/**
* search.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* $Id$
require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/imap_search.php');
require_once(SM_PATH . 'functions/imap_mailbox.php');
-require_once(SM_PATH . 'functions/array.php');
require_once(SM_PATH . 'functions/strings.php');
global $allow_thread_sort;
function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $where, $what, $usecache = false, $newsort = false) {
global $sort, $color;
- $msort = calc_msort($msgs, $sort);
- if ($cnt > 0) {
+ if ($cnt > 0) {
+ $msort = calc_msort($msgs, $sort);
if ( $mailbox == 'INBOX' ) {
$showbox = _("INBOX");
} else {
if (isset($attributes['search_what'][$i]) &&
!empty($attributes['search_what'][$i])) {
echo html_tag( 'td', $attributes['search_folder'][$i], 'left', '', 'width="35%"' )
- . html_tag( 'td', $attributes['search_what'][$i], 'left' )
+ . html_tag( 'td', htmlentities($attributes['search_what'][$i]), 'left' )
. html_tag( 'td', $attributes['search_where'][$i], 'center' )
. html_tag( 'td', '', 'right' )
. "<a href=search.php?count=$i&submit=save>"
if ($mailbox == 'All Folders') {
echo ' selected';
}
- echo ">[ All Folders ]</option>\n";
+ echo '>[ ' . _("All Folders") . " ]</option>\n";
$show_selected = array(strtolower($mailbox));
echo sqimap_mailbox_option_list($imapConnection, $show_selected, 0, $boxes);
$boxcount = count($boxes);
echo '<BR><CENTER><B>' .
_("Search Results") .
- "</B><CENTER><BR>\n";
+ "</B></CENTER><BR>\n";
for ($x=0;$x<$boxcount;$x++) {
if (!in_array('noselect', $boxes[$x]['flags'])) {
$mailbox = $boxes[$x]['unformatted'];