Merge pull request #159 from oNdsen/master

Additional Check Display Public IP Support

modules/dashboard/dashboard.php

@@ -144,11 +144,10 @@ function exec_ogp_module()
 					}else{
 						$ip = $server_home['ip'];
 					}
-					if(ip2long($server_home['display_public_ip'])){
-						$ip = $server_home['display_public_ip'];
-					}
+					$ip = checkDisplayPublicIP($server_home['display_public_ip'],$server_home['agent_ip']);
+
 					$port = $server_home['port'];
-					
+
 					if($server_xml->protocol == "lgsl")
 					{
 						$get_q_and_s = lgsl_port_conversion((string)$server_xml->lgsl_query_name, $port, "", "");
@@ -166,7 +165,7 @@ function exec_ogp_module()
 						$address = "<a href='steam://connect/$ip:$port'>$ip:$port</a>"; 
 					else
 						$address = "$ip:$port";
-					
+
 					$OnlineServers .= "<tr><td><div class='name' ><a href='?m=gamemanager&amp;p=game_monitor&amp;home_id-mod_id-ip-port=" . $server_home['home_id'] . "-" . $server_home['mod_id'] . "-" . $server_home['ip'] . "-" . $server_home['port'] . "' ><img style='border:0;height:12px;' src='images/magnifglass.png'/>" . htmlentities($server_home['home_name']) . "</a></div> | ";
 					$OnlineServers .= "<div id='gamelink' >$address</div>"; 
 					$OnlineServers .= "</td></tr>";

modules/gamemanager/mini_start.php

@@ -83,8 +83,9 @@ if( !isset( $_POST['start_server'] ) )
 		echo "<span class='info'>(". max .": ".
 			$max_players.")</span></td></tr>\n";
 	}
+	$display_ip = checkDisplayPublicIP($server_home['display_public_ip'],$server_home['ip']);
 	echo "<tr><td class='right'>". ip_and_port .
-		":</td><td class='left'>".$server_home['ip'] . ":" . $server_home['port']."<input name='ip_port' type='hidden' value='".$server_home['ip'] . ":" . $server_home['port']."'/></td></tr>";
+		":</td><td class='left'>".$display_ip . ":" . $server_home['port']."<input name='ip_port' type='hidden' value='".$server_home['ip'] . ":" . $server_home['port']."'/></td></tr>";
 
 	list($list_type,) = explode(":", $server_xml->map_list);
 
@@ -162,7 +163,7 @@ if( !isset( $_POST['start_server'] ) )
 		}
 		else
 		{
-			echo "<tr><td>";
+			echo "<tr><td colspan='2'>";
 			print_failure( failed_to_read_maps_error_code .": $map_array");
 			echo "</td></tr>";
 			$check_ok = FALSE;

modules/user_games/show_homes.php

@@ -55,9 +55,11 @@ function exec_ogp_module()
 	sort($game_homes);
 	foreach( $game_homes as $row )
 	{
+		$display_ip = checkDisplayPublicIP($row['display_public_ip'],$row['agent_ip']);
+
 		$os_arch = preg_match('/win/',$row['game_key']) ? "(Windows" : "(Linux";
 		$os_arch .= preg_match('/(win|linux)64/',$row['game_key']) ? " 64bit)" : ")";
-		echo "<tr class='tr".($i++%2)."'><td class='tdh'>$row[home_id]</td><td>".$row['agent_ip']."</td>".
+		echo "<tr class='tr".($i++%2)."'><td class='tdh'>$row[home_id]</td><td>".$display_ip."</td>".
 			 "<td class='tdh'>$row[game_name] $os_arch</td><td>$row[home_path]<br><div class='size' id='".$row["home_id"].
 			 "' style='cursor:pointer;' >[".get_lang('get_size')."]</div></td><td class='tdh'>";
 		echo empty($row['home_name']) ? get_lang('not_available') : htmlentities($row['home_name']);