X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=5b2118632ca8370d5b65f54e4c81c09fc4b061fa;hb=605ce3855a47f1062e4ddc8fe96d70b366e49269;hp=78beb7317bb9d9e9a4858225b9c7723d04b2962c;hpb=8cc8ec794a4111845258794961df8cb093ab2b3f;p=squirrelmail.git

diff --git a/src/search.php b/src/search.php
index 78beb731..5b211863 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,39 +1,40 @@
 <?php
 
 /**
-* search.php
-*
-* Copyright (c) 1999-2004 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* IMAP search page
-*
-* Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
-*
-* @version $Id$
-* @package squirrelmail
-* @link http://www.ietf.org/rfc/rfc3501.txt
-* @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
-*/
+ * search.php
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP search page
+ *
+ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
+ *
+ * @version $Id$
+ * @package squirrelmail
+ * @link http://www.ietf.org/rfc/rfc3501.txt
+ * @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
+ */
 
 /**
-* Path for SquirrelMail required files.
-* @ignore
-*/
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /** SquirrelMail required files.
-*/
+ */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/imap_asearch.php');
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/imap_messages.php');
 require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/mailbox_display.php');	//getButton()...
+require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()...
+include_once(SM_PATH . 'class/template/template.class.php');
 
 /** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys
-*/
+ */
 define('ASEARCH_WHERE', 0);
 define('ASEARCH_MAILBOX', 1);
 define('ASEARCH_WHAT', 2);
@@ -44,12 +45,12 @@ define('ASEARCH_SUB', 6);
 define('ASEARCH_MAX', 7);
 
 /** Name of session var
-*/
+ */
 define('ASEARCH_CRITERIA', 'criteria');
 
 /** Builds a href with params
-* @param string $params optional parameters to GET
-*/
+ * @param string $params optional parameters to GET
+ */
 function asearch_get_href($params = '')
 {
     $href = 'search.php';
@@ -59,10 +60,10 @@ function asearch_get_href($params = '')
 }
 
 /** Builds a [link]
-* @param string $href (reference)
-* @param string $text
-* @param string $title
-*/
+ * @param string $href (reference)
+ * @param string $text
+ * @param string $title
+ */
 function asearch_get_link(&$href, $text, $title = '')
 {
     if ($title != '')
@@ -71,30 +72,31 @@ function asearch_get_link(&$href, $text, $title = '')
 }
 
 /** Builds a toggle [link]
-* @param integer $value
-* @param string $action
-* @param array $text_array
-* @param array $title_array
-*/
+ * @param integer $value
+ * @param string $action
+ * @param array $text_array
+ * @param array $title_array
+ */
 function asearch_get_toggle_link($value, $action, $text_array, $title_array = array())
 {
     return asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value], asearch_nz($title_array[$value]));
 }
 
 /**
-* @param string $a
-* @param string $b
-* @return bool strcoll()-like result
-*/
+ * @param string $a
+ * @param string $b
+ * @return bool strcoll()-like result
+ */
 function asearch_unhtml_strcoll($a, $b)
 {
     return strcoll(asearch_unhtmlentities($a), asearch_unhtmlentities($b));
 }
 
+
 /**
-* @param string $mailbox mailbox name utf7 encoded inc. special case INBOX
-* @return string mailbox name ready to display (utf7 decoded or localized INBOX)
-*/
+ * @param string $mailbox mailbox name utf7 encoded inc. special case INBOX
+ * @return string mailbox name ready to display (utf7 decoded or localized INBOX)
+ */
 function imap_get_mailbox_display($mailbox)
 {
     if (strtoupper($mailbox) == 'INBOX')
@@ -103,9 +105,9 @@ function imap_get_mailbox_display($mailbox)
 }
 
 /**
-* @param string $mailbox mailbox name or special case 'All Folders'
-* @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
-*/
+ * @param string $mailbox mailbox name or special case 'All Folders'
+ * @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
+ */
 function asearch_get_mailbox_display($mailbox)
 {
     if ($mailbox == 'All Folders')
@@ -114,29 +116,28 @@ function asearch_get_mailbox_display($mailbox)
 }
 
 /**
-* @param array $color color array
-* @param string $txt text to display
-* @return string title ready to display
-*/
+ * @param array $color color array
+ * @param string $txt text to display
+ * @return string title ready to display
+ */
 function asearch_get_title_display(&$color, $txt)
 {
     return '<b><big>' . $txt . '</big></b>';
 }
