gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -53,15 +53,24 @@
			}

			public function warning($msg) {
			echo('WARNING: '.$msg."\n");
			echo 'WARNING: '.$msg."\n";
			}

			public function simple_query($query, $answers, $default) {
			public function simple_query($query, $answers, $default, $name = '') {
			global $autoinstall;
			$finished = false;
			do {
			$answers_str = implode(',', $answers);
			swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
			$input = sread();
			if($name != '' && $autoinstall[$name] != '') {
			if($autoinstall[$name] == 'default') {
			$input = $default;
			} else {
			$input = $autoinstall[$name];
			}
			} else {
			$answers_str = implode(',', $answers);
			swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
			$input = sread();
			}

			//* Stop the installation
			if($input == 'quit') {
			@@ -86,9 +95,18 @@
			return $answer;
			}

			public function free_query($query,$default) {
			swrite($this->lng($query).' ['.$default.']: ');
			$input = sread();
			public function free_query($query, $default, $name = '') {
			global $autoinstall;
			if($name != '' && $autoinstall[$name] != '') {
			if($autoinstall[$name] == 'default') {
			$input = $default;
			} else {
			$input = $autoinstall[$name];
			}
			} else {
			swrite($this->lng($query).' ['.$default.']: ');
			$input = sread();
			}

			//* Stop the installation
			if($input == 'quit') {
			@@ -141,6 +159,8 @@
			}

			/** Create the database for ISPConfig */


			public function configure_database() {
			global $conf;

			@@ -159,10 +179,10 @@
			} else {
			if($conf['mysql']['admin_password'] == '') {
			caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
			} else {
			caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
			}
			$db_tables = $this->db->getTables();
			if(count($db_tables) == 0) {
			@@ -194,8 +214,8 @@

			//* Create the ISPConfig database user in the local database
			$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$conf['mysql']['database'].".* "
			."TO '".$conf['mysql']['ispconfig_user']."'@'".$from_host."' "
			."IDENTIFIED BY '".$conf['mysql']['ispconfig_password']."';";
			."TO '".$conf['mysql']['ispconfig_user']."'@'".$from_host."' "
			."IDENTIFIED BY '".$conf['mysql']['ispconfig_password']."';";
			if(!$this->db->query($query)) {
			$this->error('Unable to create database user: '.$conf['mysql']['ispconfig_user'].' Error: '.$this->db->errorMessage);
			}
			@@ -215,6 +235,7 @@
			$tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
			$tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
			$tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];
			$tpl_ini_array['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin'];
			$tpl_ini_array['server']['hostname'] = $conf['hostname'];
			$tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
			$tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
			@@ -359,140 +380,148 @@
			}

			if(count($hosts) > 0) {
			foreach($hosts as $host => $value) {
			/*
			foreach($hosts as $host => $value) {
			/*
			* If a pwd exists, this means, we have to add the new user (and his pwd).
			* if not, the user already exists and we do not need the pwd
			*/
			if ($value['pwd'] != ''){
			$query = "CREATE USER '".$value['user']."'@'".$host."' IDENTIFIED BY '" . $value['pwd'] . "'";
			if ($value['pwd'] != ''){
			$query = "CREATE USER '".$value['user']."'@'".$host."' IDENTIFIED BY '" . $value['pwd'] . "'";
			if ($verbose){
			echo "\n\n" . $query ."\n";
			}
			$this->dbmaster->query($query); // ignore the error
			}

			/*
			* Try to delete all rights of the user in case that it exists.
			* In Case that it will not exist, do nothing (ignore the error!)
			*/
			$query = "REVOKE ALL PRIVILEGES, GRANT OPTION FROM '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo "\n\n" . $query ."\n";
			}
			$this->dbmaster->query($query); // ignore the error

			//* Create the ISPConfig database user in the remote database
			$query = "GRANT SELECT ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT ON ".$value['db'].".`sys_log` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`status`, `error`) ON ".$value['db'].".`sys_datalog` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`status`) ON ".$value['db'].".`software_update_inst` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`updated`) ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT ON ".$value['db'].".`sys_group` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE (`action_state`, `response`) ON ".$value['db'].".`sys_remoteaction` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT , DELETE ON ".$value['db'].".`monitor_data` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`mail_traffic` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`web_traffic` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE, DELETE ON ".$value['db'].".`aps_instances` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, DELETE ON ".$value['db'].".`aps_instances_settings` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`web_backup` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			}

			/*
			* Try to delete all rights of the user in case that it exists.
			* In Case that it will not exist, do nothing (ignore the error!)
			*/
			$query = "REVOKE ALL PRIVILEGES, GRANT OPTION FROM '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo "\n\n" . $query ."\n";
			}
			$this->dbmaster->query($query); // ignore the error

			//* Create the ISPConfig database user in the remote database
			$query = "GRANT SELECT ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT ON ".$value['db'].".`sys_log` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`status`) ON ".$value['db'].".`sys_datalog` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`status`) ON ".$value['db'].".`software_update_inst` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE(`updated`) ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT ON ".$value['db'].".`sys_group` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE (`action_state`, `response`) ON ".$value['db'].".`sys_remoteaction` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT , DELETE ON ".$value['db'].".`monitor_data` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`mail_traffic` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`web_traffic` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, UPDATE ON ".$value['db'].".`aps_instances` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			$query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`web_backup` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}

			}

			/*
			* It is all done. Relod the rights...
			*/
			$this->dbmaster->query('FLUSH PRIVILEGES;');
			$this->dbmaster->query('FLUSH PRIVILEGES;');
			}

			}
			@@ -507,7 +536,7 @@
			if(is_file($full_file_name)) {
			copy($full_file_name, $config_dir.$configfile.'~');
			}
			$content = rf('tpl/'.$configfile.'.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			@@ -528,8 +557,16 @@
			if(is_file($config_dir.'/'.$jk_init)) copy($config_dir.'/'.$jk_init, $config_dir.'/'.$jk_init.'~');
			if(is_file($config_dir.'/'.$jk_chrootsh.'.master')) copy($config_dir.'/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh.'~');

			copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
			copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$jk_init.'.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
			} else {
			copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
			}
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$jk_chrootsh.'.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
			} else {
			copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
			}
			}

			//* help jailkit fo find its ini files
			@@ -549,7 +586,7 @@
			}

			// load files
			$content = rf('tpl/mm_cfg.py.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mm_cfg.py.master', 'tpl/mm_cfg.py.master');
			$old_file = rf($full_file_name);

			$old_options = array();
			@@ -574,13 +611,13 @@
			$domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");

			if(is_array($domainAll)) {
			foreach($domainAll as $domain)
			{
			if ($domainAll[0]['domain'] == $domain['domain'])
			$virtual_domains .= "'".$domain['domain']."'";
			else
			$virtual_domains .= ", '".$domain['domain']."'";
			}
			foreach($domainAll as $domain)
			{
			if ($domainAll[0]['domain'] == $domain['domain'])
			$virtual_domains .= "'".$domain['domain']."'";
			else
			$virtual_domains .= ", '".$domain['domain']."'";
			}
			}
			}
			else
			@@ -592,10 +629,34 @@
			$content = str_replace('{virtual_domains}', $virtual_domains, $content);

			wf($full_file_name, $content);

			//* Write virtual_to_transport.sh script
			$config_dir = $conf['mailman']['config_dir'].'/';
			$full_file_name = $config_dir.'virtual_to_transport.sh';

			//* Backup exiting virtual_to_transport.sh script
			if(is_file($full_file_name)) {
			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
			}

			if(is_dir('/etc/mailman')) {
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh', $full_file_name);
			} else {
			copy('tpl/mailman-virtual_to_transport.sh', $full_file_name);
			}
			chgrp($full_file_name, 'list');
			chmod($full_file_name, 0755);
			}

			//* Create aliasaes
			exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
			if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');

			}

			public function configure_postfix($options = '') {
			global $conf;
			global $conf,$autoinstall;
			$cf = $conf['postfix'];
			$config_dir = $cf['config_dir'];

			@@ -635,9 +696,9 @@

			//* Changing mode and group of the new created config files.
			caselog('chmod o= '.$config_dir.'/mysql-virtual_.cf &> /dev/null',
			__FILE__, __LINE__, 'chmod on mysql-virtual_.cf', 'chmod on mysql-virtual_.cf failed');
			__FILE__, __LINE__, 'chmod on mysql-virtual_.cf', 'chmod on mysql-virtual_.cf failed');
			caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_.cf &> /dev/null',
			__FILE__, __LINE__, 'chgrp on mysql-virtual_.cf', 'chgrp on mysql-virtual_.cf failed');
			__FILE__, __LINE__, 'chgrp on mysql-virtual_.cf', 'chgrp on mysql-virtual_.cf failed');

			//* Creating virtual mail user and group
			$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
			@@ -647,14 +708,14 @@
			if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* These postconf commands will be executed on installation and update
			$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
			$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM `" . $this->db->quote($conf["mysql"]["database"]) . "`.`server` WHERE server_id = ".$conf['server_id']);
			$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
			unset($server_ini_rec);

			//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removeal after an update
			$rbl_list = '';
			if (@isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
			$rbl_hosts = explode(",",str_replace(" ", "", $server_ini_array['mail']['realtime_blackhole_list']));
			$rbl_hosts = explode(",", str_replace(" ", "", $server_ini_array['mail']['realtime_blackhole_list']));
			foreach ($rbl_hosts as $key => $value) {
			$rbl_list .= ", reject_rbl_client ". $value;
			}
			@@ -662,49 +723,23 @@
			unset($rbl_hosts);
			unset($server_ini_array);

			$postconf_commands = array (
			'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
			'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
			'virtual_alias_domains =',
			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, proxy:mysql:'.$config_dir.'/mysql-virtual_email2email.cf, hash:/var/lib/mailman/data/virtual-mailman',
			'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
			'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
			'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
			'virtual_uid_maps = static:'.$cf['vmail_userid'],
			'virtual_gid_maps = static:'.$cf['vmail_groupid'],
			'inet_protocols=all',
			'smtpd_sasl_auth_enable = yes',
			'broken_sasl_auth_clients = yes',
			'smtpd_sasl_authenticated_header = yes',
			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination'. $rbl_list,
			'smtpd_use_tls = yes',
			'smtpd_tls_security_level = may',
			'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
			'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
			'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
			'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
			'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
			'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
			'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
			'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
			'smtpd_client_message_rate_limit = 100',
			'maildrop_destination_concurrency_limit = 1',
			'maildrop_destination_recipient_limit = 1',
			'virtual_transport = maildrop',
			'header_checks = regexp:'.$config_dir.'/header_checks',
			'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
			'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
			'body_checks = regexp:'.$config_dir.'/body_checks',
			'owner_request_special = no'
			);
			$postconf_placeholders = array('{config_dir}' => $config_dir,
			'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
			'{vmail_userid}' => $cf['vmail_userid'],
			'{vmail_groupid}' => $cf['vmail_groupid'],
			'{rbl_list}' => $rbl_list);

			$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
			$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
			$postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines

			//* These postconf commands will be executed on installation only
			if($this->is_update == false) {
			$postconf_commands = array_merge($postconf_commands,array(
			'myhostname = '.$conf['hostname'],
			'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
			'mynetworks = 127.0.0.0/8 [::1]/128'
			));
			$postconf_commands = array_merge($postconf_commands, array(
			'myhostname = '.$conf['hostname'],
			'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
			'mynetworks = 127.0.0.0/8 [::1]/128'
			));
			}

			//* Create the header and body check files
			@@ -714,11 +749,13 @@
			touch($config_dir.'/body_checks');

			//* Create the mailman files
			exec('mkdir -p /var/lib/mailman/data');
			if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
			if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
			exec('postalias /var/lib/mailman/data/aliases');
			if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
			exec('postmap /var/lib/mailman/data/virtual-mailman');
			if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
			exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');

			//* Make a backup copy of the main.cf file
			copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
			@@ -729,10 +766,15 @@
			caselog($command." &> /dev/null", __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
			}

			if(!stristr($options,'dont-create-certs')) {
			if(!stristr($options, 'dont-create-certs')) {
			//* Create the SSL certificate
			$command = 'cd '.$config_dir.'; '
			if(AUTOINSTALL){
			$command = 'cd '.$config_dir.'; '
			."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
			} else {
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
			}
			exec($command);

			$command = 'chmod o= '.$config_dir.'/smtpd.key';
			@@ -753,8 +795,8 @@
			$configfile = $config_dir.'/master.cf';
			$content = rf($configfile);
			$content = str_replace('flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}',
			'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);
			'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);
			wf($configfile, $content);

			//* Writing the Maildrop mailfilter file
			@@ -762,7 +804,7 @@
			if(is_file($cf['vmail_mailbox_base'].'/.'.$configfile)) {
			copy($cf['vmail_mailbox_base'].'/.'.$configfile, $cf['vmail_mailbox_base'].'/.'.$configfile.'~');
			}
			$content = rf('tpl/'.$configfile.'.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
			wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);

			@@ -785,8 +827,8 @@
			global $conf;

			//* Get saslsauthd version
			exec('saslauthd -v 2>&1',$out);
			$parts = explode(' ',$out[0]);
			exec('saslauthd -v 2>&1', $out);
			$parts = explode(' ', $out[0]);
			$saslversion = $parts[1];
			unset($parts);
			unset($out);
			@@ -799,14 +841,14 @@
			$configfile = 'sasl_smtpd.conf';
			}

			if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
			if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf', $conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
			if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
			wf($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
			wf($conf['postfix']['config_dir'].'/sasl/smtpd.conf', $content);

			// TODO: Chmod and chown on the config file

			@@ -816,21 +858,21 @@

			// Edit the file /etc/default/saslauthd
			$configfile = $conf['saslauthd']['config'];
			if(is_file($configfile)) copy($configfile,$configfile.'~');
			if(is_file($configfile)) copy($configfile, $configfile.'~');
			if(is_file($configfile.'~')) chmod($configfile.'~', 0400);
			$content = rf($configfile);
			$content = str_replace('START=no','START=yes',$content);
			$content = str_replace('START=no', 'START=yes', $content);
			// Debian
			$content = str_replace('OPTIONS="-c"','OPTIONS="-m /var/spool/postfix/var/run/saslauthd -r"',$content);
			$content = str_replace('OPTIONS="-c"', 'OPTIONS="-m /var/spool/postfix/var/run/saslauthd -r"', $content);
			// Ubuntu
			$content = str_replace('OPTIONS="-c -m /var/run/saslauthd"','OPTIONS="-c -m /var/spool/postfix/var/run/saslauthd -r"',$content);
			wf($configfile,$content);
			$content = str_replace('OPTIONS="-c -m /var/run/saslauthd"', 'OPTIONS="-c -m /var/spool/postfix/var/run/saslauthd -r"', $content);
			wf($configfile, $content);

			// Edit the file /etc/init.d/saslauthd
			$configfile = $conf['init_scripts'].'/'.$conf['saslauthd']['init_script'];
			$content = rf($configfile);
			$content = str_replace('PIDFILE=$RUN_DIR/saslauthd.pid','PIDFILE="/var/spool/postfix/var/run/${NAME}/saslauthd.pid"',$content);
			wf($configfile,$content);
			$content = str_replace('PIDFILE=$RUN_DIR/saslauthd.pid', 'PIDFILE="/var/spool/postfix/var/run/${NAME}/saslauthd.pid"', $content);
			wf($configfile, $content);

			// add the postfix user to the sasl group (at least necessary for Ubuntu 8.04 and most likely Debian Lenny as well.
			exec('adduser postfix sasl');
			@@ -846,7 +888,7 @@
			if(is_file($pam.'/smtp')) copy($pam.'/smtp', $pam.'/smtp~');
			if(is_file($pam.'/smtp~')) chmod($pam.'/smtp~', 0400);

			$content = rf('tpl/'.$configfile.'.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			@@ -869,11 +911,11 @@
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			chmod($config_dir.'/'.$configfile.'~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
			wf($config_dir.'/'.$configfile, $content);

			chmod($config_dir.'/'.$configfile, 0660);
			@@ -907,9 +949,9 @@
			}
			$content = rf($conf['postfix']['config_dir'].'/master.cf');
			// Only add the content if we had not addded it before
			if(!stristr($content,'dovecot/deliver')) {
			if(!stristr($content, 'dovecot/deliver')) {
			$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
			af($conf['postfix']['config_dir'].'/master.cf',$deliver_content);
			af($conf['postfix']['config_dir'].'/master.cf', $deliver_content);
			}
			unset($content);
			unset($deliver_content);
			@@ -918,14 +960,14 @@
			//* Reconfigure postfix to use dovecot authentication
			// Adding the amavisd commands to the postfix configuration
			$postconf_commands = array (
			'dovecot_destination_recipient_limit = 1',
			'virtual_transport = dovecot',
			'smtpd_sasl_type = dovecot',
			'smtpd_sasl_path = private/auth'
			'dovecot_destination_recipient_limit = 1',
			'virtual_transport = dovecot',
			'smtpd_sasl_type = dovecot',
			'smtpd_sasl_path = private/auth'
			);

			// Make a backup copy of the main.cf file
			copy($conf['postfix']['config_dir'].'/main.cf',$conf['postfix']['config_dir'].'/main.cf~3');
			copy($conf['postfix']['config_dir'].'/main.cf', $conf['postfix']['config_dir'].'/main.cf~3');

			// Executing the postconf commands
			foreach($postconf_commands as $cmd) {
			@@ -940,17 +982,26 @@
			}

			//* Get the dovecot version
			exec('dovecot --version',$tmp);
			$parts = explode('.',trim($tmp[0]));
			exec('dovecot --version', $tmp);
			$parts = explode('.', trim($tmp[0]));
			$dovecot_version = $parts[0];
			unset($tmp);
			unset($parts);

			//* Copy dovecot configuration file
			if($dovecot_version == 2) {
			copy('tpl/debian_dovecot2.conf.master',$config_dir.'/'.$configfile);
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot2.conf.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
			} else {
			copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
			}
			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
			} else {
			copy('tpl/debian_dovecot.conf.master',$config_dir.'/'.$configfile);
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
			} else {
			copy('tpl/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
			}
			}

			//* dovecot-sql.conf
			@@ -959,16 +1010,20 @@
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			if(is_file($config_dir.'/'.$configfile.'~')) chmod($config_dir.'/'.$configfile.'~', 0400);
			$content = rf('tpl/debian_dovecot-sql.conf.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot-sql.conf.master', 'tpl/debian_dovecot-sql.conf.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
			$content = str_replace('{server_id}', $conf['server_id'], $content);
			wf($config_dir.'/'.$configfile, $content);

			chmod($config_dir.'/'.$configfile, 0600);
			chown($config_dir.'/'.$configfile, 'root');
			chgrp($config_dir.'/'.$configfile, 'root');

			// Dovecot shall ignore mounts in website directory
			if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");

			}

			@@ -977,15 +1032,15 @@

			// amavisd user config file
			$configfile = 'amavisd_user_config';
			if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy($conf['amavis']['config_dir'].'/conf.d/50-user',$conf['amavis']['config_dir'].'/50-user~');
			if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].'/50-user~');
			if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_port}',$conf['mysql']['port'],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
			wf($conf['amavis']['config_dir'].'/conf.d/50-user',$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
			$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
			wf($conf['amavis']['config_dir'].'/conf.d/50-user', $content);

			// TODO: chmod and chown on the config file

			@@ -1001,7 +1056,7 @@
			}

			// Make a backup copy of the main.cf file
			copy($conf['postfix']['config_dir'].'/main.cf',$conf['postfix']['config_dir'].'/main.cf~2');
			copy($conf['postfix']['config_dir'].'/main.cf', $conf['postfix']['config_dir'].'/main.cf~2');

			// Executing the postconf commands
			foreach($postconf_commands as $cmd) {
			@@ -1010,13 +1065,13 @@
			}

			// Append the configuration for amavisd to the master.cf file
			if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf',$conf['postfix']['config_dir'].'/master.cf~');
			if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~');
			$content = rf($conf['postfix']['config_dir'].'/master.cf');
			// Only add the content if we had not addded it before
			if(!stristr($content,'127.0.0.1:10025')) {
			if(!stristr($content, '127.0.0.1:10025')) {
			unset($content);
			$content = rf('tpl/master_cf_amavis.master');
			af($conf['postfix']['config_dir'].'/master.cf',$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
			af($conf['postfix']['config_dir'].'/master.cf', $content);
			}
			unset($content);

			@@ -1070,7 +1125,7 @@
			if(is_file($config_dir.'/'.$configfile.'~')) {
			chmod($config_dir.'/'.$configfile.'~', 0400);
			}
			$content = rf('tpl/pureftpd_mysql.conf.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/pureftpd_mysql.conf.master', 'tpl/pureftpd_mysql.conf.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			@@ -1087,13 +1142,14 @@
			exec('echo "yes" > '.$config_dir.'/conf/DisplayDotFiles');

			if(is_file('/etc/default/pure-ftpd-common')) {
			replaceLine('/etc/default/pure-ftpd-common','STANDALONE_OR_INETD=inetd','STANDALONE_OR_INETD=standalone',1,0);
			replaceLine('/etc/default/pure-ftpd-common','VIRTUALCHROOT=false','VIRTUALCHROOT=true',1,0);
			replaceLine('/etc/default/pure-ftpd-common', 'STANDALONE_OR_INETD=inetd', 'STANDALONE_OR_INETD=standalone', 1, 0);
			replaceLine('/etc/default/pure-ftpd-common', 'VIRTUALCHROOT=false', 'VIRTUALCHROOT=true', 1, 0);
			}

			if(is_file('/etc/inetd.conf')) {
			replaceLine('/etc/inetd.conf','/usr/sbin/pure-ftpd-wrapper','#ftp stream tcp nowait root /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper',0,0);
			if(is_file($conf['init_scripts'].'/'.'openbsd-inetd')) exec($conf['init_scripts'].'/'.'openbsd-inetd restart');
			replaceLine('/etc/inetd.conf', '/usr/sbin/pure-ftpd-wrapper', '#ftp stream tcp nowait root /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper', 0, 0);
			exec($this->getinitcommand('openbsd-inetd', 'restart'));
			//if(is_file($conf['init_scripts'].'/'.'openbsd-inetd')) exec($conf['init_scripts'].'/'.'openbsd-inetd restart');
			}

			if(!is_file('/etc/pure-ftpd/conf/DontResolve')) exec('echo "yes" > /etc/pure-ftpd/conf/DontResolve');
			@@ -1104,15 +1160,15 @@

			// configure pam for SMTP authentication agains the ispconfig database
			$configfile = 'mydns.conf';
			if(is_file($conf['mydns']['config_dir'].'/'.$configfile)) copy($conf['mydns']['config_dir'].'/'.$configfile,$conf['mydns']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['mydns']['config_dir'].'/'.$configfile)) copy($conf['mydns']['config_dir'].'/'.$configfile, $conf['mydns']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['mydns']['config_dir'].'/'.$configfile.'~')) chmod($conf['mydns']['config_dir'].'/'.$configfile.'~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content);
			$content = str_replace('{server_id}',$conf['server_id'],$content);
			wf($conf['mydns']['config_dir'].'/'.$configfile,$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
			$content = str_replace('{server_id}', $conf['server_id'], $content);
			wf($conf['mydns']['config_dir'].'/'.$configfile, $content);
			chmod($conf['mydns']['config_dir'].'/'.$configfile, 0600);
			chown($conf['mydns']['config_dir'].'/'.$configfile, 'root');
			chgrp($conf['mydns']['config_dir'].'/'.$configfile, 'root');
			@@ -1139,22 +1195,22 @@
			//* load the powerdns databse dump
			if($conf['mysql']['admin_password'] == '') {
			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
			} else {
			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
			__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
			}

			//* Create the powerdns config file
			$configfile = 'pdns.local';
			if(is_file($conf['powerdns']['config_dir'].'/'.$configfile)) copy($conf['powerdns']['config_dir'].'/'.$configfile,$conf['powerdns']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['powerdns']['config_dir'].'/'.$configfile)) copy($conf['powerdns']['config_dir'].'/'.$configfile, $conf['powerdns']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['powerdns']['config_dir'].'/'.$configfile.'~')) chmod($conf['powerdns']['config_dir'].'/'.$configfile.'~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{powerdns_database}',$conf['powerdns']['database'],$content);
			$content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content);
			wf($conf['powerdns']['config_dir'].'/'.$configfile,$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{powerdns_database}', $conf['powerdns']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
			wf($conf['powerdns']['config_dir'].'/'.$configfile, $content);
			chmod($conf['powerdns']['config_dir'].'/'.$configfile, 0600);
			chown($conf['powerdns']['config_dir'].'/'.$configfile, 'root');
			chgrp($conf['powerdns']['config_dir'].'/'.$configfile, 'root');
			@@ -1165,19 +1221,19 @@
			public function configure_bind() {
			global $conf;

			//* Check if the zonefile directory has a slash at the end
			$content=$conf['bind']['bind_zonefiles_dir'];
			if(substr($content,-1,1) != '/') {
			$content .= '/';
			//* Check if the zonefile directory has a slash at the end
			$content=$conf['bind']['bind_zonefiles_dir'];
			if(substr($content, -1, 1) != '/') {
			$content .= '/';
			}

			//* Create the slave subdirectory
			$content .= 'slave';
			if(!@is_dir($content)) mkdir($content, 0770, true);
			$content .= 'slave';
			if(!@is_dir($content)) mkdir($content, 0770, true);

			//* Chown the slave subdirectory to $conf['bind']['bind_user']
			chown($content, $conf['bind']['bind_user']);
			chgrp($content, $conf['bind']['bind_group']);
			//* Chown the slave subdirectory to $conf['bind']['bind_user']
			chown($content, $conf['bind']['bind_user']);
			chgrp($content, $conf['bind']['bind_group']);

			}

			@@ -1191,31 +1247,55 @@
			if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);

			if(is_file('/etc/suphp/suphp.conf')) {
			replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp="php:/usr/bin/php-cgi"',0);
			replaceLine('/etc/suphp/suphp.conf', 'php=php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
			//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
			replaceLine('/etc/suphp/suphp.conf','umask=0077','umask=0022',0);
			replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
			}

			if(is_file('/etc/apache2/sites-enabled/000-default')) {
			replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost ','NameVirtualHost :80',1,0);
			replaceLine('/etc/apache2/sites-available/000-default','<VirtualHost >','<VirtualHost :80>',1,0);
			replaceLine('/etc/apache2/sites-available/000-default', 'NameVirtualHost ', 'NameVirtualHost :80', 1, 0);
			replaceLine('/etc/apache2/sites-available/000-default', '<VirtualHost >', '<VirtualHost :80>', 1, 0);
			}

			if(is_file('/etc/apache2/ports.conf')) {
			// add a line "Listen 443" to ports conf if line does not exist
			replaceLine('/etc/apache2/ports.conf','Listen 443','Listen 443',1);
			replaceLine('/etc/apache2/ports.conf', 'Listen 443', 'Listen 443', 1);

			// Comment out the namevirtualhost lines, as they were added by ispconfig in ispconfig.conf file again
			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :80', '# NameVirtualHost :80', 1);
			replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost :443', '# NameVirtualHost :443', 1);
			}

			if(is_file('/etc/apache2/apache.conf')) {
			if(hasLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 1) == false) {
			if(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.conf', 1) == false && hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/', 1) == false) {
			replaceLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 'Include sites-enabled/', 1, 1);
			} elseif(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 1) == false) {
			replaceLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 'IncludeOptional sites-enabled/', 1, 1);
			}
			}
			}

			if(is_file('/etc/apache2/apache2.conf')) {
			if(hasLine('/etc/apache2/apache2.conf', 'Include sites-enabled/', 1) == false && hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/', 1) == false) {
			if(hasLine('/etc/apache2/apache2.conf', 'Include sites-enabled/*.conf', 1) == true) {
			replaceLine('/etc/apache2/apache2.conf', 'Include sites-enabled/*.conf', 'Include sites-enabled/', 1, 1);
			} elseif(hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 1) == true) {
			replaceLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 'IncludeOptional sites-enabled/', 1, 1);
			}
			}
			}

			//* Copy the ISPConfig configuration include
			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

			// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');

			$content = rf('tpl/apache_ispconfig.conf.master');
			$tpl = new tpl('apache_ispconfig.conf.master');
			$tpl->setVar('apache_version',getapacheversion());

			$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");

			$ip_addresses = array();

			if(is_array($records) && count($records) > 0) {
			foreach($records as $rec) {
			if($rec['ip_type'] == 'IPv6') {
			@@ -1223,42 +1303,44 @@
			} else {
			$ip_address = $rec['ip_address'];
			}
			$ports = explode(',',$rec['virtualhost_port']);
			$ports = explode(',', $rec['virtualhost_port']);
			if(is_array($ports)) {
			foreach($ports as $port) {
			$port = intval($port);
			if($port > 0 && $port < 65536 && $ip_address != '') {
			$content .= 'NameVirtualHost '.$ip_address.":".$port."\n";
			$ip_addresses[] = array('ip_address' => $ip_address, 'port' => $port);
			}
			}
			}
			}
			}

			$content .= "\n";
			wf($vhost_conf_dir.'/ispconfig.conf',$content);

			if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);

			wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());
			unset($tpl);

			if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.conf')) {
			symlink($vhost_conf_dir.'/ispconfig.conf',$vhost_conf_enabled_dir.'/000-ispconfig.conf');
			symlink($vhost_conf_dir.'/ispconfig.conf', $vhost_conf_enabled_dir.'/000-ispconfig.conf');
			}

			//* make sure that webalizer finds its config file when it is directly in /etc
			if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
			mkdir('/etc/webalizer');
			symlink('/etc/webalizer.conf','/etc/webalizer/webalizer.conf');
			symlink('/etc/webalizer.conf', '/etc/webalizer/webalizer.conf');
			}

			if(is_file('/etc/webalizer/webalizer.conf')) {
			// Change webalizer mode to incremental
			replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0);
			replaceLine('/etc/webalizer/webalizer.conf', '#IncrementalName', 'IncrementalName webalizer.current', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#Incremental', 'Incremental yes', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#HistoryName', 'HistoryName webalizer.hist', 0, 0);
			}

			// Check the awsatst script
			if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local','LogFormat=4','LogFormat=1',0,1);
			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl', '/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local', 'LogFormat=4', 'LogFormat=1', 0, 1);

			//* add a sshusers group
			$command = 'groupadd sshusers';
			@@ -1276,20 +1358,20 @@
			//* make sure that webalizer finds its config file when it is directly in /etc
			if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
			mkdir('/etc/webalizer');
			symlink('/etc/webalizer.conf','/etc/webalizer/webalizer.conf');
			symlink('/etc/webalizer.conf', '/etc/webalizer/webalizer.conf');
			}

			if(is_file('/etc/webalizer/webalizer.conf')) {
			// Change webalizer mode to incremental
			replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0);
			replaceLine('/etc/webalizer/webalizer.conf', '#IncrementalName', 'IncrementalName webalizer.current', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#Incremental', 'Incremental yes', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#HistoryName', 'HistoryName webalizer.hist', 0, 0);
			}

			// Check the awsatst script
			if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local','LogFormat=4','LogFormat=1',0,1);
			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl', '/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local', 'LogFormat=4', 'LogFormat=1', 0, 1);

			//* add a sshusers group
			$command = 'groupadd sshusers';
			@@ -1327,8 +1409,8 @@
			}

			public function configure_fail2ban() {
			// To Do
			}
			// To Do
			}

			public function configure_squid()
			{
			@@ -1338,13 +1420,13 @@
			$server_name = $row["server_name"];

			$configfile = 'squid.conf';
			if(is_file($conf["squid"]["config_dir"].'/'.$configfile)) copy($conf["squid"]["config_dir"].'/'.$configfile,$conf["squid"]["config_dir"].'/'.$configfile.'~');
			if(is_file($conf["squid"]["config_dir"].'/'.$configfile)) copy($conf["squid"]["config_dir"].'/'.$configfile, $conf["squid"]["config_dir"].'/'.$configfile.'~');
			if(is_file($conf["squid"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["squid"]["config_dir"].'/'.$configfile.'~');
			$content = rf("tpl/".$configfile.".master");
			$content = str_replace('{server_name}',$server_name,$content);
			$content = str_replace('{ip_address}',$ip_address, $content);
			$content = str_replace('{config_dir}',$conf['squid']['config_dir'], $content);
			wf($conf["squid"]["config_dir"].'/'.$configfile,$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/".$configfile.".master");
			$content = str_replace('{server_name}', $server_name, $content);
			$content = str_replace('{ip_address}', $ip_address, $content);
			$content = str_replace('{config_dir}', $conf['squid']['config_dir'], $content);
			wf($conf["squid"]["config_dir"].'/'.$configfile, $content);
			exec('chmod 600 '.$conf["squid"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
			}
			@@ -1370,7 +1452,11 @@
			if(is_dir('/etc/Bastille')) caselog('mv -f /etc/Bastille /etc/Bastille.backup', __FILE__, __LINE__);
			@mkdir('/etc/Bastille', 0700);
			if(is_dir('/etc/Bastille.backup/firewall.d')) caselog('cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/', __FILE__, __LINE__);
			caselog('cp -f tpl/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg', __FILE__, __LINE__);
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/bastille-firewall.cfg.master')) {
			caselog('cp -f ' . $conf['ispconfig_install_dir'].'/server/conf-custom/install/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg', __FILE__, __LINE__);
			} else {
			caselog('cp -f tpl/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg', __FILE__, __LINE__);
			}
			caselog('chmod 644 /etc/Bastille/bastille-firewall.cfg', __FILE__, __LINE__);
			$content = rf('/etc/Bastille/bastille-firewall.cfg');
			$content = str_replace('{DNS_SERVERS}', '', $content);
			@@ -1381,8 +1467,8 @@
			$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));

			if(trim($row['tcp_port']) != '' \|\| trim($row['udp_port']) != '') {
			$tcp_public_services = trim(str_replace(',',' ',$row['tcp_port']));
			$udp_public_services = trim(str_replace(',',' ',$row['udp_port']));
			$tcp_public_services = trim(str_replace(',', ' ', $row['tcp_port']));
			$udp_public_services = trim(str_replace(',', ' ', $row['udp_port']));
			} else {
			$tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000';
			$udp_public_services = '53';
			@@ -1426,21 +1512,21 @@

			//** Configure vlogger to use traffic logging to mysql (master) db
			$configfile = 'vlogger-dbi.conf';
			if(is_file($conf['vlogger']['config_dir'].'/'.$configfile)) copy($conf['vlogger']['config_dir'].'/'.$configfile,$conf['vlogger']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['vlogger']['config_dir'].'/'.$configfile)) copy($conf['vlogger']['config_dir'].'/'.$configfile, $conf['vlogger']['config_dir'].'/'.$configfile.'~');
			if(is_file($conf['vlogger']['config_dir'].'/'.$configfile.'~')) chmod($conf['vlogger']['config_dir'].'/'.$configfile.'~', 0400);
			$content = rf('tpl/'.$configfile.'.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			if($conf['mysql']['master_slave_setup'] == 'y') {
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['master_ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['master_database'],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['master_host'],$content);
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_server_ip}', $conf['mysql']['master_host'], $content);
			} else {
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
			}
			wf($conf['vlogger']['config_dir'].'/'.$configfile,$content);
			wf($conf['vlogger']['config_dir'].'/'.$configfile, $content);
			chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600);
			chown($conf['vlogger']['config_dir'].'/'.$configfile, 'root');
			chgrp($conf['vlogger']['config_dir'].'/'.$configfile, 'root');
			@@ -1463,7 +1549,8 @@
			if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
			//$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
			$command = 'usermod -a -G '.$apps_vhost_group.' '.$conf['apache']['user'];
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			if(!@is_dir($install_dir)){
			@@ -1478,36 +1565,46 @@
			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
			$apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];

			//* Get the apps vhost port
			if($this->is_update == true) {
			$conf['web']['apps_vhost_port'] = get_apps_vhost_port_number();
			}

			// Dont just copy over the virtualhost template but add some custom settings
			$content = rf('tpl/apache_apps.vhost.master');

			$content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content);
			$content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
			$content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
			$content = str_replace('{website_basedir}', $conf['web']['website_basedir'], $content);
			$content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
			$tpl = new tpl('apache_apps.vhost.master');
			$tpl->setVar('apps_vhost_ip',$conf['web']['apps_vhost_ip']);
			$tpl->setVar('apps_vhost_port',$conf['web']['apps_vhost_port']);
			$tpl->setVar('apps_vhost_dir',$conf['web']['website_basedir'].'/apps');
			$tpl->setVar('apps_vhost_basedir',$conf['web']['website_basedir']);
			$tpl->setVar('apps_vhost_servername',$apps_vhost_servername);
			$tpl->setVar('apache_version',getapacheversion());


			// comment out the listen directive if port is 80 or 443
			if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['apps_vhost_ip'] == 443) {
			$content = str_replace('{vhost_port_listen}', '#', $content);
			$tpl->setVar('vhost_port_listen','#');
			} else {
			$content = str_replace('{vhost_port_listen}', '', $content);
			$tpl->setVar('vhost_port_listen','');
			}

			wf($vhost_conf_dir.'/apps.vhost', $content);
			wf($vhost_conf_dir.'/apps.vhost', $tpl->grab());
			unset($tpl);

			//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
			//* and create the symlink
			if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
			if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
			symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
			symlink($vhost_conf_dir.'/apps.vhost', $vhost_conf_enabled_dir.'/000-apps.vhost');
			}

			if(!is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter')) {
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_apps_fcgi_starter.master', 'tpl/apache_apps_fcgi_starter.master');
			$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
			$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
			mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
			copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
			//copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
			wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content);
			exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
			exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');

			@@ -1525,7 +1622,8 @@
			if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
			//$command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
			$command = 'usermod -a -G '.$apps_vhost_group.' '.$conf['nginx']['user'];
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			if(!@is_dir($install_dir)){
			@@ -1542,7 +1640,7 @@
			$apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'_':$conf['web']['apps_vhost_servername'];

			// Dont just copy over the virtualhost template but add some custom settings
			$content = rf('tpl/nginx_apps.vhost.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/nginx_apps.vhost.master', 'tpl/nginx_apps.vhost.master');

			if($conf['web']['apps_vhost_ip'] == '_default_'){
			$apps_vhost_ip = '';
			@@ -1551,7 +1649,7 @@
			}

			$socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
			if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
			if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
			if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
			$fpm_socket = $socket_dir.'apps.sock';
			$cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']);
			@@ -1563,7 +1661,7 @@
			//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
			$content = str_replace('{fpm_socket}', $fpm_socket, $content);
			$content = str_replace('{cgi_socket}', $cgi_socket, $content);


			if(file_exists('/var/run/php5-fpm.sock')){
			$use_tcp = '#';
			$use_socket = '';
			@@ -1578,7 +1676,7 @@

			// PHP-FPM
			// Dont just copy over the php-fpm pool template but add some custom settings
			$content = rf('tpl/apps_php_fpm_pool.conf.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apps_php_fpm_pool.conf.master', 'tpl/apps_php_fpm_pool.conf.master');
			$content = str_replace('{fpm_pool}', 'apps', $content);
			//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
			$content = str_replace('{fpm_socket}', $fpm_socket, $content);
			@@ -1590,14 +1688,14 @@
			//* and create the symlink
			if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
			if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
			symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
			symlink($vhost_conf_dir.'/apps.vhost', $vhost_conf_enabled_dir.'/000-apps.vhost');
			}

			}
			}

			public function make_ispconfig_ssl_cert() {
			global $conf;
			global $conf,$autoinstall;

			$install_dir = $conf['ispconfig_install_dir'];

			@@ -1607,13 +1705,17 @@

			if(!@is_dir($install_dir.'/interface/ssl')) mkdir($install_dir.'/interface/ssl', 0755, true);

			$ssl_pw = substr(md5(mt_rand()),0,6);
			$ssl_pw = substr(md5(mt_rand()), 0, 6);
			exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
			exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -out $ssl_csr_file");
			if(AUTOINSTALL){
			exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -key $ssl_key_file -out $ssl_csr_file");
			} else {
			exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -out $ssl_csr_file");
			}
			exec("openssl req -x509 -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -in $ssl_csr_file -out $ssl_crt_file -days 3650");
			exec("openssl rsa -passin pass:$ssl_pw -in $ssl_key_file -out $ssl_key_file.insecure");
			rename($ssl_key_file,$ssl_key_file.'.secure');
			rename($ssl_key_file.'.insecure',$ssl_key_file);
			rename($ssl_key_file, $ssl_key_file.'.secure');
			rename($ssl_key_file.'.insecure', $ssl_key_file);

			}

			@@ -1642,6 +1744,10 @@
			//* copy the ISPConfig server part
			$command = 'cp -rf ../server '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* copy the ISPConfig security part
			$command = 'cp -rf ../security '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Create a symlink, so ISPConfig is accessible via web
			// Replaced by a separate vhost definition for port 8080
			@@ -1653,31 +1759,7 @@
			if(is_file($install_dir.'/interface/lib/'.$configfile)) {
			copy($install_dir.'/interface/lib/'.$configfile, $install_dir.'/interface/lib/'.$configfile.'~');
			}
			$content = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);

			$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);

			$content = str_replace('{server_id}', $conf['server_id'], $content);
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $content);

			wf($install_dir.'/interface/lib/'.$configfile, $content);

			//* Create the config file for ISPConfig server
			$configfile = 'config.inc.php';
			if(is_file($install_dir.'/server/lib/'.$configfile)) {
			copy($install_dir.'/server/lib/'.$configfile, $install_dir.'/interface/lib/'.$configfile.'~');
			}
			$content = rf('tpl/'.$configfile.'.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			@@ -1693,6 +1775,32 @@
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $content);
			$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

			wf($install_dir.'/interface/lib/'.$configfile, $content);

			//* Create the config file for ISPConfig server
			$configfile = 'config.inc.php';
			if(is_file($install_dir.'/server/lib/'.$configfile)) {
			copy($install_dir.'/server/lib/'.$configfile, $install_dir.'/interface/lib/'.$configfile.'~');
			}
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);

			$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);

			$content = str_replace('{server_id}', $conf['server_id'], $content);
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $content);
			$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

			wf($install_dir.'/server/lib/'.$configfile, $content);

			@@ -1709,9 +1817,9 @@
			if (is_dir($dir)) {
			if ($dh = opendir($dir)) {
			while (($file = readdir($dh)) !== false) {
			if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
			include_once($install_dir.'/server/mods-available/'.$file);
			$module_name = substr($file,0,-8);
			if($file != '.' && $file != '..' && substr($file, -8, 8) == '.inc.php') {
			include_once $install_dir.'/server/mods-available/'.$file;
			$module_name = substr($file, 0, -8);
			$tmp = new $module_name;
			if($tmp->onInstall()) {
			if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) {
			@@ -1738,11 +1846,11 @@
			while (($file = readdir($dh)) !== false) {
			if($conf['apache']['installed'] == true && $file == 'nginx_plugin.inc.php') continue;
			if($conf['nginx']['installed'] == true && $file == 'apache2_plugin.inc.php') continue;
			if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
			include_once($install_dir.'/server/plugins-available/'.$file);
			$plugin_name = substr($file,0,-8);
			if($file != '.' && $file != '..' && substr($file, -8, 8) == '.inc.php') {
			include_once $install_dir.'/server/plugins-available/'.$file;
			$plugin_name = substr($file, 0, -8);
			$tmp = new $plugin_name;
			if(method_exists($tmp,'onInstall') && $tmp->onInstall()) {
			if(method_exists($tmp, 'onInstall') && $tmp->onInstall()) {
			if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) {
			@symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
			//@symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-enabled/'.$file);
			@@ -1781,12 +1889,32 @@
			}


			//* Chmod the files
			$command = 'chmod -R 750 '.$install_dir;
			// chown install dir to root and chmod 755
			$command = 'chown root:root '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chmod 755 '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the files to the ispconfig user and group
			$command = 'chown -R ispconfig:ispconfig '.$install_dir;
			//* Chmod the files and directories in the install dir
			$command = 'chmod -R 750 '.$install_dir.'/*';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the interface files to the ispconfig user and group
			$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the server files to the root user and group
			$command = 'chown -R root:root '.$install_dir.'/server';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the security files to the root user and group
			$command = 'chown -R root:root '.$install_dir.'/security';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the security directory and security_settings.ini to root:ispconfig
			$command = 'chown root:ispconfig '.$install_dir.'/security/security_settings.ini';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chown root:ispconfig '.$install_dir.'/security';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Make the global language file directory group writable
			@@ -1797,14 +1925,14 @@

			//* Make all interface language file directories group writable
			$handle = @opendir($install_dir.'/interface/web');
			while ($file = @readdir ($handle)) {
			while ($file = @readdir($handle)) {
			if ($file != '.' && $file != '..') {
			if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) {
			$handle2 = opendir($install_dir.'/interface/web'.'/'.$file.'/lib/lang');
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang',0770);
			while ($lang_file = @readdir ($handle2)) {
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang', 0770);
			while ($lang_file = @readdir($handle2)) {
			if ($lang_file != '.' && $lang_file != '..') {
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file,0770);
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file, 0770);
			}
			}
			}
			@@ -1819,7 +1947,7 @@
			chmod($install_dir.'/server/lib/config.inc.php', 0600);
			chown($install_dir.'/server/lib/config.inc.php', 'root');
			chgrp($install_dir.'/server/lib/config.inc.php', 'root');


			//* Make sure thet the interface config file is readable by user ispconfig only
			chmod($install_dir.'/interface/lib/config.inc.php', 0600);
			chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
			@@ -1870,45 +1998,48 @@
			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

			// Dont just copy over the virtualhost template but add some custom settings
			$content = rf('tpl/apache_ispconfig.vhost.master');
			$content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
			$tpl = new tpl('apache_ispconfig.vhost.master');
			$tpl->setVar('vhost_port',$conf['apache']['vhost_port']);

			// comment out the listen directive if port is 80 or 443
			if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
			$content = str_replace('{vhost_port_listen}', '#', $content);
			$tpl->setVar('vhost_port_listen','#');
			} else {
			$content = str_replace('{vhost_port_listen}', '', $content);
			$tpl->setVar('vhost_port_listen','');
			}

			if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
			$content = str_replace('{ssl_comment}', '', $content);
			$tpl->setVar('ssl_comment','');
			} else {
			$content = str_replace('{ssl_comment}', '#', $content);
			$tpl->setVar('ssl_comment','#');
			}
			if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
			$content = str_replace('{ssl_bundle_comment}', '', $content);
			$tpl->setVar('ssl_bundle_comment','');
			} else {
			$content = str_replace('{ssl_bundle_comment}', '#', $content);
			$tpl->setVar('ssl_bundle_comment','#');
			}

			$tpl->setVar('apache_version',getapacheversion());

			wf($vhost_conf_dir.'/ispconfig.vhost', $content);
			wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab());

			//copy('tpl/apache_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
			//* and create the symlink
			if($this->is_update == false) {
			if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
			if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
			symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
			symlink($vhost_conf_dir.'/ispconfig.vhost', $vhost_conf_enabled_dir.'/000-ispconfig.vhost');
			}
			}
			if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
			mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
			copy('tpl/apache_ispconfig_fcgi_starter.master','/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			symlink($install_dir.'/interface/web','/var/www/ispconfig');
			exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');

			}
			//if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');
			$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
			$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
			@mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
			wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
			exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			@symlink($install_dir.'/interface/web', '/var/www/ispconfig');
			exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
			//}
			}

			if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
			@@ -1917,7 +2048,7 @@
			$vhost_conf_enabled_dir = $conf['nginx']['vhost_conf_enabled_dir'];

			// Dont just copy over the virtualhost template but add some custom settings
			$content = rf('tpl/nginx_ispconfig.vhost.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/nginx_ispconfig.vhost.master', 'tpl/nginx_ispconfig.vhost.master');
			$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);

			if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
			@@ -1931,7 +2062,7 @@
			}

			$socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
			if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
			if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
			if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
			$fpm_socket = $socket_dir.'ispconfig.sock';

			@@ -1944,7 +2075,7 @@

			// PHP-FPM
			// Dont just copy over the php-fpm pool template but add some custom settings
			$content = rf('tpl/php_fpm_pool.conf.master');
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/php_fpm_pool.conf.master', 'tpl/php_fpm_pool.conf.master');
			$content = str_replace('{fpm_pool}', 'ispconfig', $content);
			//$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
			$content = str_replace('{fpm_socket}', $fpm_socket, $content);
			@@ -1957,21 +2088,21 @@
			if($this->is_update == false) {
			if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
			if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
			symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
			symlink($vhost_conf_dir.'/ispconfig.vhost', $vhost_conf_enabled_dir.'/000-ispconfig.vhost');
			}
			}
			}

			//* Install the update script
			if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
			chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
			chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
			if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
			chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
			chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
			chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
			chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
			chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
			chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
			if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh','/usr/local/bin/ispconfig_update_from_svn.sh');
			if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh','/usr/local/bin/ispconfig_update.sh');
			if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
			if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');

			//* Make the logs readable for the ispconfig user
			if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log');
			@@ -1995,7 +2126,7 @@
			exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');

			if(is_user('getmail')) {
			rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');
			rename($install_dir.'/server/scripts/run-getmail.sh', '/usr/local/bin/run-getmail.sh');
			if(is_user('getmail')) chown('/usr/local/bin/run-getmail.sh', 'getmail');
			chmod('/usr/local/bin/run-getmail.sh', 0744);
			}
			@@ -2023,11 +2154,19 @@
			fclose($fh);
			*/
			}


			//* Remove Domain module as its functions are available in the client module now
			if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');



			//* Disable rkhunter run and update in debian cronjob as ispconfig is running and updating rkhunter
			if(is_file('/etc/default/rkhunter')) {
			replaceLine('/etc/default/rkhunter', 'CRON_DAILY_RUN="yes"', 'CRON_DAILY_RUN="no"', 1, 0);
			replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
			}

			// Add symlink for patch tool
			if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');

			}

			public function configure_dbserver() {
			@@ -2044,11 +2183,11 @@
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}

			$content = rf('tpl/mysql_clientdb.conf.master');
			$content = str_replace('{hostname}',$conf['mysql']['host'],$content);
			$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
			$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
			wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mysql_clientdb.conf.master', 'tpl/mysql_clientdb.conf.master');
			$content = str_replace('{hostname}', $conf['mysql']['host'], $content);
			$content = str_replace('{username}', $conf['mysql']['admin_user'], $content);
			$content = str_replace('{password}', $conf['mysql']['admin_password'], $content);
			wf($install_dir.'/server/lib/mysql_clientdb.conf', $content);
			chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
			chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
			chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
			@@ -2066,12 +2205,12 @@

			// remove existing ispconfig cronjobs, in case the syntax has changed
			foreach($existing_root_cron_jobs as $key => $val) {
			if(stristr($val,$install_dir)) unset($existing_root_cron_jobs[$key]);
			if(stristr($val, $install_dir)) unset($existing_root_cron_jobs[$key]);
			}

			$root_cron_jobs = array(
			"* * * * * ".$install_dir."/server/server.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log",
			"30 00 * * * ".$install_dir."/server/cron_daily.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log"
			"* * * * * ".$install_dir."/server/server.sh 2>&1 > /dev/null \| while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done",
			"30 00 * * * ".$install_dir."/server/cron_daily.sh 2>&1 > /dev/null \| while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done"
			);

			if ($conf['nginx']['installed'] == true) {
			@@ -2094,12 +2233,12 @@
			$existing_cron_jobs = file('crontab.txt');

			$cron_jobs = array(
			'/5 * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> '.$conf['ispconfig_log_dir'].'/cron.log'
			'/5 * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
			);

			// remove existing ispconfig cronjobs, in case the syntax has changed
			foreach($existing_cron_jobs as $key => $val) {
			if(stristr($val,'getmail')) unset($existing_cron_jobs[$key]);
			if(stristr($val, 'getmail')) unset($existing_cron_jobs[$key]);
			}

			foreach($cron_jobs as $cron_job) {
			@@ -2113,8 +2252,41 @@
			}

			touch($conf['ispconfig_log_dir'].'/cron.log');
			chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);
			chmod($conf['ispconfig_log_dir'].'/cron.log', 0660);

			}

			// This function is called at the end of the update process and contains code to clean up parts of old ISPCONfig releases
			public function cleanup_ispconfig() {
			global $app,$conf;

			// Remove directories recursively
			if(is_dir('/usr/local/ispconfig/interface/web/designer')) exec('rm -rf /usr/local/ispconfig/interface/web/designer');
			if(is_dir('/usr/local/ispconfig/interface/web/themes/default-304')) exec('rm -rf /usr/local/ispconfig/interface/web/themes/default-304');

			// Remove files
			if(is_file('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php');
			if(is_file('/usr/local/ispconfig/interface/lib/classes/form.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/form.inc.php');



			}

			public function getinitcommand($servicename, $action, $init_script_directory = ''){
			global $conf;
			// systemd
			if(is_executable('/bin/systemd')){
			return 'systemctl '.$action.' '.$servicename.'.service';
			}
			// upstart
			if(is_executable('/sbin/initctl')){
			exec('/sbin/initctl version 2>/dev/null \| /bin/grep -q upstart', $retval['output'], $retval['retval']);
			if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
			}
			// sysvinit
			if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
			if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);
			return $init_script_directory.'/'.$servicename.' '.$action;
			}

			/**
			@@ -2136,11 +2308,16 @@
			global $conf, $dist;

			$final_path = '';
			$dist_template = 'dist/tpl/'.strtolower($dist['name'])."/$tLocal.master";
			$dist_template = $conf['ispconfig_install_dir'] . '/server/conf-custom/install/' . $tLocal . '.master';
			if (file_exists($dist_template)) {
			$final_path = $dist_template;
			} else {
			$final_path = "tpl/$tLocal.master";
			$dist_template = 'dist/tpl/'.strtolower($dist['name'])."/$tLocal.master";
			if (file_exists($dist_template)) {
			$final_path = $dist_template;
			} else {
			$final_path = "tpl/$tLocal.master";
			}
			}

			if (!$tRf) {
			@@ -2179,21 +2356,21 @@
			wf($tConf, $tContents); // write file

			if (func_num_args() >= 4) // override rights and/or ownership
			{
			{
			$args = func_get_args();
			$output = array_slice($args, 2);

			switch (sizeof($output)) {
			case 3:
			$umask = array_shift($output);
			if (is_numeric($umask) && preg_match('/^0?[0-7]{3}$/', $umask)) {
			$access = $umask;
			}
			case 2:
			if (is_user($output[0]) && is_group($output[1])) {
			list($user,$group) = $output;
			}
			break;
			case 3:
			$umask = array_shift($output);
			if (is_numeric($umask) && preg_match('/^0?[0-7]{3}$/', $umask)) {
			$access = $umask;
			}
			case 2:
			if (is_user($output[0]) && is_group($output[1])) {
			list($user, $group) = $output;
			}
			break;
			}
			}

			@@ -2222,11 +2399,12 @@
			$tContents = str_replace('{mysql_server_ispconfig_password}', $conf["mysql"]["ispconfig_password"], $tContents);
			$tContents = str_replace('{mysql_server_database}', $conf["mysql"]["database"], $tContents);
			$tContents = str_replace('{mysql_server_ip}', $conf["mysql"]["ip"], $tContents);
			$tContents = str_replace('{mysql_server_host}',$conf['mysql']['host'], $tContents);
			$tContents = str_replace('{mysql_server_port}',$conf["mysql"]["port"], $tContents);
			$tContents = str_replace('{mysql_server_host}', $conf['mysql']['host'], $tContents);
			$tContents = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $tContents);

			return $tContents;
			}

			}

			?>