[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/include load_prefs.php,1.14,1.15
From:       Chris Hilts <tassium () users ! sourceforge ! net>
Date:       2003-07-29 1:52:07
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/include
In directory sc8-pr-cvs1:/tmp/cvs-serv19313

Modified Files:
	load_prefs.php 
Log Message:
Some themes (Sea Spray, among others) are incomplete and do not define every element \
of the $color array as they probably should.  I moved the "last resort default theme" \
code up before the attempt to load the chosen theme to provide "sane" defaults should \
the theme be incomplete.

This is mainly an E_ALL fix.  The themes should be complete, IMO, but that's a job \
for another day.

** This may affect how things look depending on which theme you use.  If you notice a \
difference, it's because you were using an incomplete theme. **


Index: load_prefs.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/load_prefs.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- load_prefs.php	22 Jul 2003 08:46:54 -0000	1.14
+++ load_prefs.php	29 Jul 2003 01:52:05 -0000	1.15
@@ -41,17 +41,11 @@
 }
 $chosen_theme = (!$found_theme ? '' : $chosen_theme);
 
-if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
-    @include_once($chosen_theme);
-} else {
-    if (isset($theme) && isset($theme[$theme_default]) && \
                file_exists($theme[$theme_default]['PATH'])) {
-        @include_once($theme[$theme_default]['PATH']);
-        $chosen_theme = $theme[$theme_default]['PATH'];
-    } else {
         /**
          * This theme as a failsafe if no themes were found. It makes
          * no sense to cause the whole thing to exit just because themes
          * were not found. This is the absolute last resort.
+* Moved here to provide 'sane' defaults for incomplete themes.
          */
          $color[0]  = '#DCDCDC';  /* light gray    TitleBar               */
          $color[1]  = '#800000';  /* red                                  */
@@ -67,6 +61,13 @@
          $color[11] = '#770000';  /* dark red      Special Folders color  */
          $color[12] = '#EDEDED';
          $color[15] = '#002266';  /* (dark blue)      Unselectable folders */        \
 +
+if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
+    @include_once($chosen_theme);
+} else {
+    if (isset($theme) && isset($theme[$theme_default]) && \
file_exists($theme[$theme_default]['PATH'])) { +        \
@include_once($theme[$theme_default]['PATH']); +        $chosen_theme = \
$theme[$theme_default]['PATH'];  }
 }
 



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]