X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=b271951e30fd977fff20e1a29cb9c7ef09b971ec;hp=0522221fedc3013b8076ada4b730df1a966bb79e;hb=1f80d9f527d2cc2933ee7040aecba908692a20ac;hpb=ebd2391cb0c5e3049870f90fa8a8b28707e9571a

diff --git a/src/right_main.php b/src/right_main.php
index 0522221f..b271951e 100644
--- 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
@@ -67,8 +67,14 @@ if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
     $showall = (int) $temp;
 }
 
-if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
-  $checkall = (int) $temp;
+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 */
@@ -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) {
@@ -239,6 +245,7 @@ if ($sError) {
  * 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
  */
+$onload = '';
 if (isset($aMailbox['FORWARD_SESSION'])) {
     if ($compose_new_win) {
         /* add the mailbox to the cache */
@@ -257,9 +264,11 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
             $compose_height = '550';
         }
         // do not use &, it will break the query string and $session will not be detected!!!
-        $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-                    '&session='.urlencode($aMailbox['FORWARD_SESSION']);
-        displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", '');
+        $comp_uri = $base_uri . 'src/compose.php?mailbox='. urlencode($mailbox)
+                  . '&session='.urlencode($aMailbox['FORWARD_SESSION']['SESSION_NUMBER'])
+                  . '&smaction=forward_as_attachment'
+                  . '&fwduid=' . implode('_', $aMailbox['FORWARD_SESSION']['UIDS']);
+        $onload = "comp_in_new('$comp_uri', $compose_width, $compose_height);";
     } else {
         $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
         sqsession_register($mailbox_cache,'mailbox_cache');
@@ -268,16 +277,41 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         sqsession_register($aMailbox,'aLastSelectedMailbox');
         session_write_close();
         // we have to redirect to the compose page
-        $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-                    '&session='.$aMailbox['FORWARD_SESSION'];
+        $location = $base_uri . 'src/compose.php?mailbox='. urlencode($mailbox)
+                  . '&session='.$aMailbox['FORWARD_SESSION']['SESSION_NUMBER']
+                  . '&smaction=forward_as_attachment'
+                  . '&fwduid=' . implode('_', $aMailbox['FORWARD_SESSION']['UIDS']);
         header("Location: $location");
         exit;
     }
-} else {
-    displayPageHeader($color, $mailbox);
 }
 
-do_hook('right_main_after_header', $null);
+// plugins can operate normally here (don't output anything, of course!),
+// but can also return TRUE if they want to enable the MOTD display
+// even when SM's MOTD is empty (there is plugin output that can
+// be then hooked into in motd.tpl)  
+// NOTE a TRUE return value here will cause the display of the MOTD on 
+// *every* page view; if a plugin wants to support true MOTD (one-time 
+// message display upon login), it should also check the value of 
+// "just_logged_in" in the PHP session before returning TRUE.
+//
+$show_motd = boolean_hook_function('right_main_after_header', $null, 1);
+
+
+// get "just_logged_in" from PHP session, save it in a temp variable
+// for use below, and reset its value in PHP session
+//
+if (!sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION))
+    $just_logged_in = false;
+$temp_just_logged_in = $just_logged_in;
+$just_logged_in = false;
+sqsession_register($just_logged_in, 'just_logged_in');
+
+
+// now we're done with the PHP session, can send output to browser
+//
+displayPageHeader($color, $mailbox, $onload);
+
 
 /* display a message to the user that their mail has been sent */
 if (isset($mail_sent) && $mail_sent == 'yes') {
@@ -288,16 +322,11 @@ if (isset($note)) {
     $oTemplate->display('note.tpl');
 }
 
-if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
-    if ($just_logged_in == true) {
-        $just_logged_in = false;
-        sqsession_register($just_logged_in, 'just_logged_in');
-
-        $motd = trim($motd);
-        if (strlen($motd) > 0) {
-            $oTemplate->assign('motd', $motd);
-            $oTemplate->display('motd.tpl');
-        }
+if ($temp_just_logged_in || $show_motd) {
+    $motd = trim($motd);
+    if ($show_motd || strlen($motd) > 0) {
+        $oTemplate->assign('motd', $motd);
+        $oTemplate->display('motd.tpl');
     }
 }
 
@@ -326,6 +355,15 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
     $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');