Merge pull request #182 from oNdsen/master

Display Public IP Bugfix

includes/database_mysqli.php

@@ -998,7 +998,7 @@ class OGPDatabaseMySQL extends OGPDatabase
 		$encryption_key = trim($encryption_key);
 		$rhost_timeout = trim($rhost_timeout);
 		$use_nat = trim($use_nat);
-		$display_public_up = trim($display_public_ip);
+		$display_public_ip = trim($display_public_ip);
 
 		if ( empty($rhost_ip) )
 			return false;
@@ -3397,4 +3397,4 @@ class OGPDatabaseMySQL extends OGPDatabase
 	}
 }
 
-?>
+?>

modules/server/edit_server.php

@@ -128,7 +128,6 @@ function exec_ogp_module() {
     {
 		$remote_server = $db->getRemoteServer($rhost_id);
 		$ftp_ip = empty($remote_server['ftp_ip']) ? $remote_server['agent_ip'] : $remote_server['ftp_ip'];
-		$dp_ip = empty($remote_server['display_public_ip']) ? $remote_server['agent_ip'] : $remote_server['display_public_ip'];
         require_once('includes/form_table_class.php');
         $ft = new FormTable();
         $ft->start_form('?m=server&p=edit&rhost_id='.$rhost_id.'&edit');
@@ -143,7 +142,7 @@ function exec_ogp_module() {
         $ft->add_field('string','remote_encryption_key',$remote_server['encryption_key']);
 		$ft->add_field('string','timeout',$remote_server['timeout']);
 		$ft->add_field('on_off','use_nat',$remote_server['use_nat']);
-		$ft->add_field('string','display_public_ip',$dp_ip);
+		$ft->add_field('string','display_public_ip',$remote_server['display_public_ip']);
         $ft->end_table();
         $ft->add_button('submit','save_settings', save_settings );
         $ft->end_form();

modules/user_games/edit_home.php

@@ -815,9 +815,13 @@ function exec_ogp_module()
 
 				foreach($avail_ips as $value)
 				{
-					$avail_display_ip = checkDisplayPublicIP($home_info['display_public_ip'],$value['ip']);
 					$selected = ( isset($_POST['ip']) and $_POST['ip'] == $value['ip_id'] ) ? "selected='selected'" : "";
-					echo "<option value='".$value['ip_id']."' $selected >".$avail_display_ip."</option>\n";
+					if(isset($home_info['display_public_ip']) && !empty($home_info['display_public_ip'])){
+						$display_ip = checkDisplayPublicIP($home_info['display_public_ip'],$home_info['agent_ip']);
+					}else{
+						$display_ip = $value['ip'];
+					}
+					echo "<option value='".$value['ip_id']."' $selected >".$display_ip."</option>\n";
 				}
 
 				echo "</select>";