/******************************************************************************
** Selects a mailbox
******************************************************************************/
- function sqimap_mailbox_select ($imap_stream, $mailbox) {
+ function sqimap_mailbox_select ($imap_stream, $mailbox, $hide) {
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);
}
** Unsubscribes to an existing folder
******************************************************************************/
function sqimap_unsubscribe ($imap_stream, $mailbox) {
+ global $imap_server_type;
+
+ /** This is a hack for UW server
+ ** Sometimes a folder will have a / at the end. If that's the case,
+ ** the unsubscribe doesn't work for a box named "mailbox/". We have
+ ** to strip off the / at the end. There may be a better way of doing
+ ** this, but this is the best I've found so far. (lme - April 26, 2000)
+ **/
+ if ($imap_server_type == "uw") {
+ if (substr($mailbox, -1) == "/") {
+ $mailbox = substr($mailbox, 0, strlen($mailbox)-1);
+ }
+ }
+
fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
if ($flags) {
$boxes[$g]["flags"] = explode(" ", $flags);
}
+ /**** I'm not sure why this was even in here to begin with.. (lme)
for ($i=0; $i < count($boxes[$g]["flags"]); $i++) {
if ($boxes[$g]["flags"][$i] == "noselect") {
$boxes[$g]["unformatted-dm"] = $boxes[$g]["unformatted-dm"].$dm;
- echo $boxes[$g]["unformatted-dm"]." - debug<br>";
+// echo $boxes[$g]["unformatted-dm"]." - debug<br>";
}
}
+ ****/
}
return $boxes;
}
******************************************************************************/
function sqimap_mailbox_list ($imap_stream) {
global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
- global $special_folders;
+ global $trash_folder, $sent_folder;
+ global $move_to_trash, $move_to_sent;
$inbox_in_list = false;
$inbox_subscribed = false;
$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");
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);
- }
- }
+ $sorted_list_ary[count($sorted_list_ary)] = $inbox_ary[0];
}
- $boxes = sqimap_mailbox_parse ($merged, $dm);
+ $boxes = sqimap_mailbox_parse ($sorted_list_ary, $dm);
/** Now, lets sort for special folders **/
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"], strlen($folder_prefix), 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];
** 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");
projects / squirrelmail.git / blobdiff