Fixed for loading themes, no longer needed parameters removed

[mailer.git] / inc / modules / guest / action-themes.php

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 3c9a09c57351cba6bf1d6cf9f9dce99f878a6e96..1edf21289c451d02cbc537a58298be09666736b2 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -38,38 +38,36 @@
 
 // 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);
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'theme');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 
-// Load all active designs (or all if admin)
-$whereStatement = ''; $OUT = '';
-if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";
-$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
-$num_themes = SQL_NUMROWS($result_themes);
+// Get total num
+if (IS_ADMIN()) {
+       // Load only active designs for user
+       $num_themes = GET_TOTAL_DATA('Y', 'themes', 'id', 'theme_active', true);
+} else {
+       // Load all themes for admin
+       $num_themes = GET_TOTAL_DATA('', 'themes', 'id', '', true);
+}
 
 if ($num_themes > 1) {
        // If more than 1 is installed output selection box
-       $act = '';
-       if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
-       $OUT = THEME_SELECTION_BOX('index', $act, $GLOBALS['what'], $result_themes);
+       $OUT = generateThemeSelectionBox();
 } elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
-       // If there's only one just print it's name
-       define('__THEME_NAME', GET_CURR_THEME_NAME());
-       $OUT = LOAD_TEMPLATE("theme_one", true);
+       // If there's only one just output it's name
+       define('__THEME_NAME', getCurrentThemeName());
+       $OUT = LOAD_TEMPLATE('theme_one', true);
 } elseif (IS_ADMIN()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = LOAD_TEMPLATE('admin_settings_saved', true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
 }
 
-// Free memory
-SQL_FREERESULT($result_themes);
-
 // Load final box template
-LOAD_TEMPLATE("theme_select_box", false, $OUT);
+LOAD_TEMPLATE('theme_select_box', false, $OUT);
 
 //
 ?>