X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=031ccc43f498d9bf689dd688c4a4e5c9fc581047;hp=e2c843dda4b01f081bfae30637053cc37bf9c895;hb=7350889b45590aee831ba1150ee94efb95b03992;hpb=1071ae953d0cb4bf7aff1d0e714b987e8abd9ab0 diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index e2c843dd..031ccc43 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -1,19 +1,22 @@ 0) ) ) { - $indent = $dm_count - (countCharInString($folder_prefix, $dm)); - if ($indent) + $parentfolder = readMailboxParent($mailbox, $delimiter); + 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, $delimiter)); + if ($indent > 0) $boxes[$g]["formatted"] = str_repeat("  ", $indent); else $boxes[$g]["formatted"] = ''; - $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm); + $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $delimiter); } else { $boxes[$g]["formatted"] = $mailbox; } - $boxes[$g]["unformatted-dm"] = $mailbox; - if (substr($mailbox, -1) == $dm) + $boxes[$g]['unformatted-dm'] = $mailbox; + if (substr($mailbox, -1) == $delimiter) $mailbox = substr($mailbox, 0, strlen($mailbox) - 1); - $boxes[$g]["unformatted"] = $mailbox; - $boxes[$g]["unformatted-disp"] = ereg_replace("^" . $folder_prefix, "", $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; @@ -179,31 +206,38 @@ ** 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 $folder_prefix, $trash_folder, $sent_folder, $draft_folder; + global $move_to_trash, $move_to_sent, $save_as_draft; + global $delimiter; $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"; - - $dm = sqimap_get_delimiter ($imap_stream); + require_once('../src/load_prefs.php'); + require_once('../functions/array.php'); /** LSUB array **/ - $inbox_subscribed = false; - fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n"); - $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message); - - /** OS: we don't want to parse last element of array, 'cause it is OK command, so we unset it **/ - unset($lsub_ary[count($lsub_ary)-1]); + fputs ($imap_stream, sqimap_session_id() . " LSUB \"$folder_prefix\" \"*\"\r\n"); + $lsub_ary = sqimap_read_data ($imap_stream, sqimap_session_id(), 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(); @@ -214,44 +248,63 @@ } $sorted_lsub_ary = $new_ary; if (isset($sorted_lsub_ary)) { - usort($sorted_lsub_ary, "user_strcasecmp"); + 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) + if (substr($sorted_lsub_ary[$i], -1) == $delimiter) $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") + fputs ($imap_stream, sqimap_session_id() . " LIST \"\" \"$mbx\"\r\n"); + $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message); + // 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); - - $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]); + fputs ($imap_stream, sqimap_session_id() . " LIST \"\" \"INBOX\"\r\n"); + $inbox_ary = sqimap_read_data ($imap_stream, sqimap_session_id(), 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]; + } + + $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); - + $boxes = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary); /** Now, lets sort for special folders **/ - $boxesnew = Array(); - // Find INBOX + /* Find INBOX */ for ($i = 0; $i < count($boxes); $i++) { if (strtolower($boxes[$i]["unformatted"]) == "inbox") { $boxesnew[] = $boxes[$i]; @@ -260,33 +313,46 @@ } } + /* List special folders and their subfolders, if requested. */ if ($list_special_folders_first == true) { - - // Then list special folders and their subfolders + /* First list the trash folder. */ for ($i = 0 ; $i < count($boxes) ; $i++) { if ($move_to_trash && - eregi("^" . quotemeta($trash_folder) . "(" . - quotemeta($dm) . ".*)?$", $boxes[$i]["unformatted"])) { + eregi('^' . quotemeta($trash_folder) . '(' . + quotemeta($delimiter) . '.*)?$', $boxes[$i]['unformatted'])) { + $boxesnew[] = $boxes[$i]; + $used[$i] = true; + } + } + + /* Then list the sent folder. */ + for ($i = 0 ; $i < count($boxes) ; $i++) { + if ($move_to_sent && + eregi('^' . quotemeta($sent_folder) . '(' . + quotemeta($delimiter) . '.*)?$', $boxes[$i]['unformatted'])) { $boxesnew[] = $boxes[$i]; $used[$i] = true; } - elseif ($move_to_sent && - eregi("^" . quotemeta($sent_folder) . "(" . - quotemeta($dm) . ".*)?$", $boxes[$i]["unformatted"])) { + } + + /* Lastly, list the list the draft folder. */ + for ($i = 0 ; $i < count($boxes) ; $i++) { + if ($save_as_draft && + eregi('^' . quotemeta($draft_folder) . '(' . + quotemeta($delimiter) . '.*)?$', $boxes[$i]['unformatted'])) { $boxesnew[] = $boxes[$i]; $used[$i] = true; } } - // Put INBOX.* folders ahead of the rest + /* Put INBOX.* folders ahead of the rest. */ for ($i = 0; $i < count($boxes); $i++) { - if (eregi("^inbox\.", $boxes[$i]["unformatted"]) && + if (eregi('^inbox\\.', $boxes[$i]["unformatted"]) && (!isset($used[$i]) || $used[$i] == false)) { $boxesnew[] = $boxes[$i]; $used[$i] = true; } } - } // Rest of the folders @@ -306,62 +372,85 @@ ******************************************************************************/ function sqimap_mailbox_list_all ($imap_stream) { global $list_special_folders_first, $folder_prefix; - + global $delimiter; + if (!function_exists ("ary_sort")) - include ("../functions/array.php"); - - $dm = sqimap_get_delimiter ($imap_stream); + include_once('../functions/array.php'); - fputs ($imap_stream, "a001 LIST \"$folder_prefix\" *\r\n"); - $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message); + $ssid = sqimap_session_id(); + $lsid = strlen( $ssid ); + fputs ($imap_stream, $ssid . " LIST \"$folder_prefix\" *\r\n"); + $read_ary = sqimap_read_data ($imap_stream, $ssid, true, $response, $message); $g = 0; - $phase = "inbox"; + $phase = "inbox"; for ($i = 0; $i < count($read_ary); $i++) { - if (substr ($read_ary[$i], 0, 4) != "a001") { + // 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, $lsid) != $ssid ) { // Store the raw IMAP reply $boxes[$g]["raw"] = $read_ary[$i]; - // Count number of delimiters ($dm) in folder name + // Count number of delimiters ($delimiter) in folder name $mailbox = find_mailbox_name($read_ary[$i]); - $dm_count = countCharInString($mailbox, $dm); - if (substr($mailbox, -1) == $dm) + $dm_count = countCharInString($mailbox, $delimiter); + if (substr($mailbox, -1) == $delimiter) $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)) || - (ereg("^".$folder_prefix, $mailbox)) || + $parentfolder = readMailboxParent($mailbox, $delimiter); + if((eregi('^inbox'.quotemeta($delimiter), $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); + $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $delimiter); } else { $boxes[$g]["formatted"] = $mailbox; } $boxes[$g]["unformatted-dm"] = $mailbox; - if (substr($mailbox, -1) == $dm) + if (substr($mailbox, -1) == $delimiter) $mailbox = substr($mailbox, 0, strlen($mailbox) - 1); $boxes[$g]["unformatted"] = $mailbox; - $boxes[$g]["unformatted-disp"] = ereg_replace("^" . $folder_prefix, "", $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); + fputs ($imap_stream, sqimap_session_id() . " LIST \"\" \"$mailbox\"\r\n"); + $read_mlbx = sqimap_read_data ($imap_stream, sqimap_session_id(), 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++;