Fix missing $username when rg=0

[squirrelmail.git] / src / search.php

diff --git a/src/search.php b/src/search.php
index 4a074871e36e9aad6a8f07c60fda963a38e302a4..34b1bc8b3956ba97087d41bf4f828434fdf9e039 100644 (file)
--- 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 ) {
@@ -374,7 +401,7 @@ if ($recent_count > 0) {
 
 if (isset($newsort)) {
     $sort = $newsort;
-    session_register('sort');
+    sqsession_register($sort, 'sort');
 }
 
 /*********************************************************************