UI mods

[squirrelmail.git] / src / search.php

diff --git a/src/search.php b/src/search.php
index 29b3159207a2134f878b46606ee1274f3b7008d0..1d32e7009d359541f8e1d173c23763f48de30252 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -9,17 +9,47 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/imap_search.php');
-require_once('../functions/imap_mailbox.php');
-require_once('../functions/array.php');
-require_once('../functions/strings.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+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\"";
@@ -102,7 +132,7 @@ function forget_recent($forget_index, $username, $data_dir) {
     $attributes = get_recent( $username, $data_dir);
     reset($types);
     foreach ($types as $key) {
-        array_splice($attributes[$key], $forget_index, 1);
+        array_splice($attributes[$key], $forget_index - 1, 1);
         array_unshift($attributes[$key], '');
     }
     reset($types);
@@ -173,17 +203,30 @@ 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 border="0" width="100%" cellpadding="0" cellspacing="0">';
+       echo '<tr><td>';
 
        mail_message_listing_beginning($imapConnection, $mailbox, $sort, 
-                                       $msg_cnt_str, '', 1);
+                                       $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>';
     }
 }                            
 
@@ -196,6 +239,31 @@ $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);
@@ -273,9 +341,9 @@ if ($saved_count > 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])
-        .     '&amp;what=' . urlencode($saved_attributes['saved_what'][$i])
-        .     '&amp;where=' . urlencode($saved_attributes['saved_where'][$i])
+        .     '?mailbox=' . htmlentities($saved_attributes['saved_folder'][$i])
+        .     '&amp;what=' . htmlentities($saved_attributes['saved_what'][$i])
+        .     '&amp;where=' . htmlentities($saved_attributes['saved_where'][$i])
         .   '>' . _("edit") . '</a>'
         .   '&nbsp;|&nbsp;'
         .   '<a href=search.php'
@@ -342,7 +410,7 @@ if ($recent_count > 0) {
 
 if (isset($newsort)) {
     $sort = $newsort;
-    session_register('sort');
+    sqsession_register($sort, 'sort');
 }
 
 /*********************************************************************
@@ -393,7 +461,7 @@ if ( !isset( $what ) ) {
     $what = '';
 }
 if ( !isset( $where ) ) {
-    $where = '';
+    $where = 'FROM';
 }