Fixed for loading themes, no longer needed parameters removed

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

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index fc90a45ed73887a76e30e8c2013fae3144796a99..86ad7ff2c1b53492f22cf5276e87e34dc839fe8b 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Theme-Auswahl                                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,44 +38,38 @@
 
 // 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 (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
+       return;
 }
 
-// Already defined?
-if (defined('__THEME_SELECTION_CONTENT')) return false;
-
-// 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 = ""; $wht = "";
-       if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
-       if (!empty($GLOBALS['what']))   $wht = SQL_ESCAPE($GLOBALS['what']);
-       $OUT = THEME_SELECTION_BOX("login", $act, $wht, $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, "<FONT class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</FONT>");
+       $OUT = LOAD_TEMPLATE('admin_settings_saved', true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
 }
 
-// Remember
-define('__THEME_SELECTION_CONTENT', $OUT);
-
-// Free memory
-SQL_FREERESULT($result_themes);
-
 // Load final box template
-LOAD_TEMPLATE("theme_select_box");
+LOAD_TEMPLATE('theme_select_box', false, $OUT);
 
 //
 ?>