Fixed #3980 Subdomain (vhost) - Domain added to host each save

Till Brehm

2016-07-23 5501be8a358c44707752aa6d857af09599b4bfa9

 interface/web/sites/web_vhost_domain_edit.php

@@ -50,6 +50,7 @@

class page_action extends tform_actions {
   var $_vhostdomain_type = 'domain';
   var $_letsencrypt_on_insert = false;

   //* Returna a "3/2/1" path hash from a numeric id '123'
   function id_hash($id, $levels) {
@@ -139,7 +140,7 @@
      $app->uses('ini_parser,getconf');
      $settings = $app->getconf->get_global_config('domains');

      $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
      $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl', 'limit_ssl_letsencrypt', 'limit_directive_snippets');

      if($this->_vhostdomain_type != 'domain') $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ?", @$this->dataRecord["parent_domain_id"]);
      
@@ -187,7 +188,7 @@
            }
            $server_id = intval(@$this->dataRecord["server_id"]);
         } else {
            $server_id = (isset($web_servers[0])) ? intval($web_servers[0]) : 0;
            $server_id = (isset($web_servers[0])) ? intval($web_servers[0]['server_id']) : 0;
         }
         
         if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
@@ -199,9 +200,9 @@
            }
         }
         
         //* Fill the IPv4 select field with the IP addresses that are allowed for this client
         $sql = "SELECT ip_address FROM server_ip WHERE server_id IN ? AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
         $ips = $app->db->queryAllRecords($sql, explode(',', $client['web_servers']));
         //* Fill the IPv4 select field with the IP addresses that are allowed for this client on the current server
         $sql = "SELECT ip_address FROM server_ip WHERE server_id = ? AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
         $ips = $app->db->queryAllRecords($sql, $server_id);
         $ip_select = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
         //if(!in_array($this->dataRecord["ip_address"], $ips)) $ip_select .= "<option value='".$this->dataRecord["ip_address"]."' SELECTED>".$this->dataRecord["ip_address"]."</option>\r\n";
         //$ip_select = "";
@@ -216,10 +217,11 @@
         unset($ips);

         //* Fill the IPv6 select field with the IP addresses that are allowed for this client
         $sql = "SELECT ip_address FROM server_ip WHERE server_id IN ? AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, explode(',', $client['web_servers']), $_SESSION['s']['user']['client_id']);
         $ip_select = "<option value=''></option>";
         $sql = "SELECT ip_address FROM server_ip WHERE server_id = ? AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, $server_id, $_SESSION['s']['user']['client_id']);
         //$ip_select = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
         //$ip_select = "";
         $ip_select = "<option value=''></option>";
         if(is_array($ips)) {
            foreach( $ips as $ip) {
               $selected = ($ip["ip_address"] == $this->dataRecord["ipv6_address"])?'SELECTED':'';
@@ -236,14 +238,14 @@
         if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';

         if($this->_vhostdomain_type == 'domain') {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?)", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi'){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?)", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
            }
         } else {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?)", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi'){
@@ -253,7 +255,7 @@
         $php_select = "<option value=''>Default</option>";
         if(is_array($php_records) && !empty($php_records)) {
            foreach( $php_records as $php_record) {
               if($this->dataRecord['php'] == 'php-fpm'){
               if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
                  $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
               } else {
                  $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -303,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]['server_id']) : 0;
         }

         if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
@@ -333,8 +346,8 @@
         }
         
         //* Fill the IPv4 select field with the IP addresses that are allowed for this client
         $sql = "SELECT ip_address FROM server_ip WHERE server_id IN ? AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, explode(',', $client['web_servers']), $_SESSION['s']['user']['client_id']);
         $sql = "SELECT ip_address FROM server_ip WHERE server_id = ? AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, $server_id, $_SESSION['s']['user']['client_id']);
         $ip_select = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
         //if(!in_array($this->dataRecord["ip_address"], $ips)) $ip_select .= "<option value='".$this->dataRecord["ip_address"]."' SELECTED>".$this->dataRecord["ip_address"]."</option>\r\n";
         //$ip_select = "";
