From: Roland Häder <roland@mxchange.org>
Date: Mon, 4 Feb 2008 21:25:45 +0000 (+0000)
Subject: login bonus will no longer be payed when turned off, "Y/N" rewritten to 'Y/N'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e1653405d28923c78b2e292125306ccf61138f24;p=mailer.git

login bonus will no longer be payed when turned off, "Y/N" rewritten to 'Y/N'
---

diff --git a/beg.php b/beg.php
index 9d5380cb87..baffdec97f 100644
--- a/beg.php
+++ b/beg.php
@@ -145,10 +145,10 @@ if (defined('mxchange_installed') && (mxchange_installed))
 
 				// Set mode depending on how many mails the member has to confirm
 				$locked = false;
-				if (($ref_payout > 0) && ($CONFIG['allow_direct_pay'] == "N")) $locked = true;
+				if (($ref_payout > 0) && ($CONFIG['allow_direct_pay'] == 'N')) $locked = true;
 
 				// Is begging rallye active?
-				if ($CONFIG['beg_rallye'] == "Y")
+				if ($CONFIG['beg_rallye'] == 'Y')
 				{
 					// Add points to rallye account
 					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET beg_points=beg_points+%s WHERE userid=%d LIMIT 1",
diff --git a/birthday_confirm.php b/birthday_confirm.php
index abc3bad31f..b65d5e1b0a 100644
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -73,7 +73,7 @@ WHERE b.userid=%d AND b.chk_value='%s' LIMIT 1",
 		{
 			// Set mode depending on how many mails the member has to confirm
 			$locked = false;
-			if (($ref_payout > 0) && ($CONFIG['allow_direct_pay'] == "N")) $locked = true;
+			if (($ref_payout > 0) && ($CONFIG['allow_direct_pay'] == 'N')) $locked = true;
 
 			// Add points to account
 			ADD_POINTS_REFSYSTEM($uid, $GIFT, false, "0", $locked, strtolower($CONFIG['birthday_mode']));
diff --git a/doubler.php b/doubler.php
index a630b2a4f4..637bd4411d 100644
--- a/doubler.php
+++ b/doubler.php
@@ -299,7 +299,7 @@ if (defined('mxchange_installed') && (mxchange_installed))
 	}
 
 	// Generate table with already payed out doubles
-	define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));
+	define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", 'Y', 'N', "DESC"));
 
 	// Generate timemark
 	define('__TIMEOUT_MARK', CREATE_FANCY_TIME($CONFIG['doubler_timeout']));
diff --git a/inc/autopurge.php b/inc/autopurge.php
index 52ac704727..aa393cf9b5 100644
--- a/inc/autopurge.php
+++ b/inc/autopurge.php
@@ -38,7 +38,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 	require($INC);
 }
 
-if (($CONFIG['auto_purge_active'] == "Y") && ($CONFIG['auto_purge'] > 0))
+if (($CONFIG['auto_purge_active'] == 'Y') && ($CONFIG['auto_purge'] > 0))
 {
 	// First calculate the timestamp
 	if (function_exists('CREATE_TIME_SELECTIONS'))
@@ -162,7 +162,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 }
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if ($CONFIG['ap_inactive'] == "Y")
+if ($CONFIG['ap_inactive'] == 'Y')
 {
 	// Ok, let's have a look...
 	$since = bigintval(time() - $CONFIG['ap_in_since']);
@@ -260,7 +260,7 @@ ORDER BY userid",
 		$UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
 		// Send mail notification to admin
-		if ($CONFIG['ap_un_mail'] == "Y")
+		if ($CONFIG['ap_un_mail'] == 'Y')
 		{
 			if (GET_EXT_VERSION("admins") >= "0.4.1")
 			{
@@ -279,7 +279,7 @@ ORDER BY userid",
 }
 
 // Shall I auto-purge unconfirmed accounts?
-if ($CONFIG['ap_unconfirmed'] == "Y")
+if ($CONFIG['ap_unconfirmed'] == 'Y')
 {
 	// Init variables and find unconfirmed accounts which I shall auto-purge
 	$time = bigintval(time() - $CONFIG['ap_un_time']);
@@ -308,7 +308,7 @@ if ($CONFIG['ap_unconfirmed'] == "Y")
 		$UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
 		// Send mail notification to admin
-		if ($CONFIG['ap_un_mail'] == "Y")
+		if ($CONFIG['ap_un_mail'] == 'Y')
 		{
 			if (GET_EXT_VERSION("admins") >= "0.4.1")
 			{
@@ -327,7 +327,7 @@ if ($CONFIG['ap_unconfirmed'] == "Y")
 }
 
 // Check version (must be > 0.0)
-if ((GET_EXT_VERSION("task") > "0.0") && ($CONFIG['ap_tasks'] == "Y"))
+if ((GET_EXT_VERSION("task") > "0.0") && ($CONFIG['ap_tasks'] == 'Y'))
 {
 	// Purge deleted tasks (no notification to admin)
 	$since = bigintval(time() - $CONFIG['ap_tasks_time']);
@@ -335,7 +335,7 @@ if ((GET_EXT_VERSION("task") > "0.0") && ($CONFIG['ap_tasks'] == "Y"))
 	 array($since), __FILE__, __LINE__);
 	$DELETED = SQL_AFFECTEDROWS();
 
-	if (($DELETED > 0) && ($CONFIG['ap_tasks_mail'] == "Y"))
+	if (($DELETED > 0) && ($CONFIG['ap_tasks_mail'] == 'Y'))
 	{
 		// Send out email to admin
 		if (GET_EXT_VERSION("admins") >= "0.4.1")
@@ -418,7 +418,7 @@ if ($CONFIG['ap_del_mails'])
 	SQL_FREERESULT($result_mails);
 
 	// Do we have deleted mails and the admin want's to receive a notification
-	if (($DELETED > 0) && ($CONFIG['ap_dm_notify'] == "Y"))
+	if (($DELETED > 0) && ($CONFIG['ap_dm_notify'] == 'Y'))
 	{
 		// Send out email to admin
 		if (GET_EXT_VERSION("admins") >= "0.4.1")
diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 374a8b19e4..c3ccc8dcf3 100644
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -73,11 +73,11 @@ WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed
 ORDER BY d.timemark
 LIMIT %s", array($DOUBLER_POINTS, $min, $CONFIG['doubler_max_sent']), __FILE__, __LINE__);
 
-if (((SQL_NUMROWS($result_total) > 0) && ($CONFIG['doubler_sent_all'] == "Y")) || ((SQL_NUMROWS($result_main) == $CONFIG['doubler_group_sent']) && ($CONFIG['doubler_sent_all'] == "N")))
+if (((SQL_NUMROWS($result_total) > 0) && ($CONFIG['doubler_sent_all'] == 'Y')) || ((SQL_NUMROWS($result_main) == $CONFIG['doubler_group_sent']) && ($CONFIG['doubler_sent_all'] == 'N')))
 {
 	// Switch to matching SQL resource
 	$result_load = $result_main;
-	if ((SQL_NUMROWS($result_total) > 0) && ($CONFIG['doubler_sent_all'] == "Y")) $result_load = $result_total;
+	if ((SQL_NUMROWS($result_total) > 0) && ($CONFIG['doubler_sent_all'] == 'Y')) $result_load = $result_total;
 
 	// At least one account was found
 	while(list($id, $uid, $points, $ip, $time) = SQL_FETCHROW($result_load))
@@ -129,7 +129,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($CONFIG['doubler_sent_all'] == "Y")) |
 
 			$OK = false;
 			// Check for jackpot inclusion in doubling process
-			if (($jackpot > 0) && ($jackpot >= $points) && ($CONFIG['doubler_jackpot'] == "Y"))
+			if (($jackpot > 0) && ($jackpot >= $points) && ($CONFIG['doubler_jackpot'] == 'Y'))
 			{
 				// Subtract points from jackpot
 				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points-%s WHERE ok='ok' LIMIT 1",
diff --git a/inc/extensions.php b/inc/extensions.php
index 893a5a1836..dc22eaeb7a 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -65,7 +65,7 @@ function EXTENSION_REGISTER($ext_name, $id, $dry_run=false)
 		foreach ($EXT_VER_HISTORY as $EXT_VER)
 		{
 			require($file);
-			if (((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches")))
+			if (((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['verbose_sql'] == 'Y')) || (!EXT_IS_ACTIVE("sql_patches")))
 			{
 				if (!empty($UPDATE_NOTES))
 				{
@@ -307,7 +307,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false)
 	// Shorter way
 	return (
 		(
-			($active == "Y") || (
+			($active == 'Y') || (
 				(IS_ADMIN()) &&
 				(!$ignore_admin) &&
 				(!empty($active))
@@ -384,7 +384,7 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 			include(PATH."inc/extensions/".$file);
 
 			// Add notes
-			if ($CONFIG['verbose_sql'] == "Y")
+			if ($CONFIG['verbose_sql'] == 'Y')
 			{
 				$EXT_VER = $EXT_VER_HISTORY[$idx];
 				if (!empty($UPDATE_NOTES))
@@ -470,7 +470,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $
 
 	$S = false; $SW = 2; $i = 1;
 	$OUT = "";
-	if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == "Y"))
+	if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == 'Y'))
 	{
 		$OUT  = "<DIV align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"".$WIDTH."\" align=\"center\"".$dashed.">
@@ -497,7 +497,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $
 		}
 	}
 
-	if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == "Y"))
+	if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == 'Y'))
 	{
 		// No addional SQL commands to run
 		$OUT .= "<TR>
diff --git a/inc/extensions/ext- b/inc/extensions/ext-
index 526c2a6981..d714a3e593 100644
--- a/inc/extensions/ext-
+++ b/inc/extensions/ext-
@@ -53,7 +53,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	// SQL commands to run
 
 	// Load CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -90,7 +90,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "xxx";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index b385faa120..d85309ce5e 100644
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main', 'active', 'Heute Online', 10, 'N', 'Y')";
 
 	// Load CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -131,7 +131,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "active";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index bc2522d0a9..18ac24865b 100644
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -287,7 +287,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "admins";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php
index 53c0a64387..b36ba4e0c5 100644
--- a/inc/extensions/ext-admintheme1.php
+++ b/inc/extensions/ext-admintheme1.php
@@ -89,7 +89,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "admintheme";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php
index 97517cc383..540e1ddb11 100644
--- a/inc/extensions/ext-admintheme_default.php
+++ b/inc/extensions/ext-admintheme_default.php
@@ -89,7 +89,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "admintheme";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 1a0d6bda37..9ed1a8c7f2 100644
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -288,7 +288,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "autopurge";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index 17813503eb..56efcdf01d 100644
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -193,7 +193,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "bank";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 02e74e1a38..69a2ddc9b3 100644
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -69,7 +69,7 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
 	// Load CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -166,8 +166,8 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_active enum('Y', 'N') not null default 'N'";
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_rallye enum('Y', 'N') not null default 'N'";
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_points double(21,5) not null default '0.00000'";
-		$VIS = "N"; $LOCKED = "Y";
-		if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; }
+		$VIS = 'N'; $LOCKED = 'Y';
+		if (EXT_IS_ACTIVE("beg")) { $VIS = 'Y'; $LOCKED = 'N'; }
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'beg2', 'Bettel-Rallye', '".$VIS."', '".$LOCKED."', '7')";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('user', 'list_beg', 'Bettel-Rallye', 'Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.', '12')";
 
@@ -287,7 +287,7 @@ default: // Do stuff when extension is loaded
 	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
 	{
 		// Daily reset was run so let's check if begging rallye is active
-		if ($CONFIG['beg_rallye'] == "Y")
+		if ($CONFIG['beg_rallye'] == 'Y')
 		{
 			// Check for our winers
 			$INC_POOL[] = PATH."inc/monthly/monthly_beg.php";
@@ -300,7 +300,7 @@ default: // Do stuff when extension is loaded
 	}
 
 	// Check for beg rallye is active and send mails out
-	if (($CONFIG['beg_rallye'] == "Y") && ($CONFIG['beg_new_mem_notify'] == "Y"))
+	if (($CONFIG['beg_rallye'] == 'Y') && ($CONFIG['beg_new_mem_notify'] == 'Y'))
 	{
 		// Include file for sending out mails
 		$INC_POOL[] = PATH."inc/mails/beg_mails.php";
@@ -315,7 +315,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "beg";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index fe51e4f712..42cf1e4969 100644
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -206,7 +206,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "birthday";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index 4520b240b2..db04202913 100644
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -372,7 +372,7 @@ KEY userid (userid)
 		if ($curr == "00") $curr = "12";
 
 		// Generate timemark...
-		$mark = mktime(0, 0, 0, $curr, 1, date("Y", time()));
+		$mark = mktime(0, 0, 0, $curr, 1, date('Y', time()));
 
 		// Update accounts which are not active last months
 		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_data
@@ -571,7 +571,7 @@ default: // Do stuff when extension is loaded
 	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
 	{
 		// Daily reset was run so let's check if active rallye is activated
-		if ($CONFIG['bonus_active'] == "Y")
+		if ($CONFIG['bonus_active'] == 'Y')
 		{
 			// Run active rallye
 			if($CONFIG['bonus_stats'] > 0) $INC_POOL[] = PATH."inc/stats_bonus.php";
@@ -585,7 +585,7 @@ default: // Do stuff when extension is loaded
 	}
 
 	// Check for bonus rallye is active and send mails out
-	if (($CONFIG['bonus_active'] == "Y") && ($CONFIG['bonus_new_mem_notify'] == "Y"))
+	if (($CONFIG['bonus_active'] == 'Y') && ($CONFIG['bonus_new_mem_notify'] == 'Y'))
 	{
 		// Include file for sending out mails
 		$INC_POOL[] = PATH."inc/mails/bonus_mails.php";
@@ -597,7 +597,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "bonus";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 1a86aa29a0..dc2bd99f7d 100644
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -218,7 +218,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "cache";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 17b9b8e3db..4d0d23e4ec 100644
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "country";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php
index 264b3aba70..5e3e6242c5 100644
--- a/inc/extensions/ext-demo.php
+++ b/inc/extensions/ext-demo.php
@@ -86,7 +86,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "demo";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 469547623e..fbe5fa77bd 100644
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -273,7 +273,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "doubler";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 87849df5fb..a642d7f93a 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -244,7 +244,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "holiday";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 167cf4be76..165366e14b 100644
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -168,7 +168,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "html_mail";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php
index 53dc9c7ade..759efec590 100644
--- a/inc/extensions/ext-mailid.php
+++ b/inc/extensions/ext-mailid.php
@@ -244,7 +244,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "mailid";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index a61450e7de..defda69374 100644
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "maintenance";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index aeae078060..f8fa3e0d58 100644
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -149,7 +149,7 @@ if ((isset($dry_run)) && (isset($EXT_LOAD_MODE)))
 $EXT_LANG_PREFIX = "mediadata";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php
index 5dc5197faf..676eaef3f7 100644
--- a/inc/extensions/ext-mods.php
+++ b/inc/extensions/ext-mods.php
@@ -120,7 +120,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "mods";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php
index e2b8050b3a..5b4617a17c 100644
--- a/inc/extensions/ext-mydata.php
+++ b/inc/extensions/ext-mydata.php
@@ -171,7 +171,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "mydata";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index ed9e51e0c2..2766175901 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -185,7 +185,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "newsletter";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index 99b5b5c55a..7037d140d2 100644
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main', 'nickname', 'Nicknamen', '5', 'Y', 'Y')";
 
 	// Load CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -191,7 +191,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "nickname";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index c91f111249..166d092177 100644
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "online";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php
index cd4baf7485..22be9792fa 100644
--- a/inc/extensions/ext-optimize.php
+++ b/inc/extensions/ext-optimize.php
@@ -118,7 +118,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "optimize";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 1c0827454f..85fc69ec9e 100644
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -308,7 +308,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "order";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 8e84b7d11e..096f3e1fd8 100644
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -189,7 +189,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "other";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index 089c3e78e7..f3fad50154 100644
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -246,7 +246,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "payout";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-profile.php b/inc/extensions/ext-profile.php
index 87ce68aa67..e77a7aa215 100644
--- a/inc/extensions/ext-profile.php
+++ b/inc/extensions/ext-profile.php
@@ -132,7 +132,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "profile";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index f54cc7fda0..bf770bb7b3 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -352,7 +352,7 @@ LIMIT 1", __FILE__, __LINE__);
 $EXT_LANG_PREFIX = "rallye";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 6b51035a20..1ced350f36 100644
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "";
 
 	// Load own CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -334,7 +334,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "register";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php
index cc2c20526f..3cc4d89c0e 100644
--- a/inc/extensions/ext-repair.php
+++ b/inc/extensions/ext-repair.php
@@ -120,7 +120,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "repair";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 4fb2de0626..bab687f68c 100644
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -145,7 +145,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "rewrite";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 22b0b9a26d..b9feccd1c3 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -594,10 +594,10 @@ default: // Do stuff when extension is loaded
 	} else {
 	   	// Set some lame ;-) default settings
 		$CONFIG['def_refid'] = 0;
-		$CONFIG['title_decoration'] = "N";
-		$CONFIG['title_mod_show']   = "Y";
+		$CONFIG['title_decoration'] = 'N';
+		$CONFIG['title_mod_show']   = 'Y';
 		$CONFIG['title_middle']     = "-";
-		//$CONFIG['verbose_sql']      = "N";
+		//$CONFIG['verbose_sql']      = 'N';
 		define('MT_WORD' , DEFAULT_MT_WORD );
 		define('MT_WORD2', DEFAULT_MT_WORD2);
 		define('POINTS'  , DEFAULT_POINTS);
@@ -612,7 +612,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "sql_patches";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
\ No newline at end of file
diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php
index 5d24d79c32..960a3f41a4 100644
--- a/inc/extensions/ext-support.php
+++ b/inc/extensions/ext-support.php
@@ -133,7 +133,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "support";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index b9433b0413..99a1731cfb 100644
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE status='CLOSED'";
 
 	// Enable CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -249,7 +249,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "task";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 43d9c0cce9..80e3b925f2 100644
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -112,7 +112,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "theme";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php
index 1e99c57c7f..bfe821a1e2 100644
--- a/inc/extensions/ext-top10.php
+++ b/inc/extensions/ext-top10.php
@@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD top10_max tinyint(4) not null default '10'";
 
 	// Load CSS file?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -152,7 +152,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "top10";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index 3f33d7a38f..26d94ba6c0 100644
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -298,7 +298,7 @@ default: // Do stuff when extension is loaded
 	$CONFIG['ap_transfer']      = $DUMMY['ap_transfer'];
 	unset($DUMMY);
 
-	if ((defined('__DAILY_RESET')) && ($CONFIG['ap_transfer'] == "Y"))
+	if ((defined('__DAILY_RESET')) && ($CONFIG['ap_transfer'] == 'Y'))
 	{
 		// Automatically remove outdated or not displayed transactions
 		TRANSFER_AUTPPURGE($CONFIG['transfer_max'], $CONFIG['transfer_age']);
@@ -309,7 +309,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "transfer";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 9e311fb25a..6ef846c558 100644
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -51,7 +51,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "";
 
 	// Load CSS-File?
-	$EXT_CSS = "Y";
+	$EXT_CSS = 'Y';
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -224,7 +224,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "user";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "Y";
+$EXT_ALWAYS_ACTIVE = 'Y';
 
 //
 ?>
diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index 33ea71e911..8c2d64d032 100644
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -112,7 +112,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "wernis";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
+$EXT_ALWAYS_ACTIVE = 'N';
 
 //
 ?>
diff --git a/inc/functions.php b/inc/functions.php
index 161c73c35d..3162da2b78 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -353,7 +353,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
 }
 
 // Send mail out to an email address
-function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML="N", $FROM="")
+function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="")
 {
 	// Compile subject line (for POINTS constant etc.)
 	$eval = "\$SUBJECT = \"".COMPILE_CODE(addslashes($SUBJECT))."\";";
@@ -397,7 +397,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML="N", $FROM="")
 	}
 
 	// Fix HTML parameter (default is no!)
-	if (empty($HTML)) $HTML = "N";
+	if (empty($HTML)) $HTML = 'N';
 	if (DEBUG_MODE)
 	{
 		// In debug mode we want to display the mail instead of sending it away so we can debug this part
@@ -408,7 +408,7 @@ Subject : ".$SUBJECT."
 Message : ".$MSG."
 </PRE>\n";
 	}
-	 elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail", true)))
+	 elseif (($HTML == 'Y') && (EXT_IS_ACTIVE("html_mail", true)))
 	{
 		// Send mail as HTML away
 		SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
@@ -421,7 +421,7 @@ Message : ".$MSG."
 		// Send Mail away
 		SEND_RAW_EMAIL(stripslashes($TO), COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM);
 	}
-	 elseif ($HTML == "N")
+	 elseif ($HTML == 'N')
 	{
 		// Problem found!
 		SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM);
@@ -746,7 +746,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 
 	// Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!)
 	$MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
-	$surname = ""; $family = ""; $nick = ""; $sex = "N";
+	$surname = ""; $family = ""; $nick = ""; $sex = 'N';
 
 	// Prepare IP number and User Agent
 	$REMOTE_ADDR = getenv('REMOTE_ADDR');
@@ -891,7 +891,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	 else
 	{
 		// Neutral sex and email address is default
-		$sex = "N";
+		$sex = 'N';
 		$email = WEBMASTER;
 	}
 
@@ -986,7 +986,7 @@ function MAKE_TIME($H, $M, $S, $stamp)
 	// Extract day, month and year from given timestamp
 	$DAY   = date("d", $stamp);
 	$MONTH = date("m", $stamp);
-	$YEAR  = date("Y", $stamp);
+	$YEAR  = date('Y', $stamp);
 
 	// Create timestamp for wished time which depends on extracted date
 	return mktime($H, $M, $S, $MONTH, $DAY, $YEAR);
@@ -1171,7 +1171,7 @@ function ADD_SELECTION($TYPE, $DEFAULT, $PREFIX="", $id="0")
 
 	case "year": // Year
 		// Get current year
-		$YEAR = date("Y", time());
+		$YEAR = date('Y', time());
 
 		// Check if the default value is larger than minimum and bigger than actual year
 		if (($DEFAULT > 1930) && ($DEFAULT >= $YEAR))
@@ -1195,7 +1195,7 @@ function ADD_SELECTION($TYPE, $DEFAULT, $PREFIX="", $id="0")
 		{
 			// Get current year and subtract 16 (for erotic content)
 			$OUT .= "      <OPTION value=\"1929\">&lt;1930</OPTION>\n";
-			$YEAR = date("Y", time()) - 16;
+			$YEAR = date('Y', time()) - 16;
 			for ($idx = 1930; $idx <= $YEAR; $idx++)
 			{
 				$OUT .= "      <OPTION value=\"".$idx."\"";
@@ -1228,10 +1228,10 @@ function ADD_SELECTION($TYPE, $DEFAULT, $PREFIX="", $id="0")
 
 	case "yn":
 		$OUT .= "      <OPTION value=\"Y\"";
-		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'Y') $OUT .= " selected=\"selected\"";
 		$OUT .= ">".YES."</OPTION>
       <OPTION value=\"N\"";
-		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'N') $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
 	}
@@ -1243,8 +1243,8 @@ function TRANSLATE_YESNO($yn)
 {
 	switch ($yn)
 	{
-		case "Y": $yn = YES; break;
-		case "N": $yn = NO; break;
+		case 'Y': $yn = YES; break;
+		case 'N': $yn = NO; break;
 		default : $yn = "??? (".$yn.")"; break;
 	}
 	return $yn;
@@ -1372,7 +1372,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 	$timestamp = round($timestamp / 15) * 15;
 	// Do we have a leap year?
 	$SWITCH = 0;
-	$TEST = date("Y", time()) / 4;
+	$TEST = date('Y', time()) / 4;
 	$M1 = date("m", time());
 	$M2 = date("m", (time() + $timestamp));
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
@@ -1413,7 +1413,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 		$OUT  = "<DIV align=\"".$align."\">\n";
 		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
 		$OUT .= "<TR>\n";
-		if (ereg("Y", $display) || (empty($display)))
+		if (ereg('Y', $display) || (empty($display)))
 		{
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._YEARS."</STRONG></TD>\n";
 		}
@@ -1443,7 +1443,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 		}
 		$OUT .= "</TR>\n";
 		$OUT .= "<TR>\n";
-		if (ereg("Y", $display) || (empty($display)))
+		if (ereg('Y', $display) || (empty($display)))
 		{
 			// Generate year selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
@@ -1567,7 +1567,7 @@ function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
 	$ret = "0";
 	// Do we have a leap year?
 	$SWITCH = 0;
-	$TEST = date("Y", time()) / 4;
+	$TEST = date('Y', time()) / 4;
 	$M1   = date("m", time());
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($POST[$prefix."_mo"] > "02"))  $SWITCH = ONE_DAY;
diff --git a/inc/header.php b/inc/header.php
index 008032e4b5..e336ea5b6f 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -51,20 +51,20 @@ if (defined('frameset_active')) {
 
 			// 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'])." ";
+				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']);
+				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']);
+				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']);
+				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));
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 888ecab503..95ff13f09c 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -43,7 +43,7 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type)
 	global $CONFIG;
 
 	// Shall we add bonus points?
-	if ($CONFIG['bonus_active'] == "N") return;
+	if ($CONFIG['bonus_active'] == 'N') return;
 
 	// Select SQL command
 	$SQL = "";
@@ -186,7 +186,7 @@ function BONUS_POINTS_HANDLER($MODE)
 	global $CONFIG;
 
 	// Shall we add bonus points?
-	if ($CONFIG['bonus_active'] == "N") return;
+	if ($CONFIG['bonus_active'] == 'N') return;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
 	if (($CONFIG['bonus_mode'] == "UID") && ($CONFIG['bonus_uid'] == "0")) $CONFIG['bonus_mode'] = "JACKPOT";
diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 057c76bd03..d6d3d23431 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -38,7 +38,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 	require($INC);
 }
 //
-function DOUBLER_GENERATE_TABLE($uid="0", $done="N", $ref="N", $sort="ASC")
+function DOUBLER_GENERATE_TABLE($uid="0", $done='N', $ref='N', $sort="ASC")
 {
 	global $CONFIG;
 	if (empty($cnt)) $cnt = "0";
@@ -57,7 +57,7 @@ function DOUBLER_GENERATE_TABLE($uid="0", $done="N", $ref="N", $sort="ASC")
 		$NOT_FOUND = DOUBLER_GUEST_NO_ENTRIES_FOUND;
 	}
 
-	if (($done == "Y") && ($sort == "ASC"))
+	if (($done == 'Y') && ($sort == "ASC"))
 	{
 		// Already payed out points (latest payouts first)
 		$limit = $CONFIG['doubler_display_old'];
@@ -130,13 +130,13 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT()
 	// Initialize variables
 	$points = "0";
 
-	if ($CONFIG['doubler_own'] == "Y")
+	if ($CONFIG['doubler_own'] == 'Y')
 	{
 		// Take points from doubler's own account
 		$points += $CONFIG['doubler_points'] - $CONFIG['doubler_used'];
 	}
 
-	if ($CONFIG['doubler_jackpot'] == "Y")
+	if ($CONFIG['doubler_jackpot'] == 'Y')
 	{
 		// Load jackpot
 		$result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index ce48a033e2..3d08472af5 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -165,7 +165,7 @@ function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
 	{
 		// Send mail away as HTML
 		$FROM = "Content-Type: text/html\n".$FROM;
-		SEND_EMAIL($TO, $SUBJECT, $MSG, "N", $FROM);
+		SEND_EMAIL($TO, $SUBJECT, $MSG, 'N', $FROM);
 	}
 }
 //
diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index aa75f75f36..184effff6c 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -163,19 +163,19 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
 {
 	global $_POST;
 	// Send mail away as HTML
-	if ($_POST['auto_urls'] == "Y") {
+	if ($_POST['auto_urls'] == 'Y') {
 		// Automatically insert URLs into newsletter
 		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
 			// Send HTML mail
-			SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), "Y");
+			SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), 'Y');
 		} else {
 			// Send normal mail
-			SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), "N");
+			SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), 'N');
 		}
 	} else {
 		// Regular send-out
 		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
-			SEND_EMAIL($TO, $SUBJECT, $MSG, "Y");
+			SEND_EMAIL($TO, $SUBJECT, $MSG, 'Y');
 		} else {
 			SEND_EMAIL($TO, $SUBJECT, $MSG);
 		}
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index e55876b3ee..53eee415d7 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -127,7 +127,7 @@ VALUES ('%s', '%s', '%s', '%s')",
 		$DATA['refs']  = $cnt;
 
 		// Shall I notify this member?
