- Fixed FS#2796 - Don't attach target server IP to remote IPs list in datab...

ftimme

2013-03-19 415544c8f026aa2db428b9528802a6982c6fa562

- Fixed FS#2796 - Don't attach target server IP to remote IPs list in database settings.

 interface/web/sites/database_edit.php

@@ -248,11 +248,24 @@
            // we need remote access rights for this server, so get it's ip address
            $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
            if($server_config['ip_address']!='') {
                /*
                if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
                $this->dataRecord['remote_access'] = 'y';
                if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                    $this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
                }
                */
				
                if($this->dataRecord['remote_access'] != 'y'){
                    $this->dataRecord['remote_ips'] = $server_config['ip_address'];
                    $this->dataRecord['remote_access'] = 'y';
                } else {
                    if($this->dataRecord['remote_ips'] != ''){
                        if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                            $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
                        }
                    }
                }
            }
        }
        
@@ -299,11 +312,24 @@
            // we need remote access rights for this server, so get it's ip address
            $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
            if($server_config['ip_address']!='') {
                /*
                if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
                $this->dataRecord['remote_access'] = 'y';
                if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                    $this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
                }
                */
				
                if($this->dataRecord['remote_access'] != 'y'){
                    $this->dataRecord['remote_ips'] = $server_config['ip_address'];
                    $this->dataRecord['remote_access'] = 'y';
                } else {
                    if($this->dataRecord['remote_ips'] != ''){
                        if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                            $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
                        }
                    }
                }
            }
        }