From 62b16291efe168636f5eda2c8644f6770382fb1e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 9 Feb 2009 17:59:10 +0000
Subject: [PATCH] More bugs resolved, thanks to profi-concept

---
 .gitattributes                               |   3 +
 inc/cache/.revision                          |   1 +
 inc/databases.php                            |  12 +-
 inc/db/lib-mysql3.php                        |  63 ++++--
 inc/extensions/ext-logs.php                  |   2 +-
 inc/extensions/ext-other.php                 |   2 +-
 inc/extensions/ext-sponsor.php               | 202 +++++++++----------
 inc/functions.php                            |  59 ++++++
 inc/gen_refback.php                          |   4 +-
 inc/gen_sql_patches.php                      |  37 ++--
 inc/libs/sponsor_functions.php               |  16 +-
 inc/libs/task_functions.php                  |  12 +-
 inc/modules/admin/what-del_sponsor.php       |   6 +-
 inc/modules/admin/what-edit_sponsor.php      |   6 +-
 inc/modules/admin/what-guestedit.php         |   4 +-
 inc/modules/admin/what-list_sponsor.php      |  10 +-
 inc/modules/admin/what-list_sponsor_pay.php  |  12 +-
 inc/modules/admin/what-list_sponsor_pays.php |   2 +-
 inc/modules/admin/what-lock_sponsor.php      |   4 +-
 inc/modules/admin/what-unlock_sponsor.php    |  14 +-
 inc/modules/guest/what-sponsor_infos.php     |   8 +-
 inc/modules/guest/what-sponsor_login.php     |  14 +-
 inc/modules/guest/what-sponsor_reg.php       |   6 +-
 inc/modules/sponsor/account.php              |   2 +-
 inc/modules/sponsor/settings.php             |   2 +-
 inc/modules/sponsor/welcome.php              |   2 +-
 templates/de/html/ext/ext_logs.tpl           |   3 +
 templates/de/html/ext/ext_mailid.tpl         |   4 +-
 templates/de/html/ext/ext_maintenance.tpl    |  11 +-
 templates/de/html/ext/ext_mydata.tpl         |   5 +-
 templates/de/html/ext/ext_other.tpl          |   4 +-
 templates/de/html/ext/ext_register.tpl       |   6 +-
 templates/de/html/ext/ext_usage.tpl          |   2 +
 33 files changed, 315 insertions(+), 225 deletions(-)
 create mode 100644 inc/cache/.revision
 create mode 100644 templates/de/html/ext/ext_logs.tpl
 create mode 100644 templates/de/html/ext/ext_usage.tpl

diff --git a/.gitattributes b/.gitattributes
index b0c1b1cf65..c4281ff592 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -87,6 +87,7 @@ inc/autopurge/purge-mails.php -text
 inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
+inc/cache/.revision -text
 inc/check-reset.php -text
 inc/config.php -text
 inc/databases.php -text
@@ -1229,6 +1230,7 @@ templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
+templates/de/html/ext/ext_logs.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
 templates/de/html/ext/ext_maintenance.tpl -text
 templates/de/html/ext/ext_mediadata.tpl -text
@@ -1259,6 +1261,7 @@ templates/de/html/ext/ext_task.tpl -text
 templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
+templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
 templates/de/html/ext/ext_yoomedia.tpl -text
diff --git a/inc/cache/.revision b/inc/cache/.revision
new file mode 100644
index 0000000000..3e5126c4e7
--- /dev/null
+++ b/inc/cache/.revision
@@ -0,0 +1 @@
+new
\ No newline at end of file
diff --git a/inc/databases.php b/inc/databases.php
index 23c6fef4ed..d50dd36e3e 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -79,10 +79,10 @@ define('FULL_VERSION', "0.2.1-FINAL");
 
 // Replacement strings
 $REPLACER = array(
-	'userid'  => "%uid%",			// User-ID
-	'surname' => "%vorname%",		// Surname
-	'family'  => "%nachname%",		// Family name
-	'gender'  => "%anrede%",		// Gender
+	'userid'  => "%uid%",		// User-ID
+	'surname' => "%vorname%",	// Surname
+	'family'  => "%nachname%",	// Family name
+	'gender'  => "%anrede%",	// Gender
 );
 
 // One day
