X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=e2198947a7629fdfa923d45494c76eec7f4c194c;hp=1a95765661b09163b2f146281c73432339d0a4ec;hb=c075fcfeee6685e97ac75f7400f267ddaa7c3e28;hpb=6c4f0fa1bbe82e49f8ebccbb9e69978acce3b9c3 diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 1a957656..e2198947 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -1,32 +1,38 @@ mailboxname_full; } - if ($acmp == $bcmp) return 0; - return ($acmp > $bcmp) ? 1: -1; + return strnatcasecmp($acmp, $bcmp); } function compact_mailboxes_response($ary) { /* * Workaround for mailboxes returned as literal - * FIXME : Doesn't work if the mailbox name is multiple lines + * FIXME : Doesn't work if the mailbox name is multiple lines * (larger then fgets buffer) */ for ($i = 0, $iCnt=count($ary); $i < $iCnt; $i++) { @@ -103,20 +108,11 @@ function compact_mailboxes_response($ary) return array_values(array_unique($ary)); } -/* -function find_mailbox_name ($mailbox) { - if (preg_match('/\*.+\"([^\r\n\"]*)\"[\s\r\n]*$/', $mailbox, $regs)) - return $regs[1]; - if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs)) - return $regs[1]; - ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs); - return $regs[1]; -} -*/ - -// Extract the mailbox name from an untagged LIST (7.2.2) or LSUB (7.2.3) answer -// * (LIST|LSUB) () (NIL|"") \r\n -// mailbox name in quoted string MUST be unquoted and stripslashed (sm API) +/** + * Extract the mailbox name from an untagged LIST (7.2.2) or LSUB (7.2.3) answer + * (LIST|LSUB) () (NIL|"") \r\n + * mailbox name in quoted string MUST be unquoted and stripslashed (sm API) + */ function find_mailbox_name($line) { if (preg_match('/^\* (?:LIST|LSUB) \([^\)]*\) (?:NIL|\"[^\"]*\") ([^\r\n]*)[\r\n]*$/i', $line, $regs)) { @@ -127,10 +123,16 @@ function find_mailbox_name($line) return ''; } +/** + * @return bool whether this is a Noselect mailbox. + */ function check_is_noselect ($lsub_line) { return preg_match("/^\* (LSUB|LIST) \([^\)]*\\\\Noselect[^\)]*\)/i", $lsub_line); } +/** + * @return bool whether this is a Noinferiors mailbox. + */ function check_is_noinferiors ($lsub_line) { return preg_match("/^\* (LSUB|LIST) \([^\)]*\\\\Noinferiors[^\)]*\)/i", $lsub_line); } @@ -154,13 +156,13 @@ function readMailboxParent($haystack, $needle) { return( $ret ); } -/** +/** * Check if $subbox is below the specified $parentbox */ function isBoxBelow( $subbox, $parentbox ) { global $delimiter; - /* - * Eliminate the obvious mismatch, where the + /* + * Eliminate the obvious mismatch, where the * subfolder path is shorter than that of the potential parent */ if ( strlen($subbox) < strlen($parentbox) ) { @@ -177,44 +179,57 @@ function isBoxBelow( $subbox, $parentbox ) { } } -/* Defines special mailboxes */ +/** + * Defines special mailboxes: given a mailbox name, it checks if this is a + * "special" one: INBOX, Trash, Sent or Draft. + */ function isSpecialMailbox( $box ) { $ret = ( (strtolower($box) == 'inbox') || isTrashMailbox($box) || isSentMailbox($box) || isDraftMailbox($box) ); if ( !$ret ) { - $ret = do_hook_function( 'special_mailbox', $box ); + $ret = boolean_hook_function('special_mailbox',$box,1); } return $ret; } +/** + * @return bool whether this is a Trash folder + */ function isTrashMailbox ($box) { global $trash_folder, $move_to_trash; return $move_to_trash && $trash_folder && ( $box == $trash_folder || isBoxBelow($box, $trash_folder) ); } +/** + * @return bool whether this is a Sent folder + */ function isSentMailbox($box) { global $sent_folder, $move_to_sent; return $move_to_sent && $sent_folder && ( $box == $sent_folder || isBoxBelow($box, $sent_folder) ); } +/** + * @return bool whether this is a Draft folder + */ function isDraftMailbox($box) { global $draft_folder, $save_as_draft; return $save_as_draft && ( $box == $draft_folder || isBoxBelow($box, $draft_folder) ); } -/* Expunges a mailbox */ +/** + * Expunges a mailbox, ie. delete all contents. + */ 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; + $uid = TRUE; } else { $uid = false; } @@ -232,7 +247,47 @@ function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true, return $cnt; } -/* Checks whether or not the specified mailbox exists */ + +/** + * Expunge specified message + * + * We'll use this wrapper function to + * remove the message with the matching UID .. the order + * won't be changed - the array element for the message + * will just be removed. + */ + +function sqimap_mailbox_expunge_dmn($imapConnection, &$aMailbox, $message_id) { + $cnt = 0; + + if ($aMailbox['AUTO_EXPUNGE']) { + $cnt = sqimap_mailbox_expunge($imapConnection, $aMailbox['NAME'], true); + } else { + return $cnt; + } + $error = ''; + $message_id = (int) $message_id; // we use strickt array_search + if (is_array($aMailbox['UIDSET'])) { + $key = array_search($message_id,$aMailbox['UIDSET'],true); + if ($key !== false && !is_null($key)) { + unset($aMailbox['UIDSET'][$key]); + $aMailbox['UIDSET'] = array_values($aMailbox['UIDSET']); + // adapt the exists count to avoid triggering of a new sort + $aMailbox['EXISTS'] -= 1; + } else { + $aMailbox['UIDSET'] = get_sorted_msgs_list($imapConnection,$aMailbox,$error); + } + } else { + $aMailbox['UIDSET'] = get_sorted_msgs_list($imapConnection,$aMailbox,$error); + } + sqsession_register($aMailbox,'aLastSelectedMailbox'); + sqsession_register($aMailbox['UIDSET'],'server_sort_array'); //fix me, use aMailbox instead + return $cnt; +} + +/** + * Checks whether or not the specified mailbox exists + */ function sqimap_mailbox_exists ($imap_stream, $mailbox) { if (!isset($mailbox) || empty($mailbox)) { return false; @@ -242,10 +297,10 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) { return isset($mbx[0]); } -/* Selects a mailbox */ +/** + * Selects a mailbox + */ function sqimap_mailbox_select ($imap_stream, $mailbox) { - global $auto_expunge; - if ($mailbox == 'None') { return; } @@ -261,58 +316,77 @@ function sqimap_mailbox_select ($imap_stream, $mailbox) { } else { if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) { $regs[1]=trim(preg_replace ( array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ; - $result['PERMANENTFLAGS'] = $regs[1]; + $result['PERMANENTFLAGS'] = explode(' ',strtolower($regs[1])); } else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) { $regs[1]=trim(preg_replace ( array ("/\(/","/\)/") ,'', $regs[1])) ; - $result['FLAGS'] = $regs[1]; + $result['FLAGS'] = explode(' ',strtolower($regs[1])); } } } + if (!isset($result['PERMANENTFLAGS'])) { + $result['PERMANENTFLAGS'] = $result['FLAGS']; + } if (preg_match('/^\[(.+)\]/',$message, $regs)) { - $result['RIGHTS']=$regs[1]; + $result['RIGHTS']=strtoupper($regs[1]); } - if ($auto_expunge) { - $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b); - } return $result; } -/* Creates a folder */ +/** + * Creates a folder. + */ function sqimap_mailbox_create ($imap_stream, $mailbox, $type) { global $delimiter; if (strtolower($type) == 'noselect') { $mailbox .= $delimiter; } - $read_ary = sqimap_run_command($imap_stream, 'CREATE ' . sqimap_encode_mailbox_name($mailbox), + $read_ary = sqimap_run_command($imap_stream, 'CREATE ' . + sqimap_encode_mailbox_name($mailbox), true, $response, $message); sqimap_subscribe ($imap_stream, $mailbox); } -/* Subscribes to an existing folder */ -function sqimap_subscribe ($imap_stream, $mailbox) { - $read_ary = sqimap_run_command($imap_stream, 'SUBSCRIBE ' . sqimap_encode_mailbox_name($mailbox), - true, $response, $message); +/** + * Subscribes to an existing folder. + */ +function sqimap_subscribe ($imap_stream, $mailbox,$debug=true) { + $read_ary = sqimap_run_command($imap_stream, 'SUBSCRIBE ' . + sqimap_encode_mailbox_name($mailbox), + $debug, $response, $message); } -/* Unsubscribes to an existing folder */ +/** + * Unsubscribes from an existing folder + */ function sqimap_unsubscribe ($imap_stream, $mailbox) { - $read_ary = sqimap_run_command($imap_stream, 'UNSUBSCRIBE ' . sqimap_encode_mailbox_name($mailbox), - true, $response, $message); + $read_ary = sqimap_run_command($imap_stream, 'UNSUBSCRIBE ' . + sqimap_encode_mailbox_name($mailbox), + false, $response, $message); } -/* Deletes the given folder */ +/** + * Deletes the given folder + */ function sqimap_mailbox_delete ($imap_stream, $mailbox) { global $data_dir, $username; - $read_ary = sqimap_run_command($imap_stream, 'DELETE ' . sqimap_encode_mailbox_name($mailbox), - true, $response, $message); sqimap_unsubscribe ($imap_stream, $mailbox); - do_hook_function('rename_or_delete_folder', $args = array($mailbox, 'delete', '')); - removePref($data_dir, $username, "thread_$mailbox"); + $read_ary = sqimap_run_command($imap_stream, 'DELETE ' . + sqimap_encode_mailbox_name($mailbox), + true, $response, $message); + if ($response !== 'OK') { + // subscribe again + sqimap_subscribe ($imap_stream, $mailbox); + } else { + do_hook_function('rename_or_delete_folder', $args = array($mailbox, 'delete', '')); + removePref($data_dir, $username, "thread_$mailbox"); + } } -/* Determines if the user is subscribed to the folder or not */ +/** + * Determines if the user is subscribed to the folder or not + */ function sqimap_mailbox_is_subscribed($imap_stream, $folder) { $boxesall = sqimap_mailbox_list ($imap_stream); foreach ($boxesall as $ref) { @@ -323,7 +397,9 @@ function sqimap_mailbox_is_subscribed($imap_stream, $folder) { return false; } -/* Renames a mailbox */ +/** + * Renames a mailbox. + */ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) { if ( $old_name != $new_name ) { global $delimiter, $imap_server_type, $data_dir, $username; @@ -336,7 +412,8 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) { } $boxesall = sqimap_mailbox_list($imap_stream); - $cmd = 'RENAME ' . sqimap_encode_mailbox_name($old_name) . ' ' . sqimap_encode_mailbox_name($new_name); + $cmd = 'RENAME ' . sqimap_encode_mailbox_name($old_name) . + ' ' . sqimap_encode_mailbox_name($new_name); $data = sqimap_run_command($imap_stream, $cmd, true, $response, $message); sqimap_unsubscribe($imap_stream, $old_name.$postfix); $oldpref = getPref($data_dir, $username, 'thread_'.$old_name.$postfix); @@ -367,7 +444,7 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) { } } -/* +/** * Formats a mailbox into parts for the $boxesall array * * The parts are: @@ -430,7 +507,7 @@ function sqimap_mailbox_parse ($line, $line_lsub) { $boxesall[$g]['flags'] = array(); if (isset($line[$g])) { ereg("\(([^)]*)\)",$line[$g],$regs); - // FIXME Flags do contain the \ character. \NoSelect \NoInferiors + // FIXME Flags do contain the \ character. \NoSelect \NoInferiors // and $MDNSent <= last one doesn't have the \ // It's better to follow RFC3501 instead of using our own naming. $flags = trim(strtolower(str_replace('\\', '',$regs[1]))); @@ -442,23 +519,7 @@ function sqimap_mailbox_parse ($line, $line_lsub) { return $boxesall; } -/* - * Sorting function used to sort mailbox names. - * + Original patch from dave_michmerhuizen@yahoo.com - * + Allows case insensitivity when sorting folders - * + Takes care of the delimiter being sorted to the end, causing - * subfolders to be listed in below folders that are prefixed - * with their parent folders name. - * - * For example: INBOX.foo, INBOX.foobar, and INBOX.foo.bar - * Without special sort function: foobar between foo and foo.bar - * With special sort function: foobar AFTER foo and foo.bar :) - */ -function user_strcasecmp($a, $b) { - return strnatcasecmp($a, $b); -} - -/* +/** * Returns list of options (to be echoed into select statement * based on available mailboxes and separators * Caller should surround options with and @@ -476,7 +537,7 @@ function user_strcasecmp($a, $b) { * \NoSelect and \NoInferiors * $use_long_format - override folder display preference and always show full folder name. */ -function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_skip = 0, $boxes = 0, +function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_skip = 0, $boxes = 0, $flag = 'noselect', $use_long_format = false ) { global $username, $data_dir; $mbox_options = ''; @@ -497,13 +558,13 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk if ($folder_skip != 0 && in_array($box, $folder_skip) ) { continue; } - $lowerbox = strtolower($box); + $lowerbox = strtolower($box); // mailboxes are casesensitive => inbox.sent != inbox.Sent // nevermind, to many dependencies this should be fixed! - + if (strtolower($box) == 'inbox') { // inbox is special and not casesensitive $box2 = _("INBOX"); - } else { + } else { switch ($shorten_box_names) { case 2: /* delimited, style = 2 */ @@ -527,28 +588,38 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk return $mbox_options; } -/* - * Returns sorted mailbox lists in several different ways. +/** + * 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) { + + +function sqimap_mailbox_list($imap_stream, $force=false) { global $default_folder_prefix; - if (!isset($boxesnew)) { + if (!sqgetGlobalVar('boxesnew',$boxesnew,SQ_SESSION) || $force) { 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, - $delimiter, $noselect_fix_enable; - + $delimiter, $noselect_fix_enable, $imap_server_type; $inbox_in_list = false; $inbox_subscribed = false; + $listsubscribed = sqimap_capability($imap_stream,'LIST-SUBSCRIBED'); require_once(SM_PATH . 'include/load_prefs.php'); + + if ($listsubscribed) { + $lsub = 'LIST (SUBSCRIBED)'; + } else { + $lsub = 'LSUB'; + } + if ($noselect_fix_enable) { - $lsub_args = "LSUB \"$folder_prefix\" \"*%\""; + + $lsub_args = "$lsub \"$folder_prefix\" \"*%\""; } else { - $lsub_args = "LSUB \"$folder_prefix\" \"*\""; + $lsub_args = "$lsub \"$folder_prefix\" \"*\""; } /* LSUB array */ $lsub_ary = sqimap_run_command ($imap_stream, $lsub_args, @@ -557,6 +628,7 @@ function sqimap_mailbox_list($imap_stream) { $sorted_lsub_ary = array(); for ($i = 0, $cnt = count($lsub_ary);$i < $cnt; $i++) { + $temp_mailbox_name = find_mailbox_name($lsub_ary[$i]); $sorted_lsub_ary[] = $temp_mailbox_name; if (!$inbox_subscribed && strtoupper($temp_mailbox_name) == 'INBOX') { @@ -566,7 +638,7 @@ function sqimap_mailbox_list($imap_stream) { /* natural sort mailboxes */ if (isset($sorted_lsub_ary)) { - usort($sorted_lsub_ary, 'user_strcasecmp'); + usort($sorted_lsub_ary, 'strnatcasecmp'); } /* * The LSUB response doesn't provide us information about \Noselect @@ -574,33 +646,37 @@ function sqimap_mailbox_list($imap_stream) { * call to retrieve the flags for the mailbox * Note: according RFC2060 an imap server may provide \NoSelect flags in the LSUB response. * in other words, we cannot rely on it. - */ + */ $sorted_list_ary = array(); - for ($i=0; $i < count($sorted_lsub_ary); $i++) { + // if (!$listsubscribed) { + for ($i=0; $i < count($sorted_lsub_ary); $i++) { 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]; } - $mbx = stripslashes($mbx); + $read = sqimap_run_command ($imap_stream, 'LIST "" ' . sqimap_encode_mailbox_name($mbx), true, $response, $message); + $read = compact_mailboxes_response($read); + if (isset($read[0])) { $sorted_list_ary[$i] = $read[0]; } else { $sorted_list_ary[$i] = ''; } - } + } + // } /* * Just in case they're not subscribed to their inbox, * we'll get it for them anyway */ if (!$inbox_subscribed) { - $inbox_ary = sqimap_run_command ($imap_stream, 'LIST "" INBOX', + $inbox_ary = sqimap_run_command ($imap_stream, 'LIST "" "INBOX"', true, $response, $message); - $sorted_list_ary[] = implode('', compact_mailboxes_response($inbox_ary)); + $sorted_list_ary[] = implode('',compact_mailboxes_response($inbox_ary)); $sorted_lsub_ary[] = find_mailbox_name($inbox_ary[0]); } @@ -628,19 +704,18 @@ function sqimap_mailbox_list($imap_stream) { } } } - - /* Rest of the folders */ + /* Rest of the folders */ for($k = 0; $k < $cnt; $k++) { if (!$used[$k]) { $boxesnew[] = $boxesall[$k]; } } + sqsession_register($boxesnew,'boxesnew'); } - return $boxesnew; } -/* +/** * Returns a list of all folders, subscribed or not */ function sqimap_mailbox_list_all($imap_stream) { @@ -711,7 +786,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 (true) { global $data_dir, $username, $list_special_folders_first, $folder_prefix, $delimiter, $trash_folder, $move_to_trash, @@ -734,19 +809,38 @@ function sqimap_mailbox_tree($imap_stream) { $has_inbox = false; for ($i = 0, $cnt = count($lsub_ary); $i < $cnt; $i++) { - if (preg_match("/^\*\s+LSUB\s+(.*)\"?INBOX\"?[^(\/\.)].*$/i",$lsub_ary[$i])) { + if (preg_match("/^\*\s+LSUB.*\s\"?INBOX\"?[^(\/\.)].*$/i",$lsub_ary[$i])) { $lsub_ary[$i] = strtoupper($lsub_ary[$i]); - $has_inbox = true; + // in case of an unsubscribed inbox an imap server can + // return the inbox in the lsub results with a \NoSelect + // flag. + if (!preg_match("/\*\s+LSUB\s+\(.*\\\\NoSelect.*\).*/i",$lsub_ary[$i])) { + $has_inbox = true; + } else { + // remove the result and request it again with a list + // response at a later stage. + unset($lsub_ary[$i]); + // re-index the array otherwise the addition of the LIST + // response will fail in PHP 4.1.2 and probably other older versions + $lsub_ary = array_values($lsub_ary); + } break; } } if ($has_inbox == false) { - $lsub_ary[] = '* LSUB () NIL INBOX'; + // do a list request for inbox because we should always show + // inbox even if the user isn't subscribed to it. + $inbox_ary = sqimap_run_command ($imap_stream, 'LIST "" INBOX', + true, $response, $message); + $inbox_ary = compact_mailboxes_response($inbox_ary); + if (count($inbox_ary)) { + $lsub_ary[] = $inbox_ary[0]; + } } /* - * Section about removing the last element was removed + * Section about removing the last element was removed * We don't return "* OK" anymore from sqimap_read_data */ @@ -756,14 +850,14 @@ function sqimap_mailbox_tree($imap_stream) { $mbx = find_mailbox_name($lsub_ary[$i]); // only do the noselect test if !uw, is checked later. FIX ME see conf.pl setting - if ($imap_server_type != "uw") { + if ($imap_server_type != "uw") { $noselect = check_is_noselect($lsub_ary[$i]); $noinferiors = check_is_noinferiors($lsub_ary[$i]); } if (substr($mbx, -1) == $delimiter) { $mbx = substr($mbx, 0, strlen($mbx) - 1); } - $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect, 'noinferiors' => $noinferiors); + $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect, 'noinferiors' => $noinferiors); } // FIX ME this requires a config setting inside conf.pl instead of checking on server type if ($imap_server_type == "uw") { @@ -774,7 +868,7 @@ function sqimap_mailbox_tree($imap_stream) { $mbx = stripslashes($aMbx['mbx']); sqimap_prepare_pipelined_query('LIST "" ' . sqimap_encode_mailbox_name($mbx), $tag, $aQuery, false); $aTag[$tag] = $mbx; - } + } $sorted_lsub_ary = array(); // execute all the queries at once $aResponse = sqimap_run_pipelined_command ($imap_stream, $aQuery, false, $aServerResponse, $aServerMessage); @@ -830,13 +924,13 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) { $mbx = new mailboxes(); $mailbox = $mbx_ary[$i]['mbx']; - /* + /* sent subfolders messes up using existing code as subfolders were marked, but the parents were ordered somewhere else in the list, despite having "special folders at top" option set. Need a better method than this. */ - +/* if ($mailbox == 'INBOX') { $mbx->is_special = true; } elseif (stristr($trash_folder , $mailbox)) { @@ -851,7 +945,7 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) { case 'INBOX': $mbx->is_inbox = true; $mbx->is_special = true; - $mbx_ary[$i]['noselect'] = false; + $mbx_ary[$i]['noselect'] = false; break; case $trash_folder: $mbx->is_trash = true; @@ -866,7 +960,14 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) { $mbx->is_special = true; break; } - +*/ + $mbx->is_special |= ($mbx->is_inbox = (strtoupper($mailbox) == 'INBOX')); + $mbx->is_special |= ($mbx->is_trash = isTrashMailbox($mailbox)); + $mbx->is_special |= ($mbx->is_sent = isSentMailbox($mailbox)); + $mbx->is_special |= ($mbx->is_draft = isDraftMailbox($mailbox)); + if (!$mbx->is_special) + $mbx->is_special = boolean_hook_function('special_mailbox', $mailbox, 1); + if (isset($mbx_ary[$i]['unseen'])) { $mbx->unseen = $mbx_ary[$i]['unseen']; } @@ -894,7 +995,7 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) { } function sqimap_utf7_decode_mbx_tree(&$mbx_tree) { - if (strtoupper($mbx_tree->mailboxname_sub) == 'INBOX') + if (strtoupper($mbx_tree->mailboxname_full) == 'INBOX') $mbx_tree->mailboxname_sub = _("INBOX"); else $mbx_tree->mailboxname_sub = imap_utf7_decode_local($mbx_tree->mailboxname_sub); @@ -916,23 +1017,7 @@ function sqimap_tree_to_ref_array(&$mbx_tree,&$aMbxs) { sqimap_tree_to_ref_array($mbx_tree->mbxs[$i],$aMbxs); } } -} - - -/* Define preferences for folder settings. */ -/* FIXME, we should load constants.php -unseen_notify -define('SMPREF_UNSEEN_NONE', 1); -define('SMPREF_UNSEEN_INBOX', 2); -define('SMPREF_UNSEEN_ALL', 3); - -define('SMPREF_UNSEEN_SPECIAL', 4); // Only special folders -define('SMPREF_UNSEEN_NORMAL', 5); // Only normal folders - -unseen_type -define('SMPREF_UNSEEN_ONLY', 1); -define('SMPREF_UNSEEN_TOTAL', 2); -*/ +} function sqimap_get_status_mbx_tree($imap_stream,&$mbx_tree) { global $unseen_notify, $unseen_type, $trash_folder,$move_to_trash; @@ -984,7 +1069,7 @@ function sqimap_get_status_mbx_tree($imap_stream,&$mbx_tree) { $oMbx =& $aMbxs[$i]; if (strtoupper($oMbx->mailboxname_full) == 'INBOX' || ($move_to_trash && $oMbx->mailboxname_full == $trash_folder)) { - if ($unseen_type == 2 || + if ($unseen_type == 2 || ($oMbx->mailboxname_full == $trash_folder && $move_to_trash)) { $aStatus = sqimap_status_messages($imap_stream,$oMbx->mailboxname_full); $oMbx->unseen = $aStatus['UNSEEN']; @@ -1003,7 +1088,7 @@ function sqimap_get_status_mbx_tree($imap_stream,&$mbx_tree) { } } } - } -} + } +} ?>