Updating the translation templates.

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 6ee921956e7b456bb1b2843ac64678beb4d7d38e..aea8db2565ccea61e9db35547f9f39d19e5b0995 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -6,7 +6,7 @@
  * This is where the mailboxes are listed. This controls most of what
  * goes on in SquirrelMail.
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright © 1999-2009 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -71,6 +71,12 @@ if (!sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
     $checkall = false;
 }
 
+if (!sqgetGlobalVar('preselected', $preselected, SQ_GET) || !is_array($preselected)) {
+    $preselected = array();
+} else {
+    $preselected = array_keys($preselected);
+}
+
 /* future work */
 if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
   $account = (int) $account;
@@ -122,8 +128,8 @@ $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])) {
+if (handleAsSent($mailbox)
+ && !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) {
@@ -346,6 +352,14 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->assign('color', $color);
     $oTemplate->assign('align', $align);
     $oTemplate->assign('checkall', $checkall);
+    $oTemplate->assign('preselected', $preselected);
+
+    global $show_personal_names;
+    $oTemplate->assign('show_personal_names', $show_personal_names);
+
+    global $accesskey_mailbox_toggle_selected, $accesskey_mailbox_thread;
+    $oTemplate->assign('accesskey_mailbox_toggle_selected', $accesskey_mailbox_toggle_selected);
+    $oTemplate->assign('accesskey_mailbox_thread', $accesskey_mailbox_thread);
 
     $oTemplate->display('message_list.tpl');