[Svn] r6085 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Sat Apr 14 13:15:28 CEST 2012


Author: alec
Date: 2012-04-14 06:15:28 -0500 (Sat, 14 Apr 2012)
New Revision: 6085

Modified:
   trunk/roundcubemail/program/include/rcube_charset.php
   trunk/roundcubemail/program/include/rcube_ui.php
Log:
- More public methods, code cleanup


Modified: trunk/roundcubemail/program/include/rcube_charset.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_charset.php	2012-04-14 06:35:52 UTC (rev 6084)
+++ trunk/roundcubemail/program/include/rcube_charset.php	2012-04-14 11:15:28 UTC (rev 6085)
@@ -44,14 +44,14 @@
         'UNKNOWN'       => 'ISO-8859-15',
         'USERDEFINED'   => 'ISO-8859-15',
         'KSC56011987'   => 'EUC-KR',
-        'GB2312' 	    => 'GBK',
-        'GB231280'	    => 'GBK',
-        'UNICODE'	    => 'UTF-8',
-        'UTF7IMAP'	    => 'UTF7-IMAP',
-        'TIS620'	    => 'WINDOWS-874',
-        'ISO88599'	    => 'WINDOWS-1254',
-        'ISO885911'	    => 'WINDOWS-874',
-        'MACROMAN'	    => 'MACINTOSH',
+        'GB2312'        => 'GBK',
+        'GB231280'      => 'GBK',
+        'UNICODE'       => 'UTF-8',
+        'UTF7IMAP'      => 'UTF7-IMAP',
+        'TIS620'        => 'WINDOWS-874',
+        'ISO88599'      => 'WINDOWS-1254',
+        'ISO885911'     => 'WINDOWS-874',
+        'MACROMAN'      => 'MACINTOSH',
         '77'            => 'MAC',
         '128'           => 'SHIFT-JIS',
         '129'           => 'CP949',
@@ -336,7 +336,7 @@
                         break;
                     }
 
-	                $ch .= $u7;
+                    $ch .= $u7;
                 }
 
                 if ($ch == '') {
@@ -724,7 +724,7 @@
             }
             else if ($ord >= 0xC0) {
                 if (strlen($seq) > 1) {
-	                $out .= preg_match($regexp, $seq) ? $seq : '';
+                    $out .= preg_match($regexp, $seq) ? $seq : '';
                     $seq = '';
                 }
                 else if ($seq && ord($seq) < 0xC0) {

Modified: trunk/roundcubemail/program/include/rcube_ui.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_ui.php	2012-04-14 06:35:52 UTC (rev 6084)
+++ trunk/roundcubemail/program/include/rcube_ui.php	2012-04-14 11:15:28 UTC (rev 6085)
@@ -829,7 +829,7 @@
     /**
      * Return html for a structured list <ul> for the mailbox tree
      */
-    private static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
+    public static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
     {
         global $RCMAIL;
 
@@ -922,7 +922,7 @@
     /**
      * Return html for a flat list <select> for the mailbox tree
      */
-    private static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
+    public static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
     {
         global $RCMAIL;
 



More information about the svn mailing list