Querying Libraries Need to Quit Overriding IP Variable

protocol/GameQ/GameQMonitor.php

@@ -14,9 +14,9 @@ else
 if($num_of_servers < $numberservers_to_skip_query)
 {
 	if ( $server_home['use_nat'] == 1 )
-		$ip = $server_home['agent_ip'];
+		$query_ip = $server_home['agent_ip'];
 	else
-		$ip = $server_home['ip'];
+		$query_ip = $server_home['ip'];
 	
 	$query_cache_life = ( isset($settings['query_cache_life']) and is_numeric($settings['query_cache_life']) )? $settings['query_cache_life'] : 30;
 	$ip_id = $db->getIpIdByIp($server_home['ip']);
@@ -34,7 +34,7 @@ if($num_of_servers < $numberservers_to_skip_query)
 		$server = array(
 							'id' => 'server',
 							'type' => $server_xml->gameq_query_name,
-							'host' => $ip . ":" . $query_port,
+							'host' => $query_ip . ":" . $query_port,
 						);
 		$gq->addServer($server);
 		$gq->setOption('timeout', 4);
@@ -65,7 +65,7 @@ if($num_of_servers < $numberservers_to_skip_query)
 		if(isset($results['gq_joinlink']) and $results['gq_joinlink'] != "")
 			$address = "<a href='$results[gq_joinlink]'>$ip:$port</a>";
 		elseif($server_xml->installer == 'steamcmd')
-			$address = "<a href='steam://connect/$ip:$port'>$ip:$port</a>";
+			$address = "<a href='steam://connect/$query_ip:$port'>$ip:$port</a>";
 		else
 			$address = "$ip:$port";
 		$playersList = $results['server']['players'];
@@ -79,4 +79,4 @@ else
 	$status = "half";
 	$notifications = get_lang_f('queries_disabled_by_setting_disable_queries_after',$numberservers_to_skip_query,$num_of_servers);
 }
-?>
+?>

protocol/TeamSpeak3/TS3Monitor.php

@@ -46,7 +46,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] !
 			else
 				$cfg["host"] = $server_home['ip'];
 			
-			$ip = $cfg["host"];
+			$query_ip = $cfg["host"];
 			$port = $cfg["voice"];
 			$status = "online";
 			try
@@ -94,7 +94,6 @@ if(isset($server_home['control_password']) && $server_home['control_password'] !
 		
 		if ( $ts3['status'] == "online" )
 		{
-			$ip = $ts3['ip'];
 			$port = $ts3['port'];
 			$player_list = $ts3['player_list'];
 			$maplocation = $ts3['maplocation'];

protocol/lgsl/LGSLMonitor.php

@@ -24,9 +24,9 @@ if($num_of_servers < $numberservers_to_skip_query)
 	else
 	{
 		if ( $server_home['use_nat'] == 1 )
-			$ip = $server_home['agent_ip'];
+			$query_ip = $server_home['agent_ip'];
 		else
-			$ip = $server_home['ip'];
+			$query_ip = $server_home['ip'];
 		$port = $server_home['port'];		
 		$get_q_and_s = lgsl_port_conversion((string)$server_xml->lgsl_query_name, $port, "", "");
 		//Connection port
@@ -35,8 +35,8 @@ if($num_of_servers < $numberservers_to_skip_query)
 		$q_port = $get_q_and_s['1'];
 		//software port
 		$s_port = $get_q_and_s['2'];
-		$data = lgsl_query_live((string)$server_xml->lgsl_query_name, $ip, $c_port, $q_port, $s_port, "sp");
-		$data['link'] = "<a href='" . lgsl_software_link((string)$server_xml->lgsl_query_name, $ip, $c_port, $q_port, $s_port) . "'>".$ip.":".$port."</a>";
+		$data = lgsl_query_live((string)$server_xml->lgsl_query_name, $query_ip, $c_port, $q_port, $s_port, "sp");
+		$data['link'] = "<a href='" . lgsl_software_link((string)$server_xml->lgsl_query_name, $query_ip, $c_port, $q_port, $s_port) . "'>".$ip.":".$port."</a>";
 		//-----------------------------------+
 		$data['s']['game'] = preg_replace("/[^A-Za-z0-9 \_\-]/",
 			"_", strtolower($data['s']['game']));