Added Display Public IP Support on Dropdown Field for Server Monitor

includes/functions.php

@@ -226,6 +226,8 @@ function create_home_selector_address($module, $subpage, $server_homes, $extra_i
 					$home_id, SORT_DESC, $server_homes);
 	foreach ( $server_homes as $server_home )
 	{
+		$display_ip = checkDisplayPublicIP($server_home['display_public_ip'],$server_home['ip']);
+
 		if(isset($_GET['home_id-mod_id-ip-port']) and 
 		   $get_home_id == $server_home['home_id'] and 
 		   $get_mod_id == $server_home['mod_id'] and 
@@ -237,7 +239,7 @@ function create_home_selector_address($module, $subpage, $server_homes, $extra_i
 		echo "<option value='". $server_home['home_id'] .
 			 "-" . $server_home['mod_id'] . "-" . $server_home['ip'] . 
 			 "-" . $server_home['port'] . "' $selected >" . 
-			 htmlentities($server_home['home_name']) . " - " . $server_home['ip'] .
+			 htmlentities($server_home['home_name']) . " - " . $display_ip .
 			 ":" . $server_home['port'] . "</option>\n";
 	}
 	echo "</select>\n";

modules/gamemanager/server_monitor.php

@@ -503,9 +503,8 @@ function exec_ogp_module() {
 				}else{
 					$query_ip = $server_home['ip'];
 				}
-				if(ip2long($server_home['display_public_ip'])){
-					$query_ip = $server_home['display_public_ip'];
-				}
+
+				$query_ip = checkDisplayPublicIP($server_home['display_public_ip'],$query_ip);
 				$address = $query_ip . ":" . $server_home['port'];
 
 				$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;