More XHTML-fied and extended header added to templates

[mailer.git] / inc / modules / guest / action-themes.php

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index ba848fad1599fef11ba87cb57cde68c47517ef8b..f77b0d88ee5497c6daae401c3eeb7bc561874220 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Theme-Auswahl                                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -36,17 +41,14 @@ 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");
+       addFatalMessage(__FILE__, __LINE__, getMessage('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) {
@@ -60,17 +62,14 @@ if ($num_themes > 1) {
        $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, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
+       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
 }
 
-// Remember
-define('__THEME_SELECTION_CONTENT', $OUT);
-
 // Free memory
 SQL_FREERESULT($result_themes);
 
 // Load final box template
-LOAD_TEMPLATE("theme_select_box");
+LOAD_TEMPLATE("theme_select_box", false, $OUT);
 
 //
 ?>