|
|
@@ -15,65 +15,63 @@ require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
|
|
|
global $boxesnew;
|
|
|
|
|
|
class mailboxes {
|
|
|
- var $mailboxname_full = '', $mailboxname_sub= '', $is_noselect = false,
|
|
|
- $is_special = false, $is_root = false, $is_inbox = false, $is_sent = false,
|
|
|
- $is_trash = false, $is_draft = false, $mbxs = array(),
|
|
|
- $unseen = false, $total = false;
|
|
|
-
|
|
|
- function addMbx($mbx, $delimiter, $start, $specialfirst) {
|
|
|
- $ary = explode($delimiter, $mbx->mailboxname_full);
|
|
|
- $mbx_parent = &$this;
|
|
|
- for ($i=$start; $i < (count($ary) -1); $i++) {
|
|
|
- $mbx_childs = &$mbx_parent->mbxs;
|
|
|
- $found = false;
|
|
|
- if ($mbx_childs) {
|
|
|
- foreach ($mbx_childs as $key => $parent) {
|
|
|
- if ($parent->mailboxname_sub == $ary[$i]) {
|
|
|
- $mbx_parent = &$mbx_parent->mbxs[$key];
|
|
|
- $found = true;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if (!$found) {
|
|
|
- $no_select_mbx = new mailboxes();
|
|
|
- if (isset($mbx_parent->mailboxname_full) && $mbx_parent->mailboxname_full != '') {
|
|
|
- $no_select_mbx->mailboxname_full = $mbx_parent->mailboxname_full.$delimiter.$ary[$i];
|
|
|
- } else {
|
|
|
- $no_select_mbx->mailboxname_full = $ary[$i];
|
|
|
- }
|
|
|
- $no_select_mbx->mailboxname_sub = $ary[$i];
|
|
|
- $no_select_mbx->is_noselect = true;
|
|
|
- $mbx_parent->mbxs[] = $no_select_mbx;
|
|
|
- $i--;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- $mbx_parent->mbxs[] = $mbx;
|
|
|
- if ($mbx->is_special && $specialfirst) {
|
|
|
- usort($mbx_parent->mbxs, 'sortSpecialMbx');
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
+ var $mailboxname_full = '', $mailboxname_sub= '', $is_noselect = false,
|
|
|
+ $is_special = false, $is_root = false, $is_inbox = false, $is_sent = false,
|
|
|
+ $is_trash = false, $is_draft = false, $mbxs = array(),
|
|
|
+ $unseen = false, $total = false;
|
|
|
+
|
|
|
+ function addMbx($mbx, $delimiter, $start, $specialfirst) {
|
|
|
+ $ary = explode($delimiter, $mbx->mailboxname_full);
|
|
|
+ $mbx_parent = &$this;
|
|
|
+ for ($i = $start, $c = count($ary)-1; $i < $c; $i++) {
|
|
|
+ $mbx_childs = &$mbx_parent->mbxs;
|
|
|
+ $found = false;
|
|
|
+ if ($mbx_childs) {
|
|
|
+ foreach ($mbx_childs as $key => $parent) {
|
|
|
+ if ($parent->mailboxname_sub == $ary[$i]) {
|
|
|
+ $mbx_parent = &$mbx_parent->mbxs[$key];
|
|
|
+ $found = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!$found) {
|
|
|
+ $no_select_mbx = new mailboxes();
|
|
|
+ if (isset($mbx_parent->mailboxname_full) && $mbx_parent->mailboxname_full != '') {
|
|
|
+ $no_select_mbx->mailboxname_full = $mbx_parent->mailboxname_full.$delimiter.$ary[$i];
|
|
|
+ } else {
|
|
|
+ $no_select_mbx->mailboxname_full = $ary[$i];
|
|
|
+ }
|
|
|
+ $no_select_mbx->mailboxname_sub = $ary[$i];
|
|
|
+ $no_select_mbx->is_noselect = true;
|
|
|
+ $mbx_parent->mbxs[] = $no_select_mbx;
|
|
|
+ $i--;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $mbx_parent->mbxs[] = $mbx;
|
|
|
+ if ($mbx->is_special && $specialfirst) {
|
|
|
+ usort($mbx_parent->mbxs, 'sortSpecialMbx');
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
function sortSpecialMbx($a, $b) {
|
|
|
if ($a->is_inbox) {
|
|
|
- $acmp = '0'. $a->mailboxname_full;
|
|
|
+ $acmp = '0'. $a->mailboxname_full;
|
|
|
} else if ($a->is_special) {
|
|
|
- $acmp = '1'. $a->mailboxname_full;
|
|
|
+ $acmp = '1'. $a->mailboxname_full;
|
|
|
} else {
|
|
|
- $acmp = '2' . $a->mailboxname_full;
|
|
|
- }
|
|
|
+ $acmp = '2' . $a->mailboxname_full;
|
|
|
+ }
|
|
|
if ($b->is_inbox) {
|
|
|
- $bcmp = '0'. $b->mailboxname_full;
|
|
|
+ $bcmp = '0'. $b->mailboxname_full;
|
|
|
}else if ($b->is_special) {
|
|
|
- $bcmp = '1' . $b->mailboxname_full;
|
|
|
+ $bcmp = '1' . $b->mailboxname_full;
|
|
|
} else {
|
|
|
- $bcmp = '2' . $b->mailboxname_full;
|
|
|
+ $bcmp = '2' . $b->mailboxname_full;
|
|
|
}
|
|
|
if ($acmp == $bcmp) return 0;
|
|
|
- return ($acmp>$bcmp) ? 1: -1;
|
|
|
-}
|
|
|
+ return ($acmp > $bcmp) ? 1: -1;
|
|
|
+}
|
|
|
|
|
|
function find_mailbox_name ($mailbox) {
|
|
|
if (preg_match('/\*.+\"([^\r\n\"]*)\"[\s\r\n]*$/', $mailbox, $regs))
|
|
|
@@ -94,7 +92,6 @@ function check_is_noselect ($lsub_line) {
|
|
|
* mailbox name (i.e. the mailbox's parent mailbox)
|
|
|
*/
|
|
|
function readMailboxParent($haystack, $needle) {
|
|
|
-
|
|
|
if ($needle == '') {
|
|
|
$ret = '';
|
|
|
} else {
|
|
|
@@ -154,31 +151,31 @@ function isSpecialMailbox( $box ) {
|
|
|
function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true, $id='') {
|
|
|
global $uid_support;
|
|
|
if ($id) {
|
|
|
- if (is_array($id)) {
|
|
|
- $id = sqimap_message_list_squisher($id);
|
|
|
- }
|
|
|
- $id = ' '.$id;
|
|
|
- $uid = $uid_support;
|
|
|
+ if (is_array($id)) {
|
|
|
+ $id = sqimap_message_list_squisher($id);
|
|
|
+ }
|
|
|
+ $id = ' '.$id;
|
|
|
+ $uid = $uid_support;
|
|
|
} else {
|
|
|
- $uid = false;
|
|
|
+ $uid = false;
|
|
|
}
|
|
|
$read = sqimap_run_command($imap_stream, 'EXPUNGE'.$id, $handle_errors,
|
|
|
$response, $message, $uid);
|
|
|
$cnt = 0;
|
|
|
-
|
|
|
- if ( is_array( $read ) ) {
|
|
|
+
|
|
|
+ if (is_array($read)) {
|
|
|
foreach ($read as $r) {
|
|
|
- if (preg_match('/^\*\s[0-9]+\sEXPUNGE/AUi',$r,$regs)) {
|
|
|
- $cnt++;
|
|
|
- }
|
|
|
+ if (preg_match('/^\*\s[0-9]+\sEXPUNGE/AUi',$r,$regs)) {
|
|
|
+ $cnt++;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- return $cnt;
|
|
|
+ return $cnt;
|
|
|
}
|
|
|
|
|
|
/* Checks whether or not the specified mailbox exists */
|
|
|
function sqimap_mailbox_exists ($imap_stream, $mailbox) {
|
|
|
- if (! isset($mailbox)) {
|
|
|
+ if (!isset($mailbox)) {
|
|
|
return false;
|
|
|
}
|
|
|
$mbx = sqimap_run_command($imap_stream, "LIST \"\" \"$mailbox\"",
|
|
|
@@ -190,35 +187,34 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) {
|
|
|
function sqimap_mailbox_select ($imap_stream, $mailbox) {
|
|
|
global $auto_expunge;
|
|
|
|
|
|
- if ( $mailbox == 'None' ) {
|
|
|
+ if ($mailbox == 'None') {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
$read = sqimap_run_command($imap_stream, "SELECT \"$mailbox\"",
|
|
|
true, $response, $message);
|
|
|
$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)) {
|
|
|
- $result[strtoupper($regs[1])] = $regs[2];
|
|
|
- } else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) {
|
|
|
- $result[strtoupper($regs[2])] = $regs[1];
|
|
|
- } else {
|
|
|
- if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) {
|
|
|
- $regs[1]=trim(preg_replace ( array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ;
|
|
|
- $result['PERMANENTFLAGS'] = $regs[1];
|
|
|
- }
|
|
|
- else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) {
|
|
|
- $regs[1]=trim(preg_replace ( array ("/\(/","/\)/") ,'', $regs[1])) ;
|
|
|
- $result['FLAGS'] = $regs[1];
|
|
|
- }
|
|
|
- }
|
|
|
+ $result[strtoupper($regs[1])] = $regs[2];
|
|
|
+ } else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) {
|
|
|
+ $result[strtoupper($regs[2])] = $regs[1];
|
|
|
+ } else {
|
|
|
+ if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) {
|
|
|
+ $regs[1]=trim(preg_replace ( array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ;
|
|
|
+ $result['PERMANENTFLAGS'] = $regs[1];
|
|
|
+ } else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) {
|
|
|
+ $regs[1]=trim(preg_replace ( array ("/\(/","/\)/") ,'', $regs[1])) ;
|
|
|
+ $result['FLAGS'] = $regs[1];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (preg_match('/^\[(.+)\]/',$message, $regs)) {
|
|
|
- $result['RIGHTS']=$regs[1];
|
|
|
+ $result['RIGHTS']=$regs[1];
|
|
|
}
|
|
|
|
|
|
if ($auto_expunge) {
|
|
|
- $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b);
|
|
|
+ $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b);
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
@@ -229,7 +225,7 @@ function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
|
|
|
if (strtolower($type) == 'noselect') {
|
|
|
$mailbox .= $delimiter;
|
|
|
}
|
|
|
- $mailbox = imap_utf7_encode_local($mailbox);
|
|
|
+ $mailbox = imap_utf7_encode_local($mailbox);
|
|
|
$read_ary = sqimap_run_command($imap_stream, "CREATE \"$mailbox\"",
|
|
|
true, $response, $message);
|
|
|
sqimap_subscribe ($imap_stream, $mailbox);
|
|
|
@@ -291,8 +287,8 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
|
|
|
do_hook_function("rename_or_delete_folder",$args = array($old_name, 'rename', $new_name));
|
|
|
$l = strlen( $old_name ) + 1;
|
|
|
$p = 'unformatted';
|
|
|
- foreach ( $boxesall as $box ) {
|
|
|
- if ( substr( $box[$p], 0, $l ) == $old_name . $delimiter ) {
|
|
|
+ foreach ($boxesall as $box) {
|
|
|
+ if (substr($box[$p], 0, $l) == $old_name . $delimiter) {
|
|
|
$new_sub = $new_name . $delimiter . substr($box[$p], $l);
|
|
|
if ($imap_server_type == 'cyrus') {
|
|
|
$cmd = 'RENAME "' . quoteIMAP($box[$p]) . '" "' . quoteIMAP($new_sub) . '"';
|
|
|
@@ -326,20 +322,17 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
|
|
|
global $folder_prefix, $delimiter;
|
|
|
|
|
|
/* 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 */
|
|
|
if (isset($line[$g])) {
|
|
|
$boxesall[$g]["raw"] = $line[$g];
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
$boxesall[$g]["raw"] = '';
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/* Count number of delimiters ($delimiter) in folder name */
|
|
|
- $mailbox = trim($line_lsub[$g]);
|
|
|
- $dm_count = substr_count($mailbox, $delimiter);
|
|
|
+ $mailbox = trim($line_lsub[$g]);
|
|
|
+ $dm_count = substr_count($mailbox, $delimiter);
|
|
|
if (substr($mailbox, -1) == $delimiter) {
|
|
|
/* If name ends in delimiter, decrement count by one */
|
|
|
$dm_count--;
|
|
|
@@ -350,18 +343,16 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
|
|
|
$parentfolder = readMailboxParent($mailbox, $delimiter);
|
|
|
if ( (strtolower(substr($mailbox, 0, 5)) == "inbox") ||
|
|
|
(substr($mailbox, 0, strlen($folder_prefix)) == $folder_prefix) ||
|
|
|
- ( isset($boxesallbyname[$parentfolder]) &&
|
|
|
- (strlen($parentfolder) > 0) ) ) {
|
|
|
- $indent = $dm_count - ( substr_count($folder_prefix, $delimiter));
|
|
|
+ (isset($boxesallbyname[$parentfolder]) &&
|
|
|
+ (strlen($parentfolder) > 0) ) ) {
|
|
|
+ $indent = $dm_count - (substr_count($folder_prefix, $delimiter));
|
|
|
if ($indent > 0) {
|
|
|
- $boxesall[$g]['formatted'] = str_repeat(' ', $indent);
|
|
|
- }
|
|
|
- else {
|
|
|
+ $boxesall[$g]['formatted'] = str_repeat(' ', $indent);
|
|
|
+ } else {
|
|
|
$boxesall[$g]['formatted'] = '';
|
|
|
}
|
|
|
$boxesall[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
$boxesall[$g]['formatted'] = imap_utf7_decode_local($mailbox);
|
|
|
}
|
|
|
|
|
|
@@ -385,7 +376,6 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
return $boxesall;
|
|
|
}
|
|
|
|
|
|
@@ -413,7 +403,7 @@ function user_strcasecmp($a, $b) {
|
|
|
$delimiter_length = strlen($delimiter);
|
|
|
|
|
|
/* Set the initial result value. */
|
|
|
- $result = 0;
|
|
|
+ $result = 0;
|
|
|
/* Check the strings... */
|
|
|
for ($c = 0; $c < $min_length; ++$c) {
|
|
|
$a_del = substr($a, $c, $delimiter_length);
|
|
|
@@ -462,16 +452,16 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk
|
|
|
$mbox_options = '';
|
|
|
|
|
|
$shorten_box_names = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_OFF);
|
|
|
-
|
|
|
- if ( $boxes == 0 ) {
|
|
|
+
|
|
|
+ if ($boxes == 0) {
|
|
|
$boxes = sqimap_mailbox_list($imap_stream);
|
|
|
- }
|
|
|
+ }
|
|
|
foreach ($boxes as $boxes_part) {
|
|
|
if (!in_array('noselect', $boxes_part['flags'])) {
|
|
|
$box = $boxes_part['unformatted'];
|
|
|
$lowerbox = strtolower($box);
|
|
|
|
|
|
- if ( $folder_skip != 0 && in_array($lowerbox, $folder_skip) ) {
|
|
|
+ if ($folder_skip != 0 && in_array($lowerbox, $folder_skip) ) {
|
|
|
continue;
|
|
|
}
|
|
|
if ($lowerbox == 'inbox'){
|
|
|
@@ -500,8 +490,7 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk
|
|
|
function sqimap_mailbox_list($imap_stream) {
|
|
|
global $default_folder_prefix;
|
|
|
|
|
|
- if ( !isset( $boxesnew ) ) {
|
|
|
-
|
|
|
+ if (!isset($boxesnew)) {
|
|
|
global $data_dir, $username, $list_special_folders_first,
|
|
|
$folder_prefix, $trash_folder, $sent_folder, $draft_folder,
|
|
|
$move_to_trash, $move_to_sent, $save_as_draft,
|
|
|
@@ -513,12 +502,11 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
require_once(SM_PATH . 'include/load_prefs.php');
|
|
|
require_once(SM_PATH . 'functions/array.php');
|
|
|
|
|
|
- if ($noselect_fix_enable) {
|
|
|
- $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
|
|
|
- }
|
|
|
- else {
|
|
|
- $lsub_args = "LSUB \"$folder_prefix\" \"*\"";
|
|
|
- }
|
|
|
+ if ($noselect_fix_enable) {
|
|
|
+ $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
|
|
|
+ } else {
|
|
|
+ $lsub_args = "LSUB \"$folder_prefix\" \"*\"";
|
|
|
+ }
|
|
|
/* LSUB array */
|
|
|
$lsub_ary = sqimap_run_command ($imap_stream, $lsub_args,
|
|
|
true, $response, $message);
|
|
|
@@ -530,7 +518,7 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
*/
|
|
|
|
|
|
$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
|
|
|
* Doesn't work if the mailbox name is multiple lines
|
|
|
@@ -538,7 +526,7 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
if (isset($lsub_ary[$i + 1]) &&
|
|
|
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
|
|
|
$lsub_ary[$i], $regs)) {
|
|
|
- $i ++;
|
|
|
+ $i++;
|
|
|
$lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . '"' . $regs[2];
|
|
|
}
|
|
|
$temp_mailbox_name = find_mailbox_name($lsub_ary[$i]);
|
|
|
@@ -548,7 +536,7 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
}
|
|
|
}
|
|
|
$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)) {
|
|
|
$new_ary[] = $sorted_lsub_ary[$i];
|
|
|
}
|
|
|
@@ -557,10 +545,10 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
if (isset($sorted_lsub_ary)) {
|
|
|
usort($sorted_lsub_ary, 'user_strcasecmp');
|
|
|
}
|
|
|
- $sorted_list_ary = $sorted_lsub_ary;
|
|
|
+ $sorted_list_ary = $sorted_lsub_ary;
|
|
|
/* LIST array */
|
|
|
-// $sorted_list_ary = array();
|
|
|
-// for ($i=0; $i < count($sorted_lsub_ary); $i++) {
|
|
|
+/* $sorted_list_ary = array();
|
|
|
+ for ($i=0; $i < count($sorted_lsub_ary); $i++) {
|
|
|
if (false) {
|
|
|
if (substr($sorted_lsub_ary[$i], -1) == $delimiter) {
|
|
|
$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\"",
|
|
|
true, $response, $message);
|
|
|
+*/
|
|
|
/* Another workaround for EIMS */
|
|
|
+/*
|
|
|
if (isset($read[1]) &&
|
|
|
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
|
|
|
$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; */
|
|
|
/*
|
|
|
* Just in case they're not subscribed to their inbox,
|
|
|
* 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\"",
|
|
|
true, $response, $message);
|
|
|
/* Another workaround for EIMS */
|
|
|
@@ -607,7 +598,7 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
|
|
|
$inbox_ary[0], $regs)) {
|
|
|
$inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
|
|
|
- '"' . $regs[2];
|
|
|
+ '"' . $regs[2];
|
|
|
}
|
|
|
|
|
|
$sorted_list_ary[] = $inbox_ary[0];
|
|
|
@@ -620,9 +611,10 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
$boxesnew = $used = array();
|
|
|
|
|
|
/* Find INBOX */
|
|
|
- foreach ( $boxesall as $k => $box ) {
|
|
|
- if ( strtolower($box['unformatted']) == 'inbox') {
|
|
|
- $boxesnew[] = $box;
|
|
|
+ $cnt = count($boxesall);
|
|
|
+ for($k = 0; $k < $cnt; $k++) {
|
|
|
+ if (strtolower($boxesall[$k]['unformatted']) == 'inbox') {
|
|
|
+ $boxesnew[] = $boxesall[$k];
|
|
|
$used[$k] = true;
|
|
|
} else {
|
|
|
$used[$k] = false;
|
|
|
@@ -630,29 +622,30 @@ function sqimap_mailbox_list($imap_stream) {
|
|
|
}
|
|
|
/* List special folders and their subfolders, if requested. */
|
|
|
if ($list_special_folders_first) {
|
|
|
- foreach ( $boxesall as $k => $box ) {
|
|
|
- if ( !$used[$k] && isSpecialMailbox( $box['unformatted'] ) ) {
|
|
|
- $boxesnew[] = $box;
|
|
|
- $used[$k] = true;
|
|
|
+ for($k = 0; $k < $cnt; $k++) {
|
|
|
+ if (!$used[$k] && isSpecialMailbox($boxesall[$k]['unformatted'])) {
|
|
|
+ $boxesnew[] = $boxesall[$k];
|
|
|
+ $used[$k] = true;
|
|
|
}
|
|
|
- $spec_sub = str_replace(' ', '', $box['formatted']);
|
|
|
+ $spec_sub = str_replace(' ', '', $boxesall[$k]['formatted']);
|
|
|
$spec_sub = preg_replace("/(\*|\[|\]|\(|\)|\?|\+|\{|\}|\^|\\$)/", '\\\\'.'\\1', $spec_sub);
|
|
|
|
|
|
- /* In case of problems with preg
|
|
|
- here is a ereg version
|
|
|
- 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']) ) {
|
|
|
- $boxesnew[] = $box;
|
|
|
- $used[$k] = true;
|
|
|
+ /* In case of problems with preg
|
|
|
+ here is a ereg version
|
|
|
+ if (!$used[$k] && ereg("^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$", $box['unformatted']) ) {
|
|
|
+ */
|
|
|
+ $match = "?^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$?";
|
|
|
+ if (!$used[$k] && preg_match($match, $boxesall[$k]['unformatted']) ) {
|
|
|
+ $boxesnew[] = $boxesall[$k];
|
|
|
+ $used[$k] = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
/* Rest of the folders */
|
|
|
- foreach ( $boxesall as $k => $box ) {
|
|
|
- if ( !$used[$k] ) {
|
|
|
- $boxesnew[] = $box;
|
|
|
+ for($k = 0; $k < $cnt; $k++) {
|
|
|
+ if (!$used[$k]) {
|
|
|
+ $boxesnew[] = $boxesall[$k];
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -675,7 +668,7 @@ function sqimap_mailbox_list_all($imap_stream) {
|
|
|
$phase = 'inbox';
|
|
|
$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 */
|
|
|
if (isset($read_ary[$i + 1]) &&
|
|
|
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) ) ) {
|
|
|
if ($dm_count) {
|
|
|
$boxes[$g]['formatted'] = str_repeat(' ', $dm_count);
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
$boxes[$g]['formatted'] = '';
|
|
|
}
|
|
|
$boxes[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
$boxes[$g]['formatted'] = imap_utf7_decode_local($mailbox);
|
|
|
}
|
|
|
|
|
|
@@ -723,7 +714,7 @@ function sqimap_mailbox_list_all($imap_stream) {
|
|
|
$boxes[$g]['id'] = $g;
|
|
|
|
|
|
/* Now lets get the flags for this mailbox */
|
|
|
- $read_mlbx = $read_ary[$i];
|
|
|
+ $read_mlbx = $read_ary[$i];
|
|
|
|
|
|
// $read_mlbx = sqimap_run_command ($imap_stream, "LIST \"\" \"$mailbox\"",
|
|
|
// true, $response, $message);
|
|
|
@@ -733,7 +724,7 @@ function sqimap_mailbox_list_all($imap_stream) {
|
|
|
// ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$", $read_mlbx[0], $regs)) {
|
|
|
// $read_mlbx[0] = $regs[1] . '"' . addslashes(trim($read_mlbx[1])) . '"' . $regs[2];
|
|
|
// }
|
|
|
-// echo $read_mlbx[0] .' raw 2 <br>';
|
|
|
+// echo $read_mlbx[0] .' raw 2 <br>';
|
|
|
|
|
|
$flags = substr($read_mlbx, strpos($read_mlbx, '(')+1);
|
|
|
$flags = substr($flags, 0, strpos($flags, ')'));
|
|
|
@@ -756,7 +747,7 @@ function sqimap_mailbox_list_all($imap_stream) {
|
|
|
|
|
|
function sqimap_mailbox_tree($imap_stream) {
|
|
|
global $boxesnew, $default_folder_prefix, $unseen_notify, $unseen_type;
|
|
|
- if ( !isset( $boxesnew ) ) {
|
|
|
+ if (!isset($boxesnew)) {
|
|
|
|
|
|
global $data_dir, $username, $list_special_folders_first,
|
|
|
$folder_prefix, $delimiter, $trash_folder, $move_to_trash;
|
|
|
@@ -778,7 +769,7 @@ function sqimap_mailbox_tree($imap_stream) {
|
|
|
*/
|
|
|
$sorted_lsub_ary = array();
|
|
|
$cnt = count($lsub_ary);
|
|
|
- for ($i=0;$i < $cnt; $i++) {
|
|
|
+ for ($i = 0; $i < $cnt; $i++) {
|
|
|
/*
|
|
|
* Workaround for EIMS
|
|
|
* Doesn't work if the mailbox name is multiple lines
|
|
|
@@ -786,30 +777,32 @@ function sqimap_mailbox_tree($imap_stream) {
|
|
|
if (isset($lsub_ary[$i + 1]) &&
|
|
|
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
|
|
|
$lsub_ary[$i], $regs)) {
|
|
|
- $i ++;
|
|
|
+ $i++;
|
|
|
$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];
|
|
|
-// $mbx = trim($regs[3]);
|
|
|
-// $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
|
|
|
-// }
|
|
|
- $mbx = find_mailbox_name($lsub_ary[$i]);
|
|
|
- $noselect = check_is_noselect($lsub_ary[$i]);
|
|
|
- if (substr($mbx, -1) == $delimiter) {
|
|
|
- $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
- }
|
|
|
- $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect);
|
|
|
+ /*
|
|
|
+ if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) {
|
|
|
+ $flag = $regs[1];
|
|
|
+ $mbx = trim($regs[3]);
|
|
|
+ $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
|
|
|
+ }
|
|
|
+ */
|
|
|
+ $mbx = find_mailbox_name($lsub_ary[$i]);
|
|
|
+ $noselect = check_is_noselect($lsub_ary[$i]);
|
|
|
+ if (substr($mbx, -1) == $delimiter) {
|
|
|
+ $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
+ }
|
|
|
+ $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect);
|
|
|
}
|
|
|
- array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
|
|
|
+ array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
|
|
|
|
|
|
- foreach ($sorted_lsub_ary as $mbx) {
|
|
|
- if ($mbx['mbx'] == 'INBOX') {
|
|
|
+ for($i = 0; $i < $cnt; $i++) {
|
|
|
+ if ($sorted_lsub_ary[$i]['mbx'] == 'INBOX') {
|
|
|
$inbox_in_list = true;
|
|
|
- break;
|
|
|
+ break;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
* Just in case they're not subscribed to their inbox,
|
|
|
@@ -823,50 +816,54 @@ function sqimap_mailbox_tree($imap_stream) {
|
|
|
ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
|
|
|
$inbox_ary[0], $regs)) {
|
|
|
$inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
|
|
|
- '"' . $regs[2];
|
|
|
- }
|
|
|
- $mbx = find_mailbox_name($inbox_ary[0]);
|
|
|
- if (substr($mbx, -1) == $delimiter) {
|
|
|
- $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
- }
|
|
|
- if ( $mbx == 'INBOX') {
|
|
|
- $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => '');
|
|
|
- sqimap_subscribe($imap_stream, 'INBOX');
|
|
|
- }
|
|
|
-
|
|
|
-// if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
|
|
|
-// $flag = $regs[1];
|
|
|
-// $mbx = trim($regs[3]);
|
|
|
-// if (substr($mbx, -1) == $delimiter) {
|
|
|
-// $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
-// }
|
|
|
-// $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
|
|
|
-// }
|
|
|
- }
|
|
|
- $cnt = count($sorted_lsub_ary);
|
|
|
- for ($i=0 ; $i < $cnt; $i++) {
|
|
|
- $mbx = $sorted_lsub_ary[$i]['mbx'];
|
|
|
- if (($unseen_notify == 2 && $mbx == 'INBOX')
|
|
|
- || $unseen_notify == 3
|
|
|
- || ($move_to_trash && ($mbx == $trash_folder))) {
|
|
|
- $sorted_lsub_ary[$i]['unseen'] =
|
|
|
- $sorted_lsub_ary[$i]['noselect'] ?
|
|
|
- 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) {
|
|
|
- $sorted_lsub_ary[$i]['nummessages'] =
|
|
|
- $sorted_lsub_ary[$i]['noselect'] ?
|
|
|
- 0 : sqimap_get_num_messages($imap_stream, $mbx);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- $boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary);
|
|
|
- return $boxesnew;
|
|
|
+ '"' . $regs[2];
|
|
|
+ }
|
|
|
+ $mbx = find_mailbox_name($inbox_ary[0]);
|
|
|
+ if (substr($mbx, -1) == $delimiter) {
|
|
|
+ $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
+ }
|
|
|
+ if ($mbx == 'INBOX') {
|
|
|
+ $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => '');
|
|
|
+ sqimap_subscribe($imap_stream, 'INBOX');
|
|
|
+ $cnt++;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
|
|
|
+ $flag = $regs[1];
|
|
|
+ $mbx = trim($regs[3]);
|
|
|
+ if (substr($mbx, -1) == $delimiter) {
|
|
|
+ $mbx = substr($mbx, 0, strlen($mbx) - 1);
|
|
|
+ }
|
|
|
+ $sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag);
|
|
|
+ }
|
|
|
+ */
|
|
|
+ }
|
|
|
+ for ($i = 0 ; $i < $cnt; $i++) {
|
|
|
+ $mbx = $sorted_lsub_ary[$i]['mbx'];
|
|
|
+ if (($unseen_notify == 2 && $mbx == 'INBOX') ||
|
|
|
+ ($unseen_notify == 3) ||
|
|
|
+ ($move_to_trash && ($mbx == $trash_folder))) {
|
|
|
+ if($sorted_lsub_ary[$i]['noselect']) {
|
|
|
+ $sorted_lsub_ary[$i]['unseen'] = 0;
|
|
|
+ } else {
|
|
|
+ $sorted_lsub_ary[$i]['unseen'] =
|
|
|
+ sqimap_unseen_messages($imap_stream, $mbx);
|
|
|
+ }
|
|
|
+ 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'] =
|
|
|
+ sqimap_get_num_messages($imap_stream, $mbx);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary);
|
|
|
+ return $boxesnew;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -878,68 +875,68 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
|
|
|
$delimiter;
|
|
|
|
|
|
$special_folders = array ('INBOX', $sent_folder, $draft_folder, $trash_folder);
|
|
|
-
|
|
|
+
|
|
|
/* create virtual root node */
|
|
|
$mailboxes= new mailboxes();
|
|
|
$mailboxes->is_root = true;
|
|
|
- $trail_del = false;
|
|
|
+ $trail_del = false;
|
|
|
if (isset($folder_prefix) && $folder_prefix != '') {
|
|
|
- $start = substr_count($folder_prefix,$delimiter);
|
|
|
- if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {
|
|
|
- $trail_del = true;
|
|
|
- $mailboxes->mailboxname_full = substr($folder_prefix,0, (strlen($folder_prefix)-1));
|
|
|
- } else {
|
|
|
- $mailboxes->mailboxname_full = $folder_prefix;
|
|
|
- $start++;
|
|
|
- }
|
|
|
- $mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
|
|
|
- } else $start = 0;
|
|
|
+ $start = substr_count($folder_prefix,$delimiter);
|
|
|
+ if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {
|
|
|
+ $trail_del = true;
|
|
|
+ $mailboxes->mailboxname_full = substr($folder_prefix,0, (strlen($folder_prefix)-1));
|
|
|
+ } else {
|
|
|
+ $mailboxes->mailboxname_full = $folder_prefix;
|
|
|
+ $start++;
|
|
|
+ }
|
|
|
+ $mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
|
|
|
+ } else {
|
|
|
+ $start = 0;
|
|
|
+ }
|
|
|
$cnt = count($mbx_ary);
|
|
|
for ($i=0; $i < $cnt; $i++) {
|
|
|
- if ($mbx_ary[$i]['mbx'] !='' ) {
|
|
|
- $mbx = new mailboxes();
|
|
|
- $mailbox = $mbx_ary[$i]['mbx'];
|
|
|
- switch ($mailbox) {
|
|
|
- case 'INBOX':
|
|
|
- $mbx->is_inbox = true;
|
|
|
- $mbx->is_special = true;
|
|
|
- break;
|
|
|
- case $trash_folder:
|
|
|
- $mbx->is_trash = true;
|
|
|
- $mbx->is_special = true;
|
|
|
- break;
|
|
|
- case $sent_folder:
|
|
|
- $mbx->is_sent = true;
|
|
|
- $mbx->is_special = true;
|
|
|
- break;
|
|
|
- case $draft_folder:
|
|
|
- $mbx->is_draft = true;
|
|
|
- $mbx->is_special = true;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (isset($mbx_ary[$i]['unseen'])) {
|
|
|
- $mbx->unseen = $mbx_ary[$i]['unseen'];
|
|
|
- }
|
|
|
- if (isset($mbx_ary[$i]['nummessages'])) {
|
|
|
- $mbx->total = $mbx_ary[$i]['nummessages'];
|
|
|
- }
|
|
|
-
|
|
|
- $mbx->is_noselect = $mbx_ary[$i]['noselect'];
|
|
|
-
|
|
|
+ if ($mbx_ary[$i]['mbx'] !='' ) {
|
|
|
+ $mbx = new mailboxes();
|
|
|
+ $mailbox = $mbx_ary[$i]['mbx'];
|
|
|
+ switch ($mailbox) {
|
|
|
+ case 'INBOX':
|
|
|
+ $mbx->is_inbox = true;
|
|
|
+ $mbx->is_special = true;
|
|
|
+ break;
|
|
|
+ case $trash_folder:
|
|
|
+ $mbx->is_trash = true;
|
|
|
+ $mbx->is_special = true;
|
|
|
+ break;
|
|
|
+ case $sent_folder:
|
|
|
+ $mbx->is_sent = true;
|
|
|
+ $mbx->is_special = true;
|
|
|
+ break;
|
|
|
+ case $draft_folder:
|
|
|
+ $mbx->is_draft = true;
|
|
|
+ $mbx->is_special = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isset($mbx_ary[$i]['unseen'])) {
|
|
|
+ $mbx->unseen = $mbx_ary[$i]['unseen'];
|
|
|
+ }
|
|
|
+ if (isset($mbx_ary[$i]['nummessages'])) {
|
|
|
+ $mbx->total = $mbx_ary[$i]['nummessages'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $mbx->is_noselect = $mbx_ary[$i]['noselect'];
|
|
|
+
|
|
|
$r_del_pos = strrpos($mbx_ary[$i]['mbx'], $delimiter);
|
|
|
- if ($r_del_pos) {
|
|
|
- $mbx->mailboxname_sub = substr($mbx_ary[$i]['mbx'],$r_del_pos+1);
|
|
|
- } else { /* mailbox is root folder */
|
|
|
- $mbx->mailboxname_sub = $mbx_ary[$i]['mbx'];
|
|
|
- }
|
|
|
- $mbx->mailboxname_full = $mbx_ary[$i]['mbx'];
|
|
|
- $mailboxes->addMbx($mbx, $delimiter, $start, $list_special_folders_first);
|
|
|
- }
|
|
|
+ if ($r_del_pos) {
|
|
|
+ $mbx->mailboxname_sub = substr($mbx_ary[$i]['mbx'],$r_del_pos+1);
|
|
|
+ } else { /* mailbox is root folder */
|
|
|
+ $mbx->mailboxname_sub = $mbx_ary[$i]['mbx'];
|
|
|
+ }
|
|
|
+ $mbx->mailboxname_full = $mbx_ary[$i]['mbx'];
|
|
|
+ $mailboxes->addMbx($mbx, $delimiter, $start, $list_special_folders_first);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return $mailboxes;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
?>
|
indiri69