X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=a2088a6c5f58f0e593676176f0c0dd75a69ed1ce;hp=f9d10d95db5b36172af2a4c16eae4f512ec89569;hb=7d82bcebfcbc92a35bc7066d560e64d6ae786807;hpb=447b2166b5240f1ab3fc8d7c30d715b69e4232a4

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f9d10d95..a2088a6c 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -10,8 +10,8 @@
  *
  * $Id$
  */
-require_once('../functions/imap_utf7_encode_local.php');
-require_once('../functions/imap_utf7_decode_local.php');
+require_once(SM_PATH . 'functions/imap_utf7_encode_local.php');
+require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
 global $boxesnew;
 
 class mailboxes {
@@ -26,12 +26,14 @@ class mailboxes {
       for ($i=$start; $i < (count($ary) -1); $i++) {
         $mbx_childs = &$mbx_parent->mbxs;
 	$found = false;
-        foreach ($mbx_childs as $key => $parent) {
+	if ($mbx_childs) {
+          foreach ($mbx_childs as $key => $parent) {
 	    if ($parent->mailboxname_sub == $ary[$i]) {
 		$mbx_parent = &$mbx_parent->mbxs[$key];
 		$found = true;
 	    } 
-	}
+	  }
+	}  
 	if (!$found) {
 	    $no_select_mbx = new mailboxes();
 	    if (isset($mbx_parent->mailboxname_full) && $mbx_parent->mailboxname_full != '') {
@@ -73,13 +75,17 @@ function sortSpecialMbx($a, $b) {
     return ($acmp>$bcmp) ? 1: -1;
 }     	
 
-
 function find_mailbox_name ($mailbox) {
+    if (preg_match('/\*.+\"([^\r\n\"]*)\"[\s\r\n]*$/', $mailbox, $regs)) 
+        return $regs[1];
     if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs))
         return $regs[1];
     ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs);
     return $regs[1];
-    
+}
+
+function check_is_noselect ($lsub_line) {
+    return preg_match("/^\* LSUB \([^\)]*\\Noselect[^\)]*\)/i", $lsub_line);
 }
 
 /**
@@ -145,9 +151,29 @@ function isSpecialMailbox( $box ) {
 }
 
 /* Expunges a mailbox */
-function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true) {
-    $read = sqimap_run_command($imap_stream, 'EXPUNGE', $handle_errors,
-                               $response, $message);
+function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true, $id='') {
+    global $uid_support;
+    if ($id) {
+       if (is_array($id)) {
+          $id = sqimap_message_list_squisher($id);
+       }
+       $id = ' '.$id;
+       $uid = $uid_support;
+    } else {
+       $uid = false;
+    }
+    $read = sqimap_run_command($imap_stream, 'EXPUNGE'.$id, $handle_errors,
+                               $response, $message, $uid);
+    $cnt = 0;
+    
+    if ( is_array( $read ) ) {
+        foreach ($read as $r) {
+           if (preg_match('/^\*\s[0-9]+\sEXPUNGE/AUi',$r,$regs)) {
+              $cnt++;
+           }
+        }
+    }
+    return $cnt; 
 }
 
 /* Checks whether or not the specified mailbox exists */
@@ -161,8 +187,7 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) {
 }
 
 /* Selects a mailbox */
