Changed regexps

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 5710f0d06aa11363695305e13fc5acb8c4dcc9aa..8b38ad2ba57a669eda76a91b95132f492172fabd 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -8,14 +8,15 @@
     **  Displays the options page. Pulls from proper user preference files
     **  and config.php. Displays preferences as selected and other options.
     **
+    **  $Id$
     **/
 
    session_start();
 
-   if (!isset($config_php))
-      include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
+   if (!isset($config_php))
+      include("../config/config.php");
    if (!isset($page_header_php))
       include("../functions/page_header.php");
    if (!isset($display_messages_php))
@@ -46,7 +47,7 @@
 </td></tr></table>
 
 <?php
-   if ($submit_personal) {
+   if (isset($submit_personal)) {
       # Save personal information
       if (isset($full_name)) setPref($data_dir, $username, "full_name", sqStripSlashes($full_name));
       if (isset($email_address)) setPref($data_dir, $username, "email_address", sqStripSlashes($email_address));
@@ -57,7 +58,7 @@
       do_hook("options_personal_save");
       
       echo "<br><center><b>"._("Successfully saved personal information!")."</b></center><br>";
-   } else if ($submit_display) {  
+   } else if (isset($submit_display)) {  
       # Save display preferences
       setPref($data_dir, $username, "chosen_theme", $chosentheme);
       setPref($data_dir, $username, "show_num", $shownum);
@@ -72,13 +73,9 @@
     
       do_hook("options_display_save");
 
-      echo "<center><table width=90% cellpadding=2 cellspacing=0 border=0 bgcolor=\"$color[2]\"><tr><td>";
-      ecHO "<table width=100% cellpadding=5 cellspacing=0 border=0 bgcolor=\"$color[4]\"><tr><td>";
       echo "<br><center><b>"._("Successfully saved display preferences!")."</b><br>";
-      echo "<a href=\"webmail.php?right_frame=options.php\" target=_top>"._("Refresh Page")."</a></center><br>";
-      echo "</td></tr></table>";
-      echo "</td></tr></table></center>";
-   } else if ($submit_folder) { 
+      echo "<a href=\"../src/webmail.php\" target=_top>" . _("Refresh Page") . "</a></center><br>";
+   } else if (isset($submit_folder)) { 
       # Save folder preferences
       if ($trash != "none") {
          setPref($data_dir, $username, "move_to_trash", true);
@@ -98,12 +95,8 @@
       setPref($data_dir, $username, "unseen_notify", $unseennotify);
       setPref($data_dir, $username, "unseen_type", $unseentype);
       do_hook("options_folders_save");
-      echo "<center><table width=90% cellpadding=2 cellspacing=0 border=0 bgcolor=\"$color[2]\"><tr><td>";
-      ecHO "<table width=100% cellpadding=5 cellspacing=0 border=0 bgcolor=\"$color[4]\"><tr><td>";
       echo "<br><center><b>"._("Successfully saved folder preferences!")."</b><br>";
-      echo "<a href=\"left_main.php\" target=left>"._("Refresh Folders")."</a></center><br>";
-      echo "</td></tr></table>";
-      echo "</td></tr></table></center>";
+      echo "<a href=\"../src/left_main.php\" target=left>" . _("Refresh Folder List") . "</a></center><br>";
    } else {
       do_hook("options_save");
    }