Added 'no focus' option for compose screen

[squirrelmail.git] / include / options / display.php

diff --git a/include/options/display.php b/include/options/display.php
index 366024fc1a43c53163baea26454a333791a68d81..0ae31bd6b4bdc494c01a301fe62a61514319eb0d 100644 (file)
--- 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
  */
 
@@ -22,11 +22,13 @@ global $use_icons;
 if ($use_icons) {
     global $icon_themes;
     $dirName = SM_PATH . 'images/themes';
-    $d = dir($dirName);
-    while($dir = $d->read()) {
-        if ($dir != "." && $dir != "..") {
-            if (is_dir($dirName."/".$dir) && file_exists("$dirName/$dir/theme.php"))
-                include("$dirName/$dir/theme.php");
+    if (is_readable($dirName) && is_dir($dirName)) {
+        $d = dir($dirName);
+        while($dir = $d->read()) {
+            if ($dir != "." && $dir != "..") {
+                if (is_dir($dirName."/".$dir) && file_exists("$dirName/$dir/theme.php"))
+                    include("$dirName/$dir/theme.php");
+            }
         }
     }
 }
@@ -76,18 +78,21 @@ function load_optpage_data_display() {
         'posvals' => $theme_values,
         'save'    => 'save_option_theme'
     );
- 
+
     $css_values = array( 'none' => _("Default" ) );
-    $handle=opendir('../themes/css/');
-    while ($file = readdir($handle) ) {
-        if ( substr( $file, -4 ) == '.css' ) {
-            $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
+
+    if (is_readable(SM_PATH . 'themes/css') && is_dir(SM_PATH . 'themes/css')) {
+        $handle=opendir(SM_PATH . 'themes/css');
+        while ($file = readdir($handle) ) {
+            if ( substr( $file, -4 ) == '.css' ) {
+                $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
+            }
         }
+        closedir($handle);
     }
-    closedir($handle);
-    
+
     if ( count( $css_values ) > 1 ) {
-    
+
         $optvals[SMOPT_GRP_GENERAL][] = array(
             'name'    => 'custom_css',
             'caption' => _("Custom Stylesheet"),
@@ -95,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) {
@@ -125,7 +130,7 @@ function load_optpage_data_display() {
                 isset($languages[$lang_key]['ALTNAME']) ) {
                    $language_values[$lang_key] .= " / " . $languages[$lang_key]['ALTNAME'];
                }
-           }       
+           }
        }
     }
     asort($language_values);
@@ -191,15 +196,17 @@ function load_optpage_data_display() {
             if ($icon_theme == $icon_themes[$count]['PATH'])
                 $value = $count;
         }
-        $optvals[SMOPT_GRP_MAILBOX][] = array(
-            'name'          => 'icon_theme',
-            'caption'       => _("Message Flags Icon Theme"),
-            'type'          => SMOPT_TYPE_STRLIST,
-            'refresh'       => SMOPT_REFRESH_NONE,
-            'posvals'       => $temp,
-            'initial_value' => $value,
-            'save'          => 'icon_theme_save'
-        );
+        if (sizeof($icon_themes) > 0) {
+            $optvals[SMOPT_GRP_MAILBOX][] = array(
+                'name'          => 'icon_theme',
+                'caption'       => _("Message Flags Icon Theme"),
+                'type'          => SMOPT_TYPE_STRLIST,
+                'refresh'       => SMOPT_REFRESH_NONE,
+                'posvals'       => $temp,
+                'initial_value' => $value,
+                'save'          => 'icon_theme_save'
+            );
+        }
     }
 
     $optvals[SMOPT_GRP_MAILBOX][] = array(
@@ -392,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"),
@@ -399,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(
@@ -428,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(
@@ -442,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) {
@@ -476,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) {
@@ -484,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']);
@@ -494,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);
+
+}
+
 ?>