From: Roland Häder <roland@mxchange.org>
Date: Mon, 16 Mar 2009 20:05:15 +0000 (+0000)
Subject: Even more rewritten
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=116747e4dba29e9e2e4daa82c45d8bbb302e9378;p=mailer.git

Even more rewritten
---

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index 0b9cc48045..acaacc33ff 100644
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 }
diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index a7a978dcc6..9d630b2058 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 61d2f2babc..05c3242fb4 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php
index 5a19d67782..1903319a0f 100644
--- a/inc/autopurge/purge-tsks.php
+++ b/inc/autopurge/purge-tsks.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 0c6861c389..152689ba98 100644
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index bcc9af7c82..b9f06e0191 100644
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -77,7 +77,7 @@ ORDER BY d.timemark
 LIMIT %d", array($DOUBLER_POINTS, $min, getConfig('doubler_max_sent')), __FILE__, __LINE__);
 
 // Do we have entries found?
-if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != "Y"))) {
+if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
 	// Switch to matching SQL resource
 	$result_load = $result_main;
 	if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) $result_load = $result_total;
diff --git a/inc/functions.php b/inc/functions.php
index 025f936e7d..a04e852dad 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1101,7 +1101,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	$OUT = '';
 
-	if ($type == "yn") {
+	if ($type == 'yn') {
 		// This is a yes/no selection only!
 		if ($id > 0) $prefix .= "[".$id."]";
 		$OUT .= "    <select name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
@@ -1117,7 +1117,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++) {
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
@@ -1125,7 +1125,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	case "month": // Month
 		foreach ($GLOBALS['month_descr'] as $month => $descr) {
 			$OUT .= "<option value=\"".$month."\"";
-			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $month) $OUT .= ' selected="selected"';
 			$OUT .= ">".$descr."</option>\n";
 		} // END - for
 		break;
@@ -1150,7 +1150,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
 				$OUT .= "<option value=\"".$idx."\"";
-				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+				if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		} elseif ($DEFAULT == -1) {
@@ -1174,7 +1174,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 			// Construct year selection list
 			for ($idx = $minYear; $idx <= $YEAR; $idx++) {
 				$OUT .= "<option value=\"".$idx."\"";
-				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+				if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		}
@@ -1185,7 +1185,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
@@ -1194,16 +1194,16 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
 
-	case "yn":
+	case 'yn':
 		$OUT .= "<option value=\"Y\"";
-		if ($DEFAULT == 'Y') $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'Y') $OUT .= ' selected="selected"';
 		$OUT .= ">{--YES--}</option>\n<option value=\"N\"";
-		if ($DEFAULT == 'N') $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'N') $OUT .= ' selected="selected"';
 		$OUT .= ">{--NO--}</option>\n";
 		break;
 	}
@@ -1454,7 +1454,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 10; $idx++) {
 				$OUT .= "    <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $Y) $OUT .= " selected=\"selected\"";
+				if ($idx == $Y) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1468,7 +1468,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			for ($idx = 0; $idx <= 11; $idx++)
 			{
 					$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $M) $OUT .= " selected=\"selected\"";
+				if ($idx == $M) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1481,7 +1481,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 4; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $W) $OUT .= " selected=\"selected\"";
+				if ($idx == $W) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1494,7 +1494,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 31; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $D) $OUT .= " selected=\"selected\"";
+				if ($idx == $D) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1507,7 +1507,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 23; $idx++) 	{
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $h) $OUT .= " selected=\"selected\"";
+				if ($idx == $h) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1520,7 +1520,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $m) $OUT .= " selected=\"selected\"";
+				if ($idx == $m) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1533,7 +1533,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $s) $OUT .= " selected=\"selected\"";
+				if ($idx == $s) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -3316,7 +3316,7 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
 		// No cache instance!
 		DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
 		return false;
-	} elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != "Y")) {
+	} elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != 'Y')) {
 		// Caching disabled (currently experiemental!)
 		return false;
 	}
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 9df9a11370..9b3814ae09 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -200,10 +200,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
-		if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
+		if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--MODE_RENDER--}</option>
       <option value=\"direct\"");
-		if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
+		if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--MODE_DIRECT--}</option>
     </select>
   </td>
