X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Faction-themes.php;h=22a22725ce689e01582105319a2daabe5a464118;hp=db2fbf58300007c88982ead6e7630db6a8b73cbd;hb=d92d8b4ddd219b65df8e0bba5e4354c0bbfba5c9;hpb=8ece7fd45c386f7ccd60f9c4800ad207602b0240

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index db2fbf5830..22a22725ce 100644
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,47 +38,41 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
-	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
-// Already defined?
-if (defined('__THEME_SELECTION_CONTENT')) return false;
+// Add description as navigation point
+addMenuDescription('member', __FILE__);
 
-// 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);
+if ((!isExtensionActive('theme')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
+	return;
+} // END - if
+
+// Get total num
+if (isAdmin()) {
+	// Load only active designs for user
+	$num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', true);
+} else {
+	// Load all themes for admin
+	$num_themes = countSumTotalData('', '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);
-} 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);
-} elseif (IS_ADMIN()) {
+	$OUT = generateThemeSelectionBox();
+} elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == 0))) {
+	// If there's only one just output it's name
+	$OUT = loadTemplate('theme_one', true, getCurrentThemeName());
+} elseif (isAdmin()) {
 	// 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>");
+	$OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
-// Remember
-define('__THEME_SELECTION_CONTENT', $OUT);
-
-// Free memory
-SQL_FREERESULT($result_themes);
-
 // Load final box template
-LOAD_TEMPLATE("theme_select_box");
+$GLOBALS['rows'] .= loadTemplate('theme_select_box', true, $OUT);
 
-//
+// [EOF]
 ?>