X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=4fca3ea9c9db800895d03dd96d5dad7896eb6404;hb=c3ccfa1912b4ca47279d259bb587ceb293ce5d83;hp=4a074871e36e9aad6a8f07c60fda963a38e302a4;hpb=ba5f492cea317959a2da51481215927fa9f57aea;p=squirrelmail.git diff --git a/src/search.php b/src/search.php index 4a074871..4fca3ea9 100644 --- a/src/search.php +++ b/src/search.php @@ -3,7 +3,7 @@ /** * 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$ @@ -17,11 +17,37 @@ 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; +/* get globals we may need */ + +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +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 ) { @@ -165,8 +191,8 @@ function save_recent($save_index, $username, $data_dir) { 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 { @@ -178,19 +204,28 @@ function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $where, $wha $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt); $toggle_all = get_selectall_link(1, $sort); - echo '\n"; + . ''. + " \n"; if ( !isset( $what ) ) { $what = ''; } if ( !isset( $where ) ) { - $where = ''; + $where = 'FROM'; } @@ -469,7 +469,7 @@ if ($search_all == 'all') { $boxcount = count($boxes); echo '
' . _("Search Results") . - "

\n"; + "

\n"; for ($x=0;$x<$boxcount;$x++) { if (!in_array('noselect', $boxes[$x]['flags'])) { $mailbox = $boxes[$x]['unformatted'];
'; + echo ''; + echo ''; + echo ''; + echo '
'; + mail_message_listing_beginning($imapConnection, $mailbox, $sort, $msg_cnt_str, $toggle_all, 1); + echo '
'; + echo ' '; + echo '
'; + echo ' '; + echo '
'; printHeader($mailbox, 6, $color, false); displayMessageArray($imapConnection, $cnt, 1, $msort, $mailbox, $sort, $color, $cnt, $where, $what); + echo '
'; mail_message_listing_end($cnt, '', $msg_cnt_str, $color); echo '
'; - } } @@ -203,32 +238,6 @@ $search_all = 'none'; $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); $boxes = sqimap_mailbox_list($imapConnection); @@ -245,7 +254,7 @@ if ($mailbox == 'All Folders') { if (isset($composenew) && $composenew) { $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox). "&session=$composesession&attachedmessages=true&"; - displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false); + displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false); } else { displayPageHeader($color, $mailbox); } @@ -300,14 +309,14 @@ if ($saved_count > 0) { } else { echo html_tag( 'tr', '', '', $color[4] ); } - echo html_tag( 'td', $saved_attributes['saved_folder'][$i], 'left', '', 'width="35%"' ) + echo html_tag( 'td', imap_utf7_decode_local($saved_attributes['saved_folder'][$i]), 'left', '', 'width="35%"' ) . html_tag( 'td', $saved_attributes['saved_what'][$i], 'left' ) . html_tag( 'td', $saved_attributes['saved_where'][$i], 'center' ) . html_tag( 'td', '', 'right' ) . '' . _("edit") . '' . ' | ' . ' 0) { } 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' ) + echo html_tag( 'td', imap_utf7_decode_local($attributes['search_folder'][$i]), 'left', '', 'width="35%"' ) + . html_tag( 'td', htmlspecialchars($attributes['search_what'][$i]), 'left' ) . html_tag( 'td', $attributes['search_where'][$i], 'center' ) . html_tag( 'td', '', 'right' ) . "" @@ -374,7 +383,7 @@ if ($recent_count > 0) { if (isset($newsort)) { $sort = $newsort; - session_register('sort'); + sqsession_register($sort, 'sort'); } /********************************************************************* @@ -400,32 +409,23 @@ echo html_tag( 'div', '' . _("Current Search") . '', 'left' ) . "\n" . html_tag( 'table', '', '', '', 'width="95%" cellpadding="0" cellspacing="0" border="0"' ) . html_tag( 'tr' ) . html_tag( 'td', '', 'left' ) - . ''. - "