From 788c6fb78f8fbd37a63febcdb449b82f521b8568 Mon Sep 17 00:00:00 2001
From: David Ramos <dramos@open6hosting.com>
Date: Thu, 1 Feb 2018 12:55:45 +0100
Subject: [PATCH] =?UTF-8?q?Ahora=20solo=20comprobamos=20la=20ip6=20para=20?=
 =?UTF-8?q?sitios=20web=20que=20es=20el=20=C3=BAnico=20valor=20que=20oblig?=
 =?UTF-8?q?amos=20tener.=20El=20resto=20no=20es=20necesario=20ya=20que=20t?=
 =?UTF-8?q?oman=20este=20valor=20del=20sitio=20web.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 new_service_webdns.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/new_service_webdns.php b/new_service_webdns.php
index 5820fd3..8bf54ff 100755
--- a/new_service_webdns.php
+++ b/new_service_webdns.php
@@ -922,11 +922,11 @@ class page_action extends tform_actions {
 					'SELECT ip_type, ip_address FROM server_ip
 						WHERE client_id = "0" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv6"');
 
-				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"');
-				}
+				}*/
 			}
 			$this->ip6_ultima = $this->ip6_servidor_dns['ip_address'];
 		}
@@ -1019,7 +1019,7 @@ class page_action extends tform_actions {
 				'SELECT ip_type, ip_address
 					FROM server_ip
 					WHERE client_id = "'.$this->cli_id.'" AND server_id = "'.$this->bbdd_serv.'"AND ip_type="IPv6"');
-			
+			//echo(' (1) la ip4 bbdd ' . print_r($this->ip4_servidor_bbdd));
 			//si no tiene asignado le damos el de admin.
 			if(!$this->ip4_servidor_bbdd){
 				//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
@@ -1028,7 +1028,7 @@ class page_action extends tform_actions {
 				$this->ip4_servidor_bbdd = $app->db->queryOneRecord(
 					'SELECT ip_type, ip_address FROM server_ip
 						WHERE client_id = "0" AND server_id = "'.$this->bbdd_serv.'" AND ip_type="IPv4"');
-
+				//echo(' (2) la ip4 bbdd ' . print_r($this->ip4_servidor_bbdd));
 				/*if(!$this->ip4_servidor_bbdd){
 					$this->ip4_servidor_bbdd = $app->db->queryOneRecord(
 						'SELECT ip_type, ip_address FROM server_ip
@@ -1097,6 +1097,7 @@ class page_action extends tform_actions {
 		}
 		if(!$this->ip4_servidor_web['ip_address']){
 			
+			//Si no hay ip4 en la lista de ips, tomamos esta de la configuración principal.
 			$global_web_config = $app->getconf->get_server_config($this->web_serv, 'server');
 			$this->ip4_servidor_web = $global_web_config;
 
@@ -1131,8 +1132,9 @@ class page_action extends tform_actions {
 
 			$global_bbdd_config = $app->getconf->get_server_config($this->bbdd_serv, 'server');
 			$this->ip4_servidor_bbdd = $global_bbdd_config;
-
-			if(!$this->ip4_servidor_bbdd['ip_address']){
+			//echo(' (3) la ip4 bbdd ' . print_r($this->ip4_servidor_bbdd));
+			//Como la ip4 para las bbdd es la ip4 para el sitio web, no es necesario esta comprobación
+/*			if(!$this->ip4_servidor_bbdd['ip_address']){
 				$servicio_db = $app->db->queryOneRecord(
 										'SELECT server_id, db_server, server_name FROM server
 											WHERE server_id = "'.$this->bbdd_serv.'"');
@@ -1142,11 +1144,11 @@ class page_action extends tform_actions {
 				$app->tform->errorMessage = $app->tform->wordbook['error_no_ip']. 'la IP4 para el servidor ' . $nom_serv_db;
 				$this->onError();
 				return true;
-			}
+			}*/
 		}
-		if(!$this->ip6_servidor_bbdd['ip_address']){
+/*		if(!$this->ip6_servidor_bbdd['ip_address']){
 			
-			$servicio_db = $app->db->queryOneRecord(
+		/*	$servicio_db = $app->db->queryOneRecord(
 									'SELECT server_id, db_server, server_name FROM server
 										WHERE server_id = "'.$this->bbdd_serv.'"');
 						
@@ -1155,7 +1157,7 @@ class page_action extends tform_actions {
 			$app->tform->errorMessage = $app->tform->wordbook['error_no_ip']. 'la IP6 para el servidor ' . $nom_serv_db;
 			$this->onError();
 			return true;
-		}
+		}*/
 	    return false;
 	}