Templates

functions/constants.php

@@ -7,8 +7,8 @@
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Loads constants used by the rest of the SquirrelMail source.
- * This file is included by functions/date.php, include/load_prefs.php,
- * plugins/administrator/defines.php, src/login.php and src/redirect.php.
+ * This file is include by src/login.php, src/redirect.php and
+ * src/load_prefs.php.
  *
  * @version $Id$
  * @package squirrelmail
@@ -17,9 +17,9 @@
 /** Need to enable plugin functions for a hook */
 require_once(SM_PATH . 'functions/plugin.php');  /* Required for the hook */
 
-////////////////////////////////////////////////////////////////
-// Set values for constants used by SquirrelMail preferences. //
-////////////////////////////////////////////////////////////////
+/**************************************************************/
+/* Set values for constants used by SquirrelMail preferences. */
+/**************************************************************/
 
 /* Define basic, general purpose preference constants. */
 define('SMPREF_NO', 0);
@@ -53,6 +53,84 @@ define('SMPREF_JS_OFF', 0);
 define('SMPREF_JS_ON', 1);
 define('SMPREF_JS_AUTODETECT', 2);
 
+/**
+ * default value for page_selector_max
+ */
+define('PG_SEL_MAX', 10);
+
+
+/**
+ * The number of pages to cache msg headers
+ */
+define('SQM_MAX_PAGES_IN_CACHE',5);
+
+/**
+ * The number of mailboxes to cache msg headers
+ */
+define('SQM_MAX_MBX_IN_CACHE',3);
+
+/**
+ * Sort constants used for sorting of messages
+ */
+define('SQSORT_NONE',0);
+define('SQSORT_DATE_ASC',1);
+define('SQSORT_DATE_DESC',2);
+define('SQSORT_FROM_ASC',3);
+define('SQSORT_FROM_DESC',4);
+define('SQSORT_SUBJ_ASC',5);
+define('SQSORT_SUBJ_DESC',6);
+define('SQSORT_SIZE_ASC',7);
+define('SQSORT_SIZE_DESC',8);
+define('SQSORT_TO_ASC',9);
+define('SQSORT_TO_DESC',10);
+define('SQSORT_CC_ASC',11);
+define('SQSORT_CC_DESC',12);
+define('SQSORT_INT_DATE_ASC',13);
+define('SQSORT_INT_DATE_DESC',14);
+
+/**
+ * Special sort constant thread which is added to above sort mode.
+ * By doing a bitwise check ($sort & SQSORT_THREAD) we know if the mailbox
+ * is sorted by thread.
+ */
+define('SQSORT_THREAD',32);
+
+/**
+ * Mailbox preference array keys
+ */
+define('MBX_PREF_SORT',0);
+define('MBX_PREF_LIMIT',1);
+define('MBX_PREF_AUTO_EXPUNGE',2);
+define('MBX_PREF_INTERNALDATE',3);
+define('MBX_PREF_COLUMNS',4);
+// define('MBX_PREF_FUTURE',unique integer key);
+
+/**
+ * Email address array keys
+ */
+define('SQM_ADDR_PERSONAL', 0);
+define('SQM_ADDR_ADL',      1);
+define('SQM_ADDR_MAILBOX',  2);
+define('SQM_ADDR_HOST',     3);
+
+/**
+ * Supported columns to show in a messages list
+ * The MBX_PREF_COLUMNS contains an ordered array with these columns
+ */
+define('SQM_COL_CHECK',0);
+define('SQM_COL_FROM',1);
+define('SQM_COL_DATE', 2);
+define('SQM_COL_SUBJ', 3);
+define('SQM_COL_FLAGS', 4);
+define('SQM_COL_SIZE', 5);
+define('SQM_COL_PRIO', 6);
+define('SQM_COL_ATTACHMENT', 7);
+define('SQM_COL_INT_DATE', 8);
+define('SQM_COL_TO', 9);
+define('SQM_COL_CC', 10);
+define('SQM_COL_BCC', 11);
+
+
 do_hook('loading_constants');
 
 ?>

functions/imap_messages.php

@@ -21,7 +21,7 @@
  * @param string $id The list of messages to copy
  * @param string $mailbox The destination to copy to
  * @param bool $handle_errors Show error messages in case of a NO, BAD or BYE response