-
 /**
-* @param array $color color array
-* @param string $txt text to display
-* @return string error text ready to display
-*/
+ * @param array $color color array
+ * @param string $txt text to display
+ * @return string error text ready to display
+ */
 function asearch_get_error_display(&$color, $txt)
 {
     return '<font color="' . $color[2] . '">' . '<b><big>' . $txt . '</big></b></font>';
 }
 
 /**
-* @param array $input_array array to serialize
-* @return string a string containing a byte-stream representation of value that can be stored anywhere
-*/
+ * @param array $input_array array to serialize
+ * @return string a string containing a byte-stream representation of value that can be stored anywhere
+ */
 function asearch_serialize(&$input_array)
 {
     global $search_advanced;
@@ -146,9 +147,9 @@ function asearch_serialize(&$input_array)
 }
 
 /**
-* @param string $input_string string to unserialize
-* @return array
-*/
+ * @param string $input_string string to unserialize
+ * @return array
+ */
 function asearch_unserialize($input_string)
 {
     global $search_advanced;
@@ -158,11 +159,11 @@ function asearch_unserialize($input_string)
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $default default value
-* @return string pref value
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $default default value
+ * @return string pref value
+ */
 function asearch_getPref(&$key, $index, $default = '')
 {
     global $data_dir, $username, $search_advanced;
@@ -170,11 +171,11 @@ function asearch_getPref(&$key, $index, $default = '')
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $value pref value to set
-* @return bool status
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $value pref value to set
+ * @return bool status
+ */
 function asearch_setPref(&$key, $index, $value)
 {
     global $data_dir, $username, $search_advanced;
@@ -182,10 +183,10 @@ function asearch_setPref(&$key, $index, $value)
 }
 
 /**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @return bool status
-*/
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @return bool status
+ */
 function asearch_removePref(&$key, $index)
 {
     global $data_dir, $username, $search_advanced;
@@ -193,7 +194,7 @@ function asearch_removePref(&$key, $index)
 }
 
 /** Sanity checks, done before running the imap command and before calling push_recent
-*/
+ */
 function asearch_check_query(&$where_array, &$what_array, &$exclude_array)
 {
     global $imap_asearch_opcodes;
@@ -212,7 +213,7 @@ function asearch_check_query(&$where_array, &$what_array, &$exclude_array)
 }
 
 /** Read the recent searches from the prefs
-*/
+ */
 function asearch_read_recent()
 {
     global $recent_prefkeys, $search_memory;
@@ -222,14 +223,14 @@ function asearch_read_recent()
     for ($pref_num = 0; $pref_num < $search_memory; $pref_num++) {
         foreach ($recent_prefkeys as $prefkey) {
             $pref = asearch_getPref($prefkey, $pref_num);
-/*			if (!empty($pref))*/
+/*            if (!empty($pref))*/
                 $recent_array[$prefkey][$recent_num] = $pref;
         }
         if (empty($recent_array[$recent_prefkeys[0]][$recent_num])) {
             foreach ($recent_prefkeys as $key) {
                 array_pop($recent_array[$key]);
             }
-//			break;	//Disabled to support old search code broken prefs
+//            break; //Disabled to support old search code broken prefs
         }
         else
             $recent_num++;
@@ -238,7 +239,7 @@ function asearch_read_recent()
 }
 
 /** Read the saved searches from the prefs
-*/
+ */
 function asearch_read_saved()
 {
     global $saved_prefkeys;
@@ -259,7 +260,7 @@ function asearch_read_saved()
 }
 
 /** Save a recent search to the prefs
-*/
+ */
 function asearch_save_recent($recent_index)
 {
     global $recent_prefkeys, $saved_prefkeys;
@@ -279,7 +280,7 @@ function asearch_save_recent($recent_index)
 }
 
 /** Write a recent search to prefs
-*/
+ */
 function asearch_write_recent(&$recent_array)
 {
     global $recent_prefkeys, $search_memory;
@@ -298,7 +299,7 @@ function asearch_write_recent(&$recent_array)
 }
 
 /** Remove a recent search from prefs
-*/
+ */
 function asearch_forget_recent($forget_index)
 {
     global $recent_prefkeys;
@@ -311,7 +312,7 @@ function asearch_forget_recent($forget_index)
 }
 
 /** Find a recent search in the prefs (used to avoid saving duplicates)
-*/
+ */
 function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $recent_prefkeys, $search_advanced;
@@ -345,17 +346,22 @@ function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$un
 }
 
 /** Push a recent search into the prefs
-*/
+ */
 function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $recent_prefkeys, $search_memory;
-
-    $criteria = array($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+    //global $what; // Hack to access issued search from read_body.php
+    $what = 1;
+    /**
+     * Update search history and store it in the session so we can retrieve the
+     * issued search when returning from an external page like read_body.php
+     */
+    $criteria[$what] = array($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
     sqsession_register($criteria, ASEARCH_CRITERIA);
     if ($search_memory > 0) {
         $recent_array = asearch_read_recent();
         $recent_found = asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
-        if ($recent_found >= 0) {	// Remove identical recent
+        if ($recent_found >= 0) { // Remove identical recent
             foreach ($recent_prefkeys as $key) {
                 array_splice($recent_array[$key], $recent_found, 1);
             }
@@ -371,8 +377,8 @@ function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$wher
 }
 
 /** Edit a recent search
-* @global array mailbox_array searched mailboxes
-*/
+ * @global array mailbox_array searched mailboxes
+ */
 function asearch_edit_recent($index)
 {
     global $recent_prefkeys, $search_advanced;
@@ -391,30 +397,31 @@ function asearch_edit_recent($index)
 }
 
 /** Get last search criteria from session or prefs
-*/
-function asearch_edit_last()
-{
+ * FIX ME, try to avoid globals
+ */
+function asearch_edit_last($index) {
     if (sqGetGlobalVar(ASEARCH_CRITERIA, $criteria, SQ_SESSION)) {
         global $where_array, $mailbox_array, $what_array, $unop_array;
         global $biop_array, $exclude_array, $sub_array;
-        $mailbox_array = $criteria[0];
-        $biop_array = $criteria[1];
-        $unop_array = $criteria[2];
-        $where_array = $criteria[3];
-        $what_array = $criteria[4];
-        $exclude_array = $criteria[5];
-        $sub_array = $criteria[6];
-        sqsession_unregister(ASEARCH_CRITERIA);
-    }
-    else {
+        $mailbox_array = $criteria[$index][0];
+        $biop_array = $criteria[$index][1];
+        $unop_array = $criteria[$index][2];
+        $where_array = $criteria[$index][3];
+        $what_array = $criteria[$index][4];
+        $exclude_array = $criteria[$index][5];
+        $sub_array = $criteria[$index][6];
+        unset($criteria[$index]);
+        //sqsession_unregister(ASEARCH_CRITERIA);
+    } else {
         global $search_memory;
-        if ($search_memory > 0)
+        if ($search_memory > 0) {
             asearch_edit_recent(0);
+        }
     }
 }
 
 /** Edit a saved search
-*/
+ */
 function asearch_edit_saved($index)
 {
     global $saved_prefkeys, $search_advanced;
@@ -433,7 +440,7 @@ function asearch_edit_saved($index)
 }
 
 /** Write a saved search to the prefs
-*/
+ */
 function asearch_write_saved(&$saved_array)
 {
     global $saved_prefkeys;
@@ -450,7 +457,7 @@ function asearch_write_saved(&$saved_array)
 }
 
 /** Delete a saved search from the prefs
-*/
+ */
 function asearch_delete_saved($saved_index)
 {
     global $saved_prefkeys;
@@ -464,9 +471,9 @@ function asearch_delete_saved($saved_index)
 }
 
 /** Translate the input date to imap date to local date display,
-* so the user can know if the date is wrong or illegal
-* @return string locally formatted date or error text
-*/
+ * so the user can know if the date is wrong or illegal
+ * @return string locally formatted date or error text
+ */
 function asearch_get_date_display(&$what)
 {
     $what_parts = sqimap_asearch_parse_date($what);
@@ -480,8 +487,8 @@ function asearch_get_date_display(&$what)
 }
 
 /** Translate the query to rough natural display
-* @return string rough natural query ready to display
-*/
+ * @return string rough natural query ready to display
+ */
 function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
 {
     global $imap_asearch_biops_in, $imap_asearch_biops, $imap_asearch_unops, $imap_asearch_options;
@@ -517,7 +524,7 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
             $where_display = $unop_display . asearch_nz($imap_asearch_options[$where], $where);
             $what_type = $imap_asearch_opcodes[$where];
             $what = $what_array[$crit_num];
-            if ($what_type) {	/* Check opcode parameter */
+            if ($what_type) { /* Check opcode parameter */
                 if ($what == '')
                     $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)"));
                 else {
@@ -543,9 +550,30 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
     return $query_display;
 }
 
+/**
+ * Creates button
+ *
+ * @deprecated see form functions available in 1.5.1 and 1.4.3.
+ * @param string $type
+ * @param string $name
+ * @param string $value
+ * @param string $js
+ * @param bool $enabled
+ */
+function getButton($type, $name, $value, $js = '', $enabled = TRUE) {
+    $disabled = ( $enabled ? '' : 'disabled ' );
+    $js = ( $js ? $js.' ' : '' );
+    return '<input '.$disabled.$js.
+            'type="'.$type.
+            '" name="'.$name.
+            '" value="'.$value .
+            '" style="padding: 0px; margin: 0px" />';
+}
+
+
 /** Handle the alternate row colors
-* @return string color value
-*/
+ * @return string color value
+ */
 function asearch_get_row_color(&$color, $row_num)
 {
 /*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/
@@ -561,7 +589,7 @@ function asearch_get_row_color(&$color, $row_num)
 }
 
 /** Print a whole query array, recent or saved
-*/
+ */
 function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$action_array, $title, $show_pref)
 {
     global $color;
@@ -619,7 +647,7 @@ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$actio
 }
 
 /** Print the saved array
-*/
+ */
 function asearch_print_saved(&$boxes)
 {
     global $saved_prefkeys;
@@ -635,8 +663,8 @@ function asearch_print_saved(&$boxes)
 }
 
 /**
-* Print the recent array
-*/
+ * Print the recent array
+ */
 function asearch_print_recent(&$boxes)
 {
     global $recent_prefkeys, $search_memory;
@@ -652,14 +680,14 @@ function asearch_print_recent(&$boxes)
 }
 
 /** Build an <option> statement
-*/
+ */
 function asearch_opt($val, $sel, $tit)
 {
-    return '<option value="' . $val . '"' . ($sel == $val ? ' selected' : '') . '>' . $tit . '</option>' . "\n";
+    return '<option value="' . $val . '"' . ($sel == $val ? ' selected="selected"' : '') . '>' . $tit . '</option>' . "\n";
 }
 
 /** Build a <select> statement from an array
-*/
+ */
 function asearch_opt_array($var_name, $opt_array, $cur_val)
 {
     $output = '<select name="' . $var_name . '">' . "\n";
@@ -670,8 +698,8 @@ function asearch_opt_array($var_name, $opt_array, $cur_val)
 }
 
 /** Verify that a mailbox exists
-* @return bool mailbox exists
-*/
+ * @return bool mailbox exists
+ */
 function asearch_mailbox_exists($mailbox, &$boxes)
 {
     foreach ($boxes as $box) {
@@ -682,13 +710,14 @@ function asearch_mailbox_exists($mailbox, &$boxes)
 }
 
 /** Build the mailbox select
-*/
+ */
 function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = 0)
 {
-    if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes)))
+    if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
         $missing = asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . asearch_get_mailbox_display($mailbox));
-    else
+    } else {
         $missing = '';
+    }
     return '<select name="mailbox[' . $row_num . ']">'
         . $missing
         . asearch_opt('All Folders', $mailbox, '[' . asearch_get_mailbox_display('All Folders') . ']')
@@ -697,7 +726,7 @@ function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num =
 }
 
 /** Build the Include subfolders checkbox
-*/
+ */
 function asearch_get_form_sub($sub, $row_num = 0)
 {
     return function_exists('addCheckBox') ? addCheckBox('sub[' . $row_num .']', $sub)
@@ -705,7 +734,7 @@ function asearch_get_form_sub($sub, $row_num = 0)
 }
 
 /** Build the 2 unop and where selects
-*/
+ */
 function asearch_get_form_location($unop, $where, $row_num = 0)
 {
     global $imap_asearch_unops, $imap_asearch_options;
@@ -715,7 +744,7 @@ function asearch_get_form_location($unop, $where, $row_num = 0)
 }
 
 /** Build the what text input
-*/
+ */
 function asearch_get_form_what($what, $row_num = 0)
 {
     return function_exists('addInput') ? addInput('what[' . $row_num . ']', $what, '35')
@@ -723,7 +752,7 @@ function asearch_get_form_what($what, $row_num = 0)
 }
 
 /** Build the Exclude criteria checkbox
-*/
+ */
 function asearch_get_form_exclude($exclude, $row_num = 0)
 {
     return function_exists('addCheckBox') ? addCheckBox('exclude['.$row_num.']', $exclude)
@@ -731,7 +760,7 @@ function asearch_get_form_exclude($exclude, $row_num = 0)
 }
 
 /** Print one advanced form row
-*/
+ */
 function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
 {
     global $imap_asearch_biops_in;
@@ -742,7 +771,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop
 //Binary operator
     echo html_tag('td', $row_num ?
             asearch_opt_array('biop[' . $row_num . ']', $imap_asearch_biops_in, $biop)
-            : '<b>' . _("In") . '</b>', 'center')	. "\n";
+            : '<b>' . _("In") . '</b>', 'center') . "\n";
 
 //Mailbox list and Include Subfolders
     echo html_tag('td',
@@ -762,7 +791,7 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop
 }
 
 /** Print the advanced search form
-*/
+ */
 function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
 {
     global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html;
@@ -790,17 +819,17 @@ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_arra
 //Submit buttons
     echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
     echo html_tag('tr',
-                html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $add_criteria_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $del_all_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $del_excluded_button_html), 'center') . "\n"
+                html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $add_criteria_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $del_all_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $del_excluded_button_html), 'center') . "\n"
             );
     echo '</table>' . "\n";
     echo '</form>' . "\n";
 }
 
 /** Print one basic form row
-*/
+ */
 function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
 {
     global $search_button_html;
@@ -818,13 +847,13 @@ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop,
     echo html_tag('td', asearch_get_form_what($what), 'center') . "\n";
 
 //Submit button
-    echo html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n";
+    echo html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n";
 
     echo "</tr>\n";
 }
 
 /** Print the basic search form
-*/
+ */
 function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
 {
     global $color;
@@ -850,87 +879,11 @@ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio
     echo '</form>' . "\n";
 }
 
