Ticket resolved, code rewrites and caching:

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index a84660c803eefb80d5ba1b4c1d2dc39594acab00..8c62a7b7b7a37afaf166945aa196a5436a85ada6 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -60,31 +60,31 @@ if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
        foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
                $BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
-               $file = $BASE.$value;
+               $FQFN = $BASE.$value;
 
                // Do include only existing files and whose are not empty
-               if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
+               if ((FILE_READABLE($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."\" />");
                                        break;
 
                                case "FILE":
-                                       OUTPUT_HTML(READ_FILE($file));
+                                       OUTPUT_HTML(READ_FILE($FQFN));
                                        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);
        if (isBooleanConstantAndTrue('mxchange_installing')) {
                // Default theme first
                $NEW_THEME = "default";
-               if (!empty($_GET['theme'])) $NEW_THEME = SQL_ESCAPE($_GET['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);
-       }
+       } // END - if
        OUTPUT_HTML("\" />");
 }