rename squirrelmail_rpc.php to rpc.php, it doesn't make much sense to

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 7380037399f2307ba92a07be9ec69324165f0924..b13e04a045c577e56a47a17c1ad1d930b3e93159 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -13,6 +13,9 @@
  * @subpackage prefs
  */
 
+/** This is the options page */
+define('PAGE_NAME', 'options');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -237,7 +240,7 @@ if ($optmode == SMOPT_MODE_SUBMIT) {
 /* Finally, display whatever page we are supposed to show now. */
 /***************************************************************/
 
-displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
 
 /*
  * The main option page has a different layout then the rest of the option
@@ -285,7 +288,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
     }
     
     if (!empty($notice)) {
-        $oTemplate->assign('note', $notice, FALSE);
+        $oTemplate->assign('note', $notice);
         $oTemplate->display('note.tpl');
     }
     
@@ -424,12 +427,10 @@ if ($optpage == SMOPT_PAGE_MAIN) {
          "  <td colspan=\"2\">\n";
 
     // This is the only variable that is needed by *just* the template.
-    // No output sanitizing needed because all widgets added through 
-    // template output already
-    $oTemplate->assign('options', $optpage_data['options'], FALSE);
+    $oTemplate->assign('options', $optpage_data['options']);
     
     global $ask_user_info, $org_name;
-    if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info
+    if ( $optpage == SMOPT_PAGE_PERSONAL && $ask_user_info
             && getPref($data_dir, $username,'email_address') == "" ) {
         $oTemplate->assign('topmessage',
             sprintf(_("Welcome to %s. Please supply your full name and email address."), $org_name) );