bugfixes with folder listing
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 14 Apr 2000 03:17:41 +0000 (03:17 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 14 Apr 2000 03:17:41 +0000 (03:17 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@423 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/imap_general.php
functions/imap_mailbox.php
functions/mailbox_display.php
functions/strings.php
src/folders.php

index 9e3a514..5ee3840 100755 (executable)
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
    function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LSUB \"\" *\r\n");
+      fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
       $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
       $quote_position = strpos ($read[0], "\"");
       $delim = substr ($read[0], $quote_position+1, 1);
index f7237ca..dec4e39 100755 (executable)
 <?php
-       /**
-        **  imap_mailbox.php
-        **
-        **  This impliments all functions that manipulate mailboxes
-        **/
-
-       /******************************************************************************
-        **  Expunges a mailbox 
-        ******************************************************************************/
-       function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
-               sqimap_mailbox_select ($imap_stream, $mailbox);
-               fputs ($imap_stream, "a001 EXPUNGE\r\n");
-               $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-       }
-
-
-       /******************************************************************************
-        **  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;
-               }
-               return $found;
-       }
-
-
-       
-       /******************************************************************************
-        **  Selects a mailbox
-        ******************************************************************************/
-       function sqimap_mailbox_select ($imap_stream, $mailbox) {
-               fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
-               $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-       }
-
-       
-
-       /******************************************************************************
-        **  Creates a folder 
-        ******************************************************************************/
-       function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
-               if (strtolower($type) == "noselect") {
-                       $dm = sqimap_get_delimiter($imap_stream);
-                       $mailbox = $mailbox.$dm;
-               }
-               fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
-               $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-
-               sqimap_subscribe ($imap_stream, $mailbox);
-       }
-
-
-
-       /******************************************************************************
-        **  Subscribes to an existing folder 
-        ******************************************************************************/
-       function sqimap_subscribe ($imap_stream, $mailbox) {
-               fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
-               $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-       }
-
-
-
-
-       /******************************************************************************
-        **  Unsubscribes to an existing folder 
-        ******************************************************************************/
-       function sqimap_unsubscribe ($imap_stream, $mailbox) {
-               fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
-               $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-       }
-
-
-
-       
-       /******************************************************************************
-        **  This function simply deletes the given folder
-        ******************************************************************************/
-       function sqimap_mailbox_delete ($imap_stream, $mailbox) {
-               fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
-               $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-               sqimap_unsubscribe ($imap_stream, $mailbox);
-       }
-
-
-       /******************************************************************************
-        **  Formats a mailbox into 4 parts for the $boxes array
-        ******************************************************************************/
-       function sqimap_mailbox_parse ($line, $dm) {
-               for ($g=0; $g < count($line); $g++) {
-                               $boxes[$g]["raw"] = $line[$g];
-                               
-                               $mailbox = find_mailbox_name($line[$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"] . "  ";
-                               $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-                                       
-                               $boxes[$g]["unformatted-dm"] = $mailbox;
-                               if (substr($mailbox, -1) == $dm)
-                                       $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-                               $boxes[$g]["unformatted"] = $mailbox;
-                               $boxes[$g]["id"] = $g;
-
-                               $flags = substr($line[$g], strpos($line[$g], "(")+1);
-                               $flags = substr($flags, 0, strpos($flags, ")"));
-                               $flags = str_replace("\\", "", $flags);
-                               $flags = trim(strtolower($flags));
-                               if ($flags) {
-                                       $boxes[$g]["flags"] = explode(" ", $flags);
-                               }
-       }
-               return $boxes;
-       }
-       
-       /******************************************************************************
-        **  Returns sorted mailbox lists in several different ways.
-        **  The array returned looks like this:
-        ******************************************************************************/
-       function sqimap_mailbox_list ($imap_stream) {
-               global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
-
-               if (!isset($load_prefs_php)) include "../src/load_prefs.php";
-               else global $folder_prefix;
-               if (!function_exists ("ary_sort")) include "../functions/array.php";
-
-               $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];
-               }
-               $list_sorted = array_cleave ($sorted_list_ary, "name");
-               asort($list_sorted);
-
-               /** LSUB array **/
-               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);
-               }
-               sort($sorted_lsub_ary);
-
-
-               /** Now we'll get a list of subscribed folders WITH flags **/
-               fputs ($imap_stream, "a001 LIST \"\" \"INBOX\"\r\n");
-               $inbox_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-               $merged[0] = $inbox_ary[0];
-
-               $i = $j = 0;
-               $k = 1;
-               
-               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);
-       }
-       
+   /**
+    **  imap_mailbox.php
+    **
+    **  This impliments all functions that manipulate mailboxes
+    **/
+
+   /******************************************************************************
+    **  Expunges a mailbox 
+    ******************************************************************************/
+   function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
+      sqimap_mailbox_select ($imap_stream, $mailbox);
+      fputs ($imap_stream, "a001 EXPUNGE\r\n");
+      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+   }
+
+
+   /******************************************************************************
+    **  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;
+      }
+      return $found;
+   }
+
+
+   
+   /******************************************************************************
+    **  Selects a mailbox
+    ******************************************************************************/
+   function sqimap_mailbox_select ($imap_stream, $mailbox) {
+      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
+      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+   }
+
+   
+
+   /******************************************************************************
+    **  Creates a folder 
+    ******************************************************************************/
+   function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
+      if (strtolower($type) == "noselect") {
+         $dm = sqimap_get_delimiter($imap_stream);
+         $mailbox = $mailbox.$dm;
+      }
+      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
+      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+
+      sqimap_subscribe ($imap_stream, $mailbox);
+   }
+
+
+
+   /******************************************************************************
+    **  Subscribes to an existing folder 
+    ******************************************************************************/
+   function sqimap_subscribe ($imap_stream, $mailbox) {
+      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
+      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+   }
+
+
+
+
+   /******************************************************************************
+    **  Unsubscribes to an existing folder 
+    ******************************************************************************/
+   function sqimap_unsubscribe ($imap_stream, $mailbox) {
+      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
+      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+   }
+
+
+
+   
+   /******************************************************************************
+    **  This function simply deletes the given folder
+    ******************************************************************************/
+   function sqimap_mailbox_delete ($imap_stream, $mailbox) {
+      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
+      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+      sqimap_unsubscribe ($imap_stream, $mailbox);
+   }
+
+
+   /******************************************************************************
+    **  Formats a mailbox into 4 parts for the $boxes array
+    ******************************************************************************/
+   function sqimap_mailbox_parse ($line, $dm) {
+      for ($g=0; $g < count($line); $g++) {
+         $boxes[$g]["raw"] = $line[$g];
+            
+         $mailbox = find_mailbox_name($line[$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"] . "  ";
+         $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
+            
+         $boxes[$g]["unformatted-dm"] = $mailbox;
+         if (substr($mailbox, -1) == $dm)
+            $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
+         $boxes[$g]["unformatted"] = $mailbox;
+         $boxes[$g]["id"] = $g;
+
+         $flags = substr($line[$g], strpos($line[$g], "(")+1);
+         $flags = substr($flags, 0, strpos($flags, ")"));
+         $flags = str_replace("\\", "", $flags);
+         $flags = trim(strtolower($flags));
+         if ($flags) {
+            $boxes[$g]["flags"] = explode(" ", $flags);
+         }
+
+      }
+      return $boxes;
+   }
+   
+   /******************************************************************************
+    **  Returns sorted mailbox lists in several different ways.
+    **  The array returned looks like this:
+    ******************************************************************************/
+   function sqimap_mailbox_list ($imap_stream) {
+      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
+
+      if (!isset($load_prefs_php)) include "../src/load_prefs.php";
+      else global $folder_prefix;
+      if (!function_exists ("ary_sort")) include "../functions/array.php";
+
+      $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 ($sorged_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);
+      }   
+
+      echo "<BR><BR><BR>";
+
+      /** 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;
+      }
+      if (isset($sorted_lsub_ary)) {
+         sort($sorted_lsub_ary);
+      }   
+
+      
+      /** 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);
+                }
+             }
+      }
+
+      echo "<BR><BR><BR>";
+      return sqimap_mailbox_parse ($merged, $dm);
+   }
+   
 /*
-               $original = $boxes;
+      $original = $boxes;
 
-               for ($i = 0; $i < count($original); $i++) {
-                       $boxes[$i]["unformatted"] = strtolower($boxes[$i]["unformatted"]);
-               }
+      for ($i = 0; $i < count($original); $i++) {
+         $boxes[$i]["unformatted"] = strtolower($boxes[$i]["unformatted"]);
+      }
 
-               $boxes = ary_sort($boxes, "unformatted", 1);
+      $boxes = ary_sort($boxes, "unformatted", 1);
 
-               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++) {
+         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]) {
-                               $boxesnew[0] = $boxes[$i];
-                               $boxes[$i]["used"] = true;
-                       }
-               }
-               
-               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 = 0; $i < count($boxes); $i++) {
-                       if (($boxes[$i]["unformatted"] != $special_folders[0]) &&
-                                ($boxes[$i]["used"] == false))  {
-                               $pos = count($boxesnew);
-                               $boxesnew[$pos] = $boxes[$i];
-                               $boxes[$i]["used"] = true;
-                       }
-               }
-
-               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;
-               
-               if (!function_exists ("ary_sort"))
-                       include ("../functions/array.php");
-               
-               $dm = sqimap_get_delimiter ($imap_stream);
-
-               fputs ($imap_stream, "a001 LIST \"$folder_prefix\" *\r\n");
-               $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-               $g = 0;
-               $phase = "inbox"; 
-               for ($i = 0; $i < count($read_ary); $i++) {
-                       if (substr ($read_ary[$i], 0, 4) != "a001") {
-                               $boxes[$g]["raw"] = $read_ary[$i];
-
-                               $mailbox = find_mailbox_name($read_ary[$i]);
-                               $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"] . "  ";
-                               $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-                                       
-                               $boxes[$g]["unformatted-dm"] = $mailbox;
-                               if (substr($mailbox, -1) == $dm)
-                                       $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-                               $boxes[$g]["unformatted"] = $mailbox;
-                               $boxes[$g]["id"] = $g;
-
-                               /** Now lets get the flags for this mailbox **/
-                               fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
-                               $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
-
-                               $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
-                               $flags = substr($flags, 0, strpos($flags, ")"));
-                               $flags = str_replace("\\", "", $flags);
-                               $flags = trim(strtolower($flags));
-                               if ($flags) {
-                                       $boxes[$g]["flags"] = explode(" ", $flags);
-                               }
-                       }
-                       $g++;
-               }
-               $boxes = ary_sort ($boxes, "unformatted", 1);
-               return $boxes;
-       }
-       
+      
+      for ($i = 0; $i < count($boxes); $i++) {
+         if ($boxes[$i]["unformatted"] == $special_folders[0]) {
+            $boxesnew[0] = $boxes[$i];
+            $boxes[$i]["used"] = true;
+         }
+      }
+      
+      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 = 0; $i < count($boxes); $i++) {
+         if (($boxes[$i]["unformatted"] != $special_folders[0]) &&
+             ($boxes[$i]["used"] == false))  {
+            $pos = count($boxesnew);
+            $boxesnew[$pos] = $boxes[$i];
+            $boxes[$i]["used"] = true;
+         }
+      }
+
+      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;
+      
+      if (!function_exists ("ary_sort"))
+         include ("../functions/array.php");
+      
+      $dm = sqimap_get_delimiter ($imap_stream);
+
+      fputs ($imap_stream, "a001 LIST \"$folder_prefix\" *\r\n");
+      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+      $g = 0;
+      $phase = "inbox"; 
+      for ($i = 0; $i < count($read_ary); $i++) {
+         if (substr ($read_ary[$i], 0, 4) != "a001") {
+            $boxes[$g]["raw"] = $read_ary[$i];
+
+            $mailbox = find_mailbox_name($read_ary[$i]);
+            $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"] . "  ";
+            $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
+               
+            $boxes[$g]["unformatted-dm"] = $mailbox;
+            if (substr($mailbox, -1) == $dm)
+               $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
+            $boxes[$g]["unformatted"] = $mailbox;
+            $boxes[$g]["id"] = $g;
+
+            /** Now lets get the flags for this mailbox **/
+            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
+            $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
+
+            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
+            $flags = substr($flags, 0, strpos($flags, ")"));
+            $flags = str_replace("\\", "", $flags);
+            $flags = trim(strtolower($flags));
+            if ($flags) {
+               $boxes[$g]["flags"] = explode(" ", $flags);
+            }
+         }
+         $g++;
+      }
+      $boxes = ary_sort ($boxes, "unformatted", 1);
+      return $boxes;
+   }
+   
 ?>
