X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=7d24ede6465f3e65a4d52285561fea847c5dfffc;hb=a14da8d673346da9d85bdb0ade10e246cf8baa1d;hp=a2903eb4c02a7ca1180b7b85b4ca87b2809cfa36;hpb=190dc452bedb05364a6f5842142b5e484995b1ca;p=squirrelmail.git

diff --git a/src/right_main.php b/src/right_main.php
index a2903eb4..7d24ede6 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-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
@@ -20,6 +20,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,12 +34,10 @@ 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('username',  $username,      SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
-sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
 sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
 if (is_array($delayed_errors)) {
     $oErrorHandler->AssignDelayedErrors($delayed_errors);
@@ -45,7 +50,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;
@@ -79,11 +84,6 @@ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort,
 
 $mailbox = (isset($mailbox) && $mailbox) ? $mailbox : 'INBOX';
 
-/* compensate for the UW vulnerability. */
-if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
-                                  substr($mailbox, 0, 1) == '/')) {
-   $mailbox = 'INBOX';
-}
 /**
  * Set the global settings for a mailbox and merge them with the usersettings
  * for the mailbox. In the future we can add more mailbox specific preferences
@@ -255,7 +255,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='.$aMailbox['FORWARD_SESSION'];
+                    '&session='.urlencode($aMailbox['FORWARD_SESSION']);
         displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", '');
     } else {
         $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
@@ -274,11 +274,11 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
     displayPageHeader($color, $mailbox);
 }
 
-do_hook('right_main_after_header');
+do_hook('right_main_after_header', $null);
 
 /* 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));
@@ -315,7 +315,8 @@ 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));
@@ -329,7 +330,7 @@ if ($aMailbox['EXISTS'] > 0) {
     $oTemplate->display('empty_folder.tpl');
 }
 
-do_hook('right_main_bottom');
+do_hook('right_main_bottom', $null);
 sqimap_logout ($imapConnection);
 $oTemplate->display('footer.tpl');