X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsearch.php;h=f14484e1fbb6021dca27ffa85b21475baa03d030;hp=4a074871e36e9aad6a8f07c60fda963a38e302a4;hb=e1728a7ada03ba597fc2f8a800773cb427a711ce;hpb=ba5f492cea317959a2da51481215927fa9f57aea
diff --git a/src/search.php b/src/search.php
index 4a074871..f14484e1 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,526 +1,1483 @@
' . $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));
+}
-/* here are some functions, could go in imap_search.php
- this was here, pretty handy */
-function s_opt( $val, $sel, $tit ) {
- echo " \n";
+ return '';
}
-/* 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, "");
+/** 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;
+ }
+ 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++;
}
- return $attributes;
+ return $recent_array;
}
-/* 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 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_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';
- }
+ return $saved_array;
+}
+
+/** 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++;
+ }
+}
+
+/** 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]);
+ }
+ }
+ for (; $recent_num < $search_memory; $recent_num++) {
+ foreach ($recent_prefkeys as $key) {
+ asearch_removePref($key, $recent_num);
+ }
+ }
+}
+
+/** 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);
+}
+
+/** 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;
+
+ $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;
}
}
- if ($dupe == 'no') {
+ return -1;
+}
+
+/** 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 ($types as $key) {
- array_push ($attributes[$key], $input[$i]);
- array_shift ($attributes[$key]);
+ foreach ($recent_prefkeys as $key) {
+ array_unshift($recent_array[$key], asearch_serialize($input[$i]));
$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++;
+ asearch_write_recent($recent_array);
+ }
+}
+
+/** 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));
+ }
+}
+
+/** 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);
}
}
}
-/* 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, 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]);
+/** 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;
+
+ $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));
+ }
+}
+
+/** 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]);
}
- $n++;
}
+ foreach ($saved_prefkeys as $key) {
+ asearch_removePref($key, $saved_count);
+ }
+}
+
+/** 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);
}
-/* 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);
+/** 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)");
}
- 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]);
+ return _("(Wrong date)");
+}
+
+/** 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;
+
+ $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;
}
- $n++;
+ else {
+ $mailbox_display = '';
+ $biop_display = $imap_asearch_biops[$biop];
+ }
+ $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 . '';
+ }
+ }
+ 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;
}
- reset($types);
- foreach($types as $key) {
- removePref($data_dir, $username, $key.$last_element);
}
+ return $query_display;
}
-/* 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++;
+/** Handle the alternate row colors
+* @return string color value
+*/
+function asearch_get_row_color(&$color, $row_num)
+{
+/*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/
+ $color_string = $color[4];
+ if ($GLOBALS['alt_index_colors']) {
+ if (($row_num % 2) == 0) {
+ if (!isset($color[12]))
+ $color[12] = '#EAEAEA';
+ $color_string = $color[12];
+ }
}
+ return $color_string;
}
-function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $where, $what, $usecache = false, $newsort = false) {
- global $sort, $color;
-
- $msort = calc_msort($msgs, $sort);
- if ($cnt > 0) {
- if ( $mailbox == 'INBOX' ) {
- $showbox = _("INBOX");
- } else {
- $showbox = imap_utf7_decode_local($mailbox);
- }
- echo html_tag( 'div', '' . _("Folder:") . ' '. $showbox.'','center') . "\n";
+/** 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;
+ global $data_dir, $username;
+ global $use_icons, $icon_theme;
+ $show_flag = getPref($data_dir, $username, $show_pref, 0) & 1;
+ $use_icons_flag = ($use_icons) && ($icon_theme != 'none');
+ if ($use_icons_flag)
+ $text_array = array('',
+ '');
+ else
+ $text_array = array('-', '+');
+ $toggle_link = asearch_get_toggle_link(!$show_flag, $show_pref, $text_array, array(_("Fold"), _("Unfold")));
+ if (!$use_icons_flag)
+ $toggle_link = '[' . $toggle_link . ']';
- $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
- $toggle_all = get_selectall_link(1, $sort);
+ echo "
\n";
+ echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"');
+ echo html_tag('tr',
+ html_tag('td', $toggle_link, 'center', $color[5], 'width="5%"')
+ . html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=4'));
+ if ($show_flag) {
+ $main_key = $query_keys[ASEARCH_WHERE];
+ $query_count = count($query_array[$main_key]);
+ for ($query_num = 0, $row_num = 0; $query_num < $query_count; $query_num++) {
+ if (!empty($query_array[$main_key][$query_num])) {
+ echo html_tag('tr', '', '', asearch_get_row_color($color, $row_num));
- echo '
';
- mail_message_listing_beginning($imapConnection, $mailbox, $sort,
- $msg_cnt_str, $toggle_all, 1);
+ unset($search_array);
+ foreach ($query_keys as $query_key) {
+ $search_array[] = asearch_unserialize($query_array[$query_key][$query_num]);
+ }
+ $where_array = $search_array[ASEARCH_WHERE];
+ $mailbox_array = $search_array[ASEARCH_MAILBOX];
+ $what_array = $search_array[ASEARCH_WHAT];
+ $unop_array = $search_array[ASEARCH_UNOP];
+ $biop_array = asearch_nz($search_array[ASEARCH_BIOP], array());
+ $exclude_array = asearch_nz($search_array[ASEARCH_EXCLUDE], array());
+ $sub_array = asearch_nz($search_array[ASEARCH_SUB], array());
+ $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+ 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');
+ }
- printHeader($mailbox, 6, $color, false);
+ echo ' |
' . "\n";
+ $row_num++;
+ }
+ }
+ }
+ echo '
' . "\n";
+}
- displayMessageArray($imapConnection, $cnt, 1,
- $msort, $mailbox, $sort, $color, $cnt, $where, $what);
+/** Print the saved array
+*/
+function asearch_print_saved(&$boxes)
+{
+ global $saved_prefkeys;
- mail_message_listing_end($cnt, '', $msg_cnt_str, $color);
- echo '';
-
+ $saved_array = asearch_read_saved();
+ 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($boxes, $saved_array, $saved_prefkeys, $saved_actions, _("Saved Searches"), 'search_show_saved');
+ }
}
-}
+}
-/* ------------------------ main ------------------------ */
+/**
+* Print the recent array
+*/
+function asearch_print_recent(&$boxes)
+{
+ global $recent_prefkeys, $search_memory;
-/* 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);
+ $recent_array = asearch_read_recent();
+ if (isset($recent_array[$recent_prefkeys[0]])) {
+ $recent_count = count($recent_array[$recent_prefkeys[0]]);
+ if (min($recent_count, $search_memory) > 0) {
+ $recent_actions = array('save_recent' => _("save"), 'search_recent' => _("search"), 'forget_recent' => _("forget"));
+ asearch_print_query_array($boxes, $recent_array, $recent_prefkeys, $recent_actions, _("Recent Searches"), 'search_show_recent');
+ }
+ }
+}
-/* get globals we may need */
+/** Build an ' . "\n";
+}
-$key = $_COOKIE['key'];
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$delimiter = $_SESSION['delimiter'];
+/** Build a