-function sqimap_mailbox_select ($imap_stream, $mailbox,
-                                $hide = true, $recent = false, $extrainfo = false) {
+function sqimap_mailbox_select ($imap_stream, $mailbox) {
     global $auto_expunge;
 
     if ( $mailbox == 'None' ) {
@@ -171,20 +196,13 @@ function sqimap_mailbox_select ($imap_stream, $mailbox,
 
     $read = sqimap_run_command($imap_stream, "SELECT \"$mailbox\"",
                                true, $response, $message);
-    if ($recent) {
-        for ($i=0; $i<count($read); $i++) {
-            if (strpos(strtolower($read[$i]), 'recent')) {
-                $r = explode(' ', $read[$i]);
-            }
-        }
-        return $r[1];
-    } else {
-        if ($auto_expunge) {
-            $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b);
-        }
-        if (isset( $extrainfo ) && $extrainfo) {
-            $result = array();
-            for ($i=0; $i<count($read); $i++) {
+    $result = array();
+    for ($i=0; $i<count($read); $i++) {
+        if (preg_match('/^\*\s+OK\s\[(\w+)\s(\w+)\]/',$read[$i], $regs)) {
+	   $result[strtoupper($regs[1])] = $regs[2];
+	} else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) {
+	   $result[strtoupper($regs[2])] = $regs[1];
+	} else {
                 if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) {
                     $regs[1]=trim(preg_replace (  array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ;
                     $result['PERMANENTFLAGS'] = $regs[1];
@@ -193,20 +211,16 @@ function sqimap_mailbox_select ($imap_stream, $mailbox,
                     $regs[1]=trim(preg_replace (  array ("/\(/","/\)/") ,'', $regs[1])) ;
                     $result['FLAGS'] = $regs[1];
                 }
-                else if (preg_match("/(.*)EXISTS/i",$read[$i], $regs)) {
-                    $result['EXISTS']=trim($regs[1]);
-                }
-                else if (preg_match("/(.*)RECENT/i",$read[$i], $regs)) {
-                    $result['RECENT']=trim($regs[1]);
-                }
-                else if (preg_match("/\[UNSEEN(.*)\]/i",$read[$i], $regs)) {
-                    $result['UNSEEN']=trim($regs[1]);
-                }
+	}
+    }
+    if (preg_match('/^\[(.+)\]/',$message, $regs)) {
+       $result['RIGHTS']=$regs[1];
+    }
 
-            }
-            return( $result );
-        }
+    if ($auto_expunge) {
+            $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b);
     }
+    return $result;
 }
 
 /* Creates a folder */
@@ -390,6 +404,8 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
 function user_strcasecmp($a, $b) {
     global $delimiter;
 
+    return  strnatcasecmp($a, $b);
+
     /* Calculate the length of some strings. */
     $a_length = strlen($a);
     $b_length = strlen($b);
@@ -397,8 +413,7 @@ function user_strcasecmp($a, $b) {
     $delimiter_length = strlen($delimiter);
 
     /* Set the initial result value. */
-    $result = 0;
-
+    $result = 0;    
     /* Check the strings... */
     for ($c = 0; $c < $min_length; ++$c) {
         $a_del = substr($a, $c, $delimiter_length);
@@ -437,25 +452,32 @@ function user_strcasecmp($a, $b) {
  * See comment on sqimap_mailbox_parse() for info about the returned array.
  */
 function sqimap_mailbox_list($imap_stream) {
-    global $boxesnew, $default_folder_prefix;
+    global $default_folder_prefix;
 
     if ( !isset( $boxesnew ) ) {
 
         global $data_dir, $username, $list_special_folders_first,
                $folder_prefix, $trash_folder, $sent_folder, $draft_folder,
                $move_to_trash, $move_to_sent, $save_as_draft,
-               $delimiter;
+               $delimiter, $noselect_fix_enable;
 
         $inbox_in_list = false;
         $inbox_subscribed = false;
 
-        require_once('../src/load_prefs.php');
-        require_once('../functions/array.php');
+        require_once(SM_PATH . 'include/load_prefs.php');
+        require_once(SM_PATH . 'functions/array.php');
 
+    if ($noselect_fix_enable) {
+        $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
+    }
+    else {
+        $lsub_args = "LSUB \"$folder_prefix\" \"*\"";
+    }
         /* LSUB array */
-        $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*%\"",
+        $lsub_ary = sqimap_run_command ($imap_stream, $lsub_args,
                                         true, $response, $message);
 
+
         /*
          * Section about removing the last element was removed 
          * We don't return "* OK" anymore from sqimap_read_data
@@ -489,10 +511,11 @@ function sqimap_mailbox_list($imap_stream) {
         if (isset($sorted_lsub_ary)) {
             usort($sorted_lsub_ary, 'user_strcasecmp');
         }
-
+	$sorted_list_ary = $sorted_lsub_ary;
         /* LIST array */
-        $sorted_list_ary = array();
-        for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+//        $sorted_list_ary = array();
+//        for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+        if (false) {
             if (substr($sorted_lsub_ary[$i], -1) == $delimiter) {
                 $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
             }
@@ -525,12 +548,12 @@ function sqimap_mailbox_list($imap_stream) {
                 $inbox_in_list = true;
             }
         }
-
+//        $inbox_in_list = true;
         /*
          * Just in case they're not subscribed to their inbox,
          * we'll get it for them anyway
          */
-        if (!$inbox_subscribed || !$inbox_in_list) {
+        if (!$inbox_subscribed) {// || !$inbox_in_list) {
             $inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"",
                                              true, $response, $message);
             /* Another workaround for EIMS */
@@ -567,6 +590,7 @@ function sqimap_mailbox_list($imap_stream) {
                     $used[$k] = true;
                 }
                 $spec_sub = str_replace('&nbsp;', '', $box['formatted']);
+                $spec_sub = preg_replace("/(\*|\[|\]|\(|\)|\?|\+|\{|\}|\^|\\$)/", '\\\\'.'\\1', $spec_sub);
 
                /* In case of problems with preg
                   here is a ereg version
@@ -595,7 +619,7 @@ function sqimap_mailbox_list($imap_stream) {
 function sqimap_mailbox_list_all($imap_stream) {
     global $list_special_folders_first, $folder_prefix, $delimiter;
 
-    require_once('../functions/array.php');
+    require_once(SM_PATH . 'functions/array.php');
 
     $ssid = sqimap_session_id();
     $lsid = strlen( $ssid );
@@ -603,6 +627,7 @@ function sqimap_mailbox_list_all($imap_stream) {
     $read_ary = sqimap_read_data ($imap_stream, $ssid, true, $response, $message);
     $g = 0;
     $phase = 'inbox';
+    $fld_pre_length = strlen($folder_prefix);
 
     for ($i = 0; $i < count($read_ary); $i++) {
         /* Another workaround for EIMS */
@@ -613,7 +638,6 @@ function sqimap_mailbox_list_all($imap_stream) {
             $read_ary[$i] = $regs[1] . '"' . addslashes(trim($read_ary[$i])) . '"' . $regs[2];
         }
         if (substr($read_ary[$i], 0, $lsid) != $ssid ) {
-
             /* Store the raw IMAP reply */
             $boxes[$g]['raw'] = $read_ary[$i];
 
@@ -648,20 +672,24 @@ function sqimap_mailbox_list_all($imap_stream) {
                 $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
             }
             $boxes[$g]['unformatted'] = $mailbox;
-            $boxes[$g]['unformatted-disp'] = ereg_replace('^' . $folder_prefix, '', $mailbox);
+            $boxes[$g]['unformatted-disp'] = substr($mailbox,$fld_pre_length);
+
             $boxes[$g]['id'] = $g;
 
             /* Now lets get the flags for this mailbox */
-            $read_mlbx = sqimap_run_command ($imap_stream, "LIST \"\" \"$mailbox\"",
-                                             true, $response, $message);
+	    $read_mlbx = $read_ary[$i];
+
+//            $read_mlbx = sqimap_run_command ($imap_stream, "LIST \"\" \"$mailbox\"",
+//                                             true, $response, $message);
 
             /* Another workaround for EIMS */
-            if (isset($read_mlbx[1]) &&
-                ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", $read_mlbx[0], $regs)) {
-                $read_mlbx[0] = $regs[1] . '"' . addslashes(trim($read_mlbx[1])) . '"' . $regs[2];
-            }
+//            if (isset($read_mlbx[1]) &&
+//                ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", $read_mlbx[0], $regs)) {
+//                $read_mlbx[0] = $regs[1] . '"' . addslashes(trim($read_mlbx[1])) . '"' . $regs[2];
+//            }
+//	    echo  $read_mlbx[0] .' raw 2 <br>';
 
-            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], '(')+1);
+            $flags = substr($read_mlbx, strpos($read_mlbx, '(')+1);
             $flags = substr($flags, 0, strpos($flags, ')'));
             $flags = str_replace('\\', '', $flags);
             $flags = trim(strtolower($flags));
@@ -685,14 +713,14 @@ function sqimap_mailbox_tree($imap_stream) {
     if ( !isset( $boxesnew ) ) {
 
         global $data_dir, $username, $list_special_folders_first,
-               $folder_prefix, $delimiter;
+               $folder_prefix, $delimiter, $trash_folder, $move_to_trash;
 
 
         $inbox_in_list = false;
         $inbox_subscribed = false;
 
-        require_once('../src/load_prefs.php');
-        require_once('../functions/array.php');
+        require_once(SM_PATH . 'include/load_prefs.php');
+        require_once(SM_PATH . 'functions/array.php');
 
         /* LSUB array */
         $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
@@ -703,8 +731,8 @@ function sqimap_mailbox_tree($imap_stream) {
          * We don't return "* OK" anymore from sqimap_read_data
          */
         $sorted_lsub_ary = array();
-
-        for ($i=0;$i < count($lsub_ary); $i++) {
+        $cnt = count($lsub_ary);
+        for ($i=0;$i < $cnt; $i++) {
             /*
              * Workaround for EIMS
              * Doesn't work if the mailbox name is multiple lines
@@ -722,12 +750,13 @@ function sqimap_mailbox_tree($imap_stream) {
 //		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
 //	    }
 	    $mbx = find_mailbox_name($lsub_ary[$i]);
+	    $noselect = check_is_noselect($lsub_ary[$i]);
 	    if (substr($mbx, -1) == $delimiter) {
     	        $mbx = substr($mbx, 0, strlen($mbx) - 1);
     	    }
-	    $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => ''); 
+	    $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect); 
         }
-	array_multisort($sorted_lsub_ary, SORT_ASC, SORT_STRING);
+	array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
 
 	foreach ($sorted_lsub_ary as $mbx) {
 	    if ($mbx['mbx'] == 'INBOX') {
@@ -768,21 +797,28 @@ function sqimap_mailbox_tree($imap_stream) {
 //    		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
 //	    }
         }
-
-	for ($i=0 ; $i < count($sorted_lsub_ary); $i++) {
-	    if (($unseen_notify == 2 && $sorted_lsub_ary[$i]['mbx'] == 'INBOX') 
+        $cnt = count($sorted_lsub_ary);
+	for ($i=0 ; $i < $cnt; $i++) {
+	    $mbx = $sorted_lsub_ary[$i]['mbx'];
+	    if (($unseen_notify == 2 && $mbx == 'INBOX') 
 		|| $unseen_notify == 3 
-		|| ($move_to_trash && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder))) {
-    		$sorted_lsub_ary[$i]['unseen'] = sqimap_unseen_messages($imap_stream, $mbx['mbx']);
+		|| ($move_to_trash && ($mbx == $trash_folder))) {
+    		$sorted_lsub_ary[$i]['unseen'] = 
+			$sorted_lsub_ary[$i]['noselect'] ?
+			    0 : sqimap_unseen_messages($imap_stream, $mbx);
 		if ($unseen_type == 2 || ($move_to_trash 
-		    && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder) )) {
-        	    $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx['mbx']);
+		    && ($mbx == $trash_folder) )) {
+                    $sorted_lsub_ary[$i]['nummessages'] =
+			$sorted_lsub_ary[$i]['noselect'] ?
+			    0 : sqimap_get_num_messages($imap_stream, $mbx);
     		}
-		if ($unseen_notify != 3 && !($move_to_trash 
-		    && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder) )) break;
+		if ($mbx == $trash_folder) {
+                    $sorted_lsub_ary[$i]['nummessages'] =
+			$sorted_lsub_ary[$i]['noselect'] ?
+			    0 : sqimap_get_num_messages($imap_stream, $mbx);
+		}	    
 	    }
 	}
-
 	$boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary);
     return $boxesnew;
     }
@@ -812,8 +848,8 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
 	}
 	$mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
     } else $start = 0;
-
-    for ($i=0; $i < count($mbx_ary); $i++) {
+    $cnt =  count($mbx_ary);
+    for ($i=0; $i < $cnt; $i++) {
        if ($mbx_ary[$i]['mbx'] !='' ) {
 	    $mbx = new mailboxes();
 	    $mailbox = $mbx_ary[$i]['mbx'];
@@ -842,6 +878,8 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
 	    if (isset($mbx_ary[$i]['nummessages'])) {
 		$mbx->total = $mbx_ary[$i]['nummessages'];
 	    }
+
+	    $mbx->is_noselect = $mbx_ary[$i]['noselect'];
 	    
             $r_del_pos = strrpos($mbx_ary[$i]['mbx'], $delimiter);
 	    if ($r_del_pos) {