X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=ebad86d21b431bf19af25397d3433630b90f0ee8;hb=b9511169354b5d70446d3a811f8c09699f399bdf;hp=b7ae6032f3c7d07af989a15836bff2a3d4ed7ccd;hpb=5bdd722368a3fac32defc2242e9dd3f1e567a527;p=squirrelmail.git diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index b7ae6032..ebad86d2 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -3,16 +3,20 @@ ** imap_mailbox.php ** ** This impliments all functions that manipulate mailboxes + ** + ** $Id$ **/ + if (defined ('imap_mailbox_php')) + return; + define ('imap_mailbox_php', true); + /****************************************************************************** ** Expunges a mailbox ******************************************************************************/ function sqimap_mailbox_expunge ($imap_stream, $mailbox,$handle_errors = true) { - sqimap_mailbox_select ($imap_stream, $mailbox); fputs ($imap_stream, "a001 EXPUNGE\r\n"); $read = sqimap_read_data($imap_stream, "a001", $handle_errors, $response, $message); - sqimap_mailbox_close ($imap_stream); } @@ -20,19 +24,11 @@ ** Checks whether or not the specified mailbox exists ******************************************************************************/ function sqimap_mailbox_exists ($imap_stream, $mailbox) { + if (! isset($mailbox)) + return false; fputs ($imap_stream, "a001 LIST \"\" \"$mailbox\"\r\n"); $mbx = sqimap_read_data($imap_stream, "a001", true, $response, $message); - if ($mailbox) { - return !!(ereg ("$mailbox", $mbx[0])); // To force into true/false - } - } - - /****************************************************************************** - ** 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); + return isset($mbx[0]); } /****************************************************************************** @@ -42,7 +38,7 @@ global $auto_expunge; 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 0) ) ) { - $indent = $dm_count - (countCharInString($folder_prefix, $dm)); - $boxes[$g]["formatted"] = str_repeat("  ", $indent); - $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm); - } else { - $boxes[$g]["formatted"] = $mailbox; - } + // Format folder name, but only if it's a INBOX.* or have + // a parent. + $boxesbyname[$mailbox] = $g; + $parentfolder = readMailboxParent($mailbox, $dm); + if((strtolower(substr($mailbox, 0, 5)) == "inbox") || + (substr($mailbox, 0, strlen($folder_prefix)) == $folder_prefix) || + (isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { + $indent = $dm_count - (countCharInString($folder_prefix, $dm)); + if ($indent > 0) + $boxes[$g]["formatted"] = str_repeat("  ", $indent); + else + $boxes[$g]["formatted"] = ''; + $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm); + } else { + $boxes[$g]["formatted"] = $mailbox; + } - $boxes[$g]["unformatted-dm"] = $mailbox; + $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; - - ereg("\(([^)]*)\)",$line[$g],$regs); - $flags = trim(strtolower(str_replace("\\", "",$regs[1]))); - if ($flags) { - $boxes[$g]["flags"] = explode(" ", $flags); - } + $boxes[$g]['unformatted'] = $mailbox; + if (substr($mailbox,0,strlen($folder_prefix))==$folder_prefix) + $mailbox = substr($mailbox, strlen($folder_prefix)); + $boxes[$g]['unformatted-disp'] = $mailbox; + $boxes[$g]['id'] = $g; + + $boxes[$g]['flags'] = array(); + if (isset($line[$g])) { + ereg("\(([^)]*)\)",$line[$g],$regs); + $flags = trim(strtolower(str_replace('\\', '',$regs[1]))); + if ($flags) + $boxes[$g]['flags'] = explode(' ', $flags); + } } return $boxes; } - - /* patch from dave_michmerhuizen@yahoo.com - * allows case insensativity when sorting folders + + /* Apparently you must call a user function with usort instead + * of calling a built-in directly. Stupid. + * Patch from dave_michmerhuizen@yahoo.com + * Allows case insensitivity when sorting folders */ - function _icmp ($a, $b) { - return strcasecmp($a, $b); + function user_strcasecmp($a, $b) + { + return strcasecmp($a, $b); } - + + /****************************************************************************** ** Returns sorted mailbox lists in several different ways. ** See comment on sqimap_mailbox_parse() for info about the returned array. ******************************************************************************/ function sqimap_mailbox_list ($imap_stream) { - global $load_prefs_php, $prefs_php, $config_php; global $data_dir, $username, $list_special_folders_first; global $trash_folder, $sent_folder; - global $move_to_trash, $move_to_sent; + global $move_to_trash, $move_to_sent, $folder_prefix; $inbox_in_list = false; $inbox_subscribed = false; - if (!isset($load_prefs_php)) include "../src/load_prefs.php"; - else global $folder_prefix; - if (!function_exists ("ary_sort")) include "../functions/array.php"; + include "../src/load_prefs.php"; + include "../functions/array.php"; $dm = sqimap_get_delimiter ($imap_stream); /** LSUB array **/ - $inbox_subscribed = false; - fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n"); + fputs ($imap_stream, "a001 LSUB \"$folder_prefix\" \"*\"\r\n"); $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message); + + // Section about removing the last element was removed + // We don't return "* OK" anymore from sqimap_read_data + $sorted_lsub_ary = array(); for ($i=0;$i < count($lsub_ary); $i++) { - $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]); - if ($sorted_lsub_ary[$i] == "INBOX") + // Workaround for EIMS + // Doesn't work if the mailbox name is multiple lines + if (isset($lsub_ary[$i + 1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $lsub_ary[$i], $regs)) { + $i ++; + $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . + '"' . $regs[2]; + } + $temp_mailbox_name = find_mailbox_name($lsub_ary[$i]); + $sorted_lsub_ary[] = $temp_mailbox_name; + if (strtoupper($temp_mailbox_name) == 'INBOX') $inbox_subscribed = true; } $new_ary = array(); @@ -208,11 +246,12 @@ } $sorted_lsub_ary = $new_ary; if (isset($sorted_lsub_ary)) { - usort($sorted_lsub_ary, "_icmp"); + usort($sorted_lsub_ary, 'user_strcasecmp'); //sort($sorted_lsub_ary); } /** LIST array **/ + $sorted_list_ary = 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); @@ -221,21 +260,39 @@ 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") + // Another workaround for EIMS + if (isset($read[1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $read[0], $regs)) { + $read[0] = $regs[1] . '"' . addslashes(trim($read[1])) . + '"' . $regs[2]; + } + if (isset($sorted_list_ary[$i])) + $sorted_list_ary[$i] = ""; + if (isset($read[0])) + $sorted_list_ary[$i] = $read[0]; + else + $sorted_list_ary[$i] = ""; + if (isset($sorted_list_ary[$i]) && + strtoupper(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 **/ + + /** 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); + // Another workaround for EIMS + if (isset($inbox_ary[1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $inbox_ary[0], $regs)) { + $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) . + '"' . $regs[2]; + } - $pos = count($sorted_list_ary); - $sorted_list_ary[$pos] = $inbox_ary[0]; - - $pos = count($sorted_lsub_ary); - $sorted_lsub_ary[$pos] = find_mailbox_name($inbox_ary[0]); + $sorted_list_ary[] = $inbox_ary[0]; + $sorted_lsub_ary[] = find_mailbox_name($inbox_ary[0]); } $boxes = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary, $dm); @@ -249,46 +306,46 @@ for ($i = 0; $i < count($boxes); $i++) { if (strtolower($boxes[$i]["unformatted"]) == "inbox") { $boxesnew[] = $boxes[$i]; - $boxes[$i]["used"] = true; - $i = count($boxes); + $used[$i] = true; + $i = count($boxes); } } if ($list_special_folders_first == true) { - // Then list special folders and their subfolders - for ($i = 0 ; $i <= count($boxes) ; $i++) { - if((eregi("^".$trash_folder.'$', $boxes[$i]["unformatted"]) || - eregi("^".$trash_folder.quotemeta($dm), $boxes[$i]["unformatted"]) ) && - ($move_to_trash)) { + // Then list special folders and their subfolders + for ($i = 0 ; $i < count($boxes) ; $i++) { + if ($move_to_trash && + eregi('^' . quotemeta($trash_folder) . '(' . + quotemeta($dm) . '.*)?$', $boxes[$i]["unformatted"])) { $boxesnew[] = $boxes[$i]; - $boxes[$i]["used"] = true; + $used[$i] = true; } - else if((eregi("^".$sent_folder.'$', $boxes[$i]["unformatted"]) || - eregi("^".$sent_folder.quotemeta($dm), $boxes[$i]["unformatted"]) ) && - ($move_to_sent)) { + elseif ($move_to_sent && + eregi('^' . quotemeta($sent_folder) . '(' . + quotemeta($dm) . '.*)?$', $boxes[$i]["unformatted"])) { $boxesnew[] = $boxes[$i]; - $boxes[$i]["used"] = true; + $used[$i] = true; } } - // Put INBOX.* folders ahead of the rest - for ($i = 0; $i <= count($boxes); $i++) { - if (eregi("^inbox\.", $boxes[$i]["unformatted"]) && - ($boxes[$i]["used"] == false)) { - $boxesnew[] = $boxes[$i]; - $boxes[$i]["used"] = true; - } - } + // Put INBOX.* folders ahead of the rest + for ($i = 0; $i < count($boxes); $i++) { + if (eregi('^inbox\\.', $boxes[$i]["unformatted"]) && + (!isset($used[$i]) || $used[$i] == false)) { + $boxesnew[] = $boxes[$i]; + $used[$i] = true; + } + } } // Rest of the folders for ($i = 0; $i < count($boxes); $i++) { if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && - ($boxes[$i]["used"] == false)) { + (!isset($used[$i]) || $used[$i] == false)) { $boxesnew[] = $boxes[$i]; - $boxes[$i]["used"] = true; + $used[$i] = true; } } @@ -312,45 +369,71 @@ $phase = "inbox"; for ($i = 0; $i < count($read_ary); $i++) { + // Another workaround for EIMS + if (isset($read_ary[$i + 1]) && + ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", + $read_ary[$i], $regs)) { + $i ++; + $read_ary[$i] = $regs[1] . '"' . + addslashes(trim($read_ary[$i])) . + '"' . $regs[2]; + } if (substr ($read_ary[$i], 0, 4) != "a001") { - // Store the raw IMAP reply + // Store the raw IMAP reply $boxes[$g]["raw"] = $read_ary[$i]; - // Count number of delimiters ($dm) in folder name + // Count number of delimiters ($dm) in folder name $mailbox = find_mailbox_name($read_ary[$i]); $dm_count = countCharInString($mailbox, $dm); if (substr($mailbox, -1) == $dm) $dm_count--; // If name ends in delimiter - decrement count by one - - // Format folder name, but only if it's a INBOX.* or have - // a parent. - $boxesbyname[$mailbox] = $g; - $parentfolder = readMailboxParent($mailbox, $dm); - if((eregi("^inbox".quotemeta($dm), $mailbox)) || - ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { - $boxes[$g]["formatted"] = str_repeat("  ", $dm_count); - $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm); - } else { - $boxes[$g]["formatted"] = $mailbox; - } + + // Format folder name, but only if it's a INBOX.* or have + // a parent. + $boxesbyname[$mailbox] = $g; + $parentfolder = readMailboxParent($mailbox, $dm); + if((eregi('^inbox'.quotemeta($dm), $mailbox)) || + (ereg('^'.$folder_prefix, $mailbox)) || + ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { + if ($dm_count) + $boxes[$g]["formatted"] = str_repeat("  ", $dm_count); + else + $boxes[$g]["formatted"] = ''; + $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm); + } else { + $boxes[$g]["formatted"] = $mailbox; + } $boxes[$g]["unformatted-dm"] = $mailbox; if (substr($mailbox, -1) == $dm) $mailbox = substr($mailbox, 0, strlen($mailbox) - 1); $boxes[$g]["unformatted"] = $mailbox; + $boxes[$g]["unformatted-disp"] = ereg_replace('^' . $folder_prefix, '', $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); + // 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]; + } $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1); $flags = substr($flags, 0, strpos($flags, ")")); - $flags = str_replace("\\", "", $flags); + $flags = str_replace('\\', '', $flags); $flags = trim(strtolower($flags)); if ($flags) { - $boxes[$g]["flags"] = explode(" ", $flags); + $boxes[$g]['flags'] = explode(" ", $flags); + } + else + { + $boxes[$g]['flags'] = array(); } } $g++;