X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=b220ee6f6042818d0f4b56b9fc7957b30a1aa4d4;hb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;hp=3b7ca6dd7c180a0dd42282909de25e8d59bae516;hpb=2c617aa5d1e4a3ce976cbf7a9372c425bbe5d445;p=squirrelmail.git

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 3b7ca6dd..b220ee6f 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -10,7 +10,8 @@
  *
  * $Id$
  */
-
+require_once(SM_PATH . 'functions/imap_utf7_encode_local.php');
+require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
 global $boxesnew;
 
 class mailboxes {
@@ -25,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 != '') {
@@ -72,13 +75,15 @@ function sortSpecialMbx($a, $b) {
     return ($acmp>$bcmp) ? 1: -1;
 }     	
 
-
 function find_mailbox_name ($mailbox) {
     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);
 }
 
 /**
@@ -144,9 +149,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 */
@@ -160,8 +185,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' ) {
@@ -170,20 +194,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];
@@ -192,20 +209,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 */
@@ -214,6 +227,7 @@ function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
     if (strtolower($type) == 'noselect') {
         $mailbox .= $delimiter;
     }
+    $mailbox = imap_utf7_encode_local($mailbox);
     $read_ary = sqimap_run_command($imap_stream, "CREATE \"$mailbox\"",
                                    true, $response, $message);
     sqimap_subscribe ($imap_stream, $mailbox);
@@ -343,10 +357,10 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
             else {
                 $boxesall[$g]['formatted'] = '';
             }
-            $boxesall[$g]['formatted'] .= readShortMailboxName($mailbox, $delimiter);
+            $boxesall[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
         }
         else {
-            $boxesall[$g]['formatted']  = $mailbox;
+            $boxesall[$g]['formatted']  = imap_utf7_decode_local($mailbox);
         }
 
         $boxesall[$g]['unformatted-dm'] = $mailbox;
@@ -435,25 +449,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
@@ -565,6 +586,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
@@ -593,7 +615,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 );
@@ -635,10 +657,10 @@ function sqimap_mailbox_list_all($imap_stream) {
                 else {
                     $boxes[$g]['formatted'] = '';
                 }
-                $boxes[$g]['formatted'] .= readShortMailboxName($mailbox, $delimiter);
+                $boxes[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
             }
             else {
-                $boxes[$g]['formatted']  = $mailbox;
+                $boxes[$g]['formatted']  = imap_utf7_decode_local($mailbox);
             }
 
             $boxes[$g]['unformatted-dm'] = $mailbox;
@@ -683,16 +705,14 @@ function sqimap_mailbox_tree($imap_stream) {
     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;
+               $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 +723,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
@@ -716,13 +736,19 @@ function sqimap_mailbox_tree($imap_stream) {
                 $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . '"' . $regs[2];
             }
 
-	    if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) {
-    		$flag = $regs[1];
-    		$mbx = trim($regs[3]);
-		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
-	    }
+//	    if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) {
+//    		$flag = $regs[1];
+//    		$mbx = trim($regs[3]);
+//		$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, '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') {
@@ -745,27 +771,46 @@ function sqimap_mailbox_tree($imap_stream) {
                 $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
                     '"' . $regs[2];
             }
-	    if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
-    		$flag = $regs[1];
-    		$mbx = trim($regs[3]);
-		$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') 
+	    $mbx = find_mailbox_name($inbox_ary[0]);
+	    if (substr($mbx, -1) == $delimiter) {
+    	        $mbx = substr($mbx, 0, strlen($mbx) - 1);
+    	    }
+	    if ( $mbx == 'INBOX') {
+		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => ''); 
+		sqimap_subscribe($imap_stream, 'INBOX');
+	    }	
+	    
+//	    if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
+//    		$flag = $regs[1];
+//    		$mbx = trim($regs[3]);
+//		if (substr($mbx, -1) == $delimiter) {
+//        	    $mbx = substr($mbx, 0, strlen($mbx) - 1);
+//    		}
+//    		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
+//	    }
+        }
+        $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;
     }
@@ -795,8 +840,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'];
@@ -825,6 +870,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) {