Removed countCharInString() and replaced its invocations with

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index a4936b67812c44ef33bc6f8d220ecf43a17b6298..a46ccaed379254587fa9802af58deedc6f52aa1f 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -169,7 +169,7 @@ function sqimap_mailbox_parse ($line, $line_lsub)
         
         /* Count number of delimiters ($delimiter) in folder name */
         $mailbox = trim($line_lsub[$g]);
-        $dm_count = countCharInString($mailbox, $delimiter);
+        $dm_count =  substr_count($mailbox, $delimiter);
         if (substr($mailbox, -1) == $delimiter) {
             /* If name ends in delimiter - decrement count by one */
             $dm_count--;  
@@ -183,7 +183,7 @@ function sqimap_mailbox_parse ($line, $line_lsub)
              (substr($mailbox, 0, strlen($folder_prefix)) == $folder_prefix) ||
              ( isset($boxesbyname[$parentfolder]) &&
                (strlen($parentfolder) > 0) ) ) {
-            $indent = $dm_count - (countCharInString($folder_prefix, $delimiter));
+            $indent = $dm_count - ( substr_count($folder_prefix, $delimiter));
             if ($indent > 0) {
                 $boxes[$g]["formatted"]  = str_repeat("  ", $indent);
             }
@@ -251,9 +251,9 @@ function user_strcasecmp($a, $b) {
         if (($a_del == $delimiter) && ($b_del == $delimiter)) {
             $result = 0;
         } else if (($a_del == $delimiter) && ($b_del != $delimiter)) {
-            $result = 1;
-        } else if (($a_del != $delimiter) && ($b_del != $delimiter)) {
             $result = -1;
+        } else if (($a_del != $delimiter) && ($b_del == $delimiter)) {
+            $result = 1;
         } else {
             $result = strcasecmp($a{$c}, $b{$c});
         }
@@ -491,7 +491,7 @@ function sqimap_mailbox_list_all ($imap_stream)
             
             /* Count number of delimiters ($delimiter) in folder name */
             $mailbox = find_mailbox_name($read_ary[$i]);
-            $dm_count = countCharInString($mailbox, $delimiter);
+            $dm_count =  substr_count($mailbox, $delimiter);
             if (substr($mailbox, -1) == $delimiter) {
                 /* If name ends in delimiter - decrement count by one */
                 $dm_count--;