Fixed Issue #3948 reseller missing '*' option in ipv4 address.

Till Brehm

2016-06-14 ebbc3f1a0744ec16f366ace7c4cd49c6a353b8a8

 interface/web/sites/web_vhost_domain_edit.php

@@ -305,6 +305,17 @@

         $app->tpl->setVar("server_id", $options_web_servers);
         unset($options_web_servers);
			
         if($this->id > 0) {
            if(!isset($this->dataRecord["server_id"])){
               $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ?", $this->id);
               $this->dataRecord["server_id"] = $tmp["server_id"];
               unset($tmp);
            }
            $server_id = intval(@$this->dataRecord["server_id"]);
         } else {
            $server_id = (isset($web_servers[0])) ? intval($web_servers[0]) : 0;
         }

         if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
@@ -1342,8 +1353,12 @@
      // Letsencrypt can not be activated before the website has been created
      // So we deactivate it here and add a datalog update in onAfterInsert
      if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y' && isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y') {
         // Disable letsencrypt and ssl temporarily
         $this->dataRecord['ssl_letsencrypt'] = 'n';
         $this->dataRecord['ssl'] = 'n';
         // Prevent that the datalog history gets written
         $app->tform->formDef['db_history'] = 'no';
         // Set variable that we check in onAfterInsert
         $this->_letsencrypt_on_insert = true;
      }
   }
@@ -1419,13 +1434,13 @@
      }
      if(isset($this->dataRecord['folder_directive_snippets'])) $app->db->query("UPDATE web_domain SET folder_directive_snippets = ? WHERE domain_id = ?", $this->dataRecord['folder_directive_snippets'], $this->id);
      
      // Add a datalog update with letsencrypt enabled (see also onBeforeInsert)
      // Add a datalog insert without letsencrypt and then an update with letsencrypt enabled (see also onBeforeInsert)
      if($this->_letsencrypt_on_insert == true) {
         $tmp = $web_rec;
         $tmp['ssl_letsencrypt'] = 'y';
         $tmp['ssl'] = 'y';
         $app->db->datalogUpdate('web_domain', $tmp, 'domain_id', $this->id);
         unset($tmp);
         $new_data_record = $app->tform->getDataRecord($this->id);
         $app->tform->datalogSave('INSERT', $this->id, array(), $new_data_record);
         $new_data_record['ssl_letsencrypt'] = 'y';
         $new_data_record['ssl'] = 'y';
         $app->db->datalogUpdate('web_domain', $new_data_record, 'domain_id', $this->id);
      }
   
   }
@@ -1456,9 +1471,13 @@
               $this->dataRecord["domain"] = $rec['domain'];
            }
            if(isset($this->dataRecord["ip_address"]) && $rec['ip_address'] != $this->dataRecord["ip_address"] && $rec['sys_perm_group'] != 'riud') {
               //* Add a error message and switch back to old server
               $app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv4-Address.');
               $this->dataRecord["ip_address"] = $rec['ip_address'];
            }
            if(isset($this->dataRecord["ipv6_address"]) && $rec['ipv6_address'] != $this->dataRecord["ipv6_address"] && $rec['sys_perm_group'] != 'riud') {
               //* Add a error message and switch back to old server
               $app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv6-Address.');
               $this->dataRecord["ipv6_address"] = $rec['ipv6_address'];
            }
            unset($rec);