index 6cef9ec..cd25b13 100644 (file)
 
    // generic function to convert the msgs array into an HTML table
    function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
+      global $folder_prefix;
+
       // do a check to see if the config stuff has already been included or not
       if (!isset($imapServerAddress))
          include("../config/config.php");
 
       $boxes = sqimap_mailbox_list($imapConnection);
       for ($i = 0; $i < count($boxes); $i++) {
-         $use_folder = true;
-         for ($p = 0; $p < count($special_folders); $p++) {
-            if ($boxes[$i]["unformatted"] == $special_folders[0]) {
-               $use_folder = true;
-            } else if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
-               $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
-               $use_folder = false;
-            }
-         }
-         if ($use_folder == true) {
-            $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
+         $box = $boxes[$i]["unformatted"];
+         $box2 = replace_spaces($boxes[$i]["formatted"]);
+         echo "         <OPTION VALUE=\"$box\">$box2\n";
       }
       echo "         </SELECT></SMALL></TT>";
       echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";
index c9162fa..ab2cebe 100644 (file)
       } else {
          $box = substr($mailbox, strrpos($mailbox, " ")+1, strlen($mailbox));
       }
+      echo "$box<br>";
       return $box;
    }
 
index 6758431..66bbc56 100644 (file)
@@ -95,7 +95,7 @@
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }