Heacy rewrite/cleanup:

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 8aa0924e7da797dd823a416b8c85b119ff36a707..baaee6da2c3ff5de98744b6f37393a5ed2d9fdb0 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -47,7 +47,7 @@ $stylesList = array(
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) {
+if ((isInstaller())) {
        array_push($stylesList, 'install.css');
 } // END - if
 
@@ -71,12 +71,12 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
        $stylesList = merge_array($stylesList, getExtensionCssFiles());
 
        // Generate base path
-       $basePath = sprintf("%stheme/%s/css/", getPath(), $currentTheme);
+       $basePath = getBasePathFromTheme($currentTheme);
 
        // Output inclusion lines
        foreach ($stylesList as $value) {
                // Only include found CSS files (to reduce 404 requests)
-               $FQFN = $basePath . $value;
+               $FQFN = $basePath . '/' . $value;
 
                // Do include only existing files and whose are not empty
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -90,7 +90,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
                                        break;
 
                                default: // Invalid mode!
-                                       reportBug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getCssPhp()));
+                                       reportBug(__FILE__, __LINE__, sprintf('Invalid css_php value %s detected.', getCssPhp()));
                                        break;
                        } // END - switch
                } // END - if
@@ -100,13 +100,13 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
        $stylesList = merge_array($stylesList, getExtensionCssFiles());
 
        // Generate base path
-       $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+       $basePath = getBasePathFromTheme(getCurrentTheme());
 
        // Output inclusion lines
        $OUT = '';
        foreach ($stylesList as $value) {
                // Only include found CSS files (to reduce 404 requests)
-               $FQFN = $basePath . $value;
+               $FQFN = $basePath . '/' . $value;
 
                // Do include only existing files and whose are not empty
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -120,7 +120,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
-       if ((isInstallationPhase())) {
+       if ((isInstaller())) {
                // Default theme first
                $OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
        } else {