X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=f9995139b47ecdda63644fa03a8b8780e879eef7;hp=aedec8bacda7c243b9fb6d844df552d362798780;hb=d5ee31ebfc85f22fc691b8c2753c42e188c1c4ef;hpb=c72c89ffa5f7f5444d7fd47021db520b77738d9e

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index aedec8bacd..f9995139b4 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -32,9 +32,12 @@
  ************************************************************************/
 
 // 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 ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+	return;
 }
 
 // Already loaded?
@@ -43,7 +46,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) {
@@ -53,12 +56,11 @@ if ($num_themes > 1) {
 	$OUT = THEME_SELECTION_BOX("index", $act, $GLOBALS['what'], $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