A lot double-quotes rewritten to single-quotes, global fix for getMessage() calls

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index a5c7535d7cd0fd7b5c7376c36484c9914040db85..d08d66b07b5260dba85c8a934ad8da700d1c6ef1 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -61,17 +61,17 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
        // 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'), GET_CURR_THEME());
+               $FQFN = $basePath . $value;
 
                // Do include only existing files and whose are not empty
                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."\" />");
+                               case 'DIRECT':
+                                       OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/theme/' . GET_CURR_THEME() . '/' . $value . '" />');
                                        break;
 
-                               case "FILE":
+                               case 'FILE':
                                        OUTPUT_HTML(READ_FILE($FQFN));
                                        break;
                        } // END - switch
@@ -79,15 +79,15 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
        } // 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 (isInstalling()) {
+       OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/css.php', false);
+       if ((isInstalling()) || (!isInstalled())) {
                // Default theme first
-               $NEW_THEME = "default";
-               if (REQUEST_ISSET_GET(('theme')))  $NEW_THEME = REQUEST_GET(('theme'));
-               if (REQUEST_ISSET_POST(('theme'))) $NEW_THEME = SQL_ESCAPE(REQUEST_POST('theme'));
-               OUTPUT_HTML("?theme=".$NEW_THEME."&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('" />');
 }
 
 //