@@ -349,8 +362,8 @@
         unset($ips);

         //* Fill the IPv6 select field with the IP addresses that are allowed for this client
         $sql = "SELECT ip_address FROM server_ip WHERE server_id IN ? AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, $client['web_servers'], $_SESSION['s']['user']['client_id']);
         $sql = "SELECT ip_address FROM server_ip WHERE server_id = ? AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=?)";
         $ips = $app->db->queryAllRecords($sql, $server_id, $_SESSION['s']['user']['client_id']);
         $ip_select = "<option value=''></option>";
         //$ip_select = "";
         if(is_array($ips)) {
@@ -370,14 +383,14 @@
         $selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
         $sql_where = " AND (client_id = 0 OR client_id = ?)";
         if($this->_vhostdomain_type == 'domain') {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where, ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $selected_client['client_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi') {
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ?".$sql_where, ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $selected_client['client_id']);
            }
         } else {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?)", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi') {
@@ -387,7 +400,7 @@
         $php_select = "<option value=''>Default</option>";
         if(is_array($php_records) && !empty($php_records)) {
            foreach( $php_records as $php_record) {
               if($this->dataRecord['php'] == 'php-fpm'){
               if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
                  $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
               } else {
                  $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -405,24 +418,46 @@
         $sites_config = $app->getconf->get_global_config('sites');
         if($sites_config['reseller_can_use_options']) {
            // Directive Snippets
            $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
            $php_directive_snippets_txt = '';
            $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
            if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
               $php_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
               foreach($php_directive_snippets as $php_directive_snippet){
                  $php_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $php_directive_snippet['snippet'] . PHP_EOL;
                  $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a> ';
                  $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
               $php_directive_snippets_txt .= '<br><br>';
            }
				
            $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
            if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
               $php_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
               foreach($php_directive_snippets as $php_directive_snippet){
                  $php_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $php_directive_snippet['snippet'] . PHP_EOL;
                  $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
            }
            if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
            $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);

            if($server_type == 'apache'){
               $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
               $apache_directive_snippets_txt = '';
               $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
               if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
                  $apache_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
                  foreach($apache_directive_snippets as $apache_directive_snippet){
                     $apache_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $apache_directive_snippet['snippet'] . PHP_EOL;
                     $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a> ';
                     $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                  }
                  $apache_directive_snippets_txt .= '<br><br>';
               }
					
               $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
               if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
                  $apache_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
                  foreach($apache_directive_snippets as $apache_directive_snippet){
                     $apache_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $apache_directive_snippet['snippet'] . PHP_EOL;
                     $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                  }
               }
               if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
@@ -430,24 +465,46 @@
            }

            if($server_type == 'nginx'){
               $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
               $nginx_directive_snippets_txt = '';
               $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
               if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
                  $nginx_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
                  foreach($nginx_directive_snippets as $nginx_directive_snippet){
                     $nginx_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $nginx_directive_snippet['snippet'] . PHP_EOL;
                     $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a> ';
                     $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                  }
                  $nginx_directive_snippets_txt .= '<br><br>';
               }
					
               $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
               if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
                  $nginx_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
                  foreach($nginx_directive_snippets as $nginx_directive_snippet){
                     $nginx_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $nginx_directive_snippet['snippet'] . PHP_EOL;
                     $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                  }
               }
               if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
               $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
            }

            $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
            $proxy_directive_snippets_txt = '';
            $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
            if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
               $proxy_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
               foreach($proxy_directive_snippets as $proxy_directive_snippet){
                  $proxy_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $proxy_directive_snippet['snippet'] . PHP_EOL;
                  $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a> ';
                  $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
               $proxy_directive_snippets_txt .= '<br><br>';
            }
				
            $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
            if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
               $proxy_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
               foreach($proxy_directive_snippets as $proxy_directive_snippet){
                  $proxy_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $proxy_directive_snippet['snippet'] . PHP_EOL;
                  $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
            }
            if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