-/** Print the $msgs messages from $mailbox mailbox
-*/
-function asearch_print_mailbox_msgs($imapConnection, $mbxresponse, $mailbox, $id, $cnt, $sort, $color, $where, $what)
-{
-    /* initialize */
-    $aMailbox['NAME'] = $mailbox;
-    $aMailbox['EXISTS'] = $cnt;
-    $aMailbox['SORT'] = $sort;
-    $aMailbox['UIDVALIDITY'] = $mbxresponse['UIDVALIDITY'];
-    $aMailbox['UIDNEXT'] = $mbxresponse['UIDNEXT'];
-    $aMailbox['PERMANENTFLAGS'] = $mbxresponse['PERMANENTFLAGS'];
-    $aMailbox['RIGHTS'] = $mbxresponse['RIGHTS'];
-    $aMailbox['NAME'] = $mailbox;
-    $aMailbox['UIDSET'] = $id;
-    $aMailbox['OFFSET'] = 0;
-    $aMailbox['PAGEOFFSET'] = 0;
-    $aMailbox['LIMIT'] = $cnt;
-    $aMailbox['SEARCH'] = array($where,$what);
-    $aMailbox['SORT_METHOD'] = 'SEARCH';
-
-    if ($cnt > 0) {
-        global $allow_server_sort, $allow_thread_sort, $thread_sort_messages, $auto_expunge;
-        $aMailbox['ALLOW_THREAD'] = $allow_thread_sort;
-        $aMailbox['AUTO_EXPUNGE'] = $auto_expunge;
-        $msgs = sqimap_get_small_header_list ($imapConnection, $id, count($id));
-        $thread_sort_messages = 0;
-        if ($allow_thread_sort) {
-            global $data_dir, $username;
-            $thread_sort_messages = getPref($data_dir, $username, 'thread_' . $mailbox);
-        }
-
-        $mailbox_display = asearch_get_mailbox_display($mailbox);
-        $mailbox_title = '<b><big>' . _("Folder:") . ' '. $mailbox_display . '&nbsp;</big></b>';
-        $devel = check_sm_version(1, 5, 0);
-        if (!$devel) {
-            echo html_tag('div', $mailbox_title, 'center') . "\n";
-            $mailbox_title = get_selectall_link(1, $real_sort);
-        }
-        $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
-
-        echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
-
-        echo '<tr><td>';
-        //if ($devel)
-            mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title);
-        //else
-            /// mail_message_listing_beginning($imapConnection, $aMailbox $msg_cnt_str, $mailbox_title);
-        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($aMailbox);
-        $aMailbox['NAME'] = $mailbox;
-        $aMailbox['MSG_HEADERS'] = $msgs;
-        $aMailbox['UIDSET'] = $id;
-        $aMailbox['OFFSET'] = 0;
-        $aMailbox['PAGEOFFSET'] = 0;
-        $aMailbox['LIMIT'] = $cnt;
-        $aMailbox['SEARCH'] = array($where,$what);
-        displayMessageArray($imapConnection, $aMailbox);//$cnt, 1, $id, $msgs, $mailbox, $sort, $cnt, $where, $what);
-        echo '        </td></tr>';
-        echo '       </table>';
-        echo '     </td></tr>';
-        echo '    </table>';
-        mail_message_listing_end($cnt, '', $msg_cnt_str);
-        echo '</td></tr>';
-
-        echo '</table>';
-    }
-}
 
 /**
-* @param array $boxes mailboxes array (reference)
-* @return array selectable unformatted mailboxes names
-*/
+ * @param array $boxes mailboxes array (reference)
+ * @return array selectable unformatted mailboxes names
+ */
 function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes)
 {
     $mboxes_array = array();
@@ -953,6 +906,11 @@ if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
     $checkall = (int) $temp;
 }
 