- * @return bool If the copy completed without errors  
+ * @return bool If the copy completed without errors
  */
 function sqimap_msgs_list_copy($imap_stream, $id, $mailbox, $handle_errors = true) {
     $msgs_id = sqimap_message_list_squisher($id);
@@ -581,7 +581,7 @@ function parseArray($read,&$i) {
 /**
  * Retrieves a list with headers, flags, size or internaldate from the imap server
  *
- * WARNING: function is not portable between SquirrelMail 1.2.x, 1.4.x and 1.5.x. 
+ * WARNING: function is not portable between SquirrelMail 1.2.x, 1.4.x and 1.5.x.
  * Output format, third argument and $msg_list array format requirements differ.
  * @param stream $imap_stream imap connection
  * @param array  $msg_list array with id's to create a msgs set from
@@ -591,11 +591,19 @@ function parseArray($read,&$i) {
  * @since 1.1.3
  */
 function sqimap_get_small_header_list($imap_stream, $msg_list,
-    $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Importance', 'Priority', 'Content-Type'),
+    $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'),
     $aFetchItems = array('FLAGS', 'RFC822.SIZE', 'INTERNALDATE')) {
 
     $aMessageList = array();
 
+    /**
+     * Catch other priority headers as well
+     */
+    if (in_array('X-Priority',$aHeaderFields,true)) {
+        $aHeaderFields[] = 'Importance';
+        $aHeaderFields[] = 'Priority';
+    }
+
     $bUidFetch = ! in_array('UID', $aFetchItems, true);
 
     /* Get the small headers for each message in $msg_list */
@@ -645,22 +653,23 @@ function sqimap_get_small_header_list($imap_stream, $msg_list,
  * @author Marc Groot Koerkamp
  */
 function parseFetch($aResponse,$aMessageList = array()) {
-    foreach ($aResponse as $r) {
-        $msg = array();
-        // use unset because we do isset below
-        $read = implode('',$r);
+    for ($j=0,$iCnt=count($aResponse);$j<$iCnt;++$j) {
+        $aMsg = array();
 
+        $read = implode('',$aResponse[$j]);
+        // free up memmory
+        unset($aResponse[$j]); /* unset does not reindex the array. the for loop is safe */
         /*
-         * #id<space>FETCH<space>(
-         */
+            * #id<space>FETCH<space>(
+        */
 
         /* extract the message id */
-        $i_space = strpos($read,' ',2);
-        $id = substr($read,2,$i_space-2);
-        $msg['ID'] = $id;
+        $i_space = strpos($read,' ',2);/* position 2ed <space> */
+        $id = substr($read,2/* skip "*<space>" */,$i_space -2);
+        $aMsg['ID'] = $id;
         $fetch = substr($read,$i_space+1,5);
         if (!is_numeric($id) && $fetch !== 'FETCH') {
-            $msg['ERROR'] = $read; // htmlspecialchars should be done just before display. this is backend code
+            $aMsg['ERROR'] = $read; // htmlspecialchars should be done just before display. this is backend code
             break;
         }
         $i = strpos($read,'(',$i_space+5);
@@ -674,6 +683,9 @@ function parseFetch($aResponse,$aMessageList = array()) {
             $i = strpos($read,' ');
             $arg = substr($read,0,$i);
             ++$i;
+            /*
+             * use allcaps for imap items and lowcaps for headers as key for the $aMsg array
+             */
             switch ($arg)
             {
             case 'UID':
@@ -696,7 +708,7 @@ function parseFetch($aResponse,$aMessageList = array()) {
                     $flag = strtolower($flag);
                     $aFlags[$flag] = true;
                 }
-                $msg['FLAGS'] = $aFlags;
+                $aMsg['FLAGS'] = $aFlags;
                 break;
             case 'RFC822.SIZE':
                 $i_pos = strpos($read,' ',$i);
@@ -704,77 +716,81 @@ function parseFetch($aResponse,$aMessageList = array()) {
                     $i_pos = strpos($read,')',$i);
                 }
                 if ($i_pos) {
-                    $msg['SIZE'] = substr($read,$i,$i_pos-$i);
+                    $aMsg['SIZE'] = substr($read,$i,$i_pos-$i);
                     $i = $i_pos+1;
                 } else {
                     break 3;
                 }
-
                 break;
             case 'ENVELOPE':
-                break; // to be implemented, moving imap code out of the nessages class
-                sqimap_parse_address($read,$i,$msg);
-                break; // to be implemented, moving imap code out of the nessages class
+                // sqimap_parse_address($read,$i,$aMsg);
+                break; // to be implemented, moving imap code out of the Message class
             case 'BODYSTRUCTURE':
-                break;
+                break; // to be implemented, moving imap code out of the Message class
             case 'INTERNALDATE':
-                $msg['INTERNALDATE'] = trim(str_replace('  ', ' ',parseString($read,$i)));
+                $aMsg['INTERNALDATE'] = trim(str_replace('  ', ' ',parseString($read,$i)));
                 break;
             case 'BODY.PEEK[HEADER.FIELDS':
             case 'BODY[HEADER.FIELDS':
-                $i = strpos($read,'{',$i);
+                $i = strpos($read,'{',$i); // header is always returned as literal because it contain \n characters
                 $header = parseString($read,$i);
                 if ($header === false) break 2;
                 /* First we replace all \r\n by \n, and unfold the header */
                 $hdr = trim(str_replace(array("\r\n", "\n\t", "\n "),array("\n", ' ', ' '), $header));
-                /* Now we can make a new header array with */
-                /* each element representing a headerline  */
-                $hdr = explode("\n" , $hdr);
+                /* Now we can make a new header array with
+                   each element representing a headerline  */
+                $aHdr = explode("\n" , $hdr);
                 $aReceived = array();
-                foreach ($hdr as $line) {
+                foreach ($aHdr as $line) {
                     $pos = strpos($line, ':');
                     if ($pos > 0) {
                         $field = strtolower(substr($line, 0, $pos));
                         if (!strstr($field,' ')) { /* valid field */
                             $value = trim(substr($line, $pos+1));
-                            switch($field)
-                            {
-                            case 'to': $msg['TO'] = $value; break;
-                            case 'cc': $msg['CC'] = $value; break;
-                            case 'from': $msg['FROM'] = $value; break;
-                            case 'date':
-                                $msg['DATE'] = str_replace('  ', ' ', $value);
-                                break;
-                            case 'x-priority':
-                            case 'importance':
-                            case 'priority':
-                                $msg['PRIORITY'] = parsePriority($value); break;
-                            case 'subject': $msg['SUBJECT'] = $value; break;
-                            case 'content-type':
-                                $type = $value;
-                                if ($pos = strpos($type, ";")) {
-                                    $type = substr($type, 0, $pos);
-                                }
-                                $type = explode("/", $type);
-                                if(!is_array($type) || count($type) < 2) {
-                                    $msg['TYPE0'] = 'text';
-                                    $msg['TYPE1'] = 'plain';
-                                } else {
-                                    $msg['TYPE0'] = strtolower($type[0]);
-                                    $msg['TYPE1'] = strtolower($type[1]);
-                                }
-                                break;
-                            case 'received':
-                                $aReceived[] = $value;
-                                break;
-                            default: break;
+                            switch($field) {
+                                case 'date':
+                                    $aMsg['date'] = trim(str_replace('  ', ' ', $value));
+                                    break;
+                                case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value{0} : 3; break;
+                                case 'priority':
+                                case 'importance':
+                                    if (!isset($aMsg['x-priority'])) {
+                                        $value = strtolower(array_shift(split('/\w/',trim($value))));
+                                        if  (is_numeric($value)) {
+                                            $value = (int) $value;
+                                        } elseif ( $value == 'non-urgent' || $value == 'low' ) {
+                                            $value = 3;
+                                        } elseif ( $value == 'urgent' || $value == 'high' ) {
+                                            $value = 1;
+                                        } else {
+                                            // default is normal priority
+                                            $value = 3;
+                                        }
+                                        $aMsg['x-priority'] = $value;
+                                    }
+                                    break;
+                                case 'content-type':
+                                    $type = $value;
+                                    if ($pos = strpos($type, ";")) {
+                                        $type = substr($type, 0, $pos);
+                                    }
+                                    $type = explode("/", $type);
+                                    if(!is_array($type) || count($type) < 2) {
+                                        $aMsg['content-type'] = array('text','plain');
+                                    } else {
+                                        $aMsg['content-type'] = array(strtolower($type[0]),strtolower($type[1]));
+                                    }
+                                    break;
+                                case 'received':
+                                    $aMsg['received'][] = $value;
+                                    break;
+                                default:
+                                    $aMsg[$field] = $value;
+                                    break;
                             }
                         }
                     }
                 }
-                if (count($aReceived)) {
-                    $msg['RECEIVED'] = $aReceived;
-                }
                 break;
             default:
                 ++$i;
@@ -783,14 +799,11 @@ function parseFetch($aResponse,$aMessageList = array()) {
         }
         $msgi ="$unique_id";
         $msg['UID'] = $unique_id;
-
-        $aMessageList[$msgi] = $msg;
-        ++$msgi;
+        $aMessageList[$msgi] = $aMsg;
     }
     return $aMessageList;
 }
 
-
 /**
  * Work in process
  * @private
@@ -949,45 +962,4 @@ function sqimap_get_message($imap_stream, $id, $mailbox) {
     return $msg;
 }
 
-
-/**
- * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_copy instead
- */
-function sqimap_messages_copy($imap_stream, $start, $end, $mailbox) {
-    $read = sqimap_run_command ($imap_stream, "COPY $start:$end " . sqimap_encode_mailbox_name($mailbox), true, $response, $message, TRUE);
-}
-
-
-/**
- * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_delete instead
- */
-function sqimap_messages_delete($imap_stream, $start, $end, $mailbox, $bypass_trash=false) {
-    global $move_to_trash, $trash_folder;
-
-    if (($move_to_trash == true) && ($bypass_trash != true) &&
-        (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
-        sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
-    }
-    sqimap_messages_flag ($imap_stream, $start, $end, "Deleted", true);
-}
-
-
-/**
- * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_toggle_flag instead
- * Set a flag on the provided uid list
- * @param  resource imap connection
- */
-function sqimap_messages_flag($imap_stream, $start, $end, $flag, $handle_errors) {
-    $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", $handle_errors, $response, $message, TRUE);
-}
-
-
-/**
- * @deprecated
- */
-function sqimap_get_small_header($imap_stream, $id, $sent) {
-    $res = sqimap_get_small_header_list($imap_stream, $id, $sent);
-    return $res[0];
-}
-
 ?>

functions/page_header.php

@@ -68,7 +68,6 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true
         echo "<!-- \xfd\xfe -->\n";
         echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp">' . "\n";
     }
-
     if ($do_hook) {
         do_hook('generic_header');
     }
@@ -137,375 +136,40 @@ function displayInternalLink($path, $text, $target='') {
  *
  * @param array color the array of theme colors
  * @param string mailbox the current mailbox name to display
- * @param string xtra extra html code to add
- * @param bool session
+ * @param string sHeaderJs javascipt code to be inserted in a script block in the header
+ * @param string sBodyTagJs js events to be inserted in the body tag
  * @return void
  */
-function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
-    global $hide_sm_attributions, $PHP_SELF, $frame_top,
-           $compose_new_win, $compose_width, $compose_height,
+function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') {
+    global $hide_sm_attributions, $frame_top,
            $provider_name, $provider_uri, $startMessage,
-           $javascript_on, $default_use_mdn, $mdn_user_support;
+           $javascript_on;
 
-    sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION );
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
-    $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
-    if ($qmark = strpos($module, '?')) {
-        $module = substr($module, 0, $qmark);
-    }
+
     if (!isset($frame_top)) {
         $frame_top = '_top';
     }
 
-    if ($session) {
-    $compose_uri = $base_uri.'src/compose.php?mailbox='.urlencode($mailbox).'&amp;attachedmessages=true&amp;session='."$session";
-    } else {
-        $compose_uri = $base_uri.'src/compose.php?newmessage=1';
-    $session = 0;
-    }
-
     if( $javascript_on || strpos($xtra, 'new_js_autodetect_results.value') ) {
-
-      switch ( $module ) {
-        case 'src/read_body.php':
-                $js ='';
-
-                // compose in new window code
-                if ($compose_new_win == '1') {
-                    if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
-                        $compose_width = '640';
-                    }
-                    if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
-                        $compose_height = '550';
-                    }
-                    $js .= "function comp_in_new_form(comp_uri, button, myform) {\n".
-                           '   if (!comp_uri) {'."\n".
-                           '       comp_uri = "'.$compose_uri."\";\n".
-                           '   }'. "\n".
-                           '   comp_uri += "&" + button.name + "=1";'."\n".
-                           '   for ( var i=0; i < myform.elements.length; i++ ) {'."\n".
-                           '      if ( myform.elements[i].type == "checkbox"  && myform.elements[i].checked )'."\n".
-                           '         comp_uri += "&" + myform.elements[i].name + "=1";'."\n".
-                           '   }'."\n".
-                           '   var newwin = window.open(comp_uri' .
-                           ', "_blank",'.
-                           '"width='.$compose_width. ',height='.$compose_height.
-                           ',scrollbars=yes,resizable=yes,status=yes");'."\n".
-                           "}\n\n";
-                    $js .= "function comp_in_new(comp_uri) {\n".
-                           "       if (!comp_uri) {\n".
-                           '           comp_uri = "'.$compose_uri."\";\n".
-                           '       }'. "\n".
-                           '    var newwin = window.open(comp_uri' .
-                           ', "_blank",'.
-                           '"width='.$compose_width. ',height='.$compose_height.
-                           ',scrollbars=yes,resizable=yes,status=yes");'."\n".
-                           "}\n\n";
-                }
-
-                // javascript for sending read receipts
-                if($default_use_mdn && $mdn_user_support) {
-                    $js .= 'function sendMDN() {'."\n".
-                           "    mdnuri=window.location+'&sendreceipt=1'; ".
-                           "var newwin = window.open(mdnuri,'right');".
-                       "\n}\n\n";
-                }
-
-                // if any of the above passes, add the JS tags too.
-                if($js) {
-                    $js = "\n".'<script language="JavaScript" type="text/javascript">' .
-                        "\n<!--\n" . $js . "// -->\n</script>\n";
-                }
-
-                displayHtmlHeader ('SquirrelMail', $js);
-                $onload = $xtra;
-            break;
-        case 'src/compose.php':
-            $js = '<script language="JavaScript" type="text/javascript">' .
-                 "\n<!--\n" .
-             "function checkForm() {\n";
-
-            global $action, $reply_focus;
-            if (strpos($action, 'reply') !== FALSE && $reply_focus)
-            {
-                if ($reply_focus == 'select') $js .= "document.forms['compose'].body.select();}\n";
-                else if ($reply_focus == 'focus') $js .= "document.forms['compose'].body.focus();}\n";
-                else if ($reply_focus == 'none') $js .= "}\n";
-            }
-            // no reply focus also applies to composing new messages
-            else if ($reply_focus == 'none')
-            {
-                $js .= "}\n";
-            }
-            else
-                $js .= "var f = document.forms.length;\n".
-                    "var i = 0;\n".
-                    "var pos = -1;\n".
-                    "while( pos == -1 && i < f ) {\n".
-                        "var e = document.forms[i].elements.length;\n".
-                        "var j = 0;\n".
-                        "while( pos == -1 && j < e ) {\n".
-                            "if ( document.forms[i].elements[j].type == 'text' ) {\n".
-                                "pos = j;\n".
-                            "}\n".
-                            "j++;\n".
-                        "}\n".
-                    "i++;\n".
-                    "}\n".
-                    "if( pos >= 0 ) {\n".
-                        "document.forms[i-1].elements[pos].focus();\n".
-                    "}\n".
-                "}\n";
-
-            $js .= "// -->\n".
-                 "</script>\n";
-            $onload = 'onload="checkForm();"';
-            displayHtmlHeader ('SquirrelMail', $js);
-            break;
-
-        case 'src/right_main.php':
-            global $fancy_index_highlite;
-            if (!$fancy_index_highlite) {
-                $js = '';
-            } else //{ putting braces around this block creats strange PHP errors
-                // following code graciously borrowed from 
-                // phpMyAdmin project at:
-                // http://www.phpmyadmin.net
-                $js = <<<EOS
-/**
- * This array is used to remember mark status of rows in browse mode
- */
-var marked_row = new Array;
-
-
-/* 
- * (un)Checks checkbox for the row that the current table cell is in
- * when it gets clicked.
- *
- * @param   string   the name of the checkbox that should be (un)checked
- */
-function row_click(chkboxName) {
-    chkbox = document.getElementById(chkboxName);
-    if (chkbox) { 
-        chkbox.checked = (chkbox.checked ? false : true); 
-    }
-}
-
-
-
-/*
- * Sets/unsets the pointer and marker in browse mode
- *
- * @param   object    the table row
- * @param   integer  the row number
- * @param   string    the action calling this script (over, out or click)
- * @param   string    the default background color
- * @param   string    the color to use for mouseover
- * @param   string    the color to use for marking a row
- *
- * @return  boolean  whether pointer is set or not
- */
-function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerColor, theMarkColor)
-{
-    var theCells = null;
-
-    // 1. Pointer and mark feature are disabled or the browser can't get the
-    //    row -> exits
-    if ((thePointerColor == '' && theMarkColor == '')
-        || typeof(theRow.style) == 'undefined') {
-        return false;
-    }
-
-    // 2. Gets the current row and exits if the browser can't get it
-    if (typeof(document.getElementsByTagName) != 'undefined') {
-        theCells = theRow.getElementsByTagName('td');
-    }
-    else if (typeof(theRow.cells) != 'undefined') {
-        theCells = theRow.cells;
-    }
-    else {
-        return false;
-    }
-
-    // 3. Gets the current color...
-    var rowCellsCnt  = theCells.length;
-    var domDetect    = null;
-    var currentColor = null;
-    var newColor     = null;
-    // 3.1 ... with DOM compatible browsers except Opera that does not return
-    //         valid values with "getAttribute"
-    if (typeof(window.opera) == 'undefined'
-        && typeof(theCells[0].getAttribute) != 'undefined') {
-        currentColor = theCells[0].getAttribute('bgcolor');
-        domDetect    = true;
-    }
-    // 3.2 ... with other browsers
-    else {
-        currentColor = theCells[0].style.backgroundColor;
-        domDetect    = false;
-    } // end 3
-
-    // 3.3 ... Opera changes colors set via HTML to rgb(r,g,b) format so fix it
-    if (currentColor.indexOf("rgb") >= 0)
-    {
-        var rgbStr = currentColor.slice(currentColor.indexOf('(') + 1,
-                                     currentColor.indexOf(')'));
-        var rgbValues = rgbStr.split(",");
-        currentColor = "#";
-        var hexChars = "0123456789ABCDEF";
-        for (var i = 0; i < 3; i++)
-        {
-            var v = rgbValues[i].valueOf();
-            currentColor += hexChars.charAt(v/16) + hexChars.charAt(v%16);
-        }
-    }
-
-    // 4. Defines the new color
-    // 4.1 Current color is the default one
-    if (currentColor == ''
-        || currentColor.toLowerCase() == theDefaultColor.toLowerCase()) {
-        if (theAction == 'over' && thePointerColor != '') {
-            newColor              = thePointerColor;
-        }
-        else if (theAction == 'click' && theMarkColor != '') {
-            newColor              = theMarkColor;
-            marked_row[theRowNum] = true;
-            // deactivated onclick marking of the checkbox because it's also executed
-            // when an action (clicking on the checkbox itself) on a single item is 
-            // performed. Then the checkbox would get deactived, even though we need 
-            // it activated. Maybe there is a way to detect if the row was clicked, 
-            // and not an item therein...
-            //document.getElementById('msg[' + theRowNum + ']').checked = true;
-        }
-    }
-    // 4.1.2 Current color is the pointer one
-    else if (currentColor.toLowerCase() == thePointerColor.toLowerCase()
-             && (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])) {
-        if (theAction == 'out') {
-            newColor              = theDefaultColor;
-        }
-        else if (theAction == 'click' && theMarkColor != '') {
-            newColor              = theMarkColor;
-            marked_row[theRowNum] = true;
-            //document.getElementById('msg[' + theRowNum + ']').checked = true;
-        }
-    }
-    // 4.1.3 Current color is the marker one
-    else if (currentColor.toLowerCase() == theMarkColor.toLowerCase()) {
-        if (theAction == 'click') {
-            newColor              = (thePointerColor != '')
-                                  ? thePointerColor
-                                  : theDefaultColor;
-            marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
-                                  ? true
-                                  : null;
-            //document.getElementById('msg[' + theRowNum + ']').checked = false;
-        }
-    } // end 4
-
-    // 5. Sets the new color...
-    if (newColor) {
-        var c = null;
-        // 5.1 ... with DOM compatible browsers except Opera
-        if (domDetect) {
-            for (c = 0; c < rowCellsCnt; c++) {
-                theCells[c].setAttribute('bgcolor', newColor, 0);
-            } // end for
-        }
-        // 5.2 ... with other browsers
-        else {
-            for (c = 0; c < rowCellsCnt; c++) {
-                theCells[c].style.backgroundColor = newColor;
-            }
-        }
-    } // end 5
-
-    return true;
-} // end of the 'setPointer()' function
-EOS;
-            //} putting braces around this block creats strange PHP errors
-            $js = "\n".'<script language="JavaScript" type="text/javascript">' .
-                        "\n<!--\n" . $js;
-            if ($compose_new_win == '1') {
-                if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
-                    $compose_width = '640';
-                }
-                if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
-                    $compose_height = '550';
-                }
-                $js .= "\n\nfunction comp_in_new(comp_uri) {\n".
-                     "       if (!comp_uri) {\n".
-                     '           comp_uri = "'.$compose_uri."\";\n".
-                     '       }'. "\n".
-                     '    var newwin = window.open(comp_uri' .
-                     ', "_blank",'.
-                     '"width='.$compose_width. ',height='.$compose_height.
-                     ',scrollbars=yes,resizable=yes,status=yes");'."\n".
-                     "}\n\n";
-            }
-            $js .= $xtra . "\n\n// -->\n</script>\n";
-            $onload = '';
-            displayHtmlHeader ('SquirrelMail', $js);
-            break;
-
-        default:
-            $js = '<script language="JavaScript" type="text/javascript">' .
-                 "\n<!--\n" .
-                 "function checkForm() {\n".
-                    "var f = document.forms.length;\n".
-                    "var i = 0;\n".
-                    "var pos = -1;\n".
-                    "while( pos == -1 && i < f ) {\n".
-                        "var e = document.forms[i].elements.length;\n".
-                        "var j = 0;\n".
-                        "while( pos == -1 && j < e ) {\n".
-                            "if ( document.forms[i].elements[j].type == 'text' " .
-                            "|| document.forms[i].elements[j].type == 'password' ) {\n".
-                                "pos = j;\n".
-                            "}\n".
-                            "j++;\n".
-                        "}\n".
-                    "i++;\n".
-                    "}\n".
-                    "if( pos >= 0 ) {\n".
-                        "document.forms[i-1].elements[pos].focus();\n".
-                    "}\n".
-            "$xtra\n".
-                "}\n";
-
-                if ($compose_new_win == '1') {
-                    if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
-                        $compose_width = '640';
-                    }
-                    if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
-                        $compose_height = '550';
-                    }
-                    $js .= "function comp_in_new(comp_uri) {\n".
-                         "       if (!comp_uri) {\n".
-                         '           comp_uri = "'.$compose_uri."\";\n".
-                         '       }'. "\n".
-                         '    var newwin = window.open(comp_uri' .
-                         ', "_blank",'.
-                         '"width='.$compose_width. ',height='.$compose_height.
-                         ',scrollbars=yes,resizable=yes,status=yes");'."\n".
-                         "}\n\n";
-
-                }
-            $js .= "// -->\n". "</script>\n";
-
-            $onload = 'onload="checkForm();"';
-            displayHtmlHeader ('SquirrelMail', $js);
-            break;
-
+        if ($sHeaderJs) {
+            $sJsBlock = "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+                        "\n<!--\n" .
+                        $sJsHeader . "\n\n// -->\n</script>\n";
+        } else {
+           $sJsBlock = '';
         }
-    } else {
+        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        displayHtmlHeader ('SquirrelMail', $sJsBlock);
+   } else {
         /* do not use JavaScript */
         displayHtmlHeader ('SquirrelMail');
-        $onload = '';
+        $sBodyTagJs = '';
     }
 
-    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
+    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $sBodyTagJs>\n\n";
+
     /** Here is the header and wrapping table **/
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
                 readShortMailboxName($mailbox, $delimiter)));