-		if (($notify == "Y") && ($un))
+		if (($notify == 'Y') && ($un))
 		{
 			// Load email template and send it to the user
 			$msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", $prices, $uid);
@@ -137,7 +137,7 @@ VALUES ('%s', '%s', '%s', '%s')",
 
 	// Send email to admin
 	$templ = "admin_rallye_no_notify";
-	if ($notify == "Y") $templ = "admin_rallye_notify";
+	if ($notify == 'Y') $templ = "admin_rallye_notify";
 	if (GET_EXT_VERSION("admins") < "0.4.1")
 	{
 		// Use old method to send out
@@ -316,7 +316,7 @@ VALUES ('%s', '%s', '0')",
 			SQL_FREERESULT($result);
 		}
 
-		if ($notify == "Y")
+		if ($notify == 'Y')
 		{
 			// Transfer all neccessary data to the global $DATA array
 			$DATA['start'] = MAKE_DATETIME($start, "2");
@@ -417,7 +417,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
 				}
 			}
 
-			if ($notify == "Y")
+			if ($notify == 'Y')
 			{
 				// Prepare infos for the mail template
 				if (!empty($DATA['info']))
@@ -462,7 +462,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
 	}
 
 	// Select template depending on notfication is switch on / off
-	if ($notify == "Y")
+	if ($notify == 'Y')
 	{
 		$templ = "admin_rallye_expired";
 	}
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 5dc7074504..6126705456 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -45,7 +45,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
 	while(list($name, $required) = SQL_FETCHROW($result))
 	{
 		$value = "";
-		if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
+		if ($required == 'Y') $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
 		$eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
 		eval($eval);
 	}
@@ -76,7 +76,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 			// if extensions is present check if country code was selected
 			//         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
 			$country = ((!EXT_IS_ACTIVE("country")) || ((EXT_IS_ACTIVE("country")) && (((empty($value)) && ($key == "cntry")) || (($key == "country_code") && (!empty($value)))) && (!empty($array['country_code']))));
