From c1c64b42ebd6ee664e43a0692dc0c4fb33fff50d Mon Sep 17 00:00:00 2001
From: David Ramos <dramos@open6hosting.com>
Date: Mon, 29 Jan 2018 11:28:20 +0100
Subject: [PATCH] Eliminadas las comprobaciones para las ips del servidor DNS
 se usan las del servidor Web para la plantilla webdns.

---
 new_service_webdns.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/new_service_webdns.php b/new_service_webdns.php
index 84b574a..8d341aa 100755
--- a/new_service_webdns.php
+++ b/new_service_webdns.php
@@ -860,25 +860,26 @@ class page_action extends tform_actions {
 		$global_dns_config = $app->getconf->get_server_config($this->dns_serv, 'server');
 
 		//El cliente 1 es admin
-		if($this->cli_id == 0){
+//		if($this->cli_id == 0){
 			
 			$this->ip4_servidor_dns = $global_dns_config['ip_address'];
+			$this->ip6_servidor_dns = $global_dns_config['v6_prefix'];
 
 			//Compruebo si hay datos para el client_id 0 y si no existe pruebo con el 1.
 			//Alguno de los dos tiene que existir por configuración de ispconfig.
 			/*$this->ip4_servidor_dns = $app->db->queryOneRecord(
 				'SELECT ip_type, ip_address FROM server_ip 
 					WHERE client_id = "0" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv4"');*/
-			$this->ip6_servidor_dns = $app->db->queryOneRecord(
+/*			$this->ip6_servidor_dns = $app->db->queryOneRecord(
 				'SELECT ip_type, ip_address FROM server_ip
 					WHERE client_id = "0" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv6"');
-
+*/
 			/*if(!$this->ip4_servidor_dns){
 				$this->ip4_servidor_dns = $app->db->queryOneRecord(
 					'SELECT ip_type, ip_address FROM server_ip
 						WHERE client_id = "1" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv4"');
 			}*/
-			if(!$this->ip6_servidor_dns){
+/*			if(!$this->ip6_servidor_dns){
 				$this->ip6_servidor_dns = $app->db->queryOneRecord(
 					'SELECT ip_type, ip_address FROM server_ip
 						WHERE client_id = "1" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv6"');
@@ -913,7 +914,7 @@ class page_action extends tform_actions {
 				}*/
 			
 			//}
-			if(!$this->ip6_servidor_dns){
+/*			if(!$this->ip6_servidor_dns){
 				//Compruebo si hay datos para el client_id 0 y si no existe pruebo con el 1. Es admin ya que este cliente no tiene ip4 ni ip6 asignadas
 				//Tomamos las de admin.
 				//Alguno de los dos tiene que existir por configuración de ispconfig.
@@ -928,7 +929,7 @@ class page_action extends tform_actions {
 							WHERE client_id = "1" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv6"');
 				}
 			}
-		}
+		}*/
 
 		//Captura de las ips del servidor web
 		if($this->cli_id == 0){
@@ -1048,7 +1049,7 @@ class page_action extends tform_actions {
 
 
 		//$la_ip4 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE ip_type='IPv4'");
-		$this->ip4_pdf = $this->ip4_servidor_dns['ip_address'];//$dns_ip_servidor['ip_address'];//$la_ip4['ip_address'];
+		$this->ip4_pdf = $this->ip4_servidor_web['ip_address'];//$dns_ip_servidor['ip_address'];//$la_ip4['ip_address'];
 		/*print "<pre>IP4 DNS ";print_r($this->ip4_servidor_dns);print "</pre>\n";
 		print "<pre>IP6 DNS ";print_r($this->ip6_servidor_dns);print "</pre>\n";
 		print "<pre>IP4 WEB ";print_r($this->ip4_servidor_web);print "</pre>\n";
@@ -1056,7 +1057,7 @@ class page_action extends tform_actions {
 		print "<pre>IP4 BBDD ";print_r($this->ip4_servidor_bbdd);print "</pre>\n";
 	    print "<pre>IP6 BBDD ";print_r($this->ip6_servidor_bbdd);print "</pre>\n";
 		echo('El cliente ' . $this->cli_id . '<br>');*/
-	    if(!$this->ip4_servidor_dns['ip_address']){
+/*	    if(!$this->ip4_servidor_dns['ip_address']){
 
 			$servicio_dns = $app->db->queryOneRecord(
 									'SELECT server_id, dns_server, server_name FROM server
@@ -1079,7 +1080,7 @@ class page_action extends tform_actions {
 			$app->tform->errorMessage = $app->tform->wordbook['error_no_ip']. 'la IP6 para el servidor '. $nom_serv_dns;
 			$this->onError();
 			return true;
-		}
+		}*/
 		if(!$this->ip4_servidor_web['ip_address']){
 			
 			$servidor_web = $app->db->queryOneRecord(
@@ -1243,13 +1244,13 @@ class page_action extends tform_actions {
 		print "<pre>IP6 WEB ";print_r($this->ip6_servidor_web);print "</pre>\n";*/
 
 		//Si el servidor es el que tiene asignado el cliente o el de admin por defecto, le damos esta ip4
-		if($this->dns_serv && $this->ip4_servidor_dns){
+/*		if($this->dns_serv && $this->ip4_servidor_dns){
 			$this->ip4_ultima = $this->ip4_servidor_dns;
 		}
 		
 		if($this->dns_serv && $this->ip6_servidor_dns){
 			$this->ip6_ultima = $this->ip6_servidor_dns;
-		}
+		}*/
 
 		if($this->web_serv && $this->ip4_servidor_web){
 			$this->ip4_ultima = $this->ip4_servidor_web;