X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=92359e509ab267cb7e58409b479d524f9a3094d3;hb=ceee04976336b7b26273a1fa979482c4450e7a3d;hp=60eaa47a6b9f32f91c68ea0de0a31ca3ea311267;hpb=4f7a5870e9bafe20fd8f29cca19e3113889c98dd;p=squirrelmail.git

diff --git a/include/options/display.php b/include/options/display.php
index 60eaa47a..92359e50 100644
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -8,7 +8,7 @@
  *
  * Displays all optinos about display preferences
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
@@ -78,7 +78,7 @@ function load_optpage_data_display() {
         'posvals' => $theme_values,
         'save'    => 'save_option_theme'
     );
- 
+
     $css_values = array( 'none' => _("Default" ) );
 
     if (is_readable(SM_PATH . 'themes/css') && is_dir(SM_PATH . 'themes/css')) {
@@ -90,9 +90,9 @@ function load_optpage_data_display() {
         }
         closedir($handle);
     }
-    
+
     if ( count( $css_values ) > 1 ) {
-    
+
         $optvals[SMOPT_GRP_GENERAL][] = array(
             'name'    => 'custom_css',
             'caption' => _("Custom Stylesheet"),
@@ -100,13 +100,13 @@ function load_optpage_data_display() {
             'refresh' => SMOPT_REFRESH_ALL,
             'posvals' => $css_values
         );
-    
+
     }
 
     // config.php can be unupdated.
     if (! isset($available_languages) || $available_languages=="" ) {
      $available_languages="ALL"; }
-    
+
     $language_values = array();
     if ( strtoupper($available_languages)=='ALL') {
 	foreach ($languages as $lang_key => $lang_attributes) {
@@ -130,7 +130,7 @@ function load_optpage_data_display() {
 		 isset($languages[$lang_key]['ALTNAME']) ) {
     		    $language_values[$lang_key] .= " / " . $languages[$lang_key]['ALTNAME'];
         	}
-    	    }	    
+    	    }
 	}
     }
     asort($language_values);
@@ -399,6 +399,15 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'body_quote',
+        'caption' => _("Prefix for Original Message when Replying"),
+        'type'    => SMOPT_TYPE_STRING,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_TINY,
+        'save'    => 'save_option_reply_prefix'
+    );
+
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'reply_focus',
         'caption' => _("Cursor Position when Replying"),
@@ -406,7 +415,8 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE,
         'posvals' => array('' => _("To: field"),
                            'focus' => _("Focus in body"),
-                           'select' => _("Select body"))
+                           'select' => _("Select body"),
+                           'none' => _("No focus"))
     );
 
     $optvals[SMOPT_GRP_MESSAGE][] = array(
@@ -418,7 +428,7 @@ function load_optpage_data_display() {
 
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'internal_date_sort',
-        'caption' => _("Enable Sort by of Receive Date"),
+        'caption' => _("Sort by Receive Date"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_ALL
     );
@@ -435,7 +445,7 @@ function load_optpage_data_display() {
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_ALL
     );
-        
+
     }
     /* Assemble all this together and return it as our result. */
     $result = array(
@@ -449,13 +459,15 @@ function load_optpage_data_display() {
 /** Define any specialized save functions for this option page. ***/
 /******************************************************************/
 
+function save_option_header($option) {
+}
+
 /**
  * This function saves a new theme setting.
  * It updates the theme array.
  */
 function save_option_theme($option) {
     global $theme;
-
     /* Do checking to make sure $new_theme is in the array. */
     $theme_in_array = false;
     for ($i = 0; $i < count($theme); ++$i) {
@@ -483,7 +495,7 @@ function save_option_javascript_autodetect($option) {
     checkForJavascript(TRUE);
 }
 
-/** 
+/**
  * This function saves the user's icon theme setting
  */
 function icon_theme_save($option) {
@@ -491,8 +503,8 @@ function icon_theme_save($option) {
     global $icon_themes, $data_dir, $username;
 
 
-    // Don't assume the new value is there, double check 
-    // and only save if found 
+    // Don't assume the new value is there, double check
+    // and only save if found
     //
     if (isset($icon_themes[$option->new_value]['PATH']))
         setPref($data_dir, $username, 'icon_theme', $icon_themes[$option->new_value]['PATH']);
@@ -501,4 +513,21 @@ function icon_theme_save($option) {
 
 }
 
+/**
+ * This function saves the reply prefix (body_quote) character(s)
+ */
+function save_option_reply_prefix($option) {
+    global $data_dir, $username, $new_javascript_setting;
+
+    // save as "NONE" if it was blanked out
+    //
+    if (empty($option->new_value)) $option->new_value = 'NONE';
+
+
+    // Save the option like normal.
+    //
+    save_option($option);
+
+}
+
 ?>