@@ -97,7 +97,9 @@ define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "725");
+define('CURR_SVN_REVISION', getActualVersion(0));
+define('CURR_SVN_DATE'    , getActualVersion(1));
+define('CURR_SVN_VERSION' , getActualVersion(2));
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index f41591f0ee..ada4e4795f 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -41,6 +41,9 @@ if (!defined('__SECURITY')) {
 function SQL_QUERY ($sql_string, $F, $L) {
 	global $link, $CSS, $_CONFIG, $OK;
 
+	// Link is up?
+	if (!is_resource($link)) return false;
+
 	// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
 	$sql_string = str_replace("\t", " ", str_replace("\n", " ", str_replace("\r", " ", $sql_string)));
 
@@ -49,7 +52,7 @@ function SQL_QUERY ($sql_string, $F, $L) {
 
 	// Run SQL command
 	//* DEBUG: */ echo $sql_string."<br />\n";
-	$result = @mysql_query($sql_string, $link)
+	$result = mysql_query($sql_string, $link)
 	 or addFatalMessage($F." (".$L."):".mysql_error()."<br />
 Query string:<br />
 ".$sql_string);
@@ -101,7 +104,7 @@ function SQL_NUMROWS($result) {
 	// Is the result a valid resource?
 	if (is_resource($result)) {
 		// Get the count of rows from database
-		$lines = @mysql_num_rows($result);
+		$lines = mysql_num_rows($result);
 
 		// Is the result empty? Then we have an error!
 		if (empty($lines)) $lines = 0;
@@ -120,7 +123,7 @@ function SQL_AFFECTEDROWS() {
 	if (!is_resource($link)) return false;
 
 	// Get affected rows
-	$lines = @mysql_affected_rows($link);
+	$lines = mysql_affected_rows($link);
 
 	// Return it
 	return $lines;
@@ -134,7 +137,7 @@ function SQL_FETCHROW($result) {
 	// Is a result resource set?
 	if (!is_resource($result)) return false;
 
-	$DATA = @mysql_fetch_row($result);
+	$DATA = mysql_fetch_row($result);
 	return $DATA;
 }
 
@@ -147,7 +150,7 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
 	$row = array();
 
 	// Load row from database
-	$row = @mysql_fetch_array($res);
+	$row = mysql_fetch_array($res);
 
 	// Return only arrays here
 	if (is_array($row)) {
@@ -171,19 +174,19 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
 
 // SQL result
 function SQL_RESULT($res, $row, $field) {
-	$result = @mysql_result($res, $row, $field);
+	$result = mysql_result($res, $row, $field);
 	return $result;
 }
 // SQL connect
 function SQL_CONNECT($host, $login, $password, $F, $L) {
-	$connect = @mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
+	$connect = mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
 	return $connect;
 }
 // SQL select database
 function SQL_SELECT_DB($dbName, $link, $F, $L) {
 	$select = false;
 	if (is_resource($link)) {
-		$select = @mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
+		$select = mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
 	}
 	return $select;
 }
@@ -212,20 +215,25 @@ function SQL_CLOSE(&$link, $F, $L) {
 	$link = null;
 	return $close;
 }
+
 // SQL free result
-function SQL_FREERESULT($result) {
+function SQL_FREERESULT ($result) {
 	if (!is_resource($result)) {
 		// Abort here
 		return false;
 	} // END - if
 
-	$res = @mysql_free_result($result);
+	$res = mysql_free_result($result);
 	return $res;
 }
+
 // SQL string escaping
-function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
+function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
 	global $link;
 
+	// Link is there?
+	if (!is_resource($link)) return false;
+
 	// Init variable
 	$query = "failed";
 
@@ -270,12 +278,16 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
 		return $query;
 	}
 }
+
 // Get ID from last INSERT command
-function SQL_INSERTID() {
-	return @mysql_insert_id();
+function SQL_INSERTID () {
+	global $link;
+	if (!is_resource($link)) return false;
+	return mysql_insert_id();
 }
+
 // Escape a string for the database
-function SQL_ESCAPE($str, $secureString=true,$strip=true) {
+function SQL_ESCAPE ($str, $secureString=true,$strip=true) {
 	global $link;
 
 	// Secure string first? (which is the default behaviour!)
@@ -310,9 +322,15 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	return SQL_QUERY_ESC($SQL, array(bigintval($id)), $F, $L);
 }
 // ALTER TABLE wrapper function
-function SQL_ALTER_TABLE($sql, $F, $L) {
-	// Shall we add?
-	if (eregi("ADD", $sql) > 0) {
+function SQL_ALTER_TABLE ($sql, $F, $L) {
+	// This is the default result...
+	$result = false;
+
+	// Determine index/fulltext/unique word
+	$noIndex = ((eregi("INDEX", $sql) == false) && (eregi("FULLTEXT", $sql) == false) && (eregi("UNIQUE", $sql) == false);
+
+	// Shall we add/drop?
+	if (((eregi("ADD", $sql) > 0) || (eregi("DROP", $sql) > 0)) && ($noIndex)) {
 		// Extract table name
 		$tableArray = explode(" ", $sql);
 		$tableName = str_replace("`", "", $tableArray[2]);
@@ -324,15 +342,18 @@ function SQL_ALTER_TABLE($sql, $F, $L) {
 		$result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
 			array($tableName, $columnName), $F, $L);
 
-		// Do we have no entry?
-		if (SQL_NUMROWS($result) == 0) {
+		// Do we have no entry on ADD or an entry on DROP?
+		if (((SQL_NUMROWS($result) == 0) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
 			// Do the query
-			return SQL_QUERY($sql, $F, $L, false);
+			$result = SQL_QUERY($sql, $F, $L, false);
 		} // END - if
 	} else {
 		// Send it to the SQL_QUERY() function
-		return SQL_QUERY($sql, $F, $L, false);
+		$result = SQL_QUERY($sql, $F, $L, false);
 	}
+
+	// Return result
+	return $result;
 }
 //
 ?>
diff --git a/inc/extensions/ext-logs.php b/inc/extensions/ext-logs.php
index 385a5dd1c1..74c5ee2ea5 100644
--- a/inc/extensions/ext-logs.php
+++ b/inc/extensions/ext-logs.php
@@ -56,7 +56,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
 	// SQL commands to run
-	$SQLs[] = "DELETE LOW_PRIOIRTY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='logs' LIMIT 1";
+	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='logs' LIMIT 1";
 	break;
 
 case "activate": // Do stuff when admin activates this extension
diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 2afb6ac1cc..d25000b674 100644
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
 	// SQL commands to run
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.','13')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.',13)";
 	break;
 
 case "remove": // Do stuff when removing extension
diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index 8bc5cf8fc9..bc1dccab0d 100644
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -57,8 +57,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 	//
 	// Sponsor data
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_data";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_data (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_data`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_data` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',
@@ -98,8 +98,8 @@ PRIMARY KEY(id)
 	//
 	// Sponsor orders
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_orders";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_orders (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_orders`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_orders` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -118,8 +118,8 @@ PRIMARY KEY(id)
 	//
 	// Pay-types
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_paytypes";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_paytypes (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_paytypes`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_paytypes` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 pay_name VARCHAR(255) NOT NULL DEFAULT '',
 pay_rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
@@ -130,8 +130,8 @@ PRIMARY KEY(id)
 	//
 	// Points-to-action converting
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_action_convert";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_action_convert (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_action_convert`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_action_convert` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',
 conv_rate BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -142,8 +142,8 @@ PRIMARY KEY(id)
 	//
 	// Sponsor menu system (default)
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_menu";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_menu (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_menu`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_menu` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 action VARCHAR(255) NOT NULL DEFAULT '',
 what  VARCHAR(255) NULL DEFAULT NULL,
@@ -157,8 +157,8 @@ PRIMARY KEY(id)
 	//
 	// Registry for performable actions by your sponsors
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_registry";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_registry (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_registry`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_registry` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',
@@ -171,8 +171,8 @@ PRIMARY KEY(id)
 	//
 	// URLs from the sponsors
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_urls";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_urls (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_urls`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_urls` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',
@@ -185,8 +185,8 @@ PRIMARY KEY(id)
 	//
 	// Banners of any size from the sponsors
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_banner";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_banner (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_banner`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_banner` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',
@@ -201,8 +201,8 @@ PRIMARY KEY(id)
 	//
 	// Campaigns
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_campaigns";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_campaigns (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_campaigns`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_campaigns` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -223,8 +223,8 @@ PRIMARY KEY(id)
 	//
 	// Campaigns + URLs + Banner
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_campaign_assigns";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_campaign_assigns (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_campaign_assigns`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_campaign_assigns` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 campaignid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 urlid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -239,8 +239,8 @@ PRIMARY KEY(id)
 	//
 	// Allowed data to display (administrative)
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_admin_data";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_admin_data (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_admin_data`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_admin_data` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 data_row VARCHAR(255) NOT NULL DEFAULT '',
 display ENUM('Y','N') NOT NULL DEFAULT 'N',
@@ -249,8 +249,8 @@ PRIMARY KEY(id)
 	//
 	// Allowed data to display (sponsor-side)
 	//
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_display_data";
-	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_sponsor_display_data (
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_display_data`";
+	$SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_sponsor_display_data` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 data_row VARCHAR(255) NOT NULL DEFAULT '',
@@ -261,46 +261,46 @@ PRIMARY KEY(id)
 	//
 	// Default allowed data to display
 	//
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('id','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('company','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('position','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('tax_ident','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('gender','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('surname','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('family','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr1','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr2','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('zip','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('city','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('country','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('phone','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('fax','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('email','Y')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('url','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('password','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('remote_addr','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('sponsor_created','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_online','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_change','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('status','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('receive_warnings','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('warning_interval','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_amount','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('points_used','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('refid','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('ref_count','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('hash','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_pay','N')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('last_curr','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('id','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('company','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('position','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('tax_ident','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('gender','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('surname','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('family','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('street_nr1','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('street_nr2','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('zip','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('city','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('country','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('phone','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('fax','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('email','Y')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('url','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('password','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('remote_addr','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('sponsor_created','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('last_online','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('last_change','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('status','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('receive_warnings','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('warning_interval','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('points_amount','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('points_used','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('refid','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('ref_count','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('hash','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('last_pay','N')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_admin_data` (data_row, display) VALUES ('last_curr','N')";
 	//
 	// Add default entries
 	//
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_registry (ext_name, is_active, aid, stamp_added) VALUES ('sponsor','N',".GET_CURRENT_ADMIN_ID().",UNIX_TIMESTAMP())";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_action_convert (ext_name, conv_rate, conv_name) VALUES ('sponsor','10','Mails')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Standart-Paket', 5, 1000.00000, '&euro;')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Spar-Paket', 1, 200.00000, '&euro;')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Power-Paket', 10, 2000.00000, '&euro;')";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Sponsor-Paket', 20, 4000.00000, '&euro;')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_registry` (ext_name, is_active, aid, stamp_added) VALUES ('sponsor','N',".GET_CURRENT_ADMIN_ID().",UNIX_TIMESTAMP())";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_action_convert` (ext_name, conv_rate, conv_name) VALUES ('sponsor','10','Mails')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Standart-Paket', 5, 1000.00000, '&euro;')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Spar-Paket', 1, 200.00000, '&euro;')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Power-Paket', 10, 2000.00000, '&euro;')";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Sponsor-Paket', 20, 4000.00000, '&euro;')";
 	//
 	// Admin menu
 	//
@@ -330,36 +330,36 @@ PRIMARY KEY(id)
 	//
 	// Guest menu
 	//
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, what, title, sort) VALUES ('sponsor', NULL, 'Sponsoren', 2)";
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, what, title, sort) VALUES ('sponsor','sponsor_reg','Anmeldung', 1)";
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, what, title, sort) VALUES ('sponsor','sponsor_login','Einloggen', 2)";
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, what, title, sort) VALUES ('sponsor','sponsor_infos','Infos/Preise', 3)";
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, what, title, sort) VALUES ('sponsor','sponsor_agb','AGBs', 4)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor', NULL, 'Sponsoren', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_reg','Anmeldung', 1)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_login','Einloggen', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_infos','Infos/Preise', 3)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_agb','AGBs', 4)";
 	//
 	// Member menu
 	//
-	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (action, what, title, sort) VALUES ('main','sponsor','Unsere Sponsoren', 8)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`, `what`, `title`, `sort`) VALUES ('main','sponsor','Unsere Sponsoren', 8)";
 	//
 	// Add default menus to sponsor menu
 	//
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main', NULL, 'Hauptauswahl','N', 1)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','welcome','Willkommen','N', 1)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','account','Ihr Account','N', 2)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','campaigns','Kampagnen','N', 3)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','urls','URL-Verwaltung','N', 4)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','banner','Banner-Verwaltung','N', 5)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','settings','Einstellungen','N', 6)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','fillup','Konto auff&uuml;llen','N', 7)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','stats','Statistiken','N', 8)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','inquiry','Kontaktanfrage','N', 9)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('main','refid','Referal-Link','N', 10)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions', NULL, 'Sponsorenaktionen','N', 2)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','mail','Sponsor-Mail','N', 1)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','banner','Banner buchen','N', 2)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('actions','text','Textlink buchen','N', 3)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout', NULL, 'Ausloggen','N', 3)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout','logout','Ausloggen','N', 1)";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_menu (action, what, title, active, sort) VALUES ('logout','guest','Zum Gastbereich','N', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main', NULL, 'Hauptauswahl','N', 1)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','welcome','Willkommen','N', 1)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','account','Ihr Account','N', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','campaigns','Kampagnen','N', 3)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_urls','URL-Verwaltung','N', 4)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_banner','Banner-Verwaltung','N', 5)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','settings','Einstellungen','N', 6)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','fillup','Konto auff&uuml;llen','N', 7)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','stats','Statistiken','N', 8)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','inquiry','Kontaktanfrage','N', 9)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','refid','Referal-Link','N', 10)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions', NULL, 'Sponsorenaktionen','N', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','mail','Sponsor-Mail','N', 1)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','banner','Banner buchen','N', 2)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','text','Textlink buchen','N', 3)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout', NULL, 'Ausloggen','N', 3)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','logout','Ausloggen','N', 1)";
+	$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','guest','Zum Gastbereich','N', 2)";
 	//
 	// General configuration stuff
 	//
@@ -372,18 +372,18 @@ PRIMARY KEY(id)
 
 case "remove": // Do stuff when removing extension
 	// SQL commands to run
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_data";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_orders";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_action_convert";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_paytypes";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_menu";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_registry";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_urls";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_banner";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_campaigns";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_campaign_assigns";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_admin_data";
-	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_sponsor_display_data";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_data`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_orders`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_action_convert`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_paytypes`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_menu`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_registry`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_urls`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_banner`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_campaigns`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_campaign_assigns`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_admin_data`";
+	$SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_sponsor_display_data`";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd') LIMIT 20";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_guest_menu` WHERE action='sponsor' LIMIT 5";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_member_menu` WHERE what='sponsor' LIMIT 1";
@@ -393,16 +393,16 @@ case "activate": // Do stuff when admin activates this extension
 	// SQL commands to run
 	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_guest_menu` SET visible='Y', locked='N' WHERE action='sponsor' LIMIT 4";
 	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET visible='Y', locked='N' WHERE what='sponsor' LIMIT 1";
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_sponsor_menu SET active='Y' WHERE active='N'";
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_sponsor_registry SET is_active='Y' WHERE is_active='N'";
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_sponsor_menu` SET active='Y' WHERE active='N'";
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_sponsor_registry` SET is_active='Y' WHERE is_active='N'";
 	break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
 	// SQL commands to run
 	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_guest_menu` SET visible='N', locked='Y' WHERE action='sponsor' LIMIT 4";
 	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET visible='N', locked='Y' WHERE what='sponsor' LIMIT 1";
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_sponsor_menu SET active='N' WHERE active='Y'";
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_sponsor_registry SET is_active='N' WHERE is_active='Y'";
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_sponsor_menu` SET active='N' WHERE active='Y'";
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_sponsor_registry` SET is_active='N' WHERE is_active='Y'";
 	break;
 
 case "update": // Update an extension
diff --git a/inc/functions.php b/inc/functions.php
index 6a87f258cc..b326dab098 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3013,6 +3013,23 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
 	return $content;
 }
 
+// Writes content to a file
+function WRITE_FILE ($FQFN, $content) {
+	// Is the function there?
+	if (function_exists('file_put_contents')) {
+		// Write it directly
+		file_put_contents($FQFN, $content);
+	} else {
+		// Write it with fopen
+		$fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+		fwrite($fp, $content);
+		fclose($fp);
+
+		// Set CHMOD rights
+		chmod($FQFN, 0644);
+	}
+}
+
 // Generates an error code from given account status
 function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
 	// Default error code if unknown account status
@@ -3043,6 +3060,48 @@ function clearOutputBuffer () {
 	} // END - if
 }
 
+// "Getter" for revision/version data
+function getActualVersion ($type = 0) {
+	// By default nothing is new... ;-)
+	$new = false;
+
+	// FQFN of revision file
+	$FQFN = sprintf("%sinc/cache/.revision", PATH);
+
+	// Check for revision file
+	if (!FILE_READABLE($FQFN)) {
+		// Not found, so we need to create it
+		$new = true;
+	} else {
+		// Revision file found
+		$ins_vers = explode("\n", READ_FILE($FQFN));
+
+		// Is the content valid?
+		if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$type])) || ($ins_vers[0]) == "new") {
+			// File needs update!
+			$new = true;
+		} else {
+			// Revision-File has valid Data and isn't 'new' so return the Rev-Number
+			return trim($ins_vers[$type]);
+		}
+	}
+
+	if ($new)  {
+		// no Revision-File or has no valid Data so read the Revision from the Server.
+		$version = GET_URL("check-updates3.php");
+
+		// Prepare content
+		$akt_vers[] = trim($version[10]);
+		$akt_vers[] = trim($version[9]);
+		$akt_vers[] = trim($version[8]);
+
+		// Write file
+		WRITE_FILE($FQFN, implode("\n", $akt_vers));
+
+		// Return requested content
+		return trim($akt_vers[$type]);
+	}
+}
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
diff --git a/inc/gen_refback.php b/inc/gen_refback.php
index 444a85ace8..16dbc51d1d 100644
--- a/inc/gen_refback.php
+++ b/inc/gen_refback.php
@@ -44,13 +44,13 @@ require_once(PATH."inc/libs/refback_functions.php");
 $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_refsystem WHERE level=0", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {
 	// Remove index temporaly
-	SQL_QUERY("ALTER TABLE `"._MYSQL_PREFIX."_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__);
+	SQL_ALTER_TABLE("ALTER TABLE `"._MYSQL_PREFIX."_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__);
 
 	// Upgrade refsystem, ref-level 0 is silly here
 	SQL_QUERY("UPDATE "._MYSQL_PREFIX."_refsystem SET level=level+1", __FILE__, __LINE__);
 
 	// Add it again
-	SQL_QUERY("ALTER TABLE `"._MYSQL_PREFIX."_refsystem` ADD UNIQUE `userid_level` ( `userid` , `level` )", __FILE__, __LINE__);
+	SQL_ALTER_TABLE("ALTER TABLE `"._MYSQL_PREFIX."_refsystem` ADD UNIQUE `userid_level` ( `userid` , `level` )", __FILE__, __LINE__);
 
 	// Rebuild cache
 	REBUILD_CACHE("refsystem", "refsystem");
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 9f822c302e..62ef9909e9 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -74,22 +74,17 @@ if (getConfig('file_hash') == "") {
 	$file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
 	$file = PATH."inc/.secret/.".$file_hash;
 
+	// Count of chars to be taken from back of the string
+	$nums = mt_rand(40, 45);
+
+	// Generate secret key from a randomized string
+	$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
+
 	// File hash was never created
-	$fp = @fopen($file, 'w') or mxchange_die("Cannot write secret key file!");
-	if ($fp != false) {
-		// Could write to secret file! So let's generate the secret key...
-		// 1. Count of chars to be taken from back of the string
-		$nums = mt_rand(40, 45);
-		// 2. Generate secret key from a randomized string
-		$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
-		// 3. Write the key to the file
-		fwrite($fp, $secretKey);
-		// 4. Close file
-		fclose($fp);
-
-		// Change access rights for more security
-		@chmod($file, 0644);
+	WRITE_FILE($file, $secretKey);
 
+	// Is the file there?
+	if (FILE_READABLE($file)) {
 		//* DEBUG: */ unlink($file);
 		//* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
 		//* DEBUG: */ $test = generateHash(str_replace('.', "", $test));
@@ -99,17 +94,13 @@ if (getConfig('file_hash') == "") {
 		SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
 			array($file_hash), __FILE__, __LINE__);
 
+		// Generate FQFN for .htaccess file
+		$FQFN = PATH."inc/.secret/.htaccess";
+
 		// Is the .htaccess file there?
-		if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+		if (!FILE_READABLE($FQFN)) {
 			// Also create .htaccess file
-			$fp = @fopen(PATH."inc/.secret/.htaccess", 'w') or mxchange_die("Cannot write to .htaccess file!");
-			if ($fp != false) {
-				// Add deny line to file
-				fwrite($fp, "Deny from all");
-
-				// Close the file
-				fclose($fp);
-			} // END - if
+			WRITE_FILE($FQFN, "Deny from all\n");
 		} // END - if
 
 		// Also update configuration
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index f5774c69e5..6e07f8f46c 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -69,7 +69,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
 					$SAVE = false;
 				} else {
 					// Do we want to add a new sponsor or update his data?
-					$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE email='%s' LIMIT 1",
+					$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE email='%s' LIMIT 1",
 						array($POST['email']), __FILE__, __LINE__);
 
 					// Is a sponsor alread in the db?
@@ -125,7 +125,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
 		// Update?
 		if ($UPDATE) {
 			// Update his data
-			$SQL = "UPDATE "._MYSQL_PREFIX."_sponsor_data SET ";
+			$SQL = "UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET ";
 			foreach ($DATA['keys'] as $k => $v) {
 				$SQL .= $v."='%s', ";
 			}
@@ -160,7 +160,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
 			$VALUES = str_repeat("%s', '", count($DATA['values']) - 1);
 
 			// Generate string
-			$SQL = "INSERT INTO "._MYSQL_PREFIX."_sponsor_data (".$KEYS.") VALUES ('".$VALUES."%s')";
+			$SQL = "INSERT INTO `"._MYSQL_PREFIX."_sponsor_data` (".$KEYS.") VALUES ('".$VALUES."%s')";
 
 			// Generate message
 			$MSG = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_ADDED, "added", $MSGs);
@@ -264,7 +264,7 @@ function IS_SPONSOR () {
 	$ret = false;
 	if ((isSessionVariableSet('sponsorid'))) && (isSessionVariableSet('sponsorpass')))) {
 		// Check cookies against database records...
-		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_sponsor_data
+		$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' AND password='%s' AND status='CONFIRMED' LIMIT 1",
 			array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
@@ -287,7 +287,7 @@ function GENERATE_SPONSOR_MENU($current)
 	if (IS_ADMIN()) $WHERE = "";
 
 	// Load main menu entries
-	$result_main = SQL_QUERY("SELECT action, title FROM "._MYSQL_PREFIX."_sponsor_menu
+	$result_main = SQL_QUERY("SELECT action, title FROM `"._MYSQL_PREFIX."_sponsor_menu`
 WHERE (what='' OR what IS NULL) ".$WHERE."
 ORDER BY sort", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0)
@@ -296,7 +296,7 @@ ORDER BY sort", __FILE__, __LINE__);
 		while(list($action, $title_main) = SQL_FETCHROW($result_main))
 		{
 			// Load sub menus
-			$result_sub = SQL_QUERY_ESC("SELECT what, title FROM "._MYSQL_PREFIX."_sponsor_menu
+			$result_sub = SQL_QUERY_ESC("SELECT what, title FROM `"._MYSQL_PREFIX."_sponsor_menu`
 WHERE action='%s' AND what != '' AND what IS NOT NULL ".$WHERE."
 ORDER BY sort", array($action), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result_sub) > 0)
@@ -374,7 +374,7 @@ function UPDATE_SPONSOR_LOGIN () {
 	// Is sponsor?
 	if (IS_SPONSOR()) {
 		// Update last online timestamp
-		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data
+		SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data`
 SET last_online=UNIX_TIMESTAMP()
 WHERE id='%s' AND password='%s' LIMIT 1",
 			array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
@@ -417,7 +417,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
 	$DATA = array();
 
 	// Prepare SQL string
-	$SQL = "UPDATE "._MYSQL_PREFIX."_sponsor_data SET";
+	$SQL = "UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET";
 	foreach ($POST as $key => $value) {
 		// Mmmmm, too less security here???
 		$SQL   .= " ".strip_tags($key)."='%s',";
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index f0e1ed2cd7..cc989decf4 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -439,37 +439,37 @@ ORDER BY beg_points DESC, userid";
 
 	if (EXT_IS_ACTIVE("sponsor")) {
 		// List all sponsors
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` ORDER BY id";
 		$WHATs[]  = "list_sponsor";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_TITLE;
 
 		// List confirmed sponsor accounts
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='CONFIRMED' ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE status='CONFIRMED' ORDER BY id";
 		$WHATs[]  = "list_sponsor";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED_TITLE;
 
 		// List unconfirmed sponsor accounts
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='UNCONFIRMED' ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE status='UNCONFIRMED' ORDER BY id";
 		$WHATs[]  = "list_sponsor";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED_TITLE;
 
 		// List locked sponsor accounts
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='LOCKED' ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE status='LOCKED' ORDER BY id";
 		$WHATs[]  = "list_sponsor";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED_TITLE;
 
 		// List waiting sponsor accounts to be approved
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='PENDING' ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE status='PENDING' ORDER BY id";
 		$WHATs[]  = "unlock_sponsor";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR_PENDING;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_PENDING_TITLE;
 
 		// Waiting payments
-		$SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_orders WHERE pay_status='PENDING' ORDER BY id";
+		$SQLs[]   = "SELECT id FROM `"._MYSQL_PREFIX."_sponsor_orders` WHERE pay_status='PENDING' ORDER BY id";
 		$WHATs[]  = "list_sponsor_pays";
 		$DESCRs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS;
 		$TITLEs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS_TITLE;
diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 9bf42b7830..8f850b5a2b 100644
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['id'])) {
 	// Check for selected sponsor
-	$result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 		array(bigintval($_GET['id'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Remove sponsor
@@ -63,11 +63,11 @@ if (!empty($_GET['id'])) {
 			SEND_EMAIL($email, SPONSOR_ADMIN_DEL_SUBJECT, $msg);
 
 			// Remove account
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 				array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
 			// Remove orders
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_sponsor_orders WHERE sponsorid='%s' LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_sponsor_orders` WHERE sponsorid='%s' LIMIT 1",
 				array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
 			// Output message
diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 8e496ed325..f265cca365 100644
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 	// Check for selected sponsor
-	$result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 	 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Load sponsor details
@@ -109,7 +109,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 					$POINTS = strval(REVERT_COMMA($_POST['points']));
 
 					// Add points to account
-					SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET points_amount=points_amount+%s WHERE id='%s' LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET points_amount=points_amount+%s WHERE id='%s' LIMIT 1",
 						array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
 					// Remember points /reason for the template
@@ -132,7 +132,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 					$POINTS = strval(REVERT_COMMA($_POST['points']));
 
 					// Add points to account
-					SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET points_used=points_used+%s WHERE id='%s' LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET points_used=points_used+%s WHERE id='%s' LIMIT 1",
 						array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
 					// Remember points /reason for the template
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index b4161cb7c9..b9b23e6f18 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -279,10 +279,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	// By default list menus
 	if (empty($SUB)) {
 		// List only main menus
-		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_guest_menu` WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `"._MYSQL_PREFIX."_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	} else {
 		// List sub menus
-		$result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_guest_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC",
+		$result = SQL_QUERY_ESC("SELECT `id`, `action`, `what`, `title`, `sort` FROM `"._MYSQL_PREFIX."_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
 		 array($SUB), __FILE__, __LINE__);
 	}
 
diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 8d46591038..3aceeb5f01 100644
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 if (!empty($_GET['id'])) {
 	// Show detailed informations to a sponsor
 	$result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' LIMIT 1",
  array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
@@ -58,7 +58,7 @@ WHERE id='%s' LIMIT 1",
 		}
 
 		// Check for sponsor's orders (only count)
-		$result_orders = SQL_QUERY_ESC("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_sponsor_orders WHERE sponsorid='%s'",
+		$result_orders = SQL_QUERY_ESC("SELECT COUNT(id) FROM `"._MYSQL_PREFIX."_sponsor_orders` WHERE sponsorid='%s'",
 		 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 		list($orders) = SQL_FETCHROW($result_orders);
 		SQL_FREERESULT($result_orders);
@@ -113,7 +113,7 @@ WHERE id='%s' LIMIT 1",
 	}
 } elseif (!empty($_GET['rid'])) {
 	// Search for sponsor
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 	 array(bigintval($_GET['rid'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Free memory
@@ -121,7 +121,7 @@ WHERE id='%s' LIMIT 1",
 
 		// Sponsor found so let's list all his referals
 		$result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr, ref_count
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE refid='%s' ORDER BY id",
  array(bigintval($_GET['rid'])), __FILE__, __LINE__);
 
@@ -140,7 +140,7 @@ WHERE refid='%s' ORDER BY id",
 } else {
 	// List all sponsors
 	$result_main = SQL_QUERY("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr
-FROM "._MYSQL_PREFIX."_sponsor_data ORDER BY id", __FILE__, __LINE__);
+FROM `"._MYSQL_PREFIX."_sponsor_data` ORDER BY id", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
 		// At least one sponsor found!
 		$OUT = ""; $SW = 2;
diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index e8052b9a08..7d6cace8ea 100644
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -64,7 +64,7 @@ if (isset($_POST['add'])) {
 			$id = bigintval($id);
 
 			// Save entry
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_paytypes
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_paytypes`
 SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id='%s' LIMIT 1",
  array($_POST['name'][$id], $_POST['rate'][$id], bigintval($_POST['min'][$id]), $_POST['curr'][$id], $id),
  __FILE__, __LINE__);
@@ -76,7 +76,7 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
 		// Remove entries here...
 		foreach ($_POST['id'] as $id => $sel) {
 			// Remove entry
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_sponsor_paytypes WHERE id='%s' LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_sponsor_paytypes` WHERE id='%s' LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
 		}
 
@@ -93,11 +93,11 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
 
 if (isset($_POST['add'])) {
 	// Check if entry with same name does exists
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_sponsor_paytypes WHERE pay_name='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_sponsor_paytypes` WHERE pay_name='%s' LIMIT 1",
 	 array($_POST['pay_name']), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// No entry found so add this line
-		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_sponsor_paytypes (pay_name, pay_rate, pay_min_count, pay_currency)
+		SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_sponsor_paytypes` (pay_name, pay_rate, pay_min_count, pay_currency)
  VALUES ('%s','%s','%s','%s')",
  array(htmlspecialchars($_POST['pay_name']), REVERT_COMMA($_POST['pay_rate']), bigintval($_POST['pay_min_count']), htmlspecialchars($_POST['pay_currency'])),
  __FILE__, __LINE__);
@@ -120,7 +120,7 @@ if (isset($_POST['add'])) {
 	$OUT = ""; $SW = 2;
 	foreach ($_POST['id'] as $id => $sel) {
 		// Load entry
-		$result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM "._MYSQL_PREFIX."_sponsor_paytypes WHERE id='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `"._MYSQL_PREFIX."_sponsor_paytypes` WHERE id='%s' LIMIT 1",
 		 array(bigintval($id)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
@@ -166,7 +166,7 @@ if (isset($_POST['add'])) {
 	}
 } else {
 	// Load all payment types
-	$result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_min_count, pay_currency FROM "._MYSQL_PREFIX."_sponsor_paytypes ORDER BY pay_name",
+	$result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_min_count, pay_currency FROM `"._MYSQL_PREFIX."_sponsor_paytypes` ORDER BY pay_name",
 	 __FILE__, __LINE__);
 
 	// Do we have some paytypes setup?
diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php
index 146536da7a..39038484be 100644
--- a/inc/modules/admin/what-list_sponsor_pays.php
+++ b/inc/modules/admin/what-list_sponsor_pays.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['id'])) {
 	// Check for selected sponsor
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 	 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// ...
diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index 96d40ae5b0..53034beb33 100644
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -43,7 +43,7 @@ $MSG = "";
 
 if (!empty($_GET['id'])) {
 	// Check for selected sponsor
-	$result = SQL_QUERY_ESC("SELECT gender, surname, family, email, status FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT gender, surname, family, email, status FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE id='%s' LIMIT 1",
 	 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Get sponsor's current status and let only confirmed and locked status pass
@@ -78,7 +78,7 @@ if (!empty($_GET['id'])) {
 				SEND_EMAIL($email, $subject, $msg);
 
 				// Update sponsor's account
-				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='".$status."' WHERE id='%s' LIMIT 1",
+				SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET status='".$status."' WHERE id='%s' LIMIT 1",
 					array(bigintval($_GET['id'])), __FILE__, __LINE__);
 			} elseif (!empty($_POST['no'])) {
 				// No don't lock / unlock now!
diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 0e959659de..bed2bab1f1 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -51,7 +51,7 @@ if (isset($_POST['ok'])) {
 
 			// Load his personal data
 			$result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE status='PENDING' AND id='%s' LIMIT 1",
  array($id), __FILE__, __LINE__);
 			$refid = 0;
@@ -62,8 +62,8 @@ WHERE status='PENDING' AND id='%s' LIMIT 1",
 				// Check for open payments and close them
 				$result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
 sp.pay_name, sp.pay_rate, sp.pay_currency
-FROM "._MYSQL_PREFIX."_sponsor_orders AS so
-LEFT JOIN "._MYSQL_PREFIX."_sponsor_paytypes AS sp
+FROM `"._MYSQL_PREFIX."_sponsor_orders` AS so
+LEFT JOIN `"._MYSQL_PREFIX."_sponsor_paytypes` AS sp
 ON sp.id=so.payid
 WHERE so.sponsorid='%s'
 ORDER BY sp.pay_name",
@@ -103,14 +103,14 @@ ORDER BY sp.pay_name",
 			SQL_FREERESULT($result_main);
 
 			// Unlock sponsor account
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='CONFIRMED'
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET status='CONFIRMED'
 WHERE id='%s' AND status='PENDING' LIMIT 1",
  array($id), __FILE__, __LINE__);
 
 			// Update, if applyable, referal count and points
 			if (($refid > 0) && ($refid != $id)) {
 				// Update referal account
-				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data
+				SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data`
 SET points_amount=points_amount+%s, ref_count=ref_count+1
 WHERE id='%s' LIMIT 1",
  array(getConfig('sponsor_ref_points'), bigintval($refid)), __FILE__, __LINE__);
@@ -120,7 +120,7 @@ WHERE id='%s' LIMIT 1",
 					// Load referal's data
 					$result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email,
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' LIMIT 1",
  array(bigintval($refid)), __FILE__, __LINE__);
 					$REFERRAL = SQL_FETCHARRAY($result);
@@ -164,7 +164,7 @@ WHERE id='%s' LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT id, gender, surname, family, email, remote_addr, sponsor_created
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE status='PENDING' ORDER BY id", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 1c999753f5..7dbcd2fdd6 100644
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -51,9 +51,9 @@ unset($result_act);
 
 // Load all sponsor actions
 $result_act = SQL_QUERY("SELECT DISTINCT m.title, c.conv_rate, c.conv_name
-FROM "._MYSQL_PREFIX."_sponsor_menu AS m
-LEFT JOIN "._MYSQL_PREFIX."_sponsor_action_convert AS c ON m.what=c.ext_name
-LEFT JOIN "._MYSQL_PREFIX."_sponsor_registry AS r ON m.what=r.ext_name
+FROM `"._MYSQL_PREFIX."_sponsor_menu` AS m
+LEFT JOIN `"._MYSQL_PREFIX."_sponsor_action_convert` AS c ON m.what=c.ext_name
+LEFT JOIN `"._MYSQL_PREFIX."_sponsor_registry` AS r ON m.what=r.ext_name
 WHERE m.action='actions' AND r.is_active='Y'
 ORDER BY m.sort ASC", __FILE__, __LINE__);
 $num_act = SQL_NUMROWS($result_act);
@@ -76,7 +76,7 @@ if ($num_act > 0) {
 	} // END - while
 
 	// Check for pay types
-	$result_pay = SQL_QUERY("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM "._MYSQL_PREFIX."_sponsor_paytypes ORDER BY pay_name", __FILE__, __LINE__);
+	$result_pay = SQL_QUERY("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `"._MYSQL_PREFIX."_sponsor_paytypes` ORDER BY pay_name", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_pay) > 0) {
 		// Load all pay types
 		$OUT_PAY = ""; $SW = 2;
diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index c175a55b8b..b81d0b51b0 100644
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -63,7 +63,7 @@ if (!empty($_GET['hash'])) {
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE hash='%s' AND (status='UNCONFIRMED' OR status='EMAIL')
 LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
@@ -78,7 +78,7 @@ LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
 		// Unconfirmed account or changed email address?
 		if ($SPONSOR['status'] == "UNCONFIRMED") {
 			// Set account to pending
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='PENDING'
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET status='PENDING'
 WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 
@@ -99,7 +99,7 @@ WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
 			}
 		} elseif ($SPONSOR['status'] == "EMAIL") {
 			// Changed email adress need to be confirmed
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='CONFIRMED'
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET status='CONFIRMED'
 WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 
@@ -132,7 +132,7 @@ WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
 	if (isset($_POST['ok'])) {
 		// Check email
 		$result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
 			array($_POST['email']), __FILE__, __LINE__);
 
@@ -178,7 +178,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
 	if (isset($_POST['ok'])) {
 		// Check email
 		$result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
 			array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
 		// Entry found?
@@ -198,7 +198,7 @@ WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
 			SEND_EMAIL($_POST['email'], SPONSOR_LOST_PASSWORD_SUBJ, $msg_sponsor);
 
 			// Update password
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET password='%s'
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_sponsor_data` SET password='%s'
 WHERE id='%s' LIMIT 1",
  array(md5($SPONSOR['password']), bigintval($SPONSOR['id'])), __FILE__, __LINE__);
 
@@ -217,7 +217,7 @@ WHERE id='%s' LIMIT 1",
 	}
 } elseif (isset($_POST['ok'])) {
 	// Check status and login data ...
-	$result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_sponsor_data
+	$result = SQL_QUERY_ESC("SELECT status FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_POST['sponsorid']), md5($_POST['pass'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index d718d37849..cfd9279b35 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -211,7 +211,7 @@ if ((isset($_POST['ok'])) && (count($FORM_ERRORS) == 0)) {
 
 	// Calulate points
 	$result = SQL_QUERY_ESC("SELECT (pay_rate * pay_min_count) AS points, pay_min_count AS pay, pay_currency AS curr
-FROM "._MYSQL_PREFIX."_sponsor_paytypes
+FROM `"._MYSQL_PREFIX."_sponsor_paytypes`
 WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
 	list($points, $pay, $curr) = SQL_FETCHROW($result);
 
@@ -232,7 +232,7 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
 	{
 	case "added": // Sponsor successfully added with account status = UNCONFIRMED!
 		// Check for his ID number
-		$result = SQL_QUERY_ESC("SELECT id, hash FROM "._MYSQL_PREFIX."_sponsor_data WHERE email='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT id, hash FROM `"._MYSQL_PREFIX."_sponsor_data` WHERE email='%s' LIMIT 1",
 		 array($_POST['email']), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
@@ -286,7 +286,7 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
 } else {
 	// Check for payment types
 	$result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_currency, pay_min_count
-FROM "._MYSQL_PREFIX."_sponsor_paytypes
+FROM `"._MYSQL_PREFIX."_sponsor_paytypes`
 ORDER BY pay_name", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Load all types...
diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 747104be27..d13ff959c8 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -48,7 +48,7 @@ $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
 gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {
diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index b1b2464830..7b846b9a8f 100644
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, gender
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {
diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 0c4be62050..f836205809 100644
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 
 // Load some data
 $result = SQL_QUERY_ESC("SELECT gender, surname, family, (points_amount - points_used) AS points
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `"._MYSQL_PREFIX."_sponsor_data`
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 list($gender, $surname, $family, $points) = SQL_FETCHROW($result);
diff --git a/templates/de/html/ext/ext_logs.tpl b/templates/de/html/ext/ext_logs.tpl
new file mode 100644
index 0000000000..dac00a3c63
--- /dev/null
+++ b/templates/de/html/ext/ext_logs.tpl
@@ -0,0 +1,3 @@
+Verwalten und Downloaden Sie die access_logs von Ihrem Server.
+<strong>Wichtig:</strong> Dies muss auch von Ihrem Server unterst&uuml;tzt
+sein!
diff --git a/templates/de/html/ext/ext_mailid.tpl b/templates/de/html/ext/ext_mailid.tpl
index 862ef3664a..c273d42f51 100644
--- a/templates/de/html/ext/ext_mailid.tpl
+++ b/templates/de/html/ext/ext_mailid.tpl
@@ -1,2 +1,2 @@
-Platzhalter f&uuml;r sp&auml;tere Updates. Vorsicht! Sichern Sie zuerst
-Ihre ge&auml;nderten Templates ab!
+Diese Erweiterung erlaubt es Ihren Mitgliedern, Mails zu best&auml;tigen. Sie
+gilt somit als "essential" und sollte immer installiert und aktiviert sein.
diff --git a/templates/de/html/ext/ext_maintenance.tpl b/templates/de/html/ext/ext_maintenance.tpl
index 22e15a66f6..f49c9dc446 100644
--- a/templates/de/html/ext/ext_maintenance.tpl
+++ b/templates/de/html/ext/ext_maintenance.tpl
@@ -1 +1,10 @@
-Platzhalter f&uuml;r sp&auml;tere Updates.
+Schalten Sie Ihren {!MT_WORD!} in den Wartungsmodus, wenn dieser mal nicht
+funktionieren sollte und Sie in Ruhe dran debuggen m&uuml;ssen. Bitte
+aktualisieren dann zuerst Ihre SVN-Version (SVN-Update) und falls Sie den
+Fehler nicht selber finden k&ouml;nnen, melden Sie sich bitte im
+<a href="http://forum.mxchange.org/" rel="external" target="_blank"
+ title="Direkt-Link zum Support-Forum">Forum</a> und/oder <a rel="external"
+ href="http://bugs.mxchange.org/" target="_blank"
+ title="Direkt-Link zum Bug-Tracker">Bug-Tracker</a>.<br />
+<br />
+Danke f&uuml;r Ihre Mithilfe bei der Suche nach Bugs! :-)
diff --git a/templates/de/html/ext/ext_mydata.tpl b/templates/de/html/ext/ext_mydata.tpl
index 955e791b90..81be68da8f 100644
--- a/templates/de/html/ext/ext_mydata.tpl
+++ b/templates/de/html/ext/ext_mydata.tpl
@@ -1,2 +1,3 @@
-Ausgelagerter Link &quot;Profildaten &auml;ndern&quot; aus dem
-Mitgliedsbereich. Dient als Platzhalter f&uuml;r sp&auml;tere Versionen!
+Diese Erweiterung erlaubt es Ihren Mitgliedern, Ihre Profildaten zu
+&auml;ndern. Sie sollte daher in keinem {!MT_WORD!} fehlen und immer
+aktiviert sein.
diff --git a/templates/de/html/ext/ext_other.tpl b/templates/de/html/ext/ext_other.tpl
index e6f90d35b7..7df643af6d 100644
--- a/templates/de/html/ext/ext_other.tpl
+++ b/templates/de/html/ext/ext_other.tpl
@@ -1,2 +1,2 @@
-Andere Administrative Funktionen. Diese Erweiterung dient derzeit als
-Platzhalter, um das sp&auml;tere Patchen der Datenbank zu erleichtern.
+Weitere wichtige Einstellungen zu Ihrem {!MT_WORD!}. Diese Erweiterung sollte
+immer installiert und aktiviert sein.
diff --git a/templates/de/html/ext/ext_register.tpl b/templates/de/html/ext/ext_register.tpl
index e4a368996e..0a3e41a64f 100644
--- a/templates/de/html/ext/ext_register.tpl
+++ b/templates/de/html/ext/ext_register.tpl
@@ -1,4 +1,2 @@
-Platzhalter f&uuml;r sp&auml;tere Updates. Derzeit k&ouml;nnen Sie
-Pflichtfelder im Anmeldeformular (noch nicht im Mitgliedsbereich unter
-Profildaten &auml;ndern) vorgeben. Diese m&uuml;sen dann bei der
-Anmeldung eingegeben werden.
+Das Anmeldeformular zu Ihrem {!MT_WORD!}. Bitte installieren Sie diese
+Erweiterung und aktivieren Sie diese auch.
diff --git a/templates/de/html/ext/ext_usage.tpl b/templates/de/html/ext/ext_usage.tpl
new file mode 100644
index 0000000000..b248e6a9fc
--- /dev/null
+++ b/templates/de/html/ext/ext_usage.tpl
@@ -0,0 +1,2 @@
+Schauen Sie sich Ihre Server-Statistiken - derzeit werden nur
+Webalizer-Statistiken unterst&uuml;tzt bequem aus Ihrem Adminbereich an.
-- 
2.39.5