X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=866039efa7979ec4b8ffe499e99c35054d9cb45d;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=c21964725de077a8697d35832519db237c8c5730;hpb=215c35073676dae2e88d09980033527f4a28c73c;p=squirrelmail.git diff --git a/src/search.php b/src/search.php index c2196472..866039ef 100644 --- a/src/search.php +++ b/src/search.php @@ -1,39 +1,38 @@ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + * @subpackage search + * @link http://www.ietf.org/rfc/rfc3501.txt + */ /** -* Path for SquirrelMail required files. -* @ignore -*/ -define('SM_PATH','../'); + * Include the SquirrelMail initialization file. + */ +require('../include/init.php'); /** SquirrelMail required files. -*/ -require_once(SM_PATH . 'include/validate.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/imap_messages.php'); +require_once(SM_PATH . 'functions/imap_general.php'); require_once(SM_PATH . 'functions/mime.php'); -require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()... +require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton() +require_once(SM_PATH . 'functions/forms.php'); +require_once(SM_PATH . 'functions/date.php'); /** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys -*/ + */ define('ASEARCH_WHERE', 0); define('ASEARCH_MAILBOX', 1); define('ASEARCH_WHAT', 2); @@ -44,12 +43,12 @@ define('ASEARCH_SUB', 6); define('ASEARCH_MAX', 7); /** Name of session var -*/ + */ define('ASEARCH_CRITERIA', 'criteria'); /** Builds a href with params -* @param string $params optional parameters to GET -*/ + * @param string $params optional parameters to GET + */ function asearch_get_href($params = '') { $href = 'search.php'; @@ -59,10 +58,10 @@ function asearch_get_href($params = '') } /** Builds a [link] -* @param string $href (reference) -* @param string $text -* @param string $title -*/ + * @param string $href (reference) + * @param string $text + * @param string $title + */ function asearch_get_link(&$href, $text, $title = '') { if ($title != '') @@ -71,30 +70,33 @@ function asearch_get_link(&$href, $text, $title = '') } /** Builds a toggle [link] -* @param integer $value -* @param string $action -* @param array $text_array -* @param array $title_array -*/ + * @param integer $value + * @param string $action + * @param array $text_array + * @param array $title_array + */ function asearch_get_toggle_link($value, $action, $text_array, $title_array = array()) { - return asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value], asearch_nz($title_array[$value])); + $asearch_nz=asearch_nz($title_array[$value]); + $asearch_get_href=asearch_get_href($action . '=' . (int)$value); + return asearch_get_link($asearch_get_href, $text_array[$value], $asearch_nz); } /** -* @param string $a -* @param string $b -* @return bool strcoll()-like result -*/ + * @param string $a + * @param string $b + * @return bool strcoll()-like result + */ function asearch_unhtml_strcoll($a, $b) { return strcoll(asearch_unhtmlentities($a), asearch_unhtmlentities($b)); } + /** -* @param string $mailbox mailbox name utf7 encoded inc. special case INBOX -* @return string mailbox name ready to display (utf7 decoded or localized INBOX) -*/ + * @param string $mailbox mailbox name utf7 encoded inc. special case INBOX + * @return string mailbox name ready to display (utf7 decoded or localized INBOX) + */ function imap_get_mailbox_display($mailbox) { if (strtoupper($mailbox) == 'INBOX') @@ -103,9 +105,9 @@ function imap_get_mailbox_display($mailbox) } /** -* @param string $mailbox mailbox name or special case 'All Folders' -* @return string mailbox name ready to display (utf7 decoded or localized 'All Folders') -*/ + * @param string $mailbox mailbox name or special case 'All Folders' + * @return string mailbox name ready to display (utf7 decoded or localized 'All Folders') + */ function asearch_get_mailbox_display($mailbox) { if ($mailbox == 'All Folders') @@ -114,29 +116,28 @@ function asearch_get_mailbox_display($mailbox) } /** -* @param array $color color array -* @param string $txt text to display -* @return string title ready to display -*/ + * @param array $color color array + * @param string $txt text to display + * @return string title ready to display + */ function asearch_get_title_display(&$color, $txt) { return '' . $txt . ''; } - /** -* @param array $color color array -* @param string $txt text to display -* @return string error text ready to display -*/ + * @param array $color color array + * @param string $txt text to display + * @return string error text ready to display + */ function asearch_get_error_display(&$color, $txt) { return '' . '' . $txt . ''; } /** -* @param array $input_array array to serialize -* @return string a string containing a byte-stream representation of value that can be stored anywhere -*/ + * @param array $input_array array to serialize + * @return string a string containing a byte-stream representation of value that can be stored anywhere + */ function asearch_serialize(&$input_array) { global $search_advanced; @@ -146,9 +147,9 @@ function asearch_serialize(&$input_array) } /** -* @param string $input_string string to unserialize -* @return array -*/ + * @param string $input_string string to unserialize + * @return array + */ function asearch_unserialize($input_string) { global $search_advanced; @@ -158,11 +159,11 @@ function asearch_unserialize($input_string) } /** -* @param string $key the pref key -* @param integer $index the pref key index -* @param string $default default value -* @return string pref value -*/ + * @param string $key the pref key + * @param integer $index the pref key index + * @param string $default default value + * @return string pref value + */ function asearch_getPref(&$key, $index, $default = '') { global $data_dir, $username, $search_advanced; @@ -170,11 +171,11 @@ function asearch_getPref(&$key, $index, $default = '') } /** -* @param string $key the pref key -* @param integer $index the pref key index -* @param string $value pref value to set -* @return bool status -*/ + * @param string $key the pref key + * @param integer $index the pref key index + * @param string $value pref value to set + * @return bool status + */ function asearch_setPref(&$key, $index, $value) { global $data_dir, $username, $search_advanced; @@ -182,10 +183,10 @@ function asearch_setPref(&$key, $index, $value) } /** -* @param string $key the pref key -* @param integer $index the pref key index -* @return bool status -*/ + * @param string $key the pref key + * @param integer $index the pref key index + * @return bool status + */ function asearch_removePref(&$key, $index) { global $data_dir, $username, $search_advanced; @@ -193,7 +194,7 @@ function asearch_removePref(&$key, $index) } /** Sanity checks, done before running the imap command and before calling push_recent -*/ + */ function asearch_check_query(&$where_array, &$what_array, &$exclude_array) { global $imap_asearch_opcodes; @@ -212,7 +213,7 @@ function asearch_check_query(&$where_array, &$what_array, &$exclude_array) } /** Read the recent searches from the prefs -*/ + */ function asearch_read_recent() { global $recent_prefkeys, $search_memory; @@ -222,14 +223,14 @@ function asearch_read_recent() for ($pref_num = 0; $pref_num < $search_memory; $pref_num++) { foreach ($recent_prefkeys as $prefkey) { $pref = asearch_getPref($prefkey, $pref_num); -/* if (!empty($pref))*/ +/* if (!empty($pref))*/ $recent_array[$prefkey][$recent_num] = $pref; } if (empty($recent_array[$recent_prefkeys[0]][$recent_num])) { foreach ($recent_prefkeys as $key) { array_pop($recent_array[$key]); } -// break; //Disabled to support old search code broken prefs +// break; //Disabled to support old search code broken prefs } else $recent_num++; @@ -238,7 +239,7 @@ function asearch_read_recent() } /** Read the saved searches from the prefs -*/ + */ function asearch_read_saved() { global $saved_prefkeys; @@ -259,7 +260,7 @@ function asearch_read_saved() } /** Save a recent search to the prefs -*/ + */ function asearch_save_recent($recent_index) { global $recent_prefkeys, $saved_prefkeys; @@ -279,7 +280,7 @@ function asearch_save_recent($recent_index) } /** Write a recent search to prefs -*/ + */ function asearch_write_recent(&$recent_array) { global $recent_prefkeys, $search_memory; @@ -298,7 +299,7 @@ function asearch_write_recent(&$recent_array) } /** Remove a recent search from prefs -*/ + */ function asearch_forget_recent($forget_index) { global $recent_prefkeys; @@ -311,7 +312,7 @@ function asearch_forget_recent($forget_index) } /** Find a recent search in the prefs (used to avoid saving duplicates) -*/ + */ function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array) { global $recent_prefkeys, $search_advanced; @@ -345,7 +346,7 @@ function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$un } /** Push a recent search into the prefs -*/ + */ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array) { global $recent_prefkeys, $search_memory; @@ -360,7 +361,7 @@ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$wher if ($search_memory > 0) { $recent_array = asearch_read_recent(); $recent_found = asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); - if ($recent_found >= 0) { // Remove identical recent + if ($recent_found >= 0) { // Remove identical recent foreach ($recent_prefkeys as $key) { array_splice($recent_array[$key], $recent_found, 1); } @@ -376,8 +377,8 @@ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$wher } /** Edit a recent search -* @global array mailbox_array searched mailboxes -*/ + * @global array mailbox_array searched mailboxes + */ function asearch_edit_recent($index) { global $recent_prefkeys, $search_advanced; @@ -396,8 +397,8 @@ function asearch_edit_recent($index) } /** Get last search criteria from session or prefs -* FIX ME, try to avoid globals -*/ + * FIX ME, try to avoid globals + */ function asearch_edit_last($index) { if (sqGetGlobalVar(ASEARCH_CRITERIA, $criteria, SQ_SESSION)) { global $where_array, $mailbox_array, $what_array, $unop_array; @@ -420,7 +421,7 @@ function asearch_edit_last($index) { } /** Edit a saved search -*/ + */ function asearch_edit_saved($index) { global $saved_prefkeys, $search_advanced; @@ -439,7 +440,7 @@ function asearch_edit_saved($index) } /** Write a saved search to the prefs -*/ + */ function asearch_write_saved(&$saved_array) { global $saved_prefkeys; @@ -456,7 +457,7 @@ function asearch_write_saved(&$saved_array) } /** Delete a saved search from the prefs -*/ + */ function asearch_delete_saved($saved_index) { global $saved_prefkeys; @@ -470,9 +471,9 @@ function asearch_delete_saved($saved_index) } /** Translate the input date to imap date to local date display, -* so the user can know if the date is wrong or illegal -* @return string locally formatted date or error text -*/ + * so the user can know if the date is wrong or illegal + * @return string locally formatted date or error text + */ function asearch_get_date_display(&$what) { $what_parts = sqimap_asearch_parse_date($what); @@ -486,8 +487,8 @@ function asearch_get_date_display(&$what) } /** Translate the query to rough natural display -* @return string rough natural query ready to display -*/ + * @return string rough natural query ready to display + */ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array) { global $imap_asearch_biops_in, $imap_asearch_biops, $imap_asearch_unops, $imap_asearch_options; @@ -504,7 +505,7 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno $cur_mailbox = 'INBOX'; $biop = asearch_nz($biop_array[$crit_num]); if (($query_display == '') || ($cur_mailbox != $last_mailbox)) { - $mailbox_display = ' ' . asearch_get_mailbox_display($cur_mailbox) . ''; + $mailbox_display = ' ' . htmlspecialchars(asearch_get_mailbox_display($cur_mailbox)) . ''; if ($query_display == '') $biop_display = _("In"); else @@ -523,7 +524,7 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno $where_display = $unop_display . asearch_nz($imap_asearch_options[$where], $where); $what_type = $imap_asearch_opcodes[$where]; $what = $what_array[$crit_num]; - if ($what_type) { /* Check opcode parameter */ + if ($what_type) { /* Check opcode parameter */ if ($what == '') $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)")); else { @@ -549,9 +550,30 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno return $query_display; } +/** + * Creates button + * + * @deprecated see form functions available in 1.5.1 and 1.4.3. + * @param string $type + * @param string $name + * @param string $value + * @param string $js + * @param bool $enabled + */ +function getButton($type, $name, $value, $js = '', $enabled = TRUE) { + $disabled = ( $enabled ? '' : 'disabled ' ); + $js = ( $js ? $js.' ' : '' ); + return ''; +} + + /** Handle the alternate row colors -* @return string color value -*/ + * @return string color value + */ function asearch_get_row_color(&$color, $row_num) { /*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/ @@ -567,7 +589,7 @@ function asearch_get_row_color(&$color, $row_num) } /** Print a whole query array, recent or saved -*/ + */ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$action_array, $title, $show_pref) { global $color; @@ -625,7 +647,7 @@ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$actio } /** Print the saved array -*/ + */ function asearch_print_saved(&$boxes) { global $saved_prefkeys; @@ -634,15 +656,15 @@ function asearch_print_saved(&$boxes) 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")); + $saved_actions = array('edit_saved' => _("Edit"), 'search_saved' => _("Search"), 'delete_saved' => _("Delete")); asearch_print_query_array($boxes, $saved_array, $saved_prefkeys, $saved_actions, _("Saved Searches"), 'search_show_saved'); } } } /** -* Print the recent array -*/ + * Print the recent array + */ function asearch_print_recent(&$boxes) { global $recent_prefkeys, $search_memory; @@ -658,14 +680,14 @@ function asearch_print_recent(&$boxes) } /** Build an ' . "\n"; + return '' . "\n"; } /** Build a ' . "\n"; @@ -676,8 +698,8 @@ function asearch_opt_array($var_name, $opt_array, $cur_val) } /** Verify that a mailbox exists -* @return bool mailbox exists -*/ + * @return bool mailbox exists + */ function asearch_mailbox_exists($mailbox, &$boxes) { foreach ($boxes as $box) { @@ -688,11 +710,11 @@ function asearch_mailbox_exists($mailbox, &$boxes) } /** Build the mailbox select -*/ + */ function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = 0) { if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) { - $missing = asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . asearch_get_mailbox_display($mailbox)); + $missing = asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . htmlspecialchars(asearch_get_mailbox_display($mailbox))); } else { $missing = ''; } @@ -704,15 +726,14 @@ function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = } /** Build the Include subfolders checkbox -*/ + */ function asearch_get_form_sub($sub, $row_num = 0) { - return function_exists('addCheckBox') ? addCheckBox('sub[' . $row_num .']', $sub) - : ''; + return addCheckBox('sub[' . $row_num .']', $sub); } /** Build the 2 unop and where selects -*/ + */ function asearch_get_form_location($unop, $where, $row_num = 0) { global $imap_asearch_unops, $imap_asearch_options; @@ -722,23 +743,21 @@ function asearch_get_form_location($unop, $where, $row_num = 0) } /** Build the what text input -*/ + */ function asearch_get_form_what($what, $row_num = 0) { - return function_exists('addInput') ? addInput('what[' . $row_num . ']', $what, '35') - : ''; + return addInput('what[' . $row_num . ']', $what, '35'); } /** Build the Exclude criteria checkbox -*/ + */ function asearch_get_form_exclude($exclude, $row_num = 0) { - return function_exists('addCheckBox') ? addCheckBox('exclude['.$row_num.']', $exclude) - : ''; + return addCheckBox('exclude['.$row_num.']', $exclude); } /** Print one advanced form row -*/ + */ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num) { global $imap_asearch_biops_in; @@ -749,7 +768,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop //Binary operator echo html_tag('td', $row_num ? asearch_opt_array('biop[' . $row_num . ']', $imap_asearch_biops_in, $biop) - : '' . _("In") . '', 'center') . "\n"; + : '' . _("In") . '', 'center') . "\n"; //Mailbox list and Include Subfolders echo html_tag('td', @@ -769,7 +788,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop } /** Print the advanced search form -*/ + */ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array) { global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html; @@ -797,17 +816,17 @@ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_arra //Submit buttons 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" - . html_tag('td', getButton('SUBMIT', 'submit', $del_all_button_html), 'center') . "\n" - . html_tag('td', getButton('SUBMIT', 'submit', $del_excluded_button_html), 'center') . "\n" + html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n" + . html_tag('td', getButton('submit', 'submit', $add_criteria_button_html), 'center') . "\n" + . html_tag('td', getButton('submit', 'submit', $del_all_button_html), 'center') . "\n" + . html_tag('td', getButton('submit', 'submit', $del_excluded_button_html), 'center') . "\n" ); echo '' . "\n"; echo '' . "\n"; } /** Print one basic form row -*/ + */ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num) { global $search_button_html; @@ -825,13 +844,13 @@ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, echo html_tag('td', asearch_get_form_what($what), 'center') . "\n"; //Submit button - echo html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n"; + echo html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n"; echo "\n"; } /** Print the basic search form -*/ + */ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array) { global $color; @@ -857,69 +876,11 @@ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio echo '' . "\n"; } -/** Print the $msgs messages from $mailbox mailbox -*/ - -function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color) -{ - if (fetchMessageHeaders($imapConnection, $aMailbox)) { - /** - * A mailbox can contain different sets with uid's. Default, for normal - * message list view we use '0' as setindex and for search a different - * setindex. - */ - $iSetIndx = $aMailbox['SETINDEX']; - - $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']); - $mailbox_title = '' . _("Folder:") . ' '. $mailbox_display . ' '; - - /** - * UIDSET contains the array with uid's returned by a search - */ - $cnt = count($aMailbox['UIDSET'][$iSetIndx]); - - $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $cnt : $aMailbox['LIMIT']; - $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $aMailbox['EXISTS']) ? - $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $cnt; - - $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], - $cnt, $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]); - - $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$cnt); - - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo '
'; - mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str"); - echo '
'; - echo ' '; - echo ' '; - echo '
'; - - echo ' '; - echo ' '; - echo '
'; - printHeader($aMailbox); - displayMessageArray($imapConnection, $aMailbox); - echo '
'; - echo '
'; - mail_message_listing_end($cnt, '', $msg_cnt_str); - echo '
'; - } else { - echo '
' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n"; - } -} /** -* @param array $boxes mailboxes array (reference) -* @return array selectable unformatted mailboxes names -*/ + * @param array $boxes mailboxes array (reference) + * @return array selectable unformatted mailboxes names + */ function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes) { $mboxes_array = array(); @@ -958,29 +919,29 @@ $del_all_button_html = _("Remove All Criteria"); $del_all_button_text = asearch_unhtmlentities($del_all_button_html); /** Maximum number of recent searches to handle -* Default 0 -* @global integer $search_memory -*/ + * Default 0 + * @global integer $search_memory + */ $search_memory = getPref($data_dir, $username, 'search_memory', 0); /** Advanced search control -* - 0 => allow basic interface only -* - 1 => allow advanced interface only -* - 2 => allow both -* Default 2 -*/ + * - 0 => allow basic interface only + * - 1 => allow advanced interface only + * - 2 => allow both + * Default 2 + */ $allow_advanced_search = asearch_nz($allow_advanced_search, 2); /** -* Toggle advanced/basic search -*/ + * Toggle advanced/basic search + */ if (sqgetGlobalVar('advanced', $search_advanced, SQ_GET)) { setPref($data_dir, $username, 'search_advanced', $search_advanced & 1); } /** If 1, show advanced search interface -* Default from allow_advanced_search pref -* @global integer $search_advanced -*/ + * Default from allow_advanced_search pref + * @global integer $search_advanced + */ if ($allow_advanced_search > 1) { $search_advanced = getPref($data_dir, $username, 'search_advanced', 0); } else { @@ -988,13 +949,13 @@ if ($allow_advanced_search > 1) { } if ($search_advanced) { /** Set recent prefkeys according to $search_advanced -* @global array $recent_prefkeys -*/ + * @global array $recent_prefkeys + */ $recent_prefkeys = array('asearch_recent_where', 'asearch_recent_mailbox', 'asearch_recent_what', 'asearch_recent_unop', 'asearch_recent_biop', 'asearch_recent_exclude', 'asearch_recent_sub'); /** Set saved prefkeys according to $search_advanced -* @global array $saved_prefkeys -*/ + * @global array $saved_prefkeys + */ $saved_prefkeys = array('asearch_saved_where', 'asearch_saved_mailbox', 'asearch_saved_what', 'asearch_saved_unop', 'asearch_saved_biop', 'asearch_saved_exclude', 'asearch_saved_sub'); /*$asearch_prefkeys = array('where', 'mailbox', 'what', 'biop', 'unop', 'exclude', 'sub');*/ @@ -1004,28 +965,30 @@ if ($search_advanced) { } /** How we did enter the form -* - unset : Enter key, or called from outside (eg read_body) -* - $search_button_text : Search button -* - 'Search_no_update' : Search but don't update recent -* - 'Search_last' : Same as no_update but reload and search last -* - 'Search_silent' : Same as no_update but only display results -* - $add_criteria_button_text : Add New Criteria button -* - $del_excluded_button_text : Remove Excluded Criteria button -* - $del_all_button_text : Remove All Criteria button -* - 'save_recent' -* - 'search_recent' -* - 'forget_recent' -* - 'edit_saved' -* - 'search_saved' -* - 'delete_saved' -* @global string $submit -*/ + * - unset : Enter key, or called from outside (eg read_body) + * - $search_button_text : Search button + * - 'Search_no_update' : Search but don't update recent + * - 'Search_last' : Same as no_update but reload and search last + * - 'Search_silent' : Same as no_update but only display results + * - $add_criteria_button_text : Add New Criteria button + * - $del_excluded_button_text : Remove Excluded Criteria button + * - $del_all_button_text : Remove All Criteria button + * - 'save_recent' + * - 'search_recent' + * - 'forget_recent' + * - 'edit_saved' + * - 'search_saved' + * - 'delete_saved' + * @global string $submit + */ +$searchpressed = false; if (isset($_GET['submit'])) { $submit = strip_tags($_GET['submit']); } + /** Searched mailboxes -* @global array $mailbox_array -*/ + * @global array $mailbox_array + */ if (isset($_GET['mailbox'])) { $mailbox_array = $_GET['mailbox']; $targetmailbox = $_GET['mailbox']; @@ -1034,6 +997,7 @@ if (isset($_GET['mailbox'])) { } } else { $mailbox_array = array(); + $targetmailbox = array(); } $aMailboxGlobalPref = array( MBX_PREF_SORT => 0, @@ -1047,15 +1011,15 @@ $aMailboxGlobalPref = array( * system wide admin settings and incoming vars. */ $aConfig = array( - 'allow_thread_sort' => $allow_thread_sort, - 'allow_server_sort' => $allow_server_sort, +// 'allow_thread_sort' => $allow_thread_sort, +// 'allow_server_sort' => $allow_server_sort, 'user' => $username, - 'max_cache_size' + 'setindex' => 1 ); /** Binary operators -* @global array $biop_array -*/ + * @global array $biop_array + */ if (isset($_GET['biop'])) { $biop_array = $_GET['biop']; if (!is_array($biop_array)) @@ -1064,8 +1028,8 @@ if (isset($_GET['biop'])) { $biop_array = array(); } /** Unary operators -* @global array $unop_array -*/ + * @global array $unop_array + */ if (isset($_GET['unop'])) { $unop_array = $_GET['unop']; if (!is_array($unop_array)) @@ -1074,8 +1038,8 @@ if (isset($_GET['unop'])) { $unop_array = array(); } /** Where to search -* @global array $where_array -*/ + * @global array $where_array + */ if (isset($_GET['where'])) { $where_array = $_GET['where']; if (!is_array($where_array)) { @@ -1085,8 +1049,8 @@ if (isset($_GET['where'])) { $where_array = array(); } /** What to search -* @global array $what_array -*/ + * @global array $what_array + */ if (isset($_GET['what'])) { $what_array = $_GET['what']; if (!is_array($what_array)) { @@ -1096,44 +1060,57 @@ if (isset($_GET['what'])) { $what_array = array(); } /** Whether to exclude this criteria from search -* @global array $exclude_array -*/ + * @global array $exclude_array + */ if (isset($_GET['exclude'])) { $exclude_array = $_GET['exclude']; } else { $exclude_array = array(); } /** Search within subfolders -* @global array $sub_array -*/ + * @global array $sub_array + */ if (isset($_GET['sub'])) { $sub_array = $_GET['sub']; } else { $sub_array = array(); } /** Row number used by recent and saved stuff -*/ + */ if (isset($_GET['rownum'])) { $submit_rownum = strip_tags($_GET['rownum']); } /** Change global sort -*/ + */ if (sqgetGlobalVar('srt', $temp, SQ_GET)) { $srt = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); } if (sqgetGlobalVar('startMessage', $temp, SQ_GET)) { $startMessage = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); } if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) { $showall = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +} + +if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { + $iAccount = (int) $temp; +} else { + $iAccount = 0; } + +/** + * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates + */ +$sTplDir = SM_PATH . 'templates/default/'; + + /** * Incoming submit buttons from the message list with search results */ @@ -1154,21 +1131,21 @@ if (sqgetGlobalVar('moveButton', $moveButton, SQ_POST) || /** Toggle show/hide saved searches -*/ + */ if (sqgetGlobalVar('search_show_saved', $search_show_saved, SQ_GET)) { setPref($data_dir, $username, 'search_show_saved', $search_show_saved & 1); } /** Toggle show/hide recent searches -*/ + */ if (sqgetGlobalVar('search_show_recent', $search_show_recent, SQ_GET)) { setPref($data_dir, $username, 'search_show_recent', $search_show_recent & 1); } // end of get globals /** If TRUE, do not show search interface -* Default FALSE -* @global bool $search_silent -*/ + * Default FALSE + * @global bool $search_silent + */ $search_silent = FALSE; /* See how the page was called and fire off correct function */ @@ -1213,7 +1190,7 @@ if (!isset($submit)) { array_splice($unop_array, $delrow, 1); array_splice($where_array, $delrow, 1); array_splice($what_array, $delrow, 1); - /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */ + /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */ array_splice($sub_array, $delrow, 1); } $exclude_array = array(); @@ -1235,7 +1212,7 @@ if (!isset($submit)) { asearch_edit_recent($submit_rownum); asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); break; - case 'edit_recent': /* no link to do this, yet */ + case 'edit_recent': /* no link to do this, yet */ asearch_edit_recent($submit_rownum); break; case 'forget_recent': @@ -1270,7 +1247,7 @@ if ($search_advanced) { 'BCC' => _("Bcc"), 'BEFORE' => _("Before"), 'BODY' => _("Message Body"), - 'CC' => _("CC"), + 'CC' => _("Cc"), 'DELETED' => _("Deleted"), 'DRAFT' => _("Draft"), 'FLAGGED' => _("Flagged"), @@ -1294,7 +1271,7 @@ if ($search_advanced) { 'TEXT' => _("Header and Body"), 'TO' => _("Sent To"), //'UID' => 'anum', -/* 'UNANSWERED' => '', +/* 'UNANSWERED' => '', 'UNDELETED' => '', 'UNDRAFT' => '', 'UNFLAGGED' => '', @@ -1334,16 +1311,82 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0 $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 (($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($composenew) && $composenew) { - $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox) - . "&session=$composesession&attachedmessages=true&"; - displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false); + +/** +* Handle form actions like flag / unflag, seen / unseen, delete +*/ +if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) { + if ($postMailbox) { + /** + * system wide admin settings and incoming vars. + */ + $aConfig = array( + 'user' => $username, + ); + $aConfig['setindex'] = 1; // $what $where = 'search' + /** + * Set the max cache size to the number of mailboxes to avoid cache cleanups + * when searching all mailboxes + */ + $aConfig['max_cache_size'] = count($boxes) +1; + + $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $postMailbox,$aConfig,array()); + $sError = handleMessageListForm($imapConnection,$aMailbox); + /* add the mailbox to the cache */ + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + + if ($sError) { + $note = $sError; + } + } +} + +if (isset($aMailbox['FORWARD_SESSION'])) { + /* add the mailbox to the cache */ + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); + + if ($compose_new_win) { + // write the session in order to make sure that the compose window has + // access to the composemessages array which is stored in the session + session_write_close(); + // restart the session. Do not use sqsession_is_active because the session_id + // isn't empty after a session_write_close + sqsession_start(); + + if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { + $compose_width = '640'; + } + if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { + $compose_height = '550'; + } + // do not use &, it will break the query string and $session will not be detected!!! + $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). + '&session='.$aMailbox['FORWARD_SESSION']; + displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false); + } else { + // save mailboxstate + sqsession_register($aMailbox,'aLastSelectedMailbox'); + session_write_close(); + // we have to redirect to the compose page + $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). + '&session='.$aMailbox['FORWARD_SESSION']; + header("Location: $location"); + exit; + } } else { displayPageHeader($color, $mailbox); +// $compose_uri = $base_uri.'src/compose.php?newmessage=1'; +} + +if (isset($note)) { + echo html_tag( 'div', '' . htmlspecialchars($note) .'', 'center' ) . "
\n"; } + + do_hook('search_before_form'); if (!$search_silent) { @@ -1398,13 +1441,14 @@ if (!$search_silent) { do_hook('search_after_form'); if ($submit == $search_button_text) { + $msgsfound = false; 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, $sub_array), 'center', $color[4])); echo '' . "\n"; flush(); - + $iMsgCnt = 0; $query_error = asearch_check_query($where_array, $what_array, $exclude_array); if ($query_error != '') { echo '
' . html_tag('div', asearch_get_error_display($color, $query_error), 'center') . "\n"; @@ -1415,32 +1459,28 @@ if ($submit == $search_button_text) { */ $mboxes_mailbox = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array, $mboxes_array); foreach($mboxes_mailbox as $mbx => $search) { - $aMailboxPrefSer=getPref($data_dir, $username, "pref_$mbx"); + /** + * until there is no per mailbox option screen to set prefs we override + * the mailboxprefs by the default ones + */ + + $aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$iAccount.'_'.$mbx); if ($aMailboxPrefSer) { $aMailboxPref = unserialize($aMailboxPrefSer); + $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; } else { - setUserPref($username,"pref_$mbx",serialize($aMailboxGlobalPref)); - $aMailboxPref = $aMailboxGlobalPref; + setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($default_mailbox_pref)); + $aMailboxPref = $default_mailbox_pref; } if (isset($srt) && $targetmailbox == $mbx) { $aMailboxPref[MBX_PREF_SORT] = (int) $srt; } - if (isset($startMessage) && $targetmailbox == $mbx) { - $aConfig['offset'] = $startMessage; - } else if (isset($aConfig['offset'])) { - unset($aConfig['offset']); - } - if (isset($showall) && $targetmailbox == $mbx) { - $aConfig['showall'] = $showall; - } else if (isset($aConfig['showall'])) { - unset($aConfig['showall']); - } - /** - * Set the max cache size to the number of mailboxes to avoid cache cleanups - * when searching all mailboxes - */ - $aConfig['max_cache_size'] = count($mboxes_mailbox) +1; + + $trash_folder = (isset($trash_folder)) ? $trash_folder : false; + $sent_folder = (isset($sent_folder)) ? $sent_folder : false; + $draft_folder = (isset($draft_folder)) ? $draft_folder : false; + /** * until there is no per mailbox option screen to set prefs we override @@ -1449,31 +1489,157 @@ if ($submit == $search_button_text) { $aMailboxPref[MBX_PREF_LIMIT] = (int) $show_num; $aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge; $aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort'); + $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; + + /** + * Replace From => To in case it concerns a draft or sent folder + */ + if (($mbx == $sent_folder || $mbx == $draft_folder) && + !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) { + $aNewOrder = array(); // nice var name ;) + foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + if ($iCol == SQM_COL_FROM) { + $iCol = SQM_COL_TO; + } + $aNewOrder[] = $iCol; + } + $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder; + setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($aMailboxPref)); + } - echo '
'; $aConfig['search'] = $search['search']; $aConfig['charset'] = $search['charset']; - $aConfig['setindex'] = 1; // $what $where = 'search' - $aMailbox = sqm_api_mailbox_select($imapConnection,$mbx,$aConfig,$aMailboxPref); /** - * Handle form actions like flag / unflag, seen / unseen, delete + * Set the max cache size to the number of mailboxes to avoid cache cleanups + * when searching all mailboxes + */ + $aConfig['max_cache_size'] = count($mboxes_mailbox) +1; + if (isset($startMessage) && $targetmailbox == $mbx) { + $aConfig['offset'] = $startMessage; + } else { + $aConfig['offset'] = 0; + } + if (isset($showall) && $targetmailbox == $mbx) { + $aConfig['showall'] = $showall; + } else { + if (isset($aConfig['showall'])) { + unset($aConfig['showall']); + } + $showall = false; + } + + /** + * Set the config options for the messages list */ - if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) { - if ($postMailbox === $mbx) { - handleMessageListForm($imapConnection,$aMailbox); + $aColumns = array(); + foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + $aColumns[$iCol] = array(); + switch ($iCol) { + case SQM_COL_SUBJ: + if ($truncate_subject) { + $aColumns[$iCol]['truncate'] = $truncate_subject; + } + break; + case SQM_COL_FROM: + case SQM_COL_TO: + case SQM_COL_CC: + case SQM_COL_BCC: + if ($truncate_sender) { + $aColumns[$iCol]['truncate'] = $truncate_sender; + } + break; } } - asearch_print_mailbox_msgs($imapConnection, $aMailbox, $color); + + + $aProps = array( + 'columns' => $aColumns, + 'config' => array('alt_index_colors' => $alt_index_colors, + 'highlight_list' => $message_highlight_list, + 'fancy_index_highlite' => $fancy_index_highlite, + 'show_flag_buttons' => (isset($show_flag_buttons)) ? $show_flag_buttons : true, + 'lastTargetMailbox' => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '', + 'trash_folder' => $trash_folder, + 'sent_folder' => $sent_folder, + 'draft_folder' => $draft_folder, + 'enablesort' => true, + 'color' => $color + ), + 'mailbox' => $mbx, + 'account' => (isset($iAccount)) ? $iAccount : 0, + 'module' => 'read_body', + 'email' => false); + + + $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mbx,$aConfig,$aMailboxPref); + + $iError = 0; + $aTemplate = showMessagesForMailbox($imapConnection, $aMailbox,$aProps, $iError); + + // in th future we can make use of multiple message sets, now set it to 1 for search. + $iSetIndex = 1; + if (isset($aMailbox['UIDSET'][$iSetIndex])) { + $iMsgCnt += count($aMailbox['UIDSET'][$iSetIndex]); + } + if ($iError) { + // error handling + } else { + /** + * In the future, move this the the initialisation area + */ + sqgetGlobalVar('align',$align,SQ_SESSION); + + $oTemplate = new Template($sTplDir); + + if ($aMailbox['EXISTS'] > 0) { + if ($iError) { + // TODO + echo "ERROR occured, errorhandler will be implemented very soon"; + } else { + foreach ($aTemplate as $k => $v) { + $oTemplate->assign($k, $v); + } + + $oTemplate->assign('page_selector', $page_selector); + $oTemplate->assign('page_selector_max', $page_selector_max); + $oTemplate->assign('compact_paginator', $compact_paginator); + $oTemplate->assign('javascript_on', $javascript_on); + $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false); + $oTemplate->assign('icon_theme_path', $icon_theme_path); + $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false); + $oTemplate->assign('aOrder', array_keys($aColumns)); + $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false); + $oTemplate->assign('color', $color); + $oTemplate->assign('align', $align); + + $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']); + if (strtoupper($mbx) == 'INBOX') { + $mailbox_display = _("INBOX"); + } else { + $mailbox_display = imap_utf7_decode_local($mbx); + } + + echo '
' . _("Folder:") . ' '. htmlspecialchars($mailbox_display) . ' '; + + $oTemplate->display('message_list.tpl'); + } + } + } + /* add the mailbox to the cache */ - $mailbox_cache[$aMailbox['NAME']] = $aMailbox; + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; } } + if(!$iMsgCnt) { + echo '
' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n"; + } } do_hook('search_bottom'); sqimap_logout($imapConnection); -echo ''; +$oTemplate->display('footer.tpl'); sqsession_register($mailbox_cache,'mailbox_cache'); -?> \ No newline at end of file + +?>