From 6ca8222ec0529c8b4f37e64f0e8e651a59b7b76e Mon Sep 17 00:00:00 2001 From: tassium Date: Tue, 29 Jul 2003 01:52:05 +0000 Subject: [PATCH] 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. ** git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5466 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- include/load_prefs.php | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/load_prefs.php b/include/load_prefs.php index 2407d830..75ed51a8 100644 --- a/include/load_prefs.php +++ b/include/load_prefs.php @@ -41,32 +41,33 @@ for ($i = 0; $i < count($theme); ++$i){ } $chosen_theme = (!$found_theme ? '' : $chosen_theme); +/** +* 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 */ +$color[2] = '#CC0000'; /* light red Warning/Error Messages */ +$color[3] = '#A0B8C8'; /* green-blue Left Bar Background */ +$color[4] = '#FFFFFF'; /* white Normal Background */ +$color[5] = '#FFFFCC'; /* light yellow Table Headers */ +$color[6] = '#000000'; /* black Text on left bar */ +$color[7] = '#0000CC'; /* blue Links */ +$color[8] = '#000000'; /* black Normal text */ +$color[9] = '#ABABAB'; /* mid-gray Darker version of #0 */ +$color[10] = '#666666'; /* dark gray Darker version of #9 */ +$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']; - } 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. - */ - $color[0] = '#DCDCDC'; /* light gray TitleBar */ - $color[1] = '#800000'; /* red */ - $color[2] = '#CC0000'; /* light red Warning/Error Messages */ - $color[3] = '#A0B8C8'; /* green-blue Left Bar Background */ - $color[4] = '#FFFFFF'; /* white Normal Background */ - $color[5] = '#FFFFCC'; /* light yellow Table Headers */ - $color[6] = '#000000'; /* black Text on left bar */ - $color[7] = '#0000CC'; /* blue Links */ - $color[8] = '#000000'; /* black Normal text */ - $color[9] = '#ABABAB'; /* mid-gray Darker version of #0 */ - $color[10] = '#666666'; /* dark gray Darker version of #9 */ - $color[11] = '#770000'; /* dark red Special Folders color */ - $color[12] = '#EDEDED'; - $color[15] = '#002266'; /* (dark blue) Unselectable folders */ } } -- 2.25.1