X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=422638ed3193150b8a06adb94ac9cfce9ade72ad;hb=5218b2823717b3d99bfbe440df933ff1795203e9;hp=f9819a3347b75579ad249ce00ea9edf95666acb5;hpb=1590a66843027b306e82bc819b224fb5ff2a401c;p=squirrelmail.git

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f9819a33..422638ed 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -12,6 +12,7 @@
       sqimap_mailbox_select ($imap_stream, $mailbox);
       fputs ($imap_stream, "a001 EXPUNGE\r\n");
       $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+      sqimap_mailbox_close ($imap_stream);
    }
 
 
@@ -19,23 +20,39 @@
     **  Checks whether or not the specified mailbox exists 
     ******************************************************************************/
    function sqimap_mailbox_exists ($imap_stream, $mailbox) {
-      $boxes = sqimap_mailbox_list ($imap_stream);
-      $found = false;
-      for ($i = 0; $i < count ($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $mailbox)
-            $found = true;
+      fputs ($imap_stream, "a001 LIST \"\" \"$mailbox\"\r\n");
+      $mbx = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+      if ($mailbox) {
+         if (ereg ("$mailbox", $mbx[0])) {
+            return true;
+         } else {
+            return false;
+         }
       }
-      return $found;
    }
 
+   /******************************************************************************
+    **  Closes an open mailbox 
+    ******************************************************************************/
+   function sqimap_mailbox_close ($imap_stream) {
+      fputs ($imap_stream, "a001 CLOSE\r\n");
+      $tmp = sqimap_read_data($imap_stream, "a001", false, $response, $message);
+   }
 
-   
    /******************************************************************************
     **  Selects a mailbox
     ******************************************************************************/
-   function sqimap_mailbox_select ($imap_stream, $mailbox) {
+   function sqimap_mailbox_select ($imap_stream, $mailbox, $hide=true, $recent=false) {
       fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
-      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+     	$read = sqimap_read_data($imap_stream, "a001", 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];
+      }
    }
 
    
@@ -71,6 +88,8 @@
     **  Unsubscribes to an existing folder 
     ******************************************************************************/
    function sqimap_unsubscribe ($imap_stream, $mailbox) {
+		global $imap_server_type;
+
       fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
@@ -91,17 +110,18 @@
    /******************************************************************************
     **  Formats a mailbox into 4 parts for the $boxes array
     ******************************************************************************/
-   function sqimap_mailbox_parse ($line, $dm) {
+   function sqimap_mailbox_parse ($line, $line_lsub, $dm) {
+		global $folder_prefix;
       for ($g=0; $g < count($line); $g++) {
          $boxes[$g]["raw"] = $line[$g];
             
-         $mailbox = find_mailbox_name($line[$g]);
+         $mailbox = $line_lsub[$g];
          $dm_count = countCharInString($mailbox, $dm);
          if (substr($mailbox, -1) == $dm)
             $dm_count--;
             
-         for ($j = 0; $j < $dm_count; $j++)
-            $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "  ";
+         for ($j = 0; $j < $dm_count - (countCharInString($folder_prefix, $dm)); $j++)
+            $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "&nbsp;&nbsp;";
          $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
             
          $boxes[$g]["unformatted-dm"] = $mailbox;
@@ -117,7 +137,6 @@
          if ($flags) {
             $boxes[$g]["flags"] = explode(" ", $flags);
          }
-
       }
       return $boxes;
    }
@@ -127,7 +146,9 @@
     **  The array returned looks like this:
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
-      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
+      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
+		global $trash_folder, $sent_folder;
+		global $move_to_trash, $move_to_sent;
 
       $inbox_in_list = false;
       $inbox_subscribed = false;
@@ -138,29 +159,13 @@
 
       $dm = sqimap_get_delimiter ($imap_stream);
 
-      /** LIST array **/
-      fputs ($imap_stream, "a001 LIST \"\" \"$folder_prefix*\"\r\n");
-      $list_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      for ($i=0;$i < count($list_ary); $i++) {
-         $sorted_list_ary[$i]["name"] = find_mailbox_name($list_ary[$i]);
-         $sorted_list_ary[$i]["raw"]  = $list_ary[$i];
-         if ($sorted_list_ary[$i]["name"] == "INBOX")
-            $inbox_in_list = true;
-      }
-      if (isset($sorted_list_ary)) {
-         $list_sorted = array_cleave ($sorted_list_ary, "name");
-         asort($list_sorted);
-      }   
-
-
       /** LSUB array **/
       $inbox_subscribed = false;
       fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
       $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+   
       for ($i=0;$i < count($lsub_ary); $i++) {
          $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]);
-         if (substr($sorted_lsub_ary[$i], -1) == $dm)
-            $sorted_lsub_ary[$i] = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
          if ($sorted_lsub_ary[$i] == "INBOX")
             $inbox_subscribed = true;
       }
@@ -168,77 +173,65 @@
          sort($sorted_lsub_ary);
       }   
 
