Extension ext-theme doesn't need to be activated in admin area

[mailer.git] / inc / libs / theme_functions.php

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 1a8e05bba28b6aa0656cfaa46313db2c1d1c577d..5fbcfb2edd6f6ef4d396a519eedb2ebbf284ed98 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -47,9 +47,8 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = '{%url=modules.php?module='. $mod;
+       $formAction = 'modules.php?module='. $mod;
        if (!empty($what)) $formAction .= '&what=' . $what;
-       $formAction .= '%}';
 
        // Initialize array
        $themesArray = array(
@@ -61,7 +60,10 @@ function generateThemeSelectionBox () {
        $add = " WHERE `theme_active`='Y'";
 
        // Is there admin?
-       if (isAdmin()) $add = '';
+       if (isAdmin()) {
+               // Then display all themes
+               $add = '';
+       } // END - if
 
        // Select all themes we want
        $result = SQL_QUERY('SELECT
@@ -74,16 +76,16 @@ ORDER BY
        `theme_name` ASC', __FUNCTION__, __LINE__);
 
        // Load all themes
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($row = SQL_FETCHARRAY($result)) {
                // Construct relative include file name
-               $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path']));
+               $inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
 
                // Load it's theme.php file if found
                if (isIncludeReadable($inc)) {
                        // And save all data in array
                        loadInclude($inc);
-                       array_push($themesArray['theme_unix'], $content['theme_path']);
-                       array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name']);
+                       array_push($themesArray['theme_unix'], $row['theme_path']);
+                       array_push($themesArray['theme_name'], $row['theme_name']);
                } // END - if
        } // END - while
 
@@ -105,8 +107,11 @@ ORDER BY
                'selection'   => $OUT
        );
 
+       // Load template
+       $out = loadTemplate('theme_select_form', TRUE, $content);
+
        // Return generated selection
-       return loadTemplate('theme_select_form', TRUE, $content);
+       return $out;
 }
 
 // Get version from name
@@ -149,7 +154,7 @@ function getThemeVersion ($name) {
 // Checks whether a theme is found in db
 function ifThemeExists ($name) {
        // Get theme and is it not nul?
-       return ((isExtensionActive('theme')) && (getThemeId($name) > 0));
+       return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (getThemeId($name) > 0));
 }
 
 // Checks if a theme is active