From 4cb50ca0ae8b81eba7a01b8db5b2197412d510ef Mon Sep 17 00:00:00 2001
From: mnaumann <mnaumann@users.sourceforge.net>
Date: Thu, 27 Jan 2011 03:04:34 +0000
Subject: [PATCH] - fix switched handling of privacyPlease in masetrserver code

---
 source/masterserver/addServerInfo.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/masterserver/addServerInfo.php b/source/masterserver/addServerInfo.php
index f813b9fb..ba03d107 100644
--- a/source/masterserver/addServerInfo.php
+++ b/source/masterserver/addServerInfo.php
@@ -10,6 +10,13 @@
 	$glestVersion      = (string) clean_str( $_GET['glestVersion'] );
 	$platform          = (string) clean_str( $_GET['platform'] );
 	$binaryCompileDate = (string) clean_str( $_GET['binaryCompileDate'] );
+	if ( isset( $_GET['privacyPlease'] ) ) {
+		$privacyPlease = (int) $_GET['privacyPlease'];
+	}
+	else
+	{
+		$privacyPlease = 0;
+	}
 
 	// game info:
 	$serverTitle       = (string) clean_str( $_GET['serverTitle'] );
@@ -171,18 +178,16 @@
 		*/
 		else  // connection to game server succeeded, protocol verification succeeded
 		{ // add this game server to the database
-			$country = "";
 			if ( extension_loaded('geoip') ) {
 					
-				$privacyPlease = 0;
-				if(isset($_GET["privacyPlease"])) {
-					$privacyPlease = (int)    clean_str( $_GET['privacyPlease'] );
-				}
-
-				if($privacyPlease != 0)
+				if ( $privacyPlease == 0 )
 				{
 					$country = geoip_country_code_by_name( $remote_ip );
 				}
+				else
+				{
+					$country = '';
+				}
 			}
 			mysql_query( 'INSERT INTO glestserver SET ' .
 				'glestVersion=\''      . mysql_real_escape_string( $glestVersion )      . '\', ' .