-      
+      /** LIST array **/
+		for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+			if (substr($sorted_lsub_ary[$i], -1) == $dm)
+				$mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
+			else
+				$mbx = $sorted_lsub_ary[$i];
+
+			fputs ($imap_stream, "a001 LIST \"\" \"$mbx\"\r\n");
+			$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+			$sorted_list_ary[$i] = $read[0];
+         if (find_mailbox_name($sorted_list_ary[$i]) == "INBOX")
+            $inbox_in_list = true;
+		}
+		
       /** Just in case they're not subscribed to their inbox, we'll get it for them anyway **/
       if ($inbox_subscribed == false || $inbox_in_list == false) {
          fputs ($imap_stream, "a001 LIST \"\" \"INBOX\"\r\n");
          $inbox_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-         $merged[0] = $inbox_ary[0];
-         $k = 1;
-      } else {
-         $k = 0;
-      }
-
-      $i = $j = 0;
-      
-      if (isset($list_sorted) && isset($sorted_lsub_ary)) {
-	      reset ($list_sorted);
-	      for (reset($list_sorted); $key = key($list_sorted), isset($key);) {
-	         if ($sorted_lsub_ary[$i] == $list_sorted[$key]) {
-	            $merged[$k] = $sorted_list_ary[$key]["raw"];
-	            $k++;
-	            $i++;
-	            next($list_sorted);
-	         } else if ($sorted_lsub_ary[$i] < $list_sorted[$key]) {
-	            $i++;
-	         } else {
-	            next($list_sorted);
-	         }
-	      }
-      }
 
-      return sqimap_mailbox_parse ($merged, $dm);
-   }
-   
-/*
-      $original = $boxes;
+         $pos = count($sorted_list_ary);
+         $sorted_list_ary[$pos] = $inbox_ary[0];
 
-      for ($i = 0; $i < count($original); $i++) {
-         $boxes[$i]["unformatted"] = strtolower($boxes[$i]["unformatted"]);
+         $pos = count($sorted_lsub_ary);
+         $sorted_lsub_ary[$pos] = find_mailbox_name($inbox_ary[0]);
       }
 
-      $boxes = ary_sort($boxes, "unformatted", 1);
-
+		$boxes = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary, $dm);
+		
+		/** Now, lets sort for special folders **/
       for ($i = 0; $i < count($boxes); $i++) {
-         for ($j = 0; $j < count($original); $j++) {
-            if ($boxes[$i]["id"] == $original[$j]["id"]) {
-               $boxes[$i] = $original[$j];
-            }
-         }
-      }     
- 
-      
-      for ($i = 0; $i < count($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $special_folders[0]) {
+         if (strtolower($boxes[$i]["unformatted"]) == "inbox") {
             $boxesnew[0] = $boxes[$i];
             $boxes[$i]["used"] = true;
+				$i = count($boxes);
          }
       }
-      
+
       if ($list_special_folders_first == true) {
-         for ($i = 0; $i < count($boxes); $i++) {
-            for ($j = 1; $j < count($special_folders); $j++) {
-               if (substr($boxes[$i]["unformatted"], 0, strlen($special_folders[$j])) == $special_folders[$j]) {
-                  $pos = count($boxesnew);
-                  $boxesnew[$pos] = $boxes[$i];
-                  $boxes[$i]["used"] = true;
-               }
+         for ($i = count($boxes)-1; $i >= 0 ; $i--) {
+				if (($boxes[$i]["unformatted"] == $trash_folder) && ($move_to_trash)) {	
+               $pos = count($boxesnew);
+               $boxesnew[$pos] = $boxes[$i];
+               $boxes[$i]["used"] = true;
+					$trash_found = true;
+            }
+				else if (($boxes[$i]["unformatted"] == $sent_folder) && ($move_to_sent)) {	
+               $pos = count($boxesnew);
+               $boxesnew[$pos] = $boxes[$i];
+               $boxes[$i]["used"] = true;
+					$sent_found = true;
             }
+
+				if (($sent_found && $trash_found) || ($sent_found && !$move_to_trash) || ($trash_found && !$move_to_sent) || (!$move_to_sent && !$move_to_trash))
+					$i = -1;
          }
       }
-      
+
       for ($i = 0; $i < count($boxes); $i++) {
-         if (($boxes[$i]["unformatted"] != $special_folders[0]) &&
+         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
              ($boxes[$i]["used"] == false))  {
             $pos = count($boxesnew);
             $boxesnew[$pos] = $boxes[$i];
@@ -248,13 +241,12 @@
 
       return $boxesnew;
    }
-   */
    
    /******************************************************************************
     **  Returns a list of all folders, subscribed or not
     ******************************************************************************/
    function sqimap_mailbox_list_all ($imap_stream) {
-      global $special_folders, $list_special_folders_first, $folder_prefix;
+      global $list_special_folders_first, $folder_prefix;
       
       if (!function_exists ("ary_sort"))
          include ("../functions/array.php");
@@ -298,7 +290,9 @@
          }
          $g++;
       }
-      $boxes = ary_sort ($boxes, "unformatted", 1);
+      if ($boxes) {
+         $boxes = ary_sort ($boxes, "unformatted", 1);
+      }
       return $boxes;
    }