X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsearch.php;h=1d32e7009d359541f8e1d173c23763f48de30252;hp=4a074871e36e9aad6a8f07c60fda963a38e302a4;hb=0fd2f513a6b3a90cd0e26eece27e7e63971ebb44;hpb=ba5f492cea317959a2da51481215927fa9f57aea

diff --git a/src/search.php b/src/search.php
index 4a074871..1d32e700 100644
--- a/src/search.php
+++ b/src/search.php
@@ -22,6 +22,33 @@ require_once(SM_PATH . 'functions/strings.php');
 
 global $allow_thread_sort;
 
+/* 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 ) {
@@ -178,19 +205,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 '<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>';
-       
     }
 }			      
 
@@ -374,7 +410,7 @@ if ($recent_count > 0) {
 
 if (isset($newsort)) {
     $sort = $newsort;
-    session_register('sort');
+    sqsession_register($sort, 'sort');
 }
 
 /*********************************************************************
@@ -425,7 +461,7 @@ if ( !isset( $what ) ) {
     $what = '';
 }
 if ( !isset( $where ) ) {
-    $where = '';
+    $where = 'FROM';
 }