@@ -569,75 +233,30 @@ EOS;
  *
  * @param array color the array of theme colors
  * @param string mailbox the current mailbox name to display
+ * @param string sHeaderJs javascipt code to be inserted in a script block in the header
+ * @param string sBodyTagJs js events to be inserted in the body tag
  * @return void
  */
-function compose_Header($color, $mailbox) {
-
+function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') {
     global $javascript_on;
-
     /*
      * Locate the first displayable form element (only when JavaScript on)
      */
     if($javascript_on) {
-        global $base_uri, $PHP_SELF, $data_dir, $username;
-
-        $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
-
-        switch ( $module ) {
-        case 'src/search.php':
-            $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
-            $onload = "onload=\"document.forms[$pos].elements[2].focus();\"";
-            displayHtmlHeader (_("Compose"));
-            break;
-        default:
-            $js = '<script language="JavaScript" type="text/javascript">' .
-                 "\n<!--\n" .
-             "function checkForm() {\n";
-
-            global $action, $reply_focus;
-            if (strpos($action, 'reply') !== FALSE && $reply_focus)
-            {
-                if ($reply_focus == 'select') $js .= "document.forms['compose'].body.select();}\n";
-                else if ($reply_focus == 'focus') $js .= "document.forms['compose'].body.focus();}\n";
-                else if ($reply_focus == 'none') $js .= "}\n";
-            }
-            // no reply focus also applies to composing new messages
-            else if ($reply_focus == 'none')
-            {
-                $js .= "}\n";
-            }
-            else
-                $js .= "var f = document.forms.length;\n".
-                    "var i = 0;\n".
-                    "var pos = -1;\n".
-                    "while( pos == -1 && i < f ) {\n".
-                        "var e = document.forms[i].elements.length;\n".
-                        "var j = 0;\n".
-                        "while( pos == -1 && j < e ) {\n".
-                            "if ( document.forms[i].elements[j].type == 'text' ) {\n".
-                                "pos = j;\n".
-                            "}\n".
-                            "j++;\n".
-                        "}\n".
-                    "i++;\n".
-                    "}\n".
-                    "if( pos >= 0 ) {\n".
-                        "document.forms[i-1].elements[pos].focus();\n".
-                    "}\n".
-                "}\n";
-            $js .= "// -->\n".
-                 "</script>\n";
-            $onload = 'onload="checkForm();"';
-            displayHtmlHeader (_("Compose"), $js);
-            break;
+        if ($sHeaderJs) {
+            $sJsBlock = "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+                        "\n<!--\n" .
+                        $sJsHeader . "\n\n// -->\n</script>\n";
+        } else {
+           $sJsBlock = '';
         }
+        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        displayHtmlHeader (_("Compose"), $sJsBlock);
     } else {
         /* javascript off */
         displayHtmlHeader(_("Compose"));
         $onload = '';
     }
-
-    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
+    echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $sBodyTagJs>\n\n";
 }
-
 ?>

functions/strings.php

@@ -735,7 +735,7 @@ function show_readable_size($bytes) {
         settype($bytes, 'integer');
     }
 
-    return $bytes . '<small>&nbsp;' . $type . '</small>';
+    return $bytes . '&nbsp;' . $type;
 }
 
 /**
@@ -859,6 +859,7 @@ function makeComposeLink($url, $text = null, $target='')
  * The output is wrapped in <<pre>> and <</pre>> tags.
  * Since 1.4.2 accepts unlimited number of arguments.
  * @since 1.4.1
+ *
  * @return void
  */
 function sm_print_r() {
@@ -1094,13 +1095,13 @@ function sq_mb_list_encodings() {
  * Function returns number of characters in string.
  *
  * Returned number might be different from number of bytes in string,
- * if $charset is multibyte charset. Detection depends on mbstring 
+ * if $charset is multibyte charset. Detection depends on mbstring
  * functions. If mbstring does not support tested multibyte charset,
- * vanilla string length function is used. 
+ * vanilla string length function is used.
  * @param string $str string
  * @param string $charset charset
  * @since 1.5.1
- * @return integer number of characters in string 
+ * @return integer number of characters in string
  */
 function sq_strlen($str, $charset=''){
     // default option
@@ -1123,7 +1124,7 @@ function sq_strlen($str, $charset=''){
     if (in_array($charset,$aList_of_mb_charsets) && in_array($charset,sq_mb_list_encodings())) {
         $real_length = mb_strlen($str,$charset);
     } else {
-        // own strlen detection code is removed because missing strpos, 
+        // own strlen detection code is removed because missing strpos,
         // strtoupper and substr implementations break string wrapping.
         $real_length=strlen($str);
     }
@@ -1137,7 +1138,7 @@ function sq_strlen($str, $charset=''){
  * @param string $string original string
  * @param integer $width padded string width
  * @param string $pad padding symbols
- * @param integer $padtype padding type 
+ * @param integer $padtype padding type
  *  (internal php defines, see str_pad() description)
  * @param string $charset charset used in original string
  * @return string padded string
@@ -1183,7 +1184,7 @@ function sq_substr($string,$start,$length,$charset='auto') {
         $charset=$default_charset;
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_internal_encoding') && 
+    if (function_exists('mb_internal_encoding') &&
         in_array($charset,sq_mb_list_encodings())) {
         return mb_substr($string,$start,$length,$charset);
     }
@@ -1213,7 +1214,7 @@ function sq_strpos($haystack,$needle,$offset,$charset='auto') {
         $charset=$default_charset;
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_internal_encoding') && 
+    if (function_exists('mb_internal_encoding') &&
         in_array($charset,sq_mb_list_encodings())) {
         return mb_strpos($haystack,$needle,$offset,$charset);
     }
@@ -1241,7 +1242,7 @@ function sq_strtoupper($string,$charset='auto') {
         $charset=$default_charset;
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_strtoupper') && 
+    if (function_exists('mb_strtoupper') &&
         in_array($charset,sq_mb_list_encodings())) {
         return mb_strtoupper($string,$charset);
     }

include/load_prefs.php

@@ -156,7 +156,7 @@ $timezone = getPref($data_dir, $username, 'timezone', SMPREF_NONE );
 /* Load preferences for reply citation style. */
 
 $reply_citation_style =
-    getPref($data_dir, $username, 'reply_citation_style', 'date_time_author' );
+    getPref($data_dir, $username, 'reply_citation_style', SMPREF_NONE );
 $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start');
 $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end');
 
@@ -196,20 +196,69 @@ if( $ser = getPref($data_dir, $username, 'hililist') ) {
     setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
 }
 
+/* use the internal date of the message for sorting instead of the supplied header date */
+/* OBSOLETE */
+
+$internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
+
 /* Index order lets you change the order of the message index */
 $order = getPref($data_dir, $username, 'order1');
-for ($i = 1; $order; ++$i) {
-    $index_order[$i] = $order;
-    $order = getPref($data_dir, $username, 'order'.($i+1));
+if (isset($order1)) {
+    removePref($data_dir, $username, 'order1');
+    for ($i = 1; $order; ++$i) {
+        $index_order[$i-1] = $order -1;
+        $order = getPref($data_dir, $username, 'order'.($i+1));
+        removePref($data_dir, $username, 'order'.($i+1));
+    }
+    if (isset($internal_date_sort) && $internal_date_sort) {
+        if (in_array(SQM_COL_DATE,$index_order)) {
+            $k = array_search(SQM_COL_DATE,$index_order,true);
+            $index_order[$k] = SQM_COL_INT_DATE;
+        }
+    }
+    setPref($data_dir, $username, 'index_order', serialize($index_order));
 }
-if (!isset($index_order)) {
-    $index_order[1] = 1;
-    $index_order[2] = 2;
-    $index_order[3] = 3;
-    $index_order[4] = 5;
-    $index_order[5] = 4;
+$index_order = getPref($data_dir, $username, 'index_order');
+if (is_string($index_order)) {
+    $index_order = unserialize($index_order);
 }
 
+
+// new Index order handling
+//$default_mailbox_pref = unserialize(getPref($data_dir, $username, 'default_mailbox_pref'));
+
+if (!$index_order) {
+    if (isset($internal_date_sort) && $internal_date_sort == false) {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    } else {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    }
+    setPref($data_dir, $username, 'index_order', serialize($index_order));
+}
+
+
+
+if (!isset($default_mailbox_pref)) {
+    $show_num = (isset($show_num)) ? $show_num : 15;
+
+    $default_mailbox_pref = array (
+        MBX_PREF_SORT => 0,
+        MBX_PREF_LIMIT => $show_num,
+        MBX_PREF_AUTO_EXPUNGE => $auto_expunge,
+        MBX_PREF_COLUMNS => $index_order);
+    // setPref($data_dir, $username, 'default_mailbox_pref', serialize($default_mailbox_pref));
+    // clean up the old prefs
+//    if (isset($prefs_cache['internal_date_sort'])) {
+//        unset($prefs_cache['internal_date_sort']);
+//        removePref($data_dir,$username,'internal_date_sort');
+//    }
+//    if (isset($prefs_cache['show_num'])) {
+//        unset($prefs_cache['show_num']);
+//        removePref($data_dir,$username,'show_num');
+//    }
+}
+
+
 $alt_index_colors =
     getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON );
 
@@ -235,6 +284,7 @@ $show_xmailer_default =
     getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF );
 $attachment_common_show_images = getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF );
 
+
 /* message disposition notification support setting */
 $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', SMPREF_ON);
 
@@ -251,7 +301,7 @@ $date_format = getPref($data_dir, $username, 'date_format', 3);
 $hour_format = getPref($data_dir, $username, 'hour_format', SMPREF_TIME_12HR);
 
 /*  compose in new window setting */
-$compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+$compose_new_win = getPref($data_dir, $username, 'compose_new_win', SMPREF_OFF);
 $compose_height = getPref($data_dir, $username, 'compose_height', 550);
 $compose_width = getPref($data_dir, $username, 'compose_width', 640);
 
@@ -284,11 +334,12 @@ $search_memory = getPref($data_dir, $username, 'search_memory', SMPREF_OFF);
 $show_only_subscribed_folders =
     getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
 
+
 $forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF);
 
 /* How are mailbox select lists displayed: 0. full names, 1. indented (default),
  * 3. delimited) */
-$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 1);
+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_ON);
 
 /* Allow user to customize, and display the full date, instead of day, or time based
    on time distance from date of message */
@@ -305,4 +356,4 @@ $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_disp
 
 do_hook('loading_prefs');
 
-?>
+?>

include/options/display.php

@@ -277,7 +277,8 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE,
         'size'    => SMOPT_SIZE_TINY
     );
-
+/*
+  disabled because the template doesn't support it (yet?)
     $optvals[SMOPT_GRP_MAILBOX][] = array(
         'name'    => 'show_recipient_instead',
         'caption' => _("Show recipient name if the message is from your default identity"),
@@ -285,13 +286,8 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE,
         'size'    => SMOPT_SIZE_TINY
     );
+*/
 
-    $optvals[SMOPT_GRP_MAILBOX][] = array(
-        'name'    => 'internal_date_sort',
-        'caption' => _("Sort by Received Date"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_ALL
-    );
     if ($allow_thread_sort == TRUE) {
         $optvals[SMOPT_GRP_MAILBOX][] = array(
             'name'    => 'sort_by_ref',

src/compose.php

@@ -175,6 +175,7 @@ function getReplyCitation($orig_from, $orig_date) {
     } else {
         $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true);
     }
+
 //    $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
 
     /* First, return an empty string when no citation style selected. */
@@ -204,7 +205,7 @@ function getReplyCitation($orig_from, $orig_date) {
     case 'date_time_author':
         /**
          * To translators:
-         *  first %s is for date string, second %s is for author's name. Date uses 
+         *  first %s is for date string, second %s is for author's name. Date uses
          *  formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations.
          * Example string:
          *  "On Sat, December 24, 2004 23:59, Santa said:"
@@ -230,9 +231,9 @@ function getReplyCitation($orig_from, $orig_date) {
 /**
  * Creates header fields in forwarded email body
  *
- * $default_charset global must be set correctly before you call this function. 
+ * $default_charset global must be set correctly before you call this function.
  * @param object $orig_header
- * @return $string 
+ * @return $string
  */
 function getforwardHeader($orig_header) {
     global $editor_size, $default_charset;
@@ -311,7 +312,13 @@ if (sqsession_is_registered('session_expired_post')) {
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     } else {
-        displayPageHeader($color, $mailbox);
+        $sHeaderJs = (isset($sHeaderJs)) ? $sHeaderJs : '';
+        if (strpos($action, 'reply') !== false && $reply_focus) {
+            $sBodyTagJs = 'onload="checkForm(\''.$replyfocus.'\');"';
+        } else {
+            $sBodyTagJs = 'onload="checkForm();"';
+        }
+        displayPageHeader($color, $mailbox,$sHeaderJs,$sBodyTagJs);
     }
     showInputForm($session, false);
     exit();
@@ -330,6 +337,7 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) {
 if (!isset($compose_messages)) {
     $compose_messages = array();
 }
+
 if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) {
     /* if (!array_key_exists($session, $compose_messages)) {  /* We can only do this in PHP >= 4.1 */
     $composeMessage = new Message();
@@ -337,6 +345,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)
     $composeMessage->rfc822_header = $rfc822_header;
     $composeMessage->reply_rfc822_header = '';
     $compose_messages[$session] = $composeMessage;
+
     sqsession_register($compose_messages,'compose_messages');
 } else {
     $composeMessage=$compose_messages[$session];
@@ -364,7 +373,7 @@ if ($draft) {
             $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
             sqimap_mailbox_select($imap_stream, $draft_folder);
             // force bypass_trash=true because message should be saved when deliverMessage() returns true.
-            // in current implementation of sqimap_msgs_list_flag() single message id can 
+            // in current implementation of sqimap_msgs_list_flag() single message id can
             // be submitted as string. docs state that it should be array.
             sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true);
             if ($auto_expunge) {
@@ -443,7 +452,7 @@ if ($send) {
             $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
             sqimap_mailbox_select($imap_stream, $draft_folder);
             // bypass_trash=true because message should be saved when deliverMessage() returns true.
-            // in current implementation of sqimap_msgs_list_flag() single message id can 
+            // in current implementation of sqimap_msgs_list_flag() single message id can
             // be submitted as string. docs state that it should be array.
             sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true);
             if ($auto_expunge) {
@@ -793,6 +802,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                 // forwarded message text should be as undisturbed as possible, so commenting out this call
                 // sqUnWordWrap($body);
                 $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+
                 //add a blank line after the forward headers
                 $body = "\n" . $body;
                 break;
@@ -878,7 +888,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
  * @param integer $passed_id
  * @param mixed $entities
  * @param mixed $imapConnection
- * @return object  
+ * @return object
  */
 function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) {
     global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages;
@@ -923,9 +933,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
 
             /* Write Attachment to file */
             $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
-            fputs($fp, decodeBody(mime_fetch_body($imapConnection,
-                            $passed_id, $message->entity_id),
-                        $message->header->encoding));
+            mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp);
             fclose ($fp);
         }
     } else {
@@ -979,6 +987,7 @@ function showInputForm ($session, $values=false) {
         $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
         $username, $compose_messages, $composesession, $default_charset;
 
+
     $composeMessage = $compose_messages[$session];
     if ($values) {
         $send_to = $values['send_to'];
@@ -1116,7 +1125,7 @@ function showInputForm ($session, $values=false) {
             /*
              * FIXME: test is specific to ja_JP translation implementation.
              * This test might apply incorrect conversion to other translations, but
-             * use of 7bit iso-2022-jp charset in other translations might have other 
+             * use of 7bit iso-2022-jp charset in other translations might have other
              * issues too.
              */
             if ($default_charset == 'iso-2022-jp') {
@@ -1342,7 +1351,6 @@ function checkInput ($show) {
 function saveAttachedFiles($session) {
     global $_FILES, $attachment_dir, $attachments, $username,
         $data_dir, $compose_messages;
-
     /* get out of here if no file was attached at all */
     if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
         return true;
@@ -1615,7 +1623,7 @@ function deliverMessage($composeMessage, $draft=false) {
         ClearAttachments($composeMessage);
         if ($action == 'reply' || $action == 'reply_all') {
             sqimap_mailbox_select ($imap_stream, $mailbox);
-            sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false);
+            sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false);
         }
         sqimap_logout($imap_stream);
     }
@@ -1623,4 +1631,4 @@ function deliverMessage($composeMessage, $draft=false) {
 }
 
 // vim: et ts=4
-?>
+?>

src/download.php

@@ -39,6 +39,9 @@ sqgetGlobalVar('absolute_dl',$absolute_dl,  SQ_GET);
 if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
     $passed_id = (int) $temp;
 }
+if (!sqgetGlobalVar('account', $account, SQ_GET) ) {
+    $account = 0;
+}
 
 global $default_charset;
 set_my_charset();
@@ -46,7 +49,7 @@ set_my_charset();
 /* end globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array(),array());
+$aMailbox = sqm_api_mailbox_select($imapConnection, $account, $mailbox,array(),array());
 
 if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) &&
     is_object($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) ) {

src/options_order.php

@@ -3,7 +3,7 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays messagelist column order options
@@ -26,133 +26,216 @@ require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/forms.php');
+require_once(SM_PATH . 'functions/arrays.php');
+require_once(SM_PATH . 'functions/options.php');
 
 /* get globals */
-sqgetGlobalVar('num',       $num,       SQ_GET);
-sqgetGlobalVar('add',       $add,       SQ_POST);
+if (sqgetGlobalVar('num',       $num,       SQ_GET)) {
+   $num = (int) $num;
+} else {
+   $num = false;
+}
+if (!sqgetGlobalVar('method', $method)) {
+    $method = '';
+} else {
+    $method = htmlspecialchars($method);
+}
+if (!sqgetGlobalVar('positions', $pos, SQ_GET)) {
+    $pos = 0;
+} else {
+    $pos = (int) $pos;
+}
+
+if (!sqgetGlobalVar('account', $account, SQ_GET)) {
+    $iAccount = 0;
+} else {
+    $iAccount = (int) $account;
+}
+
+if (sqgetGlobalVar('mailbox', $mailbox, SQ_GET)) {
+   $aMailboxPrefs = unserialize(getPref($data_dir, $username, "pref_".$iAccount.'_'.urldecode($mailbox)));
+   if (isset($aMailboxPrefs[MBX_PREF_COLUMNS])) {
+       $index_order = $aMailboxPrefs[MBX_PREF_COLUMNS];
+   }
+} else {
+    $index_order_ser = getPref($data_dir, $username, 'index_order');
+    if ($index_order_ser) {
+        $index_order=unserialize($index_order_ser);
+    }
+}
+if (!isset($index_order)) {
+    if (isset($internal_date_sort) && $internal_date_sort == false) {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    } else {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    }    
+}
+
+if (!sqgetGlobalVar('account', $account,  SQ_GET)) {
+   $account = 0; // future work, multiple imap accounts
+} else {
+   $account = (int) $account;
+}
 
-sqgetGlobalVar('submit',    $submit);
-sqgetGlobalVar('method',    $method);
 /* end of get globals */
 
-displayPageHeader($color, 'None');
-
-   echo
-   html_tag( 'table', '', 'center', '', 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) .
-   html_tag( 'tr' ) .
-   html_tag( 'td', '', 'center', $color[0] ) .
-   '<b>' . _("Options") . ' - ' . _("Index Order") . '</b>' .
-   html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="8" cellspacing="0"' ) .
-   html_tag( 'tr' ) .
-   html_tag( 'td', '', 'center', $color[4] );
-
-    $available[1] = _("Checkbox");
-    $available[2] = _("From");
-    $available[3] = _("Date");
-    $available[4] = _("Subject");
-    $available[5] = _("Flags");
-    $available[6] = _("Size");
-
-    if (! isset($method)) { $method = ''; }
-
-    if ($method == 'up' && $num > 1) {
-        $prev = $num-1;
-        $tmp = $index_order[$prev];
-        $index_order[$prev] = $index_order[$num];
-        $index_order[$num] = $tmp;
-    } else if ($method == 'down' && $num < count($index_order)) {
-        $next = $num++;
-        $tmp = $index_order[$next];
-        $index_order[$next] = $index_order[$num];
-        $index_order[$num] = $tmp;
-    } else if ($method == 'remove' && $num) {
-        for ($i=1; $i < 8; $i++) {
-            removePref($data_dir, $username, "order$i");
-        }
-        for ($j=1,$i=1; $i <= count($index_order); $i++) {
-           if ($i != $num) {
-               $new_ary[$j] = $index_order[$i];
-               $j++;
-           }
-        }
-        $index_order = array();
-        $index_order = $new_ary;
-        if (count($index_order) < 1) {
-           include_once(SM_PATH . 'include/load_prefs.php');
+/***************************************************************/
+/* Finally, display whatever page we are supposed to show now. */
+/***************************************************************/
+
+displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+
+
+/**
+ * Change the column order of a mailbox
+ *
+ * @param array  $index_order (reference) contains an ordered list with columns
+ * @param string $method action to take, move, add and remove are supported
+ * @param int    $num target column
+ * @param int    $pos positions to move a column in the index_order array
+ * @return bool  $r A change in the ordered list took place.
+ */
+function change_columns_list(&$index_order,$method,$num,$pos=0) {
+    $r = false;
+    switch ($method) {
+      case 'move': $r = sqm_array_move_value($index_order,$num,$pos); break;
+      case 'add':  
+          $index_order[] = (int) $num; $r = true; 
+          /**
+           * flush the cache in order to retrieve the new columns
+           */
+          sqsession_unregister('mailbox_cache');
+          break;
+      case 'remove':
+        if(in_array($num, $index_order)) {
+            unset($index_order[array_search($num, $index_order)]);
+            $index_order = array_values($index_order);
+            $r = true;
         }
-    } else if ($method == 'add' && $add) {
-        /* User should not be able to insert PHP-code here */
-        $add = str_replace ('<?', '..', $add);
-        $add = ereg_replace ('<.*script.*language.*php.*>', '..', $add);
-        $add = str_replace ('<%', '..', $add);
-        $index_order[count($index_order)+1] = $add;
+        break;
+      default: break;
     }
+    return $r;
+}
 
+/**
+ * Column to string translation array
+ */
+$available[SQM_COL_CHECK]      = _("Checkbox");
+$available[SQM_COL_FROM]       = _("From");
+$available[SQM_COL_DATE]       = _("Date");
+$available[SQM_COL_SUBJ]       = _("Subject");
+$available[SQM_COL_FLAGS]      = _("Flags");
+$available[SQM_COL_SIZE]       = _("Size");
+$available[SQM_COL_PRIO]       = _("Priority");
+$available[SQM_COL_ATTACHMENT] = _("Attachments");
+$available[SQM_COL_INT_DATE]   = _("Received");
+$available[SQM_COL_TO]         = _("To");
+$available[SQM_COL_CC]         = _("Cc");
+$available[SQM_COL_BCC]        = _("bcc");
+
+if (change_columns_list($index_order,$method,$num,$pos)) {
     if ($method) {
-        for ($i=1; $i <= count($index_order); $i++) {
-           setPref($data_dir, $username, "order$i", $index_order[$i]);
-        }
+        // TODO, bound index_order to mailbox and make a difference between the global index_order and mailbox bounded index_order
+        setPref($data_dir, $username, 'index_order', serialize($index_order));
     }
-    echo html_tag( 'table',
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.")
-                    )
-                ) ,
-            '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br />\n";
-
-    if (count($index_order))
-    {
-        echo html_tag( 'table', '', '', '', ' cellspacing="0" cellpadding="0" border="0"' ) . "\n";
-        for ($i=1; $i <= count($index_order); $i++) {
-            $tmp = $index_order[$i];
-            echo html_tag( 'tr' );
-            echo html_tag( 'td', '<small><a href="options_order.php?method=up&amp;num=' . $i . '">'. _("up") .'</a></small>' );
-            echo html_tag( 'td', '<small>&nbsp;|&nbsp;</small>' );
-            echo html_tag( 'td', '<small><a href="options_order.php?method=down&amp;num=' . $i . '">'. _("down") .'</a></small>' );
-            echo html_tag( 'td', '<small>&nbsp;|&nbsp;</small>' );
-            echo html_tag( 'td' );
-            /* Always show the subject */
-            if ($tmp != 4)
-               echo '<small><a href="options_order.php?method=remove&amp;num=' . $i . '">' . _("remove") . '</a></small>';
-            else
-               echo '&nbsp;';
-            echo '</td>';
-            echo html_tag( 'td', '<small>&nbsp;-&nbsp;</small>' );
-            echo html_tag( 'td', $available[$tmp] );
-            echo '</tr>' . "\n";
-        }
-        echo '</table>' . "\n";
+}
+
+
+$opts = array();
+if (count($index_order) != count($available)) {
+    for ($i=0; $i < count($available); $i++) {
+        if (!in_array($i,$index_order)) {
+             $opts[$i] = $available[$i];
+         }
     }
+}
+
 
-    if (count($index_order) != count($available)) {
-
-        $opts = array();
-        for ($i=1; $i <= count($available); $i++) {
-            $found = false;
-            for ($j=1; $j <= count($index_order); $j++) {
-                if ($index_order[$j] == $i) {
-                    $found = true;
-                }
-            }
-            if (!$found) {
-                $opts[$i] = $available[$i];
-            }
-        }
 
-        echo addForm('options_order.php', 'post', 'f');
-        echo addSelect('add', $opts, '', TRUE);
+viewOrderForm($available, $index_order,$opts,urldecode($mailbox));
+
+
+
+// FOOD for html designers
+function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) {
+   global $color;
+?>
+
+  <table align="center" width="95%" border="0" cellpadding="1" cellspacing="0">
+    <tr>
+      <td align="center" bgcolor="<?php echo $color[0];?>">
+        <b> <?php echo _("Options");?> - <?php echo _("Index Order");?> </b>
+        <table width="100%" border="0" cellpadding="8" cellspacing="0">
+          <tr>
+            <td align="center" bgcolor="<?php echo $color[4];?>">
+              <table width="65%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td>
+                    <?php echo _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.");?>
+                  </td>
+                </tr>
+              </table>
+              <br>
+
+<?php if (count($aOrder)) { ?>
+              <table cellspacing="0" cellpadding="0" border="0">
+<?php     foreach($aOrder as $i => $iCol) {
+             $sQuery = "&amp;num=$iCol";
+             if (isset($mailbox) && $mailbox) {
+                 $sQuery .= '&amp;mailbox='.urlencode($mailbox);
+             }
+
+?>
+                <tr>
+<?php         if ($i) { ?>
+                  <td><small><a href="options_order.php?method=move&amp;positions=-1&amp;num=<?php echo $sQuery; ?>"> <?php echo _("up");?> </a></small></td>
+<?php         } else { ?>
+                  <td>&nbsp;</td>
+<?php         } // else ?>
+                  <td><small>&nbsp;|&nbsp;</small></td>
+<?php         if ($i < count($aOrder) -1) { ?>
+                  <td><small><a href="options_order.php?method=move&amp;positions=1&amp;num=<?php echo $sQuery; ?>"> <?php echo _("down");?> </a></small></td>
+<?php         } else { ?>
+                  <td>&nbsp;</td>
+<?php         } // else ?>
+                  <td><small>&nbsp;|&nbsp;</small></td>
+<?php
+              /* Always show the subject */
+              if ($iCol != SQM_COL_SUBJ) {
+?>
+                  <td><small><a href="options_order.php?method=remove&amp;num=<?php echo $sQuery; ?>"> <?php echo _("remove");?> </a></small></td>
+<?php         } else { ?>
+                  <td>&nbsp;</td>
+<?php         } // else ?>
+                  <td><small>&nbsp;|&nbsp;</small></td>
+                  <td><?php echo $aColumns[$iCol]; ?></td>
+                </tr>
+<?php
+          } // foreach
+      } // if
+?>
+              </table>
+
+<?php
+    if (count($aOpts)) {
+        echo addForm('options_order.php', 'get', 'f');
+        echo addSelect('num', $aOpts, '', TRUE);
         echo addHidden('method', 'add');
+        if (isset($mailbox) && $mailbox) {
+            echo addHidden('mailbox', urlencode($mailbox));
+        }
         echo addSubmit(_("Add"), 'submit');
         echo '</form>';
     }
-
-    echo html_tag( 'p', '<a href="../src/options.php">' . _("Return to options page") . '</a></p><br />' );
-
 ?>
+          <p><a href="../src/options.php"><?php echo _("Return to options page");?></a></p><br>
+        </td></tr>
+      </table>
     </td></tr>
-    </table>
+  </table>
+</body></html>
 
-</td></tr>
-</table>
-</body></html>
+<?php
+}
+?>

src/read_body.php

@@ -29,6 +29,7 @@ require_once(SM_PATH . 'functions/url_parser.php');
 require_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/identity.php');
+include_once(SM_PATH . 'functions/arrays.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 
 /**
@@ -45,18 +46,12 @@ function findNextMessage($uidset,$passed_id='backwards') {
     if ($passed_id=='backwards' || !is_array($uidset)) { // check for backwards compattibilty gpg plugin
         $passed_id = $uidset;
     }
-    $result = -1;
-    $count = count($uidset) - 1;
-    foreach($uidset as $key=>$value) {
-        if ($passed_id == $value) {
-            if ($key == $count) {
-                break;
-            }
-            $result = $uidset[$key + 1];
-            break;
-        }
+    $result = sqm_array_get_value_by_offset($uidset,$passed_id,1);
+    if ($result === false) {
+        return -1;
+    } else {
+        return $result;
     }
-    return $result;
 }
 
 /**
@@ -71,17 +66,12 @@ function findPreviousMessage($uidset, $passed_id) {
     if (!is_array($uidset)) {
         return -1;
     }
-    $result = -1;
-    foreach($uidset as $key=>$value) {
-        if ($passed_id == $value) {
-            if ($key != 0) {
-                $result = $uidset[$key - 1];
-            }
-            break;
-        }
+    $result = sqm_array_get_value_by_offset($uidset,$passed_id,-1);
+    if ($result === false) {
+        return -1;
+    } else {
+        return $result;
     }
-
-    return $result;
 }
 
 /**
@@ -469,7 +459,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
            $startMessage, $PHP_SELF, $save_as_draft,
            $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
            $username, $delete_prev_next_display,
-           $compose_new_win, $javascript_on;
+           $compose_new_win, $javascript_on, $compose_width, $compose_height;
 
     //FIXME cleanup argument list, use $aMailbox where possible
     $mailbox = $aMailbox['NAME'];
@@ -501,7 +491,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
         }
 
         $prev_link = _("Previous");
-        if($entities[$passed_ent_id] > 1) {
+        if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] > 1) {
             $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
             $prev_link   = '<a href="'
                          . set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id)
@@ -509,7 +499,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
         }
 
         $next_link = _("Next");
-        if($entities[$passed_ent_id] < $c) {
+        if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] < $c) {
             $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1];
             $next_link   = '<a href="'
                          . set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
@@ -617,8 +607,14 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
     $method='method="post" ';
     $onsubmit='';
     if ($compose_new_win == '1') {
+        if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+            $compose_width = '640';
+        }
+        if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+            $compose_height = '550';
+        }
         if ( $javascript_on ) {
-          $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"';
+          $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"';
           $comp_uri = 'javascript:void(0)';
           $method='method="get" ';
           $onsubmit = 'onsubmit="return false" ';
@@ -743,6 +739,27 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
 
 }
 
+/**
+ * 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" />';
+}
+
+
 /***************************/
 /*   Main of read_body.php */
 /***************************/
@@ -780,6 +797,12 @@ if ( sqgetGlobalVar('view_hdr', $temp,  SQ_GET) ) {
     $view_hdr = (int) $temp;
 }
 
+if ( sqgetGlobalVar('account', $temp,  SQ_GET) ) {
+    $iAccount = (int) $temp;
+} else {
+    $iAccount = 0;
+}
+
 /** GET/POST VARS */
 sqgetGlobalVar('passed_ent_id', $passed_ent_id);
 sqgetGlobalVar('mailbox',       $mailbox);
@@ -804,7 +827,19 @@ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
 global $sqimap_capabilities, $lastTargetMailbox;
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array('setindex' => $what),array());
+$aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array());
+
+/**
+ * Check if cache is still valid
+ */
+$iSetIndex = $aMailbox['SETINDEX'];
+$aMailbox['CURRENT_MSG'][$iSetIndex] = $passed_id;
+//$aMailbox['OFFSET'] = $startMessage -1;
+
+sqgetGlobalVar('aFetchColumns',$aFetchColumns,SQ_SESSION);
+if (!is_array($aMailbox['UIDSET'][$what])) {
+    fetchMessageHeaders($imapConnection, $aMailbox, $aFetchColumns);
+}
 
 /**
  * Update the seen state
@@ -820,8 +855,6 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) {
  */
 if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
     handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id));
-//    sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
-//    sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id);
 }
 
 /**
@@ -848,11 +881,18 @@ if (isset($passed_ent_id) && $passed_ent_id) {
     $rfc822_header = new Rfc822Header();
     $rfc822_header->parseHeader($read);
     $message->rfc822_header = $rfc822_header;
+} else if ($message->type0 == 'message'  && $message->type1 == 'rfc822' && isset($message->entities[0])) {
+    $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[1.HEADER]", true, $response, $msg, TRUE);
+    $rfc822_header = new Rfc822Header();
+    $rfc822_header->parseHeader($read);
+    $message->rfc822_header = $rfc822_header;
 } else {
     $passed_ent_id = 0;
 }
 $header = $message->header;
 
+$header = $message->header;
+
 
 /****************************************/
 /* Block for handling incoming url vars */
@@ -961,10 +1001,11 @@ formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE);
 
 do_hook('read_body_bottom');
 sqimap_logout($imapConnection);
-/* sessions are written at the end of the script. it's better to register
-   them at the end so we avoid double session_register calls */
-/* add the mailbox to the cache */
-$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+
+/**
+ * Write mailbox with updated seen flag information back to cache.
+ */
+$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
 ?>
 </body></html>

src/right_main.php

@@ -1,9 +1,8 @@
 <?php
-
 /**
  * right_main.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This is where the mailboxes are listed. This controls most of what
@@ -30,20 +29,8 @@ require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/plugin.php');
 
-/***********************************************************
- * incoming variables from URL:                            *
- *   $sort             Direction to sort by date           *
- *                        values:  0  -  descending order  *
- *                        values:  1  -  ascending order   *
- *   $startMessage     Message to start at                 *
- *    $mailbox          Full Mailbox name                  *
- *                                                         *
- * incoming from cookie:                                   *
- *    $key              pass                               *
- * incoming from session:                                  *
- *    $username         duh                                *
- *                                                         *
- ***********************************************************/
+//include_once(SM_PATH . 'templates/default/message_list.tpl');
+include_once(SM_PATH . 'class/template/template.class.php');
 
 
 /* lets get the global vars we may need */
@@ -77,6 +64,14 @@ if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
 if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
   $checkall = (int) $temp;
 }
+
+/* future work */
+if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
+  $account = (int) $account;
+} else {
+  $account = 0;
+}
+
 /* end of get globals */
 
 
@@ -98,28 +93,25 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
  */
 
 
-$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
-                     );
-
 /* not sure if this hook should be capable to alter the global pref array */
 do_hook ('generic_header');
 
-$aMailboxPrefSer=getPref($data_dir, $username, "pref_$mailbox");
+$aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$account.'_'.$mailbox);
 if ($aMailboxPrefSer) {
     $aMailboxPref = unserialize($aMailboxPrefSer);
+    $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; // index_order contains the columns to show and the order of the columns
 } else {
-    setUserPref($username,"pref_$mailbox",serialize($aMailboxGlobalPref));
-    $aMailboxPref = $aMailboxGlobalPref;
+    setUserPref($username,'pref_'.$account.'_'.$mailbox,serialize($default_mailbox_pref));
+    $aMailboxPref = $default_mailbox_pref;
 }
 if (isset($srt)) {
     $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
@@ -128,17 +120,78 @@ if (isset($srt)) {
 $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 (($mailbox == $sent_folder || $mailbox == $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_'.$account.'_'.$mailbox,serialize($aMailboxPref));
+}
+
+
+
+/**
+ * Set the config options for the messages list
+ */
+$aColumns = array(); // contains settings per column. Switch to key -> value based array, order is the order of the array keys
+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;
+   }
+}
+
+/**
+ * Properties required by showMessagesForMailbox
+ */
+$aProps = array(
+    'columns' => $aColumns, // columns bound settings
+    'config'  => array('alt_index_colors'       => $alt_index_colors,       // alternating row colors (should be a template thing)
+                        'highlight_list'        => $message_highlight_list, // row highlighting rules
+                        'fancy_index_highlite'  => $fancy_index_highlite,   // highlight rows on hover or on click -> check
+                        'show_flag_buttons'     => (isset($show_flag_buttons)) ? $show_flag_buttons : true,
+                        'lastTargetMailbox'     => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '', // last mailbox where messages are moved/copied to
+                        'trash_folder'          => $trash_folder,
+                        'sent_folder'           => $sent_folder,
+                        'draft_folder'          => $draft_folder,
+                        'color'                 => $color,
+                        'enablesort'            => true // enable sorting on columns
+                ),
+    'mailbox' => $mailbox,
+    'account' => (isset($account)) ? $account : 0, // future usage if we support multiple imap accounts
+    'module' => 'read_body',
+    'email'  => false);
 
 
 /**
  * system wide admin settings and incoming vars.
  */
 $aConfig = array(
-                'allow_thread_sort' => $allow_thread_sort,
-                'allow_server_sort' => $allow_server_sort,
                 'user'              => $username,
                 // incoming vars
-                'offset' => $startMessage
+                'offset' => $startMessage // offset in paginator
                 );
 /**
  * The showall functionality is for the moment added to the config array
@@ -146,17 +199,34 @@ $aConfig = array(
  * this behaviour later and add it to $aMailboxPref instead
  */
 if (isset($showall)) {
-   $aConfig['showall'] = $showall;
+    $aConfig['showall'] = $showall; // show all messages in a mailbox (paginator is disabled)
+} else {
+    $showall = false;
 }
 
+
 /**
  * Retrieve the mailbox cache from the session.
  */
 sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
 
+/**
+ * Select the mailbox and retrieve the cached info.
+ */
+$aMailbox = sqm_api_mailbox_select($imapConnection,$account, $mailbox,$aConfig,$aMailboxPref);
 
-$aMailbox = sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aMailboxPref);
-
+/**
+ * MOVE THIS to a central init section !!!!
+ */
+if (!sqgetGlobalVar('align',$align,SQ_SESSION)) {
+    $dir = ( isset( $languages[$squirrelmail_language]['DIR']) ) ? $languages[$squirrelmail_language]['DIR'] : 'ltr';
+    if ( $dir == 'ltr' ) {
+        $align = array('left' => 'left', 'right' => 'right');
+    } else {
+        $align = array('left' => 'right', 'right' => 'left');
+    }
+    sqsession_register($align, 'align');
+}
 
 /*
  * After initialisation of the mailbox array it's time to handle the FORM data
@@ -166,20 +236,40 @@ if ($sError) {
    $note = $sError;
 }
 
+/**
+ * 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/';
+
+
 /*
  * If we try to forward messages as attachment we have to open a new window
  * in case of compose in new window or redirect to compose.php
  */
 if (isset($aMailbox['FORWARD_SESSION'])) {
     if ($compose_new_win) {
+        /* add the mailbox to the cache */
+        $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
+        sqsession_register($mailbox_cache,'mailbox_cache');
         // 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).
-                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
-        displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+                    '&session='.$aMailbox['FORWARD_SESSION'];
+        displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false);
     } else {
+        $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
+        sqsession_register($mailbox_cache,'mailbox_cache');
+
         // save mailboxstate
         sqsession_register($aMailbox,'aLastSelectedMailbox');
         session_write_close();
@@ -191,6 +281,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
     }
 } else {
     displayPageHeader($color, $mailbox);
+//    $compose_uri = $base_uri.'src/compose.php?newmessage=1';
 }
 
 do_hook('right_main_after_header');
@@ -223,8 +314,43 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
         }
     }
 }
