X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Faction-themes.php;h=8cb3c43166bdda9caadafcc22b45be9ec423022e;hp=5304394aa121d3b897f132a214803bfbbb63d49c;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hpb=75ad748a68473ace540251427a74fb781b1145e9

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 5304394aa1..8cb3c43166 100644
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -32,41 +32,38 @@
  ************************************************************************/
 
 // 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_MEMBER()) {
+	LOAD_URL("modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
+	return;
 }
- elseif (!IS_LOGGED_IN())
-{
-	LOAD_URL(URL."/modules.php?module=index");
-}
+
+// Already defined?
+if (defined('__THEME_SELECTION_CONTENT')) return false;
 
 // Load all active designs (or all if admin)
-$WHERE = ""; $OUT = "";
-if (!IS_ADMIN()) $WHERE = " WHERE theme_active='Y'";
-$result_themes = SQL_QUERY("SELECT theme_path FROM "._MYSQL_PREFIX."_themes".$WHERE, __FILE__, __LINE__);
+$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>");
+	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
 }
 
 // Remember