From f9cc6f432459393d1c3a220e5270705d341a350e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Dec 2008 13:40:47 +0000 Subject: [PATCH] Frameset support entirely removed, TODO extended, minor template fix --- DOCS/de/TODO.txt | 4 +++- inc/databases.php | 2 +- inc/footer.php | 9 +++------ inc/header.php | 2 +- inc/mysql-connect.php | 14 +++++--------- templates/de/html/mailid/mailid_timer.tpl | 2 +- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/DOCS/de/TODO.txt b/DOCS/de/TODO.txt index c8c8ac1c89..b9732b3c54 100644 --- 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 9b4e9a47cd..61f9ac9ddb 100644 --- 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 6d4b63cdd2..c911ac5554 100644 --- 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(""); + OUTPUT_HTML(""); // Footer has been reached $footer = 1; diff --git a/inc/header.php b/inc/header.php index b6d3f52b6e..a13fff6eb8 100644 --- 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 8f8e5cd41d..ad62a503e4 100644 --- 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 a99bc96a10..9a5c5bc4c3 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -1,6 +1,6 @@