Finished converting folder options page to new options stuff. Moved some options around to make them make more sense.

functions/constants.php

@@ -16,20 +16,33 @@
     /* Set values for constants used by Squirrelmail preferences. */
     /**************************************************************/
 
-    /* Define constants for javascript settings. */
-    define('SMPREF_JS_OFF', 0);
-    define('SMPREF_JS_ON', 1);
-    define('SMPREF_JS_AUTODETECT', 2);
+    /* Define basic, general purpose preference constants. */
+    define('SMPREF_NO', 0);
+    define('SMPREF_YES', 1);
+    define('SMPREF_NONE', 'none');
 
+    /* Define constants for location based preferences. */
     define('SMPREF_LOC_TOP', 'top');
     define('SMPREF_LOC_BETWEEN', 'between');
     define('SMPREF_LOC_BOTTOM', 'bottom');
     define('SMPREF_LOC_LEFT', '');
     define('SMPREF_LOC_RIGHT', 'right');
 
-    define('SMPREF_NO', 0);
-    define('SMPREF_YES', 1);
-    define('SMPREF_NONE', 'none');
+    /* Define preferences for folder settings. */
+    define('SMPREF_UNSEEN_NONE', 1);
+    define('SMPREF_UNSEEN_INBOX', 2);
+    define('SMPREF_UNSEEN_ALL', 3);
+    define('SMPREF_UNSEEN_ONLY', 1);
+    define('SMPREF_UNSEEN_TOTAL', 2);
+
+    /* Define constants for time/date display preferences. */
+    define('SMPREF_TIME_24HR', 1);
+    define('SMPREF_TIME_12HR', 2);
+
+    /* Define constants for javascript preferences. */
+    define('SMPREF_JS_OFF', 0);
+    define('SMPREF_JS_ON', 1);
+    define('SMPREF_JS_AUTODETECT', 2);
 
     do_hook("loading_constants");
 ?>

src/options.php

@@ -87,9 +87,6 @@
         setPref($data_dir, $username, 'wrap_at', $new_wrap_at);
         setPref($data_dir, $username, 'editor_size', $new_editor_size);
         setPref($data_dir, $username, 'location_of_buttons', $new_location_of_buttons);
-        setPref($data_dir, $username, 'location_of_bar', $new_location_of_bar);
-        setPref($data_dir, $username, 'left_size', $new_left_size);
-        setPref($data_dir, $username, 'left_refresh', $new_left_refresh);
         setPref($data_dir, $username, 'alt_index_colors', $new_alt_index_colors);
         setPref($data_dir, $username, 'show_html_default', $new_show_html_default);
         setPref($data_dir, $username, 'include_self_reply_all', $new_include_self_reply_all);
@@ -146,14 +143,16 @@
         } else {
             setPref($data_dir, $username, 'folder_prefix', '');
         }
-        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');
-        setPref($data_dir, $username, 'date_format', $dateformat);
-        setPref($data_dir, $username, 'hour_format', $hourformat);
+
+        setPref($data_dir, $username, 'location_of_bar', $new_location_of_bar);
+        setPref($data_dir, $username, 'left_size', $new_left_size);
+        setPref($data_dir, $username, 'left_refresh', $new_left_refresh);
+        setPref($data_dir, $username, 'unseen_notify', $new_unseen_notify);
+        setPref($data_dir, $username, 'unseen_type', $new_unseen_type);
+        setPref($data_dir, $username, 'collapse_folders', $new_collapse_folders);
+        setPref($data_dir, $username, 'date_format', $new_date_format);
+        setPref($data_dir, $username, 'hour_format', $new_hour_format);
+
         do_hook('options_folders_save');
         echo '<br><b>'._("Successfully saved folder preferences!").'</b><br>';
         echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a><br>';

src/options_display.php

@@ -62,15 +62,6 @@
         'posvals' => $language_values
     );
 
