X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=8bbac22d4670fc25baf0019ff46c75f88da05ea0;hb=ad851a23313d8ac6489a759a0f3d62e3bc6f4682;hp=6027284df27cbd8ab555f7517918e771378aa026;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 6027284df2..8bbac22d46 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -32,34 +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 ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
+	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+	return;
 }
 
+// Already loaded?
+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)
-{
+if ($num_themes > 1) {
 	// If more than 1 is installed output selection box
 	$act = "";
 	if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
 	$OUT = THEME_SELECTION_BOX("index", $act, $GLOBALS['what'], $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>");
 }