/**
* 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$
define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
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;
-/* here are some functions, could go in imap_search.php
+/* get globals we may need */
+
+$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+$delimiter = $_SESSION['delimiter'];
+if (isset($_GET['mailbox'])) {
+ $mailbox = strip_tags($_GET['mailbox']);
+}
+if (isset($_GET['submit'])) {
+ $submit = strip_tags($_GET['submit']);
+}
+if (isset($_GET['what'])) {
+ $what = $_GET['what'];
+}
+if (isset($_GET['where'])) {
+ $where = strip_tags($_GET['where']);
+}
+if (isset($_GET['checkall'])) {
+ $checkall = strip_tags($_GET['checkall']);
+}
+if (isset($_GET['count'])) {
+ $count = strip_tags($_GET['count']);
+}
+/* end of get globals */
+
+/* here are some functions, could go in imap_search.php
this was here, pretty handy */
function s_opt( $val, $sel, $tit ) {
echo " <option value=\"$val\"";
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 {
$msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
$toggle_all = get_selectall_link(1, $sort);
- echo '<table bgcolor="' . $color[0] . '" border="0" width="100%" cellpadding="1" cellspacing="0"><tr><td>';
+ echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
+ echo '<tr><td>';
+
mail_message_listing_beginning($imapConnection, $mailbox, $sort,
$msg_cnt_str, $toggle_all, 1);
+ echo '</td></tr>';
+ echo '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'"></td></tr>';
+ echo '<tr><td>';
+ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+ echo ' <tr><td>';
+ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[5].'">';
+ echo '<tr><td>';
printHeader($mailbox, 6, $color, false);
displayMessageArray($imapConnection, $cnt, 1,
$msort, $mailbox, $sort, $color, $cnt, $where, $what);
+ echo '</td></tr></table></td></tr></table>';
mail_message_listing_end($cnt, '', $msg_cnt_str, $color);
echo '</td></tr></table>';
-
}
}
$perbox_count = array ();
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
+/* get globals we may need */
+
+$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_GET['mailbox'])) {
+ $mailbox = strip_tags($_GET['mailbox']);
+}
+if (isset($_GET['submit'])) {
+ $submit = strip_tags($_GET['submit']);
+}
+if (isset($_GET['what'])) {
+ $what = $_GET['what'];
+}
+if (isset($_GET['where'])) {
+ $where = strip_tags($_GET['where']);
+}
+if (isset($_GET['checkall'])) {
+ $checkall = strip_tags($_GET['checkall']);
+}
+if (isset($_GET['count'])) {
+ $count = strip_tags($_GET['count']);
+}
/* get mailbox names */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
. html_tag( 'td', $saved_attributes['saved_where'][$i], 'center' )
. html_tag( 'td', '', 'right' )
. '<a href=search.php'
- . '?mailbox=' . urlencode($saved_attributes['saved_folder'][$i])
- . '&what=' . urlencode($saved_attributes['saved_what'][$i])
- . '&where=' . urlencode($saved_attributes['saved_where'][$i])
+ . '?mailbox=' . htmlentities($saved_attributes['saved_folder'][$i])
+ . '&what=' . htmlentities($saved_attributes['saved_what'][$i])
+ . '&where=' . htmlentities($saved_attributes['saved_where'][$i])
. '>' . _("edit") . '</a>'
. ' | '
. '<a href=search.php'
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 (isset($newsort)) {
$sort = $newsort;
- session_register('sort');
+ sqsession_register($sort, 'sort');
}
/*********************************************************************
. html_tag( 'table', '', '', '', 'width="95%" cellpadding="0" cellspacing="0" border="0"' )
. html_tag( 'tr' )
. html_tag( 'td', '', 'left' )
- . '<select name="mailbox">';
-for ($i = 0; $i < count($boxes); $i++) {
- if (!in_array('noselect', $boxes[$i]['flags'])) {
- $box = $boxes[$i]['unformatted'];
- $box2 = str_replace(' ', ' ',
- imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
- if( $box2 == 'INBOX' ) {
- $box2 = _("INBOX");
- }
- echo ' <option value="' . $box . '"';
- if ($mailbox == $box) { echo ' selected'; }
- echo '>' . $box2 . '</option>' . "\n";
- }
-}
- echo '<option value="All Folders"';
- if ($mailbox == 'All Folders') {
- echo ' selected';
- }
- echo ">All folders</option>\n";
-echo ' </select>'.
- " </td>\n";
+ . '<select name="mailbox">'
+ . '<option value="All Folders"';
+ if ($mailbox == 'All Folders') {
+ echo ' selected';
+ }
+ echo '>[ ' . _("All Folders") . " ]</option>\n";
+
+ $show_selected = array(strtolower($mailbox));
+ echo sqimap_mailbox_option_list($imapConnection, $show_selected, 0, $boxes);
+
+ echo ' </select>'.
+ " </td>\n";
if ( !isset( $what ) ) {
$what = '';
}
if ( !isset( $where ) ) {
- $where = '';
+ $where = 'FROM';
}
$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'];