Changeset 2317 in subversion

Timestamp:

Feb 27, 2009 5:56:45 AM (4 years ago)

Author:

thomasb

Message:

Changed code style for better diffs

File:

• trunk/roundcubemail/program/lib/html2text.php (modified) (10 diffs)

trunk/roundcubemail/program/lib/html2text.php

@@ -202 +202 @@
         "\t* \\1\n",                            // <li> and </li>
         "\n\t* ",                               // <li>
-        "\n-------------------------\n",        // <hr>
-        "\n\n",                                 // <table> and </table>
+        "\n-------------------------\n",        // <hr>
+        "\n\n",                                 // <table> and </table>
         "\n",                                   // <tr> and </tr>
         "\t\t\\1\n",                            // <td> and </td>
@@ -248 +248 @@
     */
     var $pre_search = array(
-        "/\n/",
-        "/\t/",
-        '/ /',
-        '/<pre[^>]*>/',
-        '/<\/pre>/'
+        "/\n/",
+        "/\t/",
+        '/ /',
+        '/<pre[^>]*>/',
+        '/<\/pre>/'
     );
 
@@ -263 +263 @@
      */
     var $pre_replace = array(
-        '<br>',
-        '&nbsp;&nbsp;&nbsp;&nbsp;',
-        '&nbsp;',
-        '',
-        ''
+        '<br>',
+        '&nbsp;&nbsp;&nbsp;&nbsp;',
+        '&nbsp;',
+        '',
+        ''
     );
 
@@ -343 +343 @@
             $this->set_html($source, $from_file);
         }
-        
+
         $this->set_base_url();
-        $this->_do_links = $do_links;
-        $this->width = $width;
+        $this->_do_links = $do_links;
+        $this->width = $width;
     }
 
@@ -360 +360 @@
     {
         if ( $from_file && file_exists($source) ) {
-            $this->html = file_get_contents($source); 
+            $this->html = file_get_contents($source); 
         }
         else
-            $this->html = $source;
+            $this->html = $source;
 
         $this->_converted = false;
@@ -464 +464 @@
         $text = trim(stripslashes($this->html));
 
-        // Convert <PRE>
+        // Convert <PRE>
         $this->_convert_pre($text);
 
@@ -471 +471 @@
         $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
 
-        // Replace known html entities
-        $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
+        // Replace known html entities
+        $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
 
         // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
@@ -548 +548 @@
     function _convert_pre(&$text)
     {
-        while(preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches))
-        {
-            $result = preg_replace($this->pre_search, $this->pre_replace, $matches[1]);
-            $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
-        }
+        while(preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
+            $result = preg_replace($this->pre_search, $this->pre_replace, $matches[1]);
+            $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
+        }
     }
 
@@ -564 +563 @@
     function _preg_callback($matches)
     {
-        switch($matches[1])
-        {
-            case 'b':
-            case 'strong':
-                return $this->_strtoupper($matches[2]);
-            case 'hr':
-                return $this->_strtoupper("\t\t". $matches[2] ."\n");
-            case 'h':
-                return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
-            case 'a':
-                return $this->_build_link_list($matches[3], $matches[4]);
-        }
+        switch($matches[1]) {
+        case 'b':
+        case 'strong':
+            return $this->_strtoupper($matches[2]);
+        case 'hr':
+            return $this->_strtoupper("\t\t". $matches[2] ."\n");
+        case 'h':
+            return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
+        case 'a':
+            return $this->_build_link_list($matches[3], $matches[4]);
+        }
     }
     
@@ -587 +585 @@
     function _strtoupper($str)
     {
-        if (function_exists('mb_strtoupper'))
-            return mb_strtoupper($str);
-        else
-            return strtoupper($str);
+        if (function_exists('mb_strtoupper'))
+            return mb_strtoupper($str);
+        else
+            return strtoupper($str);
     }
 }