X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Faction-themes.php;h=8cb3c43166bdda9caadafcc22b45be9ec423022e;hb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;hp=908fe6509818637e3b456f9278526d7e9847af3a;hpb=ae80e170b5d25a4782af90a7c3d81fbb176fa293;p=mailer.git

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 908fe65098..8cb3c43166 100644
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -32,11 +32,14 @@
  ************************************************************************/
 
 // 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;
 }
 
 // Already defined?
@@ -45,7 +48,7 @@ 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__);
+$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {
@@ -56,12 +59,11 @@ if ($num_themes > 1) {
 	$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
-	global $THEME_NAME;
-	define('__THEME_NAME', $THEME_NAME);
+	define('__THEME_NAME', GET_CURR_THEME_NAME());
 	$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