+/**
+ * Retrieve the mailbox cache from the session.
+ */
+sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
+
 
 $search_button_html = _("Search");
 $search_button_text = asearch_unhtmlentities($search_button_html);
@@ -964,253 +922,313 @@ $del_all_button_html = _("Remove All Criteria");
 $del_all_button_text = asearch_unhtmlentities($del_all_button_html);
 
 /** Maximum number of recent searches to handle
-* Default 0
-* @global integer $search_memory
-*/
+ * Default 0
+ * @global integer $search_memory
+ */
 $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
 /** Advanced search control
-* - 0 => allow basic interface only
-* - 1 => allow advanced interface only
-* - 2 => allow both
-* Default 2
-* @global integer $allow_advanced_search
-*/
+ * - 0 => allow basic interface only
+ * - 1 => allow advanced interface only
+ * - 2 => allow both
+ * Default 2
+ */
 $allow_advanced_search = asearch_nz($allow_advanced_search, 2);
 
 /**
-* Toggle advanced/basic search
-*/
-if (sqgetGlobalVar('advanced', $search_advanced, SQ_GET))
+ * Toggle advanced/basic search
+ */
+if (sqgetGlobalVar('advanced', $search_advanced, SQ_GET)) {
     setPref($data_dir, $username, 'search_advanced', $search_advanced & 1);
-
+}
 /** If 1, show advanced search interface
-* Default from allow_advanced_search pref
-* @global integer $search_advanced
-*/
-if ($allow_advanced_search > 1)
+ * Default from allow_advanced_search pref
+ * @global integer $search_advanced
+ */
+if ($allow_advanced_search > 1) {
     $search_advanced = getPref($data_dir, $username, 'search_advanced', 0);
-else
+} else {
     $search_advanced = $allow_advanced_search;
-
+}
 if ($search_advanced) {
 /** Set recent prefkeys according to $search_advanced
-* @global array $recent_prefkeys
-*/
+ * @global array $recent_prefkeys
+ */
     $recent_prefkeys = array('asearch_recent_where', 'asearch_recent_mailbox', 'asearch_recent_what', 'asearch_recent_unop', 'asearch_recent_biop', 'asearch_recent_exclude', 'asearch_recent_sub');
 
 /** Set saved prefkeys according to $search_advanced
-* @global array $saved_prefkeys
-*/
+ * @global array $saved_prefkeys
+ */
     $saved_prefkeys = array('asearch_saved_where', 'asearch_saved_mailbox', 'asearch_saved_what', 'asearch_saved_unop', 'asearch_saved_biop', 'asearch_saved_exclude', 'asearch_saved_sub');
 
 /*$asearch_prefkeys = array('where', 'mailbox', 'what', 'biop', 'unop', 'exclude', 'sub');*/
-}
-else {
+} else {
     $recent_prefkeys = array('search_where', 'search_folder', 'search_what', 'search_unop');
     $saved_prefkeys = array('saved_where', 'saved_folder', 'saved_what', 'saved_unop');
 }
 
 /** How we did enter the form
-* - unset : Enter key, or called from outside (eg read_body)
-* - $search_button_text : Search button
-* - 'Search_no_update' : Search but don't update recent
-* - 'Search_last' : Same as no_update but reload and search last
-* - 'Search_silent' : Same as no_update but only display results
-* - $add_criteria_button_text : Add New Criteria button
-* - $del_excluded_button_text : Remove Excluded Criteria button
-* - $del_all_button_text : Remove All Criteria button
-* - 'save_recent'
-* - 'search_recent'
-* - 'forget_recent'
-* - 'edit_saved'
-* - 'search_saved'
-* - 'delete_saved'
-* @global string $submit
-*/
-if (isset($_GET['submit']))
+ * - unset : Enter key, or called from outside (eg read_body)
+ * - $search_button_text : Search button
+ * - 'Search_no_update' : Search but don't update recent
+ * - 'Search_last' : Same as no_update but reload and search last
+ * - 'Search_silent' : Same as no_update but only display results
+ * - $add_criteria_button_text : Add New Criteria button
+ * - $del_excluded_button_text : Remove Excluded Criteria button
+ * - $del_all_button_text : Remove All Criteria button
+ * - 'save_recent'
+ * - 'search_recent'
+ * - 'forget_recent'
+ * - 'edit_saved'
+ * - 'search_saved'
+ * - 'delete_saved'
+ * @global string $submit
+ */
+if (isset($_GET['submit'])) {
     $submit = strip_tags($_GET['submit']);
-
+}
 /** Searched mailboxes
-* @global array $mailbox_array
-*/
+ * @global array $mailbox_array
+ */
 if (isset($_GET['mailbox'])) {
     $mailbox_array = $_GET['mailbox'];
-    if (!is_array($mailbox_array))
+    $targetmailbox = $_GET['mailbox'];
+    if (!is_array($mailbox_array)) {
         $mailbox_array = array($mailbox_array);
-}
-else
+    }
+} else {
     $mailbox_array = array();
+    $targetmailbox = array();
+}
+$aMailboxGlobalPref = array(
+                       MBX_PREF_SORT         => 0,
+                       MBX_PREF_LIMIT        => (int)  $show_num,
+                       MBX_PREF_AUTO_EXPUNGE => (bool) $auto_expunge,
+                       MBX_PREF_INTERNALDATE => (bool) getPref($data_dir, $username, 'internal_date_sort')
+                    // MBX_PREF_FUTURE       => (var)  $future
+                     );
+
+/**
+ * system wide admin settings and incoming vars.
+ */
+$aConfig = array(
+                'allow_thread_sort' => $allow_thread_sort,
+                'allow_server_sort' => $allow_server_sort,
+                'user'              => $username,
+                'setindex'          => 1
+                );
 
 /** Binary operators
-* @global array $biop_array
-*/
+ * @global array $biop_array
+ */
 if (isset($_GET['biop'])) {
     $biop_array = $_GET['biop'];
     if (!is_array($biop_array))
         $biop_array = array($biop_array);
-}
-else
+} else {
     $biop_array = array();
-
+}
 /** Unary operators
-* @global array $unop_array
-*/
+ * @global array $unop_array
+ */
 if (isset($_GET['unop'])) {
     $unop_array = $_GET['unop'];
     if (!is_array($unop_array))
         $unop_array = array($unop_array);
-}
-else
+} else {
     $unop_array = array();
-
+}
 /** Where to search
-* @global array $where_array
-*/
+ * @global array $where_array
+ */
 if (isset($_GET['where'])) {
     $where_array = $_GET['where'];
-    if (!is_array($where_array))
+    if (!is_array($where_array)) {
         $where_array = array($where_array);
-}
-else
+    }
+} else {
     $where_array = array();
-
+}
 /** What to search
-* @global array $what_array
-*/
+ * @global array $what_array
+ */
 if (isset($_GET['what'])) {
     $what_array = $_GET['what'];
-    if (!is_array($what_array))
+    if (!is_array($what_array)) {
         $what_array = array($what_array);
-}
-else
+    }
+} else {
     $what_array = array();
-
+}
 /** Whether to exclude this criteria from search
-* @global array $exclude_array
-*/
-if (isset($_GET['exclude']))
+ * @global array $exclude_array
+ */
+if (isset($_GET['exclude'])) {
     $exclude_array = $_GET['exclude'];
-else
+} else {
     $exclude_array = array();
-
+}
 /** Search within subfolders
-* @global array $sub_array
-*/
-if (isset($_GET['sub']))
+ * @global array $sub_array
+ */
+if (isset($_GET['sub'])) {
     $sub_array = $_GET['sub'];
-else
+} else {
     $sub_array = array();
-
+}
 /** Row number used by recent and saved stuff
-*/
-if (isset($_GET['rownum']))
+ */
+if (isset($_GET['rownum'])) {
     $submit_rownum = strip_tags($_GET['rownum']);
-
+}
 /** Change global sort
-*/
-if (sqgetGlobalVar('newsort', $newsort, SQ_GET)) {
-    setPref($data_dir, $username, 'sort', $newsort);
-    $sort = $newsort;
-    sqsession_register($sort, 'sort');
-    asearch_edit_last();
+ */
+if (sqgetGlobalVar('srt', $temp, SQ_GET)) {
+    $srt = (int) $temp;
+    asearch_edit_last(1);
+//    asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+}
+if (sqgetGlobalVar('startMessage', $temp, SQ_GET)) {
+    $startMessage = (int) $temp;
+    asearch_edit_last(1);
+//    asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
 }
 
-/** Toggle mailbox threading
-*/
-if (sqgetGlobalVar('set_thread', $set_thread, SQ_GET)) {
-    setPref($data_dir, $username, 'thread_' . $mailbox_array[0], $set_thread & 1);
-    asearch_edit_last();
+if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
+    $showall = (int) $temp;
+    asearch_edit_last(1);
+//    asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+}
+
+if ( sqgetGlobalVar('account', $temp,  SQ_GET) ) {
+    $iAccount = (int) $temp;
+} else {
+    $iAccount = 0;
+}
+
+/**
+ * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates
+ */
+$sTplDir = SM_PATH . 'templates/default/';
+
+
+/**
+ * Incoming submit buttons from the message list with search results
+ */
+if (sqgetGlobalVar('moveButton',      $moveButton,      SQ_POST) ||
+    sqgetGlobalVar('expungeButton',   $expungeButton,   SQ_POST) ||
+    sqgetGlobalVar('delete',          $markDelete,      SQ_POST) ||
+    sqgetGlobalVar('undeleteButton',  $undeleteButton,  SQ_POST) ||
+    sqgetGlobalVar('markRead',        $markRead,        SQ_POST) ||
+    sqgetGlobalVar('markUnread',      $markUnread,      SQ_POST) ||
+    sqgetGlobalVar('markFlagged',     $markFlagged,     SQ_POST) ||
+    sqgetGlobalVar('markUnflagged',   $markUnflagged,   SQ_POST) ||
+    sqgetGlobalVar('attache',         $attache,         SQ_POST)) {
+    asearch_edit_last(1);
+    $submit = '';
+    asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
 }
 
+
+
 /** Toggle show/hide saved searches
-*/
-if (sqgetGlobalVar('search_show_saved', $search_show_saved, SQ_GET))
+ */
+if (sqgetGlobalVar('search_show_saved', $search_show_saved, SQ_GET)) {
     setPref($data_dir, $username, 'search_show_saved', $search_show_saved & 1);
-
+}
 /** Toggle show/hide recent searches
-*/
-if (sqgetGlobalVar('search_show_recent', $search_show_recent, SQ_GET))
+ */
+if (sqgetGlobalVar('search_show_recent', $search_show_recent, SQ_GET)) {
     setPref($data_dir, $username, 'search_show_recent', $search_show_recent & 1);
-
+}
 // end of get globals
 
 /** If TRUE, do not show search interface
-* Default FALSE
-* @global bool $search_silent
-*/
+ * Default FALSE
+ * @global bool $search_silent
+ */
 $search_silent = FALSE;
 
 /*  See how the page was called and fire off correct function  */
 if ((empty($submit)) && (!empty($where_array))) {
     /* This happens when the Enter key is used or called from outside */
     $submit = $search_button_text;
-    if (count($where_array) != count($unop_array))	/* Hack needed to handle coming back from read_body et als */
-        asearch_edit_last();
+    /* Hack needed to handle coming back from read_body et als */
+    if (count($where_array) != count($unop_array)) {
+        /**
+         * Hack to use already existen where and what vars.
+         * where now contains the initiator page of the messagelist
+         * and in this case 'search'. what contains an index to access
+         * the search history
+         */
+
+        sqgetGlobalVar('what',$what,SQ_GET);
+        asearch_edit_last($what);
+    }
 }
 
 if (!isset($submit)) {
     $submit = '';
-}
-else {
+} else {
     switch ($submit) {
-        case $search_button_text:
-            if (asearch_check_query($where_array, $what_array, $exclude_array) == '')
-                asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+      case $search_button_text:
+        if (asearch_check_query($where_array, $what_array, $exclude_array) == '') {
+            asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+        }
         break;
-        case 'Search_silent':
-            $search_silent = TRUE;
+      case 'Search_silent':
+        $search_silent = TRUE;
         /*nobreak;*/
-        case 'Search_no_update':
-            $submit = $search_button_text;
+      case 'Search_no_update':
+        $submit = $search_button_text;
         break;
-        case $del_excluded_button_text:
-            $delarray = array_keys($exclude_array);
-            while (!empty($delarray)) {
-                $delrow = array_pop($delarray);
-                array_splice($mailbox_array, $delrow, 1);
-                array_splice($biop_array, $delrow, 1);
-                array_splice($unop_array, $delrow, 1);
-                array_splice($where_array, $delrow, 1);
-                array_splice($what_array, $delrow, 1);
-/*			array_splice($exclude_array, $delrow, 1);*/	/* There is still some php magic that eludes me */
-                array_splice($sub_array, $delrow, 1);
-            }
-            $exclude_array = array();
+      case $del_excluded_button_text:
+        $delarray = array_keys($exclude_array);
+        while (!empty($delarray)) {
+            $delrow = array_pop($delarray);
+            array_splice($mailbox_array, $delrow, 1);
+            array_splice($biop_array, $delrow, 1);
+            array_splice($unop_array, $delrow, 1);
+            array_splice($where_array, $delrow, 1);
+            array_splice($what_array, $delrow, 1);
+            /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */
+            array_splice($sub_array, $delrow, 1);
+        }
+        $exclude_array = array();
         break;
-        case $del_all_button_text:
-            $mailbox_array = array();
-            $biop_array = array();
-            $unop_array = array();
-            $where_array = array();
-            $what_array = array();
-            $exclude_array = array();
-            $sub_array = array();
+      case $del_all_button_text:
+        $mailbox_array = array();
+        $biop_array = array();
+        $unop_array = array();
+        $where_array = array();
+        $what_array = array();
+        $exclude_array = array();
+        $sub_array = array();
         break;
-        case 'save_recent':
-            asearch_save_recent($submit_rownum);
+      case 'save_recent':
+        asearch_save_recent($submit_rownum);
         break;
-        case 'search_recent':
-            $submit = $search_button_text;
-            asearch_edit_recent($submit_rownum);
-            asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+      case 'search_recent':
+        $submit = $search_button_text;
+        asearch_edit_recent($submit_rownum);
+        asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
         break;
-        case 'edit_recent':	/* no link to do this, yet */
-            asearch_edit_recent($submit_rownum);
+      case 'edit_recent': /* no link to do this, yet */
+        asearch_edit_recent($submit_rownum);
         break;
-        case 'forget_recent':
-            asearch_forget_recent($submit_rownum);
+      case 'forget_recent':
+        asearch_forget_recent($submit_rownum);
         break;
-        case 'search_saved':
-            $submit = $search_button_text;
-            asearch_edit_saved($submit_rownum);
-            asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+      case 'search_saved':
+        $submit = $search_button_text;
+        asearch_edit_saved($submit_rownum);
+        asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
         break;
-        case 'edit_saved':
-            asearch_edit_saved($submit_rownum);
+      case 'edit_saved':
+        asearch_edit_saved($submit_rownum);
         break;
-        case 'delete_saved':
-            asearch_delete_saved($submit_rownum);
+      case 'delete_saved':
+        asearch_delete_saved($submit_rownum);
         break;
     }
 }
@@ -1230,7 +1248,7 @@ if ($search_advanced) {
         'BCC' => _("Bcc"),
         'BEFORE' => _("Before"),
         'BODY' => _("Message Body"),
-        'CC' => _("CC"),
+        'CC' => _("Cc"),
         'DELETED' => _("Deleted"),
         'DRAFT' => _("Draft"),
         'FLAGGED' => _("Flagged"),
@@ -1254,7 +1272,7 @@ if ($search_advanced) {
         'TEXT' => _("Header and Body"),
         'TO' => _("Sent To"),
         //'UID' => 'anum',
-/*	'UNANSWERED' => '',
+/*        'UNANSWERED' => '',
         'UNDELETED' => '',
         'UNDRAFT' => '',
         'UNFLAGGED' => '',
@@ -1271,8 +1289,7 @@ if ($search_advanced) {
         'ALL' => _("And"),
         'OR' => _("Or")
     );
-}
-else {
+} else {
     //Texts in basic form only
     $imap_asearch_options = array(
         'BCC' => _("Bcc"),
@@ -1289,20 +1306,85 @@ uasort($imap_asearch_options, 'asearch_unhtml_strcoll');
 
 /* open IMAP connection */
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+
 /* get mailboxes once here */
 $boxes = sqimap_mailbox_list($imapConnection);
 /* ensure we have a valid default mailbox name */
 $mailbox = asearch_nz($mailbox_array[0]);
-if (($mailbox == '') || ($mailbox == 'None'))	//Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
-    $mailbox = $boxes[0]['unformatted'];	//Usually INBOX ;)
+if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
+    $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;)
+
 
-if (isset($composenew) && $composenew) {
-    $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox)
-        . "&amp;session=$composesession&amp;attachedmessages=true&amp";
-    displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+/**
+* Handle form actions like flag / unflag, seen / unseen, delete
+*/
+if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) {
+    if ($postMailbox) {
+        /**
+        * system wide admin settings and incoming vars.
+        */
+        $aConfig = array(
+                        'user'              => $username,
+                        );
+        $aConfig['setindex'] = 1; // $what $where = 'search'
+        /**
+         * Set the max cache size to the number of mailboxes to avoid cache cleanups
+         * when searching all mailboxes
+         */
+        $aConfig['max_cache_size'] = count($boxes) +1;
+
+        $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $postMailbox,$aConfig,array());
+        $sError = handleMessageListForm($imapConnection,$aMailbox);
+        /* add the mailbox to the cache */
+        $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+
+        if ($sError) {
+            $note = $sError;
+        }
+    }
 }
-else
+
+if (isset($aMailbox['FORWARD_SESSION'])) {
+    /* add the mailbox to the cache */
+    $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+    sqsession_register($mailbox_cache,'mailbox_cache');
+
+    if ($compose_new_win) {
+        // write the session in order to make sure that the compose window has
+        // access to the composemessages array which is stored in the session
+        session_write_close();
+        sqsession_is_active();
+
+        if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+            $compose_width = '640';
+        }
+        if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+            $compose_height = '550';
+        }
+        // do not use &amp;, it will break the query string and $session will not be detected!!!
+        $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+                    '&session='.$aMailbox['FORWARD_SESSION'];
+        displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false);
+    } else {
+        // save mailboxstate
+        sqsession_register($aMailbox,'aLastSelectedMailbox');
+        session_write_close();
+        // we have to redirect to the compose page
+        $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
+        header("Location: $location");
+        exit;
+    }
+} else {
     displayPageHeader($color, $mailbox);
+//    $compose_uri = $base_uri.'src/compose.php?newmessage=1';
+}
+
+if (isset($note)) {
+    echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br />\n";
+}
+
 
 do_hook('search_before_form');
 