@@ -516,6 +573,10 @@
         unset($ips);

         if ($settings['use_domain_module'] != 'y') {
            if(!isset($this->dataRecord["sys_groupid"])){
               $tmp = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
               $this->dataRecord["sys_groupid"] = $tmp["sys_groupid"];
            }
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
            $clients = $app->db->queryAllRecords($sql);
@@ -541,14 +602,14 @@
         $selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
         $sql_where = " AND (client_id = 0 OR client_id = ?)";
         if($this->_vhostdomain_type == 'domain') {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where, $server_id, $selected_client['client_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi') {
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ?".$sql_where, $server_id, $selected_client['client_id']);
            }
         } else {
            if($this->dataRecord['php'] == 'php-fpm'){
            if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
               $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $parent_domain['server_id']);
            }
            if($this->dataRecord['php'] == 'fast-cgi') {
@@ -558,7 +619,7 @@
         $php_select = "<option value=''>Default</option>";
         if(is_array($php_records) && !empty($php_records)) {
            foreach( $php_records as $php_record) {
               if($this->dataRecord['php'] == 'php-fpm'){
               if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
                  $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
               } else {
                  $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -573,24 +634,46 @@
         foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));

         // Directive Snippets
         $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
         $php_directive_snippets_txt = '';
         $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
         if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
            $php_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
            foreach($php_directive_snippets as $php_directive_snippet){
               $php_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $php_directive_snippet['snippet'] . PHP_EOL;
               $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a> ';
               $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
            }
            $php_directive_snippets_txt .= '<br><br>';
         }
			
         $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
         if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
            $php_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
            foreach($php_directive_snippets as $php_directive_snippet){
               $php_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $php_directive_snippet['snippet'] . PHP_EOL;
               $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($php_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
            }
         }
         if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
         $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);

         if($server_type == 'apache'){
            $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
            $apache_directive_snippets_txt = '';
            $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
            if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
               $apache_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
               foreach($apache_directive_snippets as $apache_directive_snippet){
                  $apache_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $apache_directive_snippet['snippet'] . PHP_EOL;
                  $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a> ';
                  $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
               $apache_directive_snippets_txt .= '<br><br>';
            }
				
            $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
            if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
               $apache_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
               foreach($apache_directive_snippets as $apache_directive_snippet){
                  $apache_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $apache_directive_snippet['snippet'] . PHP_EOL;
                  $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($apache_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
            }
            if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
@@ -598,24 +681,46 @@
         }

         if($server_type == 'nginx'){
            $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
            $nginx_directive_snippets_txt = '';
            $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
            if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
               $nginx_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
               foreach($nginx_directive_snippets as $nginx_directive_snippet){
                  $nginx_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $nginx_directive_snippet['snippet'] . PHP_EOL;
                  $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a> ';
                  $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
               $nginx_directive_snippets_txt .= '<br><br>';
            }
				
            $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
            if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
               $nginx_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
               foreach($nginx_directive_snippets as $nginx_directive_snippet){
                  $nginx_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $nginx_directive_snippet['snippet'] . PHP_EOL;
                  $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($nginx_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
               }
            }
            if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
            $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
         }

         $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
         $proxy_directive_snippets_txt = '';
         $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y' AND master_directive_snippets_id > 0 ORDER BY name");
         if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
            $proxy_directive_snippets_txt .= $app->tform->wordbook["select_master_directive_snippet_txt"].'<br>';
            foreach($proxy_directive_snippets as $proxy_directive_snippet){
               $proxy_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $proxy_directive_snippet['snippet'] . PHP_EOL;
               $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a> ';
               $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
            }
            $proxy_directive_snippets_txt .= '<br><br>';
         }
			
         $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name");
         if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
            $proxy_directive_snippets_txt .= $app->tform->wordbook["select_directive_snippet_txt"].'<br>';
            foreach($proxy_directive_snippets as $proxy_directive_snippet){
               $proxy_directive_snippet['snippet'] = PHP_EOL . PHP_EOL . $proxy_directive_snippet['snippet'] . PHP_EOL;
               $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.htmlentities($proxy_directive_snippet['snippet']).'</pre></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
            }
         }
         if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
