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

diff --git a/src/right_main.php b/src/right_main.php
index c6592fa4..7d24ede6 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -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');
@@ -29,7 +36,6 @@ 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);
 sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
@@ -272,7 +278,7 @@ 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));