+
+/**
+ * In the future, move this the the initialisation area
+ */
+
+
+$oTemplate = new Template($sTplDir);
+
 if ($aMailbox['EXISTS'] > 0) {
-    showMessagesForMailbox($imapConnection,$aMailbox);
+    $aTemplateVars =& showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
+    if ($iError) {
+
+    }
+    foreach ($aTemplateVars as $k => $v) {
+        $oTemplate->assign($k, $v);
+    }
+
+    /*
+     * TODO: To many config related vars. We should move all config related vars to
+     * one single associative array and assign that to the template
+     */
+    $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);
+
+    $oTemplate->display('message_list.tpl');
+
 } else {
     $string = '<b>' . _("THIS FOLDER IS EMPTY") . '</b>';
     echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
@@ -245,7 +371,7 @@ sqimap_logout ($imapConnection);
 echo '</body></html>';
 
 /* add the mailbox to the cache */
-$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+$mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
 
-?>
+?>

src/search.php

@@ -31,6 +31,7 @@ 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()...
+include_once(SM_PATH . 'class/template/template.class.php');
 
 /** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys
  */
@@ -91,6 +92,7 @@ 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)
@@ -122,7 +124,6 @@ function asearch_get_title_display(&$color, $txt)
 {
     return '<b><big>' . $txt . '</big></b>';
 }