@@ -647,7 +752,10 @@
         //* we are editing a existing record
         $app->tpl->setVar("edit_disabled", 1);
         $app->tpl->setVar('fixed_folder', 'y');
         if($this->_vhostdomain_type == 'domain') $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
         if($this->_vhostdomain_type == 'domain') {
            $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
            $app->tpl->setVar("document_root", $this->dataRecord["document_root"]);
         }
         else $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
      } else {
         $app->tpl->setVar("edit_disabled", 0);
@@ -662,6 +770,7 @@
       * Now we have to check, if we should use the domain-module to select the domain
       * or not
       */
      $settings = $app->getconf->get_global_config('domains');
      if ($settings['use_domain_module'] == 'y') {
         /*
          * The domain-module is in use.
@@ -693,11 +802,16 @@
            $domain_select .= "<option value=''></option>\r\n";
         }
         $app->tpl->setVar("domain_option", $domain_select);
      } else {
			
         // remove the parent domain part of the domain name before we show it in the text field.
         if($this->dataRecord["type"] == 'vhostsubdomain') $this->dataRecord["domain"] = str_replace('.'.$selected_domain, '', $this->dataRecord["domain"]);

		
      } else {
         // remove the parent domain part of the domain name before we show it in the text field.
         if($this->dataRecord["type"] == 'vhostsubdomain') $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
      }
		
      if($this->_vhostdomain_type != 'domain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);

      // check for configuration errors in sys_datalog
@@ -727,6 +841,96 @@
      if($sys_config['use_combobox'] == 'y') {
         $app->tpl->setVar('use_combobox', 'y');
      }
		
      $directive_snippets_id_select = '<option value="0"'.($this->dataRecord['directive_snippets_id'] == 0? ' selected="selected"' : '').'>-</option>';
      $server_type = $app->getconf->get_server_config($server_id, 'web');
      $server_type = $server_type['server_type'];
		
      $m_directive_snippets = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND active = 'y' AND master_directive_snippets_id > 0 AND type = ? ORDER BY name ASC", $server_type);
      if(is_array($m_directive_snippets) && !empty($m_directive_snippets)){
         $directive_snippets_id_select .= '<optgroup label="'.$app->tform->wordbook["select_master_directive_snippet_txt"].'">';
         foreach($m_directive_snippets as $m_directive_snippet){
            $directive_snippets_id_select .= '<option value="'.$m_directive_snippet['directive_snippets_id'].'"'.($this->dataRecord['directive_snippets_id'] == $m_directive_snippet['directive_snippets_id']? ' selected="selected"' : '').'>'.$m_directive_snippet['name'].'</option>';
         }
         $directive_snippets_id_select .= '</optgroup>';
      }
		
      $directive_snippets = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND active = 'y' AND master_directive_snippets_id = 0 AND type = ? ORDER BY name ASC", $server_type);
      if(is_array($directive_snippets) && !empty($directive_snippets)){
         $directive_snippets_id_select .= '<optgroup label="'.$app->tform->wordbook["select_directive_snippet_txt"].'">';
         foreach($directive_snippets as $directive_snippet){
            $directive_snippets_id_select .= '<option value="'.$directive_snippet['directive_snippets_id'].'"'.($this->dataRecord['directive_snippets_id'] == $directive_snippet['directive_snippets_id']? ' selected="selected"' : '').'>'.$directive_snippet['name'].'</option>';
         }
         $directive_snippets_id_select .= '</optgroup>';
      }
      $app->tpl->setVar("directive_snippets_id", $directive_snippets_id_select);
		
      // folder_directive_snippets
      if(isset($_POST['folder_directive_snippets']) && !isset($this->dataRecord['folder_directive_snippets'])){
         $this->dataRecord['folder_directive_snippets'] = '';
         if(is_array($_POST['folder_directive_snippets']) && !empty($_POST['folder_directive_snippets'])){
            foreach($_POST['folder_directive_snippets'] as $folder_directive_snippet){
               if(trim($folder_directive_snippet['folder']) != '' && intval($folder_directive_snippet['snippets_id']) > 0) $this->dataRecord['folder_directive_snippets'] .= trim($folder_directive_snippet['folder']).':'.intval($folder_directive_snippet['snippets_id'])."\n";
            }
         }
         $this->dataRecord['folder_directive_snippets'] = trim($this->dataRecord['folder_directive_snippets']);
      }
		
      $master_directive_snippets = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND active = 'y' AND snippet LIKE '%{FOLDER}%' AND master_directive_snippets_id > 0 AND type = ? ORDER BY name ASC", $server_type);
      $c_directive_snippets = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND active = 'y' AND snippet LIKE '%{FOLDER}%' AND master_directive_snippets_id = 0 AND type = ? ORDER BY name ASC", $server_type);
		
      $folder_directive_snippets = array();
      $this->dataRecord['folder_directive_snippets'] = str_replace("\r\n", "\n", $this->dataRecord['folder_directive_snippets']);
      $this->dataRecord['folder_directive_snippets'] = str_replace("\r", "\n", $this->dataRecord['folder_directive_snippets']);
      $folder_directive_snippets_lines = explode("\n", trim($this->dataRecord['folder_directive_snippets']));
      for($i=0;$i<sizeof($folder_directive_snippets_lines)+50;$i++){
         $folder_directive_snippets[$i]['folder_directive_snippets_index'] = $i;
         $folder_directive_snippets[$i]['folder_directive_snippets_index_plus_1'] = $i + 1;
         if($i > sizeof($folder_directive_snippets_lines)){
            $folder_directive_snippets[$i]['folder_directive_snippets_css'] = 'hidden';
         } else {
            $folder_directive_snippets[$i]['folder_directive_snippets_css'] = '';
         }
         if(trim($folder_directive_snippets_lines[$i]) != ''){
            list($folder_directive_snippets[$i]['folder_directive_snippets_folder'], $selected_snippet) = explode(':', trim($folder_directive_snippets_lines[$i]));
            $folder_directive_snippets[$i]['folder_directive_snippets_id'] = '<option value="0">-</option>';
            if(is_array($master_directive_snippets) && !empty($master_directive_snippets)){
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<optgroup label="'.$app->tform->wordbook["select_master_directive_snippet_txt"].'">';
               foreach($master_directive_snippets as $master_directive_snippet){
                  $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<option value="'.$master_directive_snippet['directive_snippets_id'].'"'.($master_directive_snippet['directive_snippets_id'] == $selected_snippet ? ' selected="selected"' : '').'>'.$master_directive_snippet['name'].'</option>';
               }
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '</optgroup>';
            }
				
            if(is_array($c_directive_snippets) && !empty($c_directive_snippets)){
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<optgroup label="'.$app->tform->wordbook["select_directive_snippet_txt"].'">';
               foreach($c_directive_snippets as $c_directive_snippet){
                  $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<option value="'.$c_directive_snippet['directive_snippets_id'].'"'.($c_directive_snippet['directive_snippets_id'] == $selected_snippet? ' selected="selected"' : '').'>'.$c_directive_snippet['name'].'</option>';
               }
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '</optgroup>';
            }
         } else {
            $folder_directive_snippets[$i]['folder_directive_snippets_folder'] = '';
            $folder_directive_snippets[$i]['folder_directive_snippets_id'] = '<option value="0">-</option>';
            if(is_array($master_directive_snippets) && !empty($master_directive_snippets)){
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<optgroup label="'.$app->tform->wordbook["select_master_directive_snippet_txt"].'">';
               foreach($master_directive_snippets as $master_directive_snippet){
                  $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<option value="'.$master_directive_snippet['directive_snippets_id'].'">'.$master_directive_snippet['name'].'</option>';
               }
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '</optgroup>';
            }
				
            if(is_array($c_directive_snippets) && !empty($c_directive_snippets)){
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<optgroup label="'.$app->tform->wordbook["select_directive_snippet_txt"].'">';
               foreach($c_directive_snippets as $c_directive_snippet){
                  $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '<option value="'.$c_directive_snippet['directive_snippets_id'].'">'.$c_directive_snippet['name'].'</option>';
               }
               $folder_directive_snippets[$i]['folder_directive_snippets_id'] .= '</optgroup>';
            }
         }
      }
      $app->tpl->setLoop('folder_directive_snippets', $folder_directive_snippets);

      parent::onShowEnd();
   }

@@ -768,7 +972,7 @@
         $this->parent_domain_record = $parent_domain;
      }

      $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
      $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl', 'limit_ssl_letsencrypt', 'limit_directive_snippets');

      /* check if the domain module is used - and check if the selected domain can be used! */
      if($app->tform->getCurrentTab() == 'domain') {
@@ -835,6 +1039,8 @@
         if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = 'n';
         if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = 'n';
         if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = 'n';
         if($client['limit_ssl_letsencrypt'] != 'y') $this->dataRecord['ssl_letsencrypt'] = 'n';
         if($client['limit_directive_snippets'] != 'y') $this->dataRecord['directive_snippets_id'] = 0;

         // only generate quota and traffic warnings if value has changed
         if($this->id > 0) {
@@ -922,7 +1128,7 @@
            // restore the server ID if the user is not admin and record is edited
            $tmp = $app->db->queryOneRecord("SELECT server_id, `system_user`, `system_group`, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ?", $this->id);
            $this->dataRecord["server_id"] = $tmp["server_id"];
            $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
            if($this->_vhostdomain_type != 'domain') $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
            $this->dataRecord['system_user'] = $tmp['system_user'];
            $this->dataRecord['system_group'] = $tmp['system_group'];

@@ -1092,9 +1298,76 @@
         unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
      }
      if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';

		
      //print_r($_POST['folder_directive_snippets']);
      //print_r($_POST['folder_directive_snippets_id']);
      if(isset($_POST['folder_directive_snippets'])){
         $this->dataRecord['folder_directive_snippets'] = '';
         if(is_array($_POST['folder_directive_snippets']) && !empty($_POST['folder_directive_snippets'])){
            $existing_directive_snippets_folders = array();
            foreach($_POST['folder_directive_snippets'] as $folder_directive_snippet){
               $folder_directive_snippet['folder'] = trim($folder_directive_snippet['folder']);
               if($folder_directive_snippet['folder'] != '' && intval($folder_directive_snippet['snippets_id']) > 0){
                  if(substr($folder_directive_snippet['folder'], -1) != '/') $folder_directive_snippet['folder'] .= '/';
                  if(substr($folder_directive_snippet['folder'], 0, 1) == '/') $folder_directive_snippet['folder'] = substr($folder_directive_snippet['folder'], 1);
                  if(in_array($folder_directive_snippet['folder'], $existing_directive_snippets_folders)){
                     $app->tform->errorMessage .= $app->tform->lng("config_for_folder_exists_already_txt").'<br>';
                  } else {
                     $existing_directive_snippets_folders[] = $folder_directive_snippet['folder'];
                  }
                  $this->dataRecord['folder_directive_snippets'] .= $folder_directive_snippet['folder'].':'.intval($folder_directive_snippet['snippets_id'])."\n";
               }
               if(!preg_match('@^((?!(.*\.\.)|(.*\./)|(.*//))[^/][\w/_\.\-]{1,100})?$@', $folder_directive_snippet['folder'])) $app->tform->errorMessage .= $app->tform->lng("web_folder_error_regex").'<br>';
            }
         }
         $this->dataRecord['folder_directive_snippets'] = trim($this->dataRecord['folder_directive_snippets']);
      }
		
      // Check custom PHP version
      if(isset($this->dataRecord['fastcgi_php_version']) && $this->dataRecord['fastcgi_php_version'] != '') {
         // Check php-fpm mode
         if($this->dataRecord['php'] == 'php-fpm'){
            $tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fpm_init_script,':',php_fpm_ini_dir,':',php_fpm_pool_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
            if(is_array($tmp)) {
               $this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fpm_init_script'].':'.$tmp['php_fpm_ini_dir'].':'.$tmp['php_fpm_pool_dir'];
            } else {
               $this->dataRecord['fastcgi_php_version'] = '';
            }
            unset($tmp);
         // Check fast-cgi mode
         } elseif($this->dataRecord['php'] == 'fast-cgi') {
            $tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fastcgi_binary,':',php_fastcgi_ini_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
            if(is_array($tmp)) {
               $this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fastcgi_binary'].':'.$tmp['php_fastcgi_ini_dir'];
            } else {
               $this->dataRecord['fastcgi_php_version'] = '';
            }
            unset($tmp);
         } else {
            // Other PHP modes do not have custom versions, so we force the value to be empty
            $this->dataRecord['fastcgi_php_version'] = '';
         }
      }
		
      parent::onSubmit();
   }
	
   function onBeforeInsert() {
      global $app, $conf;
		
      // 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;
      }
   }
	

   function onAfterInsert() {
      global $app, $conf;
@@ -1145,11 +1418,10 @@
         $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
         $php_open_basedir = str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir);
         $htaccess_allow_override = $web_config["htaccess_allow_override"];
         $added_date = date($app->lng('conf_format_dateshort'));
         $added_by = $_SESSION['s']['user']['username'];

         $sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = ?, added_by = ?  WHERE domain_id = ?";
         $app->db->query($sql, $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_date, $added_by, $this->id);
         $sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?  WHERE domain_id = ?";
         $app->db->query($sql, $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $this->id);
      } else  {
         // Set the values for document_root, system_user and system_group
         $system_user = $this->parent_domain_record['system_user'];
@@ -1160,13 +1432,22 @@
         $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
         $php_open_basedir = str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir);
         $htaccess_allow_override = $this->parent_domain_record['allow_override'];
         $added_date = date($app->lng('conf_format_dateshort'));
         $added_by = $_SESSION['s']['user']['username'];
         
         $sql = "UPDATE web_domain SET sys_groupid = ?, system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = ?, added_by = ?  WHERE domain_id = ?";
         $app->db->query($sql, $this->parent_domain_record['sys_groupid'], $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_date, $added_by, $this->id);
         $sql = "UPDATE web_domain SET sys_groupid = ?, system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?  WHERE domain_id = ?";
         $app->db->query($sql, $this->parent_domain_record['sys_groupid'], $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $this->id);
      }

      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 insert without letsencrypt and then an update with letsencrypt enabled (see also onBeforeInsert)
      if($this->_letsencrypt_on_insert == true) {
         $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);
      }
	
   }

   function onBeforeUpdate () {
@@ -1189,15 +1470,19 @@
         } else {
            //* We do not allow users to change a domain which has been created by the admin
            $rec = $app->db->queryOneRecord("SELECT sys_perm_group, domain, ip_address, ipv6_address from web_domain WHERE domain_id = ?", $this->id);
            if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && $app->tform->checkPerm($this->id, 'u')) {
            if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && !$app->tform->checkPerm($this->id, 'u')) {
               //* Add a error message and switch back to old server
               $app->tform->errorMessage .= $app->lng('The Domain can not be changed. Please ask your Administrator if you want to change the domain name.');
               $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);
@@ -1206,10 +1491,6 @@

      //* Check that all fields for the SSL cert creation are filled
      if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'create') {
         if($this->dataRecord['ssl_state'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_state_empty').'<br />';
         if($this->dataRecord['ssl_locality'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_locality_empty').'<br />';
         if($this->dataRecord['ssl_organisation'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_empty').'<br />';
         if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
         if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
      }

@@ -1218,6 +1499,12 @@
      }

   }
	
   function onAfterUpdate() {
      global $app, $conf;

      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);
   }
}

$page = new page_action;