added option to enable/disable alternating row colors

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 643f3e79e21f80771604f18c1e745039010fb0e0..4a29dd900fa25d6ca09dbaabe2bf0c38cd614ae0 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -11,24 +11,14 @@
     **  $Id$
     **/
 
-   session_start();
-
-   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))
-      include('../functions/display_messages.php');
-   if (!isset($imap_php))
-      include('../functions/imap.php');
-   if (!isset($array_php))
-      include('../functions/array.php');
-   if (!isset($i18n_php))
-      include('../functions/i18n.php');
-   if (!isset($auth_php))
-      include ('../functions/auth.php'); 
+   include('../src/validate.php');
+   include('../functions/strings.php');
+   include('../config/config.php');
+   include('../functions/page_header.php');
+   include('../functions/display_messages.php');
+   include('../functions/imap.php');
+   include('../functions/array.php');
+   include('../functions/i18n.php');
 
    if (isset($language)) {
       setcookie('squirrelmail_language', $language, time()+2592000);
@@ -37,7 +27,7 @@
 
    include('../src/load_prefs.php');
    displayPageHeader($color, 'None');
-   is_logged_in(); 
+
 ?>
 
 <br>
@@ -51,14 +41,32 @@
       # Save personal information
       if (isset($full_name)) setPref($data_dir, $username, 'full_name', $full_name);
       if (isset($email_address)) setPref($data_dir, $username, 'email_address', $email_address);
-      if (isset($reply_to)) setPref($data_dir, $username, 'reply_to', $reply_to);  
+      if (isset($reply_to)) setPref($data_dir, $username, 'reply_to', $reply_to);
+      if (! isset($usesignature))
+         $usesignature = 0;
       setPref($data_dir, $username, 'use_signature', $usesignature);  
+      if (! isset($prefixsig))
+         $prefixsig = 0;
+      setPref($data_dir, $username, 'prefix_sig', $prefixsig);
       if (isset($signature_edit)) setSig($data_dir, $username, $signature_edit);
       
       do_hook('options_personal_save');
       
       echo '<br><center><b>'._("Successfully saved personal information!").'</b></center><br>';
-   } else if (isset($submit_display)) {  
+   } else if (isset($submit_display)) {
+      // Do checking to make sure $chosentheme is in the array
+      $in_ary = false;
+      for ($i=0; $i < count($theme); $i++)
+      {
+          if ($theme[$i]['PATH'] == $chosentheme)
+         {
+             $in_ary = true;
+             break;
+         }
+      }
+      if (! $in_ary)
+          $chosentheme = '';
+   
       # Save display preferences
       setPref($data_dir, $username, 'chosen_theme', $chosentheme);
       setPref($data_dir, $username, 'show_num', $shownum);
@@ -70,11 +78,19 @@
       setPref($data_dir, $username, 'location_of_buttons', $button_new_location);
       setPref($data_dir, $username, 'left_size', $leftsize);
       setPref($data_dir, $username, 'use_javascript_addr_book', $javascript_abook);
+      if (isset($altIndexColors) && $altIndexColors == 1)
+         setPref($data_dir, $username, 'alt_index_colors', 1);
+      else
+         setPref($data_dir, $username, 'alt_index_colors', 0);
+      if (isset($showhtmldefault))
+         setPref($data_dir, $username, 'show_html_default', 1);
+      else
+         removePref($data_dir, $username, 'show_html_default');
     
       do_hook('options_display_save');
 
       echo '<br><center><b>'._("Successfully saved display preferences!").'</b><br>';
-      echo '<a href="../src/webmail.php" target=_top>' . _("Refresh Page") . '</a></center><br>';
+      echo '<a href="../src/webmail.php?right_frame=options.php" target=_top>' . _("Refresh Page") . '</a></center><br>';
    } else if (isset($submit_folder)) { 
       # Save folder preferences
       if ($trash != 'none') {
@@ -94,6 +110,10 @@
       setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       setPref($data_dir, $username, 'unseen_notify', $unseennotify);
       setPref($data_dir, $username, 'unseen_type', $unseentype);
+      if (isset($collapsefolders))
+          setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
+      else
+          removePref($data_dir, $username, 'collapse_folders');
       do_hook('options_folders_save');
       echo '<br><center><b>'._("Successfully saved folder preferences!").'</b><br>';
       echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a></center><br>';