X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_display.php;h=6189c0f7b0240f1889765a3eaf3cf2dc567a6d90;hp=f0aede33a7e19e36e770bfae55234b2f400b2a59;hb=fd87494d30afbfc69dafcaaaec43e287be4bc22c;hpb=ce39317491517268fe421d95b7329bbe80a2fe8d

diff --git a/src/options_display.php b/src/options_display.php
index f0aede33..6189c0f7 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -161,6 +161,41 @@
         'posvals' => $left_refresh_values
     );
 
+    $optvals[] = array(
+        'name'    => 'alt_index_colors',
+        'caption' => _("Use Alternating Row Colors"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[] = array(
+        'name'    => 'show_html_default',
+        'caption' => _("Show HTML Version by Default"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[] = array(
+        'name'    => 'include_self_reply_all',
+        'caption' => _("Include Self in Reply All"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        '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
+    );
+
     /* Build all these values into an array of SquirrelOptions objects. */
     $options = createOptionArray($optvals);
 
@@ -179,27 +214,6 @@
 
     /*** NOT YET CONVERTED TO OPTION OBJECTS ***/
 
-   OptionRadio( _("Use alternating row colors?"),
-                'altIndexColors',
-                array( 1 => _("Yes"),
-                       0 => _("No") ),
-                $alt_index_colors );
-   OptionCheck( _("Show HTML version by default"),
-                'showhtmldefault',
-                $show_html_default,
-                _("Yes, show me the HTML version of a mail message, if it is available.") );
-   OptionCheck( _("Include Self"),
-                'includeselfreplyall',
-                getPref($data_dir, $username, 'include_self_reply_all', FALSE ),
-                _("Don't remove me from the CC addresses when I use \"Reply All\"") );
-   $psw = getPref($data_dir, $username, 'page_selector_max', 10 );
-   OptionCheck( _("Page Selector"),
-                'pageselector',
-                !getPref($data_dir, $username, 'page_selector', FALSE ),
-                _("Show page selector") .
-                " <input name=pageselectormax size=3  value=\"$psw\"> &nbsp;" .
-                _("pages max") );
-
    echo '<tr><td colspan=2><hr noshade></td></tr>';
    do_hook('options_display_inside');
    OptionSubmit( 'submit_display' );