-    $optvals[] = array(
-        'name'    => 'use_javascript_addr_book',
-        'caption' => _("Addressbook Display Format"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => array('1' => _("Javascript"),
-                           '0' => _("HTML"))
-    );
-
     /* Set values for the "use javascript" option. */
     $optvals[] = array(
         'name'    => 'javascript_setting',
@@ -97,6 +88,27 @@
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    $optvals[] = array(
+        'name'    => 'alt_index_colors',
+        'caption' => _("Enable Alternating Row Colors"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[] = array(
+        'name'    => 'page_selector',
+        'caption' => _("Enable Page Selector"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[] = array(
+        'name'    => 'page_selector_max',
+        'caption' => _("Maximum Number of Pages to Show"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
     $optvals[] = array(
         'name'    => 'wrap_at',
         'caption' => _("Wrap Incoming Text At"),
@@ -122,50 +134,12 @@
     );
 
     $optvals[] = array(
-        'name'    => 'location_of_bar',
-        'caption' => _("Location of Folder List"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_ALL,
-        'posvals' => array(SMPREF_LOC_LEFT  => _("Left"),
-                           SMPREF_LOC_RIGHT => _("Right"))
-    );
-
-    $left_size_values = array();
-    for ($lsv = 100; $lsv <= 300; $lsv += 10) {
-        $left_size_values[$lsv] = "$lsv " . _("pixels");
-    }
-    $optvals[] = array(
-        'name'    => 'left_size',
-        'caption' => _("Width of Folder List"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_ALL,
-        'posvals' => $left_size_values
-    );
-
-    $minute_str = _("Minutes");
-    $left_refresh_values = array(SMPREF_NONE => _("Never"));
-    foreach (array(30,60,120,180,300,600) as $lr_val) {
-        if ($lr_val < 60) {
-            $left_refresh_values[$lr_val] = "$lr_val " . _("Seconds");
-        } else if ($lr_val == 60) {
-            $left_refresh_values[$lr_val] = "1 " . _("Minute");
-        } else {
-            $left_refresh_values[$lr_val] = ($lr_val/60) . " $minute_str";
-        }
-    }
-    $optvals[] = array(
-        'name'    => 'left_refresh',
-        'caption' => _("Auto Refresh Folder List"),
+        'name'    => 'use_javascript_addr_book',
+        'caption' => _("Addressbook Display Format"),
         'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_FOLDERLIST,
-        'posvals' => $left_refresh_values
-    );
-
-    $optvals[] = array(
-        'name'    => 'alt_index_colors',
-        'caption' => _("Use Alternating Row Colors"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => array('1' => _("Javascript"),
+                           '0' => _("HTML"))
     );
 
     $optvals[] = array(
@@ -182,23 +156,9 @@
         'refresh' => SMOPT_REFRESH_NONE
     );
 
-    $optvals[] = array(
-        'name'    => 'page_selector',
-        'caption' => _("Use Page Selector"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
-
-    $optvals[] = array(
-        'name'    => 'page_selector_max',
-        'caption' => _("Maximum Number of Pages to Show"),
-        'type'    => SMOPT_TYPE_INTEGER,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
-
     $optvals[] = array(
         'name'    => 'show_xmailer_default',
-        'caption' => _("Show the Mailer of incoming messages"),
+        'caption' => _("Enable Mailer Display"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_NONE
     );

src/options_folder.php

@@ -91,6 +91,95 @@
         'posvals' => $draft_folder_values
     );
 
+    $optvals[] = array(
+        'name'    => 'location_of_bar',
+        'caption' => _("Location of Folder List"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => array(SMPREF_LOC_LEFT  => _("Left"),
+                           SMPREF_LOC_RIGHT => _("Right"))
+    );
+
+    $left_size_values = array();
+    for ($lsv = 100; $lsv <= 300; $lsv += 10) {
+        $left_size_values[$lsv] = "$lsv " . _("pixels");
+    }
+    $optvals[] = array(
+        'name'    => 'left_size',
+        'caption' => _("Width of Folder List"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => $left_size_values
+    );
+
+    $minute_str = _("Minutes");
+    $left_refresh_values = array(SMPREF_NONE => _("Never"));
+    foreach (array(30,60,120,180,300,600) as $lr_val) {
+        if ($lr_val < 60) {
+            $left_refresh_values[$lr_val] = "$lr_val " . _("Seconds");
+        } else if ($lr_val == 60) {
+            $left_refresh_values[$lr_val] = "1 " . _("Minute");
+        } else {
+            $left_refresh_values[$lr_val] = ($lr_val/60) . " $minute_str";
+        }
+    }
+    $optvals[] = array(
+        'name'    => 'left_refresh',
+        'caption' => _("Auto Refresh Folder List"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => $left_refresh_values
+    );
+
+    $optvals[] = array(
+        'name'    => 'unseen_notify',
+        'caption' => _("Enable Unseen Message Notification"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => array(SMPREF_UNSEEN_NONE  => _("No Notification"),
+                           SMPREF_UNSEEN_INBOX => _("Only INBOX"),
+                           SMPREF_UNSEEN_ALL   => _("All Folders"))
+    );
+
+    $optvals[] = array(
+        'name'    => 'unseen_type',
+        'caption' => _("Unseen Message Notification Type"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => array(SMPREF_UNSEEN_ONLY  => _("Only Unseen"),
+                           SMPREF_UNSEEN_TOTAL => _("Unseen and Total")) 
+    );
+
+    $optvals[] = array(
+        'name'    => 'collapse_folders',
+        'caption' => _("Enable Collapsable Folders"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST
+    );
+
+    $optvals[] = array(
+        'name'    => 'date_format',
+        'caption' => _("Show Clock on Folders Panel"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => array( '1' => 'MM/DD/YY HH:MM',
+                            '2' => 'DD/MM/YY HH:MM',
+                            '3' => 'DDD, HH:MM',
+                            '4' => 'HH:MM:SS',
+                            '5' => 'HH:MM',
+                            '6' => _("No Clock")),
+    );
+
+    $optvals[] = array(
+        'name'    => 'hour_format',
+        'caption' => _("Hour Format"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST,
+        'posvals' => array(SMPREF_TIME_12HR => _("12-hour clock"),
+                           SMPREF_TIME_24HR => _("24-hour clock")) 
+    );
+
+
     /* Build all these values into an array of SquirrelOptions objects. */
     $options = createOptionArray($optvals);
 
@@ -109,37 +198,7 @@
 
    // if( $unseen_notify == '' )
    //   $unseen_notify = '2';
-   OptionRadio( _("Unseen message notification"),
-                'unseennotify',
-                array( 1 => _("No notification"),
-                       2 => _("Only INBOX"),
-                       3 => _("All Folders") ),
-                $unseen_notify, '', '',
-                '<br>' );
-    OptionRadio( _("Unseen message notification type"),
-                 'unseentype',
-                 array( 1 => _("Only unseen"),
-                        2 => _("Unseen and Total") ),
-                 $unseen_type, '', '',
-                 '<br>' );
-    OptionCheck( _("Collapseable folders"),
-                 'collapsefolders',
-                 $collapse_folders,
-                 _("Enable Collapseable Folders") );
-   OptionSelect( '<b>' . _("Show Clock on Folders Panel") . '</b> ' . _("Date format"),
-                 'dateformat',
-                 array( '1' => 'MM/DD/YY HH:MM',
-                        '2' => 'DD/MM/YY HH:MM',
-                        '3' => 'DDD, HH:MM',
-                        '4' => 'HH:MM:SS',
-                        '5' => 'HH:MM',
-                        '6' => _("No Clock") ),
-                 $date_format );
-   OptionSelect( _("Hour format"),
-                 'hourformat',
-                 array( '1' => _("24-hour clock"),
-                        '2' => _("12-hour clock") ),
-                 $hour_format );     
+
                  
    echo '<tr><td colspan=2><hr noshade></td></tr>';
    do_hook("options_folders_inside");