X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=720cec595c9edb60dac04d78f7c340f4e0b0ccdb;hb=48027e89566ad3b27266166bc8f11cfbb5670d5b;hp=3d49744ef5b0d40026b1d681966a446e6da072d5;hpb=794d59c03f4269cdbb49e0789e94a9368a7b0a24;p=squirrelmail.git
diff --git a/src/search.php b/src/search.php
index 3d49744e..720cec59 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,427 +1,1483 @@
$tit\n";
+/** Name of session var
+*/
+define('ASEARCH_CRITERIA', 'criteria');
+
+/** Builds a href with params
+* @param string $params optional parameters to GET
+*/
+function asearch_get_href($params = '')
+{
+ $href = 'search.php';
+ if ($params != '')
+ $href .= '?' . $params;
+ return $href;
}
-/* function to get the recent searches and put them in the attributes array */
-function get_recent($username, $data_dir) {
- $attributes = array();
- $types = array('search_what', 'search_where', 'search_folder');
- $recent_count = getPref($data_dir, $username, 'search_memory', 0);
- for ($x=1;$x<=$recent_count;$x++) {
- reset($types);
- foreach ($types as $key) {
- $attributes[$key][$x] = getPref($data_dir, $username, $key.$x, "");
- }
+/** Builds a [link]
+* @param string $href (reference)
+* @param string $text
+* @param string $title
+*/
+function asearch_get_link(&$href, $text, $title = '')
+{
+ if ($title != '')
+ $title = ' title="' . $title . '"';
+ return '' . $text . '';
+}
+
+/** Builds a toggle [link]
+* @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]));
+}
+
+/**
+* @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)
+*/
+function imap_get_mailbox_display($mailbox)
+{
+ if (strtoupper($mailbox) == 'INBOX')
+ return _("INBOX");
+ return imap_utf7_decode_local($mailbox);
+}
+
+/**
+* @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')
+ return _("All Folders");
+ return imap_get_mailbox_display($mailbox);
+}
+
+/**
+* @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
+*/
+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
+*/
+function asearch_serialize(&$input_array)
+{
+ global $search_advanced;
+ if ($search_advanced)
+ return serialize($input_array);
+ return $input_array[0];
+}
+
+/**
+* @param string $input_string string to unserialize
+* @return array
+*/
+function asearch_unserialize($input_string)
+{
+ global $search_advanced;
+ if ($search_advanced)
+ return unserialize($input_string);
+ return array($input_string);
+}
+
+/**
+* @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;
+ return getPref($data_dir, $username, $key . ($index + !$search_advanced), $default);
+}
+
+/**
+* @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;
+ return setPref($data_dir, $username, $key . ($index + !$search_advanced), $value);
+}
+
+/**
+* @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;
+ return removePref($data_dir, $username, $key . ($index + !$search_advanced));
+}
+
+/** 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;
+
+ 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 $attributes;
+ return '';
}
-/* function to get the saved searches and put them in the saved_attributes array */
-function get_saved($username, $data_dir) {
- $saved_attributes = array();
- $types = array('saved_what', 'saved_where', 'saved_folder');
- foreach ($types as $key) {
- for ($x=1;;$x++) {
- $saved_attributes[$key][$x] = getPref($data_dir, $username, $key."$x", "");
- if ($saved_attributes[$key][$x] == "") {
- array_pop($saved_attributes[$key]);
- break;
- }
+/** Read the recent searches from the prefs
+*/
+function asearch_read_recent()
+{
+ global $recent_prefkeys, $search_memory;
+
+ $recent_array = array();
+ $recent_num = 0;
+ for ($pref_num = 0; $pref_num < $search_memory; $pref_num++) {
+ foreach ($recent_prefkeys as $prefkey) {
+ $pref = asearch_getPref($prefkey, $pref_num);
+/* if (!empty($pref))*/
+ $recent_array[$prefkey][$recent_num] = $pref;
}
- }
- return $saved_attributes;
-}
-
-/* function to update recent pref arrays */
-function update_recent($what, $where, $mailbox, $username, $data_dir) {
- $attributes = array();
- $types = array('search_what', 'search_where', 'search_folder');
- $input = array($what, $where, $mailbox);
- $attributes = get_recent( $username, $data_dir);
- reset($types);
- $dupe = 'no';
- for ($i=1;$i<=count($attributes['search_what']);$i++) {
- if (isset($attributes['search_what'][$i])) {
- if ($what == $attributes['search_what'][$i] &&
- $where == $attributes['search_where'][$i] &&
- $mailbox == $attributes['search_folder'][$i]) {
- $dupe = 'yes';
+ 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
}
+ else
+ $recent_num++;
}
- if ($dupe == 'no') {
- $i = 0;
- foreach ($types as $key) {
- array_push ($attributes[$key], $input[$i]);
- array_shift ($attributes[$key]);
- $i++;
- }
- $recent_count = getPref($data_dir, $username, 'search_memory', 0);
- $n=0;
- for ($i=1;$i<=$recent_count;$i++) {
- reset($types);
- foreach ($types as $key) {
- setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
- }
- $n++;
+ return $recent_array;
+}
+
+/** Read the saved searches from the prefs
+*/
+function asearch_read_saved()
+{
+ global $saved_prefkeys;
+
+ $saved_array = array();
+ $saved_key = $saved_prefkeys[0];
+ for ($saved_count = 0; ; $saved_count++) {
+ $pref = asearch_getPref($saved_key, $saved_count);
+ if (empty($pref))
+ break;
+ }
+ for ($saved_num = 0; $saved_num < $saved_count; $saved_num++) {
+ foreach ($saved_prefkeys as $key) {
+ $saved_array[$key][$saved_num] = asearch_getPref($key, $saved_num);
}
}
+ return $saved_array;
}
-/* function to forget a recent search */
-function forget_recent($forget_index, $username, $data_dir) {
- $attributes = array();
- $types = array('search_what', 'search_where', 'search_folder');
- $attributes = get_recent( $username, $data_dir);
- reset($types);
- foreach ($types as $key) {
- array_splice($attributes[$key], $forget_index, 1);
- array_unshift($attributes[$key], '');
- }
- reset($types);
- $recent_count = getPref($data_dir, $username, 'search_memory', 0);
- $n=0;
- for ($i=1;$i<=$recent_count;$i++) {
- reset($types);
- foreach ($types as $key) {
- setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
- }
+/** Save a recent search to the prefs
+*/
+function asearch_save_recent($recent_index)
+{
+ global $recent_prefkeys, $saved_prefkeys;
+
+ $saved_array = asearch_read_saved();
+ $saved_index = count($saved_array[$saved_prefkeys[0]]);
+ $recent_array = asearch_read_recent();
+ $n = 0;
+ foreach ($recent_prefkeys as $key) {
+ $recent_slice = array_slice($recent_array[$key], $recent_index, 1);
+ if (!empty($recent_slice[0]))
+ asearch_setPref($saved_prefkeys[$n], $saved_index, $recent_slice[0]);
+ else
+ asearch_removePref($saved_prefkeys[$n], $saved_index);
$n++;
}
}
-/* function to delete a saved search */
-function delete_saved($delete_index, $username, $data_dir) {
- $types = array('saved_what', 'saved_where', 'saved_folder');
- $attributes = get_saved($username, $data_dir);
- foreach ($types as $key) {
- array_splice($attributes[$key], $delete_index, 1);
+/** Write a recent search to prefs
+*/
+function asearch_write_recent(&$recent_array)
+{
+ global $recent_prefkeys, $search_memory;
+
+ $recent_count = min($search_memory, count($recent_array[$recent_prefkeys[0]]));
+ for ($recent_num = 0; $recent_num < $recent_count; $recent_num++) {
+ foreach ($recent_prefkeys as $key) {
+ asearch_setPref($key, $recent_num, $recent_array[$key][$recent_num]);
+ }
}
- reset($types);
- $n=0;
- $saved_count = count($attributes['saved_what']);
- $last_element = $saved_count + 1;
- for ($i=1;$i<=$saved_count;$i++) {
- reset($types);
- foreach ($types as $key) {
- setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
- }
- $n++;
+ for (; $recent_num < $search_memory; $recent_num++) {
+ foreach ($recent_prefkeys as $key) {
+ asearch_removePref($key, $recent_num);
}
- reset($types);
- foreach($types as $key) {
- removePref($data_dir, $username, $key.$last_element);
}
}
-/* function to save a search from recent to saved */
-function save_recent($save_index, $username, $data_dir) {
- $attributes = array();
- $types = array('search_what', 'search_where', 'search_folder');
- $saved_types = array(0 => 'saved_what', 1 => 'saved_where', 2 => 'saved_folder');
- $saved_array = get_saved($username, $data_dir);
- $save_index = $save_index -1;
- $saved_count = (count($saved_array['saved_what']) + 1);
- $attributes = get_recent ($username, $data_dir);
- $n = 0;
- foreach ($types as $key) {
- $slice = array_slice($attributes[$key], $save_index, 1);
- $name = $saved_types[$n];
- setPref($data_dir, $username, $name.$saved_count, $slice[0]);
- $n++;
+/** Remove a recent search from prefs
+*/
+function asearch_forget_recent($forget_index)
+{
+ global $recent_prefkeys;
+
+ $recent_array = asearch_read_recent();
+ foreach ($recent_prefkeys as $key) {
+ array_splice($recent_array[$key], $forget_index, 1);
}
+ asearch_write_recent($recent_array);
}
-/* ------------------------ main ------------------------ */
+/** 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;
-/* reset these arrays on each page load just in case */
-$attributes = array ();
-$saved_attributes = array ();
-$search_all = 'none';
-$perbox_count = array ();
-$recent_count = getPref($data_dir, $username, 'search_memory', 0);
+ $where_string = asearch_serialize($where_array);
+ $mailbox_string = asearch_serialize($mailbox_array);
+ $what_string = asearch_serialize($what_array);
+ $unop_string = asearch_serialize($unop_array);
+ if ($search_advanced) {
+ $biop_string = asearch_serialize($biop_array);
+ $exclude_string = asearch_serialize($exclude_array);
+ $sub_string = asearch_serialize($sub_array);
+ }
+ $recent_count = count($recent_array[$recent_prefkeys[ASEARCH_WHERE]]);
+ for ($recent_num = 0; $recent_num < $recent_count; $recent_num++) {
+ if (isset($recent_array[$recent_prefkeys[ASEARCH_WHERE]][$recent_num])) {
+ if (
+ $where_string == $recent_array[$recent_prefkeys[ASEARCH_WHERE]][$recent_num] &&
+ $mailbox_string == $recent_array[$recent_prefkeys[ASEARCH_MAILBOX]][$recent_num] &&
+ $what_string == $recent_array[$recent_prefkeys[ASEARCH_WHAT]][$recent_num] &&
+ $unop_string == $recent_array[$recent_prefkeys[ASEARCH_UNOP]][$recent_num] &&
+ ((!$search_advanced) ||
+ ($biop_string == $recent_array[$recent_prefkeys[ASEARCH_BIOP]][$recent_num] &&
+ $exclude_string == $recent_array[$recent_prefkeys[ASEARCH_EXCLUDE]][$recent_num] &&
+ $sub_string == $recent_array[$recent_prefkeys[ASEARCH_SUB]][$recent_num]))
+ )
+ return $recent_num;
+ }
+ }
+ return -1;
+}
-/* get mailbox names */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$boxes = sqimap_mailbox_list($imapConnection);
+/** 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;
+ //global $what; // Hack to access issued search from read_body.php
+ $what = 1;
+ /**
+ * Update search history and store it in the session so we can retrieve the
+ * issued search when returning from an external page like read_body.php
+ */
+ $criteria[$what] = array($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+ sqsession_register($criteria, ASEARCH_CRITERIA);
+ 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
+ foreach ($recent_prefkeys as $key) {
+ array_splice($recent_array[$key], $recent_found, 1);
+ }
+ }
+ $input = array($where_array, $mailbox_array, $what_array, $unop_array, $biop_array, $exclude_array, $sub_array);
+ $i = 0;
+ foreach ($recent_prefkeys as $key) {
+ array_unshift($recent_array[$key], asearch_serialize($input[$i]));
+ $i++;
+ }
+ asearch_write_recent($recent_array);
+ }
+}
-/* set current mailbox to INBOX if none was selected or if page
- was called to search all folders. */
-if ( !isset($mailbox) || $mailbox == 'None' || $mailbox == '' ) {
- $mailbox = $boxes[0]['unformatted'];
+/** Edit a recent search
+* @global array mailbox_array searched mailboxes
+*/
+function asearch_edit_recent($index)
+{
+ global $recent_prefkeys, $search_advanced;
+ global $where_array, $mailbox_array, $what_array, $unop_array;
+ global $biop_array, $exclude_array, $sub_array;
+
+ $where_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_WHERE], $index));
+ $mailbox_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_MAILBOX], $index));
+ $what_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_WHAT], $index));
+ $unop_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_UNOP], $index));
+ if ($search_advanced) {
+ $biop_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_BIOP], $index));
+ $exclude_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_EXCLUDE], $index));
+ $sub_array = asearch_unserialize(asearch_getPref($recent_prefkeys[ASEARCH_SUB], $index));
+ }
}
-if ($mailbox == 'All Folders') {
- $search_all = 'all';
+
+/** Get last search criteria from session or prefs
+* 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;
+ global $biop_array, $exclude_array, $sub_array;
+ $mailbox_array = $criteria[$index][0];
+ $biop_array = $criteria[$index][1];
+ $unop_array = $criteria[$index][2];
+ $where_array = $criteria[$index][3];
+ $what_array = $criteria[$index][4];
+ $exclude_array = $criteria[$index][5];
+ $sub_array = $criteria[$index][6];
+ unset($criteria[$index]);
+ //sqsession_unregister(ASEARCH_CRITERIA);
+ } else {
+ global $search_memory;
+ if ($search_memory > 0) {
+ asearch_edit_recent(0);
+ }
+ }
}
-displayPageHeader($color, $mailbox);
+/** Edit a saved search
+*/
+function asearch_edit_saved($index)
+{
+ global $saved_prefkeys, $search_advanced;
+ global $where_array, $mailbox_array, $what_array, $unop_array;
+ global $biop_array, $exclude_array, $sub_array;
-/* See how the page was called and fire off correct function */
-if ((!isset($submit) || empty($submit)) && !empty($what)) {
- $submit = _("Search");
-}
-if ( !isset( $submit ) ) {
- $submit = '';
-} else if ($submit == _("Search") && !empty($what)) {
- if ($recent_count > 0) {
- update_recent($what, $where, $mailbox, $username, $data_dir);
+ $where_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_WHERE], $index));
+ $mailbox_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_MAILBOX], $index));
+ $what_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_WHAT], $index));
+ $unop_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_UNOP], $index));
+ if ($search_advanced) {
+ $biop_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_BIOP], $index));
+ $exclude_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_EXCLUDE], $index));
+ $sub_array = asearch_unserialize(asearch_getPref($saved_prefkeys[ASEARCH_SUB], $index));
}
}
-elseif ($submit == 'forget') {
- forget_recent($count, $username, $data_dir);
+
+/** Write a saved search to the prefs
+*/
+function asearch_write_saved(&$saved_array)
+{
+ global $saved_prefkeys;
+
+ $saved_count = count($saved_array[$saved_prefkeys[0]]);
+ for ($saved_num=0; $saved_num < $saved_count; $saved_num++) {
+ foreach ($saved_prefkeys as $key) {
+ asearch_setPref($key, $saved_num, $saved_array[$key][$saved_num]);
+ }
+ }
+ foreach ($saved_prefkeys as $key) {
+ asearch_removePref($key, $saved_count);
+ }
}
-elseif ($submit == 'save') {
- save_recent($count, $username, $data_dir);
+
+/** Delete a saved search from the prefs
+*/
+function asearch_delete_saved($saved_index)
+{
+ global $saved_prefkeys;
+
+ $saved_array = asearch_read_saved();
+ $asearch_keys = $saved_prefkeys;
+ foreach ($asearch_keys as $key) {
+ array_splice($saved_array[$key], $saved_index, 1);
+ }
+ asearch_write_saved($saved_array);
}
-elseif ($submit == 'delete') {
- delete_saved($count, $username, $data_dir);
+
+/** 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
+*/
+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]))
+ return date_intl(_("M j, Y"), mktime(0,0,0,$what_parts[2],$what_parts[1],$what_parts[3]));
+ //return $what_parts[1] . ' ' . getMonthName($what_parts[2]) . ' ' . $what_parts[3];
+ return _("(Illegal date)");
+ }
+ return _("(Wrong date)");
}
-do_hook('search_before_form');
+/** Translate the query to rough natural 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;
+ global $imap_asearch_opcodes;
-echo "
\n".
- "
\n".
- "\n".
- "" . _("Search") . "\n".
- " |
\n".
- "
\n";
-
-/* update the recent and saved searches from the pref files */
-$attributes = get_recent($username, $data_dir);
-$saved_attributes = get_saved($username, $data_dir);
-$saved_count = count($saved_attributes['saved_what']);
-$count_all = 0;
-
-/* Saved Search Table */
-if ($saved_count > 0) {
- echo "
\n"
- . ""
- . 'Saved Searches |
'
- . '';
- for ($i=0; $i < $saved_count; ++$i) {
- if ($i % 2) {
- echo "";
- } else {
- echo " ";
- }
- echo "".$saved_attributes['saved_folder'][$i]." | "
- . "".$saved_attributes['saved_what'][$i]." | "
- . "".$saved_attributes['saved_where'][$i]." | "
- . ''
- . '' . _("edit") . ''
- . ' | '
- . '' . _("search") . ''
- . ' | '
- . ""
- . _("delete")
- . ''
- . ' | ';
- }
- echo " |
\n";
-}
-
-/* Recent Search Table */
-if ($recent_count > 0) {
- echo "
\n"
- . "\n"
- . '' . _("Recent Searches") . ' |
'
- . '';
- for ($i=1; $i <= $recent_count; ++$i) {
- if (isset($attributes['search_folder'][$i])) {
- if ($attributes['search_folder'][$i] == "") {
- $attributes['search_folder'][$i] = "INBOX";
+ $last_mailbox = $mailbox_array[0];
+ if (empty($last_mailbox))
+ $last_mailbox = 'INBOX';
+ $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[$crit_num]);
+ if (($query_display == '') || ($cur_mailbox != $last_mailbox)) {
+ $mailbox_display = ' ' . asearch_get_mailbox_display($cur_mailbox) . '';
+ if ($query_display == '')
+ $biop_display = _("In");
+ else
+ $biop_display = $imap_asearch_biops_in[$biop];
+ $last_mailbox = $cur_mailbox;
}
+ else {
+ $mailbox_display = '';
+ $biop_display = $imap_asearch_biops[$biop];
}
- if ($i % 2) {
- echo "";
- } else {
- echo " ";
+ $unop = $unop_array[$crit_num];
+ $unop_display = $imap_asearch_unops[$unop];
+ if ($unop_display != '')
+ $unop_display .= ' ';
+ $where = $where_array[$crit_num];
+ $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 == '')
+ $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)"));
+ else {
+ if ($what_type == 'adate')
+ $what_display = asearch_get_date_display($what);
+ else
+ $what_display = htmlspecialchars($what);
+ $what_display = ' ' . $what_display . '';
+ }
}
- if (isset($attributes['search_what'][$i]) &&
- !empty($attributes['search_what'][$i])) {
- echo "".$attributes['search_folder'][$i]." | "
- . "".$attributes['search_what'][$i]." | "
- . "".$attributes['search_where'][$i]." | "
- . ''
- . ""
- . _("save")
- . ''
- . ' | '
- . '' . _("search") . ''
- . ' | '
- . ""
- . _("forget")
- . ''
- . ' | ';
- }
+ else {
+ if ($what)
+ $what_display = ' ' . asearch_get_error_display($color, _("(Spurious argument)"));
+ else
+ $what_display = '';
+ }
+ if ($mailbox_display != '')
+ $query_display .= ' ' . $biop_display . '' . $mailbox_display . ' ' . $where_display . '' . $what_display;
+ else
+ $query_display .= ' ' . $biop_display . ' ' . $where_display . '' . $what_display;
}
- echo ' |
';
-}
-
-/* Search Form */
-echo '' . _("Current Search") . ''
- . '\n".
- " \n".
- "\n";
+ }
+}
+/** Build an ' . "\n";
+}
-do_hook('search_after_form');
+/** Build a