X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=f974d4299df9216879cebf98e74257fefcfccd0b;hp=5f5c1e713cfa2f3558c837d8ebd31fa169b29a43;hb=8949acd68dc6459372ef79823c88c0fbf2ae4e23;hpb=6e515418431c0a99f10705da21366fe7093f95b6

diff --git a/src/right_main.php b/src/right_main.php
index 5f5c1e71..f974d429 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -6,12 +6,15 @@
  * This is where the mailboxes are listed. This controls most of what
  * goes on in SquirrelMail.
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
+/** This is the right_main page */
+define('PAGE_NAME', 'right_main');
+
 //xdebug_start_profiling("/var/spool/xdebug/right_main.txt");
 
 
@@ -20,6 +23,13 @@
  */
 include('../include/init.php');
 
+/* If email_address not set and admin wants us to ask user for it,
+ * redirect to options page. */
+if ( $ask_user_info && getPref($data_dir, $username,'email_address') == "" ) {
+    header("Location: " . get_location() . "/options.php?optpage=personal");
+    exit;
+}
+
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'functions/imap_asearch.php');
 require_once(SM_PATH . 'functions/imap_general.php');
@@ -27,7 +37,7 @@ require_once(SM_PATH . 'functions/imap_messages.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
-
+require_once(SM_PATH . 'functions/compose.php');
 
 /* lets get the global vars we may need */
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
@@ -43,7 +53,7 @@ sqgetGlobalVar('note',              $note,              SQ_GET);
 sqgetGlobalVar('mail_sent',         $mail_sent,         SQ_GET);
 
 
-if ( sqgetGlobalVar('startMessage', $temp) ) {
+if ( sqGetGlobalVarMultiple('startMessage', $temp, 'paginator_submit') ) {
     $startMessage = (int) $temp;
 } else {
     $startMessage = 1;
@@ -57,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 */
@@ -229,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 */
@@ -249,7 +266,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         // 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);", '');
+        $onload = "comp_in_new('$comp_uri', $compose_width, $compose_height);";
     } else {
         $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
         sqsession_register($mailbox_cache,'mailbox_cache');
@@ -263,31 +280,49 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         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') {
-    $note = _("Your Message has been sent.");
+    $note = _("Your mail has been sent.");
 }
 if (isset($note)) {
     $oTemplate->assign('note', htmlspecialchars($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');
     }
 }
 
@@ -308,13 +343,19 @@ if ($aMailbox['EXISTS'] > 0) {
     $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('javascript_on', checkForJavascript());
+    $oTemplate->assign('base_uri', sqm_baseuri());
     $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
     $oTemplate->assign('icon_theme_path', $icon_theme_path);
     $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('checkall', $checkall);
+    $oTemplate->assign('preselected', $preselected);
+
+    global $show_personal_names;
+    $oTemplate->assign('show_personal_names', $show_personal_names);
 
     $oTemplate->display('message_list.tpl');