@@ -1328,10 +1410,11 @@ if (!$search_silent) {
         $mailbox_array[0] = $mailbox;
         $biop_array[0] = '';
         $unop_array[0] = '';
-        if ($mailbox == $sent_folder)
+        if ($mailbox == $sent_folder) {
             $where_array[0] = 'TO';
-        else
+        } else {
             $where_array[0] = 'FROM';
+        }
         $what_array[0] = '';
         $exclude_array[0] = '';
         $sub_array[0] = '';
@@ -1349,23 +1432,15 @@ if (!$search_silent) {
             $sub_array[] = asearch_nz($sub_array[$last_index]);
         }
         asearch_print_form($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
-    }
-    else
+    } else {
         asearch_print_form_basic($imapConnection, $boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+    }
 }
 
-/*********************************************************************
-* Check to see if we can use cache or not. Currently the only time  *
-* when you will not use it is when a link on the left hand frame is *
-* used. Also check to make sure we actually have the array in the   *
-* registered session data.  :)                                      *
-*********************************************************************/
-if (!isset($use_mailbox_cache))
-    $use_mailbox_cache = 0;
-
 do_hook('search_after_form');
 
 if ($submit == $search_button_text) {
+    $msgsfound = false;
     echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
     echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Results")), 'center', $color[5]));
     echo html_tag('tr', html_tag('td', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array), 'center', $color[4]));
