0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some code cleanups.

Browse source
This commit is contained in:
indiri69 2002-10-24 16:35:16 +00:00
parent e19fc25714
commit 0c68f83077
1 changed files with 257 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
functions/imap_mailbox.php
View file

@ -23,7 +23,7 @@ class mailboxes {
function addMbx($mbx, $delimiter, $start, $specialfirst) { function addMbx($mbx, $delimiter, $start, $specialfirst) {
$ary = explode($delimiter, $mbx->mailboxname_full); $ary = explode($delimiter, $mbx->mailboxname_full);
$mbx_parent = &$this; $mbx_parent = &$this;
for ($i=$start; $i < (count($ary) -1); $i++) { for ($i = $start, $c = count($ary)-1; $i < $c; $i++) {
$mbx_childs = &$mbx_parent->mbxs; $mbx_childs = &$mbx_parent->mbxs;
$found = false; $found = false;
if ($mbx_childs) { if ($mbx_childs) {
@ -46,13 +46,11 @@ class mailboxes {
$mbx_parent->mbxs[] = $no_select_mbx; $mbx_parent->mbxs[] = $no_select_mbx;
$i--; $i--;
} }
} }
$mbx_parent->mbxs[] = $mbx; $mbx_parent->mbxs[] = $mbx;
if ($mbx->is_special && $specialfirst) { if ($mbx->is_special && $specialfirst) {
usort($mbx_parent->mbxs, 'sortSpecialMbx'); usort($mbx_parent->mbxs, 'sortSpecialMbx');
} }
} }
} }
@ -94,7 +92,6 @@ function check_is_noselect ($lsub_line) {
* mailbox name (i.e. the mailbox's parent mailbox) * mailbox name (i.e. the mailbox's parent mailbox)
*/ */
function readMailboxParent($haystack, $needle) { function readMailboxParent($haystack, $needle) {
if ($needle == '') { if ($needle == '') {
$ret = ''; $ret = '';
} else { } else {
@ -197,7 +194,7 @@ function sqimap_mailbox_select ($imap_stream, $mailbox) {
$read = sqimap_run_command($imap_stream, "SELECT \"$mailbox\"", $read = sqimap_run_command($imap_stream, "SELECT \"$mailbox\"",
true, $response, $message); true, $response, $message);
$result = array(); $result = array();
for ($i=0; $i<count($read); $i++) { for ($i = 0, $cnt = count($read); $i < $cnt; $i++) {
if (preg_match('/^\*\s+OK\s\[(\w+)\s(\w+)\]/',$read[$i], $regs)) { if (preg_match('/^\*\s+OK\s\[(\w+)\s(\w+)\]/',$read[$i], $regs)) {
$result[strtoupper($regs[1])] = $regs[2]; $result[strtoupper($regs[1])] = $regs[2];
} else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) { } else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) {
@ -206,8 +203,7 @@ function sqimap_mailbox_select ($imap_stream, $mailbox) {
if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) { if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) {
$regs[1]=trim(preg_replace ( array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ; $regs[1]=trim(preg_replace ( array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ;
$result['PERMANENTFLAGS'] = $regs[1]; $result['PERMANENTFLAGS'] = $regs[1];
} } else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) {
else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) {
$regs[1]=trim(preg_replace ( array ("/\(/","/\)/") ,'', $regs[1])) ; $regs[1]=trim(preg_replace ( array ("/\(/","/\)/") ,'', $regs[1])) ;
$result['FLAGS'] = $regs[1]; $result['FLAGS'] = $regs[1];
} }
@ -326,17 +322,14 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
global $folder_prefix, $delimiter; global $folder_prefix, $delimiter;
/* Process each folder line */ /* Process each folder line */
for ($g=0; $g < count($line); $g++) { for ($g = 0, $cnt = count($line); $g < $cnt; $g++) {
/* Store the raw IMAP reply */ /* Store the raw IMAP reply */
if (isset($line[$g])) { if (isset($line[$g])) {
$boxesall[$g]["raw"] = $line[$g]; $boxesall[$g]["raw"] = $line[$g];
} } else {
else {
$boxesall[$g]["raw"] = ''; $boxesall[$g]["raw"] = '';
} }
/* Count number of delimiters ($delimiter) in folder name */ /* Count number of delimiters ($delimiter) in folder name */
$mailbox = trim($line_lsub[$g]); $mailbox = trim($line_lsub[$g]);
$dm_count = substr_count($mailbox, $delimiter); $dm_count = substr_count($mailbox, $delimiter);
@ -355,13 +348,11 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
$indent = $dm_count - (substr_count($folder_prefix, $delimiter)); $indent = $dm_count - (substr_count($folder_prefix, $delimiter));
if ($indent > 0) { if ($indent > 0) {
$boxesall[$g]['formatted'] = str_repeat('&nbsp;&nbsp;', $indent); $boxesall[$g]['formatted'] = str_repeat('&nbsp;&nbsp;', $indent);
} } else {
else {
$boxesall[$g]['formatted'] = ''; $boxesall[$g]['formatted'] = '';
} }
$boxesall[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter)); $boxesall[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
} } else {
else {
$boxesall[$g]['formatted'] = imap_utf7_decode_local($mailbox); $boxesall[$g]['formatted'] = imap_utf7_decode_local($mailbox);
} }
@ -385,7 +376,6 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
} }
} }
} }
return $boxesall; return $boxesall;
} }
@ -501,7 +491,6 @@ function sqimap_mailbox_list($imap_stream) {
global $default_folder_prefix; global $default_folder_prefix;
if (!isset($boxesnew)) { if (!isset($boxesnew)) {
global $data_dir, $username, $list_special_folders_first, global $data_dir, $username, $list_special_folders_first,
$folder_prefix, $trash_folder, $sent_folder, $draft_folder, $folder_prefix, $trash_folder, $sent_folder, $draft_folder,
$move_to_trash, $move_to_sent, $save_as_draft, $move_to_trash, $move_to_sent, $save_as_draft,
@ -515,8 +504,7 @@ function sqimap_mailbox_list($imap_stream) {
if ($noselect_fix_enable) { if ($noselect_fix_enable) {
$lsub_args = "LSUB \"$folder_prefix\" \"*%\""; $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
} } else {
else {
$lsub_args = "LSUB \"$folder_prefix\" \"*\""; $lsub_args = "LSUB \"$folder_prefix\" \"*\"";
} }
/* LSUB array */ /* LSUB array */
@ -530,7 +518,7 @@ function sqimap_mailbox_list($imap_stream) {
*/ */
$sorted_lsub_ary = array(); $sorted_lsub_ary = array();
for ($i=0;$i < count($lsub_ary); $i++) { for ($i = 0, $cnt = count($lsub_ary);$i < $cnt; $i++) {
/* /*
* Workaround for EIMS * Workaround for EIMS
* Doesn't work if the mailbox name is multiple lines * Doesn't work if the mailbox name is multiple lines
@ -548,7 +536,7 @@ function sqimap_mailbox_list($imap_stream) {
} }
} }
$new_ary = array(); $new_ary = array();
for ($i=0; $i < count($sorted_lsub_ary); $i++) { for ($i = 0, $cnt = count($sorted_lsub_ary); $i < $cnt; $i++) {
if (!in_array($sorted_lsub_ary[$i], $new_ary)) { if (!in_array($sorted_lsub_ary[$i], $new_ary)) {
$new_ary[] = $sorted_lsub_ary[$i]; $new_ary[] = $sorted_lsub_ary[$i];
} }
@ -559,8 +547,8 @@ function sqimap_mailbox_list($imap_stream) {
} }
$sorted_list_ary = $sorted_lsub_ary; $sorted_list_ary = $sorted_lsub_ary;
/* LIST array */ /* LIST array */
// $sorted_list_ary = array(); /* $sorted_list_ary = array();
// for ($i=0; $i < count($sorted_lsub_ary); $i++) { for ($i=0; $i < count($sorted_lsub_ary); $i++) {
if (false) { if (false) {
if (substr($sorted_lsub_ary[$i], -1) == $delimiter) { if (substr($sorted_lsub_ary[$i], -1) == $delimiter) {
$mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1); $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
@ -571,7 +559,9 @@ function sqimap_mailbox_list($imap_stream) {
$read = sqimap_run_command ($imap_stream, "LIST \"\" \"$mbx\"", $read = sqimap_run_command ($imap_stream, "LIST \"\" \"$mbx\"",
true, $response, $message); true, $response, $message);
*/
/* Another workaround for EIMS */ /* Another workaround for EIMS */
/*
if (isset($read[1]) && if (isset($read[1]) &&
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
$read[0], $regs)) { $read[0], $regs)) {
@ -594,12 +584,13 @@ function sqimap_mailbox_list($imap_stream) {
$inbox_in_list = true; $inbox_in_list = true;
} }
} }
// $inbox_in_list = true; */
/* $inbox_in_list = true; */
/* /*
* Just in case they're not subscribed to their inbox, * Just in case they're not subscribed to their inbox,
* we'll get it for them anyway * we'll get it for them anyway
*/ */
if (!$inbox_subscribed) {// || !$inbox_in_list) { if (!$inbox_subscribed) {/* || !$inbox_in_list) { */
$inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"", $inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"",
true, $response, $message); true, $response, $message);
/* Another workaround for EIMS */ /* Another workaround for EIMS */
@ -620,9 +611,10 @@ function sqimap_mailbox_list($imap_stream) {
$boxesnew = $used = array(); $boxesnew = $used = array();
/* Find INBOX */ /* Find INBOX */
foreach ( $boxesall as $k => $box ) { $cnt = count($boxesall);
if ( strtolower($box['unformatted']) == 'inbox') { for($k = 0; $k < $cnt; $k++) {
$boxesnew[] = $box; if (strtolower($boxesall[$k]['unformatted']) == 'inbox') {
$boxesnew[] = $boxesall[$k];
$used[$k] = true; $used[$k] = true;
} else { } else {
$used[$k] = false; $used[$k] = false;
@ -630,29 +622,30 @@ function sqimap_mailbox_list($imap_stream) {
} }
/* List special folders and their subfolders, if requested. */ /* List special folders and their subfolders, if requested. */
if ($list_special_folders_first) { if ($list_special_folders_first) {
foreach ( $boxesall as $k => $box ) { for($k = 0; $k < $cnt; $k++) {
if ( !$used[$k] && isSpecialMailbox( $box['unformatted'] ) ) { if (!$used[$k] && isSpecialMailbox($boxesall[$k]['unformatted'])) {
$boxesnew[] = $box; $boxesnew[] = $boxesall[$k];
$used[$k] = true; $used[$k] = true;
} }
$spec_sub = str_replace('&nbsp;', '', $box['formatted']); $spec_sub = str_replace('&nbsp;', '', $boxesall[$k]['formatted']);
$spec_sub = preg_replace("/(\*|\[|\]|\(|\)|\?|\+|\{|\}|\^|\\$)/", '\\\\'.'\\1', $spec_sub); $spec_sub = preg_replace("/(\*|\[|\]|\(|\)|\?|\+|\{|\}|\^|\\$)/", '\\\\'.'\\1', $spec_sub);
/* In case of problems with preg /* In case of problems with preg
here is a ereg version here is a ereg version
if (!$used[$k] && ereg("^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$", $box['unformatted']) ) { */ if (!$used[$k] && ereg("^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$", $box['unformatted']) ) {
*/
if (!$used[$k] && preg_match("?^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$?", $box['unformatted']) ) { $match = "?^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$?";
$boxesnew[] = $box; if (!$used[$k] && preg_match($match, $boxesall[$k]['unformatted']) ) {
$boxesnew[] = $boxesall[$k];
$used[$k] = true; $used[$k] = true;
} }
} }
} }
/* Rest of the folders */ /* Rest of the folders */
foreach ( $boxesall as $k => $box ) { for($k = 0; $k < $cnt; $k++) {
if (!$used[$k]) { if (!$used[$k]) {
$boxesnew[] = $box; $boxesnew[] = $boxesall[$k];
} }
} }
} }
@ -675,7 +668,7 @@ function sqimap_mailbox_list_all($imap_stream) {
$phase = 'inbox'; $phase = 'inbox';
$fld_pre_length = strlen($folder_prefix); $fld_pre_length = strlen($folder_prefix);
for ($i = 0; $i < count($read_ary); $i++) { for ($i = 0, $cnt = count($read_ary); $i < $cnt; $i++) {
/* Another workaround for EIMS */ /* Another workaround for EIMS */
if (isset($read_ary[$i + 1]) && if (isset($read_ary[$i + 1]) &&
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
@ -703,13 +696,11 @@ function sqimap_mailbox_list_all($imap_stream) {
( isset($boxesallbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { ( isset($boxesallbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
if ($dm_count) { if ($dm_count) {
$boxes[$g]['formatted'] = str_repeat('&nbsp;&nbsp;', $dm_count); $boxes[$g]['formatted'] = str_repeat('&nbsp;&nbsp;', $dm_count);
} } else {
else {
$boxes[$g]['formatted'] = ''; $boxes[$g]['formatted'] = '';
} }
$boxes[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter)); $boxes[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
} } else {
else {
$boxes[$g]['formatted'] = imap_utf7_decode_local($mailbox); $boxes[$g]['formatted'] = imap_utf7_decode_local($mailbox);
} }
@ -790,11 +781,13 @@ function sqimap_mailbox_tree($imap_stream) {
$lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . '"' . $regs[2]; $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . '"' . $regs[2];
} }
// if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) { /*
// $flag = $regs[1]; if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) {
// $mbx = trim($regs[3]); $flag = $regs[1];
// $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); $mbx = trim($regs[3]);
// } $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
}
*/
$mbx = find_mailbox_name($lsub_ary[$i]); $mbx = find_mailbox_name($lsub_ary[$i]);
$noselect = check_is_noselect($lsub_ary[$i]); $noselect = check_is_noselect($lsub_ary[$i]);
if (substr($mbx, -1) == $delimiter) { if (substr($mbx, -1) == $delimiter) {
@ -804,8 +797,8 @@ function sqimap_mailbox_tree($imap_stream) {
} }
array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR); array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
foreach ($sorted_lsub_ary as $mbx) { for($i = 0; $i < $cnt; $i++) {
if ($mbx['mbx'] == 'INBOX') { if ($sorted_lsub_ary[$i]['mbx'] == 'INBOX') {
$inbox_in_list = true; $inbox_in_list = true;
break; break;
} }
@ -832,36 +825,40 @@ function sqimap_mailbox_tree($imap_stream) {
if ($mbx == 'INBOX') { if ($mbx == 'INBOX') {
$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => ''); $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => '');
sqimap_subscribe($imap_stream, 'INBOX'); sqimap_subscribe($imap_stream, 'INBOX');
$cnt++;
} }
// if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) { /*
// $flag = $regs[1]; if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
// $mbx = trim($regs[3]); $flag = $regs[1];
// if (substr($mbx, -1) == $delimiter) { $mbx = trim($regs[3]);
// $mbx = substr($mbx, 0, strlen($mbx) - 1); if (substr($mbx, -1) == $delimiter) {
// } $mbx = substr($mbx, 0, strlen($mbx) - 1);
// $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); }
// } $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
}
*/
} }
$cnt = count($sorted_lsub_ary);
for ($i = 0 ; $i < $cnt; $i++) { for ($i = 0 ; $i < $cnt; $i++) {
$mbx = $sorted_lsub_ary[$i]['mbx']; $mbx = $sorted_lsub_ary[$i]['mbx'];
if (($unseen_notify == 2 && $mbx == 'INBOX') if (($unseen_notify == 2 && $mbx == 'INBOX') ||
|| $unseen_notify == 3 ($unseen_notify == 3) ||
|| ($move_to_trash && ($mbx == $trash_folder))) { ($move_to_trash && ($mbx == $trash_folder))) {
if($sorted_lsub_ary[$i]['noselect']) {
$sorted_lsub_ary[$i]['unseen'] = 0;
} else {
$sorted_lsub_ary[$i]['unseen'] = $sorted_lsub_ary[$i]['unseen'] =
$sorted_lsub_ary[$i]['noselect'] ? sqimap_unseen_messages($imap_stream, $mbx);
0 : sqimap_unseen_messages($imap_stream, $mbx);
if ($unseen_type == 2 || ($move_to_trash
&& ($mbx == $trash_folder) )) {
$sorted_lsub_ary[$i]['nummessages'] =
$sorted_lsub_ary[$i]['noselect'] ?
0 : sqimap_get_num_messages($imap_stream, $mbx);
} }
if ($mbx == $trash_folder) { if (($unseen_type == 2) ||
($move_to_trash && ($mbx == $trash_folder)) ||
($mbx == $trash_folder)) {
if($sorted_lsub_ary[$i]['noselect']) {
$sorted_lsub_ary[$i]['nummessages'] = 0;
} else {
$sorted_lsub_ary[$i]['nummessages'] = $sorted_lsub_ary[$i]['nummessages'] =
$sorted_lsub_ary[$i]['noselect'] ? sqimap_get_num_messages($imap_stream, $mbx);
0 : sqimap_get_num_messages($imap_stream, $mbx); }
} }
} }
} }
@ -893,7 +890,9 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
$start++; $start++;
} }
$mailboxes->mailboxname_sub = $mailboxes->mailboxname_full; $mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
} else $start = 0; } else {
$start = 0;
}
$cnt = count($mbx_ary); $cnt = count($mbx_ary);
for ($i=0; $i < $cnt; $i++) { for ($i=0; $i < $cnt; $i++) {
if ($mbx_ary[$i]['mbx'] !='' ) { if ($mbx_ary[$i]['mbx'] !='' ) {
@ -940,6 +939,4 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
return $mailboxes; return $mailboxes;
} }
?> ?>