Removed function sqimap_mailbox_has_children() from imap_mailbox.php

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f79aa6995505f707255cfd6710f9644aaf043b49..8553beca3fbf101956e0a3e2ce64920470027f64 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -107,27 +107,28 @@ function readMailboxParent($haystack, $needle) {
 
 
 function isBoxBelow( $box2, $box1 ) {
-    global $delimiter, $folder_prefix, $imap_server_type;
-
-    if ( $imap_server_type == 'uw' ) {
-        $boxs = $box2;
-        $i = strpos( $box1, $delimiter, strlen( $folder_prefix ) );
-        if ( $i === false ) {
-            $i = strlen( $box2 );
-        }
-    } else {
-        $boxs = $box2 . $delimiter;
-        /* Skip next second delimiter */
-        $i = strpos( $box1, $delimiter );
-        $i = strpos( $box1, $delimiter, $i + 1  );
-        if ( $i === false ) {
-            $i = strlen( $box2 );
-        } else {
-            $i++;
-        }
-    }
-
-    return ( substr( $box1, 0, $i ) == substr( $boxs, 0, $i ) );
+global $delimiter, $folder_prefix, $imap_server_type;
+       if ( $imap_server_type == 'uw' ) {
+               $boxs = $box2;
+               $i = strpos( $box1, $delimiter, strlen( $folder_prefix ) );
+               if ( $i === false ) {
+                       $i = strlen( $box2 );
+               }
+       } else {
+               if (substr($box2,0,strlen($box1)) == $box1) {
+                       return true;
+               }
+               $boxs = $box2 . $delimiter;
+               /* Skip next second delimiter */
+               $i = strpos( $box1, $delimiter );
+               $i = strpos( $box1, $delimiter, $i + 1  );
+               if ( $i === false ) {
+                       $i = strlen( $box2 );
+               } else {
+                       $i++;
+               }
+       }
+       return ( substr( $box1, 0, $i ) == substr( $boxs, 0, $i ) );
 }
 
 /* Defines special mailboxes */
@@ -935,4 +936,5 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
 
     return $mailboxes;
 }
+
 ?>