X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=5e63fe677f5634ca44a94e59d1ce5ad808e517d8;hb=781b93d40a43707ec4b5a47616b5c9f3017a526a;hp=ab0615e3616e77e5a66bf260e693f63a0e6c6fc4;hpb=34a85c56b8f2836a89de68fd66cda4a8cd3acc2f;p=squirrelmail.git diff --git a/src/search.php b/src/search.php index ab0615e3..5e63fe67 100644 --- a/src/search.php +++ b/src/search.php @@ -6,18 +6,21 @@ * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * Originally by Alex Lemaresquier - Brainstorm - alex at brainstorm.fr + * @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/imap_asearch.php'); require_once(SM_PATH . 'functions/imap_mailbox.php'); -require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/imap_messages.php'); +require_once(SM_PATH . 'functions/mime.php'); +require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()... function asearch_unhtml_strcoll($a, $b) { @@ -26,7 +29,7 @@ function asearch_unhtml_strcoll($a, $b) function imap_get_mailbox_display($mailbox) { - if ($mailbox == 'INBOX') + if (strtoupper($mailbox) == 'INBOX') return _("INBOX"); return imap_utf7_decode_local($mailbox); } @@ -38,15 +41,15 @@ function asearch_get_mailbox_display($mailbox) return imap_get_mailbox_display($mailbox); } -function asearch_title_display($color, $txt) +function asearch_get_title_display($color, $txt) { return '' . $txt . ''; } -function asearch_error_display($color, $txt) +function asearch_get_error_display($color, $txt) { -/*return '' . '' . $txt . '';*/ - return '' . $txt . ''; + return '' . '' . $txt . ''; +/*return '' . $txt . '';*/ } function asearch_serialize($input_array) @@ -77,13 +80,20 @@ function asearch_removePref($data_dir, $username, $key, $index) } /* sanity checks, done before running the imap command and before push_recent */ -function asearch_check_query() +function asearch_check_query($where_array, $what_array, $exclude_array) { - global $where_array, $exclude_array; + global $imap_asearch_opcodes; + if (empty($where_array)) return _("Please enter something to search for"); if (count($exclude_array) == count($where_array)) return _("There must be at least one criteria to search for"); + for ($crit_num = 0; $crit_num < count($where_array); $crit_num++) { + $where = $where_array[$crit_num]; + $what = $what_array[$crit_num]; + if (!(($what == '') ^ ($imap_asearch_opcodes[$where] != ''))) + return _("Error in criteria argument"); + } return ''; } @@ -179,7 +189,7 @@ function asearch_forget_recent($data_dir, $username, $forget_index) asearch_write_recent($data_dir, $username, $recent_array); } -function asearch_recent_exists($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array) +function asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array) { global $recent_prefkeys; @@ -200,10 +210,10 @@ function asearch_recent_exists($recent_array, $mailbox_array, $biop_array, $unop $what_string == $recent_array['asearch_recent_what'][$recent_num] && $exclude_string == $recent_array['asearch_recent_exclude'][$recent_num] ) - return TRUE; + return $recent_num; } } - return FALSE; + return -1; } /* push a recent search */ @@ -214,15 +224,19 @@ function asearch_push_recent($data_dir, $username, $mailbox_array, $biop_array, $recent_max = getPref($data_dir, $username, 'search_memory', 0); if ($recent_max > 0) { $recent_array = asearch_read_recent($data_dir, $username); - if (!asearch_recent_exists($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array)) { - $input = array($where_array, $mailbox_array, $what_array, $biop_array, $unop_array, $exclude_array); - $i = 0; + $recent_found = asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); + if ($recent_found >= 0) { // Remove identical recent foreach ($recent_prefkeys as $key) { - array_unshift($recent_array[$key], asearch_serialize($input[$i])); - $i++; + array_splice($recent_array[$key], $recent_found, 1); } - asearch_write_recent($data_dir, $username, $recent_array); - } + } + $input = array($where_array, $mailbox_array, $what_array, $biop_array, $unop_array, $exclude_array); + $i = 0; + foreach ($recent_prefkeys as $key) { + array_unshift($recent_array[$key], asearch_serialize($input[$i])); + $i++; + } + asearch_write_recent($data_dir, $username, $recent_array); } } @@ -293,7 +307,7 @@ function asearch_get_date_display($what) $what_parts = sqimap_asearch_parse_date($what); if (count($what_parts) == 4) { if (checkdate($what_parts[2], $what_parts[1], $what_parts[3])) { - $what_display = date_intl(_("M j, Y"),mktime(0,0,0,$what_parts[2],$what_parts[1],$what_parts[3])); + $what_display = date_intl(_("M j, Y"), mktime(0,0,0,$what_parts[2],$what_parts[1],$what_parts[3])); /*$what_display = $what_parts[1] . ' ' . getMonthName($what_parts[2]) . ' ' . $what_parts[3];*/ } else @@ -305,7 +319,7 @@ function asearch_get_date_display($what) } /* translate the query to rough natural display */ -function asearch_build_query_display($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array) +function asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array) { global $imap_asearch_biops_in, $imap_asearch_biops, $imap_asearch_unops, $imap_asearch_options; global $imap_asearch_opcodes; @@ -313,16 +327,16 @@ function asearch_build_query_display($mailbox_array, $biop_array, $unop_array, $ $last_mailbox = $mailbox_array[0]; if (empty($last_mailbox)) $last_mailbox = 'INBOX'; - $asearch_string = ''; - for ($cur_crit=0; $cur_crit < count($where_array); $cur_crit++) { - if ((!isset($exclude_array[$cur_crit])) || (!$exclude_array[$cur_crit])) { - $cur_mailbox = $mailbox_array[$cur_crit]; + $query_display = ''; + for ($crit_num=0; $crit_num < count($where_array); $crit_num++) { + if ((!isset($exclude_array[$crit_num])) || (!$exclude_array[$crit_num])) { + $cur_mailbox = $mailbox_array[$crit_num]; if (empty($cur_mailbox)) $cur_mailbox = 'INBOX'; - $biop = asearch_nz($biop_array[$cur_crit]); - if (($asearch_string == '') || ($cur_mailbox != $last_mailbox)) { + $biop = asearch_nz($biop_array[$crit_num]); + if (($query_display == '') || ($cur_mailbox != $last_mailbox)) { $mailbox_display = ' ' . asearch_get_mailbox_display($cur_mailbox) . ''; - if ($asearch_string == '') + if ($query_display == '') $biop_display = _("In"); else $biop_display = $imap_asearch_biops_in[$biop]; @@ -333,33 +347,37 @@ function asearch_build_query_display($mailbox_array, $biop_array, $unop_array, $ $biop_display = $imap_asearch_biops[$biop]; } $biop_display = ' ' . $biop_display . ''; - $unop = $unop_array[$cur_crit]; + $unop = $unop_array[$crit_num]; $unop_display = $imap_asearch_unops[$unop]; - $where = $where_array[$cur_crit]; + $where = $where_array[$crit_num]; $where_display = $imap_asearch_options[$where]; if ($unop_display != '') $where_display = ' ' . $unop_display . ' ' . $where_display . ''; else $where_display = ' ' . $where_display . ''; $what_type = $imap_asearch_opcodes[$where]; - if ($what_type) { /* Check if this opcode needs a parameter */ - $what = $what_array[$cur_crit]; - if ($what_type == 'adate') - $what_display = asearch_get_date_display($what); + $what = $what_array[$crit_num]; + if ($what_type) { /* Check opcode parameter */ + if ($what == '') + $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)")); else { - if ($what == '') - $what_display = '' . _("(Empty string)") . ''; + if ($what_type == 'adate') + $what_display = asearch_get_date_display($what); else $what_display = htmlspecialchars($what); + $what_display = ' ' . $what_display . ''; } - $what_display = ' ' . $what_display . ''; } - else - $what_display = ''; - $asearch_string .= ' ' . $biop_display . $mailbox_display . $where_display . $what_display; + else { + if ($what) + $what_display = ' ' . asearch_get_error_display($color, _("(Spurious argument)")); + else + $what_display = ''; + } + $query_display .= ' ' . $biop_display . $mailbox_display . $where_display . $what_display; } } - return $asearch_string; + return $query_display; } /* Handle the alternate row colors */ @@ -383,8 +401,8 @@ function asearch_print_query_array($query_array, $query_keys, $action_array, $ti global $color; echo "
\n"; - echo html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' ); - echo html_tag( 'tr', html_tag( 'td', asearch_title_display($color, $title), 'center', $color[5], 'colspan=5')); + echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"'); + echo html_tag('tr', html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=5')); $main_key = $query_keys[0]; $query_count = count($query_array[$main_key]); for ($query_num=0, $row_num=0; $query_num<$query_count; $query_num++) { @@ -401,10 +419,10 @@ function asearch_print_query_array($query_array, $query_keys, $action_array, $ti $where_array = $search_array[0]; $what_array = $search_array[2]; $exclude_array = $search_array[5]; - $query_display = asearch_build_query_display($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); + $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); - echo html_tag( 'td', $query_num+1, 'right'); - echo html_tag( 'td', $query_display, 'center', '', 'width="80%"'); + echo html_tag('td', $query_num+1, 'right'); + echo html_tag('td', $query_display, 'center', '', 'width="80%"'); foreach ($action_array as $action => $action_display) { echo html_tag('td', '' . $action_display . '', 'center'); } @@ -422,17 +440,12 @@ function asearch_print_saved($data_dir, $username) global $saved_prefkeys; $saved_array = asearch_read_saved($data_dir, $username); - if (isset($saved_prefkeys)) { - if (isset($saved_array[$saved_prefkeys[0]])) { - $saved_count = count($saved_array[$saved_prefkeys[0]]); - } else { $saved_count = 0; } - } else { - $saved_count = 0; - } - - if ($saved_count > 0) { - $saved_actions = array('edit_saved' => _("edit"), 'search_saved' => _("search"), 'delete_saved' => _("delete")); - asearch_print_query_array($saved_array, $saved_prefkeys, $saved_actions, _("Saved Searches")); + if (isset($saved_array[$saved_prefkeys[0]])) { + $saved_count = count($saved_array[$saved_prefkeys[0]]); + if ($saved_count > 0) { + $saved_actions = array('edit_saved' => _("edit"), 'search_saved' => _("search"), 'delete_saved' => _("delete")); + asearch_print_query_array($saved_array, $saved_prefkeys, $saved_actions, _("Saved Searches")); + } } } @@ -442,25 +455,23 @@ function asearch_print_recent($data_dir, $username) global $recent_prefkeys; $recent_array = asearch_read_recent($data_dir, $username); - if (isset($recent_array[$recent_prefkeys[0]])) { - $recent_count = count($recent_array[$recent_prefkeys[0]]); - } else { - $recent_count = 0; - } - $recent_max = min($recent_count, getPref($data_dir, $username, 'search_memory', 0)); - if ($recent_max > 0) { - $recent_actions = array('save_recent' => _("save"), 'search_recent' => _("search"), 'forget_recent' => _("forget")); - asearch_print_query_array($recent_array, $recent_prefkeys, $recent_actions, _("Recent Searches")); + if (isset($recent_array[$recent_prefkeys[0]])) { + $recent_count = count($recent_array[$recent_prefkeys[0]]); + $recent_max = min($recent_count, getPref($data_dir, $username, 'search_memory', 0)); + if ($recent_max > 0) { + $recent_actions = array('save_recent' => _("save"), 'search_recent' => _("search"), 'forget_recent' => _("forget")); + asearch_print_query_array($recent_array, $recent_prefkeys, $recent_actions, _("Recent Searches")); + } } } -/* build an ' . "\n"; + return '' . "\n"; } -/* build a statement from an array */ function asearch_opt_array($var_name, $opt_array, $cur_val) { $output = '' .*/ '' . _("In") . ''; echo "\n"; - echo html_tag( 'td', '', 'center' ); + echo html_tag('td', '', 'center'); /* Mailbox list */ - echo ''; + if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) + echo asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . asearch_get_mailbox_display($mailbox)); + echo asearch_opt('All Folders', $mailbox, '[' . asearch_get_mailbox_display('All Folders') . ']'); echo sqimap_mailbox_option_list($imapConnection, array(strtolower($mailbox)), 0, $boxes); echo '' . "\n"; /* Unary operator and Search location */ - if (empty($where)) - $where = 'FROM'; - echo html_tag( 'td', - asearch_opt_array('unop[' . $rownum . ']', $imap_asearch_unops, $unop) - . asearch_opt_array('where[' . $rownum . ']', $imap_asearch_options, $where), + echo html_tag('td', + asearch_opt_array('unop[' . $row_num . ']', $imap_asearch_unops, $unop) + . asearch_opt_array('where[' . $row_num . ']', $imap_asearch_options, $where), 'center'); /* Text input */ @@ -509,18 +527,18 @@ function asearch_print_form_row($imapConnection, $boxes, $mailbox, $biop, $unop, $what_disp = str_replace('\\\\', '\\', $what_disp); $what_disp = str_replace('\\"', '"', $what_disp); $what_disp = str_replace('"', '"', $what_disp);*/ - $what_disp = htmlspecialchars($what, ENT_QUOTES); - echo html_tag( 'td', '', 'center' ) . "\n"; + $what_disp = htmlspecialchars($what); + echo html_tag('td', '', 'center') . "\n"; /* Exclude criteria */ - echo html_tag( 'td', - _("Exclude Criteria:") . '', 'center', '') . "\n"; + echo html_tag('td', + _("Exclude Criteria:") . '', 'center', '') . "\n"; echo "\n"; } /* print the search form */ -function asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $add_criteria) +function asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array) { global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html; global $color; @@ -529,16 +547,11 @@ function asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array echo "
\n"; echo '
' . "\n"; - echo html_tag( 'table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"' ); - echo html_tag( 'tr', html_tag( 'td', asearch_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=5')); - $row_count = count($where_array) + $add_criteria; - $mailbox = ''; + echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"'); + echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=5')); + $row_count = count($where_array); for ($row_num = 0; $row_num < $row_count; $row_num++) { - /* Keep the last non-empty mailbox as default choice */ - if (strip_tags(asearch_nz($mailbox_array[$row_num])) != '') - $mailbox = strip_tags($mailbox_array[$row_num]); - if ($mailbox == '') - $mailbox = $boxes[0]['unformatted']; + $mailbox = asearch_nz($mailbox_array[$row_num]); $biop = strip_tags(asearch_nz($biop_array[$row_num])); $unop = strip_tags(asearch_nz($unop_array[$row_num])); $where = strip_tags(asearch_nz($where_array[$row_num])); @@ -549,7 +562,7 @@ function asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array echo '' . "\n"; /* Submit buttons */ - echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"' ); + echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"'); echo html_tag('tr', html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n" . html_tag('td', getButton('SUBMIT', 'submit', $add_criteria_button_html), 'center') . "\n" @@ -562,22 +575,36 @@ function asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array /* print the $msgs messages from $mailbox mailbox */ /* this is almost the original code */ -function asearch_print_mailbox_msgs($msgs, $mailbox, $cnt, $imapConnection, $where, $what, $usecache = false, $newsort = false) +function asearch_print_mailbox_msgs($imapConnection, $mailbox, $msgs, $cnt, $sort, $color, $where, $what) { - global $sort, $color; - if ($cnt > 0) { - $msort = calc_msort($msgs, $sort); - $showbox = asearch_get_mailbox_display($mailbox); - echo html_tag( 'div', '' . _("Folder:") . ' '. $showbox.'','center') . "\n"; + global $allow_server_sort, $allow_thread_sort, $thread_sort_messages; + + $thread_sort_messages = 0; + if ($allow_thread_sort) { + global $data_dir, $username; + $thread_sort_messages = getPref($data_dir, $username, 'thread_' . $mailbox); + $msort = $msgs; + $real_sort = 6; + } + elseif ($allow_server_sort) { + $msort = $msgs; + $real_sort = 6; + } + else { + $msort = calc_msort($msgs, $sort); + $real_sort = $sort; + } + $mailbox_display = asearch_get_mailbox_display($mailbox); + echo html_tag('div', '' . _("Folder:") . ' '. $mailbox_display . '','center') . "\n"; $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt); - $toggle_all = get_selectall_link(1, $sort); + $toggle_all = get_selectall_link(1, $real_sort); echo ''; echo ''; echo ''; @@ -588,8 +615,8 @@ function asearch_print_mailbox_msgs($msgs, $mailbox, $cnt, $imapConnection, $whe echo '
'; - mail_message_listing_beginning($imapConnection, $mailbox, $sort, $msg_cnt_str, $toggle_all, 1); + mail_message_listing_beginning($imapConnection, $mailbox, $real_sort, $msg_cnt_str, $toggle_all, 1); echo '
'; echo ' '; echo '
'; - printHeader($mailbox, 6, $color, false); - displayMessageArray($imapConnection, $cnt, 1, $msort, $mailbox, $sort, $color, $cnt, $where, $what); + printHeader($mailbox, $sort, $color, !$thread_sort_messages); + displayMessageArray($imapConnection, $cnt, 1, $msort, $mailbox, $real_sort, $color, $cnt, $where, $what); echo '
'; echo ' '; @@ -602,14 +629,11 @@ function asearch_print_mailbox_msgs($msgs, $mailbox, $cnt, $imapConnection, $whe } /* ------------------------ main ------------------------ */ -global $allow_thread_sort; - /* get globals we may need */ - sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); /* we really need this? */ +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); /* do we really need this? */ $recent_prefkeys = array('asearch_recent_where', 'asearch_recent_mailbox', 'asearch_recent_what', 'asearch_recent_biop', 'asearch_recent_unop', 'asearch_recent_exclude'); $saved_prefkeys = array('asearch_saved_where', 'asearch_saved_mailbox', 'asearch_saved_what', 'asearch_saved_biop', 'asearch_saved_unop', 'asearch_saved_exclude'); @@ -745,8 +769,21 @@ else $exclude_array = array(); /* Used by recent and saved stuff */ -if (isset($_GET['rownum'])) { +if (isset($_GET['rownum'])) $submit_rownum = strip_tags($_GET['rownum']); + +/* Change global sort */ +if (sqgetGlobalVar('newsort', $newsort, SQ_GET)) { + setPref($data_dir, $username, 'sort', $newsort); + $sort = $newsort; + sqsession_register($sort, 'sort'); + asearch_edit_last($data_dir, $username); +} + +/* Change mailbox threading */ +if (sqgetGlobalVar('set_thread', $set_thread, SQ_GET)) { + setPref($data_dir, $username, 'thread_' . $mailbox_array[0], ($set_thread == 1) ? 1 : 0 ); + asearch_edit_last($data_dir, $username); } /* end of get globals */ @@ -767,7 +804,7 @@ if (!isset($submit)) { else { switch ($submit) { case $search_button_text: - if (asearch_check_query() == '') + if (asearch_check_query($where_array, $what_array, $exclude_array) == '') asearch_push_recent($data_dir, $username, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); break; case 'Search_silent': @@ -802,7 +839,9 @@ else { break; case 'search_recent': $submit = $search_button_text; - /*nobreak;*/ + asearch_edit_recent($data_dir, $username, $submit_rownum); + asearch_push_recent($data_dir, $username, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); + break; case 'edit_recent': /* no link to do this, yet */ asearch_edit_recent($data_dir, $username, $submit_rownum); break; @@ -811,7 +850,9 @@ else { break; case 'search_saved': $submit = $search_button_text; - /*nobreak;*/ + asearch_edit_saved($data_dir, $username, $submit_rownum); + asearch_push_recent($data_dir, $username, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); + break; case 'edit_saved': asearch_edit_saved($data_dir, $username, $submit_rownum); break; @@ -825,12 +866,11 @@ else { $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); /* get mailbox names once here */ $boxes = sqimap_mailbox_list($imapConnection); +/* ensure we have a valid default mailbox name */ +$mailbox = asearch_nz($mailbox_array[0]); +if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?) + $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;) -if (isset($mailbox_array[0])) { - $mailbox = strip_tags($mailbox_array[0]); -} -if (empty($mailbox)) - $mailbox = $boxes[0]['unformatted']; if (isset($composenew) && $composenew) { $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox) . "&session=$composesession&attachedmessages=true&"; @@ -842,24 +882,31 @@ else do_hook('search_before_form'); if (!$search_silent) { - echo html_tag( 'table', - html_tag( 'tr', "\n" . - html_tag( 'td', asearch_title_display($color, _("Advanced Search")), 'center', $color[0] ) + echo html_tag('table', + html_tag('tr', "\n" . + html_tag('td', asearch_get_title_display($color, _("Search")), 'center', $color[0]) ) , '', '', 'width="100%"') . "\n"; asearch_print_saved($data_dir, $username); asearch_print_recent($data_dir, $username); - if (($submit == $add_criteria_button_text) || (empty($where_array))) - $new_row = 1; - else - $new_row = 0; - asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $new_row); -} - -/* This deserves a comment, at least. What is it for exactly? */ -if (isset($newsort)) { - $sort = $newsort; - sqsession_register($sort, 'sort'); + if (empty($where_array)) { + $mailbox_array[0] = $mailbox; + $biop_array[0] = ''; + $unop_array[0] = ''; + $where_array[0] = 'FROM'; + $what_array[0] = ''; + $exclude_array[0] = ''; + } + if ($submit == $add_criteria_button_text) { + $last_index = max(count($where_array) - 1, 0); + $mailbox_array[] = asearch_nz($mailbox_array[$last_index]); + $biop_array[] = asearch_nz($biop_array[$last_index]); + $unop_array[] = asearch_nz($unop_array[$last_index]); + $where_array[] = asearch_nz($where_array[$last_index]); + $what_array[] = asearch_nz($what_array[$last_index]); + $exclude_array[] = asearch_nz($exclude_array[$last_index]); + } + asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array); } /********************************************************************* @@ -868,34 +915,26 @@ if (isset($newsort)) { * used. Also check to make sure we actually have the array in the * * registered session data. :) * *********************************************************************/ -if (! isset($use_mailbox_cache)) { +if (!isset($use_mailbox_cache)) $use_mailbox_cache = 0; -} - -/* There is a problem with registered vars in 4.1 */ -/* -if( substr( phpversion(), 0, 3 ) == '4.1' ) { - $use_mailbox_cache = FALSE; -} -*/ do_hook('search_after_form'); if ($submit == $search_button_text) { - $query_error = asearch_check_query(); + echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"'); + echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Results")), 'center', $color[5])); + echo html_tag('tr', html_tag('td', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array), 'center', $color[4])); + echo '
' . "\n"; + + $query_error = asearch_check_query($where_array, $what_array, $exclude_array); if ($query_error != '') - echo '
' . html_tag( 'div', asearch_error_display($color, $query_error), 'center' ) . "\n"; + echo '
' . html_tag('div', asearch_get_error_display($color, $query_error), 'center') . "\n"; else { - echo html_tag( 'table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"' ); - echo html_tag( 'tr', html_tag( 'td', asearch_title_display($color, _("Search Results")), 'center', $color[5])); - echo html_tag( 'tr', html_tag( 'td', asearch_build_query_display($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array), 'center', $color[4])); - echo '
' . "\n"; - - $old_allow_thread_sort = 0; - if ($allow_thread_sort == TRUE) { - $old_allow_thread_sort = $allow_thread_sort; - $allow_thread_sort = FALSE; - } + + // Disable thread sort for now if there is more than one mailbox + global $allow_thread_sort; + $old_allow_thread_sort = $allow_thread_sort; + $allow_thread_sort = (count(array_unique($mailbox_array)) <= 1); $boxcount = count($boxes); for ($boxnum=0; $boxnum<$boxcount; $boxnum++) { @@ -905,7 +944,7 @@ if ($submit == $search_button_text) { $mboxes_msgs = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $mboxes_array); if (empty($mboxes_msgs)) - echo '
' . html_tag( 'div', asearch_error_display($color, _("No Messages Found")), 'center' ) . "\n"; + echo '
' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n"; else { foreach($mboxes_msgs as $mailbox => $msgs) { sqimap_mailbox_select($imapConnection, $mailbox); @@ -915,15 +954,14 @@ if ($submit == $search_button_text) { $what = asearch_serialize($what_array);*/ $where = $where_array[0]; $what = $what_array[0]; - asearch_print_mailbox_msgs($msgs, $mailbox, count($msgs), $imapConnection, urlencode($where), urlencode($what), false, false); + asearch_print_mailbox_msgs($imapConnection, $mailbox, $msgs, count($msgs), $sort, $color, urlencode($where), urlencode($what)); } } - $allow_thread_sort = $old_allow_thread_sort; + $allow_thread_sort = $old_allow_thread_sort; // Restore thread sort } } - do_hook('search_bottom'); sqimap_logout($imapConnection); echo '';