Several minor rewrites, getter GET_JACKPOT_POINTS() added

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 5b0888977cfd6e49c7a6b80a10f343a09000dfa6..0e2045ae026938a12e0498acee01af40b7e8632b 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -44,50 +44,54 @@ if (!defined('__SECURITY')) {
 
 // Default styles
 $STYLES = array(
-               "general.css",
+               'general.css',
 );
 
 // Add stylesheet for installation
-if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css";
+if ((isInstalling()) || (!isInstalled())) $STYLES[] = 'install.css';
 
 // When no CSS output-mode is set, set it to file-output
-if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
 
 // Output CSS files or content or link to css.php ?
-if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
+if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
        // Load CSS files
        $STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
 
        // Output inclusion lines
        foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
-               $BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
-               $FQFN = $BASE.$value;
+               $basePath = sprintf("%stheme/%s/css/", constant('PATH'), getCurrentTheme());
+               $FQFN = $basePath . $value;
 
                // Do include only existing files and whose are not empty
-               if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {
+               if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
                        switch (getConfig('css_php')) {
-                               case "DIRECT":
-                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
+                               case 'DIRECT': // Just link them (unsupported)
+                                       OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/theme/' . getCurrentTheme() . '/' . $value . '" />');
                                        break;
 
-                               case "FILE":
-                                       OUTPUT_HTML(READ_FILE($FQFN));
+                               case 'FILE': // Output contents
+                                       OUTPUT_HTML(readFromFile($FQFN));
+                                       break;
+
+                               default: // Invalid mode!
+                                       debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
                                        break;
                        } // END - switch
                } // END - if
        } // END - foreach
 } else {
        // Now we load all CSS files from css.php!
-       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
+       OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/css.php', false);
        if ((isInstalling()) || (!isInstalled())) {
                // Default theme first
-               $newTheme = "default";
-               if (REQUEST_ISSET_GET(('theme')))  $newTheme = REQUEST_GET(('theme'));
-               if (REQUEST_ISSET_POST(('theme'))) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
-               OUTPUT_HTML("?theme=".$newTheme."&amp;installing=1", false);
+               $newTheme = 'default';
+               if (REQUEST_ISSET_GET('theme'))  $newTheme = REQUEST_GET('theme');
+               if (REQUEST_ISSET_POST('theme')) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
+               OUTPUT_HTML('?theme=' . $newTheme . '&amp;installing=1', false);
        } // END - if
-       OUTPUT_HTML("\" />");
+       OUTPUT_HTML('" />');
 }
 
 //