Mahor rewrite:

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 9c3a67dd9e3714007f1c9f9b11b7c2de4ef01385..7b83cda9532411964d94f4a7ac06f72fe8956d44 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -44,65 +43,50 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!mxchange_installed) || (isset($_GET['installing']))) $STYLES[] = "install.css";
+if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
-if (empty($_CONFIG['css_php'])) $_CONFIG['css_php'] = "FILE";
+if (getConfig('css_php') == "") $_CONFIG['css_php'] = "FILE";
 
 // Output CSS files or content or link to css.php ?
-if (($CSS == "1") || ($_CONFIG['css_php'] == "DIRECT"))
-{
+if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
        // Load CSS files
-       if (is_array($EXT_CSS_FILES))
-       {
+       if (is_array($EXT_CSS_FILES)) {
                // Load extension's CSS files
                foreach ($EXT_CSS_FILES as $value) $STYLES[] = $value;
-       }
-
-       // Create missing configuration file
-       if (!function_exists('GET_CURR_THEME')) {
-               // Dummy for e.g. down database links
-               function GET_CURR_THEME () {
-                       return "default";
-               }
-       }
+       } // END - if
 
        // Output inclusion lines
-       foreach ($STYLES as $value)
-       {
+       foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
-               $BASE = PATH."theme/".GET_CURR_THEME()."/css/";
+               $BASE = sprintf("%stheme/%s/css/", PATH, GET_CURR_THEME());
                $file = $BASE.$value;
+
                // Do include only existing files and whose are not empty
-               if ((file_exists($file)) && (filesize($file) > 0))
-               {
-                       switch ($_CONFIG['css_php'])
-                       {
-                       case "DIRECT":
-                               OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\">");
-                               break;
+               if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
+                       switch (getConfig('css_php')) {
+                               case "DIRECT":
+                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/theme/".GET_CURR_THEME()."/".$value."\" />");
+                                       break;
 
-                       case "FILE":
-                               $load = implode("", file($file));
-                               OUTPUT_HTML($load);
-                               break;
+                               case "FILE":
+                                       $load = implode("", file($file));
+                                       OUTPUT_HTML($load);
+                                       break;
                        }
                }
        }
-}
- else
-{
+} else {
        // Now we load all CSS files from css.php!
-       OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
-       if (mxchange_installing)
-       {
+       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
+       if (isBooleanConstantAndTrue('mxchange_installing')) {
                // Default theme first
                $NEW_THEME = "default";
-               if (!empty($_GET['theme'])) $NEW_THEME = $_GET['theme'];
-               if (!empty($_POST['theme'])) $NEW_THEME = $_POST['theme'];
+               if (!empty($_GET['theme'])) $NEW_THEME = SQL_ESCAPE($_GET['theme']);
+               if (!empty($_POST['theme'])) $NEW_THEME = SQL_ESCAPE($_POST['theme']);
                OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
        }
-       OUTPUT_HTML("\">");
+       OUTPUT_HTML("\" />");
 }
 
 //