@@ -1374,38 +1449,190 @@ if ($submit == $search_button_text) {
     flush();
 
     $query_error = asearch_check_query($where_array, $what_array, $exclude_array);
-    if ($query_error != '')
+    if ($query_error != '') {
         echo '<br />' . html_tag('div', asearch_get_error_display($color, $query_error), 'center') . "\n";
-    else {
-        // Disable thread sort for now if there is more than one mailbox or at least one 'All Folders'
-        global $allow_thread_sort;
-        $old_allow_thread_sort = $allow_thread_sort;
-        $allow_thread_sort = ((count(array_unique($mailbox_array)) <= 1) && (!in_array('All Folders', $mailbox_array)));
-
+    } else {
         $mboxes_array = sqimap_asearch_get_selectable_unformatted_mailboxes($boxes);
-        $mboxes_msgs = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array, $mboxes_array);
-        if (empty($mboxes_msgs))
-            echo '<br />' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n";
-        else {
-            foreach($mboxes_msgs as $mailbox => $msgs) {
-                echo '<br />';
-                $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
-                //$msgs = sqimap_get_small_header_list ($imapConnection, $msgs, count($msgs));
-/* For now just keep the first criteria to make the regular search happy if the user tries to come back to search */
-/*			$where = asearch_serialize($where_array);
-                $what = asearch_serialize($what_array);*/
-                $where = $where_array[0];
-                $what = $what_array[0];
-                asearch_print_mailbox_msgs($imapConnection, $mbxresponse, $mailbox, $msgs, count($msgs), $sort, $color, urlencode($where), urlencode($what));
+        /**
+         * Retrieve the search queries
+         */
+        $mboxes_mailbox = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array, $mboxes_array);
+        foreach($mboxes_mailbox as $mbx => $search) {
+
+            /**
+            * until there is no per mailbox option screen to set prefs we override
+            * the mailboxprefs by the default ones
+            */
+
+            $aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$iAccount.'_'.$mbx);
+            if ($aMailboxPrefSer) {
+                $aMailboxPref = unserialize($aMailboxPrefSer);
+                $aMailboxPref[MBX_PREF_COLUMNS] = $index_order;
+            } else {
+                setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($default_mailbox_pref));
+                $aMailboxPref = $default_mailbox_pref;
             }
-        }
+            if (isset($srt) && $targetmailbox == $mbx) {
+                $aMailboxPref[MBX_PREF_SORT] = (int) $srt;
+            }
+
+            $trash_folder = (isset($trash_folder)) ? $trash_folder : false;
+            $sent_folder = (isset($sent_folder)) ? $sent_folder : false;
+            $draft_folder = (isset($draft_folder)) ? $draft_folder : false;
+
+
+            /**
+            * until there is no per mailbox option screen to set prefs we override
+            * the mailboxprefs by the default ones
+            */
+            $aMailboxPref[MBX_PREF_LIMIT] = (int)  $show_num;
+            $aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge;
+            $aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort');
+            $aMailboxPref[MBX_PREF_COLUMNS] = $index_order;
+
+            /**
+            * Replace From => To  in case it concerns a draft or sent folder
+            */
+            if (($mbx == $sent_folder || $mbx == $draft_folder) &&
+                !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) {
+                $aNewOrder = array(); // nice var name ;)
+                foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+                    if ($iCol == SQM_COL_FROM) {
+                        $iCol = SQM_COL_TO;
+                    }
+                    $aNewOrder[] = $iCol;
+                }
+                $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder;
+                setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($aMailboxPref));
+            }
+
+            $aConfig['search'] = $search['search'];
+            $aConfig['charset'] = $search['charset'];
+
+            /**
+             * Set the max cache size to the number of mailboxes to avoid cache cleanups
+             * when searching all mailboxes
+             */
+            $aConfig['max_cache_size'] = count($mboxes_mailbox) +1;
+            if (isset($startMessage) && $targetmailbox == $mbx) {
+                $aConfig['offset'] = $startMessage;
+            } else if (isset($aConfig['offset'])) {
+                unset($aConfig['offset']);
+            }
+            if (isset($showall) && $targetmailbox == $mbx) {
+                $aConfig['showall'] = $showall;
+            } else {
+                if (isset($aConfig['showall'])) {
+                    unset($aConfig['showall']);
+                }
+                $showall = false;
+            }
+
+            /**
+            * Set the config options for the messages list
+            */
+            $aColumns = array();
+            foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+                $aColumns[$iCol] = array();
+                switch ($iCol) {
+                    case SQM_COL_SUBJ:
+                        if ($truncate_subject) {
+                            $aColumns[$iCol]['truncate'] = $truncate_subject;
+                        }
+                        break;
+                    case SQM_COL_FROM:
+                    case SQM_COL_TO:
+                    case SQM_COL_CC:
+                    case SQM_COL_BCC:
+                        if ($truncate_sender) {
+                            $aColumns[$iCol]['truncate'] = $truncate_sender;
+                        }
+                        break;
+                }
+            }
+
+
+            $aProps = array(
+                'columns' => $aColumns,
+                'config'  => array('alt_index_colors'      => $alt_index_colors,
+                                    'highlight_list'        => $message_highlight_list,
+                                    'fancy_index_highlite'  => $fancy_index_highlite,
+                                    'show_flag_buttons'     => (isset($show_flag_buttons)) ? $show_flag_buttons : true,
+                                    'lastTargetMailbox'     => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '',
+                                    'trash_folder'          => $trash_folder,
+                                    'sent_folder'           => $sent_folder,
+                                    'draft_folder'          => $draft_folder,
+                                    'enablesort'            => true,
+                                    'color'                 => $color
+                            ),
+                'mailbox' => $mbx,
+                'account' => (isset($iAccount)) ? $iAccount : 0,
+                'module' => 'read_body',
+                'email'  => false);
+
+
+            $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mbx,$aConfig,$aMailboxPref);
+
+            $iError = 0;
+            $aTemplate = showMessagesForMailbox($imapConnection, $aMailbox,$aProps, $iError);
+            if ($iError) {
+                // error handling
+            } else {
+                /**
+                * In the future, move this the the initialisation area
+                */
+                sqgetGlobalVar('align',$align,SQ_SESSION);
+
+                $oTemplate = new Template($sTplDir);
+
+                if ($aMailbox['EXISTS'] > 0) {
+                    // $aTemplate =& showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
+                    if ($iError) {
+
+                    }
+                    foreach ($aTemplate as $k => $v) {
+                        $oTemplate->assign($k, $v);
+                    }
+                    $oTemplate->assign('page_selector',  $page_selector);
+                    $oTemplate->assign('page_selector_max', $page_selector_max);
+                    $oTemplate->assign('compact_paginator', $compact_paginator);
+                    $oTemplate->assign('javascript_on', $javascript_on);
+                    $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
+                    // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null
+                    $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false);
+                    $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
+                    $oTemplate->assign('aOrder', array_keys($aColumns));
+                    $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
+                    $oTemplate->assign('color', $color);
+                    $oTemplate->assign('align', $align);
+                    $oTemplate->assign('showall', $showall);
+
+                    $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']);
+                    if (strtoupper($mbx) == 'INBOX') {
+                        $mailbox_display = _("INBOX");
+                    } else {
+                        $mailbox_display = imap_utf7_decode_local($mbx);
+                    }
+
+                    echo '<br /><b><big>' . _("Folder:") . ' '. $mailbox_display . '&nbsp;</big></b>';
+
+
+                    $oTemplate->display('message_list.tpl');
+                }
+            }
+
+            /* add the mailbox to the cache */
+            $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
 
-        $allow_thread_sort = $old_allow_thread_sort;	// Restore thread sort
+        }
+    }
+    if(!$msgsfound) {
+        echo '<br />' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n";
     }
 }
 
 do_hook('search_bottom');
 sqimap_logout($imapConnection);
 echo '</body></html>';
-
+sqsession_register($mailbox_cache,'mailbox_cache');
 ?>
\ No newline at end of file