瀏覽代碼

move the 'fallback theme colors' to init.php. It makes sense to initialise
that array as early as possible, because we may need the colours when
setting up something goes wrong.

Thijs Kinkhorst 19 年之前
父節點
當前提交
053e9af4bd
共有 2 個文件被更改,包括 24 次插入22 次删除
  1. 24 1
      include/init.php
  2. 0 21
      include/load_prefs.php

+ 24 - 1
include/init.php

@@ -102,6 +102,29 @@ define('SM_BASE_URI', $base_uri);
  */
  */
 $bInit = true;
 $bInit = true;
 
 
+/**
+ * This theme as a failsafe if no themes were found, or if we error
+ * out before anything could be initialised.
+ */
+$color = array();
+$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[13] = '#800000';  /* (dark red)    Color for quoted text -- > 1 quote */
+$color[14] = '#ff0000';  /* (red)         Color for quoted text -- >> 2 or more */
+$color[15] = '#002266';  /* (dark blue)   Unselectable folders */
+$color[16] = '#ff9933';  /* (orange)      Highlight color */
+
 require(SM_PATH . 'functions/global.php');
 require(SM_PATH . 'functions/global.php');
 require(SM_PATH . 'config/config.php');
 require(SM_PATH . 'config/config.php');
 require(SM_PATH . 'functions/plugin.php');
 require(SM_PATH . 'functions/plugin.php');
@@ -500,4 +523,4 @@ function checkForJavascript($reset = FALSE) {
 function sqm_baseuri() {
 function sqm_baseuri() {
     global $base_uri;
     global $base_uri;
     return $base_uri;
     return $base_uri;
-}
+}

+ 0 - 21
include/load_prefs.php

@@ -72,27 +72,6 @@ for ($i = 0; $i < count($theme); ++$i){
 
 
 $chosen_theme = (!$found_theme ? '' : $chosen_theme);
 $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))) {
 if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
     @include_once($chosen_theme);
     @include_once($chosen_theme);
 } else {
 } else {