[SM-CVS] CVS: squirrelmail/include/options display.php,1.33,1.34 folder.php,1.14,1.15 personal.php,1.14,1.15

[Fredrik J. <jer...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/include/options
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15160/options

Modified Files:
	display.php folder.php personal.php 
Log Message:
Unifying STABLE and DEVEL where possible

Index: display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/options/display.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- display.php	15 Aug 2004 20:34:53 -0000	1.33
+++ display.php	30 Sep 2004 07:22:34 -0000	1.34
@@ -80,9 +80,9 @@
     );
 
     $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_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) {

Index: folder.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/options/folder.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15

Index: personal.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/options/personal.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15