Frameset support entirely removed, TODO extended, minor template fix

diff --git a/DOCS/de/TODO.txt b/DOCS/de/TODO.txt
index c8c8ac1c89b2bfd7661488721321db427f4b6e30..b9732b3c548c7b10ae15f469c31fc4ed23071149 100644 (file)
--- a/DOCS/de/TODO.txt
+++ b/DOCS/de/TODO.txt
@@ -2,9 +2,11 @@
 = TODO-Liste =
 ==============
 
-[13.12.2008 06:50 Uhr]:
+[16.12.2008 14:40 Uhr]:
 
 --- OFFEN: ---
+- Alle JavaScripte aus den HTML-Templates umlagern und per js.php?tag=xxx
+  aufrufen
 - Die Datenbankspalten ext_has_css nach ext_css und id nach ext_id umbenennen
 - Dokumentation erweitern
 - Englische Uebersetzung komplettieren

diff --git a/inc/databases.php b/inc/databases.php
index 9b4e9a47cde25e590f0913a941b0a4080c3c9a36..61f9ac9ddb5dd2f147ea055932de179120d90d5f 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "632");
+define('CURR_SVN_REVISION', "633");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/footer.php b/inc/footer.php
index 6d4b63cdd2b18c47b4b7d9d6c4cb15cc64abec75..c911ac5554168ef6dc078ceab51fe11e8f146037 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -68,14 +68,11 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
                DISPLAY_PARSING_TIME_FOOTER();
        } // END - if
 
-       // Not in frameset mode?
-       if ((!isset($isFrameset)) || ($isFrameset === false)) {
-               // Load page footer
-               LOAD_TEMPLATE("page_footer");
-       } // END - if
+       // Load page footer
+       LOAD_TEMPLATE("page_footer");
 
        // And the last closing HTML tag
-       OUTPUT_HTML("</HTML>");
+       OUTPUT_HTML("</html>");
 
        // Footer has been reached
        $footer = 1;

diff --git a/inc/header.php b/inc/header.php
index b6d3f52b6e27f0ccb8a58b28e74e96a000b5c4d7..a13fff6eb8f9203c2fe49c2f0782c3f943db0608 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -129,7 +129,7 @@ if (($header != "1") && ($header != "2")) {
 } // END - if
 
 // Load body or not
-if (((!$isFrameset) && ($GLOBALS['module'] != "frametester")) || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && ($isFrameset) && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && (!empty($_GET['frame']))) && ($CSS != "1")) {
        // Is the header sent and the script is not the mail confirmation script and not a CSS?
        if (($header == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($CSS != "1")) {
                // Add BODY tag

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 8f8e5cd41d760e6f51c304ea5c1e4da407626378..ad62a503e465398de0261406629f8cf3f7e1144c 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,18 +40,14 @@ if (!defined('__SECURITY')) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
-// Default is not a frameset
-global $isFrameset;
-$isFrameset = false;
-
-// Load library
+// Load database library
 require_once(PATH."inc/db/lib.php");
 
-// Load general functions
-require_once(PATH."inc/functions.php");  // Non-database functions
+// // Non-database functions
+require_once(PATH."inc/functions.php");  
 
-// Load more include files
-require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database
+// Functions which interact with the database
+require_once(PATH."inc/mysql-manager.php");
 
 // Load extensions and language
 require_once(PATH."inc/extensions.php");

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index a99bc96a107255d98b26bfcfa617bf251d2bb050..9a5c5bc4c35bb62c260620ce623adb0bc57ed85e 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -1,6 +1,6 @@
 <SCRIPT language="JavaScript" type="text/javascript">
 <!--
-var Timer = "{--_TIME_VALUE!}";
+var Timer = "{!_TIME_VALUE!}";
 
 function Init() {
        var Counter = window.setInterval("StartCounter()", 1000);