X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=72482acb3cd7dd66257bc664d5fb757bf4f1009f;hb=b65c5db0af524fb167e8cd73feb572e7cf0af90b;hp=b3ad10440b54393db443b24f8acb07d37d763c3f;hpb=3dffe83ff7a657794208f04e87e3ca7f6448d2cc;p=squirrelmail.git
diff --git a/src/search.php b/src/search.php
index b3ad1044..72482acb 100644
--- a/src/search.php
+++ b/src/search.php
@@ -14,10 +14,11 @@ define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/strings.php');
require_once(SM_PATH . 'functions/imap_asearch.php');
require_once(SM_PATH . 'functions/imap_mailbox.php');
-require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/imap_messages.php');
+require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()...
function asearch_unhtml_strcoll($a, $b)
{
@@ -357,7 +358,7 @@ function asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_ar
if ($what_type == 'adate')
$what_display = asearch_get_date_display($what);
else
- $what_display = htmlspecialchars($what);
+ $what_display = htmlentities($what);
$what_display = ' ' . $what_display . '';
}
}
@@ -394,8 +395,8 @@ function asearch_print_query_array($query_array, $query_keys, $action_array, $ti
global $color;
echo "
\n";
- echo html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' );
- echo html_tag( 'tr', html_tag( 'td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=5'));
+ echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"');
+ echo html_tag('tr', html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=5'));
$main_key = $query_keys[0];
$query_count = count($query_array[$main_key]);
for ($query_num=0, $row_num=0; $query_num<$query_count; $query_num++) {
@@ -414,8 +415,8 @@ function asearch_print_query_array($query_array, $query_keys, $action_array, $ti
$exclude_array = $search_array[5];
$query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array);
- echo html_tag( 'td', $query_num+1, 'right');
- echo html_tag( 'td', $query_display, 'center', '', 'width="80%"');
+ echo html_tag('td', $query_num+1, 'right');
+ echo html_tag('td', $query_display, 'center', '', 'width="80%"');
foreach ($action_array as $action => $action_display) {
echo html_tag('td', '' . $action_display . '', 'center');
}
@@ -459,9 +460,9 @@ function asearch_print_recent($data_dir, $username)
}
/* build an ' . "\n";
+ return '' . "\n";
}
/* build a