X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsearch.php;h=ea4aa730dad5f5a3df16c7334ded94c2a035dfdc;hp=ab0615e3616e77e5a66bf260e693f63a0e6c6fc4;hb=05f5b952095b7e387a57c596a643327d65768749;hpb=b65d1a0813429fe9e8e3193c18abb892f1bc35a9;ds=sidebyside
diff --git a/src/search.php b/src/search.php
index ab0615e3..ea4aa730 100644
--- a/src/search.php
+++ b/src/search.php
@@ -38,15 +38,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 +77,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 '';
}
@@ -305,7 +312,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 +320,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 +340,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 */
@@ -384,7 +395,7 @@ function asearch_print_query_array($query_array, $query_keys, $action_array, $ti
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( '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,7 +412,7 @@ 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%"');
@@ -422,17 +433,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 +448,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";
}
-/* build a