gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -1,7 +1,7 @@
			<?php

			/*
			Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
			Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
			All rights reserved.

			Redistribution and use in source and binary forms, with or without modification,
			@@ -35,6 +35,7 @@

			// private variables
			var $action = '';
			var $ssl_certificate_changed = false;

			//* This function is called during ispconfig installation to determine
			// if a symlink shall be created for this plugin.
			@@ -114,7 +115,22 @@
			$crt_file = $ssl_dir.'/'.$domain.'.crt';

			//* Create a SSL Certificate
			if($data['new']['ssl_action'] == 'create') {
			if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {

			$this->ssl_certificate_changed = true;

			//* Rename files if they exist
			if(file_exists($key_file)){
			$app->system->rename($key_file,$key_file.'.bak');
			$app->system->chmod($key_file.'.bak',0400);
			}
			if(file_exists($key_file2)){
			$app->system->rename($key_file2,$key_file2.'.bak');
			$app->system->chmod($key_file2.'.bak',0400);
			}
			if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
			if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');

			$rand_file = $ssl_dir.'/random_file';
			$rand_data = md5(uniqid(microtime(),1));
			for($i=0; $i<1000; $i++) {
			@@ -154,11 +170,15 @@

			$rand_file = escapeshellcmd($rand_file);
			$key_file = escapeshellcmd($key_file);
			if(substr($domain, 0, 2) == '.' && strpos($key_file, '/ssl/\.') != false) $key_file = str_replace('/ssl/\.', '/ssl/.', $key_file); // wildcard certificate
			$key_file2 = escapeshellcmd($key_file2);
			if(substr($domain, 0, 2) == '.' && strpos($key_file2, '/ssl/\.') != false) $key_file2 = str_replace('/ssl/\.', '/ssl/.', $key_file2); // wildcard certificate
			$ssl_days = 3650;
			$csr_file = escapeshellcmd($csr_file);
			if(substr($domain, 0, 2) == '.' && strpos($csr_file, '/ssl/\.') != false) $csr_file = str_replace('/ssl/\.', '/ssl/.', $csr_file); // wildcard certificate
			$config_file = escapeshellcmd($ssl_cnf_file);
			$crt_file = escapeshellcmd($crt_file);
			if(substr($domain, 0, 2) == '.' && strpos($crt_file, '/ssl/\.') != false) $crt_file = str_replace('/ssl/\.', '/ssl/.', $crt_file); // wildcard certificate

			if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) {

			@@ -179,6 +199,7 @@

			}

			$app->system->chmod($key_file,0400);
			$app->system->chmod($key_file2,0400);
			@$app->system->unlink($config_file);
			@$app->system->unlink($rand_file);
			@@ -195,6 +216,7 @@

			//* Save a SSL certificate to disk
			if($data["new"]["ssl_action"] == 'save') {
			$this->ssl_certificate_changed = true;
			$ssl_dir = $data["new"]["document_root"]."/ssl";
			$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
			$key_file = $ssl_dir.'/'.$domain.'.key.org';
			@@ -202,18 +224,36 @@
			$csr_file = $ssl_dir.'/'.$domain.".csr";
			$crt_file = $ssl_dir.'/'.$domain.".crt";
			//$bundle_file = $ssl_dir.'/'.$domain.".bundle";
			if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]);
			if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]);

			//* Backup files
			if(file_exists($key_file)){
			$app->system->copy($key_file,$key_file.'~');
			$app->system->chmod($key_file.'~',0400);
			}
			if(file_exists($key_file2)){
			$app->system->copy($key_file2,$key_file2.'~');
			$app->system->chmod($key_file2.'~',0400);
			}
			if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
			if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
			//if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');

			//* Write new ssl files
			if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file,$data["new"]["ssl_request"]);
			if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file,$data["new"]["ssl_cert"]);
			//if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
			if(trim($data["new"]["ssl_key"]) != '') $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]);

			// for nginx, bundle files have to be appended to the certificate file
			if(trim($data["new"]["ssl_bundle"]) != ''){
			if(file_exists($crt_file)){
			$crt_file_contents = trim(file_get_contents($crt_file));
			$crt_file_contents = trim($app->system->file_get_contents($crt_file));
			} else {
			$crt_file_contents = '';
			}
			if($crt_file_contents != '') $crt_file_contents .= "\n";
			$crt_file_contents .= $data["new"]["ssl_bundle"];
			file_put_contents($crt_file,$app->file->unix_nl($crt_file_contents));
			$app->system->file_put_contents($crt_file,$app->file->unix_nl($crt_file_contents));
			unset($crt_file_contents);
			}
			/* Update the DB of the (local) Server */
			@@ -231,7 +271,7 @@
			$csr_file = $ssl_dir.'/'.$domain.'.csr';
			$crt_file = $ssl_dir.'/'.$domain.'.crt';
			//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
			if(file_exists($web_config['CA_path'].'/openssl.cnf'))
			if(file_exists($web_config['CA_path'].'/openssl.cnf') && !is_link($web_config['CA_path'].'/openssl.cnf'))
			{
			exec("openssl ca -batch -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -revoke $crt_file");
			$app->log("Revoking CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
			@@ -267,7 +307,7 @@

			//* Check if the apache plugin is enabled
			if(@is_link('/usr/local/ispconfig/server/plugins-enabled/apache2_plugin.inc.php')) {
			$app->log('The nginx plugin can not be used together with the apache2 plugin..',LOGLEVEL_WARN);
			$app->log('The nginx plugin cannot be used together with the apache2 plugin.',LOGLEVEL_WARN);
			return 0;
			}

			@@ -355,7 +395,7 @@
			$groupname = escapeshellcmd($data['new']['system_group']);
			if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
			exec('groupadd '.$fixed_gid_param.' '.$groupname);
			if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
			if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
			$app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
			}

			@@ -363,10 +403,10 @@
			if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
			if($web_config['add_web_users_to_sshusers_group'] == 'y') {
			exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
			if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
			if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param -G sshusers $username -s /bin/false");
			} else {
			exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
			if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
			if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname $fixed_uid_param $username -s /bin/false");
			}
			$app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
			}
			@@ -406,14 +446,16 @@

			//* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path
			if(@is_dir($data['new']['document_root'])) {
			$app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d'));
			$app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d'),LOGLEVEL_DEBUG);
			$app->system->web_folder_protection($data['new']['document_root'],false);
			$app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'));
			$app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG);
			}

			//* Create new base directory, if it does not exist yet
			if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
			//exec('mv '.$data['old']['document_root'].' '.$new_dir);
			$app->system->rename($data['old']['document_root'],$new_dir);
			$app->system->web_folder_protection($data['old']['document_root'],false);
			exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir));
			//$app->system->rename($data['old']['document_root'],$new_dir);
			$app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);

			// Handle the change in php_open_basedir
			@@ -430,19 +472,27 @@
			exec($command);

			if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);


			//* Change the log mount
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
			$app->system->removeLine('/etc/fstab',$fstab_line);
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
			$app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1);

			}

			//print_r($data);

			// Check if the directories are there and create them if necessary.
			$app->system->web_folder_protection($data['new']['document_root'],false);

			if(!is_dir($data['new']['document_root'].'/' . $web_folder)) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder);
			if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/error') and $data['new']['errordocs']) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/error');
			//if(!is_dir($data['new']['document_root'].'/'.$log_folder)) exec('mkdir -p '.$data['new']['document_root'].'/'.$log_folder);
			if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
			if(!is_dir($data['new']['document_root'].'/cgi-bin')) $app->system->mkdirpath($data['new']['document_root'].'/cgi-bin');
			if(!is_dir($data['new']['document_root'].'/tmp')) $app->system->mkdirpath($data['new']['document_root'].'/tmp');
			//if(!is_dir($data['new']['document_root'].'/webdav')) $app->system->mkdirpath($data['new']['document_root'].'/webdav');

			//* Create the new private directory
			if(!is_dir($data['new']['document_root'].'/private')) {
			@@ -457,21 +507,30 @@
			if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
			if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
			if(is_link($data['old']['document_root'].'/'.$log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$log_folder);

			//* remove old log mount
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
			$app->system->removeLine('/etc/fstab',$fstab_line);

			//* Unmount log directory
			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
			}

			//* Create the log dir if nescessary and mount it
			if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']);
			if(!is_dir($data['new']['document_root'].'/'.$log_folder) \|\| is_link($data['new']['document_root'].'/'.$log_folder)) {
			if(!is_dir($data['new']['document_root'].'/'.$log_folder) \|\| !is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain']) \|\| is_link($data['new']['document_root'].'/'.$log_folder)) {
			if(is_link($data['new']['document_root'].'/'.$log_folder)) unlink($data['new']['document_root'].'/'.$log_folder);
			if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']);
			$app->system->mkdirpath($data['new']['document_root'].'/'.$log_folder);
			$app->system->chown($data['new']['document_root'].'/'.$log_folder,'root');
			$app->system->chgrp($data['new']['document_root'].'/'.$log_folder,'root');
			$app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755);
			exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/'.$log_folder));
			//* add mountpoint to fstab
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind 0 0';
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
			$app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1);
			}

			$app->system->web_folder_protection($data['new']['document_root'],true);

			// Get the client ID
			$client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['new']['sys_groupid']));
			@@ -619,6 +678,9 @@

			//* If the security level is set to high
			if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {

			$app->system->web_folder_protection($data['new']['document_root'],false);

			//* Check if we have the new private folder and create it if nescessary
			if(!is_dir($data['new']['document_root'].'/private')) $app->system->mkdir($data['new']['document_root'].'/private');

			@@ -626,7 +688,7 @@

			$app->system->chmod($data['new']['document_root'],0755);
			$app->system->chmod($data['new']['document_root'].'/web',0710);
			$app->system->chmod($data['new']['document_root'].'/webdav',0710);
			//$app->system->chmod($data['new']['document_root'].'/webdav',0710);
			$app->system->chmod($data['new']['document_root'].'/private',0710);
			$app->system->chmod($data['new']['document_root'].'/ssl',0755);

			@@ -661,45 +723,67 @@
			$app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));

			//* Chown all default directories
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
			$app->system->chown($data['new']['document_root'],'root');
			$app->system->chgrp($data['new']['document_root'],'root');
			$app->system->chown($data['new']['document_root'].'/cgi-bin',$username);
			$app->system->chgrp($data['new']['document_root'].'/cgi-bin',$groupname);
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/log'));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
			$this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));

			/*
			* Workaround for jailkit: If jailkit is enabled for the site, the
			* website root has to be owned by the root user and we have to chmod it to 755 then
			*/

			//* Check if there is a jailkit user for this site
			$tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
			if($tmp['number'] > 0) {
			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
			$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
			if(realpath($data['new']['document_root'].'/'.$log_folder . '/error.log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
			$app->system->chown($data['new']['document_root'].'/'.$log_folder,'root',false);
			$app->system->chgrp($data['new']['document_root'].'/'.$log_folder,$groupname,false);
			}
			unset($tmp);
			$app->system->chown($data['new']['document_root'].'/ssl','root');
			$app->system->chgrp($data['new']['document_root'].'/ssl','root');
			$app->system->chown($data['new']['document_root'].'/tmp',$username);
			$app->system->chgrp($data['new']['document_root'].'/tmp',$groupname);
			$app->system->chown($data['new']['document_root'].'/web',$username);
			$app->system->chgrp($data['new']['document_root'].'/web',$groupname);
			$app->system->chown($data['new']['document_root'].'/web/error',$username);
			$app->system->chgrp($data['new']['document_root'].'/web/error',$groupname);
			$app->system->chown($data['new']['document_root'].'/web/stats',$username);
			$app->system->chgrp($data['new']['document_root'].'/web/stats',$groupname);
			//$app->system->chown($data['new']['document_root'].'/webdav',$username);
			//$app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
			$app->system->chown($data['new']['document_root'].'/private',$username);
			$app->system->chgrp($data['new']['document_root'].'/private',$groupname);

			// If the security Level is set to medium
			} else {

			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/log'));
			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/ssl'));
			$this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/web'));
			$app->system->chmod($data['new']['document_root'],0755);
			$app->system->chmod($data['new']['document_root'].'/web',0755);
			//$app->system->chmod($data['new']['document_root'].'/webdav',0755);
			$app->system->chmod($data['new']['document_root'].'/ssl',0755);
			$app->system->chmod($data['new']['document_root'].'/cgi-bin',0755);

			// make temp directory writable for nginx and the website users
			$this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
			$app->system->chmod($data['new']['document_root'].'/tmp',0777);

			$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/cgi-bin'));
			$this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'].'/log'));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/tmp'));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/ssl'));
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'].'/web'));
			// Set Log directory to 755 to make the logs accessible by the FTP user
			if(realpath($data['new']['document_root'].'/'.$log_folder . '/error.log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
			$app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755);
			}

			$app->system->chown($data['new']['document_root'],'root');
			$app->system->chgrp($data['new']['document_root'],'root');
			$app->system->chown($data['new']['document_root'].'/cgi-bin',$username);
			$app->system->chgrp($data['new']['document_root'].'/cgi-bin',$groupname);
			if(realpath($data['new']['document_root'].'/'.$log_folder . '/error.log') == '/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log') {
			$app->system->chown($data['new']['document_root'].'/'.$log_folder,'root',false);
			$app->system->chgrp($data['new']['document_root'].'/'.$log_folder,$groupname,false);
			}

			$app->system->chown($data['new']['document_root'].'/ssl','root');
			$app->system->chgrp($data['new']['document_root'].'/ssl','root');
			$app->system->chown($data['new']['document_root'].'/tmp',$username);
			$app->system->chgrp($data['new']['document_root'].'/tmp',$groupname);
			$app->system->chown($data['new']['document_root'].'/web',$username);
			$app->system->chgrp($data['new']['document_root'].'/web',$groupname);
			$app->system->chown($data['new']['document_root'].'/web/error',$username);
			$app->system->chgrp($data['new']['document_root'].'/web/error',$groupname);
			$app->system->chown($data['new']['document_root'].'/web/stats',$username);
			$app->system->chgrp($data['new']['document_root'].'/web/stats',$groupname);
			//$app->system->chown($data['new']['document_root'].'/webdav',$username);
			//$app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
			}
			} elseif(($this->action == 'insert' && $data['new']['type'] == 'vhostsubdomain') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhostsubdomain')) {
			if($web_config['security_level'] == 20) {
			@@ -720,10 +804,23 @@
			$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats',$groupname);
			}
			}

			//* Protect web folders
			$app->system->web_folder_protection($data['new']['document_root'],true);

			if($data['new']['type'] == 'vhost') {
			// Change the ownership of the error log to the root user
			if(!@is_file('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log')) exec('touch '.escapeshellcmd('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log'));
			$app->system->chown('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log','root');
			$app->system->chgrp('/var/log/ispconfig/httpd/'.$data['new']['domain'].'/error.log','root');
			}

			// Change the ownership of the error log to the owner of the website
			/*
			if(!@is_file($data['new']['document_root'].'/log/error.log')) exec('touch '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
			$this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
			$app->system->chown($data['new']['document_root'].'/log/error.log',$username);
			$app->system->chgrp($data['new']['document_root'].'/log/error.log',$groupname);
			*/


			/*
			@@ -767,7 +864,21 @@
			$vhost_data['web_basedir'] = $web_config['website_basedir'];

			// IPv6
			if($data['new']['ipv6_address'] != '') $tpl->setVar('ipv6_enabled', 1);
			if($data['new']['ipv6_address'] != ''){
			$tpl->setVar('ipv6_enabled', 1);
			if ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') {
			if (isset($conf['serverconfig']['server']['v6_prefix']) && $conf['serverconfig']['server']['v6_prefix'] <> '') {
			$explode_v6prefix=explode(':',$conf['serverconfig']['server']['v6_prefix']);
			$explode_v6=explode(':',$data['new']['ipv6_address']);

			for ( $i = 0; $i <= count($explode_v6prefix)-3; $i++ ) {
			$explode_v6[$i] = $explode_v6prefix[$i];
			}
			$data['new']['ipv6_address'] = implode(':',$explode_v6);
			$vhost_data['ipv6_address'] = $data['new']['ipv6_address'];
			}
			}
			}

			// PHP-FPM
			// Support for multiple PHP versions
			@@ -819,6 +930,7 @@
			$tpl->setVar('use_socket', $use_socket);
			$fpm_socket = $socket_dir.$pool_name.'.sock';
			$tpl->setVar('fpm_socket', $fpm_socket);
			$tpl->setVar('rnd_php_dummy_file', '/'.md5(uniqid(microtime(),1)).'.htm');
			$vhost_data['fpm_port'] = $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1;

			// backwards compatibility; since ISPConfig 3.0.5, the PHP mode for nginx is called 'php-fpm' instead of 'fast-cgi'. The following line makes sure that old web sites that have 'fast-cgi' in the database still get PHP-FPM support.
			@@ -853,123 +965,209 @@
			}

			// Set SEO Redirect
			if($data['new']['seo_redirect'] != '' && ($data['new']['subdomain'] == 'www' \|\| $data['new']['subdomain'] == '*')){
			if($data['new']['seo_redirect'] != ''){
			$vhost_data['seo_redirect_enabled'] = 1;
			if($data['new']['seo_redirect'] == 'non_www_to_www'){
			$vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
			$vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
			}
			if($data['new']['seo_redirect'] == 'www_to_non_www'){
			$vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
			$vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
			$tmp_seo_redirects = $this->get_seo_redirects($data['new']);
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			foreach($tmp_seo_redirects as $key => $val){
			$vhost_data[$key] = $val;
			}
			} else {
			$vhost_data['seo_redirect_enabled'] = 0;
			}
			} else {
			$vhost_data['seo_redirect_enabled'] = 0;
			}

			$tpl->setVar($vhost_data);


			// Rewrite rules
			$own_rewrite_rules = array();
			$rewrite_rules = array();
			$local_rewrite_rules = array();
			if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
			if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
			if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);

			/* Disabled path extension
			if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
			$data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
			if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
			if($data['new']['redirect_type'] != 'proxy'){
			$data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
			} else {
			$data['new']['redirect_path'] = 'http'.substr($data['new']['redirect_path'],8);
			}
			}
			*/

			// Custom proxy directives
			if($data['new']['redirect_type'] == 'proxy' && trim($data['new']['proxy_directives'] != '')){
			$final_proxy_directives = array();
			$proxy_directives = $data['new']['proxy_directives'];
			// Make sure we only have Unix linebreaks
			$proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
			$proxy_directives = str_replace("\r", "\n", $proxy_directives);
			$proxy_directive_lines = explode("\n", $proxy_directives);
			if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
			foreach($proxy_directive_lines as $proxy_directive_line){
			$final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
			}
			}
			} else {
			$final_proxy_directives = false;
			}

			switch($data['new']['subdomain']) {
			case 'www':
			$exclude_own_hostname = '';
			if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
			break;
			}
			$rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $data['new']['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(($tmp_redirect_path_parts['host'] == $data['new']['domain'] \|\| $tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain']) && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			// URL is local
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			//$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
			break;
			} else {
			$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			$exclude_own_hostname = $tmp_redirect_path_parts['host'];
			}
			} else {
			$rewrite_exclude = '(.?)';
			// external URL
			$rewrite_exclude = '(.?)/';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['use_proxy'] = 'y';
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^'.$data['new']['domain'],
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);

			if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $data['new']['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^www.'.$data['new']['domain'],
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);
			break;
			case '*':
			if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $data['new']['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if(substr($tmp_redirect_path_parts['host'],-strlen($data['new']['domain'])) == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => $data['new']['domain'],
			$own_rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);
			'rewrite_exclude' => $rewrite_exclude,
			'rewrite_subdir' => $rewrite_subdir,
			'exclude_own_hostname' => $exclude_own_hostname,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
			break;
			case '*':
			$exclude_own_hostname = '';
			if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
			break;
			}
			$rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $data['new']['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);

			//if($is_serveralias && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if($this->url_is_local($tmp_redirect_path_parts['host'], $data['new']['domain_id']) && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			// URL is local
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			//$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
			break;
			} else {
			$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			$exclude_own_hostname = $tmp_redirect_path_parts['host'];
			}
			} else {
			// external URL
			$rewrite_exclude = '(.?)/';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['use_proxy'] = 'y';
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$own_rewrite_rules[] = array( 'rewrite_domain' => '(^\|\.)'.$this->_rewrite_quote($data['new']['domain']),
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude,
			'rewrite_subdir' => $rewrite_subdir,
			'exclude_own_hostname' => $exclude_own_hostname,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
			break;
			default:
			if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
			$exclude_own_hostname = '';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
			break;
			}
			$rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $data['new']['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			// URL is local
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			//$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
			$vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
			break;
			} else {
			$rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			$exclude_own_hostname = $tmp_redirect_path_parts['host'];
			}
			} else {
			$rewrite_exclude = '(.?)';
			// external URL
			$rewrite_exclude = '(.?)/';
			if($data['new']['redirect_type'] == 'proxy'){
			$vhost_data['use_proxy'] = 'y';
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^'.$data['new']['domain'],
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);
			$own_rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
			'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
			'rewrite_target' => $data['new']['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude,
			'rewrite_subdir' => $rewrite_subdir,
			'exclude_own_hostname' => $exclude_own_hostname,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($data['new']['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($data['new']['redirect_type'] == 'proxy' ? true:false));
			}
			}

			$tpl->setVar($vhost_data);

			$server_alias = array();

			@@ -984,11 +1182,9 @@
			unset($client);
			unset($aa_search);
			unset($aa_replace);
			$server_alias[] .= $auto_alias;
			$server_alias[] .= $auto_alias.' ';
			}

			// get alias domains (co-domains and subdomains)
			$aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
			switch($data['new']['subdomain']) {
			case 'www':
			$server_alias[] = 'www.'.$data['new']['domain'].' ';
			@@ -997,118 +1193,213 @@
			$server_alias[] = '*.'.$data['new']['domain'].' ';
			break;
			}

			// get alias domains (co-domains and subdomains)
			$aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
			$alias_seo_redirects = array();
			if(is_array($aliases)) {
			foreach($aliases as $alias) {
			switch($alias['subdomain']) {
			case 'www':
			$server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
			break;
			case '*':
			$server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
			break;
			default:
			$server_alias[] = $alias['domain'].' ';
			break;
			}
			$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
			// Rewriting
			if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
			if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
			if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);

			/* Disabled the path extension
			if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
			$data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';

			// Custom proxy directives
			if($alias['redirect_type'] == 'proxy' && trim($alias['proxy_directives'] != '')){
			$final_proxy_directives = array();
			$proxy_directives = $alias['proxy_directives'];
			// Make sure we only have Unix linebreaks
			$proxy_directives = str_replace("\r\n", "\n", $proxy_directives);
			$proxy_directives = str_replace("\r", "\n", $proxy_directives);
			$proxy_directive_lines = explode("\n", $proxy_directives);
			if(is_array($proxy_directive_lines) && !empty($proxy_directive_lines)){
			foreach($proxy_directive_lines as $proxy_directive_line){
			$final_proxy_directives[] = array('proxy_directive' => $proxy_directive_line);
			}
			}
			*/
			} else {
			$final_proxy_directives = false;
			}

			if($alias['redirect_type'] == '' \|\| $alias['redirect_path'] == '' \|\| substr($alias['redirect_path'],0,1) == '/') {
			switch($alias['subdomain']) {
			case 'www':
			$server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
			break;
			case '*':
			$server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
			break;
			default:
			$server_alias[] = $alias['domain'].' ';
			break;
			}
			$app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);

			// Add SEO redirects for alias domains
			if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '_to_www_domain_tld' && $data['new']['seo_redirect'] != '_to_domain_tld' && ($alias['type'] == 'alias' \|\| ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '_domain_tld_to_domain_tld'))){
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			$alias_seo_redirects[] = $tmp_seo_redirects;
			}
			}
			}

			// Local Rewriting (inside vhost server {} container)
			if($alias['redirect_type'] != '' && substr($alias['redirect_path'],0,1) == '/' && $alias['redirect_type'] != 'proxy') { // proxy makes no sense with local path
			if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
			$rewrite_exclude = '(?!/\b('.substr($alias['redirect_path'],1,-1).(substr($alias['redirect_path'],1,-1) != ''? '\|': '').'stats'.($vhost_data['errordocs'] == 1 ? '\|error' : '').')\b)/';
			switch($alias['subdomain']) {
			case 'www':
			// example.com
			$local_rewrite_rules[] = array( 'local_redirect_origin_domain' => $alias['domain'],
			'local_redirect_operator' => '=',
			'local_redirect_exclude' => $rewrite_exclude,
			'local_redirect_target' => $alias['redirect_path'],
			'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);

			// www.example.com
			$local_rewrite_rules[] = array( 'local_redirect_origin_domain' => 'www.'.$alias['domain'],
			'local_redirect_operator' => '=',
			'local_redirect_exclude' => $rewrite_exclude,
			'local_redirect_target' => $alias['redirect_path'],
			'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
			break;
			case '*':
			$local_rewrite_rules[] = array( 'local_redirect_origin_domain' => '^('.str_replace('.', '\.', $alias['domain']).'\|.+\.'.str_replace('.', '\.', $alias['domain']).')$',
			'local_redirect_operator' => '~*',
			'local_redirect_exclude' => $rewrite_exclude,
			'local_redirect_target' => $alias['redirect_path'],
			'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
			break;
			default:
			$local_rewrite_rules[] = array( 'local_redirect_origin_domain' => $alias['domain'],
			'local_redirect_operator' => '=',
			'local_redirect_exclude' => $rewrite_exclude,
			'local_redirect_target' => $alias['redirect_path'],
			'local_redirect_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type']);
			}
			}

			// External Rewriting (extra server {} containers)
			if($alias['redirect_type'] != '' && $alias['redirect_path'] != '' && substr($alias['redirect_path'],0,1) != '/') {
			if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
			if(substr($alias['redirect_path'],0,8) == '[scheme]'){
			if($alias['redirect_type'] != 'proxy'){
			$alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
			} else {
			$alias['redirect_path'] = 'http'.substr($alias['redirect_path'],8);
			}
			}

			switch($alias['subdomain']) {
			case 'www':
			if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			if($alias['redirect_type'] == 'proxy'){
			$tmp_redirect_path = $alias['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^'.$alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);

			if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $alias['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == 'www.'.$alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);

			if($alias['redirect_type'] != 'proxy'){
			if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^www.'.$alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);
			break;
			case '*':
			if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			$tmp_redirect_path = $alias['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if(substr($tmp_redirect_path_parts['host'],-strlen($alias['domain'])) == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			// Add SEO redirects for alias domains
			$alias_seo_redirects2 = array();
			if($alias['seo_redirect'] != ''){
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			$alias_seo_redirects2[] = $tmp_seo_redirects;
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			}
			$rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);
			'rewrite_subdir' => $rewrite_subdir,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
			'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));

			// Add SEO redirects for alias domains
			$alias_seo_redirects2 = array();
			if($alias['seo_redirect'] != ''){
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'www');
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			$alias_seo_redirects2[] = $tmp_seo_redirects;
			}
			}
			$rewrite_rules[] = array( 'rewrite_domain' => 'www.'.$alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_subdir' => $rewrite_subdir,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
			'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
			break;
			case '*':
			if($alias['redirect_type'] == 'proxy'){
			$tmp_redirect_path = $alias['redirect_path'];
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}

			if($alias['redirect_type'] != 'proxy'){
			if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
			}
			// Add SEO redirects for alias domains
			$alias_seo_redirects2 = array();
			if($alias['seo_redirect'] != ''){
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			$alias_seo_redirects2[] = $tmp_seo_redirects;
			}
			}
			$rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'].' *.'.$alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_subdir' => $rewrite_subdir,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
			'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
			break;
			default:
			if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
			$rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
			} else { // URL - check if URL is local
			if($alias['redirect_type'] == 'proxy'){
			$tmp_redirect_path = $alias['redirect_path'];
			if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
			$tmp_redirect_path_parts = parse_url($tmp_redirect_path);
			if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' \|\| $tmp_redirect_path_parts['port'] == '443' \|\| !isset($tmp_redirect_path_parts['port']))){
			if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
			if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
			$rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
			} else {
			$rewrite_exclude = '(.?)';
			}
			unset($tmp_redirect_path);
			unset($tmp_redirect_path_parts);
			$rewrite_subdir = $tmp_redirect_path_parts['path'];
			if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
			if(substr($rewrite_subdir,-1) != '/') $rewrite_subdir .= '/';
			if($rewrite_subdir == '/') $rewrite_subdir = '';
			}
			$rewrite_rules[] = array( 'rewrite_domain' => '^'.$alias['domain'],
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_exclude' => $rewrite_exclude);

			if($alias['redirect_type'] != 'proxy'){
			if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
			}
			if(substr($alias['domain'], 0, 2) === '.') $domain_rule = '.'.substr($alias['domain'], 2);
			else $domain_rule = $alias['domain'];
			// Add SEO redirects for alias domains
			$alias_seo_redirects2 = array();
			if($alias['seo_redirect'] != ''){
			if(substr($alias['domain'], 0, 2) === '*.'){
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
			} else {
			$tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
			}
			if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
			$alias_seo_redirects2[] = $tmp_seo_redirects;
			}
			}
			$rewrite_rules[] = array( 'rewrite_domain' => $domain_rule,
			'rewrite_type' => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
			'rewrite_target' => $alias['redirect_path'],
			'rewrite_subdir' => $rewrite_subdir,
			'proxy_directives' => $final_proxy_directives,
			'use_rewrite' => ($alias['redirect_type'] == 'proxy' ? false:true),
			'use_proxy' => ($alias['redirect_type'] == 'proxy' ? true:false),
			'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
			}
			}
			}
			@@ -1132,9 +1423,18 @@
			if(count($rewrite_rules) > 0) {
			$tpl->setLoop('redirects',$rewrite_rules);
			}
			if(count($own_rewrite_rules) > 0) {
			$tpl->setLoop('own_redirects',$own_rewrite_rules);
			}
			if(count($local_rewrite_rules) > 0) {
			$tpl->setLoop('local_redirects',$local_rewrite_rules);
			}
			if(count($alias_seo_redirects) > 0) {
			$tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
			}

			//* Create basic http auth for website statistics
			$tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/.htpasswd_stats");
			$tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/web/stats/.htpasswd_stats");

			// Create basic http auth for other directories
			$basic_auth_locations = $this->_create_web_folder_auth_configuration($data['new']);
			@@ -1145,7 +1445,7 @@
			if(file_exists($vhost_file)) copy($vhost_file,$vhost_file.'~');

			//* Write vhost file
			file_put_contents($vhost_file,$this->nginx_merge_locations($tpl->grab()));
			$app->system->file_put_contents($vhost_file,$this->nginx_merge_locations($tpl->grab()));
			$app->log('Writing the vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
			unset($tpl);

			@@ -1202,11 +1502,11 @@
			}

			// create password file for stats directory
			if(!is_file($data['new']['document_root'].'/.htpasswd_stats') \|\| $data['new']['stats_password'] != $data['old']['stats_password']) {
			if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') \|\| $data['new']['stats_password'] != $data['old']['stats_password']) {
			if(trim($data['new']['stats_password']) != '') {
			$htp_file = 'admin:'.trim($data['new']['stats_password']);
			file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
			chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
			$app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
			$app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0755);
			unset($htp_file);
			}
			}
			@@ -1233,14 +1533,48 @@
			$app->log('nginx online status after restart is: '.$nginx_online_status_after_restart,LOGLEVEL_DEBUG);
			if($nginx_online_status_before_restart && !$nginx_online_status_after_restart) {
			$app->log('nginx did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
			copy($vhost_file,$vhost_file.'.err');
			$app->system->copy($vhost_file,$vhost_file.'.err');
			if(is_file($vhost_file.'~')) {
			//* Copy back the last backup file
			$app->system->copy($vhost_file.'~',$vhost_file);
			} else {
			//* There is no backup file, so we create a empty vhost file with a warning message inside
			file_put_contents($vhost_file,"# nginx did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
			$app->system->file_put_contents($vhost_file,"# nginx did not start after modifying this vhost file.\n# Please check file $vhost_file.err for syntax errors.");
			}

			if($this->ssl_certificate_changed === true) {

			$ssl_dir = $data['new']['document_root'].'/ssl';
			$domain = $data['new']['ssl_domain'];
			$key_file = $ssl_dir.'/'.$domain.'.key.org';
			$key_file2 = $ssl_dir.'/'.$domain.'.key';
			$csr_file = $ssl_dir.'/'.$domain.'.csr';
			$crt_file = $ssl_dir.'/'.$domain.'.crt';
			//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';

			//* Backup the files that might have caused the error
			if(is_file($key_file)){
			$app->system->copy($key_file,$key_file.'.err');
			$app->system->chmod($key_file.'.err',0400);
			}
			if(is_file($key_file2)){
			$app->system->copy($key_file2,$key_file2.'.err');
			$app->system->chmod($key_file2.'.err',0400);
			}
			if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
			if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
			//if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');

			//* Restore the ~ backup files
			if(is_file($key_file.'~')) $app->system->copy($key_file.'~',$key_file);
			if(is_file($key_file2.'~')) $app->system->copy($key_file2.'~',$key_file2);
			if(is_file($crt_file.'~')) $app->system->copy($crt_file.'~',$crt_file);
			if(is_file($csr_file.'~')) $app->system->copy($csr_file.'~',$csr_file);
			//if(is_file($bundle_file.'~')) $app->system->copy($bundle_file.'~',$bundle_file);

			$app->log('nginx did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the SSL configuration. Saved non-working SSL files with .err extension.',LOGLEVEL_WARN);
			}

			$app->services->restartService('httpd','restart');
			}
			} else {
			@@ -1252,6 +1586,24 @@
			$app->services->restartServiceDelayed('httpd','reload');
			}
			}

			//* The vhost is written and apache has been restarted, so we
			// can reset the ssl changed var to false and cleanup some files
			$this->ssl_certificate_changed = false;

			$ssl_dir = $data['new']['document_root'].'/ssl';
			$domain = $data['new']['ssl_domain'];
			$key_file = $ssl_dir.'/'.$domain.'.key.org';
			$key_file2 = $ssl_dir.'/'.$domain.'.key';
			$csr_file = $ssl_dir.'/'.$domain.'.csr';
			$crt_file = $ssl_dir.'/'.$domain.'.crt';
			//$bundle_file = $ssl_dir.'/'.$domain.'.bundle';

			if(@is_file($key_file.'~')) $app->system->unlink($key_file.'~');
			if(@is_file($key2_file.'~')) $app->system->unlink($key2_file.'~');
			if(@is_file($crt_file.'~')) $app->system->unlink($crt_file.'~');
			if(@is_file($csr_file.'~')) $app->system->unlink($csr_file.'~');
			//if(@is_file($bundle_file.'~')) $app->system->unlink($bundle_file.'~');

			// Remove the backup copy of the config file.
			if(@is_file($vhost_file.'~')) $app->system->unlink($vhost_file.'~');
			@@ -1268,6 +1620,8 @@
			$app->uses('getconf');
			$app->uses('system');
			$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');

			$app->system->web_folder_protection($data['old']['document_root'],false);

			//* Check if this is a chrooted setup
			if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
			@@ -1275,6 +1629,24 @@
			} else {
			$nginx_chrooted = false;
			}

			//* Remove the mounts
			$log_folder = 'log';
			$web_folder = '';
			if($data['old']['type'] == 'vhostsubdomain') {
			$tmp = $app->db->queryOneRecord('SELECT `domain`,`document_root` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
			$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
			if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
			$web_folder = $data['old']['web_folder'];
			$log_folder .= '/' . $subdomain_host;
			unset($tmp);
			}

			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));

			//* remove mountpoint from fstab
			$fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
			$app->system->removeLine('/etc/fstab',$fstab_line);

			if($data['old']['type'] != 'vhost' && $data['old']['type'] != 'vhostsubdomain' && $data['old']['parent_domain_id'] > 0) {
			//* This is a alias domain or subdomain, so we have to update the website instead
			@@ -1310,9 +1682,67 @@
			$app->system->unlink($vhost_file);
			$app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);

			if($data['old']['type'] == 'vhost') {
			if($data['old']['type'] == 'vhost' \|\| $data['old']['type'] == 'vhostsubdomain') {
			$docroot = escapeshellcmd($data['old']['document_root']);
			if($docroot != '' && !stristr($docroot,'..')) exec('rm -rf '.$docroot);
			if($docroot != '' && !stristr($docroot,'..')) {
			if($data['old']['type'] == 'vhost') {
			// this is a vhost - we delete everything in here.
			exec('rm -rf '.$docroot);
			} elseif(!stristr($data['old']['web_folder'], '..')) {
			// this is a vhost subdomain
			// IMPORTANT: do some folder checks before we delete this!
			$do_delete = true;
			$delete_folder = preg_replace('/[\/]{2,}/', '/', $web_folder); // replace / occuring multiple times
			if(substr($delete_folder, 0, 1) === '/') $delete_folder = substr($delete_folder, 1);
			if(substr($delete_folder, -1) === '/') $delete_folder = substr($delete_folder, 0, -1);

			$path_elements = explode('/', $delete_folder);

			if($path_elements[0] == 'web' \|\| $path_elements[0] === '') {
			// paths beginning with /web should NEVER EVER be deleted, empty paths should NEVER occur - but for safety reasons we check it here!
			// we use strict check as otherwise directories named '0' may not be deleted
			$do_delete = false;
			} else {
			// read all vhost subdomains with same parent domain
			$used_paths = array();
			$tmp = $app->db->queryAllRecords("SELECT `web_folder` FROM web_domain WHERE type = 'vhostsubdomain' AND parent_domain_id = ".intval($data['old']['parent_domain_id'])." AND domain_id != ".intval($data['old']['domain_id']));
			foreach($tmp as $tmprec) {
			// we normalize the folder entries because we need to compare them
			$tmp_folder = preg_replace('/[\/]{2,}/', '/', $tmprec['web_folder']); // replace / occuring multiple times
			if(substr($tmp_folder, 0, 1) === '/') $tmp_folder = substr($tmp_folder, 1);
			if(substr($tmp_folder, -1) === '/') $tmp_folder = substr($tmp_folder, 0, -1);

			// add this path and it's parent paths to used_paths array
			while(strpos($tmp_folder, '/') !== false) {
			if(in_array($tmp_folder, $used_paths) == false) $used_paths[] = $tmp_folder;
			$tmp_folder = substr($tmp_folder, 0, strrpos($tmp_folder, '/'));
			}
			if(in_array($tmp_folder, $used_paths) == false) $used_paths[] = $tmp_folder;
			}
			unset($tmp);

			// loop and check if the path is still used and stop at first used one
			// set do_delete to false so nothing gets deleted if the web_folder itself is still used
			$do_delete = false;
			while(count($path_elements) > 0) {
			$tmp_folder = implode('/', $path_elements);
			if(in_array($tmp_folder, $used_paths) == true) break;

			// this path is not used - set it as path to delete, strip the last element from the array and set do_delete to true
			$delete_folder = $tmp_folder;
			$do_delete = true;
			array_pop($path_elements);
			}
			unset($tmp_folder);
			unset($used_paths);
			}

			if($do_delete === true && $delete_folder !== '') exec('rm -rf '.$docroot.'/'.$delete_folder);

			unset($delete_folder);
			unset($path_elements);
			}
			}

			//remove the php fastgi starter script if available
			if ($data['old']['php'] == 'fast-cgi') {
			@@ -1400,6 +1830,9 @@
			$app->services->restartServiceDelayed('httpd','reload');

			}


			if($data['old']['type'] != 'vhost') $app->system->web_folder_protection($data['old']['document_root'],true);
			}

			//* This function is called when a IP on the server is inserted, updated or deleted
			@@ -1651,7 +2084,11 @@
			}

			if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
			$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
			if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
			$app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
			} else {
			$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
			}
			}

			//* Delete the awstats configuration file
			@@ -1763,27 +2200,31 @@
			$ini_settings = explode("\n", $custom_php_ini_settings);
			if(is_array($ini_settings) && !empty($ini_settings)){
			foreach($ini_settings as $ini_setting){
			list($key, $value) = explode('=', $ini_setting);
			if($value){
			$value = escapeshellcmd(trim($value));
			$key = escapeshellcmd(trim($key));
			switch (strtolower($value)) {
			case '0':
			// PHP-FPM might complain about invalid boolean value if you use 0
			$value = 'off';
			case '1':
			case 'on':
			case 'off':
			case 'true':
			case 'false':
			case 'yes':
			case 'no':
			$final_php_ini_settings[] = array('ini_setting' => 'php_admin_flag['.$key.'] = '.$value);
			break;
			default:
			$final_php_ini_settings[] = array('ini_setting' => 'php_admin_value['.$key.'] = '.$value);
			}
			$ini_setting = trim($ini_setting);
			if(substr($ini_setting,0,1) == ';') continue;
			if(substr($ini_setting,0,1) == '#') continue;
			if(substr($ini_setting,0,2) == '//') continue;
			list($key, $value) = explode('=', $ini_setting);
			if($value){
			$value = trim($value);
			$key = trim($key);
			switch (strtolower($value)) {
			case '0':
			// PHP-FPM might complain about invalid boolean value if you use 0
			$value = 'off';
			case '1':
			case 'on':
			case 'off':
			case 'true':
			case 'false':
			case 'yes':
			case 'no':
			$final_php_ini_settings[] = array('ini_setting' => 'php_admin_flag['.$key.'] = '.$value);
			break;
			default:
			$final_php_ini_settings[] = array('ini_setting' => 'php_admin_value['.$key.'] = '.$value);
			}
			}
			}
			}
			}
			@@ -1889,14 +2330,44 @@

			$lines = explode("\n", $vhost_conf);

			// if whole location block is in one line, split it up into multiple lines
			if(is_array($lines) && !empty($lines)){
			$linecount = sizeof($lines);
			for($h=0;$h<$linecount;$h++){
			$lines[$h] = rtrim($lines[$h]);
			if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], ';') !== false){
			$lines[$h] = str_replace("{", "{\n", $lines[$h]);
			$lines[$h] = str_replace(";", ";\n", $lines[$h]);
			if(strpos($lines[$h], '##merge##') !== false){
			$lines[$h] = str_replace('##merge##', '', $lines[$h]);
			$lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
			}
			}
			if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], '}') !== false && strpos($lines[$h], ';') === false){
			$lines[$h] = str_replace("{", "{\n", $lines[$h]);
			if(strpos($lines[$h], '##merge##') !== false){
			$lines[$h] = str_replace('##merge##', '', $lines[$h]);
			$lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1);
			}
			}
			}
			}
			$vhost_conf = implode("\n", $lines);
			unset($lines);
			unset($linecount);

			$lines = explode("\n", $vhost_conf);

			if(is_array($lines) && !empty($lines)){
			$locations = array();
			$islocation = false;
			$linecount = sizeof($lines);
			$server_count = 0;

			for($i=0;$i<$linecount;$i++){
			$l = trim($lines[$i]);
			if(substr($l, 0, 8) == 'server {') $server_count += 1;
			if($server_count > 1) break;
			if(substr($l, 0, 8) == 'location' && !$islocation){

			$islocation = true;
			@@ -1956,7 +2427,7 @@
			$vhost_conf = implode("\n", $lines);
			}

			return $vhost_conf;
			return trim($vhost_conf);
			}

			function client_delete($event_name,$data) {
			@@ -1970,6 +2441,17 @@

			$client_dir = $web_config['website_basedir'].'/clients/client'.$client_id;
			if(is_dir($client_dir) && !stristr($client_dir,'..')) {
			// remove symlinks from $client_dir
			$files = array_diff(scandir($client_dir), array('.','..'));
			if(is_array($files) && !empty($files)){
			foreach($files as $file){
			if(is_link($client_dir.'/'.$file)){
			unlink($client_dir.'/'.$file);
			$app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG);
			}
			}
			}

			@rmdir($client_dir);
			$app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
			}
			@@ -1998,7 +2480,145 @@
			return false;
			}
			}

			public function create_relative_link($f, $t) {
			global $app;
			// $from already exists
			$from = realpath($f);

			// realpath requires the traced file to exist - so, lets touch it first, then remove
			@$app->system->unlink($t); touch($t);
			$to = realpath($t);
			@$app->system->unlink($t);

			// Remove from the left side matching path elements from $from and $to
			// and get path elements counts
			$a1 = explode('/', $from); $a2 = explode('/', $to);
			for ($c = 0; $a1[$c] == $a2[$c]; $c++) {
			unset($a1[$c]); unset($a2[$c]);
			}
			$cfrom = implode('/', $a1);

			// Check if a path is fully a subpath of another - no way to create symlink in the case
			if (count($a1) == 0 \|\| count($a2) == 0) return false;

			// Add ($cnt_to-1) number of "../" elements to left side of $cfrom
			for ($c = 0; $c < (count($a2)-1); $c++) { $cfrom = '../'.$cfrom; }

			return symlink($cfrom, $to);
			}

			private function _rewrite_quote($string) {
			return str_replace(array('.', '', '?', '+'), array('\\.', '\\', '\\?', '\\+'), $string);
			}

			private function url_is_local($hostname, $domain_id){
			global $app;

			// ORDER BY clause makes sure wildcard subdomains (*) are listed last in the result array so that we can find direct matches first
			$webs = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' ORDER BY subdomain ASC");
			if(is_array($webs) && !empty($webs)){
			foreach($webs as $web){
			// web domain doesn't match hostname
			if(substr($hostname,-strlen($web['domain'])) != $web['domain']) continue;
			// own vhost and therefore server {} container of its own
			//if($web['type'] == 'vhostsubdomain') continue;
			// alias domains/subdomains using rewrites and therefore a server {} container of their own
			//if(($web['type'] == 'alias' \|\| $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') continue;

			if($web['subdomain'] == '*'){
			$pattern = '/\.?'.str_replace('.', '\.', $web['domain']).'$/i';
			}
			if($web['subdomain'] == 'none'){
			if($web['domain'] == $hostname){
			if($web['domain_id'] == $domain_id \|\| $web['parent_domain_id'] == $domain_id){
			// own vhost and therefore server {} container of its own
			if($web['type'] == 'vhostsubdomain') return false;
			// alias domains/subdomains using rewrites and therefore a server {} container of their own
			if(($web['type'] == 'alias' \|\| $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
			return true;
			} else {
			return false;
			}
			}
			$pattern = '/^'.str_replace('.', '\.', $web['domain']).'$/i';
			}
			if($web['subdomain'] == 'www'){
			if($web['domain'] == $hostname \|\| $web['subdomain'].'.'.$web['domain'] == $hostname){
			if($web['domain_id'] == $domain_id \|\| $web['parent_domain_id'] == $domain_id){
			// own vhost and therefore server {} container of its own
			if($web['type'] == 'vhostsubdomain') return false;
			// alias domains/subdomains using rewrites and therefore a server {} container of their own
			if(($web['type'] == 'alias' \|\| $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
			return true;
			} else {
			return false;
			}
			}
			$pattern = '/^(www\.)?'.str_replace('.', '\.', $web['domain']).'$/i';
			}
			if(preg_match($pattern, $hostname)){
			if($web['domain_id'] == $domain_id \|\| $web['parent_domain_id'] == $domain_id){
			// own vhost and therefore server {} container of its own
			if($web['type'] == 'vhostsubdomain') return false;
			// alias domains/subdomains using rewrites and therefore a server {} container of their own
			if(($web['type'] == 'alias' \|\| $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
			return true;
			} else {
			return false;
			}
			}
			}
			}

			return false;
			}

			private function get_seo_redirects($web, $prefix = '', $force_subdomain = false){
			// $force_subdomain = 'none\|www'
			$seo_redirects = array();

			if(substr($web['domain'], 0, 2) === '.') $web['subdomain'] = '';

			if(($web['subdomain'] == 'www' \|\| $web['subdomain'] == '*') && $force_subdomain != 'www'){
			if($web['seo_redirect'] == 'non_www_to_www'){
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '=';
			}
			if($web['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
			// ^(example\.com\|(?!\bwww\b)\.example\.com)$
			// ^(example\.com\|((?:\w+(?:-\w+)\.))((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^('.str_replace('.', '\.', $web['domain']).'\|((?:\w+(?:-\w+)\.))((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $web['domain']).'))$';
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
			}
			if($web['seo_redirect'] == '*_to_www_domain_tld'){
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
			}
			}
			if($force_subdomain != 'none'){
			if($web['seo_redirect'] == 'www_to_non_www'){
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '=';
			}
			if($web['seo_redirect'] == '*_domain_tld_to_domain_tld'){
			// ^(.+)\.example\.com$
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^(.+)\.'.str_replace('.', '\.', $web['domain']).'$';
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
			}
			if($web['seo_redirect'] == '*_to_domain_tld'){
			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
			$seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
			}
			}
			return $seo_redirects;
			}

			} // end class