* 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;
}
function sqimap_mailbox_expunge_dmn($message_id)
{
global $msgs, $msort, $sort, $imapConnection,
- $mailbox, $uid_support, $mbx_response, $auto_expunge,
+ $mailbox, $mbx_response, $auto_expunge,
$sort, $allow_server_sort, $thread_sort_messages, $allow_thread_sort,
$username, $data_dir;
+ $cnt = 0;
// Got to grab this out of prefs, since it isn't saved from mailbox_view.php
if ($allow_thread_sort) {
break;
}
}
+
+ if ( isset($msgs) ) {
+ unset($msgs[$i]);
+ $msgs = array_values($msgs);
+ sqsession_register($msgs, 'msgs');
+ }
- unset($msgs[$i]);
- unset($msort[$i]);
-
- $msgs = array_values($msgs);
- $msort = array_values($msort);
-
- sqsession_register($msgs, 'msgs');
- sqsession_register($msort, 'msort');
+ if ( isset($msort) ) {
+ unset($msort[$i]);
+ $msort = array_values($msort);
+ sqsession_register($msort, 'msort');
+ }
if ($auto_expunge) {
- sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
}
// And after all that mucking around, update the sort list!
$server_sort_array = get_thread_sort($imapConnection);
} elseif ( $allow_server_sort ) {
$server_sort_array = sqimap_get_sort_order($imapConnection, $sort, $mbx_response);
- } elseif ( $uid_support ) {
+ } else {
$server_sort_array = sqimap_get_php_sort_order($imapConnection, $mbx_response);
}
-
+ return $cnt;
}
/**
for ($i = 0, $cnt = count($lsub_ary); $i < $cnt; $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];
+ }
}
/*