X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=28c50740610b686d6fcb250e4c547149ec44b1c1;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hp=06fba85c3a546a8a8228d69bd404909e0a1e373c;hpb=36c3c8b749a88ce05ad0fda81e00047f9cb5433f;p=mailer.git

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 06fba85c3a..28c5074061 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,41 +38,40 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
+	die();
+} elseif (!isBlockModeEnabled()) {
+	// Non-block mode detected
 	return;
 }
 
+if ((!isExtensionActive('theme')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
+	return;
+} // END - if
+
 // Get total num
-if (IS_ADMIN()) {
-	// Load only active designs for user
-	$num_themes = GET_TOTAL_DATA('Y', 'themes', 'id', 'theme_active', true);
-} else {
+if (isAdmin()) {
 	// Load all themes for admin
-	$num_themes = GET_TOTAL_DATA('', 'themes', 'id', '', true);
+	$num_themes = countSumTotalData('', 'themes', 'id', '', true);
+} else {
+	// Load only active designs for user
+	$num_themes = countSumTotalData('Y', 'themes', 'id', 'theme_active', true);
 }
 
+$OUT = '';
 if ($num_themes > 1) {
 	// If more than 1 is installed output selection box
-	$act = '';
-	if (isActionSet()) $act = getAction();
-	$OUT = generateThemeSelectionBox('index', $act, getWhat(), $result_themes);
-} elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
+	$OUT = generateThemeSelectionBox();
+} elseif (($num_themes == 1) || ((!isAdmin()) && ($num_themes == 0))) {
 	// If there's only one just output it's name
-	define('__THEME_NAME', getCurrentThemeName());
-	$OUT = LOAD_TEMPLATE('theme_one', true);
-} elseif (IS_ADMIN()) {
+	$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--}';
 }
 
-// Free memory
-SQL_FREERESULT($result_themes);
-
 // Load final box template
-LOAD_TEMPLATE('theme_select_box', false, $OUT);
+$GLOBALS['rows'] .= loadTemplate('theme_select_box', true, $OUT);
 
-//
+// [EOF]
 ?>