require_once('../src/validate.php');
require_once('../functions/imap.php');
require_once('../functions/imap_search.php');
-require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/imap_mailbox.php');
require_once('../functions/array.php');
require_once('../functions/strings.php');
$attributes = get_recent( $username, $data_dir);
reset($types);
foreach ($types as $key) {
- array_splice($attributes[$key], $forget_index, 1);
+ array_splice($attributes[$key], $forget_index - 1, 1);
array_unshift($attributes[$key], '');
}
reset($types);
}
}
-function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $usecache = false, $newsort = false) {
+function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $where, $what, $usecache = false, $newsort = false) {
global $sort, $color;
- $msort = calc_msort($msgs, $sort, $cnt, true);
-
+ $msort = calc_msort($msgs, $sort);
if ($cnt > 0) {
if ( $mailbox == 'INBOX' ) {
$showbox = _("INBOX");
}
echo html_tag( 'div', '<b><big>' . _("Folder:") . ' '. $showbox.'</big></b>','center') . "\n";
+
+ $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
+ $toggle_all = get_selectall_link(1, $sort);
+
+ echo '<table bgcolor="' . $color[0] . '" border="0" width="100%" cellpadding="1" cellspacing="0"><tr><td>';
+ mail_message_listing_beginning($imapConnection, $mailbox, $sort,
+ $msg_cnt_str, $toggle_all, 1);
+
+
+ printHeader($mailbox, 6, $color, false);
+
displayMessageArray($imapConnection, $cnt, 1,
- $msgs, $msort, $mailbox, $sort, $color,
- $cnt, true);
+ $msort, $mailbox, $sort, $color, $cnt, $where, $what);
+
+ mail_message_listing_end($cnt, '', $msg_cnt_str, $color);
+ echo '</td></tr></table>';
}
}
do_hook('search_before_form');
-echo "<br>\n".
- html_tag( 'table',
+echo html_tag( 'table',
html_tag( 'tr', "\n" .
html_tag( 'td', '<b>' . _("Search") . '</b>', 'center', $color[0] )
) ,
sqimap_mailbox_select($imapConnection, $mailbox);
$msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
$count_all = count($msgs);
- printSearchMessages($msgs, $mailbox, $count_all, $imapConnection);
+ printSearchMessages($msgs, $mailbox, $count_all, $imapConnection,
+ $where, $what, false, false);
array_push($perbox_count, $count_all);
}
}
sqimap_mailbox_select($imapConnection, $mailbox);
$msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
if (count($msgs)) {
- printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection);
+ printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection,
+ $where, $what, false, false);
} else {
echo '<br><center>' . _("No Messages Found") . '</center>';
}