-			if ((empty($value)) && ($chk == "Y") && (!$country))
+			if ((empty($value)) && ($chk == 'Y') && (!$country))
 			{
 				// Required field not set
 				$array[$key] = "!";
@@ -92,7 +92,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 	$result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
 	while(list($name, $required) = SQL_FETCHROW($result))
 	{
-		if (($array[$name] == "!") && ($required == "Y"))
+		if (($array[$name] == "!") && ($required == 'Y'))
 		{
 			// Empty entry found
 			$array[$name] = "";
@@ -134,7 +134,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
 				'id'    => $id,
 			);
 
-			if (($_POST['cat'][$id] == "Y") || (($CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id]))))
+			if (($_POST['cat'][$id] == 'Y') || (($CONFIG['register_default'] == 'Y') && (empty($_POST['cat'][$id]))))
 			{
 				$content['def_y'] = " checked";
 			}
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 9140cd191e..730812bf89 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -336,11 +336,11 @@ ORDER BY d.userid";
 		if (GET_EXT_VERSION("bonus") >= "0.6.9") {
 			// Add more bonus points here
 			$USE = "(0";
-			if ($CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
-			if ($CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus";
-			if ($CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order";
-			if ($CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
-			if ($CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
+			if ($CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus";
+			if ($CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus";
+			if ($CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order";
+			if ($CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats";
+			if ($CONFIG['bonus_ref_yn']   == 'Y') $USE .= " + bonus_ref";
 			$USE .= ")";
 		} else {
 			// Old version ???
@@ -349,7 +349,7 @@ ORDER BY d.userid";
 
 		// Autopurge installed?
 		$LAST = ""; $ONLINE = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) {
+		if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == 'Y') && ($CONFIG['ap_in_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
 			$LAST   = " AND last_online >= ";
 			$ONLINE = bigintval(time() - $CONFIG['ap_in_since']);
@@ -368,7 +368,7 @@ ORDER BY active_bonus DESC, userid";
 
 		// Autopurge installed?
 		$LAST = ""; $ONLINE = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) {
+		if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == 'Y') && ($CONFIG['ap_in_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
 			$LAST   = " AND last_online >= ";
 			$ONLINE = bigintval(time() - $CONFIG['ap_in_since']);
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 4701307d3d..8faadd570e 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -46,7 +46,7 @@ function alpha($sortby, $colspan, $return=false)
 	if (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
 
 	/* Creates the list of letters and makes them a link. */
-	$alphabet = array(_ALL2, "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", _OTHERS);
+	$alphabet = array(_ALL2, "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", 'N', "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", 'Y', "Z", _OTHERS);
 	$num = count($alphabet) - 1;
 	$OUT = "";
 	while (list($counter, $ltr) = each($alphabet))
diff --git a/inc/load_cache.php b/inc/load_cache.php
index 6458778e67..69aec9887b 100644
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -112,7 +112,7 @@ if (($CACHE->cache_file("admins", true) == true))
 		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");
@@ -185,7 +185,7 @@ if ($CACHE->cache_file("mod_reg", true) == true)
 		}
 	}
 }
- 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");
@@ -241,7 +241,7 @@ if ($CACHE->cache_file("config", true) == true)
 		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");
@@ -286,7 +286,7 @@ if ($CACHE->cache_file("refsystem", true) == true)
 		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");
@@ -331,7 +331,7 @@ if ($CACHE->cache_file("refdepths", true) == true)
 		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");
@@ -382,7 +382,7 @@ if (GET_EXT_VERSION("admins") >= "0.3")
 			}
 		}
 	}
-	 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");
diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 91a3fb690c..f919b7d80d 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -51,7 +51,7 @@ if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."
 	// Load it...
 	$EXT_LOAD_MODE = "";
 	require_once(PATH."inc/extensions/ext-sql_patches.php");
-	$KEEP_ACTIVE = array('sql_patches' => "Y"); // KEEP THIS ALWAYS ACTIVE!
+	$KEEP_ACTIVE = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
 }
  else
 {
@@ -75,7 +75,7 @@ if (EXT_IS_ACTIVE("cache"))
 	}
 
 	// Do not recreate cache file when it's switched off!
-	if (($CACHE_FILE == "init") && ($CONFIG['cache_exts'] == "N")) $CACHE_FILE = "skip";
+	if (($CACHE_FILE == "init") && ($CONFIG['cache_exts'] == 'N')) $CACHE_FILE = "skip";
 
 	// Load language
 	if ($CACHE_FILE == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
@@ -98,20 +98,20 @@ if ($CACHE_FILE == "load")
 	foreach ($EXT_DUMMY['ext_name'] as $k=>$name)
 	{
 		// Load functions file
-		if ($EXT_DUMMY['ext_funcs'][$k] == "Y") require_once(PATH."inc/libs/".$name."_functions.php");
+		if ($EXT_DUMMY['ext_funcs'][$k] == 'Y') require_once(PATH."inc/libs/".$name."_functions.php");
 
 		// Load Language file
-		if ($EXT_DUMMY['ext_lang'][$k] == "Y")
+		if ($EXT_DUMMY['ext_lang'][$k] == 'Y')
 		{
 			$INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
 			if (file_exists($INC)) require_once($INC);
 		}
 
 		// Load CSS file
-		if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
+		if ($EXT_DUMMY['ext_css'][$k] == 'Y') $EXT_CSS_FILES[] = "".$name.".css";
 
 		// Load extension file itself
-		if (($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN()))
+		if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (IS_ADMIN()))
 		{
 			require_once(PATH."inc/extensions/ext-".$name.".php");
 		}
@@ -193,11 +193,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 		//* DEBUG: */ echo "*".$name."/".$menu."*<br>";
 
 		// An empty menu entry will be interpreted as N (no menu) to avoid problems
-		if (empty($menu)) $menu = "N";
+		if (empty($menu)) $menu = 'N';
 
 		// Load extensions
 		$file1 = sprintf(PATH."inc/extensions/ext-%s.php", $name);
-		$file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
+		$file2 = $file1; $EXT_CSS = 'N'; $EXT_ALWAYS_ACTIVE = 'N';
 
 		// Special functions file
 		$file3 = sprintf(PATH."inc/libs/%s_functions.php", $name);
@@ -214,26 +214,26 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 			if (file_exists($file3) && is_readable($file3))
 			{
 				// Special functions file
-				$funcs = "Y";
+				$funcs = 'Y';
 				require_once($file3);
 			}
 			 else
 			{
 				// Don't load functions file
-				$funcs = "N";
+				$funcs = 'N';
 			}
 
 			// Do we need a language file?
 			if (($file1 != $file2) && (file_exists($file2)) && (is_readable($file2)))
 			{
 				// Load language file
-				$lang = "Y";
+				$lang = 'Y';
 				include($file2);
 			}
 			 else
 			{
 				// Don't load language file
-				$lang = "N";
+				$lang = 'N';
 			}
 
 			// Load extension
@@ -245,10 +245,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 			 else
 			{
 				// KEEP sql_patches ALWAYS ACTIVE!
-				$EXT_ALWAYS_ACTIVE = "Y";
+				$EXT_ALWAYS_ACTIVE = 'Y';
 			}
 
-			if ($css == "Y")
+			if ($css == 'Y')
 			{
 				$CSS_FILE = PATH."theme/".GET_CURR_THEME()."/css/".$name.".css";
 				if (file_exists($CSS_FILE))
@@ -259,7 +259,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 				 else
 				{
 					// Don't load CSS file
-					$css = "N";
+					$css = 'N';
 				}
 			}
 
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 2391b284d9..9363f83e57 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -47,15 +47,15 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if ($CSS == 1) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, $CONFIG['beg_month'], date("d", time()), date("Y", time()));
+$mark = mktime(0, 0, 0, $CONFIG['beg_month'], date("d", time()), date('Y', time()));
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
 $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (beg_ral_notify ";
 switch ($CONFIG['beg_rallye'])
 {
-case "Y": // Begging rallye is activated
-	if ($CONFIG['beg_ral_en_notify'] == "Y")
+case 'Y': // Begging rallye is activated
+	if ($CONFIG['beg_ral_en_notify'] == 'Y')
 	{
 		// Okay, let's check for member accounts
 		$SQL .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
@@ -68,8 +68,8 @@ case "Y": // Begging rallye is activated
 	}
 	break;
 
-case "N": // Begging rallye is deactivated
-	if ($CONFIG['beg_ral_di_notify'] == "Y")
+case 'N': // Begging rallye is deactivated
+	if ($CONFIG['beg_ral_di_notify'] == 'Y')
 	{
 		// Okay, let's check for member accounts
 		$SQL .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 2c3f047dbb..ec8317a926 100644
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -49,11 +49,11 @@ if ($CSS == 1) return;
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
 $DAY   = date("d", time());
 $MONTH = date("m", time());
-$YEAR  = date("Y", time());
+$YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
-if (($CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_in_since'] > 0) && ($CONFIG['ap_inactive'] == "Y"))
+if (($CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_in_since'] > 0) && ($CONFIG['ap_inactive'] == 'Y'))
 {
 	$ADD = " AND last_online >= %d";
 	$VALUE = bigintval(time() - $CONFIG['ap_in_since']);
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index e265e53f78..1c4cb97331 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -47,15 +47,15 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if ($CSS == 1) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, $CONFIG['bonus_month'], date("d", time()), date("Y", time()));
+$mark = mktime(0, 0, 0, $CONFIG['bonus_month'], date("d", time()), date('Y', time()));
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
 $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (bonus_ral_notify ";
 switch ($CONFIG['bonus_active'])
 {
-case "Y": // Active rallye is activated
-	if ($CONFIG['bonus_en_notify'] == "Y")
+case 'Y': // Active rallye is activated
+	if ($CONFIG['bonus_en_notify'] == 'Y')
 	{
 		// Okay, let's check for member accounts
 		$SQL .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
@@ -68,8 +68,8 @@ case "Y": // Active rallye is activated
 	}
 	break;
 
-case "N": // Active rallye is deactivated
-	if ($CONFIG['bonus_di_notify'] == "Y")
+case 'N': // Active rallye is deactivated
+	if ($CONFIG['bonus_di_notify'] == 'Y')
 	{
 		// Okay, let's check for member accounts
 		$SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 0ac017533a..258c265a2a 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -715,7 +715,7 @@ function ADMIN_CHECK_MENU_MODE()
 // Change activation status
 function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 	global $CONFIG;
-	$cnt = 0; $newStatus = "Y";
+	$cnt = 0; $newStatus = 'Y';
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" all through and count them
 		foreach ($IDs as $id=>$selected) {
@@ -732,7 +732,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 				if (SQL_NUMROWS($result) == 1) {
 					// Load the status
 					list($currStatus) = SQL_FETCHROW($result);
-					if ($currStatus == "Y") $newStatus="N"; else $newStatus = "Y";
+					if ($currStatus == 'Y') $newStatus='N'; else $newStatus = 'Y';
 
 					// Change this status
 					SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s SET %s='%s' WHERE %s=%d LIMIT 1",
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index da5df68748..2a3ac6f0de 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -138,7 +138,7 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
 				if (!empty($KEEP_ACTIVE[$ext]))
 				{
 					// Maybe we want to keept the current extension active?
-					if (($KEEP_ACTIVE[$ext] == "Y") && (!EXT_IS_ACTIVE($ext, true, true)))
+					if (($KEEP_ACTIVE[$ext] == 'Y') && (!EXT_IS_ACTIVE($ext, true, true)))
 					{
 						// Reactivate this extension!
 						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
@@ -217,7 +217,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
 				$title = TASK_NO_TITLE;
 
 				// Shall I list SQL commands assigned to an extension installation or update task?
-				if (((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches")))
+				if (((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['verbose_sql'] == 'Y')) || (!EXT_IS_ACTIVE("sql_patches")))
 				{
 					$ext_name = substr($subj, 1, strpos($subj, ":") - 1);
 					if ($type == "EXTENSION")
@@ -258,7 +258,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
 					// Add SQLs to a table
 					if (empty($SQLs)) $SQLs = array();
 					if (empty($title)) $title = "";
-					if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($CONFIG['verbose_sql'] == "Y")) {
+					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";
 					}
diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 0aa241dd93..2d08ad826b 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -105,12 +105,12 @@ define('_START_MIN'  , ADD_SELECTION("min"  , "0"              , "start"));
 define('_START_HOUR' , ADD_SELECTION("hour" , date("G", time()), "start"));
 define('_START_DAY'  , ADD_SELECTION("day"  , date("d", time()), "start"));
 define('_START_MONTH', ADD_SELECTION("month", date("m", time()), "start"));
-define('_START_YEAR' , ADD_SELECTION("year" , date("Y", time()), "start"));
+define('_START_YEAR' , ADD_SELECTION("year" , date('Y', time()), "start"));
 
 // Calcualte ending date
 $D = date("d", time() + (ONE_DAY * 7));
 $M = date("m", time() + (ONE_DAY * 7));
-$Y = date("Y", time() + (ONE_DAY * 7));
+$Y = date('Y', time() + (ONE_DAY * 7));
 
 // Ending day
 define('_END_SEC'  , ADD_SELECTION("sec"  , "0"              , "end"));
diff --git a/inc/modules/admin/what-autopurge.php b/inc/modules/admin/what-autopurge.php
index 4d129d45e8..5ff646d568 100644
--- a/inc/modules/admin/what-autopurge.php
+++ b/inc/modules/admin/what-autopurge.php
@@ -49,13 +49,13 @@ if (isset($_POST['ok']))
 	// Setup constants for the template
 	switch ($CONFIG['ap_inactive'])
 	{
-		case "Y": define('__YES_IN', " checked"); define('__NO_IN', "");         break;
-		case "N": define('__YES_IN', "");         define('__NO_IN', " checked"); break;
+		case 'Y': define('__YES_IN', " checked"); define('__NO_IN', "");         break;
+		case 'N': define('__YES_IN', "");         define('__NO_IN', " checked"); break;
 	}
 	switch ($CONFIG['ap_unconfirmed'])
 	{
-		case "Y": define('__YES_UN', " checked"); define('__NO_UN', "");         break;
-		case "N": define('__YES_UN', "");         define('__NO_UN', " checked"); break;
+		case 'Y': define('__YES_UN', " checked"); define('__NO_UN', "");         break;
+		case 'N': define('__YES_UN', "");         define('__NO_UN', " checked"); break;
 	}
 	define('__AP_IN_SINCE', $CONFIG['ap_in_since']);
 	define('__AP_IN_TIME' , $CONFIG['ap_in_time']);
diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index bc870efe0d..e1b31b971e 100644
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -68,7 +68,7 @@ if (isset($_POST['ok']))
 
 	// Mail confirmation links
 	define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($CONFIG['auto_purge'], "auto_purge", "MWD"));
-	if ($CONFIG['auto_purge_active'] == "N")
+	if ($CONFIG['auto_purge_active'] == 'N')
 	{
 		define('_CFG_AP_ACTIVE_N', " checked");
 		define('_CFG_AP_ACTIVE_Y', "");
diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 20470c43c4..32a8225e21 100644
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -57,7 +57,7 @@ if (isset($_POST['ok']))
 	$CONFIG['beg_ral_di_notify'] = $_POST['beg_ral_di_notify'];
 
 	// Include sending out mails
-	if ((($CONFIG['beg_rallye'] == "Y") && ($CONFIG['beg_ral_en_notify'] == "Y")) || (($CONFIG['beg_rallye'] == "N") && ($CONFIG['beg_ral_di_notify'] == "Y")))
+	if ((($CONFIG['beg_rallye'] == 'Y') && ($CONFIG['beg_ral_en_notify'] == 'Y')) || (($CONFIG['beg_rallye'] == 'N') && ($CONFIG['beg_ral_di_notify'] == 'Y')))
 	{
 		include(PATH."inc/mails/beg_mails.php");
 	}
@@ -77,24 +77,24 @@ if (isset($_POST['ok']))
 	// Activate / Deactivate beg rallye (Y/N)
 	switch ($CONFIG['beg_rallye'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_RALLYE_Y', " checked");
 		define('__BEG_RALLYE_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_RALLYE_Y', "");
 		define('__BEG_RALLYE_N', " checked");
 		break;
 	}
 	switch ($CONFIG['beg_active'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_ACTIVE_Y', " checked");
 		define('__BEG_ACTIVE_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_ACTIVE_Y', "");
 		define('__BEG_ACTIVE_N', " checked");
 		break;
@@ -113,48 +113,48 @@ if (isset($_POST['ok']))
 	}
 	switch ($CONFIG['beg_ral_en_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_RAL_EN_NOTIFY_Y', " checked");
 		define('__BEG_RAL_EN_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_RAL_EN_NOTIFY_Y', "");
 		define('__BEG_RAL_EN_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['beg_ral_di_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_RAL_DI_NOTIFY_Y', " checked");
 		define('__BEG_RAL_DI_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_RAL_DI_NOTIFY_Y', "");
 		define('__BEG_RAL_DI_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['beg_new_mem_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_NEW_MEMBER_NOTIFY_Y', " checked");
 		define('__BEG_NEW_MEMBER_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_NEW_MEMBER_NOTIFY_Y', "");
 		define('__BEG_NEW_MEMBER_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['beg_include_own'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BEG_INCLUDE_OWN_Y', " checked");
 		define('__BEG_INCLUDE_OWN_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BEG_INCLUDE_OWN_Y', "");
 		define('__BEG_INCLUDE_OWN_N', " checked");
 		break;
diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php
index 0db02fdc32..6d77eacf9b 100644
--- a/inc/modules/admin/what-config_birthday.php
+++ b/inc/modules/admin/what-config_birthday.php
@@ -51,12 +51,12 @@ if (isset($_POST['ok']))
 	define('__POINTS_VALUE', $CONFIG['birthday_points']);
 	switch ($CONFIG['birthday_active'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BIRTHDAY_ACTIVE_Y', " checked");
 		define('__BIRTHDAY_ACTIVE_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BIRTHDAY_ACTIVE_Y', "");
 		define('__BIRTHDAY_ACTIVE_N', " checked");
 		break;
diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 4fd94922c4..0b0ae7703b 100644
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -71,7 +71,7 @@ if (isset($_POST['ok']))
 	$CONFIG['bonus_di_notify'] = $_POST['bonus_di_notify'];
 
 	// Include sending out mails
-	if ((($CONFIG['bonus_active'] == "Y") && ($CONFIG['bonus_en_notify'] == "Y")) || (($CONFIG['bonus_active'] == "N") && ($CONFIG['bonus_di_notify'] == "Y")))
+	if ((($CONFIG['bonus_active'] == 'Y') && ($CONFIG['bonus_en_notify'] == 'Y')) || (($CONFIG['bonus_active'] == 'N') && ($CONFIG['bonus_di_notify'] == 'Y')))
 	{
 		include(PATH."inc/mails/bonus_mails.php");
 	}
@@ -121,12 +121,12 @@ if (isset($_POST['ok']))
 	// Activate / Deactivate bonus active rallye (Y/N)
 	switch ($CONFIG['bonus_active'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_ACTIVE_Y', " checked");
 		define('__BONUS_ACTIVE_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_ACTIVE_Y', "");
 		define('__BONUS_ACTIVE_N', " checked");
 		break;
@@ -134,108 +134,108 @@ if (isset($_POST['ok']))
 	// Other bonus to de-/activate
 	switch ($CONFIG['bonus_login_yn'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_LOGIN_Y', " checked");
 		define('__BONUS_LOGIN_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_LOGIN_Y', "");
 		define('__BONUS_LOGIN_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_stats_yn'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_STATS_Y', " checked");
 		define('__BONUS_STATS_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_STATS_Y', "");
 		define('__BONUS_STATS_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_order_yn'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_ORDER_Y', " checked");
 		define('__BONUS_ORDER_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_ORDER_Y', "");
 		define('__BONUS_ORDER_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_ref_yn'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_REF_Y', " checked");
 		define('__BONUS_REF_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_REF_Y', "");
 		define('__BONUS_REF_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_click_yn'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_CLICK_Y', " checked");
 		define('__BONUS_CLICK_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_CLICK_Y', "");
 		define('__BONUS_CLICK_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_en_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_EN_NOTIFY_Y', " checked");
 		define('__BONUS_EN_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_EN_NOTIFY_Y', "");
 		define('__BONUS_EN_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_di_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_DI_NOTIFY_Y', " checked");
 		define('__BONUS_DI_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_DI_NOTIFY_Y', "");
 		define('__BONUS_DI_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_new_mem_notify'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_NEW_MEMBER_NOTIFY_Y', " checked");
 		define('__BONUS_NEW_MEMBER_NOTIFY_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_NEW_MEMBER_NOTIFY_Y', "");
 		define('__BONUS_NEW_MEMBER_NOTIFY_N', " checked");
 		break;
 	}
 	switch ($CONFIG['bonus_include_own'])
 	{
-	case "Y":
+	case 'Y':
 		define('__BONUS_INCLUDE_OWN_Y', " checked");
 		define('__BONUS_INCLUDE_OWN_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__BONUS_INCLUDE_OWN_Y', "");
 		define('__BONUS_INCLUDE_OWN_N', " checked");
 		break;
diff --git a/inc/modules/admin/what-config_cache.php b/inc/modules/admin/what-config_cache.php
index afe2ebb04a..dd5b231829 100644
--- a/inc/modules/admin/what-config_cache.php
+++ b/inc/modules/admin/what-config_cache.php
@@ -43,41 +43,41 @@ ADD_DESCR("admin", basename(__FILE__));
 if (isset($_POST['ok']))
 {
 	// Cache path has been not changed by default so don't test it again
-	$_POST['cache_tested'] = "N";
+	$_POST['cache_tested'] = 'N';
 
 	// Check if path has been changed
 	if ($_POST['cache_path'] != $CONFIG['cache_path'])
 	{
 		// Okay, cache path has been altered so we have to test it again!
-		$_POST['cache_tested'] = "Y";
+		$_POST['cache_tested'] = 'Y';
 	}
 
 	// Delete deactivated cache files
-	if (($_POST['cache_admins'] == "N") && ($CACHE->cache_file("admins", true)))
+	if (($_POST['cache_admins'] == 'N') && ($CACHE->cache_file("admins", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_acls'] == "N") && ($CACHE->cache_file("acls", true)))
+	if (($_POST['cache_acls'] == 'N') && ($CACHE->cache_file("acls", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_exts'] == "N") && ($CACHE->cache_file("extensions", true)))
+	if (($_POST['cache_exts'] == 'N') && ($CACHE->cache_file("extensions", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_config'] == "N") && ($CACHE->cache_file("config", true)))
+	if (($_POST['cache_config'] == 'N') && ($CACHE->cache_file("config", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_modreg'] == "N") && ($CACHE->cache_file("modreg", true)))
+	if (($_POST['cache_modreg'] == 'N') && ($CACHE->cache_file("modreg", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_refdepth'] == "N") && ($CACHE->cache_file("refdepth", true)))
+	if (($_POST['cache_refdepth'] == 'N') && ($CACHE->cache_file("refdepth", true)))
 	{
 		$CACHE->cache_destroy();
 	}
-	if (($_POST['cache_refsys'] == "N") && ($CACHE->cache_file("refsys", true)))
+	if (($_POST['cache_refsys'] == 'N') && ($CACHE->cache_file("refsys", true)))
 	{
 		$CACHE->cache_destroy();
 	}
@@ -90,38 +90,38 @@ if (isset($_POST['ok']))
 	// Prepare data
 	switch ($CONFIG['cache_admins'])
 	{
-		case "Y": define('__ADMINS_Y', " checked"); define('__ADMINS_N', "");         break;
-		case "N": define('__ADMINS_Y', "");         define('__ADMINS_N', " checked"); break;
+		case 'Y': define('__ADMINS_Y', " checked"); define('__ADMINS_N', "");         break;
+		case 'N': define('__ADMINS_Y', "");         define('__ADMINS_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_acls'])
 	{
-		case "Y": define('__ACLS_Y', " checked"); define('__ACLS_N', "");         break;
-		case "N": define('__ACLS_Y', "");         define('__ACLS_N', " checked"); break;
+		case 'Y': define('__ACLS_Y', " checked"); define('__ACLS_N', "");         break;
+		case 'N': define('__ACLS_Y', "");         define('__ACLS_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_exts'])
 	{
-		case "Y": define('__EXTS_Y', " checked"); define('__EXTS_N', "");         break;
-		case "N": define('__EXTS_Y', "");         define('__EXTS_N', " checked"); break;
+		case 'Y': define('__EXTS_Y', " checked"); define('__EXTS_N', "");         break;
+		case 'N': define('__EXTS_Y', "");         define('__EXTS_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_config'])
 	{
-		case "Y": define('__CONFIG_Y', " checked"); define('__CONFIG_N', "");         break;
-		case "N": define('__CONFIG_Y', "");         define('__CONFIG_N', " checked"); break;
+		case 'Y': define('__CONFIG_Y', " checked"); define('__CONFIG_N', "");         break;
+		case 'N': define('__CONFIG_Y', "");         define('__CONFIG_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_modreg'])
 	{
-		case "Y": define('__MODREG_Y', " checked"); define('__MODREG_N', "");         break;
-		case "N": define('__MODREG_Y', "");         define('__MODREG_N', " checked"); break;
+		case 'Y': define('__MODREG_Y', " checked"); define('__MODREG_N', "");         break;
+		case 'N': define('__MODREG_Y', "");         define('__MODREG_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_refdepth'])
 	{
-		case "Y": define('__REFDEPTH_Y', " checked"); define('__REFDEPTH_N', "");         break;
-		case "N": define('__REFDEPTH_Y', "");         define('__REFDEPTH_N', " checked"); break;
+		case 'Y': define('__REFDEPTH_Y', " checked"); define('__REFDEPTH_N', "");         break;
+		case 'N': define('__REFDEPTH_Y', "");         define('__REFDEPTH_N', " checked"); break;
 	}
 	switch ($CONFIG['cache_refsys'])
 	{
-		case "Y": define('__REFSYS_Y', " checked"); define('__REFSYS_N', "");         break;
-		case "N": define('__REFSYS_Y', "");         define('__REFSYS_N', " checked"); break;
+		case 'Y': define('__REFSYS_Y', " checked"); define('__REFSYS_N', "");         break;
+		case 'N': define('__REFSYS_Y', "");         define('__REFSYS_N', " checked"); break;
 	}
 	define('__PATH', $CONFIG['cache_path']);
 
diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index 727a5e739d..ff86aa13b2 100644
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -73,12 +73,12 @@ if (isset($_POST['ok']))
 	// Take points from jackpot (Y/N)
 	switch ($CONFIG['doubler_jackpot'])
 	{
-	case "Y":
+	case 'Y':
 		define('__DOUBLER_JACKPOT_Y', " checked");
 		define('__DOUBLER_JACKPOT_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__DOUBLER_JACKPOT_Y', "");
 		define('__DOUBLER_JACKPOT_N', " checked");
 		break;
@@ -87,12 +87,12 @@ if (isset($_POST['ok']))
 	// Take points from own account (Y/N)
 	switch ($CONFIG['doubler_own'])
 	{
-	case "Y":
+	case 'Y':
 		define('__DOUBLER_OWN_Y', " checked");
 		define('__DOUBLER_OWN_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__DOUBLER_OWN_Y', "");
 		define('__DOUBLER_OWN_N', " checked");
 		break;
@@ -115,12 +115,12 @@ if (isset($_POST['ok']))
 	// Take points from own account (Y/N)
 	switch ($CONFIG['doubler_sent_all'])
 	{
-	case "Y":
+	case 'Y':
 		define('__DOUBLER_SENT_ALL_Y', " checked");
 		define('__DOUBLER_SENT_ALL_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__DOUBLER_SENT_ALL_Y', "");
 		define('__DOUBLER_SENT_ALL_N', " checked");
 		break;
diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php
index 2504ad8259..d079f78c71 100644
--- a/inc/modules/admin/what-config_extensions.php
+++ b/inc/modules/admin/what-config_extensions.php
@@ -50,8 +50,8 @@ if (isset($_POST['ok']))
 	// Prepare data
 	switch ($CONFIG['verbose_sql'])
 	{
-		case "Y": define('__VERBOSE_Y', " checked"); define('__VERBOSE_N', "");         break;
-		case "N": define('__VERBOSE_Y', "");         define('__VERBOSE_N', " checked"); break;
+		case 'Y': define('__VERBOSE_Y', " checked"); define('__VERBOSE_N', "");         break;
+		case 'N': define('__VERBOSE_Y', "");         define('__VERBOSE_N', " checked"); break;
 	}
 
 	// Load template
diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 9f00f402f8..03aea0c192 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -112,7 +112,7 @@ if (isset($_POST['ok']))
 		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
 	}
 
-	if ($CONFIG['test_text'] == "N")
+	if ($CONFIG['test_text'] == 'N')
 	{
 		define('_CFG_TEST_TEXT_N', " checked");
 		define('_CFG_TEST_TEXT_Y', "");
@@ -122,7 +122,7 @@ if (isset($_POST['ok']))
 		define('_CFG_TEST_TEXT_N', "");
 		define('_CFG_TEST_TEXT_Y', " checked");
 	}
-	if ($CONFIG['test_subj'] == "N")
+	if ($CONFIG['test_subj'] == 'N')
 	{
 		define('_CFG_TEST_SUBJ_N', " checked");
 		define('_CFG_TEST_SUBJ_Y', "");
@@ -132,7 +132,7 @@ if (isset($_POST['ok']))
 		define('_CFG_TEST_SUBJ_N', "");
 		define('_CFG_TEST_SUBJ_Y', " checked");
 	}
-	if ($CONFIG['url_blacklist'] == "N")
+	if ($CONFIG['url_blacklist'] == 'N')
 	{
 		define('_CFG_URL_BLIST_N', " checked");
 		define('_CFG_URL_BLIST_Y', "");
@@ -142,7 +142,7 @@ if (isset($_POST['ok']))
 		define('_CFG_URL_BLIST_N', "");
 		define('_CFG_URL_BLIST_Y', " checked");
 	}
-	if ($CONFIG['order_multi_page'] == "N")
+	if ($CONFIG['order_multi_page'] == 'N')
 	{
 		define('_CFG_ORDER_MULTI_N', " checked");
 		define('_CFG_ORDER_MULTI_Y', "");
@@ -152,7 +152,7 @@ if (isset($_POST['ok']))
 		define('_CFG_ORDER_MULTI_N', "");
 		define('_CFG_ORDER_MULTI_Y', " checked");
 	}
-	if ($CONFIG['autosend_active'] == "N")
+	if ($CONFIG['autosend_active'] == 'N')
 	{
 		define('_CFG_AUTOSEND_ACTIVE_N', " checked");
 		define('_CFG_AUTOSEND_ACTIVE_Y', "");
@@ -162,7 +162,7 @@ if (isset($_POST['ok']))
 		define('_CFG_AUTOSEND_ACTIVE_N', "");
 		define('_CFG_AUTOSEND_ACTIVE_Y', " checked");
 	}
-	if ($CONFIG['send_prof_update'] == "N")
+	if ($CONFIG['send_prof_update'] == 'N')
 	{
 		define('_CFG_SEND_UPDATE_N', " checked");
 		define('_CFG_SEND_UPDATE_Y', "");
@@ -172,7 +172,7 @@ if (isset($_POST['ok']))
 		define('_CFG_SEND_UPDATE_N', "");
 		define('_CFG_SEND_UPDATE_Y', " checked");
 	}
-	if ($CONFIG['admin_notify'] == "N")
+	if ($CONFIG['admin_notify'] == 'N')
 	{
 		define('_CFG_ADMIN_NOTIFY_N', " checked");
 		define('_CFG_ADMIN_NOTIFY_Y', "");
@@ -192,7 +192,7 @@ if (isset($_POST['ok']))
 		define('_CFG_CSS_PHP_DIRECT', "");
 		define('_CFG_CSS_PHP_FILE', " checked");
 	}
-	if ($CONFIG['guest_menu'] == "Y")
+	if ($CONFIG['guest_menu'] == 'Y')
 	{
 		define('_CFG_GUEST_MENU_ACTIVE', " checked");
 		define('_CFG_GUEST_MENU_INACTIVE', "");
@@ -202,7 +202,7 @@ if (isset($_POST['ok']))
 		define('_CFG_GUEST_MENU_ACTIVE', "");
 		define('_CFG_GUEST_MENU_INACTIVE', " checked");
 	}
-	if ($CONFIG['member_menu'] == "Y")
+	if ($CONFIG['member_menu'] == 'Y')
 	{
 		define('_CFG_MEMBER_MENU_ACTIVE', " checked");
 		define('_CFG_MEMBER_MENU_INACTIVE', "");
@@ -212,7 +212,7 @@ if (isset($_POST['ok']))
 		define('_CFG_MEMBER_MENU_ACTIVE', "");
 		define('_CFG_MEMBER_MENU_INACTIVE', " checked");
 	}
-	if ($CONFIG['youre_here'] == "Y")
+	if ($CONFIG['youre_here'] == 'Y')
 	{
 		define('_CFG_YOURE_HERE_ACTIVE', " checked");
 		define('_CFG_YOURE_HERE_INACTIVE', "");
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index a1e35996d6..1f028aa60d 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -187,12 +187,12 @@ WHERE mails_confirmed < %d", $REF, $REF);
 	// Including new add-mode for one-time referral bonus
 	switch ($CONFIG['allow_direct_pay'])
 	{
-	case "Y":
+	case 'Y':
 		define('__DIRECT_Y', " checked");
 		define('__DIRECT_N', "");
 		break;
 
-	case "N":
+	case 'N':
 		define('__DIRECT_Y', "");
 		define('__DIRECT_N', " checked");
 		break;
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 83e90ef542..91565cf9e3 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -262,7 +262,7 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
 		while (list($id, $aid, $start, $end, $title, $alogin, $active) = SQL_FETCHROW($result))
 		{
 			$select = "<INPUT type=\"checkbox\" name=\"sel[".$id."]\" class=\"admin_normal\" value=\"1\">";
-			if ($active == "Y") $select = "<STRONG class=\"big\">".$id."</STRONG>";
+			if ($active == 'Y') $select = "<STRONG class=\"big\">".$id."</STRONG>";
 
 			// Prepare data for the row template
 			$content = array(
diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index 0fe433f49f..bc6c58fd7b 100644
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -47,7 +47,7 @@ if (isset($_POST['ok']))
 	foreach ($_POST['mod'] as $mod=>$sel)
 	{
 		// Now you can never deselect the admin module, bah!!! ;-)
-		if (($sel == "Y") || ($mod == "admin"))
+		if (($sel == 'Y') || ($mod == "admin"))
 		{
 			// Add module to queue
 			$MODs[] = $mod;
diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php
index d128bbd6ca..e4b9f62ab9 100644
--- a/inc/modules/admin/what-config_transfer.php
+++ b/inc/modules/admin/what-config_transfer.php
@@ -54,8 +54,8 @@ define('__TRANS_CODE_VALUE'   , $CONFIG['transfer_code']);
 // Autppurge expired transfer entries?
 switch ($CONFIG['ap_inactive'])
 {
-	case "Y": define('__YES_AP', " selected=\"selected\""); define('__NO_AP', "");          break;
-	case "N": define('__YES_AP', "");          define('__NO_AP', " selected=\"selected\""); break;
+	case 'Y': define('__YES_AP', " selected=\"selected\""); define('__NO_AP', "");          break;
+	case 'N': define('__YES_AP', "");          define('__NO_AP', " selected=\"selected\""); break;
 }
 
 // Time selection box
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index d574a547ca..0fd97cf399 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -55,12 +55,12 @@ if (!empty($_GET['reg_ext'])) {
 	// De-/activate extensions
 	foreach ($_POST['sel'] as $id=>$active) {
 		// Shall we keep the extension always active?
-		if ((isset($KEEP_ACTIVE[GET_EXT_NAME($id)])) && ($KEEP_ACTIVE[GET_EXT_NAME($id)] == "Y") && ($active == "N")) {
+		if ((isset($KEEP_ACTIVE[GET_EXT_NAME($id)])) && ($KEEP_ACTIVE[GET_EXT_NAME($id)] == 'Y') && ($active == 'N')) {
 			// Keep this extension active!
 		} else {
 			// De/activate extension
-			$ACT = "N"; $EXT_LOAD_MODE = "deactivate";
-			if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
+			$ACT = 'N'; $EXT_LOAD_MODE = "deactivate";
+			if ($active == 'N') { $ACT = 'Y'; $EXT_LOAD_MODE = "activate"; }
 			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='".$ACT."' WHERE id=%d AND ext_active='%s' LIMIT 1",
 			 array(bigintval($id), $active), __FILE__, __LINE__);
 
@@ -93,8 +93,8 @@ if (!empty($_GET['reg_ext'])) {
 
 				// Run SQLs on activation / deactivation
 				switch ($active) {
-					case "Y": $EXT_LOAD_MODE = "activate";   break;
-					case "N": $EXT_LOAD_MODE = "deactivate"; break;
+					case 'Y': $EXT_LOAD_MODE = "activate";   break;
+					case 'N': $EXT_LOAD_MODE = "deactivate"; break;
 				}
 
 				// Run embeded SQL commands
@@ -111,7 +111,7 @@ if (!empty($_GET['reg_ext'])) {
 		$SW = "2"; $OUT = "";
 		foreach ($_POST['sel'] as $id=>$sel) {
 			// Edit this extension?
-			if (($sel == "Y") || ($sel == "N")) {
+			if (($sel == 'Y') || ($sel == 'N')) {
 				// Load required data
 				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
 					$result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 013330c1d0..8453ffe978 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if ($CONFIG['beg_rallye'] == "Y")
+if ($CONFIG['beg_rallye'] == 'Y')
 {
 	// Shall I withdraw now?
 	if (isset($_POST['withdraw']))
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 0f597a78e5..a4c6c97535 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if ($CONFIG['bonus_active'] == "Y")
+if ($CONFIG['bonus_active'] == 'Y')
 {
 	// Shall I withdraw now?
 	if (isset($_POST['withdraw']))
@@ -58,11 +58,11 @@ if ($CONFIG['bonus_active'] == "Y")
 	{
 		// Add more bonus points here
 		$USE = "(0";
-		if ($CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
-		if ($CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus";
-		if ($CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order";
-		if ($CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
-		if ($CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
+		if ($CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus";
+		if ($CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus";
+		if ($CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order";
+		if ($CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats";
+		if ($CONFIG['bonus_ref_yn']   == 'Y') $USE .= " + bonus_ref";
 		$USE .= ")";
 	}
 	 else
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 3a646ac64d..f9b7e02e47 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -148,7 +148,7 @@ if (!empty($_GET['pid']))
 						$msg = LOAD_EMAIL_TEMPLATE("member_payout_accepted", $_POST['text'], $uid);
 
 						// Output message
-						if ($allow == "Y")
+						if ($allow == 'Y')
 						{
 							// Banner / Textlink request
 							LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_BANNER_ACCEPTED_NOTIFIED);
@@ -259,7 +259,7 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
 			}
 
 			// Nothing entered must be secured in member/what-payputs.php !
-			if ($allow == "Y")
+			if ($allow == 'Y')
 			{
 				// Banner/Textlink views/clicks request
 				if (!empty($banner))
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index ffe00d085a..18d8b63cd5 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -183,7 +183,7 @@ if (isset($_POST['edit']))
 			$content['s_hour']  = ADD_SELECTION("hour" , date("G", $start), "start", $id);
 			$content['s_day']   = ADD_SELECTION("day"  , date("d", $start), "start", $id);
 			$content['s_month'] = ADD_SELECTION("month", date("m", $start), "start", $id);
-			$content['s_year']  = ADD_SELECTION("year" , date("Y", $start), "start", $id);
+			$content['s_year']  = ADD_SELECTION("year" , date('Y', $start), "start", $id);
 
 			// Ending day
 			$content['e_sec']   = ADD_SELECTION("sec"  , date("s", $end)  , "end"  , $id);
@@ -191,7 +191,7 @@ if (isset($_POST['edit']))
 			$content['e_hour']  = ADD_SELECTION("hour" , date("G", $end)  , "end"  , $id);
 			$content['e_day']   = ADD_SELECTION("day"  , date("d", $end)  , "end"  , $id);
 			$content['e_month'] = ADD_SELECTION("month", date("m", $end)  , "end"  , $id);
-			$content['e_year']  = ADD_SELECTION("year" , date("Y", $end)  , "end"  , $id);
+			$content['e_year']  = ADD_SELECTION("year" , date('Y', $end)  , "end"  , $id);
 
 			// Remember over values
 			$content['templ']      = RALLYE_TEMPLATE_SELECTION("templ[".$id."]", $templ);
@@ -337,14 +337,14 @@ ORDER BY start_time DESC",
 			// Is the rallye active or not?
 			switch ($active)
 			{
-			case "Y":
+			case 'Y':
 				// Rallye is active so do not edit it!
 				$content['select'] = "<STRONG class=\"big\">".$id."</STRONG>";
 				$content['active_title'] = RALLYE_DEACTIVATE_NOW;
 				$content['active'] = "0";
 				break;
 
-			case "N":
+			case 'N':
 				$content['active_title'] = RALLYE_ACTIVATE_NOW;
 				$content['active'] = "1";
 				break;
@@ -353,12 +353,12 @@ ORDER BY start_time DESC",
 			// Notification to members?
 			switch ($notify)
 			{
-			case "Y":
+			case 'Y':
 				$content['notify_title'] = RALLYE_STOP_NOTIFY_NOW;
 				$content['notify'] = "0";
 				break;
 
-			case "N":
+			case 'N':
 				$content['notify_title'] = RALLYE_START_NOTIFY_NOW;
 				$content['notify'] = "1";
 				break;
@@ -367,12 +367,12 @@ ORDER BY start_time DESC",
 			// Auto-add of new joined members?
 			switch ($auto_add)
 			{
-			case "Y":
+			case 'Y':
 				$content['auto_title'] = RALLYE_STOP_AUTO_ADD_NOW;
 				$content['auto'] = "0";
 				break;
 
-			case "N":
+			case 'N':
 				$content['auto_title'] = RALLYE_START_AUTO_ADD_NOW;
 				$content['auto'] = "1";
 				break;
diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php
index 734640b911..e5dde00cc9 100644
--- a/inc/modules/admin/what-maintenance.php
+++ b/inc/modules/admin/what-maintenance.php
@@ -45,13 +45,13 @@ if (isset($_POST['ok']))
 	// De- or activate maintenance mode
 	switch ($CONFIG['maintenance'])
 	{
-	case "Y":
-		$target_mode = "N";
+	case 'Y':
+		$target_mode = 'N';
 		$out = ADMIN_MAINTENANCE_DEACTIVATED;
 		break;
 
-	case "N":
-		$target_mode = "Y";
+	case 'N':
+		$target_mode = 'Y';
 		$out = ADMIN_MAINTENANCE_ACTIVATED;
 		break;
 	}
@@ -67,11 +67,11 @@ if (isset($_POST['ok']))
 {
 	switch ($CONFIG['maintenance'])
 	{
-	case "Y": // Maintenance mode is active
+	case 'Y': // Maintenance mode is active
 		define('ADMIN_MAINTENANCE_MODE', ADMIN_MAINTENANCE_MODE_IS_ACTIVE);
 		break;
 
-	case "N": // Maintenance mode is inactive
+	case 'N': // Maintenance mode is inactive
 		define('ADMIN_MAINTENANCE_MODE', ADMIN_MAINTENANCE_MODE_IS_INACTIVE);
 		break;
 	}
diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index fccbb061a5..ef60bdb2b0 100644
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -93,8 +93,8 @@ if (isset($_POST['ok']))
 		// Gettings points is oka, so we can add $USED later from
 		if ($EXT_HTML)
 		{
-			$HTML = "N";
-			if ($_GET['mode'] == "html") $HTML = "Y";
+			$HTML = 'N';
+			if ($_GET['mode'] == "html") $HTML = 'Y';
 			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
 VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s', '%s')",
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 9246c4bf46..9fc626ce05 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -55,7 +55,7 @@ if ($SEL > 0)
 		if (isset($_POST['status']))
 		{
 			// Change status
-			if ($_POST['active'][$id] == "Y")
+			if ($_POST['active'][$id] == 'Y')
 			{
 				$SQL = "UPDATE "._MYSQL_PREFIX."_themes SET theme_active='N' WHERE id='".$id."' LIMIT 1";
 			}
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 93c8630e74..badd8c36e4 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -82,7 +82,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
 					SQL_FREERESULT($result);
 
 					// Check for bonus extension version >= 0.4.4 for the order bonus
-					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($CONFIG['bonus_active'] == "Y"))
+					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($CONFIG['bonus_active'] == 'Y'))
 					{
 						// Add points directly
 						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_order=bonus_order+".$CONFIG['bonus_order']." WHERE userid=%d LIMIT 1",
diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php
index eb2dfc697d..bc44387c0b 100644
--- a/inc/modules/admin/what-user_online.php
+++ b/inc/modules/admin/what-user_online.php
@@ -85,12 +85,12 @@ if (SQL_NUMROWS($result) > 0)
 		if ($action == "") $action = "---";
 		if ($what   == "")   $what = "---";
 
-		if ($admin == "Y")
+		if ($admin == 'Y')
 		{
 			// Is an administrator
 			$userid = _IS_ADMIN;
 		}
-		elseif (($mem == "N") && ($admin == "N"))
+		elseif (($mem == 'N') && ($admin == 'N'))
 		{
 			// Is a guest
 			$userid = _IS_GUEST;
diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index e5952f873a..236b491fc9 100644
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -75,12 +75,12 @@ if (EXT_IS_ACTIVE("online", true))
 			if (empty($act)) $act = "---";
 			if (empty($wht))   $wht = "---";
 
-			if ($admin == "Y")
+			if ($admin == 'Y')
 			{
 				// Is an administrator
 				$uid = _IS_ADMIN;
 			}
-			 elseif (($mem == "N") && ($admin == "N"))
+			 elseif (($mem == 'N') && ($admin == 'N'))
 			{
 				// Is a guest
 				$uid = _IS_GUEST;
diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 9be4517da9..c04d7117a2 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -55,8 +55,7 @@ if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE[
 	$_COOKIE['mxchange_theme'] = $NewTheme;
 
 	$bonus = false;
-	die("<pre>".print_r($CONFIG, true)."</pre>");
-	if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1")) {
+	if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && ($CONFIG['bonus_login_yn'] == 'Y')) {
 		// Update last login
 		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET last_login=UNIX_TIMESTAMP()
diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 1cb2a7b8e2..2f0f114206 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -91,7 +91,7 @@ if (!empty($_GET['hash']))
 					}
 
 					// If version matches add ref bonus to refid's account
-					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($CONFIG['bonus_active'] == "Y"))
+					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($CONFIG['bonus_active'] == 'Y'))
 					{
 						// Add points (directly only!)
 						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_ref=bonus_ref+%s WHERE userid=%d LIMIT 1",
diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index c40c2cc679..ceabf29cd0 100644
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -72,7 +72,7 @@ case "RESET":
 }
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", 'Y', 'N', "DESC"));
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE());
diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 03ce6d8547..1dccf93bc1 100644
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -67,7 +67,7 @@ define('__MT_STAGE', $CONFIG['mt_stage']);
 
 // Project timestamp when number of members are reached
 $PROJECTED = round((time() - $CONFIG['mt_start']) / user_count * $CONFIG['mt_stage'] + $CONFIG['mt_start']);
-$YEAR = date("Y", $PROJECTED); $MONTH = date("m", $PROJECTED); $DAY = date("d", $PROJECTED);
+$YEAR = date('Y', $PROJECTED); $MONTH = date("m", $PROJECTED); $DAY = date("d", $PROJECTED);
 $TEST = mktime(0, 0, 0, $MONTH, $DAY, $YEAR);
 if ($TEST > time())
 {
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 541575379c..80b313be03 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -77,7 +77,7 @@ if (isset($_POST['ok']))
 	// First we only check the submitted data then we continue... :)
 	//
 	// Did he agree to our Terms Of Usage?
-	if ($_POST['agree'] != "Y")
+	if ($_POST['agree'] != 'Y')
 	{
 		$_POST['agree'] = "!";
 		$FAILED = true;
@@ -133,7 +133,7 @@ if (isset($_POST['ok']))
 		// Do this check only when no admin is logged in
 		foreach ($_POST['cat'] as $id=>$answer)
 		{
-			if ($answer == "Y") $cats++;
+			if ($answer == 'Y') $cats++;
 		}
 		if ($cats < $CONFIG['least_cats'])
 		{
@@ -141,7 +141,7 @@ if (isset($_POST['ok']))
 			$FAILED = true;
 		}
 	}
-	if (($_POST['addy'] != "!") && ($CONFIG['check_double_email'] == "Y") && (!IS_ADMIN()))
+	if (($_POST['addy'] != "!") && ($CONFIG['check_double_email'] == 'Y') && (!IS_ADMIN()))
 	{
 		// Does the email address already exists in our database?
 		$CHK = SEARCH_EMAIL_USERTAB($_POST['addy']);
@@ -198,7 +198,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	if (GET_EXT_VERSION("beg") >= "0.1.7")
 	{
 		// Okay, shall I disable now?
-		if ($CONFIG['beg_new_mem_notify'] == "N")
+		if ($CONFIG['beg_new_mem_notify'] == 'N')
 		{
 			$ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -209,7 +209,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	if (GET_EXT_VERSION("bonus") >= "0.7.7")
 	{
 		// Okay, shall I disable now?
-		if ($CONFIG['bonus_new_mem_notify'] == "N")
+		if ($CONFIG['bonus_new_mem_notify'] == 'N')
 		{
 			$ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -286,7 +286,7 @@ array(
 	// Write catgories
 	if ((is_array($_POST['cat'])) && (count($_POST['cat']))) {
 		foreach ($_POST['cat'] as $cat=>$joined) {
-			if ($joined == "Y") {
+			if ($joined == 'Y') {
 				// Insert category entry
 				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%d, %d)",
 				 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
@@ -438,7 +438,7 @@ array(
 	}
 
 	// Shall I display the refid or shall I make it editable?
-	if ($CONFIG['display_refid'] == "Y") {
+	if ($CONFIG['display_refid'] == 'Y') {
 		// Load template to enter it
 		define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
 	} else {
diff --git a/inc/modules/index.php b/inc/modules/index.php
index afccd22e33..f73e2c23f9 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -97,7 +97,7 @@ if (empty($GLOBALS['action']))
 }
 
 // Add the guest's menu here...
-if (($CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
 	// Show only when guest menu is active
 	ADD_MENU("guest", $act, $GLOBALS['what']);
@@ -118,7 +118,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
 	LOAD_URL(URL."/modules.php?module=index");
 }
 
-if (($CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
 	// TDs between content and </table>
 	LOAD_TEMPLATE("guest_content_footer");
diff --git a/inc/modules/login.php b/inc/modules/login.php
index e7e2d35810..47f34c07f4 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -92,7 +92,7 @@ if (empty($GLOBALS['action']))
 }
 
 // Add the member's menu here...
-if (($CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
 	ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']);
 }
@@ -112,7 +112,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
 	LOAD_URL("modules.php?module=login");
 }
 
-if (($CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
 	OUTPUT_HTML ("  <BR></TD>
 </TR>
diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 57b238cb1a..e967ae56fc 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -55,11 +55,11 @@ if (GET_EXT_VERSION("bonus") >= "0.6.9")
 {
 	// Add more bonus points here
 	$USE = "(0";
-	if ($CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
-	if ($CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus";
-	if ($CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order";
-	if ($CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
-	if ($CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
+	if ($CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus";
+	if ($CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus";
+	if ($CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order";
+	if ($CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats";
+	if ($CONFIG['bonus_ref_yn']   == 'Y') $USE .= " + bonus_ref";
 	$USE .= ")";
 }
  else
diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 13e65235e3..659673b732 100644
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -60,7 +60,7 @@ if ($cats > 0)
 		$cnt = 0;
 		foreach ($_POST['cat'] as $cat=>$joined)
 		{
-			if ($joined == "N") $cnt++;
+			if ($joined == 'N') $cnt++;
 		}
 		if (($cats - $cnt) < $CONFIG['least_cats'])
 		{
@@ -74,7 +74,7 @@ if ($cats > 0)
 		{
 			switch ($joined)
 			{
-				case "Y":
+				case 'Y':
 					$sql = "";
 					$result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%d AND cat_id=%d LIMIT 1",
 					 array($UID, bigintval($cat)), __FILE__, __LINE__);
@@ -90,7 +90,7 @@ if ($cats > 0)
 					}
 					break;
 
-				case "N":
+				case 'N':
 					$sql = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%d AND cat_id=%d LIMIT 1";
 					break;
 			}
@@ -130,7 +130,7 @@ if ($cats > 0)
 			// When we found an entry don't read it, just change the JOINED_x variables
 			if (isset($_POST['cat']))
 			{
-				if ($_POST['cat'][$id] =="Y") { $JOINED_Y = " checked"; $JOINED_N = ""; }
+				if ($_POST['cat'][$id] =='Y') { $JOINED_Y = " checked"; $JOINED_N = ""; }
 			}
 			 else
 			{
diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 5819281f00..b665764ef2 100644
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -96,13 +96,13 @@ case "RESET":
 }
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "Y", "N", "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], 'Y', 'N', "DESC"));
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE($GLOBALS['userid']));
 
 // Generate table with refferal payouts
-define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "N", "Y", "DESC"));
+define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], 'N', 'Y', "DESC"));
 
 // Generate timemark
 define('__TIMEOUT_MARK', CREATE_FANCY_TIME($CONFIG['doubler_timeout']));
diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index ac0a54d122..6b58f029af 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -159,7 +159,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if (($active == "Y") && (($locked + $CONFIG['holiday_lock']) < time()))
+	if (($active == 'Y') && (($locked + $CONFIG['holiday_lock']) < time()))
 	{
 		// Load data
 		$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
@@ -203,7 +203,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_CANNOT_DEACTIVATE);
 		}
 	}
-	 elseif ($active == "Y")
+	 elseif ($active == 'Y')
 	{
 		// To fast!
 		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED);
@@ -225,7 +225,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 		// User can deactivate his holiday request
 		switch ($active)
 		{
-		case "Y": // Display deactivation form
+		case 'Y': // Display deactivation form
 			// Load starting and ending date
 			$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
 WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
@@ -257,16 +257,16 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			}
 			break;
 
-		case "N": // Display activation form
+		case 'N': // Display activation form
 			// Starting day
 			define('_START_DAY'  , ADD_SELECTION("day"  , date("d", (time() + ONE_DAY)), "start"));
 			define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + ONE_DAY)), "start"));
-			define('_START_YEAR' , ADD_SELECTION("year" , date("Y", (time() + ONE_DAY)), "start"));
+			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + ONE_DAY)), "start"));
 
 			// Calcualte ending date
 			$D = date("d", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
 			$M = date("m", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
-			$Y = date("Y", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
+			$Y = date('Y', time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
 
 			// Ending day
 			define('_END_DAY'  , ADD_SELECTION("day"  , $D, "end"));
diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 2baa95b8d6..57a4cb8359 100644
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -66,7 +66,7 @@ if (isset($_POST['ok']))
 	list($mode) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if ($mode == "Y")
+	if ($mode == 'Y')
 	{
 		define('HTML_Y', " checked");
 		define('HTML_N', "");
diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index af06409959..de1bcdb994 100644
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -59,7 +59,7 @@ SQL_FREERESULT($result);
 // Remember charge value
 define('__CHARGE_VALUE', TRANSLATE_COMMA($CONFIG['nl_charge']));
 
-if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
+if ((isset($_POST['ok'])) && ($status == 'Y') && ($span == "0"))
 {
 	// Save request
 	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET nl_timespan='".(ONE_DAY * 30)."' WHERE userid=%d LIMIT 1",
@@ -102,13 +102,13 @@ VALUES ('0', 'NEW', 'NL_UNSUBSCRIBE', '".ADMIN_NL_SUBJECT."', '".addslashes($adm
 	// Set status message and submit button
 	switch ($status)
 	{
-	case "Y": // Receives the newsletter
+	case 'Y': // Receives the newsletter
 		define('__STATUS_VALUE', NL_MEMBER_ON);
 		define('__UNTIL_VALUE', "");
 		define('NL_SUBMIT', NL_MEMBER_SUBMIT_OFF);
 		break;
 
-	case "N": // Does not receive the newsletter
+	case 'N': // Does not receive the newsletter
 		define('__STATUS_VALUE', NL_MEMBER_OFF);
 		define('__UNTIL_VALUE', MAKE_DATETIME($until, "2"));
 		define('NL_SUBMIT', NL_MEMBER_SUBMIT_ON);
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index fd48a1b2b5..205ef6a589 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -92,7 +92,7 @@ WHERE userid=%d AND max_mails > 0 LIMIT 1",
 $mmails = SQL_NUMROWS($result_mmails);
 list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
 SQL_FREERESULT($result_mmails);
-if ($HOLIDAY == $DMY) $HOLIDAY="N";
+if ($HOLIDAY == $DMY) $HOLIDAY='N';
 
 $ALLOWED = $MAXI - $ORDERS;
 if ($CONFIG['order_max'] == "MAX") $ALLOWED = $MAXI;
@@ -123,7 +123,7 @@ if (SQL_NUMROWS($result_p) > 0)
 	if (!ereg(".", $TOTAL)) $TOTAL .= ".00000";
 }
 
-if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
+if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 {
 	// Holiday is active!
 	SQL_FREERESULT($result_p);
@@ -148,7 +148,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 		// No entry found, so we need to check out the stats table as well... :)
 		// We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters
 		$URL = "";
-		if ($CONFIG['test_text'] == "Y")
+		if ($CONFIG['test_text'] == 'Y')
 		{
 			// Test submitted text against some filters (length, URLs in text etc.)
 			if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1))
@@ -164,7 +164,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 			}
 		}
 		// Shall I test the subject line against URLs?
-		if ($CONFIG['test_subj'] == "Y")
+		if ($CONFIG['test_subj'] == 'Y')
 		{
 			// Check the subject line for issues
 			$_POST['subject'] = str_replace("\\", "[nl]", substr($_POST['subject'], 0, 200));
@@ -175,7 +175,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 			}
 		}
 		// And shall I check that his URL is not in the black list?
-		if ($CONFIG['url_blacklist'] == "Y")
+		if ($CONFIG['url_blacklist'] == 'Y')
 		{
 			// Ok, I do that for you know...
 			$result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_url_blist WHERE url='%s' LIMIT 1",
@@ -205,7 +205,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 		// Probe for HTML extension
 		if ($HTML_EXT)
 		{
-			if ($_POST['html'] == "Y")
+			if ($_POST['html'] == 'Y')
 			{
 				// Chek for valid HTML tags
 				$_POST['text'] = HTML_CHECK_TAGS($_POST['text']);
@@ -229,7 +229,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 	{
 		// Check if category and number of receivers is okay
 		$ADD = "";
-		if (($CONFIG['order_multi_page'] == "Y") && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";
+		if (($CONFIG['order_multi_page'] == 'Y') && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";
 
 		// Check for userids
 		$result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c
@@ -468,7 +468,7 @@ array(
 
 			// Enable HTML checking
 			$HTML = ""; $HOLIDAY = false; $HOL_STRING = "";
-			if (($HTML_EXT) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'";
+			if (($HTML_EXT) && ($_POST['html'] == 'Y')) $HTML = " AND html='Y'";
 			if (GET_EXT_VERSION("holiday") >= "0.1.3")
 			{
 				// Extension's version is fine
@@ -515,7 +515,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						$result_ver = SQL_QUERY_ESC("SELECT zip FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
 						 array(bigintval($ucat)), __FILE__, __LINE__);
 
-						if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($CONFIG['order_multi_page'] == "Y"))
+						if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($CONFIG['order_multi_page'] == 'Y'))
 						{
 							list($zip) = SQL_FETCHROW($result_ver);
 							SQL_FREERESULT($result_ver);
@@ -688,7 +688,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				}
 
 				// 01      2                       21    12                             2    23         443    3          3210
-				if ((!empty($_POST['data'])) || (($CONFIG['order_multi_page'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT))))
+				if ((!empty($_POST['data'])) || (($CONFIG['order_multi_page'] == 'N') && ((!IS_ADMIN()) && (!$HTML_EXT))))
 				{
 					// Pre-output categories
 					$CAT = "";
@@ -730,7 +730,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						define('ZIP_OUTPUT', "<TR><TD colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</TD></TR>");
 					}
 					// HTML extension
-					if (($HTML_EXT) && ($_POST['html'] == "Y"))
+					if (($HTML_EXT) && ($_POST['html'] == 'Y'))
 					{
 						// Extension is active so output valid HTML tags
 						define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS()));
@@ -751,7 +751,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					if ($HTML_EXT)
 					{
 						// Add some content when html extension is active
-						if (($CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
+						if (($CONFIG['order_multi_page'] == 'Y') || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
 						define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));
 					}
 					 else
@@ -760,7 +760,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
 					}
 					// Do we want ZIP code or not?
-					if (($CONFIG['order_multi_page'] == "Y") || (IS_ADMIN()))
+					if (($CONFIG['order_multi_page'] == 'Y') || (IS_ADMIN()))
 					{
 						// Yes
 						$content = array(
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 0431f0e627..87249d1e4f 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -109,7 +109,7 @@ ORDER BY p.payout_timestamp DESC",
 				$status = "<FONT class=\"member_failed\">".$status."</FONT>";
 
 				// Nothing entered must be secured in member/what-payputs.php !
-				if ($allow == "Y")
+				if ($allow == 'Y')
 				{
 					// Banner/Textlink views/clicks request
 					if (!empty($banner))
@@ -206,7 +206,7 @@ ORDER BY p.payout_timestamp DESC",
 				}
 
 				// Add entry to his tranfer history
-				if ($allow == "Y")
+				if ($allow == 'Y')
 				{
 					// Banner/textlink ordered
 					$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)
@@ -281,7 +281,7 @@ VALUES (0, 'NEW', 'PAYOUT_REQUEST', '[payout:] ".PAYOUT_REQUEST_ADMIN."', '%s',
 				// Load template and output it
 				LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REQUEST_SENT);
 			}
-			 elseif ($allow == "Y")
+			 elseif ($allow == 'Y')
 			{
 				// Generate banner order form
 				LOAD_TEMPLATE("member_payout_form_banner");
diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index c094e51d09..aee76fd692 100644
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -154,7 +154,7 @@ define('__TLOCK_VALUE', TRANSLATE_COMMA($TLOCK));
 if (GET_EXT_VERSION("bonus") < "0.4.4") $CONFIG['bonus_active'] = "X";
 
 // Display login bonus and turbo-click bonus
-if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($CONFIG['bonus_active'] == "Y"))
+if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($CONFIG['bonus_active'] == 'Y'))
 {
 	$ADD = ", 0, 0, 0";
 	if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
@@ -185,7 +185,7 @@ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($CONFI
 	// Output rows
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true));
 }
- elseif ($CONFIG['bonus_active'] == "N")
+ elseif ($CONFIG['bonus_active'] == 'N')
 {
 	// Bonus active rallye deactivated
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_disabled", true));
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 27f4b77727..0cc0be7d80 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -62,7 +62,7 @@ $MODE = "";
 if (!empty($_GET['mode'])) $MODE = $_GET['mode'];
 
 // Check for "faker"
-if (($opt_in == "N") && ($MODE == "new")) $MODE = "";
+if (($opt_in == 'N') && ($MODE == "new")) $MODE = "";
 
 switch ($MODE)
 {
@@ -592,13 +592,13 @@ case "": // Overview page
 	}
 	switch ($opt_in)
 	{
-	case "Y":
+	case 'Y':
 		define('__TRANSFER_ALLOW_Y', " checked");
 		define('__TRANSFER_ALLOW_N', "");
 		define('__TRANSFER_NEW_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</A>");
 		break;
 
-	case "N":
+	case 'N':
 		define('__TRANSFER_ALLOW_Y', "");
 		define('__TRANSFER_ALLOW_N', " checked");
 		define('__TRANSFER_NEW_LINK', TRANSFER_PLEASE_ALLOW_OPT_IN);
diff --git a/inc/modules/order.php b/inc/modules/order.php
index bd0d656cf9..f8c5585af5 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -58,7 +58,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if (empty($URL))
 {
 	// Is the auto-send mechanism active or inactive?
-	if ($CONFIG['autosend_active'] == "Y")
+	if ($CONFIG['autosend_active'] == 'Y')
 	{
 		// Auto-send is active
 		define('ADMIN_AUTOSEND',  COMPILE_CODE(ADMIN_AUTOSEND_ACTIVE));
diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 7b5780dfb6..6576bd8819 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -61,7 +61,7 @@ if (($curr != $CONFIG['beg_month']) && ($CONFIG['beg_month'] > 0) && ($CONFIG['b
 	if (EXT_IS_ACTIVE("autopurge"))
 	{
 		// Use last online stamp only when autopurge for inactive members is activated
-		if (($CONFIG['ap_in_since'] > 0) && ($CONFIG['beg_active'] == "Y"))
+		if (($CONFIG['ap_in_since'] > 0) && ($CONFIG['beg_active'] == 'Y'))
 		{
 			// Okay, include last online timestamp
 			$WHERE1 = "AND last_online >=";
diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 1dec6c3bef..eb98676f30 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -71,11 +71,11 @@ if (($curr != $CONFIG['bonus_month']) && ($CONFIG['bonus_ranks'] > 0) && ($CSS !
 
 	// Add more bonus points here
 	$ADD = " AND (0";
-	if ($CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus";
-	if ($CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus";
-	if ($CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order";
-	if ($CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats";
-	if ($CONFIG['bonus_ref_yn']   == "Y") $ADD .= " + bonus_ref";
+	if ($CONFIG['bonus_click_yn'] == 'Y') $ADD .= " + turbo_bonus";
+	if ($CONFIG['bonus_login_yn'] == 'Y') $ADD .= " + login_bonus";
+	if ($CONFIG['bonus_order_yn'] == 'Y') $ADD .= " + bonus_order";
+	if ($CONFIG['bonus_stats_yn'] == 'Y') $ADD .= " + bonus_stats";
+	if ($CONFIG['bonus_ref_yn']   == 'Y') $ADD .= " + bonus_ref";
 	$ADD .= ") > 0";
 
 	// SQL string to check for accounts
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 6c79d2d583..00f4109494 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -110,7 +110,7 @@ function CHECK_MODULE($mod)
 	if ((!mxchange_installed) || (mxchange_installing) || (!admin_registered)) return "done";
 
 	// Check if cache is latest version
-	$locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
+	$locked = 'Y'; $hidden = 'N'; $admin = 'N'; $mem = 'N'; $found = false;
 	if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module'])))
 	{
 		// Is the module cached?
@@ -145,22 +145,22 @@ 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";
@@ -303,7 +303,7 @@ function ADD_DESCR($ACC_LVL, $FILE, $return = false, $output = true)
 			// 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";
@@ -850,7 +850,7 @@ function SEND_MODE_MAILS($mod, $modes)
 					// Load template
 					$msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']);
 
-					if ($CONFIG['admin_notify'] == "Y")
+					if ($CONFIG['admin_notify'] == 'Y')
 					{
 						// The admin needs to be notified about a profile change
 						$msg_admin = "admin_mydata_notify";
@@ -909,7 +909,7 @@ function SEND_MODE_MAILS($mod, $modes)
 			SEND_ADMIN_EMAILS($sub_adm, LOAD_EMAIL_TEMPLATE($msg_admin, $content, $GLOBALS['userid']));
 		}
 	}
-	 elseif ($CONFIG['admin_notify'] == "Y")
+	 elseif ($CONFIG['admin_notify'] == 'Y')
 	{
 		// Cannot send mails to admin!
 		$content = CANNOT_SEND_ADMIN_MAILS;
@@ -1249,7 +1249,7 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht)
 	if (!EXT_IS_ACTIVE("online", true)) return;
 
 	// Initialize variables
-	$uid = "0"; $rid = "0"; $MEM = "N"; $ADMIN = "N";
+	$uid = "0"; $rid = "0"; $MEM = 'N'; $ADMIN = 'N';
 	if (!empty($GLOBALS['userid']))
 	{
 		// Update member status only when userid is valid
@@ -1257,13 +1257,13 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht)
 		{
 			// Is valid user
 			$uid = $GLOBALS['userid'];
-			$MEM = "Y";
+			$MEM = 'Y';
 		}
 	}
 	if (IS_ADMIN())
 	{
 		// Is administrator
-		$ADMIN = "Y";
+		$ADMIN = 'Y';
 	}
 	if (!empty($_COOKIE['refid']))
 	{
@@ -1653,13 +1653,13 @@ function MODULE_HAS_MENU($mod)
 		if (isset($MODULES['has_menu'][$mod]))
 		{
 			// Check module cache and count hit
-			if ($MODULES['has_menu'][$mod] == "Y") $ret = true;
+			if ($MODULES['has_menu'][$mod] == 'Y') $ret = true;
 			$CONFIG['cache_hits']++;
 		}
 		 elseif (isset($EXTENSIONS['ext_menu'][$mod]))
 		{
 			// Check cache and count hit
-			if ($EXTENSIONS['ext_menu'][$mod] == "Y") $ret = true;
+			if ($EXTENSIONS['ext_menu'][$mod] == 'Y') $ret = true;
 			$CONFIG['cache_hits']++;
 		}
 	}
@@ -1671,7 +1671,7 @@ function MODULE_HAS_MENU($mod)
 		if (SQL_NUMROWS($result) == 1)
 		{
 			list($has_menu) = SQL_FETCHROW($result);
-			if ($has_menu == "Y") $ret = true;
+			if ($has_menu == 'Y') $ret = true;
 		}
 
 		// Free memory
diff --git a/inc/pool-update.php b/inc/pool-update.php
index fabbcbdb0e..b764392c67 100644
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -60,7 +60,7 @@ if (SQL_NUMROWS($result_main) > 0)
 	while ($DATA = SQL_FETCHROW($result_main))
 	{
 		// Check fetched data for HTML
-		$HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N";
+		$HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = 'N';
 
 		// Compile URL and subject line
 		$DATA[7] = COMPILE_CODE($DATA[7]);
diff --git a/inc/profile-updte.php b/inc/profile-updte.php
index 216e46fe2e..759219abb1 100644
--- a/inc/profile-updte.php
+++ b/inc/profile-updte.php
@@ -39,7 +39,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 	require($INC);
 }
 
-if (($CONFIG['send_prof_update'] == "Y") && ($CONFIG['profile_update'] > 0) && ($CONFIG['resend_profile_update']))
+if (($CONFIG['send_prof_update'] == 'Y') && ($CONFIG['profile_update'] > 0) && ($CONFIG['resend_profile_update']))
 {
 	// Ok, we shall send update notifications...
 	$TIMEOUT  = bigintval(time() - $CONFIG['profile_update']);
diff --git a/mailid_top.php b/mailid_top.php
index a4d1b72377..efeb5ecba5 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -102,7 +102,7 @@ if (defined('mxchange_installed') && (mxchange_installed))
 				list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid);
 
 				// Correct notification switch in non-bonus mails
-				if (($notify != "Y") && ($notify != "N")) $notify = "N";
+				if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
 
 				// Free some memory
 				SQL_FREERESULT($result_mailid);
@@ -214,7 +214,7 @@ if (defined('mxchange_installed') && (mxchange_installed))
 									if (bigintval($_POST['gfx_check']) == $img_code)
 									{
 										// Right code entered add points and remove entry
-										if (($ref_pay > 0) && ($CONFIG['allow_direct_pay'] == "N"))
+										if (($ref_pay > 0) && ($CONFIG['allow_direct_pay'] == 'N'))
 										{
 											// Don't add points over the referral system
 											$locked = true;
@@ -238,10 +238,10 @@ if (defined('mxchange_installed') && (mxchange_installed))
 										if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (function_exists('BONUS_ADD_TURBO_POINTS')))
 										{
 											// Is an active-rallye running and this is not a notification mail?
-											if (($CONFIG['bonus_active'] == "Y") && ($notify == "N"))
+											if (($CONFIG['bonus_active'] == 'Y') && ($notify == 'N'))
 											{
 												// Shall I exclude the webmaster's own userid from the active-rallye?
-												if (((($CONFIG['bonus_uid'] == $url_uid) && ($CONFIG['bonus_include_own'] == "Y")) || ($CONFIG['bonus_uid'] != $url_uid)) && ($CONFIG['def_refid'] != $url_uid))
+												if (((($CONFIG['bonus_uid'] == $url_uid) && ($CONFIG['bonus_include_own'] == 'Y')) || ($CONFIG['bonus_uid'] != $url_uid)) && ($CONFIG['def_refid'] != $url_uid))
 												{
 													// Add points and remember ranking are done in this function....
 													BONUS_ADD_TURBO_POINTS($DATA, $url_uid, $TYPE);
diff --git a/modules.php b/modules.php
index 9cc7ff28b9..52833e3ac4 100644
--- a/modules.php
+++ b/modules.php
@@ -92,7 +92,7 @@ include (PATH."inc/header.php");
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
-if ((!empty($CONFIG['maintenance'])) && ($CONFIG['maintenance'] == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin"))
+if ((!empty($CONFIG['maintenance'])) && ($CONFIG['maintenance'] == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin"))
 {
 	// Maintain mode is active and you are no admin
 	ADD_FATAL(LANG_DOWN_MAINTAINCE);
diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl
index b1a5ee7bf4..64b1fbe399 100644
--- a/templates/de/html/admin/admin_add_bank_package.tpl
+++ b/templates/de/html/admin/admin_add_bank_package.tpl
@@ -132,9 +132,9 @@
 		{--ADMIN_BANK_PACKAGE_ACTIVE--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><INPUT class="admin_normal" type="radio"
-			name="package_active" value="Y" default checked>&nbsp;{--YES--}<BR />
+			name="package_active" value='Y' default checked>&nbsp;{--YES--}<BR />
 		<INPUT class="admin_normal" type="radio" name="package_active"
-			value="N">&nbsp;{--NO--}</TD>
+			value='N'>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_add_banner.tpl b/templates/de/html/admin/admin_add_banner.tpl
index 45dcd60cf5..0b143b7c01 100644
--- a/templates/de/html/admin/admin_add_banner.tpl
+++ b/templates/de/html/admin/admin_add_banner.tpl
@@ -32,8 +32,8 @@
 		<TD align="right" width="200">{--ADMIN_SELECT_BANNER_ACTIVE--}</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><SELECT name="visible" size="1" class="admin_select">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
+			<OPTION value='Y'>{--YES--}</OPTION>
+			<OPTION value='N'>{--NO--}</OPTION>
 		</SELECT></TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl
index b1f7b0862d..36353a787c 100644
--- a/templates/de/html/admin/admin_add_cat.tpl
+++ b/templates/de/html/admin/admin_add_cat.tpl
@@ -42,9 +42,9 @@
 		<TD align="right" width="200"><STRONG>{--CAT_IS_VISIBLE--}</STRONG>
 		</TD>
 		<TD class="seperator" width="7">&nbsp;</TD>
-		<TD>{--YES--}: <INPUT type="radio" name="visible" value="Y"
+		<TD>{--YES--}: <INPUT type="radio" name="visible" value='Y'
 			class="admin_normal" checked>&nbsp;&nbsp; {--NO--}: <INPUT
-			type="radio" name="visible" value="N" class="admin_normal"></TD>
+			type="radio" name="visible" value='N' class="admin_normal"></TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl
index 33639c9fdb..f41940f14b 100644
--- a/templates/de/html/admin/admin_add_country.tpl
+++ b/templates/de/html/admin/admin_add_country.tpl
@@ -38,8 +38,8 @@
 		<TD align="right" width="200">{--ADMIN_COUNTRY_CODE_ACTIVE--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><SELECT name="is_active" size="1" class="admin_select">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
+			<OPTION value='Y'>{--YES--}</OPTION>
+			<OPTION value='N'>{--NO--}</OPTION>
 		</SELECT></TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl
index a7d4c963bc..e4edb08ea1 100644
--- a/templates/de/html/admin/admin_config_autopurge.tpl
+++ b/templates/de/html/admin/admin_config_autopurge.tpl
@@ -95,8 +95,8 @@
 		<TD align="right">{--ADMIN_OPTION_AUTOPURGE_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="auto_purge_active" value="Y"{--_CFG_AP_ACTIVE_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="auto_purge_active" value="N"{--_CFG_AP_ACTIVE_N--}>
+			type="radio" name="auto_purge_active" value='Y'{--_CFG_AP_ACTIVE_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="auto_purge_active" value='N'{--_CFG_AP_ACTIVE_N--}>
 		</SPAN></TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 6ea8cb6d20..f5ff750d45 100644
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -98,8 +98,8 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_rallye"
-			class="admin_normal" value="Y"{--__BEG_RALLYE_Y--}>&nbsp;{--YES--}<BR>
-		<INPUT type="radio" name="beg_rallye" class="admin_normal" value="N"{--__BEG_RALLYE_N--}>&nbsp;{--NO--}
+			class="admin_normal" value='Y'{--__BEG_RALLYE_Y--}>&nbsp;{--YES--}<BR>
+		<INPUT type="radio" name="beg_rallye" class="admin_normal" value='N'{--__BEG_RALLYE_N--}>&nbsp;{--NO--}
 		</TD>
 	</TR>
 	<TR>
@@ -109,9 +109,9 @@
 		<TD align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_include_own"
-			class="admin_normal" value="Y"{--__BEG_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
+			class="admin_normal" value='Y'{--__BEG_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="beg_include_own" class="admin_normal"
-			value="N"{--__BEG_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BEG_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -131,8 +131,8 @@
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_active"
-			class="admin_normal" value="Y"{--__BEG_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
-		<INPUT type="radio" name="beg_active" class="admin_normal" value="N"{--__BEG_ACTIVE_N--}>&nbsp;{--NO--}
+			class="admin_normal" value='Y'{--__BEG_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+		<INPUT type="radio" name="beg_active" class="admin_normal" value='N'{--__BEG_ACTIVE_N--}>&nbsp;{--NO--}
 		</TD>
 	</TR>
 	<TR>
@@ -149,9 +149,9 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_ral_en_notify"
-			class="admin_normal" value="Y"{--__BEG_RAL_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			class="admin_normal" value='Y'{--__BEG_RAL_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="beg_ral_en_notify" class="admin_normal"
-			value="N"{--__BEG_RAL_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BEG_RAL_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -160,9 +160,9 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_ral_di_notify"
-			class="admin_normal" value="Y"{--__BEG_RAL_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			class="admin_normal" value='Y'{--__BEG_RAL_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="beg_ral_di_notify" class="admin_normal"
-			value="N"{--__BEG_RAL_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BEG_RAL_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -171,9 +171,9 @@
 		<TD align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_new_mem_notify"
-			class="admin_normal" value="Y"{--__BEG_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			class="admin_normal" value='Y'{--__BEG_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="beg_new_mem_notify" class="admin_normal"
-			value="N"{--__BEG_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BEG_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl
index ad5cb57c5f..30c6ad0dc1 100644
--- a/templates/de/html/admin/admin_config_birthday.tpl
+++ b/templates/de/html/admin/admin_config_birthday.tpl
@@ -27,9 +27,9 @@
 		<TD align="right" height="20">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="birthday_active"
-			class="admin_normal" value="Y"{--__BIRTHDAY_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+			class="admin_normal" value='Y'{--__BIRTHDAY_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="birthday_active" class="admin_normal"
-			value="N"{--__BIRTHDAY_ACTIVE_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BIRTHDAY_ACTIVE_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl
index ededcf5f42..f1fb49e981 100644
--- a/templates/de/html/admin/admin_config_bonus.tpl
+++ b/templates/de/html/admin/admin_config_bonus.tpl
@@ -14,8 +14,8 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_active" class="admin_normal" value="Y"{--__BONUS_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
-		<INPUT type="radio" name="bonus_active" class="admin_normal" value="N"{--__BONUS_ACTIVE_N--}>&nbsp;{--NO--}
+			name="bonus_active" class="admin_normal" value='Y'{--__BONUS_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+		<INPUT type="radio" name="bonus_active" class="admin_normal" value='N'{--__BONUS_ACTIVE_N--}>&nbsp;{--NO--}
 		</TD>
 	</TR>
 	<TR>
@@ -26,9 +26,9 @@
 		&nbsp;{--ADMIN_BONUS_INCLUDE_OWN--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_include_own" class="admin_normal" value="Y"{--__BONUS_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_include_own" class="admin_normal" value='Y'{--__BONUS_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_include_own" class="admin_normal"
-			value="N"{--__BONUS_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -41,9 +41,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_click_yn" class="admin_normal" value="Y"{--__BONUS_CLICK_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_click_yn" class="admin_normal" value='Y'{--__BONUS_CLICK_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_click_yn" class="admin_normal"
-			value="N"{--__BONUS_CLICK_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_CLICK_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -56,9 +56,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_login_yn" class="admin_normal" value="Y"{--__BONUS_LOGIN_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_login_yn" class="admin_normal" value='Y'{--__BONUS_LOGIN_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_login_yn" class="admin_normal"
-			value="N"{--__BONUS_LOGIN_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_LOGIN_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -71,9 +71,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_order_yn" class="admin_normal" value="Y"{--__BONUS_ORDER_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_order_yn" class="admin_normal" value='Y'{--__BONUS_ORDER_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_order_yn" class="admin_normal"
-			value="N"{--__BONUS_ORDER_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_ORDER_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -86,9 +86,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_stats_yn" class="admin_normal" value="Y"{--__BONUS_STATS_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_stats_yn" class="admin_normal" value='Y'{--__BONUS_STATS_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_stats_yn" class="admin_normal"
-			value="N"{--__BONUS_STATS_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_STATS_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -101,8 +101,8 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_REF_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_ref_yn" class="admin_normal" value="Y"{--__BONUS_REF_Y--}>&nbsp;{--YES--}<BR>
-		<INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value="N"{--__BONUS_REF_N--}>&nbsp;{--NO--}
+			name="bonus_ref_yn" class="admin_normal" value='Y'{--__BONUS_REF_Y--}>&nbsp;{--YES--}<BR>
+		<INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value='N'{--__BONUS_REF_N--}>&nbsp;{--NO--}
 		</TD>
 	</TR>
 	<TR>
@@ -275,9 +275,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_en_notify" class="admin_normal" value="Y"{--__BONUS_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_en_notify" class="admin_normal" value='Y'{--__BONUS_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_en_notify" class="admin_normal"
-			value="N"{--__BONUS_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -287,9 +287,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_di_notify" class="admin_normal" value="Y"{--__BONUS_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_di_notify" class="admin_normal" value='Y'{--__BONUS_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_di_notify" class="admin_normal"
-			value="N"{--__BONUS_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -299,9 +299,9 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_new_mem_notify" class="admin_normal" value="Y"{--__BONUS_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+			name="bonus_new_mem_notify" class="admin_normal" value='Y'{--__BONUS_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="bonus_new_mem_notify" class="admin_normal"
-			value="N"{--__BONUS_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+			value='N'{--__BONUS_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_config_cache.tpl b/templates/de/html/admin/admin_config_cache.tpl
index 6a1cc9d17c..32fc84b637 100644
--- a/templates/de/html/admin/admin_config_cache.tpl
+++ b/templates/de/html/admin/admin_config_cache.tpl
@@ -13,8 +13,8 @@
 		<TD class="switch_sw1" align="right" width="350" height="20">
 		{--ADMIN_CACHE_ADMINS--}</TD>
 		<TD class="switch_sw1" width="150" style="padding-left: 10px"><INPUT
-			type="radio" name="cache_admins" value="Y" class="admin_normal"{--__ADMINS_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_admins" value="N" class="admin_normal"{--__ADMINS_N--}>&nbsp;{--NO--}&nbsp;
+			type="radio" name="cache_admins" value='Y' class="admin_normal"{--__ADMINS_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_admins" value='N' class="admin_normal"{--__ADMINS_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
@@ -24,8 +24,8 @@
 		<TD class="switch_sw2" align="right" width="350" height="20">
 		{--ADMIN_CACHE_ACLS--}</TD>
 		<TD class="switch_sw2" width="150" style="padding-left: 10px"><INPUT
-			type="radio" name="cache_acls" value="Y" class="admin_normal"{--__ACLS_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_acls" value="N" class="admin_normal"{--__ACLS_N--}>&nbsp;{--NO--}&nbsp;
+			type="radio" name="cache_acls" value='Y' class="admin_normal"{--__ACLS_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_acls" value='N' class="admin_normal"{--__ACLS_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
@@ -35,8 +35,8 @@
 		<TD align="right" width="350" height="20">{--ADMIN_CACHE_EXTS--}
 		</TD>
 		<TD width="150" style="padding-left: 10px"><INPUT type="radio"
-			name="cache_exts" value="Y" class="admin_normal"{--__EXTS_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_exts" value="N" class="admin_normal"{--__EXTS_N--}>&nbsp;{--NO--}&nbsp;
+			name="cache_exts" value='Y' class="admin_normal"{--__EXTS_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_exts" value='N' class="admin_normal"{--__EXTS_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
@@ -46,8 +46,8 @@
 		<TD align="right" width="350" height="20">
 		{--ADMIN_CACHE_CONFIG--}</TD>
 		<TD width="150" style="padding-left: 10px"><INPUT type="radio"
-			name="cache_config" value="Y" class="admin_normal"{--__CONFIG_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_config" value="N" class="admin_normal"{--__CONFIG_N--}>&nbsp;{--NO--}&nbsp;
+			name="cache_config" value='Y' class="admin_normal"{--__CONFIG_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_config" value='N' class="admin_normal"{--__CONFIG_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
@@ -57,8 +57,8 @@
 		<TD align="right" width="350" height="20">
 		{--ADMIN_CACHE_MODREG--}</TD>
 		<TD width="150" style="padding-left: 10px"><INPUT type="radio"
-			name="cache_modreg" value="Y" class="admin_normal"{--__MODREG_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_modreg" value="N" class="admin_normal"{--__MODREG_N--}>&nbsp;{--NO--}&nbsp;
+			name="cache_modreg" value='Y' class="admin_normal"{--__MODREG_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_modreg" value='N' class="admin_normal"{--__MODREG_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
@@ -68,8 +68,8 @@
 		<TD align="right" width="350" height="20">
 		{--ADMIN_CACHE_REFDEPTH--}</TD>
 		<TD width="150" style="padding-left: 10px"><INPUT type="radio"
-			name="cache_refdepth" value="Y" class="admin_normal"{--__REFDEPTH_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_refdepth" value="N"
+			name="cache_refdepth" value='Y' class="admin_normal"{--__REFDEPTH_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_refdepth" value='N'
 			class="admin_normal"{--__REFDEPTH_N--}>&nbsp;{--NO--}&nbsp;</TD>
 	</TR>
 	<TR>
@@ -79,8 +79,8 @@
 		<TD align="right" width="350" height="20">
 		{--ADMIN_CACHE_REFSYS--}</TD>
 		<TD width="150" style="padding-left: 10px"><INPUT type="radio"
-			name="cache_refsys" value="Y" class="admin_normal"{--__REFSYS_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="cache_refsys" value="N" class="admin_normal"{--__REFSYS_N--}>&nbsp;{--NO--}&nbsp;
+			name="cache_refsys" value='Y' class="admin_normal"{--__REFSYS_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="cache_refsys" value='N' class="admin_normal"{--__REFSYS_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl
index 3343638f00..b3a83da4c7 100644
--- a/templates/de/html/admin/admin_config_doubler.tpl
+++ b/templates/de/html/admin/admin_config_doubler.tpl
@@ -90,9 +90,9 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!}>&nbsp;{--YES--}<BR>
+			name="doubler_sent_all" class="admin_normal" value='Y'{!__DOUBLER_SENT_ALL_Y!}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="doubler_sent_all" class="admin_normal"
-			value="N"{!__DOUBLER_SENT_ALL_N!}>&nbsp;{--NO--}</TD>
+			value='N'{!__DOUBLER_SENT_ALL_N!}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -101,9 +101,9 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_JACKPOT--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!}>&nbsp;{--YES--}<BR>
+			name="doubler_jackpot" class="admin_normal" value='Y'{!__DOUBLER_JACKPOT_Y!}>&nbsp;{--YES--}<BR>
 		<INPUT type="radio" name="doubler_jackpot" class="admin_normal"
-			value="N"{!__DOUBLER_JACKPOT_N!}>&nbsp;{--NO--}</TD>
+			value='N'{!__DOUBLER_JACKPOT_N!}>&nbsp;{--NO--}</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -112,8 +112,8 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_OWN--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!}>&nbsp;{--YES--}<BR>
-		<INPUT type="radio" name="doubler_own" class="admin_normal" value="N"{!__DOUBLER_OWN_N!}>&nbsp;{--NO--}
+			name="doubler_own" class="admin_normal" value='Y'{!__DOUBLER_OWN_Y!}>&nbsp;{--YES--}<BR>
+		<INPUT type="radio" name="doubler_own" class="admin_normal" value='N'{!__DOUBLER_OWN_N!}>&nbsp;{--NO--}
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl
index c64023d83f..edfeb264dc 100644
--- a/templates/de/html/admin/admin_config_extensions.tpl
+++ b/templates/de/html/admin/admin_config_extensions.tpl
@@ -11,8 +11,8 @@
 		<TD class="bottom2" align="right" width="350" height="20">
 		{--ADMIN_VERBOSE_SQL--}:</TD>
 		<TD class="bottom2" width="150" align="right"><INPUT type="radio"
-			name="verbose_sql" value="Y" class="admin_normal"{--__VERBOSE_Y--}>&nbsp;{--YES--}
-		<INPUT type="radio" name="verbose_sql" value="N" class="admin_normal"{--__VERBOSE_N--}>&nbsp;{--NO--}&nbsp;
+			name="verbose_sql" value='Y' class="admin_normal"{--__VERBOSE_Y--}>&nbsp;{--YES--}
+		<INPUT type="radio" name="verbose_sql" value='N' class="admin_normal"{--__VERBOSE_N--}>&nbsp;{--NO--}&nbsp;
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index 7dcdde0fba..8dd75ef1c9 100644
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -67,8 +67,8 @@
 		<TD align="right">{--ADMIN_OPTION_CHECK_EMAIL_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="test_text" value="N"{--_CFG_TEST_TEXT_N--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="test_text" value="Y"{--_CFG_TEST_TEXT_Y--}>
+			type="radio" name="test_text" value='N'{--_CFG_TEST_TEXT_N--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="test_text" value='Y'{--_CFG_TEST_TEXT_Y--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -82,8 +82,8 @@
 		<TD align="right">{--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="test_subj" value="N"{--_CFG_TEST_SUBJ_N--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="test_subj" value="Y"{--_CFG_TEST_SUBJ_Y--}>
+			type="radio" name="test_subj" value='N'{--_CFG_TEST_SUBJ_N--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="test_subj" value='Y'{--_CFG_TEST_SUBJ_Y--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -97,8 +97,8 @@
 		<TD align="right">{--ADMIN_OPTION_URL_BLACKLIST--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="url_blacklist" value="Y"{--_CFG_URL_BLIST_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="url_blacklist" value="N"{--_CFG_URL_BLIST_N--}>
+			type="radio" name="url_blacklist" value='Y'{--_CFG_URL_BLIST_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="url_blacklist" value='N'{--_CFG_URL_BLIST_N--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -226,8 +226,8 @@
 		<TD align="right">{--ADMIN_OPTION_GUEST_MENU--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<BR>
-		<INPUT type="radio" name="guest_menu" value="N"{--_CFG_GUEST_MENU_INACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_INACTIVE--}
+			name="guest_menu" value='Y'{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<BR>
+		<INPUT type="radio" name="guest_menu" value='N'{--_CFG_GUEST_MENU_INACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_INACTIVE--}
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -241,8 +241,8 @@
 		<TD align="right">{--ADMIN_OPTION_MEMBER_MENU--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<BR>
-		<INPUT type="radio" name="member_menu" value="N"{--_CFG_MEMBER_MENU_INACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_INACTIVE--}
+			name="member_menu" value='Y'{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<BR>
+		<INPUT type="radio" name="member_menu" value='N'{--_CFG_MEMBER_MENU_INACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_INACTIVE--}
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -256,8 +256,8 @@
 		<TD align="right">{--ADMIN_OPTION_YOURE_HERE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<BR>
-		<INPUT type="radio" name="youre_here" value="N"{--_CFG_YOURE_HERE_INACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_INACTIVE--}
+			name="youre_here" value='Y'{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<BR>
+		<INPUT type="radio" name="youre_here" value='N'{--_CFG_YOURE_HERE_INACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_INACTIVE--}
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -301,8 +301,8 @@
 		<TD align="right">{--ADMIN_OPTION_ZIPCODE_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="order_multi_page" value="Y"{--_CFG_ORDER_MULTI_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="order_multi_page" value="N"{--_CFG_ORDER_MULTI_N--}>
+			type="radio" name="order_multi_page" value='Y'{--_CFG_ORDER_MULTI_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="order_multi_page" value='N'{--_CFG_ORDER_MULTI_N--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -316,8 +316,8 @@
 		<TD align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="autosend_active" value="Y"{--_CFG_AUTOSEND_ACTIVE_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="autosend_active" value="N"{--_CFG_AUTOSEND_ACTIVE_N--}>
+			type="radio" name="autosend_active" value='Y'{--_CFG_AUTOSEND_ACTIVE_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="autosend_active" value='N'{--_CFG_AUTOSEND_ACTIVE_N--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -348,8 +348,8 @@
 		<TD align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="send_prof_update" value="Y"{--_CFG_SEND_UPDATE_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="send_prof_update" value="N"{--_CFG_SEND_UPDATE_N--}>
+			type="radio" name="send_prof_update" value='Y'{--_CFG_SEND_UPDATE_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="send_prof_update" value='N'{--_CFG_SEND_UPDATE_N--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -363,8 +363,8 @@
 		<TD align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
-			type="radio" name="admin_notify" value="Y"{--_CFG_ADMIN_NOTIFY_Y--}>&nbsp;
-		{--NO--}:&nbsp;<INPUT type="radio" name="admin_notify" value="N"{--_CFG_ADMIN_NOTIFY_N--}>
+			type="radio" name="admin_notify" value='Y'{--_CFG_ADMIN_NOTIFY_Y--}>&nbsp;
+		{--NO--}:&nbsp;<INPUT type="radio" name="admin_notify" value='N'{--_CFG_ADMIN_NOTIFY_N--}>
 		</SPAN></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl
index 7c63eaaa9a..dadfabcede 100644
--- a/templates/de/html/admin/admin_config_point_settings.tpl
+++ b/templates/de/html/admin/admin_config_point_settings.tpl
@@ -15,9 +15,9 @@
 		{--ADMIN_CONFIG_DIRECT_PAY--}:</TD>
 		<TD width="190" align="right">
 		{--ADMIN_CONFIG_POINTS_DIRECT--}:&nbsp;<INPUT type="radio"
-			name="allow_direct_pay" value="Y" class="admin_normal"{--__DIRECT_Y--}><BR>
+			name="allow_direct_pay" value='Y' class="admin_normal"{--__DIRECT_Y--}><BR>
 		{--ADMIN_CONFIG_POINTS_MAILS--}:&nbsp;<INPUT type="radio"
-			name="allow_direct_pay" value="N" class="admin_normal"{--__DIRECT_N--}>
+			name="allow_direct_pay" value='N' class="admin_normal"{--__DIRECT_N--}>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_rewrite_rows.tpl b/templates/de/html/admin/admin_config_rewrite_rows.tpl
index 0f5cdd8689..aa1b749448 100644
--- a/templates/de/html/admin/admin_config_rewrite_rows.tpl
+++ b/templates/de/html/admin/admin_config_rewrite_rows.tpl
@@ -3,7 +3,7 @@
 	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[title]</TD>
 	<TD class="switch_sw$content[sw] bottom2" align="center">
 	{--YES--}:&nbsp;<INPUT type="radio" name="mod[$content[module]]"
-		class="admin_normal" value="Y"$content[y_default]>
+		class="admin_normal" value='Y'$content[y_default]>
 	{--NO--}:&nbsp;<INPUT type="radio" name="mod[$content[module]]"
-		class="admin_normal" value="N"$content[n_default]></TD>
+		class="admin_normal" value='N'$content[n_default]></TD>
 </TR>
diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl
index 2e750afc82..8acd397168 100644
--- a/templates/de/html/admin/admin_config_transfer.tpl
+++ b/templates/de/html/admin/admin_config_transfer.tpl
@@ -59,8 +59,8 @@
 		<TD align="right" width="250">{--ADMIN_AUTOPURGE_TRANSFER--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><SELECT name="ap_transfer" size="1" class="admin_select">
-			<OPTION value="Y"{--__YES_IN--}>{--YES--}</OPTION>
-			<OPTION value="N"{--__NO_IN--}>{--NO--}</OPTION>
+			<OPTION value='Y'{--__YES_IN--}>{--YES--}</OPTION>
+			<OPTION value='N'{--__NO_IN--}>{--NO--}</OPTION>
 		</SELECT></TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl
index bf7ad93811..de616dfd92 100644
--- a/templates/de/html/admin/admin_guest_add.tpl
+++ b/templates/de/html/admin/admin_guest_add.tpl
@@ -55,8 +55,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="center" class="admin_table"><SELECT
 			class="admin_select" name="visible" size="1">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
+			<OPTION value='Y'>{--YES--}</OPTION>
+			<OPTION value='N'>{--NO--}</OPTION>
 		</SELECT></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
@@ -69,8 +69,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="center" class="admin_table"><SELECT
 			class="admin_select" name="active" size="1">
-			<OPTION value="N">{--YES--}</OPTION>
-			<OPTION value="Y">{--NO--}</OPTION>
+			<OPTION value='N'>{--YES--}</OPTION>
+			<OPTION value='Y'>{--NO--}</OPTION>
 		</SELECT></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl
index 656f2b7e5d..19318283eb 100644
--- a/templates/de/html/admin/admin_member_add.tpl
+++ b/templates/de/html/admin/admin_member_add.tpl
@@ -55,8 +55,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="center" class="admin_table"><SELECT
 			class="admin_select" name="visible" size="1">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
+			<OPTION value='Y'>{--YES--}</OPTION>
+			<OPTION value='N'>{--NO--}</OPTION>
 		</SELECT></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
@@ -69,8 +69,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="center" class="admin_table"><SELECT
 			class="admin_select" name="active" size="1">
-			<OPTION value="N">{--YES--}</OPTION>
-			<OPTION value="Y">{--NO--}</OPTION>
+			<OPTION value='N'>{--YES--}</OPTION>
+			<OPTION value='Y'>{--NO--}</OPTION>
 		</SELECT></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl
index d40fcbe66c..754d914ffa 100644
--- a/templates/de/html/admin/admin_newsletter.tpl
+++ b/templates/de/html/admin/admin_newsletter.tpl
@@ -53,10 +53,10 @@
 			<TR>
 				<TD width="30%">{--YES--}</TD>
 				<TD width="20%">&nbsp;<INPUT type="radio" name="auto_urls"
-					class="admin_normal" value="Y" checked></TD>
+					class="admin_normal" value='Y' checked></TD>
 				<TD width="30%">{--NO--}</TD>
 				<TD width="20%">&nbsp;<INPUT type="radio" name="auto_urls"
-					class="admin_normal" value="N"></TD>
+					class="admin_normal" value='N'></TD>
 			</TR>
 		</TABLE>
 		</TD>
diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl
index 195488b5d5..e14c645bf5 100644
--- a/templates/de/html/admin/admin_newsletter_nohtml.tpl
+++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl
@@ -30,10 +30,10 @@
 			<TR>
 				<TD width="30%">{--YES--}</TD>
 				<TD width="20%">&nbsp;<INPUT type="radio" name="auto_urls"
-					class="admin_normal" value="Y" checked></TD>
+					class="admin_normal" value='Y' checked></TD>
 				<TD width="30%">{--NO--}</TD>
 				<TD width="20%">&nbsp;<INPUT type="radio" name="auto_urls"
-					class="admin_normal" value="N"></TD>
+					class="admin_normal" value='N'></TD>
 			</TR>
 		</TABLE>
 		</TD>
diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl
index 537bacedd8..9237dd0420 100644
--- a/templates/de/html/admin/admin_payout_add_new.tpl
+++ b/templates/de/html/admin/admin_payout_add_new.tpl
@@ -41,8 +41,8 @@
 		<TD align="right">{--ADMIN_PAYOUT_ALLOW_URLS--}:</TD>
 		<TD class="seperator">&nbsp;</TD>
 		<TD><SELECT name="allow_url" class="admin_select" size="1">
-			<OPTION value="N">{--NO--}</OPTION>
-			<OPTION value="Y">{--YES--}</OPTION>
+			<OPTION value='N'>{--NO--}</OPTION>
+			<OPTION value='Y'>{--YES--}</OPTION>
 		</SELECT></TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/guest/guest_cat_row.tpl b/templates/de/html/guest/guest_cat_row.tpl
index 75523d6e01..c31c923663 100644
--- a/templates/de/html/guest/guest_cat_row.tpl
+++ b/templates/de/html/guest/guest_cat_row.tpl
@@ -3,10 +3,10 @@
 	<TD class="register_right switch_sw$content[sw]">&nbsp;&nbsp;$content[cat]&nbsp;&nbsp;</TD>
 	<TD width="20" class="guest_normal switch_$content[sw]">
 	{--YES--}&nbsp;<INPUT type="radio" class="guest_normal"
-		name="cat[$content[id]]" value="Y"$content[def_y]></TD>
+		name="cat[$content[id]]" value='Y'$content[def_y]></TD>
 	<TD width="20" class="guest_normal switch_$content[sw]">
 	{--NO--}&nbsp;<INPUT type="radio" class="guest_normal"
-		name="cat[$content[id]]" value="N"$content[def_n]></TD>
+		name="cat[$content[id]]" value='N'$content[def_n]></TD>
 	<TD width="10" class="switch_sw$content[sw]">&nbsp;</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 9d8f1e9046..da6c9fcd5f 100644
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -146,9 +146,9 @@
 		<TD align="right" width="60%" class="register_left">
 		{--AGREE_TO_THIS--}:&nbsp;&nbsp;</TD>
 		<TD width="40%" class="register_right">{--YES--}: <INPUT
-			type="radio" name="agree" class="guest_normal" value="Y">&nbsp;
+			type="radio" name="agree" class="guest_normal" value='Y'>&nbsp;
 		{--NO--}: <INPUT type="radio" name="agree" class="guest_normal"
-			value="N" checked></TD>
+			value='N' checked></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="7" class="seperator bottom2">&nbsp;</TD>
diff --git a/templates/de/html/member/member_cat_row.tpl b/templates/de/html/member/member_cat_row.tpl
index 87c470b5ec..6f4bc90fa1 100644
--- a/templates/de/html/member/member_cat_row.tpl
+++ b/templates/de/html/member/member_cat_row.tpl
@@ -2,9 +2,9 @@
 	<TD align="right" height="20" class="switch_sw$content[sw]">$content[cat]&nbsp;&nbsp;</TD>
 	<TD width="2" class="seperator">&nbsp;</TD>
 	<TD align="center" class="switch_sw$content[sw]">{--YES--} <INPUT
-		type="radio" name="cat[$content[id]]" class="member_normal" value="Y"$content[jy]>&nbsp;
+		type="radio" name="cat[$content[id]]" class="member_normal" value='Y'$content[jy]>&nbsp;
 	{--NO--} <INPUT type="radio" name="cat[$content[id]]"
-		class="member_normal" value="N"$content[jn]></TD>
+		class="member_normal" value='N'$content[jn]></TD>
 </TR>
 <TR>
 	<TD colspan="3" height="2" class="seperator"></TD>
diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl
index b19c5c0e67..fd3fc04f80 100644
--- a/templates/de/html/member/member_html_mail_settings.tpl
+++ b/templates/de/html/member/member_html_mail_settings.tpl
@@ -17,9 +17,9 @@
 	</TR>
 	<TR>
 		<TD width="50%" align="right">{--YES--}:&nbsp;<INPUT type="radio"
-			name="html" class="member_normal" value="Y"{!HTML_Y!}>&nbsp;&nbsp;</TD>
+			name="html" class="member_normal" value='Y'{!HTML_Y!}>&nbsp;&nbsp;</TD>
 		<TD width="50%" align="left">&nbsp;&nbsp;{--NO--}:&nbsp;<INPUT
-			type="radio" name="html" class="member_normal" value="N"{!HTML_N!}></TD>
+			type="radio" name="html" class="member_normal" value='N'{!HTML_N!}></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" class="seperator bottom2" height="5">&nbsp;</TD>
diff --git a/templates/de/html/member/member_order-html_ext.tpl b/templates/de/html/member/member_order-html_ext.tpl
index b7ed4cb85e..3c13f5098c 100644
--- a/templates/de/html/member/member_order-html_ext.tpl
+++ b/templates/de/html/member/member_order-html_ext.tpl
@@ -1,7 +1,7 @@
 <TR>
 	<TD width="10" class="top2 bottom2 seperator">&nbsp;</TD>
 	<TD class="top2 bottom2" colspan="3" align="center"><STRONG>{--MEMBER_HTML_VALID_TAGS--}:</STRONG><BR>
-	$content <INPUT type="hidden" name="html" value="Y"></TD>
+	$content <INPUT type="hidden" name="html" value='Y'></TD>
 	<TD width="10" class="top2 bottom2 seperator">&nbsp;</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl
index 639087a92c..e908f7cd61 100644
--- a/templates/de/html/member/member_order-html_intro.tpl
+++ b/templates/de/html/member/member_order-html_intro.tpl
@@ -7,7 +7,7 @@
 </TR>
 <TR>
 	<TD valign="top" height="20" align="right">{--MEMBER_HTML_MSG--}:&nbsp;<INPUT
-		type="radio" name="html" class="member_normal" value="Y">&nbsp;&nbsp;</TD>
+		type="radio" name="html" class="member_normal" value='Y'>&nbsp;&nbsp;</TD>
 	<TD valign="top">&nbsp;&nbsp;{--MEMBER_NORMAL_MSG--}:&nbsp;<INPUT
-		type="radio" name="html" class="member_normal" value="N" checked></TD>
+		type="radio" name="html" class="member_normal" value='N' checked></TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl
index f3805c4362..f499f68c5a 100644
--- a/templates/de/html/member/member_transfer_settings.tpl
+++ b/templates/de/html/member/member_transfer_settings.tpl
@@ -7,9 +7,9 @@
 		{--TRANSFER_ALLOW_OPT_IN--}</TD>
 		<TD align="center" width="160" class="admin_title bottom2" height="50">
 		{--YES--}:&nbsp;<INPUT type="radio" name="opt_in"
-			class="member_normal" value="Y"{--__TRANSFER_ALLOW_Y--}>
+			class="member_normal" value='Y'{--__TRANSFER_ALLOW_Y--}>
 		{--NO--}:&nbsp;<INPUT type="radio" name="opt_in" class="member_normal"
-			value="N"{--__TRANSFER_ALLOW_N--}></TD>
+			value='N'{--__TRANSFER_ALLOW_N--}></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" height="40"><INPUT type="reset"