@@ -214,10 +214,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -228,10 +228,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"wfooter\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -242,10 +242,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"blink\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index dbf64ee231..c4b83983ea 100644
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 function BEG_ADD_POINTS ($uid, $points) {
 	// Set mode depending on how many mails the member has to confirm
 	$locked = false;
-	if ((getConfig('ref_payout') > 0) && (getConfig('allow_direct_pay') != "Y")) $locked = true;
+	if ((getConfig('ref_payout') > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
 
 	// Is begging rallye active?
 	if (getConfig('beg_rallye') == 'Y') {
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 597e4b5a90..eb59536d4b 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' !
 function BONUS_ADD_TURBO_POINTS ($mid, $uid, $type) {
 	// Shall we add bonus points?
-	if (getConfig('bonus_active') != "Y") return false;
+	if (getConfig('bonus_active') != 'Y') return false;
 
 	// Init variables
 	$sql = ''; $bonys = 0; $mail = 0; $column = '';
@@ -191,7 +191,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 //
 function BONUS_POINTS_HANDLER ($MODE) {
 	// Shall we add bonus points?
-	if (getConfig('bonus_active') != "Y") return;
+	if (getConfig('bonus_active') != 'Y') return;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
 	if ((getConfig('bonus_mode') == "UID") && (getConfig('bonus_uid') == "0")) {
diff --git a/inc/libs/order_functions.php b/inc/libs/order_functions.php
index 63283118a6..bae9a83051 100644
--- a/inc/libs/order_functions.php
+++ b/inc/libs/order_functions.php
@@ -48,7 +48,7 @@ function ORDER_SELECT_OPTION_LIST($default) {
 	$OUT = '';
 	foreach ($LIST as $item) {
 		$selected = '';
-		if ($item == $default) $selected = " selected=\"selected\"";
+		if ($item == $default) $selected = ' selected="selected"';
 		$OUT .= "<option value=\"".$item."\"".$selected.">{--ORDER_SELECT_COLUMN_".strtoupper($item)."--}</option>\n";
 	}
 
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 32a205e40c..0a11d0f1a4 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -700,7 +700,7 @@ function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") {
   <option value=\"\">{--SELECT_NONE--}</option>\n";
 		foreach ($ral as $rallye) {
 		     $OUT .= "  <option value=\"".$rallye."\"";
-			if ($default == $rallye) $OUT .= " selected=\"selected\"";
+			if ($default == $rallye) $OUT .= ' selected="selected"';
 			$OUT .= ">".$rallye."</option>\n";
 		}
 		$OUT .= "</select>\n";
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 2321ea35ec..2e4b807dbe 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -74,7 +74,7 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 	$OUT = '';
 	foreach ($themesArray['theme_unix'] as $key => $theme) {
 		$OUT .= "  <option value=\"".$theme."\"";
-		if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
+		if ($theme == GET_CURR_THEME()) $OUT .= ' selected="selected"';
 		$OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
 	} // END - foreach
 
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 54cd49ce43..8327e6da39 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -212,7 +212,7 @@ function WERNIS_TEST_API () {
 // Widthdraw this amount
 function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
 	// Is the sponsor extension installed?
-	if (getConfig('wernis_withdraw_active') != "Y") {
+	if (getConfig('wernis_withdraw_active') != 'Y') {
 		if (!EXT_IS_ACTIVE('sponsor')) {
 			// No, abort here
 			return false;
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index fccceb81af..a0330bdc56 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -496,7 +496,7 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 
 	while ($content = SQL_FETCHARRAY($result)) {
 		$OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
-		if ($def == $content['userid']) $OUT .= " selected=\"selected\"";
+		if ($def == $content['userid']) $OUT .= ' selected="selected"';
 		$OUT .= ">".$content['surname']." ".$content['family']." (".bigintval($content['userid']).")</option>\n";
 	} // END - while
 
@@ -534,7 +534,7 @@ function ADMIN_MENU_SELECTION ($MODE, $default="", $defid="") {
 		// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 		while (list($menu, $title) = SQL_FETCHROW($result)) {
 			$OUT .= "  <option value=\"".$menu."\"";
-			if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
+			if ((!empty($default)) && ($default == $menu)) $OUT .= ' selected="selected"';
 			$OUT .= ">".$title."</option>\n";
 		} // END - while
 
@@ -678,7 +678,7 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
 				// Is that part different from the overview?
 				if ($part != "overview") {
 					$OUT .= "	<option value=\"".$part."\"";
-					if ($part == $default) $OUT .= " selected=\"selected\"";
+					if ($part == $default) $OUT .= ' selected="selected"';
 					$OUT .= ">".$part."</option>\n";
 				} // END - if
 			} // END - if
diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 86cb6f0c2b..0f67efc615 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -61,11 +61,11 @@ if (REQUEST_ISSET_POST('edit')) {
 				// @TODO Can this be rewritten???
 				$OUT .= "<select name=\"admin_id[".$content['id']."]\" size=\"1\" class=\"admin_select\">
 <option value=\"0\"";
-				if ($content['admin_id'] == "0") $OUT .= " selected=\"selected\"";
+				if ($content['admin_id'] == "0") $OUT .= ' selected="selected"';
 				$OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
 				if (EXT_IS_ACTIVE('events')) {
 					$OUT .= "<option value=\"-1\"";
-					if ($content['admin_id'] == "-1") $OUT .= " selected=\"selected\"";
+					if ($content['admin_id'] == "-1") $OUT .= ' selected="selected"';
 					$OUT .= ">{--ADMINS_TO_USER_EVENTS--}</option>\n";
 				}
 				$OUT .= ADD_OPTION_LINES('admins', "id", "login", $content['admin_id'], 'email');
diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index e58601b9a0..aff79ba14e 100644
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -50,16 +50,16 @@ if (IS_FORM_SENT()) {
 	ADMIN_SAVE_SETTINGS_POST();
 } else {
 	// Output de-/activation selections
-	define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", getConfig('autopurge_inactive')   , "autopurge_inactive"));
-	define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", getConfig('autopurge_unconfirmed'), "autopurge_unconfirmed"));
-	define('__AP_TASKS_SELECTION'      , ADD_SELECTION("yn", getConfig('ap_tasks')             , "autopurge_tasks"));
-	define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION("yn", getConfig('ap_del_mails')         , "ap_del_mails"));
+	define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION('yn', getConfig('autopurge_inactive')   , "autopurge_inactive"));
+	define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION('yn', getConfig('autopurge_unconfirmed'), "autopurge_unconfirmed"));
+	define('__AP_TASKS_SELECTION'      , ADD_SELECTION('yn', getConfig('ap_tasks')             , "autopurge_tasks"));
+	define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION('yn', getConfig('ap_del_mails')         , "ap_del_mails"));
 
 	// Output notification selections
-	define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION("yn", getConfig('ap_in_notify')   , "ap_in_notify"));
-	define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION("yn", getConfig('ap_un_notify')   , "ap_un_notify"));
-	define('__AP_NOTIFY_TASKS'         , ADD_SELECTION("yn", getConfig('ap_tasks_notify'), "ap_tasks_notify"));
-	define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION("yn", getConfig('ap_dm_notify')   , "ap_dm_notify"));
+	define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION('yn', getConfig('ap_in_notify')   , "ap_in_notify"));
+	define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION('yn', getConfig('ap_un_notify')   , "ap_un_notify"));
+	define('__AP_NOTIFY_TASKS'         , ADD_SELECTION('yn', getConfig('ap_tasks_notify'), "ap_tasks_notify"));
+	define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION('yn', getConfig('ap_dm_notify')   , "ap_dm_notify"));
 
 	// Output time selection boxes
 	define('__AP_IN_SINCE'      , CREATE_TIME_SELECTIONS(getConfig('ap_inactive_since'), "ap_inactive_since"  , "MWDh"));
@@ -70,7 +70,7 @@ if (IS_FORM_SENT()) {
 
 	// Mail confirmation links
 	define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS(getConfig('auto_purge'), "auto_purge", "MWD"));
-	if (getConfig('auto_purge_active') != "Y") {
+	if (getConfig('auto_purge_active') != 'Y') {
 		define('_CFG_AP_ACTIVE_N', ' chkecked="checked"');
 		define('_CFG_AP_ACTIVE_Y', '');
 	} else {
diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index c832041f1d..70d591f6e9 100644
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -163,7 +163,7 @@ if (IS_FORM_SENT()) {
 
 	switch (getConfig('beg_pay_mode')) {
 		case "IMG":
-			define('__BEG_PAY_MODE_IMG' , " selected=\"selected\"");
+			define('__BEG_PAY_MODE_IMG' , ' selected="selected"');
 			define('__BEG_PAY_MODE_JS'  , '');
 			define('__BEG_PAY_MODE_BOTH', '');
 			define('__BEG_PAY_MODE_NONE', '');
@@ -171,7 +171,7 @@ if (IS_FORM_SENT()) {
 
 		case "JS":
 			define('__BEG_PAY_MODE_IMG' , '');
-			define('__BEG_PAY_MODE_JS'  , " selected=\"selected\"");
+			define('__BEG_PAY_MODE_JS'  , ' selected="selected"');
 			define('__BEG_PAY_MODE_BOTH', '');
 			define('__BEG_PAY_MODE_NONE', '');
 			break;
@@ -179,7 +179,7 @@ if (IS_FORM_SENT()) {
 		case "BOTH":
 			define('__BEG_PAY_MODE_IMG' , '');
 			define('__BEG_PAY_MODE_JS'  , '');
-			define('__BEG_PAY_MODE_BOTH', " selected=\"selected\"");
+			define('__BEG_PAY_MODE_BOTH', ' selected="selected"');
 			define('__BEG_PAY_MODE_NONE', '');
 			break;
 
@@ -187,7 +187,7 @@ if (IS_FORM_SENT()) {
 			define('__BEG_PAY_MODE_IMG' , '');
 			define('__BEG_PAY_MODE_JS'  , '');
 			define('__BEG_PAY_MODE_BOTH', '');
-			define('__BEG_PAY_MODE_NONE', " selected=\"selected\"");
+			define('__BEG_PAY_MODE_NONE', ' selected="selected"');
 			break;
 	}
 
diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 025dfe769f..a000ebfd51 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -149,7 +149,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 			'sw'   => $SW,
 			'id'   => $id,
 			'cat'  => $cat,
-			'vis'  => ADD_SELECTION("yn", $vis, "vis", $id),
+			'vis'  => ADD_SELECTION('yn', $vis, "vis", $id),
 			'sort' => $sort,
 		);
 
diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index d536ce6674..df9f65ae4a 100644
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -59,7 +59,7 @@ case "settings": // Settings related to the index page
 	} else {
 		// Prepare data for the template
 		$content = array_fill(-1, 60, '');
-		$content[getConfig('index_delay')] = " selected=\"selected\"";
+		$content[getConfig('index_delay')] = ' selected="selected"';
 
 		define('__INDEX_COOKIE_SELECTION', CREATE_TIME_SELECTIONS(getConfig('index_cookie'), "index_cookie", "YMWD"));
 		LOAD_TEMPLATE("admin_config_home_settings", false, $content);
diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index 6cc28e23ac..30b3c530c4 100644
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -70,13 +70,13 @@ if (IS_FORM_SENT()) {
 	switch (getConfig('order_mode'))
 	{
 	case "ASC":
-		define('__ASC_DEFAULT' , " selected=\"selected\"");
+		define('__ASC_DEFAULT' , ' selected="selected"');
 		define('__DESC_DEFAULT', '');
 		break;
 
 	case "DESC":
 		define('__ASC_DEFAULT' , '');
-		define('__DESC_DEFAULT', " selected=\"selected\"");
+		define('__DESC_DEFAULT', ' selected="selected"');
 		break;
 	}
 
@@ -84,7 +84,7 @@ if (IS_FORM_SENT()) {
 	define('_CFG_UNCONFIRMED'   , getConfig('unconfirmed'));
 	define('_CFG_MAX_TLENGTH'   , getConfig('max_tlength'));
 
-	if (getConfig('test_text') != "Y") {
+	if (getConfig('test_text') != 'Y') {
 		define('_CFG_TEST_TEXT_N', ' chkecked="checked"');
 		define('_CFG_TEST_TEXT_Y', '');
 	} else {
@@ -94,25 +94,25 @@ if (IS_FORM_SENT()) {
 
 	switch (getConfig('repay_deleted_mails')) {
 		case "REPAY":
-			define('_CFG_REPAY_POINTS_REPAY'  , " selected=\"selected\"");
+			define('_CFG_REPAY_POINTS_REPAY'  , ' selected="selected"');
 			define('_CFG_REPAY_POINTS_JACKPOT', '');
 			define('_CFG_REPAY_POINTS_SHRED'  , '');
 			break;
 
 		case "JACKPOT":
 			define('_CFG_REPAY_POINTS_REPAY'  , '');
-			define('_CFG_REPAY_POINTS_JACKPOT', " selected=\"selected\"");
+			define('_CFG_REPAY_POINTS_JACKPOT', ' selected="selected"');
 			define('_CFG_REPAY_POINTS_SHRED'  , '');
 			break;
 
 		case "SHRED":
 			define('_CFG_REPAY_POINTS_REPAY'  , '');
 			define('_CFG_REPAY_POINTS_JACKPOT', '');
-			define('_CFG_REPAY_POINTS_SHRED'  , " selected=\"selected\"");
+			define('_CFG_REPAY_POINTS_SHRED'  , ' selected="selected"');
 			break;
 	}
 
-	if (getConfig('test_subj') != "Y") {
+	if (getConfig('test_subj') != 'Y') {
 		define('_CFG_TEST_SUBJ_N', ' chkecked="checked"');
 		define('_CFG_TEST_SUBJ_Y', '');
 	} else {
@@ -120,7 +120,7 @@ if (IS_FORM_SENT()) {
 		define('_CFG_TEST_SUBJ_Y', ' chkecked="checked"');
 	}
 
-	if (getConfig('url_blacklist') != "Y") {
+	if (getConfig('url_blacklist') != 'Y') {
 		define('_CFG_URL_BLIST_N', ' chkecked="checked"');
 		define('_CFG_URL_BLIST_Y', '');
 	} else {
diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index a9a8296083..66698b57ca 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -99,7 +99,7 @@ if (IS_FORM_SENT()) {
 		define('_CFG_ORDER_MULTI_Y', ' chkecked="checked"');
 	}
 
-	if (getConfig('autosend_active') != "Y") {
+	if (getConfig('autosend_active') != 'Y') {
 		define('_CFG_AUTOSEND_ACTIVE_N', ' chkecked="checked"');
 		define('_CFG_AUTOSEND_ACTIVE_Y', '');
 	} else {
@@ -107,7 +107,7 @@ if (IS_FORM_SENT()) {
 		define('_CFG_AUTOSEND_ACTIVE_Y', ' chkecked="checked"');
 	}
 
-	if (getConfig('send_prof_update') != "Y") {
+	if (getConfig('send_prof_update') != 'Y') {
 		define('_CFG_SEND_UPDATE_N', ' chkecked="checked"');
 		define('_CFG_SEND_UPDATE_Y', '');
 	} else {
@@ -115,7 +115,7 @@ if (IS_FORM_SENT()) {
 		define('_CFG_SEND_UPDATE_Y', ' chkecked="checked"');
 	}
 
-	if (getConfig('admin_notify') != "Y") {
+	if (getConfig('admin_notify') != 'Y') {
 		define('_CFG_ADMIN_NOTIFY_N', ' chkecked="checked"');
 		define('_CFG_ADMIN_NOTIFY_Y', '');
 	} else {
diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 368a3e8c5f..79b6f1c6cc 100644
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -133,7 +133,7 @@ WHERE id='".$id."' LIMIT 1",
 				'title' => COMPILE_CODE($title),
 				'rate'  => TRANSLATE_COMMA($rate),
 				'mpoi'  => TRANSLATE_COMMA($mpoi),
-				'allow' => ADD_SELECTION("yn", $allow, "allow[".$id."]"),
+				'allow' => ADD_SELECTION('yn', $allow, "allow[".$id."]"),
 			);
 
 			// Load row template and switch color
diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php
index bf8b8de7e5..cef646c306 100644
--- a/inc/modules/admin/what-config_refid.php
+++ b/inc/modules/admin/what-config_refid.php
@@ -54,13 +54,13 @@ if (IS_FORM_SENT()) {
 
 	switch (getConfig('refid_target')) {
 		case 'index':
-			define('__DEF_RT_INDEX'   , " selected=\"selected\"");
+			define('__DEF_RT_INDEX'   , ' selected="selected"');
 			define('__DEF_RT_REGISTER', '');
 			break;
 
 		case 'register':
 			define('__DEF_RT_INDEX'   , '');
-			define('__DEF_RT_REGISTER', " selected=\"selected\"");
+			define('__DEF_RT_REGISTER', ' selected="selected"');
 			break;
 
 		default: // Invalid config!
@@ -70,13 +70,13 @@ if (IS_FORM_SENT()) {
 
 	switch (getConfig('select_user_zero_refid')) {
 		case 'Y':
-			define('__RAND_REFID_Y', " selected=\"selected\"");
+			define('__RAND_REFID_Y', ' selected="selected"');
 			define('__RAND_REFID_N', '');
 			break;
 
 		case 'N':
 			define('__RAND_REFID_Y', '');
-			define('__RAND_REFID_N', " selected=\"selected\"");
+			define('__RAND_REFID_N', ' selected="selected"');
 			break;
 
 		default: // Invalid config!
diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php
index 966189b344..f78267f97e 100644
--- a/inc/modules/admin/what-config_register.php
+++ b/inc/modules/admin/what-config_register.php
@@ -63,7 +63,7 @@ while ($content = SQL_FETCHARRAY($result)) {
 
 	// Add more data
 	$content['sw']        = $SW;
-	$content['seleciton'] = ADD_SELECTION("yn", $content['field_required'], "sel[".$content['id']."]");
+	$content['seleciton'] = ADD_SELECTION('yn', $content['field_required'], "sel[".$content['id']."]");
 
 	// @TODO Move this HTML code into a template
 	$OUT .= "<tr>
diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php
index b041c5fc04..b28e8fa5f9 100644
--- a/inc/modules/admin/what-config_register2.php
+++ b/inc/modules/admin/what-config_register2.php
@@ -50,11 +50,11 @@ if (IS_FORM_SENT()) {
 } else {
 	// Remember stuff in constants
 	define('LEAST_CATS_VALUE'   , round(getConfig('least_cats')));
-	define('__CFG_SHOW_REFID'   , ADD_SELECTION("yn", getConfig('display_refid')   , "display_refid"));
+	define('__CFG_SHOW_REFID'   , ADD_SELECTION('yn', getConfig('display_refid')   , "display_refid"));
 	define('__TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS(getConfig('ip_timeout')   , "ip_timeout", "Dhm"));
-	define('__CFG_DBL_EMAIL'    , ADD_SELECTION("yn", getConfig('check_double_email')       , "check_double_email"));
-	define('__CFG_DBL_PASS'     , ADD_SELECTION("yn", getConfig('check_double_pass')        , "check_double_pass"));
-	define('__CFG_CAT_DEFAULT'  , ADD_SELECTION("yn", getConfig('register_default'), "register_default"));
+	define('__CFG_DBL_EMAIL'    , ADD_SELECTION('yn', getConfig('check_double_email')       , "check_double_email"));
+	define('__CFG_DBL_PASS'     , ADD_SELECTION('yn', getConfig('check_double_pass')        , "check_double_pass"));
+	define('__CFG_CAT_DEFAULT'  , ADD_SELECTION('yn', getConfig('register_default'), "register_default"));
 
 	// Load normal template
 	LOAD_TEMPLATE("admin_config_register2");
diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php
index e1b4632d44..626e23176e 100644
--- a/inc/modules/admin/what-config_removeip.php
+++ b/inc/modules/admin/what-config_removeip.php
@@ -148,21 +148,21 @@ if (IS_FORM_SENT()) {
 
 	switch (getConfig('anonymous_ip')) {
 		case "127.0.0.1":
-			define('__CFG_ANONYMOUS_IP_LOCAL' , " selected=\"selected\"");
+			define('__CFG_ANONYMOUS_IP_LOCAL' , ' selected="selected"');
 			define('__CFG_ANONYMOUS_IP_ZERO'  , '');
 			define('__CFG_ANONYMOUS_IP_RANDOM', '');
 			break;
 
 		case "0.0.0.0":
 			define('__CFG_ANONYMOUS_IP_LOCAL' , '');
-			define('__CFG_ANONYMOUS_IP_ZERO'  , " selected=\"selected\"");
+			define('__CFG_ANONYMOUS_IP_ZERO'  , ' selected="selected"');
 			define('__CFG_ANONYMOUS_IP_RANDOM', '');
 			break;
 
 		case "RANDOM":
 			define('__CFG_ANONYMOUS_IP_LOCAL' , '');
 			define('__CFG_ANONYMOUS_IP_ZERO'  , '');
-			define('__CFG_ANONYMOUS_IP_RANDOM', " selected=\"selected\"");
+			define('__CFG_ANONYMOUS_IP_RANDOM', ' selected="selected"');
 			break;
 	} // END - switch
 
diff --git a/inc/modules/admin/what-config_stats.php b/inc/modules/admin/what-config_stats.php
index 80b095fb9a..d153496368 100644
--- a/inc/modules/admin/what-config_stats.php
+++ b/inc/modules/admin/what-config_stats.php
@@ -54,21 +54,21 @@ if (IS_FORM_SENT()) {
 	switch (getConfig('guest_stats'))
 	{
 	case "MEMBERS":
-		define('__MEMBERS_RADIO', " selected=\"selected\"");
+		define('__MEMBERS_RADIO', ' selected="selected"');
 		define('__MODULES_RADIO', '');
 		define('__INACTIVE_RADIO', '');
 		break;
 
 	case "MODULES":
 		define('__MEMBERS_RADIO', '');
-		define('__MODULES_RADIO', " selected=\"selected\"");
+		define('__MODULES_RADIO', ' selected="selected"');
 		define('__INACTIVE_RADIO', '');
 		break;
 
 	case "INACTIVE":
 		define('__MEMBERS_RADIO', '');
 		define('__MODULES_RADIO', '');
-		define('__INACTIVE_RADIO', " selected=\"selected\"");
+		define('__INACTIVE_RADIO', ' selected="selected"');
 		break;
 	}
 
diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index 2b78abaa38..ac629fb3f5 100644
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -141,12 +141,12 @@ if (IS_FORM_SENT()) {
 	// Notification mode
 	if (getConfig('surfbar_notification_mode') == "INSTANT") {
 		// Instant notification
-		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT', " selected=\"selected\"");
+		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT', ' selected="selected"');
 		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_RESET'  , '');
 	} else {
 		// Only daily reset
 		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT', '');
-		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_RESET'  , " selected=\"selected\"");
+		define('__CONFIG_SURFBAR_NOTIFICATION_MODE_RESET'  , ' selected="selected"');
 	}
 
 	// Load template
diff --git a/inc/modules/admin/what-config_title.php b/inc/modules/admin/what-config_title.php
index 3c41e03763..a01e850535 100644
--- a/inc/modules/admin/what-config_title.php
+++ b/inc/modules/admin/what-config_title.php
@@ -56,9 +56,9 @@ if (IS_FORM_SENT())
 	define('__CFG_TITLE_LEFT'     , getConfig('title_left'));
 	define('__CFG_TITLE_MIDDLE'   , getConfig('title_middle'));
 	define('__CFG_TITLE_RIGHT'    , getConfig('title_right'));
-	define('__CFG_TITLE_DECOS'    , ADD_SELECTION("yn", getConfig('enable_title_deco'), "enable_title_deco"));
-	define('__CFG_TITLE_MOD_SHOW' , ADD_SELECTION("yn", getConfig('enable_mod_title') , "enable_mod_title" ));
-	define('__CFG_TITLE_WHAT_SHOW', ADD_SELECTION("yn", getConfig('enable_what_title'), "enable_what_title"));
+	define('__CFG_TITLE_DECOS'    , ADD_SELECTION('yn', getConfig('enable_title_deco'), "enable_title_deco"));
+	define('__CFG_TITLE_MOD_SHOW' , ADD_SELECTION('yn', getConfig('enable_mod_title') , "enable_mod_title" ));
+	define('__CFG_TITLE_WHAT_SHOW', ADD_SELECTION('yn', getConfig('enable_what_title'), "enable_what_title"));
 
 	// Load template
 	LOAD_TEMPLATE("admin_config_title");
diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php
index 62e14fe2cb..26216dda53 100644
--- a/inc/modules/admin/what-config_transfer.php
+++ b/inc/modules/admin/what-config_transfer.php
@@ -58,13 +58,13 @@ define('__TRANS_CODE_VALUE'   , getConfig(('transfer_code')));
 // Autppurge expired transfer entries?
 switch (getConfig('ap_transfer')) {
 	case 'Y':
-		define('__YES_AP', " selected=\"selected\"");
+		define('__YES_AP', ' selected="selected"');
 		define('__NO_AP', '');
 		break;
 
 	case 'N':
 		define('__YES_AP', '');
-		define('__NO_AP', " selected=\"selected\"");
+		define('__NO_AP', ' selected="selected"');
 		break;
 }
 
diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index 632c90cd9c..1c47baa4fc 100644
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -73,21 +73,21 @@ if (IS_FORM_SENT()) {
 	// Erotic?
 	switch (getConfig('yoomedia_erotic_allowed')) {
 		case 0: // No erotic at all
-			define('__CFG_YOOMEDIA_EROTIC_NONE'   , " selected=\"selected\"");
+			define('__CFG_YOOMEDIA_EROTIC_NONE'   , ' selected="selected"');
 			define('__CFG_YOOMEDIA_EROTIC_INCLUDE', '');
 			define('__CFG_YOOMEDIA_EROTIC_ONLY'   , '');
 			break;
 
 		case 1: // Include erotic
 			define('__CFG_YOOMEDIA_EROTIC_NONE'   , '');
-			define('__CFG_YOOMEDIA_EROTIC_INCLUDE', " selected=\"selected\"");
+			define('__CFG_YOOMEDIA_EROTIC_INCLUDE', ' selected="selected"');
 			define('__CFG_YOOMEDIA_EROTIC_ONLY'   , '');
 			break;
 
 		case 2: // Erotic only
 			define('__CFG_YOOMEDIA_EROTIC_NONE'   , '');
 			define('__CFG_YOOMEDIA_EROTIC_INCLUDE', '');
-			define('__CFG_YOOMEDIA_EROTIC_ONLY'   , " selected=\"selected\"");
+			define('__CFG_YOOMEDIA_EROTIC_ONLY'   , ' selected="selected"');
 			break;
 	}
 
diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 71832e8043..29e9ee166c 100644
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -65,21 +65,21 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
 		switch ($DATA['gender'])
 		{
 		case "M":
-			define('__GENDER_M', " selected=\"selected\"");
+			define('__GENDER_M', ' selected="selected"');
 			define('__GENDER_F', '');
 			define('__GENDER_C', '');
 			break;
 
 		case "F":
 			define('__GENDER_M', '');
-			define('__GENDER_F', " selected=\"selected\"");
+			define('__GENDER_F', ' selected="selected"');
 			define('__GENDER_C', '');
 			break;
 
 		case "C":
 			define('__GENDER_M', '');
 			define('__GENDER_F', '');
-			define('__GENDER_C', " selected=\"selected\"");
+			define('__GENDER_C', ' selected="selected"');
 			break;
 		}
 		define('__SURNAME'    , $DATA['surname']);
@@ -96,7 +96,7 @@ if ((REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('mode')))) {
 		define('__EMAIL'      , $DATA['email']);
 		define('__URL'        , $DATA['url']);
 		//  Warning because low points
-		define('__REC_WARNING', ADD_SELECTION("yn", $DATA['receive_warnings'], "receive_warning"));
+		define('__REC_WARNING', ADD_SELECTION('yn', $DATA['receive_warnings'], "receive_warning"));
 		define('__INTERVAL'   , CREATE_TIME_SELECTIONS($DATA['warning_interval'], "warning_interval", "MWDh"));
 
 		// Init variables here
diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 805f495cb7..b81215da76 100644
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -125,21 +125,21 @@ WHERE userid=%s LIMIT 1",
 		switch ($gender)
 		{
 		case "M":
-			define('_GENDER_M', " selected=\"selected\"");
+			define('_GENDER_M', ' selected="selected"');
 			define('_GENDER_F', '');
 			define('_GENDER_C', '');
 			break;
 
 		case "F":
 			define('_GENDER_M', '');
-			define('_GENDER_F', " selected=\"selected\"");
+			define('_GENDER_F', ' selected="selected"');
 			define('_GENDER_C', '');
 			break;
 
 		case "C":
 			define('_GENDER_M', '');
 			define('_GENDER_F', '');
-			define('_GENDER_C', " selected=\"selected\"");
+			define('_GENDER_C', ' selected="selected"');
 			break;
 		}
 
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 3a81efd449..6928fe89de 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -134,14 +134,14 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
 
 				// Output row
 				$cssSelection = "---";
-				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = ADD_SELECTION("yn", $css, "css", $ext_id);
+				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = ADD_SELECTION('yn', $css, "css", $ext_id);
 
 				// Prepare data for the row template
 				$content = array(
 					'sw'     => $SW,
 					'id'     => $ext_id,
 					'name'   => $name,
-					'active' => ADD_SELECTION("yn", $active, 'active', $ext_id),
+					'active' => ADD_SELECTION('yn', $active, 'active', $ext_id),
 					'css'    => $cssSelection,
 				);
 
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 8a84140adb..27b0447d6f 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -209,8 +209,8 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
 					'menu'    => $menu,
 					'sel'     => $sel,
 					'sw'      => $SW,
-					'visible' => ADD_SELECTION("yn", $vis   , "visible", $sel),
-					'locked'  => ADD_SELECTION("yn", $locked, "locked" , $sel),
+					'visible' => ADD_SELECTION('yn', $vis   , "visible", $sel),
+					'locked'  => ADD_SELECTION('yn', $locked, "locked" , $sel),
 				);
 
 				// Load template
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index 98f7ec5afb..7705671620 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -155,8 +155,8 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 					'menu'    => $menu,
 					'sel'     => $sel,
 					'sw'      => $SW,
-					'visible' => ADD_SELECTION("yn", $vis   , "visible", $sel),
-					'locked'  => ADD_SELECTION("yn", $locked, "locked" , $sel),
+					'visible' => ADD_SELECTION('yn', $vis   , "visible", $sel),
+					'locked'  => ADD_SELECTION('yn', $locked, "locked" , $sel),
 				);
 
 				// Load template
diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index e3ad5ab0af..1cbddf6dcb 100644
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -116,7 +116,7 @@ VALUES ('%s','%s','%s')",
 			'id'  => $id,
 			'url' => $url,
 			'alt' => $alt,
-			'vis' => ADD_SELECTION("yn", $vis   , "visible"),
+			'vis' => ADD_SELECTION('yn', $vis   , "visible"),
 		);
 
 		// Load row template and switch color
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index bb4911f983..6d26db812c 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -232,7 +232,7 @@ LIMIT 1",
 
 		// Load main template
 		LOAD_TEMPLATE("admin_unlock_emails");
-	} elseif ((REQUEST_ISSET_POST(('lock'))) && (getConfig('url_blacklist') != "Y")) {
+	} elseif ((REQUEST_ISSET_POST(('lock'))) && (getConfig('url_blacklist') != 'Y')) {
 		// URL blacklist not activated
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
 	} else {
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 6e3645427e..99c859d050 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -94,7 +94,7 @@ if (IS_FORM_SENT()) {
 	// First we only check the submitted data then we continue... :)
 	//
 	// Did he agree to our Terms Of Usage?
-	if (REQUEST_POST('agree') != "Y") {
+	if (REQUEST_POST('agree') != 'Y') {
 		REQUEST_SET_POST('agree', "!");
 		$FAILED = true;
 	} // END - if
@@ -203,7 +203,7 @@ if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) {
 	// First comes first: begging rallye
 	if (GET_EXT_VERSION('beg') >= '0.1.7') {
 		// Okay, shall I disable now?
-		if (getConfig('beg_new_mem_notify') != "Y") {
+		if (getConfig('beg_new_mem_notify') != 'Y') {
 			$ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
 		} // END - if
@@ -212,7 +212,7 @@ if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) {
 	// Second: active rallye
 	if (GET_EXT_VERSION('bonus') >= '0.7.7') {
 		// Okay, shall I disable now?
-		if (getConfig('bonus_new_mem_notify') != "Y") {
+		if (getConfig('bonus_new_mem_notify') != 'Y') {
 			$ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
 		} // END - if
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 69920c8735..7c5ca54b51 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -322,21 +322,21 @@ ORDER BY pay_name", __FILE__, __LINE__);
 			switch (REQUEST_POST('gender'))
 			{
 			case "M": // Male
-				define('__GENDER_M'  , " selected=\"selected\"");
+				define('__GENDER_M'  , ' selected="selected"');
 				define('__GENDER_F'  , '');
 				define('__GENDER_C'  , '');
 				break;
 
 			case "F": // Female
 				define('__GENDER_M'  , '');
-				define('__GENDER_F'  , " selected=\"selected\"");
+				define('__GENDER_F'  , ' selected="selected"');
 				define('__GENDER_C'  , '');
 				break;
 
 			case "C": // Company
 				define('__GENDER_M'  , '');
 				define('__GENDER_F'  , '');
-				define('__GENDER_C'  , " selected=\"selected\"");
+				define('__GENDER_C'  , ' selected="selected"');
 				break;
 			}
 
@@ -344,13 +344,13 @@ ORDER BY pay_name", __FILE__, __LINE__);
 			switch (REQUEST_POST('receive_warnings'))
 			{
 			case 'Y':
-				define('__REC_Y'    , " selected=\"selected\"");
+				define('__REC_Y'    , ' selected="selected"');
 				define('__REC_N'    , '');
 				break;
 
 			case 'N':
 				define('__REC_Y'    , '');
-				define('__REC_N'    , " selected=\"selected\"");
+				define('__REC_N'    , ' selected="selected"');
 				break;
 			}
 
diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 4830e9fdfc..cc051262cb 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -130,21 +130,21 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		switch ($DATA[10])
 		{
 		case "M":
-			define('M_DEFAULT', " selected=\"selected\"");
+			define('M_DEFAULT', ' selected="selected"');
 			define('F_DEFAULT', '');
 			define('C_DEFAULT', '');
 			break;
 
 		case "F":
 			define('M_DEFAULT', '');
-			define('F_DEFAULT', " selected=\"selected\"");
+			define('F_DEFAULT', ' selected="selected"');
 			define('C_DEFAULT', '');
 			break;
 
 		case "C":
 			define('M_DEFAULT', '');
 			define('F_DEFAULT', '');
-			define('C_DEFAULT', " selected=\"selected\"");
+			define('C_DEFAULT', ' selected="selected"');
 			break;
 		}
 		$DOB = '';
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index a5a58c6f15..4c1055a240 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -622,12 +622,12 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				SQL_FREERESULT($result);
 
 				// 01      2              21    12                                    2    23         443    3          3210
-				if ((REQUEST_ISSET_POST(('data'))) || ((getConfig('order_multi_page') != "Y") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE('html_mail'))))) {
+				if ((REQUEST_ISSET_POST(('data'))) || ((getConfig('order_multi_page') != 'Y') && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE('html_mail'))))) {
 					// Pre-output categories
 					$CAT = '';
 					foreach ($CATS['id'] as $key => $value) {
 						$CAT .= "      <option value=\"".$value."\"";
-						if (($OLD_ORDER) && ($content['cat'] == $value)) $CAT .= " selected=\"selected\"";
+						if (($OLD_ORDER) && ($content['cat'] == $value)) $CAT .= ' selected="selected"';
 						$CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." {--USER_IN_CAT--})</option>\n";
 					} // END - foreach
 
@@ -638,7 +638,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						if (is_array($value)) {
 							// Output option line
 							$type .= "      <option value=\"".$typeS[$key][0]."\"";
-							if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= " selected=\"selected\"";
+							if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= ' selected="selected"';
 							$type .= ">".$P." {--PER_MAIL--} - ".$typeS[$key][3]." - ".round($typeS[$key][2])." {--PAYMENT--}</option>\n";
 						} // END - if
 					} // END - foreach
diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 00726da307..86dc794f94 100644
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -174,7 +174,7 @@ if ((GET_EXT_VERSION('bonus') >= '0.2.2') && (EXT_IS_ACTIVE('bonus')) && (getCon
 
 	// Output rows
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true));
-} elseif (getConfig('bonus_active') != "Y") {
+} elseif (getConfig('bonus_active') != 'Y') {
 	// Bonus active rallye deactivated
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_disabled", true));
 } elseif ((IS_ADMIN()) && (EXT_VERSION_IS_OLDER('bonus', '0.2.2')) && (EXT_IS_ACTIVE('bonus'))) {
diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index ce46dfb130..8d50527594 100644
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Is the refback system enabled?
-if (getConfig('refback_enabled') != "Y") {
+if (getConfig('refback_enabled') != 'Y') {
 	// Output message
 	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_REFBACK_DISABLED'));
 	// Abort here
diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 830df271d3..2e009be6e0 100644
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -105,7 +105,7 @@ array_pk_sort($THEMES, array("theme_name"));
 $OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	$default = '';
-	if (get_session('mxchange_theme') == $unix) $default = " selected=\"selected\"";
+	if (get_session('mxchange_theme') == $unix) $default = ' selected="selected"';
 
 	// Add row
 	$OUT .= "<tr>
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index e089d57be8..5838df6442 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -247,7 +247,7 @@ case "new": // Start new transfer
 			// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
 			while (list($uid, $nick) = SQL_FETCHROW($result)) {
 				$OUT .= "	<option value=\"".$uid."\"";
-				if ((REQUEST_ISSET_POST(('to_uid'))) && (REQUEST_POST('to_uid') == $uid)) $OUT .= " selected=\"selected\"";
+				if ((REQUEST_ISSET_POST(('to_uid'))) && (REQUEST_POST('to_uid') == $uid)) $OUT .= ' selected="selected"';
 				$OUT .= ">";
 				if (($nick != $uid) && (!empty($nick))) {
 					// Output nickname
diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 15ab182de0..5adea29d74 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -121,21 +121,21 @@ if (SQL_NUMROWS($result) == 1) {
 			switch ($content['gender'])
 			{
 			case "M": // Male
-				define('__GENDER_M', " selected=\"selected\"");
+				define('__GENDER_M', ' selected="selected"');
 				define('__GENDER_F', '');
 				define('__GENDER_C', '');
 				break;
 
 			case "F": // Female
 				define('__GENDER_M', '');
-				define('__GENDER_F', " selected=\"selected\"");
+				define('__GENDER_F', ' selected="selected"');
 				define('__GENDER_C', '');
 				break;
 
 			case "C": // Company
 				define('__GENDER_M', '');
 				define('__GENDER_F', '');
-				define('__GENDER_C', " selected=\"selected\"");
+				define('__GENDER_C', ' selected="selected"');
 				break;
 			}
 
diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index dac9ff1b8c..adc07ca534 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != "Y")) return;
+if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
@@ -58,7 +58,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 	$whereStatement2 = getConfig(('beg_ranks'));
 
 	// Shall we exclude webmaster's own userid?
-	if ((getConfig('beg_include_own') != "Y") && (getConfig('beg_uid') > 0)) {
+	if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_uid') > 0)) {
 		// Exclude it
 		$whereStatement1 = sprintf(" AND userid != %s", getConfig(('beg_uid')));
 	} // END - if
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 6a8a9e43f2..df617a6299 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -570,7 +570,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= "      <option value=\"".$content['value']."\"";
-			if (REQUEST_POST('max_mails') == $content['value']) $OUT .= " selected=\"selected\"";
+			if (REQUEST_POST('max_mails') == $content['value']) $OUT .= ' selected="selected"';
 			$OUT .= ">".$content['value']." {--PER_DAY--}";
 			if (!empty($content['comment'])) $OUT .= " (".$content['comment'].")";
 			$OUT .= "</option>\n";
@@ -1511,7 +1511,7 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
 			// Both are arrays
 			foreach ($id as $idx => $value) {
 				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
+				if ($default == $value) $ret .= ' selected="selected"';
 				$ret .= ">".$name[$idx]."</option>\n";
 			} // END - foreach
 		} // END - if
@@ -1529,7 +1529,7 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
 			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
 				if (empty($special)) $add = '';
 				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
+				if ($default == $value) $ret .= ' selected="selected"';
 				if (!empty($add)) $add = " (".$add.")";
 				$ret .= ">".$title.$add."</option>\n";
 			} // END - while