X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Faction-themes.php;h=fc90a45ed73887a76e30e8c2013fae3144796a99;hb=7f104f6fe558bb56b4205241435a2357c2feece1;hp=c9cba3d7fa3b2a69848dd7111a59c9a4d99a4ad6;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index c9cba3d7fa..fc90a45ed7 100644
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -32,39 +32,33 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 }
 
+// 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);
 
-if ($num_themes > 1)
-{
+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)))
-{
+} elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
 	// If there's only one just print it's name
-	global $THEME_NAME;
-	define('__THEME_NAME', $THEME_NAME);
+	define('__THEME_NAME', GET_CURR_THEME_NAME());
 	$OUT = LOAD_TEMPLATE("theme_one", true);
-}
- elseif (IS_ADMIN())
-{
+} 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>");
 }