-
 /**
  * @param array $color color array
  * @param string $txt text to display
@@ -549,6 +550,27 @@ 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
  */
@@ -857,72 +879,6 @@ 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, &$aMailbox, $color) {
-    global $javascript_on, $compact_paginator;
-    /**
-     * A mailbox can contain different sets with uid's. Default, for normal
-     * message list view we use '0' as setindex and for search a different
-     * setindex.
-     */
-    $iSetIndx = $aMailbox['SETINDEX'];
-
-    $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']);
-    $mailbox_title = '<b><big>' . _("Folder:") . ' '. $mailbox_display . '&nbsp;</big></b>';
-
-    /**
-     * UIDSET contains the array with uid's returned by a search
-     */
-    $cnt = count($aMailbox['UIDSET'][$iSetIndx]);
-
-    $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $cnt : $aMailbox['LIMIT'];
-    $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $cnt) ?
-            $aMailbox['PAGEOFFSET'] + ($iLimit - 1) : $cnt;
-
-    $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'],
-                                    $cnt, $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]);
-
-    if ($javascript_on && $compact_paginator) {
-    echo "\n<!-- start of compact paginator javascript -->\n"
-    . "<script language=\"JavaScript\">\n"
-    . "function SubmitOnSelect(select, URL)\n"
-    . "{\n"
-    . "   URL += select.options[select.selectedIndex].value;\n"
-    . "   window.location.href = URL;\n"
-    . "}\n"
-    . "</script>\n"
-    . "<!-- end of compact paginator javascript -->\n";
-    }
-
-    $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$cnt);
-
-    echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
-
-    echo '<tr><td>';
-    mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str");
-    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);
-    displayMessageArray($imapConnection, $aMailbox);
-    echo '        </td></tr>';
-    echo '       </table>';
-    echo '     </td></tr>';
-    echo '    </table>';
-    mail_message_listing_end($cnt, '', $msg_cnt_str);
-    echo '</td></tr>';
-
-    echo '</table></form>';
-}
 
 /**
  * @param array $boxes mailboxes array (reference)
@@ -1059,7 +1015,7 @@ $aConfig = array(
                 'allow_thread_sort' => $allow_thread_sort,
                 'allow_server_sort' => $allow_server_sort,
                 'user'              => $username,
-                'max_cache_size'
+                'setindex'          => 1
                 );
 
 /** Binary operators
@@ -1130,19 +1086,32 @@ if (isset($_GET['rownum'])) {
 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);
+//    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);
+//    asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
 }
 
 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);
+//    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
  */
