From 8a9324b2d931f54f54f4319fd7234910af77012c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 13 Feb 2008 21:32:32 +0000
Subject: [PATCH] A *lot* more code-cleanups, errors in CSS fixed (missing
 brackets) and frameset support removed due to it will never be finished

---
 .gitattributes                            |   1 -
 admin.php                                 |   2 -
 agb.php                                   |   2 -
 birthday_confirm.php                      |   2 -
 click.php                                 |   2 -
 confirm.php                               |   2 -
 css.php                                   |   2 -
 doubler.php                               |   2 -
 img.php                                   |   2 -
 inc/config.php                            |   3 -
 inc/db/lib-mysql3.php                     |   4 +-
 inc/extensions.php                        |  14 +-
 inc/extensions/ext-autopurge.php          |   4 +-
 inc/extensions/ext-doubler.php            |   2 +-
 inc/extensions/ext-mydata.php             |   4 +-
 inc/extensions/ext-rallye.php             |   4 +-
 inc/extensions/ext-register.php           |   4 +-
 inc/extensions/ext-task.php               |   2 +-
 inc/footer.php                            |  45 ++-
 inc/functions.php                         |  36 +--
 inc/header.php                            | 160 +++++------
 inc/install-inc.php                       |  25 +-
 inc/language/beg_de.php                   |   2 +-
 inc/language/birthday_de.php              |   2 +-
 inc/language/de.php                       |  16 +-
 inc/language/en.php                       |   4 +-
 inc/language/install_de.php               |   4 +-
 inc/language/payout_de.php                |   4 +-
 inc/language/rewrite_de.php               |   4 +-
 inc/language/task_de.php                  |   4 +-
 inc/libs/html_mail_functions.php          |   4 +-
 inc/libs/output_functions.php             |   4 +-
 inc/libs/payout_functions.php             |   4 +-
 inc/libs/rallye_functions.php             |   8 +-
 inc/libs/register_functions.php           |   2 +-
 inc/libs/user_functions.php               |   2 +-
 inc/load_cache.php                        | 143 +++------
 inc/modules/admin/action-logout.php       |   2 +-
 inc/modules/admin/admin-inc.php           |  12 +-
 inc/modules/admin/overview-inc.php        |   2 +-
 inc/modules/admin/what-adminedit.php      |   2 +-
 inc/modules/admin/what-admins_mails.php   |   2 +-
 inc/modules/admin/what-config_mods.php    |   4 +-
 inc/modules/admin/what-del_task.php       |   2 +-
 inc/modules/admin/what-email_details.php  |  46 +--
 inc/modules/admin/what-email_stats.php    |   2 +-
 inc/modules/admin/what-extensions.php     |   2 +-
 inc/modules/admin/what-guest_add.php      |   2 +-
 inc/modules/admin/what-guestedit.php      |   2 +-
 inc/modules/admin/what-holiday_list.php   |   2 +-
 inc/modules/admin/what-holiday_remove.php |   2 +-
 inc/modules/admin/what-list_beg.php       |   2 +-
 inc/modules/admin/what-list_bonus.php     |   2 +-
 inc/modules/admin/what-list_country.php   |   4 +-
 inc/modules/admin/what-list_payouts.php   |   2 +-
 inc/modules/admin/what-list_rallyes.php   |   2 +-
 inc/modules/admin/what-list_refs.php      |   2 +-
 inc/modules/admin/what-mem_add.php        |   2 +-
 inc/modules/admin/what-memedit.php        |   2 +-
 inc/modules/admin/what-theme_import.php   |   2 +-
 inc/modules/admin/what-user_online.php    |   4 +-
 inc/modules/chk_login.php                 |   2 +-
 inc/modules/frameset.php                  |  47 ---
 inc/modules/guest/what-register.php       |  22 +-
 inc/modules/index.php                     |  16 +-
 inc/modules/login.php                     |   2 +-
 inc/modules/member/what-beg2.php          |   2 +-
 inc/modules/member/what-bonus.php         |   2 +-
 inc/modules/member/what-order.php         |   6 +-
 inc/modules/member/what-reflinks.php      |  16 +-
 inc/modules/member/what-transfer.php      |   2 +-
 inc/modules/member/what-welcome.php       |   2 +-
 inc/mysql-manager.php                     | 155 +++-------
 inc/pool-update.php                       |  40 +--
 inc/rdf.class.php                         |   2 +-
 index.php                                 |   2 -
 install.php                               |   2 -
 lead-confirm.php                          |   2 -
 login.php                                 |   2 -
 mailid.php                                |   2 -
 mailid_top.php                            |   2 -
 ref.php                                   |   2 -
 show_bonus.php                            |   2 -
 theme/business/css/general.css            | 229 ++++++++-------
 theme/business/css/register.css           |   3 -
 theme/default/css/general.css             | 335 +++++++++++-----------
 theme/default/css/register.css            |   1 -
 theme/desert/css/general.css              |   3 +-
 theme/desert/css/register.css             |   1 -
 view.php                                  |   2 -
 90 files changed, 648 insertions(+), 897 deletions(-)
 delete mode 100644 inc/modules/frameset.php

diff --git a/.gitattributes b/.gitattributes
index 5977fc2a93..b9b6e70832 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -350,7 +350,6 @@ inc/modules/admin/what-user_contct.php -text
 inc/modules/admin/what-user_online.php -text
 inc/modules/admin/what-usr_online.php -text
 inc/modules/chk_login.php -text
-inc/modules/frameset.php -text
 inc/modules/frametester.php -text
 inc/modules/guest/.htaccess -text
 inc/modules/guest/action- -text
diff --git a/admin.php b/admin.php
index 2320674c5e..7fcb0e8612 100644
--- a/admin.php
+++ b/admin.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action']))	$GLOBALS['action']	= secureString($_GET['action']);
-if (!empty($_GET['what']))		$GLOBALS['what']	= secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "admin"; $CSS = -1;
diff --git a/agb.php b/agb.php
index a802e0c401..4c878bc909 100644
--- a/agb.php
+++ b/agb.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what']))   $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "agb"; $CSS = -1;
diff --git a/birthday_confirm.php b/birthday_confirm.php
index b65d5e1b0a..27729533e4 100644
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "birthday_confirm"; $CSS = -1;
diff --git a/click.php b/click.php
index 8a083637b4..1601300cad 100644
--- a/click.php
+++ b/click.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "click"; $CSS = -1;
diff --git a/confirm.php b/confirm.php
index e844c6c77e..42165299f6 100644
--- a/confirm.php
+++ b/confirm.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module to confirm
 $GLOBALS['module'] = "confirm"; $CSS = -1;
diff --git a/css.php b/css.php
index cdc3461e4f..ef86272f3a 100644
--- a/css.php
+++ b/css.php
@@ -40,8 +40,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // This is a CSS file loader!
 $CSS = "1"; $GLOBALS['module'] = "css";
diff --git a/doubler.php b/doubler.php
index 637bd4411d..356821765a 100644
--- a/doubler.php
+++ b/doubler.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "doubler";
diff --git a/img.php b/img.php
index 94878c19a3..82855eee2e 100644
--- a/img.php
+++ b/img.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "img"; $CSS = -1;
diff --git a/inc/config.php b/inc/config.php
index 41abd29524..3e98b5af6b 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -104,9 +104,6 @@ define('mxchange_installed', false);
 // CFG: ADMIN-SETUP
 define('admin_registered', false);
 
-// CFG: FRAMESET
-define('frameset_active', false);
-
 // CFG: DEBUG-MODE (if enabled all mails will be *displayed* and *not* send!)
 define('DEBUG_MODE', false);
 
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index c07f09aeb3..2f75170617 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -45,8 +45,8 @@ function SQL_QUERY($sql_string, $F, $L)
 
 	// Run SQL command
 	$result = @mysql_query($sql_string, $link)
-	 or ADD_FATAL($F." (".$L."):".mysql_error()."<BR>
-".MYSQL_QUERY_STRING."<BR>
+	 or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
+".MYSQL_QUERY_STRING."<br />
 ".$sql_string);
 
 	if (($CSS != "1") && ($CSS != "-1") && (DEBUG_MODE) && (DEBUG_SQL))
diff --git a/inc/extensions.php b/inc/extensions.php
index c12749305c..7f43bbac09 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -70,17 +70,17 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 				if (!empty($UPDATE_NOTES))
 				{
 					// Update notes found
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR>".$UPDATE_NOTES."<BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".$UPDATE_NOTES."<br /><br />\n";
 					$UPDATE_NOTES = "";
 				}
 				 elseif (($EXT_VER == "0.0") || ($EXT_VER == "0.0.0"))
 				{
 					// Initial release
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR>".INITIAL_RELEASE."<BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".INITIAL_RELEASE."<br /><br />\n";
 				}
 				 else
 				{
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR><I>".NO_UPDATE_NOTES."</I><BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br /><I>".NO_UPDATE_NOTES."</I><br /><br />\n";
 				}
 			}
 		}
@@ -273,7 +273,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false)
 	// Extension's file name will also be checked
 	$file = PATH."inc/extensions/ext-".$ext_name.".php";
 	if ((!file_exists($file)) && (!is_readable($file))) return false;
-	//* DEBUG: */ echo "*".$ext_name."*<BR>";
+	//* DEBUG: */ echo "*".$ext_name."*<br />";
 
 	// Failed is the default
 	$ret = false;
@@ -388,17 +388,17 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 				if (!empty($UPDATE_NOTES))
 				{
 					// Update notes found
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR>".$UPDATE_NOTES."<BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".$UPDATE_NOTES."<br /><br />\n";
 					$UPDATE_NOTES = "";
 				}
 				 elseif ($EXT_VER == "0.0")
 				{
 					// Initial release
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR>".INITIAL_RELEASE."<BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".INITIAL_RELEASE."<br /><br />\n";
 				}
 				 else
 				{
-					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><BR><I>".NO_UPDATE_NOTES."</I><BR><BR>\n";
+					$NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br /><I>".NO_UPDATE_NOTES."</I><br /><br />\n";
 				}
 			}
 
diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 9ed1a8c7f2..ea4952da78 100644
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -138,7 +138,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_time bigint(20) not null default '".(60*60*24*7)."'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<BR><BR><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
@@ -147,7 +147,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify enum('Y', 'N') not null default 'Y'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<BR><BR><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index cd905390cf..6cb45a143d 100644
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -186,7 +186,7 @@ WHERE d.completed='N'";
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.<BR><BR>Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
+		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php
index 8d035be2a3..7d3234322e 100644
--- a/inc/extensions/ext-mydata.php
+++ b/inc/extensions/ext-mydata.php
@@ -124,8 +124,8 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<BR>
-<BR>
+		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<br />
+<br />
 <STRONG>Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".GET_LANGUAGE()."/html/member/ !) mit hoch!</STRONG>";
 
 		// Depends on 'country'!
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 26c2f713ca..600fcf0189 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -214,12 +214,12 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_prices bigint(20) not null default '3'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <STRONG>templates/de/emails/member/member_rallye_notifty.tpl</STRONG> folgende zwei Zeilen ein:<BR>
+		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <STRONG>templates/de/emails/member/member_rallye_notifty.tpl</STRONG> folgende zwei Zeilen ein:<br />
 <UL>
   <LI>&#36;DATA&#91;min_users&#93;</LI>
   <LI>&#36;DATA&#91;min_prices&#93;</LI>
 </UL>
-Zudem sollten Sie mindestens folgende Templates (in <STRONG>templates/".GET_LANGUAGE()."/html/guest/</STRONG> !) aktualisieren:<BR>
+Zudem sollten Sie mindestens folgende Templates (in <STRONG>templates/".GET_LANGUAGE()."/html/guest/</STRONG> !) aktualisieren:<br />
 <UL>
   <LI><STRONG>guest_rallye_footer.tpl</STRONG></LI>
   <LI><STRONG>guest_rallye_header.tpl</STRONG></LI>
diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 1ced350f36..060a8d74fa 100644
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -209,8 +209,8 @@ PRIMARY KEY(id)
 
 	case "0.3.2": // SQL queries for v0.3.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<BR>
-<BR>
+		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<br />
+<br />
 <STRONG>Wichtig: Laden Sie noch das Template <STRONG>guest_register.tpl</STRONG> mit hoch, welches unter templates/".GET_LANGUAGE()."/html/guest/ zu finden ist!</STRONG>";
 
 		// Depends on 'country'
diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index 4bc55f3a82..8836181216 100644
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -154,7 +154,7 @@ case "update": // Update an extension
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Weitere Direkt-Links eingebaut:<BR>
+		$UPDATE_NOTES = "Weitere Direkt-Links eingebaut:<br />
 <UL>
   <LI>L&auml;ndercodes (<STRONG><A href=\"".SERVER_URL."/extensions/ext-country.zip\">ext-country.zip</A></STRONG>)</LI>
   <LI>Wartende Verdopplungen (<STRONG><A href=\"".SERVER_URL."/extensions/ext-doubler.zip\">ext-doubler.zip</A></STRONG>)</LI>
diff --git a/inc/footer.php b/inc/footer.php
index 4062ecc36d..42b4e4315d 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -32,65 +32,52 @@
  ************************************************************************/
 
 // Global variable stuff
-global $link, $frame, $CSS, $_GET, $header, $_SERVER;
+global $link, $frame, $CSS, $header;
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
-if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1"))
-{
-	// Currently nothing more...
-	if (((frameset_active) || ($GLOBALS['module'] == "frametester") || ($header < 2)) && (empty($frame)))
-	{
-		// Add some non-frameset stuff
-		OUTPUT_HTML("<NOFRAMES>
-<BODY>");
-	}
-
+if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 	// Output the generated HTML code or do nothing in direct-mode
-	if (!empty($FATAL[0]))
-	{
+	if (!empty($FATAL[0])) {
 		// Output fatal error messages
 		require_once(PATH."inc/fatal_errors.php");
 	}
 
 	// Shall we display the copyright notice?
-	if ((empty($frame)) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (WRITE_FOOTER == true))
-	{
+	if ((empty($frame)) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (WRITE_FOOTER == true)) {
 		LOAD_TEMPLATE("copyright");
 	}
 
 	// Load page footer
 	LOAD_TEMPLATE("page_footer");
 
-	if (((frameset_active) || ($GLOBALS['module'] == "frametester")) && ($FOOTER == "1"))
-	{
-		// Add the closing NOFRAMES tag
-		OUTPUT_HTML("</NOFRAMES>");
-	}
 	// And the last closing HTML tag
 	OUTPUT_HTML("</HTML>");
 
 	// Footer has been reached
-	$FOOTER = 1;
+	$footer = 1;
 
 	// Output HTML code
 	OUTPUT_HTML("");
 
-	// Close link
-	if ($link) { SQL_CLOSE($link, __FILE__, __LINE__); } else { ADD_FATAL(NO_DB_LINK); }
-}
- elseif ($CSS == "1")
-{
+	if (is_resource($link)) {
+		// Close link
+		SQL_CLOSE($link, __FILE__, __LINE__);
+	} else {
+		// No database link
+		ADD_FATAL(NO_DB_LINK);
+	}
+} elseif ($CSS == "1") {
 	// Footer has been reached
-	$FOOTER = 1;
+	$footer = 1;
 
 	// Output CSS content
 	OUTPUT_HTML("");
 }
+
 //
 ?>
diff --git a/inc/functions.php b/inc/functions.php
index 5c0d7da89b..eb09c9b119 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -103,7 +103,7 @@ function CLOSE_TABLE($ADD="")
 // Output HTML code directly or "render" it. You addionally switch the new-line character off
 function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 	// Some global variables
-	global $OUTPUT, $FOOTER, $CSS;
+	global $OUTPUT, $footer, $CSS;
 
 	// Do we have HTML-Code here?
 	if (!empty($HTML)) {
@@ -144,7 +144,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 			die ("<STRONG>".FATAL_ERROR.":</STRONG> ".LANG_NO_RENDER_DIRECT);
 			break;
 		}
-	} elseif ((_OB_CACHING == "on") && ($FOOTER == 1)) {
+	} elseif ((_OB_CACHING == "on") && ($footer == 1)) {
 		// Output cached HTML code
 		$OUTPUT = ob_get_contents();
 
@@ -322,14 +322,14 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
 	 elseif ((IS_ADMIN()) || ((mxchange_installing) && (!mxchange_installed)))
 	{
 		// Only admins shall see this warning or when installation mode is active
-		$ret = "<BR><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><BR>
-(".basename($file).")<BR>
-<BR>
+		$ret = "<br /><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><br />
+(".basename($file).")<br />
+<br />
 ".TEMPLATE_CONTENT."
 <PRE>".print_r($content, true)."</PRE>
 ".TEMPLATE_DATA."
 <PRE>".print_r($DATA, true)."</PRE>
-<BR><BR>";
+<br /><br />";
 	}
 	if (!empty($ret))
 	{
@@ -348,7 +348,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
 	 elseif (DEBUG_MODE)
 	{
 		// Warning, empty output!
-		return "E:".$template."<BR>\n";
+		return "E:".$template."<br />\n";
 	}
 }
 
@@ -963,12 +963,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	 elseif (!empty($template))
 	{
 		// Template file not found!
-		$content = TEMPLATE_404.": ".$template."<BR>
+		$content = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."
 <PRE>".print_r($content, true)."</PRE>
 ".TEMPLATE_DATA."
 <PRE>".print_r($DATA, true)."</PRE>
-<BR><BR>";
+<br /><br />";
 
 		// Debug mode not active? Then remove the HTML tags
 		if (!DEBUG_MODE) $content = strip_tags($content);
@@ -1005,7 +1005,7 @@ function LOAD_URL($URL, $addUrlData=true) {
 		$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
 
 		// Output new location link as anchor
-		OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>\n");
+		OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>");
 	} elseif (!headers_sent()) {
 		// Load URL when headers are not sent
 		@header ("Location: ".str_replace("&amp;", "&", $URL));
@@ -1797,11 +1797,11 @@ function VALIDATE_EMAIL($email) {
 function VALIDATE_URL ($URL, $compile=true) {
 	// Trim URL a little
 	$URL = trim(urldecode($URL));
-	//* DEBUG: */ echo $URL."<BR>";
+	//* DEBUG: */ echo $URL."<br />";
 
 	// Compile some chars out...
 	if ($compile) $URL = COMPILE_CODE($URL, false, false, false);
-	//* DEBUG: */ echo $URL."<BR>";
+	//* DEBUG: */ echo $URL."<br />";
 
 	// Check for the extension filter
 	if (EXT_IS_ACTIVE("filter")) {
@@ -1911,7 +1911,7 @@ function generateHash($plainText, $salt = "") {
 
 		// Generate the password salt string
 		$salt = substr($sha1, 0, $CONFIG['salt_length']);
-		//* DEBUG: */ echo $salt." (".strlen($salt).")<BR>";
+		//* DEBUG: */ echo $salt." (".strlen($salt).")<br />";
 	}
 	 else
 	{
@@ -1941,7 +1941,7 @@ function scrambleString($str) {
 	}
 
 	// Scramble string here
-	//* DEBUG: */ echo "***Original=".$str."***<BR>";
+	//* DEBUG: */ echo "***Original=".$str."***<br />";
 	for ($idx = 0; $idx < strlen($str); $idx++) {
 		// Get char on scrambled position
 		$char = substr($str, $scrambleNums[$idx], 1);
@@ -1951,7 +1951,7 @@ function scrambleString($str) {
 	}
 
 	// Return scrambled string
-	//* DEBUG: */ echo "***Scrambled=".$scrambled."***<BR>";
+	//* DEBUG: */ echo "***Scrambled=".$scrambled."***<br />";
 	return $scrambled;
 }
 //
@@ -1969,7 +1969,7 @@ function descrambleString($str)
 
 	// Begin descrambling
 	$orig = str_repeat(" ", 40);
-	//* DEBUG: */ echo "+++Scrambled=".$str."+++<BR>";
+	//* DEBUG: */ echo "+++Scrambled=".$str."+++<br />";
 	for ($idx = 0; $idx < 40; $idx++)
 	{
 		$char = substr($str, $idx, 1);
@@ -1977,7 +1977,7 @@ function descrambleString($str)
 	}
 
 	// Return scrambled string
-	//* DEBUG: */ echo "+++Original=".$orig."+++<BR>";
+	//* DEBUG: */ echo "+++Original=".$orig."+++<br />";
 	return $orig;
 }
 //
@@ -2087,7 +2087,7 @@ function FIX_DELETED_COOKIES ($cookies) {
 }
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
-	global $FOOTER;
+	global $footer;
 
 	// Load the message template
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
diff --git a/inc/header.php b/inc/header.php
index 015b9e43b3..4f3f2a4e75 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -39,92 +39,88 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	require($INC);
 }
 
-if (defined('frameset_active')) {
-	// Initialize variables
-	$header = ""; $FOOTER = "";
-	if (empty($GLOBALS['what'])) $GLOBALS['what'] = "";
-	if (($header != "1") && ($header != "2")) {
-		// If not in CSS mode generate the header
-		if (($CSS != "1")) {
-			// Generate header
-			$TITLE = "";
-
-			// Add title decorations? (left)
-			if ((!empty($CONFIG)) && (isset($link)) && (isset($db))) {
-				if (($CONFIG['title_decoration'] == 'Y') && (trim(!empty($CONFIG['title_left'])))) $TITLE .= trim($CONFIG['title_left'])." ";
-				$TITLE .= MAIN_TITLE;
-
-				// Add title of module? (middle decoration will also be added!)
-				if (($CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
-
-				// Add title from what file
-				$MODE = "";
-				if ($GLOBALS['module'] == "login") $MODE = "member";
-				 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
-				if ((!empty($MODE)) && ($CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
-
-				// Add title decorations? (right)
-				if (($CONFIG['title_decoration'] == 'Y') && (!empty($CONFIG['title_right']))) $TITLE .= " ".trim($CONFIG['title_right']);
-
-				// Remember title in constant for the template
-				define('__PAGE_TITLE', html_entity_decode($TITLE));
-			} elseif ((!mxchange_installed) || (!admin_registered)) {
-				// Load language file because it was missing in installation finalizer step... *sigh*
-				require_once(sprintf("%sinc/language/install_%s.php",
-					PATH,
-					GET_LANGUAGE()
-				));
-
-				// Installation mode
-				define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
-			} else {
-				// Configuration not found!
-				define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
-				ADD_FATAL(NO_CONFIG_FOUND);
-			}
-
-			// Save some little memory
-			unset($TITLE);
-
-			// Output page header code
-			LOAD_TEMPLATE("page_header");
-
-			// Include meta data here
-			LOAD_TEMPLATE("metadata");
-
-			// Add meta description to header
-			if ((mxchange_installed) && (admin_registered) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
-				// Add meta description not in admin and login module and when the script is installed
-				META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
-			}
-
-			// Include more header data here
-			LOAD_TEMPLATE("header");
-
-			// Include stylesheet
-			include (PATH."inc/stylesheet.php");
+// Initialize variables
+if (!isset($header)) $header = 0;
+
+if (($header != "1") && ($header != "2")) {
+	// If not in CSS mode generate the header
+	if (($CSS != "1")) {
+		// Generate header
+		$TITLE = "";
+
+		// Add title decorations? (left)
+		if ((!empty($CONFIG)) && (isset($link)) && (isset($db))) {
+			if (($CONFIG['title_decoration'] == 'Y') && (trim(!empty($CONFIG['title_left'])))) $TITLE .= trim($CONFIG['title_left'])." ";
+			$TITLE .= MAIN_TITLE;
+
+			// Add title of module? (middle decoration will also be added!)
+			if (($CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
+
+			// Add title from what file
+			$MODE = "";
+			if ($GLOBALS['module'] == "login") $MODE = "member";
+			 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
+			if ((!empty($MODE)) && ($CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+
+			// Add title decorations? (right)
+			if (($CONFIG['title_decoration'] == 'Y') && (!empty($CONFIG['title_right']))) $TITLE .= " ".trim($CONFIG['title_right']);
+
+			// Remember title in constant for the template
+			define('__PAGE_TITLE', html_entity_decode($TITLE));
+		} elseif ((!mxchange_installed) || (!admin_registered)) {
+			// Load language file because it was missing in installation finalizer step... *sigh*
+			require_once(sprintf("%sinc/language/install_%s.php",
+				PATH,
+				GET_LANGUAGE()
+			));
+
+			// Installation mode
+			define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
+		} else {
+			// Configuration not found!
+			define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
+			ADD_FATAL(NO_CONFIG_FOUND);
 		}
 
-		// Closing HEAD tag
-		if ($CSS != "1") OUTPUT_HTML("</HEAD>\n");
-		$header = 1;
-	}
+		// Save some little memory
+		unset($TITLE);
+
+		// Output page header code
+		LOAD_TEMPLATE("page_header");
+
+		// Include meta data here
+		LOAD_TEMPLATE("metadata");
+
+		// Add meta description to header
+		if ((mxchange_installed) && (admin_registered) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
+			// Add meta description not in admin and login module and when the script is installed
+			META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+		}
 
-	// Set unsetted variables
-	if (empty($_GET['frame'])) $_GET['frame'] = "";
-
-	// Load body or not
-	if (((!frameset_active) && ($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!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
-			LOAD_TEMPLATE("page_body");
-  			$header = 2;
-  		}
+		// Include more header data here
+		LOAD_TEMPLATE("header");
+
+		// Include stylesheet
+		include (PATH."inc/stylesheet.php");
 	}
-} else {
-	// Something is missing
-	die ("<STRONG>Fatal error:</STRONG> You have to define <STRONG>frameset_active</STRONG>!");
+
+	// Closing HEAD tag
+	if ($CSS != "1") OUTPUT_HTML("</HEAD>");
+	$header = 1;
 }
+
+// Set unsetted variables
+if (empty($_GET['frame'])) $_GET['frame'] = "";
+
+// Load body or not
+if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!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
+		LOAD_TEMPLATE("page_body");
+  		$header = 2;
+  	}
+}
+
 //
 ?>
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 043c701cfc..5e0a39a00d 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -48,9 +48,9 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
 	if (file_exists($file)) {
 		$search = "CFG: ".$comment;
 		$tmp = $file.".tmp";
-		$fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<BR>");
+		$fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
 		if (is_resource($fp)) {
-			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
 			if (is_resource($fp_tmp)) {
 				while (!feof($fp)) {
 					$line = fgets ($fp, 10240);
@@ -82,7 +82,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
 			}
 		}
 	} else {
-		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
+		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
 	}
 }
 
@@ -156,9 +156,9 @@ if ((!mxchange_installed) || (!admin_registered))
 		if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
 			OUTPUT_HTML("<SPAN class=\"install_fatal\">");
 			foreach ($FATAL as $key=>$err) {
-				OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
+				OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
 			}
-			OUTPUT_HTML("</SPAN><BR>");
+			OUTPUT_HTML("</SPAN><br />");
 		}
 		define('__MYSQL_HOST'  , $mysql['host']);
 		define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -284,20 +284,6 @@ if ((!mxchange_installed) || (!admin_registered))
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">".LANG_FRAMESET_ACTIVE.":&nbsp;&nbsp;</TD>
-  <TD>
-    <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
-		if (frameset_active) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
-		if (!frameset_active) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".NO."</OPTION>
-    </SELECT>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD class=\"install\" align=\"right\">".INSTALL_ENABLE_BACKLINK.":&nbsp;&nbsp;</TD>
   <TD>
@@ -391,7 +377,6 @@ if ((!mxchange_installed) || (!admin_registered))
 						install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define ('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
 						install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define ('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
 						install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define ('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
-						// install_WriteData($_POST['spath']."inc/config.php", "FRAMESET", "define ('frameset_active', ", ");", $_POST['frameset'], 0);
 						// install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define ('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
 						install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "	'host'     => \"", "\",", $mysql['host'], 0);
 						install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "	'dbase'    => \"", "\",", $mysql['dbase'], 0);
diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index e37956e0a4..ac4cbe9b34 100644
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -93,7 +93,7 @@ define('ADMIN_BEG_TIMEOUT_1', "Es werden nur Mitglieder ausgewertet und hier auf
 define('ADMIN_BEG_TIMEOUT_2', "noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht!");
 define('ADMIN_EDIT_BEG_RALLYE_SETTINGS', "Einstellungen an der Bettel-Rallye");
 define('ADMIN_BEG_RALLYE_ACTIVE', "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)");
-define('ADMIN_BEG_RALLYE_ONLY_ACTIVE', "Nur aktive Mitglieder nehmen dran?<BR><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
+define('ADMIN_BEG_RALLYE_ONLY_ACTIVE', "Nur aktive Mitglieder nehmen dran?<br /><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
 define('ADMIN_BEG_NO_RALLYE', "Niemand nimmt an der Bettel-Rallye dran teil!");
 define('ADMIN_BEG_WITHDRAW_NOW', "Jetzt Verg&uuml;tung Bettel-Rallye verg&uuml;ten");
 define('ADMIN_BEG_WITHDRAW_NOTE', "Es wird nur die Verg&uuml;tung vorbereitet. Die eigentliche Verg&uuml;tung erfolgt beim T&auml;glichen Reset um 00:00 Uhr!");
diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php
index aeebaf43c5..c3873135bc 100644
--- a/inc/language/birthday_de.php
+++ b/inc/language/birthday_de.php
@@ -49,7 +49,7 @@ define('BIRTHDAY_CANNOT_LOAD_DATA', "Entweder haben Sie bereits Ihr Geburtsgesch
 define('ADMIN_SELECT_BIRTHDAY_MODE', "Verg&uuml;tungsmodus der {!POINTS!}");
 define('BIRTHDAY_MODE_DIRECT', "Nur direktem Mitglied gutschreiben.");
 define('BIRTHDAY_MODE_REF', "Auch dem Werber des Mitgliedes gutschreiben.");
-define('ADMIN_BIRTHDAY_ONLY_ACTIVE', "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<BR><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
+define('ADMIN_BIRTHDAY_ONLY_ACTIVE', "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
 
 //
 ?>
diff --git a/inc/language/de.php b/inc/language/de.php
index 53948200ed..f49358c0ff 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -86,7 +86,7 @@ define('RETURN_MYSQL_PAGE', "Zur&uuml;ck zu den MySQL-Einstellungen");
 define('INSTALL_FINALIZER_FAILED', "W&auml;hrend der Installation ist ein unerwarteter Fehler aufgetreten! Der Finalizer konnte die Installation nicht abschliessen!");
 define('INSTALL_MAYBE_DONE', "Die Installation ist m&ouml;glicherweise abgeschlossen oder es ist ein unerwarteter Fehler aufgetreten!");
 define('INSTALL_FINISHED', "Die Installation ist abgeschlossen! :-)");
-define('INSTALL_FIN_SECU', "<strong><U>Sicherheitshinweise:</U></strong><BR>Installieren Sie eine .htaccess Datei in alle Unterverzeichnisse ab dem Verzeichnis inc!");
+define('INSTALL_FIN_SECU', "<strong><U>Sicherheitshinweise:</U></strong><br />Installieren Sie eine .htaccess Datei in alle Unterverzeichnisse ab dem Verzeichnis inc!");
 define('CONTINUE_ADMIN', "Weiter zum Administrationsbereich...");
 define('RUNTIME_PROBLEMS_DETECTED', "Laufzeit-Problem erkannt!");
 define('FATAL_INC_WRITABLE', "Das Verzeichnis inc ist beschreibbar! Bitte setzen Sie die Zugriffsrechte auf 755 oder 555.");
@@ -114,7 +114,7 @@ define('ADMIN_LOGIN_ALREADY_REG', "Das von Ihnen eingegebene Admin-Login existie
 define('ADMIN_REGISTER_FAILED', "Bei der Registrierung eines Admin-Accounts ist ein unerwarteter Fehler unterlaufen!");
 define('ADMIN_REGISTER_DONE', "Das Admin-Account wurde soeben erstellt. Sie k&ouml;nnen sich nun mit den eingegeben Login-Daten einloggen.");
 define('ADMIN_CANNOT_COMPLETE', "Kann die Regsitrierung des Admin-Accounts nicht abschliessen!");
-define('ADMIN_LOGIN_NOW', "Sie k&ouml;nnen sich nun in den Administratorbereich einloggen.<BR>Geben Sie dazu Ihren Admin-Login (nicht Benutzer-Login!) und das Passwort dazu ein.");
+define('ADMIN_LOGIN_NOW', "Sie k&ouml;nnen sich nun in den Administratorbereich einloggen.<br />Geben Sie dazu Ihren Admin-Login (nicht Benutzer-Login!) und das Passwort dazu ein.");
 define('ENTER_ADMIN_LOGIN', "Administrator-Login");
 define('ENTER_ADMIN_PASS', "Passwort zum Admin-Account");
 define('ADMIN_LOGIN_SUBMIT', "Einloggen zum Admin-Bereich");
@@ -320,7 +320,7 @@ define('LOGIN_UNKNOWN_CODE', "Unbekannter R&uuml;ckgabewert!");
 define('LOGIN_WRONG_PASS', "Falsches Passwort eingegben!");
 define('LOGIN_WRONG_ID', "Die Login-ID ist nicht mehr g&uuml;ltig!");
 define('LOGIN_ID_LOCKED', "Ihr Account wurde gesperrt!");
-define('LOGIN_ID_UNCONFIRMED', "Bitte best&auml;tigen Sie erst Ihre Email-Adresse!<BR>Haben Sie den Best&auml;tigungslink verloren? Links im Men&uuml; k&ouml;nnen Sie ihn erneut anfordern.");
+define('LOGIN_ID_UNCONFIRMED', "Bitte best&auml;tigen Sie erst Ihre Email-Adresse!<br />Haben Sie den Best&auml;tigungslink verloren? Links im Men&uuml; k&ouml;nnen Sie ihn erneut anfordern.");
 define('LOGIN_NO_COOKIES', "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt!");
 define('GUEST_REG_POINTS_1', "F&uuml;r Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift");
 define('GUEST_REG_POINTS_2', "{!POINTS!} gutgeschrieben. Sie k&ouml;nnen bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empf&auml;nger auch erreichbar sind.");
@@ -722,8 +722,8 @@ define('LATEST_PATCH_INSTALLED', "Es wurde bereits die Datenbank aktualisiert!")
 define('PATCH_LISTED', "Anbei eine Liste der noetigen Dateien:");
 define('NO_PATCHES_APPLIED', "Keine Patches wurden ausgef&uuml;hrt!");
 define('LOAD_URL_ERROR_1', "Konnte nicht weiterleiten, da bereits Kopfinformationen gesendet wurden! <A href=\"");
-define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</A>, um zur URL zu kommen.<BR>
-<BR>
+define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</A>, um zur URL zu kommen.<br />
+<br />
 Danke.");
 define('GUEST_STATS', "Statistiken unseres {!MT_WORD2!}");
 define('GUEST_STATS_MONTHLY', "Mitgliederverteilung auf Kalendermonate");
@@ -823,15 +823,15 @@ define('MEMBER_ORDER_PAGE1_INTRO', "Mailbuchung - Schritt 1 von 4: PLZ eingeben"
 define('MEMBER_ORDER_PAGE2_INTRO', "Mailbuchung - Schritt 2 von 4: Daten eingeben");
 define('MEMBER_ORDER_PAGE3_INTRO', "Mailbuchung - Schritt 3 von 4: Frame-Killer Test und Absenden");
 define('MEMBER_ORDER_PAGE4_INTRO', "Mailbuchung - Schritt 4 von 4: Vielen Dank!");
-define('MEMBER_ORDER_PAGE1_NOTE', "Geben Sie hier die ersten ein bis drei Stellen der Postleitzahl ein, in der gesendet werden soll.<BR>
-<BR>
+define('MEMBER_ORDER_PAGE1_NOTE', "Geben Sie hier die ersten ein bis drei Stellen der Postleitzahl ein, in der gesendet werden soll.<br />
+<br />
 Beispiele:
 <UL>
   <LI><strong>1</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 1 anf&auml;ngt.</LI>
   <LI><strong>12</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 12 anf&auml;ngt.</LI>
   <LI><strong>123</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 123 anf&auml;ngt.</LI>
 </UL>
-<BR>
+<br />
 Oder geben Sie nichts ein, wenn Sie diese Option nicht w&uuml;nschen.");
 define('MEMBER_ENTER_ZIP_CODE', "PLZ eingeben");
 define('ORDER_PAGE_2', "Weiter zur Seite 2");
diff --git a/inc/language/en.php b/inc/language/en.php
index efdee8c960..35616be652 100644
--- a/inc/language/en.php
+++ b/inc/language/en.php
@@ -91,7 +91,7 @@ define('RETURN_MYSQL_PAGE', "Back to MySQL settings");
 define('INSTALL_FINALIZER_FAILED', "While installtion unexpected errors occur! The finalizer cannt finish installation.");
 define('INSTALL_MAYBE_DONE', "The installation is possibely completed or unexpected errros occur.");
 define('INSTALL_FINISHED', "Installation is completed! :-)");
-define('INSTALL_FIN_SECU', "<STRONG><U>Security notes:</U></STRONG><BR>Install a .htaccess file in directory inc and templates including all secondary directories.");
+define('INSTALL_FIN_SECU', "<STRONG><U>Security notes:</U></STRONG><br />Install a .htaccess file in directory inc and templates including all secondary directories.");
 define('CONTINUE_ADMIN', "Continue to administrator's area...");
 define('RUNTIME_PROBLEMS_DETECTED', "Runtime-problem detected!");
 define('FATAL_INC_WRITABLE', "Directory inc is writeable! Please set the access rights to CHMOD 755.");
@@ -119,7 +119,7 @@ define('ADMIN_LOGIN_ALREADY_REG', "Your entered admin-login does already exists.
 define('ADMIN_REGISTER_FAILED', "While creating an admin-account an unexpected error occurs!");
 define('ADMIN_REGISTER_DONE', "Admin account created. You can use the account to login into the admin-area.");
 define('ADMIN_CANNOT_COMPLETE', "Cannot finish registration of admin-account!");
-define('ADMIN_LOGIN_NOW', "You can now login into the admin-area.<BR>Enter your admin-login (not user-login!) and the password to do so.");
+define('ADMIN_LOGIN_NOW', "You can now login into the admin-area.<br />Enter your admin-login (not user-login!) and the password to do so.");
 define('ENTER_ADMIN_LOGIN', "Administrator login");
 define('ENTER_ADMIN_PASS', "Password");
 define('ADMIN_LOGIN_SUBMIT', "Login to admin-area");
diff --git a/inc/language/install_de.php b/inc/language/install_de.php
index 9ee16469d7..64ced8fdc7 100644
--- a/inc/language/install_de.php
+++ b/inc/language/install_de.php
@@ -46,7 +46,7 @@ define('INSTALL_MISSING_DUMPS', "Die SQL-Dumps wurden nicht gefunden! Diese soll
 define('INSTALL_ENABLE_BACKLINK', "Backlink (=R&uuml;ckverlinkung zu mxchange.org setzen?) <EM>rel=&quot;external&quot;</EM> ist gsetzt. Bitte nicht den Backlink einbauen, und <STRONG>nofollow</STRONG> verwenden! Das schadet allen.");
 define('WRONG_PAGE', "Sie oder dieses Script haben eine falsche Seite ausgew&auml;hlt!");
 define('WELCOME_TEXT', "Willkommen zum Installationsscript von MXChange-{!MT_WORD!}, dem kostenlosen {!MT_WORD!} Powered by MyAutoInstaller-Community!");
-define('INTRO_TEXT', "Dieses Script wird den {!MT_WORD!} f&uuml;r Sie soweit installieren, die Datenbank einrichten und vorkonfigurieren.<BR>Sie werden w&auml;hrend der Installation Schritt-F&uuml;r-Schritt durch die Installation gebracht! Bitte halten Sie die MySQL-Daten, sowie den absoluten Server-Pfad bereit!<BR>Nach erfolgreicher Installation sollten Sie als n&auml;chstes das erste Administrator-Login einrichten. Anschliessend k&ouml;nnen Sie sich einloggen und weitere Einstellungen verfeinern.<BR>Wir empfehlen dann alle Installationsdateien von Ihrem Server zu l&ouml;schen.");
+define('INTRO_TEXT', "Dieses Script wird den {!MT_WORD!} f&uuml;r Sie soweit installieren, die Datenbank einrichten und vorkonfigurieren.<br />Sie werden w&auml;hrend der Installation Schritt-F&uuml;r-Schritt durch die Installation gebracht! Bitte halten Sie die MySQL-Daten, sowie den absoluten Server-Pfad bereit!<br />Nach erfolgreicher Installation sollten Sie als n&auml;chstes das erste Administrator-Login einrichten. Anschliessend k&ouml;nnen Sie sich einloggen und weitere Einstellungen verfeinern.<br />Wir empfehlen dann alle Installationsdateien von Ihrem Server zu l&ouml;schen.");
 define('NEXT_PAGE', "Weiter zur n&auml;chsten Seite...");
 define('HEADER_TEXT_PAGE1', "Server-Pfad, Basis-URL und Webseitentitel");
 define('HEADER_TEXT_PAGE2', "MySQL-Daten: Hostname, Login und Passwort");
@@ -59,7 +59,7 @@ define('TEXT_PAGE_2', "Geben Sie hier die Daten vom MySQL-Server ein, die Ihnen
 define('TEXT_PAGE_3', "Geben Sie hier die Ihre Zugangsdaten zum SMTP-Server (ausgehender Mailserver) ein, wenn der mail()-Befehl auf Ihrem Server deaktiviert sein sollte. Oder lassen Sie alle Felder leer f&uuml;r Standart-Einstellungen.");
 define('TEXT_PAGE_4', "Geben Sie hier die URL Ihrer hochgeladenen CSS-Datei an. Wenn Sie die bestehende Standart-Datei verwenden m&ouml;chten, so klicken Sie einfach auf Weiter.");
 define('TEXT_PAGE_5', "Hier k&ouml;nnen Sie weitere Einstellungen vornehmen, wie zum Beispiel den Ausgabe-Modus festlegen, in der der HTML-Code ausgegeben werden soll, usw.");
-define('TEXT_MYSQL_ERRORS', "Es konnte keine Verbindung zur Datenbank aufgebaut werden! Ist das Login richtig? Ist auch die UMSCHALT-Taste nicht bet&auml;tigt? (zweite gr&uuml;ne Lampe leuchtet!) Ist somit das Passwort richtig?<BR><BR>Hier sind / ist alle Fehler aufgelistet:");
+define('TEXT_MYSQL_ERRORS', "Es konnte keine Verbindung zur Datenbank aufgebaut werden! Ist das Login richtig? Ist auch die UMSCHALT-Taste nicht bet&auml;tigt? (zweite gr&uuml;ne Lampe leuchtet!) Ist somit das Passwort richtig?<br /><br />Hier sind / ist alle Fehler aufgelistet:");
 define('SERVER_PATH', "Absoluter Server-Pfad");
 define('BASE_URL', "Basis-URL");
 define('HP_TITLE', "{!MT_WORD!}-Titel");
diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php
index 799d159119..264578a9fa 100644
--- a/inc/language/payout_de.php
+++ b/inc/language/payout_de.php
@@ -63,8 +63,8 @@ define('ADMIN_PAYOUT_YOUR_ACCOUNT', "Ihre Account-ID");
 define('ADMIN_PAYOUT_YOUR_PASSWORD', "Passwort");
 define('ADMIN_PAYOUT_YOUR_URL', "URL zum ext. Script");
 define('ADMIN_PAYOUT_YOUR_URL_NOTE', "<FONT class=\"admin_note\">
-  Wobei &#36;fuid/&#36;fpass und &#36;f/&#36;fpass die Logindaten sind und &#36;points die zu &uuml;bberweisenden {!POINTS!} sind:<BR>
-  http://url/engine.php?action=trans&amp;from_uid=&#36;fuid&amp;from_pass=&#36;fpass&amp;to_uid=&#36;tuid&amp;to_pass=&#36;tpass&amp;points=&#36;points<BR>
+  Wobei &#36;fuid/&#36;fpass und &#36;f/&#36;fpass die Logindaten sind und &#36;points die zu &uuml;bberweisenden {!POINTS!} sind:<br />
+  http://url/engine.php?action=trans&amp;from_uid=&#36;fuid&amp;from_pass=&#36;fpass&amp;to_uid=&#36;tuid&amp;to_pass=&#36;tpass&amp;points=&#36;points<br />
 </FONT>");
 define('ADMIN_PAYOUT_YOUR_RET_DONE', "Return-Code: Erfolgreich");
 define('ADMIN_PAYOUT_YOUR_RET_FAILED', "Return-Code: Fehlgeschlagen");
diff --git a/inc/language/rewrite_de.php b/inc/language/rewrite_de.php
index 307dab9ebb..f9b8ec176c 100644
--- a/inc/language/rewrite_de.php
+++ b/inc/language/rewrite_de.php
@@ -42,8 +42,8 @@ if (basename($_SERVER['PHP_SELF']) == basename(__FILE__))
 define('MODULE_NAME', "Modulname");
 define('MODULE_TITLE', "Modultitel");
 define('MODULE_SKIPPED', "Modul wird ausgeblendet");
-define('ADMIN_CONFIG_REWRITE_NOTE', "Stellen Sie hier die Module ein, die von der Rewrite-Engine nicht<BR>
-auf die suchmaschienenoptimierten URLs umgeschrieben werden sollen.<BR>
+define('ADMIN_CONFIG_REWRITE_NOTE', "Stellen Sie hier die Module ein, die von der Rewrite-Engine nicht<br />
+auf die suchmaschienenoptimierten URLs umgeschrieben werden sollen.<br />
 Das Modul <U>admin</U> sollten Sie *KEINES FALLS* aus der Liste enfernen!");
 
 //
diff --git a/inc/language/task_de.php b/inc/language/task_de.php
index d57db260e4..e8b7c8194a 100644
--- a/inc/language/task_de.php
+++ b/inc/language/task_de.php
@@ -68,8 +68,8 @@ define('ADMIN_OVERVIEW_TASK_UNASSIGNED_TYPE', "Nicht zugewiesene und nicht gel&o
 define('ADMIN_OVERVIEW_TASK_DELETED_TYPE', "Als zu l&ouml;schende markierte Aufgaben");
 define('ADMIN_OVERVIEW_TASK_CLOSED_TYPE', "Ihre geschlossenen Aufgaben");
 define('TASK_ADMIN_DELETE_ENTRIES', "Sofort l&ouml;schen");
-define('TASK_DELETE_MODE_NOTE', "Diese Aufgaben sind zum automatischen L&ouml;schen freigegeben.<BR>
-Die automatische L&ouml;schung erfolgt durch die autopurge-Erweiterung.<BR>
+define('TASK_DELETE_MODE_NOTE', "Diese Aufgaben sind zum automatischen L&ouml;schen freigegeben.<br />
+Die automatische L&ouml;schung erfolgt durch die autopurge-Erweiterung.<br />
 Sie k&ouml;nnen die Aufgaben aber auch jetzt endg&uuml;ltig l&ouml;schen!");
 define('TASK_ADMIN_UNKNOWN_LIST_TITLE', "Linktitel nicht gesetzt!");
 
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 3d08472af5..f45f68d4e9 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -155,8 +155,8 @@ function HTML_INSERT_URLS($text)
 		$text .= $part;
 	}
 
-	// Replace new-lines agains <BR>-s and finally compile possible own HTML tags out...
-	return COMPILE_CODE(str_replace("\n", "<BR>\n", $text));
+	// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
+	return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
 }
 //
 function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
diff --git a/inc/libs/output_functions.php b/inc/libs/output_functions.php
index efa5bc7304..49a2d8385f 100644
--- a/inc/libs/output_functions.php
+++ b/inc/libs/output_functions.php
@@ -155,9 +155,9 @@ function get_template ($template, $return=false, $content="")
 	 elseif (IS_ADMIN())
 	{
 		// Only admins shall see this warning
-		$ret = "<BR><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><BR>
+		$ret = "<br /><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><br />
 (".basename($file).")
-<BR><BR>";
+<br /><br />";
 	}
 	if ($return)
 	{
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index 5122ee6140..e1697c7b6a 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -51,8 +51,8 @@ WHERE %s >= min_points
 ORDER BY type", array($POINTS), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) > 0)
 		{
-			OUTPUT_HTML("<BR><DIV align=\"center\">
-<DIV align=\"center\"><STRONG>".PAYOUT_NOW.":</STRONG></DIV><BR>
+			OUTPUT_HTML("<br /><DIV align=\"center\">
+<DIV align=\"center\"><STRONG>".PAYOUT_NOW.":</STRONG></DIV><br />
 <UL>");
 			// Now let's check
 			while (list($id, $type, $rate, $mpoi) = SQL_FETCHROW($result))
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index b498578213..799c896f7a 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -160,7 +160,7 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 	switch($mode)
 	{
 		case "email": $mode = "\n";     break;
-		case "html" : $mode = "<BR>\n"; break;
+		case "html" : $mode = "<br />\n"; break;
 	}
 
 	// Load prices
@@ -786,7 +786,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
 					{
 						// Level does exist so abort here
 						$cnt = $REF_SYSTEM['counter'][$id];
-						//* DEBUG: */ echo "*".$uid."/".$cnt."*<BR>";
+						//* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
 						break;
 					}
 					 elseif ($level > 0)
@@ -810,7 +810,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
 			$CONFIG['cache_hits']++;
 
 			// Remove old refs
-			//* DEBUG: */ echo "+".$cnt."/".$old."+<BR>";
+			//* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
 			$cnt -= $old;
 		}
 	}
@@ -835,7 +835,7 @@ WHERE s.userid=%d AND s.level=0", array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
 	// Return count
-	//* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*<BR>";
+	//* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*<br />";
 	return $cnt;
 }
 //
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 3c4d42e6f8..317bcea87b 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -98,7 +98,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 			$array[$name] = "";
 			$eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
 			eval($eval);
-			OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><BR><BR>");
+			OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><br /><br />");
 		}
 	}
 
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 8247227d1a..cf44c26d78 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -65,7 +65,7 @@ function alpha($sortby, $colspan, $return=false)
 		}
 		if ((($counter / $CONFIG['user_alpha']) == round($counter / $CONFIG['user_alpha'])) && ($counter > 0))
 		{
-			$OUT .= "&nbsp;]<BR>[&nbsp;";
+			$OUT .= "&nbsp;]<br />[&nbsp;";
 		}
 		 elseif ( $counter != $num )
 		{
diff --git a/inc/load_cache.php b/inc/load_cache.php
index 69aec9887b..0f22199809 100644
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -32,42 +32,35 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // Let's start with the admins table...
-if (($CACHE->cache_file("admins", true) == true))
-{
+if (($CACHE->cache_file("admins", true) == true)) {
 	// Load cache
 	global $ADMINS;
 	$ADMINS = $CACHE->cache_load();
 
 	// Check if valid
-	if (is_array($ADMINS['login']) && is_array($ADMINS['def_acl']) && is_array($ADMINS['aid']))
-	{
+	if ((is_array($ADMINS['login'])) && (is_array($ADMINS['aid']))) {
 		// Check count
-		if (count($ADMINS['login']) == count($ADMINS['aid']) && count($ADMINS['login']) == count($ADMINS['def_acl']) && count($ADMINS['aid']) == count($ADMINS['def_acl']))
-		{
+		if (count($ADMINS['login']) == count($ADMINS['aid'])) {
 			//* DEBUG: */ echo "<PRE>";
 			//* DEBUG: */ print_r($ADMINS);
 
 			// The cache file seems to be fine
-			foreach ($ADMINS['login'] as $k=>$login)
-			{
+			foreach ($ADMINS['login'] as $k=>$login) {
 				// Rewrite default_acl
 				$ADMINS['aid'][$login]      = $ADMINS['aid'][$k];
 				$ADMINS['password'][$login] = $ADMINS['password'][$k];
 				$ADMINS['email'][$login]    = $ADMINS['email'][$k];
 
 				// Some extra data depening on version
-				if (GET_EXT_VERSION("admins") >= "0.3")
-				{
+				if (GET_EXT_VERSION("admins") >= "0.3") {
 					$ADMINS['def_acl'][$login]  = $ADMINS['def_acl'][$k];
-					if (GET_EXT_VERSION("admins") >= "0.6.7")
-					{
+					if (GET_EXT_VERSION("admins") >= "0.6.7") {
 						$ADMINS['la_mode'][$login]  = $ADMINS['la_mode'][$k];
 					}
 				}
@@ -85,11 +78,9 @@ if (($CACHE->cache_file("admins", true) == true))
 			//* DEBUG: */ print_r($ADMINS);
 
 			// Rewrite Login
-			foreach ($ADMINS['login'] as $k=>$login)
-			{
+			foreach ($ADMINS['login'] as $k=>$login) {
 				$ADMINS['login'][$ADMINS['aid'][$login]] = $login;
-				if (!in_array($k, $ADMINS['aid']))
-				{
+				if (!in_array($k, $ADMINS['aid'])) {
 					unset($ADMINS['login'][$k]);
 				}
 			}
@@ -98,22 +89,16 @@ if (($CACHE->cache_file("admins", true) == true))
 			//* DEBUG: */ print_r($ADMINS);
 			//* DEBUG: */ echo "</PRE>";
 			//* DEBUG: */ die();
-		}
-		 else
-		{
+		} else {
 			// Nope, cache file is corrupted!
 			$CACHE->cache_destroy();
 		}
-	}
-	 else
-	{
+	} else {
 		// Nope, cache file is corrupted!
 		$CACHE->cache_destroy();
 		unset($ADMINS);
 	}
-}
- elseif (($CONFIG['cache_admins'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-{
+} elseif (($CONFIG['cache_admins'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file
 	$CACHE->cache_init("ADMINS");
 
@@ -122,11 +107,11 @@ if (($CACHE->cache_file("admins", true) == true))
 	if (GET_EXT_VERSION("admins") >= "0.3")   $ADD  = ", default_acl AS def_acl";
 	if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
 
+	// Query the database about this
 	$result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
 FROM "._MYSQL_PREFIX."_admins
 ORDER BY login", __FILE__, __LINE__);
-	while($dummy = SQL_FETCHARRAY($result_admins))
-	{
+	while($dummy = SQL_FETCHARRAY($result_admins)) {
 		// Save row
 		$CACHE->add_row($dummy);
 	}
@@ -139,16 +124,14 @@ ORDER BY login", __FILE__, __LINE__);
 $CACHE->cache_close();
 
 // Next cached table is the module registry (mod_reg)...
-if ($CACHE->cache_file("mod_reg", true) == true)
-{
+if ($CACHE->cache_file("mod_reg", true) == true) {
 	// Load cache
 	global $MODULES;
 	$MODULES = $CACHE->cache_load();
 
 	// Valid cache file
 	$CNT = 0;
-	foreach ($MODULES as $k=>$array)
-	{
+	foreach ($MODULES as $k=>$array) {
 		$CNT += count($array);
 	}
 
@@ -156,18 +139,14 @@ if ($CACHE->cache_file("mod_reg", true) == true)
 	// damaged/corrupted
 	$TEST = "failed";
 	if (count($MODULES) > 0 ) $TEST = ($CNT / (count($MODULES)));
-	if ($TEST != bigintval($TEST))
-	{
+	if ($TEST != bigintval($TEST)) {
 		// Cache file is corrupted!
 		$CACHE->cache_destroy();
 		unset($MODULES);
-	}
-	 else
-	{
+	} else {
 		// Rewrite module cache
 		$MOD = $MODULES;
-		foreach ($MODULES['module'] as $key=>$mod)
-		{
+		foreach ($MODULES['module'] as $key=>$mod) {
 			$MODULES['id'][$mod] = $MODULES['id'][$key];
 			unset($MODULES['id'][$key]);
 			$MODULES['title'][$mod] = $MODULES['title'][$key];
@@ -184,27 +163,21 @@ if ($CACHE->cache_file("mod_reg", true) == true)
 			unset($MODULES['has_menu'][$key]);
 		}
 	}
-}
- elseif (($CONFIG['cache_modreg'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-{
+} elseif (($CONFIG['cache_modreg'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
 	$CACHE->cache_init("MODULES");
 
 	// Load all modules and their data
-	if (GET_EXT_VERSION("sql_patches") >= "0.3.6")
-	{
+	if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 		// Load has_menu
 		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
 FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
-	}
-	 else
-	{
+	} else {
 		// Don't load has_menu
 		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only
 FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
 	}
-	while ($DATA = SQL_FETCHARRAY($result))
-	{
+	while ($DATA = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$CACHE->add_row($DATA);
 	}
@@ -217,16 +190,14 @@ FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
 $CACHE->cache_close();
 
 // Next cached table is the configuration (config)...
-if ($CACHE->cache_file("config", true) == true)
-{
+if ($CACHE->cache_file("config", true) == true) {
 	// Load config from cache
 	global $CFG_CACHE;
 	$CFG_CACHE = $CACHE->cache_load();
 
 	// Valid cache file
 	$CNT = 0;
-	foreach ($CFG_CACHE as $k=>$array)
-	{
+	foreach ($CFG_CACHE as $k=>$array) {
 		$CNT += count($array);
 	}
 
@@ -234,22 +205,18 @@ if ($CACHE->cache_file("config", true) == true)
 	// damaged/corrupted
 	$TEST = "failed";
 	if (count($CFG_CACHE) > 0 ) $TEST = ($CNT / (count($CFG_CACHE)));
-	if ($TEST != bigintval($TEST))
-	{
+	if ($TEST != bigintval($TEST)) {
 		// Cache file is corrupted!
 		$CACHE->cache_destroy();
 		unset($CFG_CACHE);
 	}
-}
- elseif (($CONFIG['cache_config'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-{
+} elseif (($CONFIG['cache_config'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
 	$CACHE->cache_init("CONFIG");
 
 	// Load all modules and their data
 	$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHARRAY($result))
-	{
+	while ($DATA = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$CACHE->add_row($DATA);
 	}
@@ -262,16 +229,14 @@ if ($CACHE->cache_file("config", true) == true)
 $CACHE->cache_close();
 
 // Next cached table is the referral system (refsystem)...
-if ($CACHE->cache_file("refsystem", true) == true)
-{
+if ($CACHE->cache_file("refsystem", true) == true) {
 	// Load referral system from cache
 	global $REF_SYSTEM;
 	$REF_SYSTEM = $CACHE->cache_load();
 
 	// Valid cache file
 	$CNT = 0;
-	foreach ($REF_SYSTEM as $k=>$array)
-	{
+	foreach ($REF_SYSTEM as $k=>$array) {
 		$CNT += count($array);
 	}
 
@@ -279,22 +244,18 @@ if ($CACHE->cache_file("refsystem", true) == true)
 	// damaged/corrupted
 	$TEST = "failed";
 	if (count($REF_SYSTEM) > 0 ) $TEST = ($CNT / (count($REF_SYSTEM)));
-	if ($TEST != bigintval($TEST))
-	{
+	if ($TEST != bigintval($TEST)) {
 		// Cache file is corrupted!
 		$CACHE->cache_destroy();
 		unset($REF_SYSTEM);
 	}
-}
- elseif (($CONFIG['cache_refsys'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-{
+} elseif (($CONFIG['cache_refsys'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
 	$CACHE->cache_init("REFSYSTEM");
 
 	// Load all modules and their data
 	$result = SQL_QUERY("SELECT id, userid, level, counter FROM "._MYSQL_PREFIX."_refsystem ORDER BY userid, level", __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHARRAY($result))
-	{
+	while ($DATA = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$CACHE->add_row($DATA);
 	}
@@ -307,16 +268,14 @@ if ($CACHE->cache_file("refsystem", true) == true)
 $CACHE->cache_close();
 
 // Next cached table is the referral system (refdepths)...
-if ($CACHE->cache_file("refdepths", true) == true)
-{
+if ($CACHE->cache_file("refdepths", true) == true) {
 	// Load referral system from cache
 	global $REF_DEPTHS;
 	$REF_DEPTHS = $CACHE->cache_load();
 
 	// Valid cache file
 	$CNT = 0;
-	foreach ($REF_DEPTHS as $k=>$array)
-	{
+	foreach ($REF_DEPTHS as $k=>$array) {
 		$CNT += count($array);
 	}
 
@@ -324,22 +283,18 @@ if ($CACHE->cache_file("refdepths", true) == true)
 	// damaged/corrupted
 	$TEST = "failed";
 	if (count($REF_DEPTHS) > 0 ) $TEST = ($CNT / (count($REF_DEPTHS)));
-	if ($TEST != bigintval($TEST))
-	{
+	if ($TEST != bigintval($TEST)) {
 		// Cache file is corrupted!
 		$CACHE->cache_destroy();
 		unset($REF_DEPTHS);
 	}
-}
- elseif (($CONFIG['cache_refdepth'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-{
+} elseif (($CONFIG['cache_refdepth'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
 	$CACHE->cache_init("REFDEPTHS");
 
 	// Load all modules and their data
 	$result = SQL_QUERY("SELECT id, level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHARRAY($result))
-	{
+	while ($DATA = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
 		$CACHE->add_row($DATA);
 	}
@@ -352,45 +307,37 @@ if ($CACHE->cache_file("refdepths", true) == true)
 $CACHE->cache_close();
 
 // Next cached table is the referral system (admins_acls)...
-if (GET_EXT_VERSION("admins") >= "0.3")
-{
+if (GET_EXT_VERSION("admins") >= "0.3") {
 	// Check for cache file
-	if ($CACHE->cache_file("admins_acls", true) == true)
-	{
+	if ($CACHE->cache_file("admins_acls", true) == true) {
 		// Load referral system from cache
 		global $ADMINS_ACLS;
 		$ADMINS_ACLS = $CACHE->cache_load();
 
 		// Valid cache file
 		$CNT = 0;
-		foreach ($ADMINS_ACLS as $k=>$array)
-		{
+		foreach ($ADMINS_ACLS as $k=>$array) {
 			$CNT += count($array);
 		}
 
 		// When there is a period (.) in the result this test will fail and so the cache file is
 		// damaged/corrupted
-		if (count($ADMINS_ACLS) > 0)
-		{
+		if (count($ADMINS_ACLS) > 0) {
 			$TEST = "failed";
 			if (count($ADMINS_ACLS) > 0 ) $TEST = ($CNT / (count($ADMINS_ACLS)));
-			if ($TEST != bigintval($TEST))
-			{
+			if ($TEST != bigintval($TEST)) {
 				// Cache file is corrupted!
 				$CACHE->cache_destroy();
 				unset($ADMINS_ACLS);
 			}
 		}
-	}
-	 elseif (($CONFIG['cache_acls'] == 'Y') && ($CSS != "1") && ($CSS != "-1"))
-	{
+	} elseif (($CONFIG['cache_acls'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
 		// Create cache file here
 		$CACHE->cache_init("ADMINS_ACLS");
 
 		// Load all modules and their data
 		$result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
-		while ($DATA = SQL_FETCHARRAY($result))
-		{
+		while ($DATA = SQL_FETCHARRAY($result)) {
 			// Add row to cache file
 			$CACHE->add_row($DATA);
 		}
diff --git a/inc/modules/admin/action-logout.php b/inc/modules/admin/action-logout.php
index 1fefc2a0af..e389d58b88 100644
--- a/inc/modules/admin/action-logout.php
+++ b/inc/modules/admin/action-logout.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><br /><br />");
 
 if (!empty($_POST['no']))
 {
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 6efa17c259..db3e3b30d3 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -86,7 +86,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 		}
 	}
 
-	//* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<BR>";
+	//* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<br />";
 	if ((strlen($pass) == 32) && ($pass == md5($password)))
 	{
 		// Generate new hash
@@ -151,7 +151,7 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password)
 		}
 	}
 
-	//* DEBUG: */ echo "*".$pass."/".$password."<BR>";
+	//* DEBUG: */ echo "*".$pass."/".$password."<br />";
 
 	// Check if password matches
 	if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password)))
@@ -169,10 +169,10 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 	{
 		$search = "CFG: ".$comment;
 		$tmp = $file.".tmp";
-		$fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<BR>");
+		$fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
 		if ($fp)
 		{
-			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
 			if ($fp_tmp)
 			{
 				while (! feof($fp))
@@ -219,7 +219,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 	}
 	 else
 	{
-		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
+		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
 	}
 }
 //
@@ -672,7 +672,7 @@ function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user")
 		return $title;
 	}
 
-	//* DEBUG: */ echo "A:".$title."<BR>";
+	//* DEBUG: */ echo "A:".$title."<br />";
 	// Return link
 	return "<A href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
 }
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 2a3ac6f0de..2b1556bafc 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -260,7 +260,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
 					if (empty($title)) $title = "";
 					if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == 'Y')) {
 						// Add verbose SQL table
-						$text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."<BR>\n";
+						$text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."<br />\n";
 					}
 				}
 				 else
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 3a039943e7..761e902496 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 
 // List all menu points and make them editable
-OUTPUT_HTML("<BR><BR></FONT>
+OUTPUT_HTML("<br /><br /></FONT>
 <DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 1ed0fe9d81..724d2ae12b 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -68,7 +68,7 @@ if (isset($_POST['edit']))
 					$OUT .= ">".ADMINS_TO_USERLOG."</OPTION>\n";
 				}
 				$OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
-				$OUT .= "</SELECT><BR>\n";
+				$OUT .= "</SELECT><br />\n";
 				$aid2 = $aid; $id2 = $id;
 			}
 
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 22d2bef91e..b0785007ea 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -83,7 +83,7 @@ if (isset($_POST['edit']))
 	{
 		// Nothing selected
 		LOAD_TEMPLATE("admin_settings_saved", false, MODS_NOTHING_SELECTED);
-		OUTPUT_HTML("<BR>");
+		OUTPUT_HTML("<br />");
 
 		// Remove maybe confusing data
 		unset($_POST['edit']);
@@ -111,7 +111,7 @@ if (isset($_POST['edit']))
 
 	// Entries updated
 	LOAD_TEMPLATE("admin_settings_saved", false, MODS_CHANGED);
-	OUTPUT_HTML("<BR>");
+	OUTPUT_HTML("<br />");
 }
 
 if ($SEL == 0)
diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php
index edef52bfd7..ed8e7187fa 100644
--- a/inc/modules/admin/what-del_task.php
+++ b/inc/modules/admin/what-del_task.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 }
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><br /><br />");
 
 //
 ?>
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 0fbd32f90c..1b30be74b6 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -160,56 +160,56 @@ if (SQL_NUMROWS($result_list) > 0)
 		// List mail
 		OUTPUT_HTML("<TR>
   <TD class=\"bottom top2 right\" width=\"23%\" align=\"center\">
-    ".EMAIL_SENDER.":<BR>
+    ".EMAIL_SENDER.":<br />
     <STRONG class=\"admin_misc\">".ADMIN_USER_PROFILE_LINK($pool[1])."</STRONG>
   </TD>
   <TD class=\"bottom top2 right\" width=\"23%\" align=\"center\">
-    ".EMAIL_SUBJECT.":<BR>
+    ".EMAIL_SUBJECT.":<br />
     <STRONG class=\"admin_misc\">".COMPILE_CODE($pool[2])."</STRONG>
   </TD>
   <TD class=\"bottom top2\" width=\"54%\" align=\"center\">
-    ".EMAIL_TEXT.":<BR>
+    ".EMAIL_TEXT.":<br />
     <STRONG class=\"admin_misc\">".COMPILE_CODE($pool[3])."</STRONG>
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD colspan=\"2\" align=\"center\" class=\"top bottom right\">
-    ".EMAIL_PAYMENT.":<BR>
+    ".EMAIL_PAYMENT.":<br />
     <STRONG class=\"admin_misc\">".GET_PAYMENT($pool[5])."
   </TD>
   <TD align=\"center\" class=\"top bottom\">
-    ".EMAIL_CATEGORY.":<BR>
+    ".EMAIL_CATEGORY.":<br />
     <STRONG class=\"admin_misc\">".GET_CATEGORY($pool[10])."
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD align=\"center\" class=\"top bottom right\">
-    ".EMAIL_RECEIVERS.":<BR>
+    ".EMAIL_RECEIVERS.":<br />
     <STRONG class=\"admin_misc\">".$sent."</STRONG> (".EMAIL_RUIDS.": <STRONG class=\"admin_misc\">".str_replace(";", ", ", $pool[4])."</STRONG>)
   </TD>
   <TD align=\"center\" class=\"top bottom right\">
-    ".USERS_LINKS.":<BR>
+    ".USERS_LINKS.":<br />
     <STRONG class=\"admin_misc\">".$unconfirmed."</STRONG>
   </TD>
   <TD align=\"center\" class=\"top bottom\">
-    ".EMAIL_POOL_TYPE.":<BR>
+    ".EMAIL_POOL_TYPE.":<br />
     <STRONG class=\"admin_misc\">".GET_POOL_TYPE($pool[6])."</STRONG>
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD align=\"center\" class=\"top right\">
-    ".EMAIL_TSEND.":<BR>
+    ".EMAIL_TSEND.":<br />
     <STRONG class=\"admin_misc\">".$pool[9]."</STRONG>
   </TD>
   <TD align=\"center\" class=\"top right\">
-    ".EMAIL_URL.":<BR>
+    ".EMAIL_URL.":<br />
     <STRONG class=\"admin_misc\"><A href=\"".FRAMETESTER($pool[8])."\" target=\"_blank\">".EMAIL_URL_TEST."</A></STRONG>
   </TD>
   <TD align=\"center\" class=\"top\">
-    ".EMAIL_TIMESTAMP.":<BR>
+    ".EMAIL_TIMESTAMP.":<br />
     <STRONG class=\"admin_misc\">".MAKE_DATETIME($pool[7], "0")."</STRONG>
   </TD>
 </TR>
@@ -233,7 +233,7 @@ if (SQL_NUMROWS($result_list) > 0)
 	if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
 	{
 		// Check only if bonus extension is active
-		if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("<BR><BR>");
+		if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("<br /><br />");
 	}
 }
 
@@ -269,56 +269,56 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
 
 			OUTPUT_HTML("<TR>
   <TD class=\"bottom top2 right\" colspan=\"2\" width=\"46%\" align=\"center\">
-    ".EMAIL_SUBJECT.":<BR>
+    ".EMAIL_SUBJECT.":<br />
     <STRONG class=\"admin_misc\">".$bonus[1]."</STRONG>
   </TD>
   <TD class=\"bottom top2\" width=\"54%\" align=\"center\">
-    ".EMAIL_TEXT.":<BR>
+    ".EMAIL_TEXT.":<br />
     <STRONG class=\"admin_misc\">".$bonus[2]."</STRONG>
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD align=\"center\" class=\"top bottom right\" width=\"23%\">
-    ".EMAIL_POINTS.":<BR>
+    ".EMAIL_POINTS.":<br />
     <STRONG class=\"admin_misc\">".$bonus[4]." ".POINTS."
   </TD>
   <TD align=\"center\" class=\"top bottom right\" width=\"23%\">
-    ".EMAIL_SECONDS.":<BR>
+    ".EMAIL_SECONDS.":<br />
     <STRONG class=\"admin_misc\">".$bonus[5]." ".SECS."
   </TD>
   <TD align=\"center\" class=\"top bottom\">
-    ".EMAIL_CATEGORY.":<BR>
+    ".EMAIL_CATEGORY.":<br />
     <STRONG class=\"admin_misc\">".GET_CATEGORY($bonus[9])."
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD align=\"center\" class=\"top bottom right\">
-    ".EMAIL_RECEIVERS.":<BR>
+    ".EMAIL_RECEIVERS.":<br />
     <STRONG class=\"admin_misc\">".$bonus[11]."</STRONG> (".EMAIL_RUIDS.": <STRONG class=\"admin_misc\">".str_replace(";", ", ", $bonus[3])."</STRONG>)
   </TD>
   <TD align=\"center\" class=\"top bottom right\">
-    ".USERS_LINKS.":<BR>
+    ".USERS_LINKS.":<br />
     <STRONG class=\"admin_misc\">".$unconfirmed."</STRONG>
   </TD>
   <TD align=\"center\" class=\"top bottom\">
-    ".EMAIL_POOL_TYPE.":<BR>
+    ".EMAIL_POOL_TYPE.":<br />
     <STRONG class=\"admin_misc\">".GET_POOL_TYPE($bonus[6])."</STRONG>
   </TD>
 </TR>
 <TR><TD height=\"5\" colspan=\"3\"></TD></TR>
 <TR>
   <TD align=\"center\" class=\"top right\">
-    ".EMAIL_TSEND.":<BR>
+    ".EMAIL_TSEND.":<br />
     <STRONG class=\"admin_misc\">".$bonus[10]."</STRONG>
   </TD>
   <TD align=\"center\" class=\"top right\">
-    ".EMAIL_URL.":<BR>
+    ".EMAIL_URL.":<br />
     <STRONG class=\"admin_misc\"><A href=\"".FRAMETESTER($bonus[8])."\" target=\"_blank\">".EMAIL_URL_TEST."</A></STRONG>
   </TD>
   <TD align=\"center\" class=\"top\">
-    ".EMAIL_TIMESTAMP.":<BR>
+    ".EMAIL_TIMESTAMP.":<br />
     <STRONG class=\"admin_misc\">".MAKE_DATETIME($bonus[7], "0")."</STRONG>
   </TD>
 </TR>
diff --git a/inc/modules/admin/what-email_stats.php b/inc/modules/admin/what-email_stats.php
index 5612fce7de..1cffc67e0f 100644
--- a/inc/modules/admin/what-email_stats.php
+++ b/inc/modules/admin/what-email_stats.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 }
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 CLOSE_TABLE();
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index ce0ccaaaf5..bfad063c37 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -277,7 +277,7 @@ case "overview": // List all registered extensions
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
 	}
 	// Link for checking for new or updated extensions
-	OUTPUT_HTML("<BR><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
+	OUTPUT_HTML("<br /><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
 	break;
 
 case "register": // Register new extension
diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 460cbb0e81..414d847ce0 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 }
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 5643bc183c..da93679254 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 // List all menu points and make them editable
-OUTPUT_HTML("<BR><BR></FONT>
+OUTPUT_HTML("<br /><br /></FONT>
 <DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
diff --git a/inc/modules/admin/what-holiday_list.php b/inc/modules/admin/what-holiday_list.php
index 6446e9a8ea..5d22e1054b 100644
--- a/inc/modules/admin/what-holiday_list.php
+++ b/inc/modules/admin/what-holiday_list.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 }
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><br /><br />");
 
 //
 ?>
diff --git a/inc/modules/admin/what-holiday_remove.php b/inc/modules/admin/what-holiday_remove.php
index fe6cddb34a..e90501e69d 100644
--- a/inc/modules/admin/what-holiday_remove.php
+++ b/inc/modules/admin/what-holiday_remove.php
@@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 }
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><br /><br />");
 
 //
 ?>
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 8453ffe978..dd3ad3dfb2 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -51,7 +51,7 @@ if ($CONFIG['beg_rallye'] == 'Y')
 		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET beg_month='%s' WHERE config='0' LIMIT 1",
 		 array($curr), __FILE__, __LINE__);
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_WITHDRAW_PREPARED);
-		OUTPUT_HTML("<BR>");
+		OUTPUT_HTML("<br />");
 	}
 
 	// Autopurge installed?
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index a4c6c97535..66038f6020 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -51,7 +51,7 @@ if ($CONFIG['bonus_active'] == 'Y')
 		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET last_bonus_month='%s' WHERE config='0' LIMIT 1",
 		 array($curr), __FILE__, __LINE__);
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
-		OUTPUT_HTML("<BR>");
+		OUTPUT_HTML("<br />");
 	}
 
 	if (GET_EXT_VERSION("bonus") >= "0.6.9")
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 4a54818168..d694fdf927 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -68,7 +68,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
 
 	// Display message
 	LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-	OUTPUT_HTML("<BR>");
+	OUTPUT_HTML("<br />");
 }
 // Change status?
  elseif ((isset($_POST['change'])) && (!empty($_POST['id'])))
@@ -182,7 +182,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
 
 		// Display message
 		LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-		OUTPUT_HTML("<BR>");
+		OUTPUT_HTML("<br />");
 	}
 
 	// Load currenty setup country codes to list
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 84016ea790..157025c55d 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -165,7 +165,7 @@ if (!empty($_GET['pid']))
 					 else
 					{
 						// Something goes wrong... :-(
-						$content = implode("<BR>", $ret);
+						$content = implode("<br />", $ret);
 						LOAD_TEMPLATE("admin_payout_failed_transfer", false, $content);
 					}
 				}
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 18d8b63cd5..f8f809a166 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -240,7 +240,7 @@ if (isset($_POST['edit']))
 			if (($old > 0) || ($cnt > 0))
 			{
 				// Insert link to referral list
-				//* DEBUG: */ echo "-".$uid."/".$cnt."/".$old."-<BR>";
+				//* DEBUG: */ echo "-".$uid."/".$cnt."/".$old."-<br />";
 				$cnt = ADMIN_USER_PROFILE_LINK($uid, $cnt, "list_refs");
 				$old = ADMIN_USER_PROFILE_LINK($uid, $old, "list_refs");
 			}
diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index 3ecc0c7e86..29b0b1ca78 100644
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -73,7 +73,7 @@ if (!empty($_GET['u_id']))
 		$result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%d ORDER BY userid",
 		 array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
-		OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<BR><BR>");
+		OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<br /><br />");
 		if ($result)
 		{
 			$rows = SQL_NUMROWS($result);
diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 766509afde..d420e0b8d4 100644
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 }
 // Add desciption as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index b380436a97..a29ac3692b 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 // List all menu points and make them editable
-OUTPUT_HTML("<BR><BR></FONT>
+OUTPUT_HTML("<br /><br /></FONT>
 <DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 3bd1ce95bf..0e3ec8ebdf 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -78,7 +78,7 @@ VALUES ('%s', 'N', '%s')",
 
 	// Output message
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-	OUTPUT_HTML("<BR>");
+	OUTPUT_HTML("<br />");
 }
 
 // Initialize array
diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php
index a7f4aca9ca..502a538e9e 100644
--- a/inc/modules/admin/what-user_online.php
+++ b/inc/modules/admin/what-user_online.php
@@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR><BR>");
+OUTPUT_HTML("</FONT><br /><br />");
 
 // Count guests, members and admins
 $result_guests  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
@@ -70,7 +70,7 @@ OUTPUT_HTML("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"cen
   <TD width=\"5%\">&nbsp;</TD>
   <TD width=\"10%\"><B>".SQL_NUMROWS($result_admins)."</B></TD>
 </TR>
-</TABLE><BR>");
+</TABLE><br />");
 
 $result = SQL_QUERY("SELECT id, ip, userid, refid, module, action, what, is_member, is_admin, timestamp FROM "._MYSQL_PREFIX."_online ORDER by timestamp DESC", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0)
diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 8bf1a9c3f0..05522c4247 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 OPEN_TABLE("500", "guest_login_header dashed", "center");
 
-OUTPUT_HTML("<BR><STRONG>".VALIDATING_LOGIN."</STRONG><BR>");
+OUTPUT_HTML("<br /><STRONG>".VALIDATING_LOGIN."</STRONG><br />");
 
 if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE['lifetime']))
 {
diff --git a/inc/modules/frameset.php b/inc/modules/frameset.php
deleted file mode 100644
index 652a3cb303..0000000000
--- a/inc/modules/frameset.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/************************************************************************
- * MXChange v0.2.1                                    Start: 10/09/2003 *
- * ===============                              Last change: 02/27/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : frameset.php                                     *
- * -------------------------------------------------------------------- *
- * Short description : Frameset page                                    *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Frameset-Seite                                   *
- * -------------------------------------------------------------------- *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
-
-// When the frameset is not active redirect the user as well :)
-if (!frameset_active)
-{
-	LOAD_URL(URL."/modules.php?module=index");
-}
-//
-?>
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index e0e3ca9b3e..9537fe5090 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -357,51 +357,51 @@ array(
 {
 	if ($_POST['agree'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><br /><br />");
 	}
 	if ($_POST['addy'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><br /><br />");
 		$_POST['addy'] = "";
 	}
 	 elseif ($_POST['addy'] == "?")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><br /><br />");
 		$_POST['addy'] = "";
 	}
 	if ($_POST['surname'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><br /><br />");
 		$_POST['surname'] = "";
 	}
 	if ($_POST['family_name'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><br /><br />");
 		$_POST['family_name'] = "";
 	}
 	if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!"))
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><br /><br />");
 	}
 	 elseif ($_POST['pass1'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><br /><br />");
 	}
 	 elseif ($_POST['pass2'] == "!")
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><br /><br />");
 	}
 	if ($SHORT_PASS)
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".$CONFIG['pass_len']."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".$CONFIG['pass_len']."</SPAN></STRONG><br /><br />");
 	}
 	if ($IP_TIMEOUT)
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><br /><br />");
 	}
 	if ((!empty($cats)) && ($cats < $CONFIG['least_cats']))
 	{
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".$CONFIG['least_cats']."</SPAN></STRONG><BR><BR>");
+		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".$CONFIG['least_cats']."</SPAN></STRONG><br /><br />");
 	}
 
 	// Generate birthday selection
diff --git a/inc/modules/index.php b/inc/modules/index.php
index 7a3af51f11..24290647b8 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -32,23 +32,14 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif (!EXT_IS_ACTIVE("sql_patches", true))
-{
+} elseif (!EXT_IS_ACTIVE("sql_patches", true)) {
 	// The extension "sql_patches" *MUST* be activated or you have lot's of problems!
 	LOAD_URL(URL."/modules.php?module=admin");
 }
 
-// When the frameset is active redirect the user :)
-if (frameset_active)
-{
-	LOAD_URL(URL."/modules.php?module=frameset");
-}
-
 // Load adverstising template
 define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
 
@@ -56,8 +47,7 @@ define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
 LOAD_TEMPLATE("guest_header");
 
 // Add message here
-if (!empty($_GET['msg']))
-{
+if (!empty($_GET['msg'])) {
 	switch ($_GET['msg'])
 	{
 		case CODE_LOGOUT_DONE      : $msg = LOGOUT_DONE; break;
diff --git a/inc/modules/login.php b/inc/modules/login.php
index 5fa5aaf438..79bf0066ca 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -114,7 +114,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
 
 if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
-	OUTPUT_HTML("  <BR></TD>
+	OUTPUT_HTML("  <br /></TD>
 </TR>
 <TR>
   <TD align=\"center\" valign=\"top\" class=\"member_advert\">");
diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index fbceeeb4da..67bbd992eb 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 // Add description as navigation point
 ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 // Autopurge installed?
 $LAST = "%s"; $ONLINE = "";
diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 00faebcc6b..d6acff68c9 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 // Add description as navigation point
 ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 if (GET_EXT_VERSION("bonus") >= "0.6.9")
 {
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index ed6a17bead..c1ccf0f0db 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -572,8 +572,8 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					$SEC = $CONFIG['url_tlock'] - $STD * 60 * 60 - $MIN * 60;
 
 					// Finally contruct the message
-					$MSG = MEMBER_URL_TIME_LOCK."<BR>".CONFIG_URL_TLOCK." ".$STD." ".
-						HOURS.", ".$MIN." ".MINS." "._AND." ".$SEC." ".SECS."<BR>".
+					$MSG = MEMBER_URL_TIME_LOCK."<br />".CONFIG_URL_TLOCK." ".$STD." ".
+						HOURS.", ".$MIN." ".MINS." "._AND." ".$SEC." ".SECS."<br />".
 						MEMBER_LAST_TLOCK.": ".$LORDER;
 					break;
 
@@ -590,7 +590,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					break;
 
 				case CODE_BLIST_URL:
-					$MSG = MEMBER_URL_BLACK_LISTED."<BR>
+					$MSG = MEMBER_URL_BLACK_LISTED."<br />
 ".MEMBER_BLIST_TIME.": ".MAKE_DATETIME($_GET['blist'], "0");
 					break;
 
diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index aa1ceba425..d79060ef56 100644
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -54,9 +54,9 @@ $result = SQL_QUERY_ESC("SELECT ref_clicks FROM "._MYSQL_PREFIX."_user_data WHER
 list($c) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
-OUTPUT_HTML("<FONT class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<BR>
-<STRONG><A href=\"".URL."/ref.php?ref=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</A></STRONG><BR>
-<BR>");
+OUTPUT_HTML("<FONT class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<br />
+<STRONG><A href=\"".URL."/ref.php?ref=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</A></STRONG><br />
+<br />");
 
 if (EXT_IS_ACTIVE("nickname"))
 {
@@ -66,20 +66,20 @@ if (EXT_IS_ACTIVE("nickname"))
 	if (!empty($nick))
 	{
 		// Display nickname link
-		OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<BR>
-<STRONG><A href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</A></STRONG><BR>
-<BR>");
+		OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<br />
+<STRONG><A href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</A></STRONG><br />
+<br />");
 	}
 	 else
 	{
 		// Display link to nickname form
-		OUTPUT_HTML("<STRONG class=\"guest_note\">".NO_NICKNAME_SET."</STRONG><BR>
+		OUTPUT_HTML("<STRONG class=\"guest_note\">".NO_NICKNAME_SET."</STRONG><br />
 <A class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</A>");
 	}
 }
 
 // Clicks on your reflink
-OUTPUT_HTML(YOUR_REFCLICKS.": <STRONG>".$c."</STRONG> ".CLICKS."</FONT><BR><BR>");
+OUTPUT_HTML(YOUR_REFCLICKS.": <STRONG>".$c."</STRONG> ".CLICKS."</FONT><br /><br />");
 $WHERE = " WHERE visible='Y'";
 if (IS_ADMIN()) $WHERE = "";
 $result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM "._MYSQL_PREFIX."_refbanner", __FILE__, __LINE__);
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 13386b10d4..5274b2b08d 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -235,7 +235,7 @@ case "new": // Start new transfer
 
 			// Transfer is completed
 			OUTPUT_HTML("<P>");
-			LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<BR><A href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</A>");
+			LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<br /><A href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</A>");
 			OUTPUT_HTML("</P>");
 		}
 		 elseif (!$valid_code)
diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php
index 71787b967f..50250d2b7a 100644
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -44,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 
 // Add description as navigation point
 ADD_DESCR ("member", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+OUTPUT_HTML("</FONT><br />");
 
 // Export data for template
 define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online']));
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index a2cb2579fa..562738fc29 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -79,9 +79,8 @@ function ADD_MODULE_TITLE($mod)
 	}
 	return $name;
 }
-//
-function CHECK_MODULE($mod)
-{
+// Check validity of a given module name (no file extension)
+function CHECK_MODULE($mod) {
 	// We need them now here...
 	global $MODULES, $CONFIG, $CACHE;
 
@@ -89,17 +88,15 @@ function CHECK_MODULE($mod)
 	$mod = preg_replace("/[^a-z_]/", "", $mod);
 
 	// Check for prefix is a extension...
-	$MOD_SPLIT = explode("_", $mod);
+	$modSplit = explode("_", $mod);
 	$extension = ""; $mod_chk = $mod;
-	//* DEBUG: */ echo __LINE__."*".count($MOD_SPLIT)."*/".$mod."*<BR>";
-	if (count($MOD_SPLIT) == 2)
-	{
+	//* DEBUG: */ echo __LINE__."*".count($modSplit)."*/".$mod."*<br />";
+	if (count($modSplit) == 2) {
 		// Okay, there is a seperator (_) in the name so is the first part a module?
-		//* DEBUG: */ echo __LINE__."*".$MOD_SPLIT[0]."*<BR>";
-		if (EXT_IS_ACTIVE($MOD_SPLIT[0]))
-		{
+		//* DEBUG: */ echo __LINE__."*".$modSplit[0]."*<br />";
+		if (EXT_IS_ACTIVE($modSplit[0])) {
 			// The prefix is an extension's name, so let's set it
-			$extension = $MOD_SPLIT[0]; $mod = $MOD_SPLIT[1];
+			$extension = $modSplit[0]; $mod = $modSplit[1];
 		}
 	}
 
@@ -111,8 +108,7 @@ function CHECK_MODULE($mod)
 
 	// Check if cache is latest version
 	$locked = 'Y'; $hidden = 'N'; $admin = 'N'; $mem = 'N'; $found = false;
-	if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module'])))
-	{
+	if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module']))) {
 		// Is the module cached?
 		if (isset($MODULES['locked'][$mod_chk])) {
 			// Check cache
@@ -128,13 +124,10 @@ function CHECK_MODULE($mod)
 			// No, then we have to update it!
 			$ret = "cache_miss";
 		}
-	}
-	 else
-	{
+	} else {
 		// Check for module in database
 		$result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
 			// Read data
 			list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
@@ -145,33 +138,24 @@ function CHECK_MODULE($mod)
 	// Check returned values against current access permissions
 	//
 	//  Admin access            ----- Guest access -----           --- Guest   or   member? ---
-	if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_LOGGED_IN()))))
-	{
+	if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_LOGGED_IN())))) {
 		// If you are admin you are welcome for everything!
 		$ret = "done";
-	}
-	 elseif ($locked == 'Y')
-	{
+	} elseif ($locked == 'Y') {
 		// Module is locked
 		$ret = "locked";
-	}
-	 elseif (($mem == 'Y') && (!IS_LOGGED_IN()))
-	{
+	} elseif (($mem == 'Y') && (!IS_LOGGED_IN())) {
 		// You have to login first!
 		$ret = "mem_only";
-	}
-	 elseif (($admin == 'Y') && (!IS_ADMIN()))
-	{
+	} elseif (($admin == 'Y') && (!IS_ADMIN())) {
 		// Only the Admin is allowed to enter this module!
 		$ret = "admin_only";
 	}
 
 	// Still no luck or not found?
-	if (($ret == "major") || ($ret == "cache_miss") || (!$found))
-	{
+	if (($ret == "major") || ($ret == "cache_miss") || (!$found)) {
 		//         ----- Legacy module -----                      ---- Module in base folder  ----           --- Module with extension's name ---
-		if ((file_exists(PATH."inc/modules/".$mod.".php")) || (file_exists(PATH.$mod.".php")) || (file_exists(PATH.$extension."/".$mod.".php")))
-		{
+		if ((file_exists(PATH."inc/modules/".$mod.".php")) || (file_exists(PATH.$mod.".php")) || (file_exists(PATH.$extension."/".$mod.".php"))) {
 			// Data is missing so we add it
 			if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 				// Since 0.3.6 we have a has_menu column, this took me a half hour
@@ -212,14 +196,13 @@ function CHECK_MODULE($mod)
 	// Return the value
 	return $ret;
 }
-//
+// Add menu description pending on given file name (without path!)
 function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
 {
 	global $DEPTH, $CONFIG;
 	$LINK_ADD = ""; $OUT = ""; $AND = "";
 	// First we have to do some analysis...
-	if (ereg("action-", $file))
-	{
+	if (ereg("action-", $file)) {
 		// This is an action file!
 		$type = "action";
 		$search = substr($file, 7);
@@ -236,9 +219,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
 			break;
 		}
 		$AND = " AND what=''";
-	}
-	 elseif (ereg("what-", $file))
-	{
+	} elseif (ereg("what-", $file)) {
 		// This is an admin what file!
 		$type = "what";
 		$search = substr($file, 5);
@@ -252,84 +233,67 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
 		case "guest":
 		case "member":
 			$MOD_CHECK = $GLOBALS['module'];
-			if (!IS_ADMIN())
-			{
+			if (!IS_ADMIN()) {
 				$AND = " AND visible='Y' AND locked='N'";
 			}
 			break;
 		}
 		$DUMMY = substr($search, 0, -4);
 		$AND .= " AND action='".GET_ACTION($ACC_LVL, $DUMMY)."'";
-	}
-	 elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine"))
-	{
+	} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
 		// Sponsor / engine menu
 		$type = "what";
 		$search = $file;
 		$MOD_CHECK = $GLOBALS['module'];
 		$AND = "";
-	}
-	 else
-	{
+	} else {
 		// Other
 		$type = "menu";
 		$search = $file;
 		$MOD_CHECK = $GLOBALS['module'];
 		$AND = "";
 	}
-	if ((!isset($DEPTH)) && (!$return))
-	{
+	if ((!isset($DEPTH)) && (!$return)) {
 		$DEPTH = "0";
 		$prefix = "<DIV class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</A></STRONG>";
-	}
-	 else
-	{
+	} else {
 		if (!$return) $DEPTH++;
 		$prefix = "";
 	}
 	$prefix .= "&nbsp;-&gt;&nbsp;";
-	if (ereg(".php", $search))
-	{
+	if (ereg(".php", $search)) {
 		$search = substr($search, 0, strpos($search, ".php"));
 	}
 	$result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE %s='%s' ".$AND." LIMIT 1",
 	 array($ACC_LVL, $type, $search), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+	if (SQL_NUMROWS($result) == 1) {
 		list($ret) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		if ($return)
-		{
+		if ($return) {
 			// Return title
 			return $ret;
-		}
-		 elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin")))
-		{
+		} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) {
 			// Output HTML code
 			$OUT = $prefix."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$MOD_CHECK."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
 			//* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
 			if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) {
 				//* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
-				$OUT .= "</DIV><BR>\n";
+				$OUT .= "</DIV><br />\n";
 			}
 		}
 	}
 
 	// Return or output HTML code?
-	if ($output)
-	{
+	if ($output) {
 		// Output HTML code here
 		OUTPUT_HTML($OUT);
-	}
-	 else
-	{
+	} else {
 		// Return HTML code
 		return $OUT;
 	}
 }
 //
-function ADD_MENU($MODE, $act, $wht)
-{
+function ADD_MENU($MODE, $act, $wht) {
 	global $CONFIG;
 	if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) return CODE_MENU_NOT_VALID;
 	$main_cnt = 0; $AND = ""; $main_action = ""; $sub_what = "";
@@ -366,66 +330,41 @@ function ADD_MENU($MODE, $act, $wht)
 					//* DEBUG: */ echo __LINE__.":!!!!".$sub_what."!!!<br />\n";
 					$test_inc = sprintf("%sinc/modules/%s/what-%s.php", PATH, $MODE, $sub_what);
 					$test = (file_exists($test_inc) && is_readable($test_inc));
-					if ($test)
-					{
-						if ((!empty($wht)) && (($wht == $sub_what)))
-						{
+					if ($test) {
+						if ((!empty($wht)) && (($wht == $sub_what))) {
 							$content = "<STRONG>";
 						}
 
 						// Navigation link
-						$content .= "<A name=\"menu\" class=\"menu_blur\" href=\"".URL."/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\"";
-
-						if (frameset_active)
-						{
-							// We need to add a JavaScript here to reload both frames!
-						}
-						 else
-						{
-							// Add the default target _self
-							$content .= " target=\"_self\"";
-						}
-						$content .= ">";
-					}
-					 else
-					{
+						$content .= "<A name=\"menu\" class=\"menu_blur\" href=\"".URL."/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";
+					} else {
 						$content .= "<I>";
 					}
 
 					// Menu title
 					$content .= $CONFIG['middot'].$sub_title;
 
-					if ($test)
-					{
+					if ($test) {
 						$content .= "</A>";
-					}
-					 else
-					{
+					} else {
 						$content .= "</I>";
 					}
 
-					if ((!empty($wht)) && (($wht == $sub_what)))
-					{
+					if ((!empty($wht)) && (($wht == $sub_what))) {
 						$content .= "</STRONG>";
 					}
 					$wht = $sub_what; $cnt++;
-					if ($cnt < $ctl)
-					{
+					if ($cnt < $ctl) {
 						LOAD_TEMPLATE($MODE."_menu_row", false, $content);
-					}
-					 else
-					{
+					} else {
 						LOAD_TEMPLATE($MODE."_menu_bottom", false, $content);
 					}
 				}
-			}
-			 else
-			{
+			} else {
 				// This is a menu block... ;-)
 				$BLOCK_MODE = true;
 				$INC_BLOCK = sprintf(PATH."inc/modules/%s/action-%s.php", $MODE, $main_action);
-				if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK)))
-				{
+				if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK))) {
 					// Load include file
 					if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("<TR>
   <TD class=\"".$MODE."_menu_whats\">");
@@ -455,14 +394,14 @@ function IS_ADMIN($admin="")
 {
 	global $_COOKIE, $ADMINS, $CONFIG;
 	$ret = false; $passCookie = ""; $valPass = "";
-	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<BR>";
+	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
 
 	// If admin login is not given take current from cookies...
 	if ((empty($admin)) && (!empty($_COOKIE['admin_login'])) && (!empty($_COOKIE['admin_md5'])))
 	{
 		$admin = SQL_ESCAPE($_COOKIE['admin_login']); $passCookie = $_COOKIE['admin_md5'];
 	}
-	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."<BR>";
+	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."<br />";
 
 	// Search in array for entry
 	if ((!empty($passCookie)) && (isset($ADMINS['password'][$admin])) && (!empty($admin)))
@@ -1531,7 +1470,7 @@ function META_DESCRIPTION($mod, $wht)
 		// Exclude admin and member's area
 		$DESCR = MAIN_TITLE." ".trim($CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true);
 		unset($DEPTH);
-		OUTPUT_HTML("<META name=\"description\" content=\"".$DESCR."\">\n");
+		OUTPUT_HTML("<META name=\"description\" content=\"".$DESCR."\">");
 	}
 }
 //
diff --git a/inc/pool-update.php b/inc/pool-update.php
index 573af01bf9..fc71a8ae81 100644
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -97,7 +97,7 @@ if (SQL_NUMROWS($result_main) > 0)
 				 array(bigintval($uid)), __FILE__, __LINE__);
 
 				// Is his data available?
-				//* DEBUG: */ echo "*L:".__LINE__."/".SQL_NUMROWS($result_user)."*<BR>";
+				//* DEBUG: */ echo "*L:".__LINE__."/".SQL_NUMROWS($result_user)."*<br />";
 				if (SQL_NUMROWS($result_user) == 1)
 				{
 					// The final receiver does exists so we can continue...
@@ -111,7 +111,7 @@ if (SQL_NUMROWS($result_main) > 0)
 					 array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
 
 					// If there's no stats entry add it!
-					//* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<BR>";
+					//* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
 					if (SQL_NUMROWS($result_stats) == 0)
 					{
 						// No entry was found, so we add him!
@@ -123,7 +123,7 @@ if (SQL_NUMROWS($result_main) > 0)
 						 array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
 					}
 
-					//* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<BR>";
+					//* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
 					if (SQL_NUMROWS($result_stats) == 1)
 					{
 						// We got one!
@@ -131,7 +131,7 @@ if (SQL_NUMROWS($result_main) > 0)
 						SQL_FREERESULT($result_stats);
 
 						// Mark this user as "spammed" ;-) And place a line for him...
-						//* DEBUG: */ echo "?L:".__LINE__."/".$DUMMY."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<BR>";
+						//* DEBUG: */ echo "?L:".__LINE__."/".$DUMMY."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<br />";
 						switch (REMOVE_RECEIVER($DUMMY, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id)))
 						{
 						case "done":
@@ -162,25 +162,25 @@ if (SQL_NUMROWS($result_main) > 0)
 							if (GET_EXT_VERSION("mediadata") >= "0.0.4")
 							{
 								// Update entry (or add missing)
-								//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<BR>";
+								//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
 								MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1);
 							}
 
 							// And count up the mail
 							$cnt++;
-							//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."*<BR>";
+							//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."*<br />";
 							break;
 
 						case "already":
 							// Entry already found, but we still count one up!
 							$cnt++;
-							//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."<BR>";
+							//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."<br />";
 							break;
 						}
 					}
 
 					// Do we have reached the maximum to send mails? || ($CONFIG['max_send'] >= $cnt)
-					//* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*<BR>";
+					//* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*<br />";
 					if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA[0]))
 					{
 						// Yes we do, so we notify admin and sender about fully sent mail!
@@ -224,11 +224,11 @@ if (SQL_NUMROWS($result_main) > 0)
 						if (GET_EXT_VERSION("mediadata") >= "0.0.4")
 						{
 							// Update entry (or add missing)
-							//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<BR>";
+							//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
 							MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), "add", 1);
 						}
 
-						//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$P."<BR>";
+						//* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$P."<br />";
 						break;
 					}
 					// Do we have send maximum mails?
@@ -240,7 +240,7 @@ if (SQL_NUMROWS($result_main) > 0)
 						$result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%d LIMIT 1",
 						 array(implode(";", $DUMMY), bigintval($DATA[0])), __FILE__, __LINE__);
 
-						//* DEBUG: */ echo"*EXIT/L:".__LINE__."*<BR>";
+						//* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
 						break;
 					}
 				}
@@ -266,7 +266,7 @@ if (SQL_NUMROWS($result_main) > 0)
 							if (GET_EXT_VERSION("mediadata") >= "0.0.4")
 							{
 								// Update database
-								//* DEBUG: */ echo "*MEDIA/L:".__LINE__."/".$POINTS."*<BR>";
+								//* DEBUG: */ echo "*MEDIA/L:".__LINE__."/".$POINTS."*<br />";
 								MEDIA_UPDATE_ENTRY(array("total_points"), "add", $POINTS);
 							}
 
@@ -381,7 +381,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
 			foreach ($RECEIVERS as $key=>$uid)
 			{
 				// Load personal data
-				//* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<BR>";
+				//* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
 				$result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
 				 array(bigintval($uid)), __FILE__, __LINE__);
 
@@ -390,7 +390,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
 				{
 					// The final receiver does exists so we can continue...
 					list($sname, $fname, $email) = SQL_FETCHROW($result_user);
-					//* DEBUG: */ echo "OK!/L:".__LINE__."<BR>";
+					//* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
 					// Mark this user as "spammed" ;-) And place a line for him...
 					if (REMOVE_RECEIVER($DUMMY, $key, $uid, $DATA[0], $DATA[0], true) == "done")
@@ -415,7 +415,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
 						if (($cnt >= $CONFIG['max_send']) || (SELECTION_COUNT($DUMMY) == 0))
 						{
 							// Yes, we have
-							//* DEBUG: */ echo "*EXIT/L:".__LINE__."<BR>";
+							//* DEBUG: */ echo "*EXIT/L:".__LINE__."<br />";
 							break;
 						}
 					}
@@ -431,24 +431,24 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
 				// Update entry (or add missing
 				$P = $cnt;
 				if (!empty($cnt2) && empty($cnt)) $P = $cnt2;
-				//* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<BR>";
+				//* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<br />";
 				MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
 			}
 
 			// Close sending system
-			//* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($DUMMY)."-<BR>";
+			//* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($DUMMY)."-<br />";
 			if (SELECTION_COUNT($DUMMY) == 0)
 			{
 				// Queue reached!
 				$result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='SEND', target_send='0', receivers='' WHERE id=%d LIMIT 1",
 				 array(bigintval($DATA[0])), __FILE__, __LINE__);
-				//* DEBUG: */ echo "*L:".__LINE__."*<BR>";
+				//* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
 				// Update mediadata if version is 0.0.4 or higher
 				if (GET_EXT_VERSION("mediadata") >= "0.0.4")
 				{
 					// Update entry (or add missing)
-					//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<BR>";
+					//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
 					MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
 				}
 			}
@@ -459,7 +459,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
 				 array(SELECTION_COUNT($DUMMY), implode(";", $DUMMY), bigintval($DATA[0])), __FILE__, __LINE__);
 				//* DEBUG: */ echo "*L:".__LINE__."<PRE>";
 				//* DEBUG: */ print_r($DUMMY);
-				//* DEBUG: */ echo "</PRE>\n!!!<BR>";
+				//* DEBUG: */ echo "</PRE>\n!!!<br />";
 				break;
 			}
 		}
diff --git a/inc/rdf.class.php b/inc/rdf.class.php
index 0552c36837..c39c1717c0 100644
--- a/inc/rdf.class.php
+++ b/inc/rdf.class.php
@@ -55,7 +55,7 @@ class fase4_rdf {
     var $_word_wrap = 0;
 
     /**
-    * Wether to recode \n -> <BR> or not in description
+    * Wether to recode \n -> <br /> or not in description
     *
     * @access private
     * @var    boolean
diff --git a/index.php b/index.php
index 9f7f464288..ab4e5b7610 100644
--- a/index.php
+++ b/index.php
@@ -38,8 +38,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "index";
diff --git a/install.php b/install.php
index aaf53f3d58..7b0c6b857c 100644
--- a/install.php
+++ b/install.php
@@ -54,8 +54,6 @@ require ("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "install";
diff --git a/lead-confirm.php b/lead-confirm.php
index 825b1e5f83..76b2c9b455 100644
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "lead-confirm";
diff --git a/login.php b/login.php
index 7686aa71c3..8c2c0c9dbc 100644
--- a/login.php
+++ b/login.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "login";
diff --git a/mailid.php b/mailid.php
index babf54fa35..68192d26c8 100644
--- a/mailid.php
+++ b/mailid.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Tell everyone we are in this module
 $GLOBALS['module'] = "mailid"; $CSS = -1;
diff --git a/mailid_top.php b/mailid_top.php
index 6ba01b401e..d406287c96 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Tell everyone we are in this module
 $GLOBALS['module'] = "mailid";  $CSS = "0";
diff --git a/ref.php b/ref.php
index f4ee90afee..d3fdc56e33 100644
--- a/ref.php
+++ b/ref.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "ref"; $CSS = -1;
diff --git a/show_bonus.php b/show_bonus.php
index 7e83f9b096..2375215afc 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set this because we have no module in URI
 $GLOBALS['module'] = "show_bonus"; $CSS = 0;
diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index b448661750..bbcf9d8fe9 100644
--- a/theme/business/css/general.css
+++ b/theme/business/css/general.css
@@ -19,21 +19,21 @@ table {
 }
 
 A {
-	font-style		: normal;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
-	text-decoration	: none;
+	font-style			: normal;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	text-decoration		: none;
 }
 
 A:link {
-	color			: #000000;
+	color				: #000000;
 }
 
 A:visited {
-	color			: #000000;
+	color				: #000000;
 }
 
 A:active {
-	color			: #000088;
+	color				: #000088;
 	background-color	: transparent;
 }
 
@@ -49,50 +49,50 @@ input, textarea, select, option {
 }
 
 ul, ol {
-	margin-top		: 0px;
+	margin-top			: 0px;
 	margin-bottom		: 0px;
 }
 
 .admin_reset, .guest_reset, .member_reset {
 	border-style		: groove;
-	border			: solid 1px #000000;
-	color			: #000000;
+	border				: solid 1px #000000;
+	color				: #000000;
 }
 
 .admin_submit, .guest_submit, .member_submit {
-	color			: #000000;
+	color				: #000000;
 	border-color		: #000000;
 }
 
 .admin_submit_reject {
 	border-style		: groove;
-	color			: #000000;
+	color				: #000000;
 	border-color		: #000000;
 }
 
 .runtime_fatal, .runtime_fatalcontent {
-	color			: #000000;
+	color				: #000000;
 	background-color	: #FFFFFF;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
 }
 
 .runtime_fatal {
-	color			: #000000;
+	color				: #000000;
 }
 
 .runtime_fatalcontent {
-	text-align		: left;
+	text-align			: left;
 	font-size			: 12px;
 }
 
 .admin {
-	color			: #000000;
+	color				: #000000;
 	background-color	: #FFFFFF;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
 }
 
 .admin_note {
-	color			: #000000;
+	color				: #000000;
 	font-size			: 12px;
 }
 
@@ -103,7 +103,7 @@ DIV.admin_note {
 }
 
 .admin_fatal {
-	color			: #000000;
+	color				: #000000;
 	font-size			: 18px;
 }
 
@@ -113,37 +113,37 @@ DIV.admin_note {
 
 .member_banner {
 	background-color	: #FFFFFF;
-	width			: 488px;
+	width				: 488px;
 }
 
 .admin_error {
 	background-color	: #FFFFFF;
-	color			: #000000;
+	color				: #000000;
 	font-size			: 10px;
 }
 
 .admin_select, .guest_select, .member_select {
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #000000;
 	background-color	: #EEEEFF;
 }
 
 .admin_register, .admin_desc_header, .admin_done, .admin_title, .member_title2, .guest_title2, .admin_message {
 	background-color	: #EEEEFF;
-	color			: #000000;
-	text-align		: center;
+	color				: #000000;
+	text-align			: center;
 }
 
 .admin_title2 {
 	background-color	: #EEEEFF;
-	color			: #000000;
-	text-align		: center;
-	height			: 25px;
+	color				: #000000;
+	text-align			: center;
+	height				: 25px;
 	font-size			: 14px;
 }
 
 .member_done, .guest_done {
-	color			: #000000;
+	color				: #000000;
 }
 
 .member_misc {
@@ -151,23 +151,23 @@ DIV.admin_note {
 }
 
 .admin_misc, .member_misc {
-	color			: #000000;
+	color				: #000000;
 }
 
 .admin_done2 {
-	color			: #000000;
+	color				: #000000;
 }
 
 .admin_green, .admin_no {
-	color			: #000000;
+	color				: #000000;
 }
 
 .admin_welcome {
 	background-color	: #EEEEFF;
-	color			: #000000;
+	color				: #000000;
 	vertical-align		: middle;
 	font-size			: 18px;
-	height			: 50px;
+	height				: 50px;
 }
 
 .admin_header {
@@ -176,13 +176,13 @@ DIV.admin_note {
 
 .admin_menu {
 	background-color	: #EEEEFF;
-	color			: #000000;
-	width			: 230px;
+	color				: #000000;
+	width				: 230px;
 }
 
 .admin_logout {
 	background-color	: #DDDDFF;
-	color			: #000000;
+	color				: #000000;
 }
 
 .admin_desc_cont {
@@ -201,19 +201,19 @@ DIV.admin_note {
 
 .admin_form_header {
 	text-align          : center;
-	height			: 36px;
+	height				: 36px;
 	background-color	: #EEEEFF;
-	color			: #000000;
+	color				: #000000;
 }
 
 .member_header {
 	text-align          : center;
-	height			: 28px;
+	height				: 28px;
 	background-color	: #EEEEFF;
 }
 
 .admin_failed, .guest_failed, .member_failed, .member_note {
-	color			: #000000;
+	color				: #000000;
 }
 
 .member_note_bg {
@@ -222,14 +222,14 @@ DIV.admin_note {
 
 .member_data {
 	background-color	: #FFFFFF;
-	color			: #000000;
-	height			: 20px;
+	color				: #000000;
+	height				: 20px;
 }
 
 .admin_header_b1 {
 	border-bottom		: 1px solid #000000;
 	background-color	: #EEEEFF;
-	height			: 22px;
+	height				: 22px;
 }
 
 .admin_snote {
@@ -238,35 +238,35 @@ DIV.admin_note {
 
 .admin_normal, .guest_normal, .member_normal {
 	border-style		: solid;
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #000000;
 	background-color	: #EEEEFF;
 }
 
 .admin_alpha {
-	text-align	: center;
-	height		: 40px;
-	vertical-align	: middle;
+	text-align			: center;
+	height				: 40px;
+	vertical-align		: middle;
 }
 
 .admin_sortlinks {
-	text-align	: center;
-	height		: 20px;
-	vertical-align	: middle;
+	text-align			: center;
+	height				: 20px;
+	vertical-align		: middle;
 }
 
 .member_stats {
 	vertical-align		: top;
-	font-weight		: bold;
-	height			: 23px;
+	font-weight			: bold;
+	height				: 23px;
 	font-size			: 16px;
 	border-style		: none;
-	border			: 0px;
+	border				: 0px;
 	background          : #FFFFFF;
-	color			: #000000;
-	margin-top		: -4px;
+	color				: #000000;
+	margin-top			: -4px;
 	margin-bottom		: 1px;
-	cursor			: default;
+	cursor				: default;
 }
 
 .normal {
@@ -278,58 +278,58 @@ DIV.admin_note {
 }
 
 .guest_title, .member_title {
-	text-align		: center;
-	color			: #000000;
+	text-align			: center;
+	color				: #000000;
 	vertical-align		: middle;
 	background-color	: #EEEEFF;
-	height			: 60px;
+	height				: 60px;
 }
 
 .guest_login_header {
-	color			: #000000;
+	color				: #000000;
 	vertical-align		: middle;
 	background-color	: #EEEEFF;
 }
 
 .guest_menu, .member_menu {
-	width			: 220px;
+	width				: 220px;
 	background-color	: #FFFFFF;
 	vertical-align		: top;
 }
 
 .guest_menu_title, .member_menu_title {
 	background-color	: #EEEEFF;
-	color			: #000000;
-	height			: 25px;
-	width			: 200px;
-	border			: 1px solid #000000;
+	color				: #000000;
+	height				: 25px;
+	width				: 200px;
+	border				: 1px solid #000000;
 }
 
 .guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom {
-	border			: 1px solid #000000;
-	border-top		: 0px;
+	border				: 1px solid #000000;
+	border-top			: 0px;
 	background-color	: #FFFFFF;
-	height			: 22px;
-	text-align		: left;
+	height				: 22px;
+	text-align			: left;
 }
 
 .guest_menu_seperator, .member_menu_seperator {
-	height			: 15px;
+	height				: 15px;
 }
 
 .guest_content, .member_content {
 	background-color	: #FFFFFF;
-	width			: 99%;
+	width				: 99%;
 	padding-left		: 2px;
 	padding-right		: 2px;
-	margin-left		: 5px;
+	margin-left			: 5px;
 	margin-right		: 5px;
 }
 
 .guest_advert, .guest_login, .member_advert, .member_login {
 	background-color	: #FFFFFF;
 	vertical-align		: top;
-	margin-top		: 10px;
+	margin-top			: 10px;
 }
 
 .guest_footer {
@@ -338,29 +338,28 @@ DIV.admin_note {
 }
 
 #master {
-	width			: 100%;
-	height			: 100%;
-	min-height		: 90%;
-	max-height		: 100%;
-	vertical-align	: top;
+	width				: 100%;
+	height				: 100%;
+	min-height			: 90%;
+	max-height			: 100%;
+	vertical-align		: top;
 }
 
 .masterbox {
-	text-align		: center;
-	align			: center;
+	text-align			: center;
 }
 
 .footer_lines {
 	vertical-align      : bottom;
 	font-size           : 10px;
-	width			: 380px;
+	width				: 380px;
 	vertical-align		: middle;
 	background-color	: #FFFFFF;
-	height			: 40px;
+	height				: 40px;
 }
 
 .dashed {
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #000000;
 }
 
@@ -374,10 +373,10 @@ DIV.admin_note {
 
 .impressum {
 	font-size			: 12px;
-	width			: 320px;
+	width				: 320px;
 	vertical-align		: middle;
 	background-color	: #FFFFFF;
-	height			: 70px;
+	height				: 70px;
 }
 
 .mediadata {
@@ -386,23 +385,23 @@ DIV.admin_note {
 
 .media_header, .impressum_header {
 	background-color	: #EEEEFF;
-	text-align		: center;
-	color			: #000000;
-	height			: 26px;
-	font-weight		: bold;
+	text-align			: center;
+	color				: #000000;
+	height				: 26px;
+	font-weight			: bold;
 	font-size			: 20px;
 }
 
 .media_left {
 	font-size			: 14px;
-	width			: 200px;
+	width				: 200px;
 }
 
 .media_right {
-	color			: #000000;
-	font-weight		: bold;
+	color				: #000000;
+	font-weight			: bold;
 	font-size			: 14px;
-	width			: 70px;
+	width				: 70px;
 }
 
 .admin_sep_footer {
@@ -420,20 +419,20 @@ DIV.admin_note {
 }
 
 .member_footer {
-	height			: 30px;
+	height				: 30px;
 	background-color	: #EEEEFF;
 }
 
 .admin_footer {
-	height			: 30px
+	height				: 30px
 }
 
 .admin_task_header {
 	background-color	: #EEEEFF;
-	color			: #000000;
+	color				: #000000;
 	vertical-align		: middle;
 	font-size			: 18px;
-	height			: 35px;
+	height				: 35px;
 }
 
 .seperator {
@@ -441,42 +440,42 @@ DIV.admin_note {
 }
 
 .tab1 {
-	text-align		: center
+	text-align			: center
 }
 
 .admin_delete, .admin_yes {
 	border-style		: groove;
-	border			: solid 1px #000000;
+	border				: solid 1px #000000;
 	background-color	: #000000;
-	color			: #FFFFFF;
+	color				: #FFFFFF;
 }
 
 .guest_stats {
 	background-color	: #FFFFFF;
-	width			: 460px;
+	width				: 460px;
 }
 
 .guest_stats_title {
-	color			: #000000;
+	color				: #000000;
 	vertical-align		: middle;
 	background-color	: #EEEEFF;
-	height			: 30px;
+	height				: 30px;
 }
 
 .guest_stats_l {
-	width			: 344px;
-	text-align		: right;
+	width				: 344px;
+	text-align			: right;
 }
 
 .guest_stats_m {
-	width			: 2px;
+	width				: 2px;
 }
 
 .guest_stats_r, .guest_stats_lr, .guest_stats_rr {
-	color			: #000000;
-	width			: 28px;
-	font-weight		: bold;
-	text-align		: center;
+	color				: #000000;
+	width				: 28px;
+	font-weight			: bold;
+	text-align			: center;
 }
 
 .guest_stats_ll, .guest_stats_rl {
@@ -554,17 +553,17 @@ DIV.admin_note {
 }
 
 .main {
-	height			: 99%;
-	vertical-align	: top;
+	height				: 99%;
+	vertical-align		: top;
 }
 
 .footer {
-	height			: 1%
+	height				: 1%;
 	vertical-align		: bottom;
 }
 
 .menu_blur {
-	display			: block;
+	display				: block;
 }
 
 .menu_blur:hover {
@@ -574,7 +573,7 @@ DIV.admin_note {
 .disabled {
 	border-style		: groove;
 	background-color	: #660000;
-	color			: #FFFFFF;
+	color				: #FFFFFF;
 }
 
 .mini_select {
diff --git a/theme/business/css/register.css b/theme/business/css/register.css
index 076a9ae4ab..7b72f08e69 100644
--- a/theme/business/css/register.css
+++ b/theme/business/css/register.css
@@ -48,7 +48,6 @@
 .register_title {
 	background-color	: #EEEEFF;
 	text-align		: center;
-	align			: center;
 	font-size			: 18px;
 	padding-left		: 5px;
 	padding-right		: 5px;
@@ -61,7 +60,6 @@
 
 .register_left {
 	text-align		: right;
-	align			: right;
 	margin-right		: 2px;
 	color			: #000000;
 	font-weight		: bold;
@@ -75,7 +73,6 @@
 
 .register_header {
 	text-align		: center;
-	align			: center;
 	background-color	: #EEEEFF;
 	color			: #000000;
 	font-weight		: bold;
diff --git a/theme/default/css/general.css b/theme/default/css/general.css
index a6f6a1c3b3..01343bff5f 100644
--- a/theme/default/css/general.css
+++ b/theme/default/css/general.css
@@ -1,7 +1,7 @@
 body {
 	background-color	: #EEFFEE;
-	color			: #000000;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	color				: #000000;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
 	font-size			: 12px;
 	letter-spacing      : 1px;
 
@@ -14,10 +14,10 @@ body {
 	scrollbar-track-color		: #CCEFCC;
 	scrollbar-darkshadow-color	: #999999;
 
-	margin			: 0px;
-	margin-left		: 0px;
+	margin				: 0px;
+	margin-left			: 0px;
 	margin-right		: 0px;
-	margin-top		: 0px;
+	margin-top			: 0px;
 	margin-bottom		: 0px;
 }
 
@@ -28,21 +28,21 @@ table {
 }
 
 A {
-	font-style		: normal;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
-	text-decoration	: none;
+	font-style			: normal;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	text-decoration		: none;
 }
 
 A:link {
-	color			: #2e51a9;
+	color				: #2e51a9;
 }
 
 A:visited {
-	color			: #AA0044;
+	color				: #AA0044;
 }
 
 A:active {
-	color			: #2e51a9;
+	color				: #2e51a9;
 	background-color	: transparent;
 }
 
@@ -59,51 +59,51 @@ input, textarea, select, option {
 }
 
 ul, ol {
-	margin-top		: 0px;
-	margin-bottom	: 0px;
+	margin-top			: 0px;
+	margin-bottom		: 0px;
 }
 
 .admin_reset, .guest_reset, .member_reset {
-	border-style	: groove;
-	border			: solid 1px #009900;
-	color			: #AA0044;
+	border-style		: groove;
+	border				: solid 1px #009900;
+	color				: #AA0044;
 }
 
 .admin_submit, .guest_submit, .member_submit {
-	color			: #AA0044;
+	color				: #AA0044;
 	border-color		: #009900;
 }
 
 .admin_submit_reject {
 	border-style		: groove;
-	color			: #881111;
+	color				: #881111;
 	border-color		: #009900;
 }
 
 .runtime_fatal, .runtime_fatalcontent {
-	width			: 700px;
-	color			: #118811;
+	width				: 700px;
+	color				: #118811;
 	background-color	: #DDEEDD;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
 }
 
 .runtime_fatal {
-	color			: #00AA00;
+	color				: #00AA00;
 }
 
 .runtime_fatalcontent {
-	text-align		: left;
+	text-align			: left;
 	font-size			: 12px;
 }
 
 .admin {
-	color			: #118811;
+	color				: #118811;
 	background-color	: #DDEEDD;
-	font-family		: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-family			: Verdana, Arial, Geneva, Helvetica, sans-serif;
 }
 
 .admin_note {
-	color			: #FF0000;
+	color				: #FF0000;
 	font-size			: 12px;
 }
 
@@ -115,7 +115,7 @@ DIV.admin_note {
 
 .admin_fatal {
 	font-size			: 18px;
-	color			: #00AA00;
+	color				: #00AA00;
 }
 
 .admin_edit, .member_confirm {
@@ -124,29 +124,29 @@ DIV.admin_note {
 
 .member_banner {
 	background-color	: #eeffee;
-	width			: 488px;
+	width				: 488px;
 }
 
 .admin_error {
 	background-color	: #eeffee;
-	color			: #00AA00;
+	color				: #00AA00;
 	font-size			: 10px;
 }
 
 .admin_select, .guest_select, .member_select {
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #009900;
 	background-color	: #EEFFEE;
 }
 
 .admin_register, .admin_desc_header, .admin_done, .admin_title, .member_title2, .guest_title2, .admin_message {
 	background-color	: #ddeedd;
-	color			: #009900;
-	text-align		: center;
+	color				: #009900;
+	text-align			: center;
 }
 
 .member_done, .guest_done {
-	color			: #009900;
+	color				: #009900;
 }
 
 .member_misc {
@@ -154,23 +154,23 @@ DIV.admin_note {
 }
 
 .admin_misc, .member_misc {
-	color			: #000000;
+	color				: #000000;
 }
 
 .admin_done2 {
-	color			: #AA0044;
+	color				: #AA0044;
 }
 
 .admin_green, .admin_no {
-	color			: #009900;
+	color				: #009900;
 }
 
 .admin_welcome {
 	background-color	: #DDEEDD;
-	color			: #009900;
+	color				: #009900;
 	vertical-align		: middle;
 	font-size			: 18px;
-	height			: 50px;
+	height				: 50px;
 }
 
 .admin_header {
@@ -179,13 +179,13 @@ DIV.admin_note {
 
 .admin_menu {
 	background-color	: #DDEEDD;
-	color			: #000077;
-	width			: 230px;
+	color				: #000077;
+	width				: 230px;
 }
 
 .admin_logout {
 	background-color	: #AAFFAA;
-	color			: #00AA00;
+	color				: #00AA00;
 }
 
 .admin_desc_cont {
@@ -204,19 +204,19 @@ DIV.admin_note {
 
 .admin_form_header {
 	text-align          : center;
-	height			: 36px;
+	height				: 36px;
 	background-color	: #ddeedd;
-	color			: #009900;
+	color				: #009900;
 }
 
 .member_header {
 	text-align          : center;
-	height			: 28px;
+	height				: 28px;
 	background-color	: #ddeedd;
 }
 
 .admin_failed, .guest_failed, .member_failed, .member_note {
-	color			: #00AA00;
+	color				: #00AA00;
 }
 
 .member_note_bg {
@@ -225,14 +225,14 @@ DIV.admin_note {
 
 .member_data {
 	background-color	: #eeffee;
-	color			: #009900;
-	height			: 20px;
+	color				: #009900;
+	height				: 20px;
 }
 
 .admin_header_b1 {
 	border-bottom		: 1px solid #AA0044;
 	background-color	: #ddeedd;
-	height			: 22px;
+	height				: 22px;
 }
 
 .admin_snote {
@@ -241,22 +241,22 @@ DIV.admin_note {
 
 .admin_normal, .guest_normal, .member_normal {
 	border-style		: solid;
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #009900;
 }
 
 .member_stats {
 	vertical-align		: top;
-	font-weight		: bold;
-	height			: 23px;
+	font-weight			: bold;
+	height				: 23px;
 	font-size			: 16px;
 	border-style		: none;
-	border			: 0px;
+	border				: 0px;
 	background          : #DDEEDD;
-	color			: #000000;
-	margin-top		: -4px;
+	color				: #000000;
+	margin-top			: -4px;
 	margin-bottom		: 1px;
-	cursor			: default;
+	cursor				: default;
 }
 
 .normal {
@@ -268,96 +268,95 @@ DIV.admin_note {
 }
 
 .guest_title, .member_title {
-	text-align		: center;
-	color			: #009900;
+	text-align			: center;
+	color				: #009900;
 	vertical-align		: middle;
 	background-color	: #DDEEDD;
-	height			: 60px;
+	height				: 60px;
 }
 
 .guest_login_header {
-	color			: #009900;
+	color				: #009900;
 	vertical-align		: middle;
 	background-color	: #DDEEDD;
 }
 
 .guest_menu, .member_menu {
-	width			: 220px;
+	width				: 220px;
 	background-color	: #DDEEDD;
 	vertical-align		: top;
 }
 
 .guest_menu_title, .member_menu_title {
 	background-color	: #BDEFCD;
-	color			: #009900;
-	height			: 25px;
-	width			: 200px;
-	border			: 1px solid #AA0044;
+	color				: #009900;
+	height				: 25px;
+	width				: 200px;
+	border				: 1px solid #AA0044;
 }
 
 .guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom {
-	border			: 1px solid #AA0044;
-	border-top		: 0px;
+	border				: 1px solid #AA0044;
+	border-top			: 0px;
 	background-color	: #eeffbc;
-	height			: 22px;
-	text-align		: left;
+	height				: 22px;
+	text-align			: left;
 }
 
 .member_menu_whats {
-	border			: 1px solid #AA0044;
-	border-top		: 0px;
+	border				: 1px solid #AA0044;
+	border-top			: 0px;
 	background-color	: #eeffee;
-	height			: 20px;
+	height				: 20px;
 }
 
 .guest_menu_seperator, .member_menu_seperator {
-	height			: 15px;
+	height				: 15px;
 }
 
 .guest_content, .member_content {
 	background-color	: #eeffee;
-	width			: 99%;
+	width				: 99%;
 	padding-left		: 2px;
 	padding-right		: 2px;
-	margin-left		: 5px;
+	margin-left			: 5px;
 	margin-right		: 5px;
 }
 
 .guest_advert, .guest_login, .member_advert, .member_login {
 	background-color	: #DDEEDD;
 	vertical-align		: top;
-	margin-top		: 10px;
+	margin-top			: 10px;
 }
 
 #master {
-	width			: 100%;
-	height			: 100%;
-	min-height		: 90%;
-	max-height		: 100%;
-	text-align		: center;
+	width				: 100%;
+	height				: 100%;
+	min-height			: 90%;
+	max-height			: 100%;
+	text-align			: center;
 }
 
 .masterbox {
-	text-align		: center;
-	align			: center;
+	text-align			: center;
 }
 
 .footer {
-	text-align		: center;
+	text-align			: center;
 }
 
 .footer_lines {
 	font-size           : 10px;
-	width			: 380px;
-	height			: 40px;
+	width				: 380px;
+	height				: 40px;
 	vertical-align		: middle;
 	background-color	: #E5EFE5;
-	margin-top		: 5px;
+	margin-top			: 5px;
 	margin-bottom		: 5px;
 }
 
 .dashed {
-	border			: solid 1px;
+	border				: solid 1px;
 	border-color		: #AA0044;
 }
 
@@ -371,10 +370,10 @@ DIV.admin_note {
 
 .impressum {
 	font-size			: 12px;
-	width			: 320px;
+	width				: 320px;
 	vertical-align		: middle;
 	background-color	: #E5EFE5;
-	height			: 70px;
+	height				: 70px;
 }
 
 .mediadata {
@@ -383,23 +382,23 @@ DIV.admin_note {
 
 .media_header, .impressum_header {
 	background-color	: #b8fccb;
-	text-align		: center;
-	color			: #009900;
-	height			: 26px;
-	font-weight		: bold;
+	text-align			: center;
+	color				: #009900;
+	height				: 26px;
+	font-weight			: bold;
 	font-size			: 20px;
 }
 
 .media_left {
 	font-size			: 14px;
-	width			: 200px;
+	width				: 200px;
 }
 
 .media_right {
-	color			: #009900;
-	font-weight		: bold;
+	color				: #009900;
+	font-weight			: bold;
 	font-size			: 14px;
-	width			: 70px;
+	width				: 70px;
 }
 
 .admin_sep_footer {
@@ -417,20 +416,20 @@ DIV.admin_note {
 }
 
 .member_footer {
-	height			: 30px;
+	height				: 30px;
 	background-color	: #DDEEDD;
 }
 
 .admin_footer {
-	height			: 30px
+	height				: 30px
 }
 
 .admin_task_header {
 	background-color	: #ddeedd;
-	color			: #009900;
+	color				: #009900;
 	vertical-align		: middle;
 	font-size			: 18px;
-	height			: 35px;
+	height				: 35px;
 }
 
 .seperator {
@@ -438,61 +437,61 @@ DIV.admin_note {
 }
 
 .tab1 {
-	text-align		: center
+	text-align			: center
 }
 
 .admin_delete, .admin_yes {
 	border-style		: groove;
-	border			: solid 1px #00AA00;
+	border				: solid 1px #00AA00;
 	background-color	: #AA0044;
-	color			: #DDEEDD;
+	color				: #DDEEDD;
 }
 
 .guest_stats {
 	background-color	: #eeffee;
-	width			: 460px;
+	width				: 460px;
 }
 
 .guest_stats_title {
-	color			: #009900;
+	color				: #009900;
 	vertical-align		: middle;
 	background-color	: #DDEEDD;
-	height			: 30px;
+	height				: 30px;
 }
 
 .guest_stats_l {
-	width			: 344px;
-	text-align		: right;
+	width				: 344px;
+	text-align			: right;
 }
 
 .guest_stats_m {
-	width			: 2px;
+	width				: 2px;
 }
 
 .guest_stats_r, .guest_stats_lr, .guest_stats_rr {
-	color			: #009900;
-	width			: 28px;
-	font-weight		: bold;
-	text-align		: center;
+	color				: #009900;
+	width				: 28px;
+	font-weight			: bold;
+	text-align			: center;
 }
 
 .guest_stats_ll, .guest_stats_rl {
-	width			: 192px;
-	text-align		: right;
+	width				: 192px;
+	text-align			: right;
 }
 
 .guest_stats_footer {
-	color			: #009900;
+	color				: #009900;
 	vertical-align		: middle;
 	background-color	: #DDEEDD;
-	height			: 20px;
+	height				: 20px;
 }
 
 .task_pre {
-	font-weight		: bold;
-	margin-left		: 0px;
+	font-weight			: bold;
+	margin-left			: 0px;
 	margin-right		: 0px;
-	margin-top		: 10px;
+	margin-top			: 10px;
 	margin-bottom		: 10px;
 }
 
@@ -501,70 +500,70 @@ DIV.admin_note {
 }
 
 .guest_content_align, .member_content_align, .admin_content_align {
-	text-align		: center;
-	align			: center;
+	text-align			: center;
+	align				: center;
 	vertical-align		: top;
 }
 
 .member_mailidtop {
 	background-color	: #DDEEDD;
-	width			: 100%;
-	height			: 100%;
+	width				: 100%;
+	height				: 100%;
 }
 
 .list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub {
-	text-align		: left;
-	width			: 100%;
+	text-align			: left;
+	width				: 100%;
 }
 
 .admin_alpha {
-	text-align	: center;
-	height		: 40px;
-	vertical-align	: middle;
+	text-align			: center;
+	height				: 40px;
+	vertical-align		: middle;
 }
 
 .admin_sortlinks {
-	text-align	: center;
-	height		: 20px;
-	vertical-align	: middle;
+	text-align			: center;
+	height				: 20px;
+	vertical-align		: middle;
 }
 
 .admin_title2 {
 	background-color	: #ddeedd;
-	color			: #000099;
-	text-align		: center;
-	height			: 25px;
+	color				: #000099;
+	text-align			: center;
+	height				: 25px;
 	font-size			: 14px;
 }
 
 .member_unconfirmed {
 	background-color	: #DDEEDD;
-	width			: 100%;
-	text-align		: center;
+	width				: 100%;
+	text-align			: center;
 }
 
 .you_are_here {
-	white-space		: nowrap;
+	white-space			: nowrap;
 	font-size			: 14px;
-	text-align		: left;
+	text-align			: left;
 }
 
 .tiny   { font-size		: 12px; }
 .medium { font-size		: 14px; }
 .big    { font-size		: 20px; }
 
-.top    { border-top	: 1px solid #4400AA; }
-.bottom { border-bottom	: 1px solid #4400AA; }
-.left   { border-left	: 1px solid #4400AA; }
-.right  { border-right	: 1px solid #4400AA; }
+.top    { border-top		: 1px solid #4400AA; }
+.bottom { border-bottom		: 1px solid #4400AA; }
+.left   { border-left		: 1px solid #4400AA; }
+.right  { border-right		: 1px solid #4400AA; }
 
-.top2    { border-top	: 1px solid #AA0044; }
+.top2    { border-top		: 1px solid #AA0044; }
 .bottom2 { border-bottom	: 1px solid #AA0044; }
-.left2   { border-left	: 1px solid #AA0044; }
-.right2  { border-right	: 1px solid #AA0044; }
+.left2   { border-left		: 1px solid #AA0044; }
+.right2  { border-right		: 1px solid #AA0044; }
 
 .nobr {
-	white-space		: nowrap;
+	white-space			: nowrap;
 }
 
 .guest_table {
@@ -572,16 +571,16 @@ DIV.admin_note {
 }
 
 .main {
-	height			: 99%
+	height				: 99%
 }
 
 .footer {
-	height			: 1%
+	height				: 1%;
 	vertical-align		: bottom;
 }
 
 .menu_blur {
-	display			: block;
+	display				: block;
 }
 
 .menu_blur:hover {
@@ -594,9 +593,9 @@ DIV.admin_note {
 }
 
 .disabled {
-	border-style: groove;
-	background-color: #660000;
-	color: #FF9900;
+	border-style		: groove;
+	background-color	: #660000;
+	color				: #FF9900;
 }
 
 .mini_select {
@@ -607,11 +606,11 @@ DIV.admin_note {
 }
 
 .theme_box {
-     border              : 1px dotted #AA0044;
-     border-top          : 0px;
+     border             : 1px dotted #AA0044;
+     border-top         : 0px;
 	width               : 100%;
 	height              : 70px;
-     background-color    : #eeffbc;
+     background-color   : #eeffbc;
 }
 
 .theme_note {
@@ -624,28 +623,28 @@ DIV.admin_note {
 }
 
 .agb_box {
-	text-align	: left;
+	text-align			: left;
 }
 
 .agb_title, .fatal_title {
-	font-size		: 16px;
-	text-align	: center;
-	height		: 40px;
-	font-weight	: bold;
+	font-size			: 16px;
+	text-align			: center;
+	height				: 40px;
+	font-weight			: bold;
 }
 
 .agb_para {
-	text-indent	: 8px;
-	text-align	: left;
-	margin-left	: 5px;
+	text-indent		: 8px;
+	text-align		: left;
+	margin-left		: 5px;
 	margin-right	: 5px;
 	margin-bottom	: 12px;
 }
 
 .fatal_box {
-	text-align	: center;
-	width		: 100%;
-	margin-top	: 10px;
+	text-align		: center;
+	width			: 100%;
+	margin-top		: 10px;
 }
 
 .admin_message {
diff --git a/theme/default/css/register.css b/theme/default/css/register.css
index 68daca9b43..8eb855deda 100644
--- a/theme/default/css/register.css
+++ b/theme/default/css/register.css
@@ -56,7 +56,6 @@
 
 .register_left {
 	text-align		: right;
-	align			: right;
 	margin-right		: 2px;
 	color			: #0000AA;
 	font-weight		: bold;
diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css
index 37b0be9df4..504a7b3521 100644
--- a/theme/desert/css/general.css
+++ b/theme/desert/css/general.css
@@ -322,7 +322,6 @@ DIV.admin_note {
 
 .masterbox {
 	text-align		: center;
-	align			: center;
 }
 
 .footer_lines {
@@ -534,7 +533,7 @@ DIV.admin_note {
 }
 
 .footer {
-	height			: 1%
+	height				: 1%;
 	vertical-align		: bottom;
 }
 
diff --git a/theme/desert/css/register.css b/theme/desert/css/register.css
index 54809371c1..6769f615d7 100644
--- a/theme/desert/css/register.css
+++ b/theme/desert/css/register.css
@@ -60,7 +60,6 @@
 
 .register_left {
 	text-align		: right;
-	align			: right;
 	margin-right		: 2px;
 	color			: #880000;
 	font-weight		: bold;
diff --git a/view.php b/view.php
index 2f688f67c3..003ca6de1f 100644
--- a/view.php
+++ b/view.php
@@ -37,8 +37,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "view"; $CSS = -1;
-- 
2.39.2