diff --git a/new_service_webdns.php b/new_service_webdns.php index 19595da..e86dc08 100755 --- a/new_service_webdns.php +++ b/new_service_webdns.php @@ -566,9 +566,9 @@ class page_action extends tform_actions { //combinando un query a las dos tablas sys_group y sys_user que comparten el client_id. if($fields['client_group_id']==0) { //En la tabla sys_user el userid 1 es admin. No esta en sys_group. - $this->cli_id = 1; + $this->cli_id = 0; //En la tabla dns_soa y dns_rr se guarda el valor 0 en sys_groupid cuando es admin. - $this->cli_grupo_id = 0; + $this->cli_grupo_id = 1; $this->sys_usuario_id = $this->cli_id; $this->sys_grupo_id = $this->cli_grupo_id; }else{ @@ -825,31 +825,40 @@ class page_action extends tform_actions { print "
DB SERVER ";print_r($this->bbdd_serv);print "\n"; print "
FTP SERVER ";print_r($this->ftp_serv);print "\n";*/ + + //Captura de las ips del servidor dns de la variable global. + $global_dns_config = $app->getconf->get_server_config($this->dns_serv, 'server'); + //El cliente 1 es admin - //Captura de las ips del servidor dns - if($this->cli_id == 1){ +// 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( + /*$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( + WHERE client_id = "0" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv4"');*/ + /*$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"'); + WHERE client_id = "0" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv6"');*/ - if(!$this->ip4_servidor_dns){ + /*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"'); } - }else{//Comprobamos si el cliente tiene servidor asignado, si no lo tiene asignamos el que admin a seleccionado - //para este servidor. - $this->ip4_servidor_dns = $app->db->queryOneRecord( + }else{*/ +// $this->ip4_servidor_dns = $global_dns_config['ip_address']; +// $this->ip6_servidor_dns = $global_dns_config['v6_prefix']; + //Comprobamos si el cliente tiene servidor asignado, si no lo tiene asignamos el que admin a seleccionado + //para este servidor. + /*$this->ip4_servidor_dns = $app->db->queryOneRecord( 'SELECT ip_type, ip_address FROM server_ip WHERE client_id = "'.$this->cli_id.'" AND server_id = "'.$this->dns_serv.'" AND ip_type="IPv4"'); @@ -857,13 +866,14 @@ class page_action extends tform_actions { 'SELECT ip_type, ip_address FROM server_ip WHERE client_id = "'.$this->cli_id.'" AND server_id = "'.$this->dns_serv.'"AND ip_type="IPv6"'); - + */ //si no tiene asignado le damos el de admin. - if(!$this->ip4_servidor_dns){ + // if(!$this->ip4_servidor_dns){ + // $this->ip4_servidor_dns = $global_dns_config['ip_address']; //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. - $this->ip4_servidor_dns = $app->db->queryOneRecord( + /*$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"'); @@ -871,13 +881,13 @@ class page_action extends tform_actions { $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){ //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. - //$this->ip4_servidor_dns = $app->db->queryOneRecord('SELECT ip_type, ip_address FROM server_ip WHERE client_id = "0" AND ip_type="IPv4"'); $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"'); @@ -888,7 +898,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 == 1){ @@ -1006,9 +1016,9 @@ class page_action extends tform_actions { //para el servidor ftp no se hacen comprobaciones //ya que las ips son las mismas que para el servidor web. - + //print_r($this->ip4_servidor_web['ip_address']); //$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'];//$this->ip4_servidor_dns; /*print "
IP4 DNS ";print_r($this->ip4_servidor_dns);print "\n"; print "
IP6 DNS ";print_r($this->ip6_servidor_dns);print "\n"; print "
IP4 WEB ";print_r($this->ip4_servidor_web);print "\n"; @@ -1016,7 +1026,8 @@ class page_action extends tform_actions { print "
IP4 BBDD ";print_r($this->ip4_servidor_bbdd);print "\n"; print "
IP6 BBDD ";print_r($this->ip6_servidor_bbdd);print "\n"; echo('El cliente ' . $this->cli_id . '
IP4 WEB ";print_r($this->ip4_servidor_web);print "\n"; print "
IP6 WEB ";print_r($this->ip6_servidor_web);print "\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;