@@ -1346,13 +1315,77 @@ $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 (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;
+        }
+    }
+}
+
+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');
 
 if (!$search_silent) {
@@ -1425,32 +1458,28 @@ if ($submit == $search_button_text) {
          */
         $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) {
-            $aMailboxPrefSer=getPref($data_dir, $username, "pref_$mbx");
 
+            /**
+            * 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_$mbx",serialize($aMailboxGlobalPref));
-                $aMailboxPref = $aMailboxGlobalPref;
+                setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($default_mailbox_pref));
+                $aMailboxPref = $default_mailbox_pref;
             }
             if (isset($srt) && $targetmailbox == $mbx) {
                 $aMailboxPref[MBX_PREF_SORT] = (int) $srt;
             }
-            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']);
-            }
-            /**
-             * 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;
+
+            $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
@@ -1459,28 +1488,141 @@ if ($submit == $search_button_text) {
             $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_'.$account.'_'.$mbx,serialize($aMailboxPref));
+            }
 
             $aConfig['search'] = $search['search'];
             $aConfig['charset'] = $search['charset'];
-            $aConfig['setindex'] = 1; // $what $where = 'search'
 
-            $aMailbox = sqm_api_mailbox_select($imapConnection,$mbx,$aConfig,$aMailboxPref);
             /**
-            * Handle form actions like flag / unflag, seen / unseen, delete
+             * 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
             */
-            if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) {
-                if ($postMailbox === $mbx) {
-                    handleMessageListForm($imapConnection,$aMailbox);
+            $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;
                 }
             }
-            if (fetchMessageHeaders($imapConnection, $aMailbox)) {
-                $msgsfound = true;
-                echo '<br />';
-                asearch_print_mailbox_msgs($imapConnection, $aMailbox, $color);
-                flush();
+
+
+            $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[$aMailbox['NAME']] = $aMailbox;
+            $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
 
         }
     }