Unifying STABLE and DEVEL where possible

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8096 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 1f91c82e436afc15b455fec217208ab489c1e6a6..12be9826262bdc3b3d97f67c9ce288393196ef01 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -174,7 +174,7 @@ $reply_focus = getPref($data_dir, $username, 'reply_focus', '');
 $left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE );
 $left_refresh = strtolower($left_refresh);
 
-/** Load up the Signature file **/
+/* Load up the Signature file */
 $signature_abs = $signature = getSig($data_dir, $username, 'g');
 
 /* Message Highlighting Rules */
@@ -297,4 +297,4 @@ $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_disp
 
 do_hook('loading_prefs');
 
-?>
+?>
\ No newline at end of file

diff --git a/include/options/display.php b/include/options/display.php
index b1e197cd038a9c3e895bcfc67d6d70f5809b7c4e..0ce7ad3d941f22261b41a1b6efd14f3c8fb89976 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -80,9 +80,9 @@ function load_optpage_data_display() {
     );
 
     $css_values = array( 'none' => _("Default" ) );
-
-    if (is_readable(SM_PATH . 'themes/css') && is_dir(SM_PATH . 'themes/css')) {
-        $handle=opendir(SM_PATH . 'themes/css');
+    $css_dir = SM_PATH . 'themes/css';
+    if (is_readable($css_dir) && is_dir($css_dir)) {
+        $handle=opendir($css_dir);
         while ($file = readdir($handle) ) {
             if ( substr( $file, -4 ) == '.css' ) {
                 $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
@@ -468,6 +468,7 @@ function save_option_header($option) {
  */
 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) {
@@ -530,4 +531,4 @@ function save_option_reply_prefix($option) {
 
 }
 
-?>
+?>
\ No newline at end of file

diff --git a/include/options/folder.php b/include/options/folder.php
index 8ca1f09ce8f1aec37192caeefdac43507db32964..54cdf5ee74ed9fcfb3ac1fb28eab78b461f7521f 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -295,4 +295,4 @@ function save_option_draft_folder($option) {
     save_option($option);
 }
 
-?>
+?>
\ No newline at end of file

diff --git a/include/options/personal.php b/include/options/personal.php
index 952269aebea7fb28c19c32799e0b63f64c7a201d..7d1498528475dfe9c99c1575f6d76c46fdd89e1c 100644 (file)
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -134,13 +134,13 @@ function load_optpage_data_personal() {
     if ( $tzChangeAllowed ) {
         $TZ_ARRAY[SMPREF_NONE] = _("Same as server");
         $tzfile = SM_PATH . 'locale/timezones.cfg';
-               if ((!is_readable($tzfile)) or (!$fd = fopen($tzfile,'r'))) {
-               $message = _("Error opening timezone config, contact administrator.");
-               }
-               if (isset($message)) {
-                   plain_error_message($message, $color);
-                   exit;
-       }
+        if ((!is_readable($tzfile)) or (!$fd = fopen($tzfile,'r'))) {
+            $message = _("Error opening timezone config, contact administrator.");
+        }
+        if (isset($message)) {
+            plain_error_message($message, $color);
+            exit;
+        }
         while (!feof ($fd)) {
             $zone = fgets($fd, 1024);
             if( $zone ) {

diff --git a/include/validate.php b/include/validate.php
index 339c8ed64164e95af7a5bb573409e39f8cddfd6e..aeed3e12709d63ef3f2f387d85be6e1906fbf26d 100644 (file)
--- a/include/validate.php
+++ b/include/validate.php
@@ -104,4 +104,5 @@ if ( $timeZone != SMPREF_NONE && ($timeZone != "")
     && $tzChangeAllowed ) {
     putenv("TZ=".$timeZone);
 }
-?>
+
+?>
\ No newline at end of file