gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -49,9 +49,13 @@
			}

			public function error($msg) {
			die("ERROR: ".$msg."\n");
			die('ERROR: '.$msg."\n");
			}

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

			public function simple_query($query, $answers, $default) {
			$finished = false;
			do {
			@@ -113,11 +117,12 @@

			if(is_installed('mysql') \|\| is_installed('mysqld')) $conf['mysql']['installed'] = true;
			if(is_installed('postfix')) $conf['postfix']['installed'] = true;
			if(is_installed('mailman')) $conf['mailman']['installed'] = true;
			if(is_installed('apache') \|\| is_installed('apache2') \|\| is_installed('httpd')) $conf['apache']['installed'] = true;
			if(is_installed('getmail')) $conf['getmail']['installed'] = true;
			if(is_installed('couriertcpd')) $conf['courier']['installed'] = true;
			if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
			if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
			if(is_installed('saslsauthd')) $conf['saslauthd']['installed'] = true;
			if(is_installed('saslauthd')) $conf['saslauthd']['installed'] = true;
			if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
			if(is_installed('clamdscan')) $conf['clamav']['installed'] = true;
			if(is_installed('pure-ftpd') \|\| is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['installed'] = true;
			@@ -125,7 +130,13 @@
			if(is_installed('jk_chrootsh')) $conf['jailkit']['installed'] = true;
			if(is_installed('pdns_server') \|\| is_installed('pdns_control')) $conf['powerdns']['installed'] = true;
			if(is_installed('named') \|\| is_installed('bind') \|\| is_installed('bind9')) $conf['bind']['installed'] = true;

			if(is_installed('squid')) $conf['squid']['installed'] = true;
			if(is_installed('nginx')) $conf['nginx']['installed'] = true;
			if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
			if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
			if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;

			if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;
			}

			/** Create the database for ISPConfig */
			@@ -196,7 +207,8 @@

			$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));

			// TODO: Update further distribution specific parameters for server config here
			//* Update further distribution specific parameters for server config here
			//* HINT: Every line added here has to be added in update.lib.php too!!
			$tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir'];
			$tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir'];
			$tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
			@@ -220,6 +232,17 @@
			$tpl_ini_array['dns']['bind_zonefiles_dir'] = $conf['bind']['bind_zonefiles_dir'];
			$tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
			$tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];

			if ($conf['nginx']['installed'] == true) {
			$tpl_ini_array['nginx']['vhost_conf_dir'] = $conf['nginx']['vhost_conf_dir'];
			$tpl_ini_array['nginx']['vhost_conf_enabled_dir'] = $conf['nginx']['vhost_conf_enabled_dir'];
			}

			if (array_key_exists('awstats', $conf)) {
			foreach ($conf['awstats'] as $aw_sett => $aw_value) {
			$tpl_ini_array['web']['awstats_'.$aw_sett] = $aw_value;
			}
			}

			$server_ini_content = array_to_ini($tpl_ini_array);
			$server_ini_content = mysql_real_escape_string($server_ini_content);
			@@ -230,19 +253,34 @@
			$file_server_enabled = ($conf['services']['file'])?1:0;
			$db_server_enabled = ($conf['services']['db'])?1:0;
			$vserver_server_enabled = ($conf['services']['vserver'])?1:0;

			$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
			$firewall_server_enabled = ($conf['services']['firewall'])?1:0;

			//** Get the database version number based on the patchfiles
			$found = true;
			$current_db_version = 1;
			while($found == true) {
			$next_db_version = intval($current_db_version + 1);
			$patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
			if(is_file($patch_filename)) {
			$current_db_version = $next_db_version;
			} else {
			$found = false;
			}
			}
			$current_db_version = intval($current_db_version);


			if($conf['mysql']['master_slave_setup'] == 'y') {

			//* Insert the server record in master DB
			$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);";
			$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1, $current_db_version, $proxy_server_enabled, $firewall_server_enabled);";
			$this->dbmaster->query($sql);
			$conf['server_id'] = $this->dbmaster->insertID();
			$conf['server_id'] = $conf['server_id'];

			//* Insert the same record in the local DB
			$sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES ('".$conf['server_id']."',1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);";
			$sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES ('".$conf['server_id']."',1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1, $current_db_version, $proxy_server_enabled, $firewall_server_enabled);";
			$this->db->query($sql);

			//* username for the ispconfig user
			@@ -252,7 +290,7 @@

			} else {
			//* Insert the server, if its not a mster / slave setup
			$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);";
			$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1, $current_db_version, $proxy_server_enabled, $firewall_server_enabled);";
			$this->db->query($sql);
			$conf['server_id'] = $this->db->insertID();
			$conf['server_id'] = $conf['server_id'];
			@@ -261,7 +299,7 @@

			}

			public function grant_master_database_rights() {
			public function grant_master_database_rights($verbose = false) {
			global $conf;

			/*
			@@ -272,6 +310,8 @@
			* 1) it is a single server
			* 2) it is the MASTER of n clients
			*/
			$hosts = array();

			if($conf['mysql']['master_slave_setup'] == 'y') {
			/*
			* it is a master-slave - Setup so the slave has to grant its rights in the master
			@@ -306,7 +346,7 @@
			}
			}

			if(is_array($hosts)) {
			if(count($hosts) > 0) {
			foreach($hosts as $host => $value) {
			/*
			* If a pwd exists, this means, we have to add the new user (and his pwd).
			@@ -314,6 +354,9 @@
			*/
			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
			}

			@@ -322,62 +365,98 @@
			* 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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' ";
			if ($verbose){
			echo $query ."\n";
			}
			if(!$this->dbmaster->query($query)) {
			$this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$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->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage);
			$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
			}
			}

			@@ -418,12 +497,68 @@

			if (is_dir($config_dir)) {
			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.'~');
			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);
			copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
			copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
			}

			}

			public function configure_mailman($status = 'insert') {
			global $conf;

			$config_dir = $conf['mailman']['config_dir'].'/';
			$full_file_name = $config_dir.'mm_cfg.py';
			//* Backup exiting file
			if(is_file($full_file_name)) {
			copy($full_file_name, $config_dir.'mm_cfg.py~');
			}

			// load files
			$content = rf('tpl/mm_cfg.py.master');
			$old_file = rf($full_file_name);

			$old_options = array();
			$lines = explode("\n", $old_file);
			foreach ($lines as $line)
			{
			if (trim($line) != '' && substr($line, 0, 1) != '#')
			{
			@list($key, $value) = @explode("=", $line);
			if (!empty($value))
			{
			$key = rtrim($key);
			$old_options[$key] = trim($value);
			}
			}
			}

			$virtual_domains = '';
			if($status == 'update')
			{
			// create virtual_domains list
			$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']."'";
			}
			}
			}
			else
			$virtual_domains = "' '";

			$content = str_replace('{hostname}', $conf['hostname'], $content);
			if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
			$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
			$content = str_replace('{virtual_domains}', $virtual_domains, $content);

			wf($full_file_name, $content);
			}

			public function configure_postfix($options = '') {
			@@ -482,8 +617,10 @@
			'myhostname = '.$conf['hostname'],
			'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
			'mynetworks = 127.0.0.0/8 [::1]/128',
			'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, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
			'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'],
			@@ -500,22 +637,18 @@
			'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',
			'virtual_create_maildirsize = yes',
			'virtual_maildir_extended = yes',
			'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
			'virtual_mailbox_limit_override = yes',
			'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
			'virtual_overquota_bounce = yes',
			'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'
			'body_checks = regexp:'.$config_dir.'/body_checks',
			'owner_request_special = no'
			);

			//* Create the header and body check files
			@@ -523,7 +656,13 @@
			touch($config_dir.'/mime_header_checks');
			touch($config_dir.'/nested_header_checks');
			touch($config_dir.'/body_checks');


			//* Create the mailman files
			exec('mkdir -p /var/lib/mailman/data');
			touch('/var/lib/mailman/data/aliases');
			exec('postmap /var/lib/mailman/data/aliases');
			touch('/var/lib/mailman/data/virtual-mailman');
			exec('postmap /var/lib/mailman/data/virtual-mailman');

			//* Make a backup copy of the main.cf file
			copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
			@@ -537,7 +676,7 @@
			if(!stristr($options,'dont-create-certs')) {
			//* Create the SSL certificate
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
			exec($command);

			$command = 'chmod o= '.$config_dir.'/smtpd.key';
			@@ -553,7 +692,7 @@
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
			}
			if(is_file($config_dir.'/master.cf~')) {
			exec('chmod 400 '.$config_dir.'/master.cf~');
			chmod($config_dir.'/master.cf~', 0400);
			}
			$configfile = $config_dir.'/master.cf';
			$content = rf($configfile);
			@@ -567,7 +706,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 = rf('tpl/'.$configfile.'.master');
			$content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
			wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);

			@@ -591,26 +730,25 @@


			$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~')) exec('chmod 400 '.$conf["postfix"]["config_dir"].'/sasl/smtpd.conf~');
			$content = rf("tpl/".$configfile.".master");
			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);
			wf($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$content);

			// TODO: Chmod and chown on the config file



			// Create the spool directory
			exec('mkdir -p /var/spool/postfix/var/run/saslauthd');
			// Recursively create the spool directory
			if(!@is_dir('/var/spool/postfix/var/run/saslauthd')) mkdir('/var/spool/postfix/var/run/saslauthd', 0755, true);

			// Edit the file /etc/default/saslauthd
			$configfile = $conf["saslauthd"]["config"];
			$configfile = $conf['saslauthd']['config'];
			if(is_file($configfile)) copy($configfile,$configfile.'~');
			if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
			if(is_file($configfile.'~')) chmod($configfile.'~', 0400);
			$content = rf($configfile);
			$content = str_replace('START=no','START=yes',$content);
			// Debian
			@@ -620,12 +758,12 @@
			wf($configfile,$content);

			// Edit the file /etc/init.d/saslauthd
			$configfile = $conf["init_scripts"].'/'.$conf["saslauthd"]["init_script"];
			$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);

			// add the postfix user to the sasl group (at least nescessary for ubuntu 8.04 and most likely debian lenny too.
			// 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');


			@@ -636,19 +774,20 @@
			$pam = $conf['pam'];
			//* configure pam for SMTP authentication agains the ispconfig database
			$configfile = 'pamd_smtp';
			if(is_file("$pam/smtp")) copy("$pam/smtp", "$pam/smtp~");
			// On some OSes smtp is world readable which allows for reading database information. Removing world readable rights should have no effect.
			if(is_file("$pam/smtp")) exec("chmod o= $pam/smtp");
			if(is_file("$pam/smtp~")) exec("chmod 400 $pam/smtp~");
			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 = 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("$pam/smtp", $content);
			exec("chmod 660 $pam/smtp");
			exec("chown daemon:daemon $pam/smtp");
			wf($pam.'/smtp', $content);
			// On some OSes smtp is world readable which allows for reading database information. Removing world readable rights should have no effect.
			if(is_file($pam.'/smtp')) exec("chmod o= $pam/smtp");
			chmod($pam.'/smtp', 0660);
			chown($pam.'/smtp', 'daemon');
			chgrp($pam.'/smtp', 'daemon');

			}

			@@ -657,27 +796,28 @@
			$config_dir = $conf['courier']['config_dir'];
			//* authmysqlrc
			$configfile = 'authmysqlrc';
			if(is_file("$config_dir/$configfile")) {
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			if(is_file($config_dir.'/'.$configfile)) {
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			exec("chmod 400 $config_dir/$configfile~");
			$content = rf("tpl/$configfile.master");
			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);
			wf("$config_dir/$configfile", $content);
			wf($config_dir.'/'.$configfile, $content);

			exec("chmod 660 $config_dir/$configfile");
			exec("chown daemon:daemon $config_dir/$configfile");
			chmod($config_dir.'/'.$configfile, 0660);
			chown($config_dir.'/'.$configfile, 'daemon');
			chgrp($config_dir.'/'.$configfile, 'daemon');

			//* authdaemonrc
			$configfile = $conf['courier']['config_dir'].'/authdaemonrc';
			$configfile = $config_dir.'/authdaemonrc';
			if(is_file($configfile)) {
			copy($configfile, $configfile.'~');
			}
			if(is_file($configfile.'~')) {
			exec('chmod 400 '.$configfile.'~');
			chmod($configfile.'~', 0400);
			}
			$content = rf($configfile);
			$content = str_replace('authmodulelist="authpam"', 'authmodulelist="authmysql"', $content);
			@@ -690,17 +830,17 @@
			$config_dir = $conf['dovecot']['config_dir'];

			//* Configure master.cf and add a line for deliver
			if(is_file($config_dir.'/master.cf')) {
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
			if(is_file($conf['postfix']['config_dir'].'/master.cf')) {
			copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~2');
			}
			if(is_file($config_dir.'/master.cf~')) {
			exec('chmod 400 '.$config_dir.'/master.cf~2');
			if(is_file($conf['postfix']['config_dir'].'/master.cf~')) {
			chmod($conf['postfix']['config_dir'].'/master.cf~2', 0400);
			}
			$content = rf($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,"dovecot/deliver")) {
			if(!stristr($content,'dovecot/deliver')) {
			$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu 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);
			@@ -716,7 +856,7 @@
			);

			// 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) {
			@@ -726,26 +866,27 @@

			//* copy dovecot.conf
			$configfile = 'dovecot.conf';
			if(is_file("$config_dir/$configfile")) {
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			if(is_file($config_dir.'/'.$configfile)) {
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			copy('tpl/debian_dovecot.conf.master',"$config_dir/$configfile");
			copy('tpl/debian_dovecot.conf.master',$config_dir.'/'.$configfile);

			//* dovecot-sql.conf
			$configfile = 'dovecot-sql.conf';
			if(is_file("$config_dir/$configfile")) {
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			if(is_file($config_dir.'/'.$configfile)) {
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			exec("chmod 400 $config_dir/$configfile~");
			$content = rf("tpl/debian_dovecot-sql.conf.master");
			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);
			wf("$config_dir/$configfile", $content);
			wf($config_dir.'/'.$configfile, $content);

			exec("chmod 600 $config_dir/$configfile");
			exec("chown root:root $config_dir/$configfile");
			chmod($config_dir.'/'.$configfile, 0600);
			chown($config_dir.'/'.$configfile, 'root');
			chgrp($config_dir.'/'.$configfile, 'root');

			}

			@@ -754,15 +895,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~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/conf.d/50-user~');
			$content = rf("tpl/".$configfile.".master");
			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_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);
			wf($conf['amavis']['config_dir'].'/conf.d/50-user',$content);

			// TODO: chmod and chown on the config file

			@@ -774,7 +915,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) {
			@@ -783,13 +924,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~');
			$content = rf($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 = rf('tpl/master_cf_amavis.master');
			af($conf['postfix']['config_dir'].'/master.cf',$content);
			}
			unset($content);

			@@ -817,9 +958,9 @@

			$config_dir = $conf['getmail']['config_dir'];

			if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
			if(!@is_dir($config_dir)) mkdir(escapeshellcmd($config_dir), 0700, true);

			$command = "useradd -d $config_dir getmail";
			$command = 'useradd -d '.$config_dir.' getmail';
			if(!is_user('getmail')) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			$command = "chown -R getmail $config_dir";
			@@ -837,21 +978,22 @@

			//* configure pure-ftpd for MySQL authentication against the ispconfig database
			$configfile = 'db/mysql.conf';
			if(is_file("$config_dir/$configfile")) {
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			if(is_file($config_dir.'/'.$configfile)) {
			copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
			}
			if(is_file("$config_dir/$configfile~")) {
			exec("chmod 400 $config_dir/$configfile~");
			if(is_file($config_dir.'/'.$configfile.'~')) {
			chmod($config_dir.'/'.$configfile.'~', 0400);
			}
			$content = rf('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);
			$content = str_replace('{mysql_server_ip}', $conf["mysql"]["ip"], $content);
			$content = str_replace('{server_id}', $conf["server_id"], $content);
			wf("$config_dir/$configfile", $content);
			exec("chmod 600 $config_dir/$configfile");
			exec("chown root:root $config_dir/$configfile");
			$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('{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');
			// **enable chrooting
			//exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone');
			exec('echo "yes" > '.$config_dir.'/conf/ChrootEveryone');
			@@ -865,10 +1007,10 @@

			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('/etc/init.d/openbsd-inetd')) exec('/etc/init.d/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");
			if(!is_file('/etc/pure-ftpd/conf/DontResolve')) exec('echo "yes" > /etc/pure-ftpd/conf/DontResolve');
			}

			public function configure_mydns() {
			@@ -876,17 +1018,18 @@

			// 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.'~')) exec('chmod 400 '.$conf["mydns"]["config_dir"].'/'.$configfile.'~');
			$content = rf("tpl/".$configfile.".master");
			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);
			exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["mydns"]["config_dir"].'/'.$configfile);
			$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');

			}

			@@ -918,16 +1061,17 @@

			//* 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.'~')) exec('chmod 400 '.$conf["powerdns"]["config_dir"].'/'.$configfile.'~');
			$content = rf("tpl/".$configfile.".master");
			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);
			exec('chmod 600 '.$conf["powerdns"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["powerdns"]["config_dir"].'/'.$configfile);
			$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');


			}
			@@ -935,7 +1079,19 @@
			public function configure_bind() {
			global $conf;

			//* Nothing to do
			//* 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);

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

			}

			@@ -945,7 +1101,7 @@
			global $conf;

			//* Create the logging directory for the vhost logfiles
			exec('mkdir -p /var/log/ispconfig/httpd');
			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);
			@@ -970,25 +1126,25 @@

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

			$content = rf("tpl/apache_ispconfig.conf.master");
			$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
			$content = rf('tpl/apache_ispconfig.conf.master');
			$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
			if(is_array($records) && count($records) > 0) {
			foreach($records as $rec) {
			$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
			$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
			$content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
			$content .= 'NameVirtualHost '.$rec['ip_address'].":443\n";
			}
			}
			$content .= "\n";
			wf($vhost_conf_dir.'/ispconfig.conf',$content);

			if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
			exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
			if(!@is_link($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')) {
			exec('mkdir /etc/webalizer');
			exec('ln -s /etc/webalizer.conf /etc/webalizer/webalizer.conf');
			mkdir('/etc/webalizer');
			symlink('/etc/webalizer.conf','/etc/webalizer/webalizer.conf');
			}

			if(is_file('/etc/webalizer/webalizer.conf')) {
			@@ -997,11 +1153,77 @@
			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);

			//* add a sshusers group
			$command = 'groupadd sshusers';
			if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			}

			public function configure_nginx()
			{
			global $conf;
			$row = $this->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$conf["server_id"]."");
			$ip_address = gethostbyname($row["server_name"]);
			$server_name = $row["server_name"];

			//setup proxy.conf
			$configfile = 'proxy.conf';
			if(is_file($conf["nginx"]["config_dir"].'/'.$configfile)) copy($conf["nginx"]["config_dir"].'/'.$configfile,$conf["nginx"]["config_dir"].'/'.$configfile.'~');
			if(is_file($conf["nginx"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["nginx"]["config_dir"].'/'.$configfile.'~');
			$content = rf("tpl/nginx_".$configfile.".master");
			wf($conf["nginx"]["config_dir"].'/'.$configfile,$content);
			exec('chmod 600 '.$conf["nginx"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["nginx"]["config_dir"].'/'.$configfile);

			//setup conf.d/cache.conf
			$configfile = 'cache.conf';
			if(is_file($conf["nginx"]["config_dir"].'/conf.d/'.$configfile)) copy($conf["nginx"]["config_dir"].'/conf.d/'.$configfile,$conf["nginx"]["config_dir"].'/conf.d/'.$configfile.'~');
			if(is_file($conf["nginx"]["config_dir"].'/conf.d/'.$configfile.'~')) exec('chmod 400 '.$conf["nginx"]["config_dir"].'/conf.d/'.$configfile.'~');
			$content = rf("tpl/nginx_".$configfile.".master");
			wf($conf["nginx"]["config_dir"].'/conf.d/'.$configfile,$content);
			exec('chmod 600 '.$conf["nginx"]["config_dir"].'/conf.d/'.$configfile);
			exec('chown root:root '.$conf["nginx"]["config_dir"].'/conf.d/'.$configfile);

			//setup cache directories
			mkdir('/var/cache/nginx/cache');
			exec('chown www-data:www-data /var/cache/nginx/cache');
			mkdir('/var/cache/nginx/temp');
			exec('chown www-data:www-data /var/cache/nginx/temp');
			}

			public function configure_squid()
			{
			global $conf;
			$row = $this->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$conf["server_id"]."");
			$ip_address = gethostbyname($row["server_name"]);
			$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.'~')) 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);
			exec('chmod 600 '.$conf["squid"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
			}

			public function configure_ufw_firewall()
			{
			$configfile = 'ufw.conf';
			if(is_file('/etc/ufw/ufw.conf')) copy('/etc/ufw/ufw.conf','/etc/ufw/ufw.conf~');
			$content = rf("tpl/".$configfile.".master");
			wf('/etc/ufw/ufw.conf',$content);
			exec('chmod 600 /etc/ufw/ufw.conf');
			exec('chown root:root /etc/ufw/ufw.conf');
			}

			public function configure_firewall() {
			@@ -1009,23 +1231,23 @@

			$dist_init_scripts = $conf['init_scripts'];

			if(is_dir("/etc/Bastille.backup")) caselog("rm -rf /etc/Bastille.backup", __FILE__, __LINE__);
			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__);
			caselog("chmod 644 /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__);
			$content = rf("/etc/Bastille/bastille-firewall.cfg");
			$content = str_replace("{DNS_SERVERS}", "", $content);
			if(is_dir('/etc/Bastille.backup')) caselog('rm -rf /etc/Bastille.backup', __FILE__, __LINE__);
			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__);
			caselog('chmod 644 /etc/Bastille/bastille-firewall.cfg', __FILE__, __LINE__);
			$content = rf('/etc/Bastille/bastille-firewall.cfg');
			$content = str_replace('{DNS_SERVERS}', '', $content);

			$tcp_public_services = '';
			$udp_public_services = '';

			$row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id']));
			$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"]));
			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']));
			} else {
			$tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000';
			$udp_public_services = '53';
			@@ -1033,33 +1255,33 @@

			if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
			$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
			if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
			if($row['tcp_port'] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
			}

			$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
			$content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content);
			$content = str_replace('{TCP_PUBLIC_SERVICES}', $tcp_public_services, $content);
			$content = str_replace('{UDP_PUBLIC_SERVICES}', $udp_public_services, $content);

			wf("/etc/Bastille/bastille-firewall.cfg", $content);
			wf('/etc/Bastille/bastille-firewall.cfg', $content);

			if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-firewall $dist_init_scripts", __FILE__, __LINE__);
			caselog("chmod 700 $dist_init_scripts/bastille-firewall", __FILE__, __LINE__);
			if(is_file($dist_init_scripts.'/bastille-firewall')) caselog('mv -f '.$dist_init_scripts.'/bastille-firewall '.$dist_init_scripts.'/bastille-firewall.backup', __FILE__, __LINE__);
			caselog('cp -f apps/bastille-firewall '.$dist_init_scripts, __FILE__, __LINE__);
			caselog('chmod 700 '.$dist_init_scripts.'/bastille-firewall', __FILE__, __LINE__);

			if(is_file("/sbin/bastille-ipchains")) caselog("mv -f /sbin/bastille-ipchains /sbin/bastille-ipchains.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-ipchains /sbin", __FILE__, __LINE__);
			caselog("chmod 700 /sbin/bastille-ipchains", __FILE__, __LINE__);
			if(is_file('/sbin/bastille-ipchains')) caselog('mv -f /sbin/bastille-ipchains /sbin/bastille-ipchains.backup', __FILE__, __LINE__);
			caselog('cp -f apps/bastille-ipchains /sbin', __FILE__, __LINE__);
			caselog('chmod 700 /sbin/bastille-ipchains', __FILE__, __LINE__);

			if(is_file("/sbin/bastille-netfilter")) caselog("mv -f /sbin/bastille-netfilter /sbin/bastille-netfilter.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-netfilter /sbin", __FILE__, __LINE__);
			caselog("chmod 700 /sbin/bastille-netfilter", __FILE__, __LINE__);
			if(is_file('/sbin/bastille-netfilter')) caselog('mv -f /sbin/bastille-netfilter /sbin/bastille-netfilter.backup', __FILE__, __LINE__);
			caselog('cp -f apps/bastille-netfilter /sbin', __FILE__, __LINE__);
			caselog('chmod 700 /sbin/bastille-netfilter', __FILE__, __LINE__);

			if(!@is_dir('/var/lock/subsys')) caselog("mkdir /var/lock/subsys", __FILE__, __LINE__);
			if(!@is_dir('/var/lock/subsys')) caselog('mkdir /var/lock/subsys', __FILE__, __LINE__);

			exec("which ipchains &> /dev/null", $ipchains_location, $ret_val);
			if(!is_file("/sbin/ipchains") && !is_link("/sbin/ipchains") && $ret_val == 0) phpcaselog(@symlink(shell_exec("which ipchains"), "/sbin/ipchains"), 'create symlink', __FILE__, __LINE__);
			exec('which ipchains &> /dev/null', $ipchains_location, $ret_val);
			if(!is_file('/sbin/ipchains') && !is_link('/sbin/ipchains') && $ret_val == 0) phpcaselog(@symlink(shell_exec('which ipchains'), '/sbin/ipchains'), 'create symlink', __FILE__, __LINE__);
			unset($ipchains_location);
			exec("which iptables &> /dev/null", $iptables_location, $ret_val);
			if(!is_file("/sbin/iptables") && !is_link("/sbin/iptables") && $ret_val == 0) phpcaselog(@symlink(trim(shell_exec("which iptables")), "/sbin/iptables"), 'create symlink', __FILE__, __LINE__);
			exec('which iptables &> /dev/null', $iptables_location, $ret_val);
			if(!is_file('/sbin/iptables') && !is_link('/sbin/iptables') && $ret_val == 0) phpcaselog(@symlink(trim(shell_exec('which iptables')), '/sbin/iptables'), 'create symlink', __FILE__, __LINE__);
			unset($iptables_location);

			}
			@@ -1069,23 +1291,24 @@

			//** 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.'~')) exec('chmod 400 '.$conf["vlogger"]["config_dir"].'/'.$configfile.'~');
			$content = rf("tpl/".$configfile.".master");
			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');
			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_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"]["host"],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['host'],$content);
			}
			wf($conf["vlogger"]["config_dir"].'/'.$configfile,$content);
			exec('chmod 600 '.$conf["vlogger"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["vlogger"]["config_dir"].'/'.$configfile);
			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');

			}

			@@ -1101,15 +1324,16 @@
			$command = 'groupadd '.$apps_vhost_user;
			if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			$command = "useradd -g '$apps_vhost_group' -d $install_dir $apps_vhost_group";
			$command = 'useradd -g '.$apps_vhost_group.' -d '.$install_dir.' '.$apps_vhost_group;
			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;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			exec('mkdir -p '.$install_dir);
			exec("chown $apps_vhost_user:$apps_vhost_group $install_dir");
			if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
			chown($install_dir, $apps_vhost_user);
			chgrp($install_dir, $apps_vhost_group);

			//* Copy the apps vhost file
			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
			@@ -1117,7 +1341,7 @@
			$apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];

			// Dont just copy over the virtualhost template but add some custom settings
			$content = rf("tpl/apache_apps.vhost.master");
			$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);
			@@ -1133,24 +1357,45 @@
			$content = str_replace('{vhost_port_listen}', '', $content);
			}

			wf("$vhost_conf_dir/apps.vhost", $content);
			wf($vhost_conf_dir.'/apps.vhost', $content);

			//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
			//* and create the symlink
			if($this->install_ispconfig_interface == true) {
			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")) {
			exec("ln -s $vhost_conf_dir/apps.vhost $vhost_conf_enabled_dir/000-apps.vhost");
			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');
			}
			}
			if(!is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter')) {
			exec('mkdir -p '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
			exec('cp tpl/apache_apps_fcgi_starter.master '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
			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');
			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');

			}

			}

			public function make_ispconfig_ssl_cert() {
			global $conf;

			$install_dir = $conf['ispconfig_install_dir'];

			$ssl_crt_file = $install_dir.'/interface/ssl/ispserver.crt';
			$ssl_csr_file = $install_dir.'/interface/ssl/ispserver.csr';
			$ssl_key_file = $install_dir.'/interface/ssl/ispserver.key';

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

			$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");
			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);

			}

			public function install_ispconfig() {
			@@ -1159,7 +1404,7 @@
			$install_dir = $conf['ispconfig_install_dir'];

			//* Create the ISPConfig installation directory
			if(!@is_dir("$install_dir")) {
			if(!@is_dir($install_dir)) {
			$command = "mkdir $install_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}
			@@ -1168,15 +1413,15 @@
			$command = 'groupadd ispconfig';
			if(!is_group('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			$command = "useradd -g ispconfig -d $install_dir ispconfig";
			$command = 'useradd -g ispconfig -d '.$install_dir.' ispconfig';
			if(!is_user('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

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

			//* copy the ISPConfig server part
			$command = "cp -rf ../server $install_dir";
			$command = 'cp -rf ../server '.$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
			@@ -1187,9 +1432,9 @@
			//* Create the config file for ISPConfig interface
			$configfile = 'config.inc.php';
			if(is_file($install_dir.'/interface/lib/'.$configfile)) {
			copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~");
			copy($install_dir.'/interface/lib/'.$configfile, $install_dir.'/interface/lib/'.$configfile.'~');
			}
			$content = rf("tpl/$configfile.master");
			$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);
			@@ -1204,14 +1449,14 @@
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);

			wf("$install_dir/interface/lib/$configfile", $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~");
			copy($install_dir.'/server/lib/'.$configfile, $install_dir.'/interface/lib/'.$configfile.'~');
			}
			$content = rf("tpl/$configfile.master");
			$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);
			@@ -1226,13 +1471,13 @@
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);

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

			//* Create the config file for remote-actions (but only, if it does not exist, because
			// the value is a autoinc-value and so changed by the remoteaction_core_module
			if (!file_exists("$install_dir/server/lib/remote_action.inc.php")) {
			$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n?>";
			wf("$install_dir/server/lib/remote_action.inc.php", $content);
			if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
			$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
			wf($install_dir.'/server/lib/remote_action.inc.php', $content);
			}

			//* Enable the server modules and plugins.
			@@ -1298,13 +1543,14 @@
			$file_server_enabled = ($conf['services']['file'])?1:0;
			$db_server_enabled = ($conf['services']['db'])?1:0;
			$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
			$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
			$firewall_server_enabled = ($conf['services']['firewall'])?1:0;






			$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
			$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled' WHERE server_id = ".intval($conf['server_id']);

			if($conf['mysql']['master_slave_setup'] == 'y') {
			$this->dbmaster->query($sql);
			@@ -1315,18 +1561,18 @@


			//* Chmod the files
			$command = "chmod -R 750 $install_dir";
			$command = 'chmod -R 750 '.$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";
			$command = 'chown -R ispconfig:ispconfig '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Make the global language file directory group writable
			exec("chmod -R 770 $install_dir/interface/lib/lang");

			//* Make the temp directory for language file exports writable
			if(is_dir("$install_dir/interface/web/temp")) exec("chmod -R 770 $install_dir/interface/web/temp");
			if(is_dir($install_dir.'/interface/web/temp')) exec("chmod -R 770 $install_dir/interface/web/temp");

			//* Make all interface language file directories group writable
			$handle = @opendir($install_dir.'/interface/web');
			@@ -1345,15 +1591,18 @@
			}

			//* make sure that the server config file (not the interface one) is only readable by the root user
			exec("chmod 600 $install_dir/server/lib/$configfile");
			exec("chown root:root $install_dir/server/lib/$configfile");
			chmod($install_dir.'/server/lib/'.$configfile, 0600);
			chown($install_dir.'/server/lib/'.$configfile, 'root');
			chgrp($install_dir.'/server/lib/'.$configfile, 'root');

			exec("chmod 600 $install_dir/server/lib/remote_action.inc.php");
			exec("chown root:root $install_dir/server/lib/remote_action.inc.php");
			chmod($install_dir.'/server/lib/remote_action.inc.php', 0600);
			chown($install_dir.'/server/lib/remote_action.inc.php', 'root');
			chgrp($install_dir.'/server/lib/remote_action.inc.php', 'root');

			if(@is_file("$install_dir/server/lib/mysql_clientdb.conf")) {
			exec("chmod 600 $install_dir/server/lib/mysql_clientdb.conf");
			exec("chown root:root $install_dir/server/lib/mysql_clientdb.conf");
			if(@is_file($install_dir.'/server/lib/mysql_clientdb.conf')) {
			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');
			}

			// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
			@@ -1372,7 +1621,7 @@


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

			// comment out the listen directive if port is 80 or 443
			@@ -1381,36 +1630,42 @@
			} else {
			$content = str_replace('{vhost_port_listen}', '', $content);
			}

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

			wf("$vhost_conf_dir/ispconfig.vhost", $content);
			wf($vhost_conf_dir.'/ispconfig.vhost', $content);

			//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
			//copy('tpl/apache_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
			//* and create the symlink
			if($this->install_ispconfig_interface == true && $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")) {
			exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
			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');
			}
			}
			if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
			exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
			exec('cp tpl/apache_ispconfig_fcgi_starter.master /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');
			exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
			symlink($install_dir.'/interface/web','/var/www/ispconfig');
			exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');

			}

			//* Install the update script
			if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
			if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
			if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
			chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
			chmod($install_dir.'/server/scripts/update_from_svn.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');

			//* Make the logs readable for the ispconfig user
			if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log');
			@@ -1420,27 +1675,30 @@
			if(@is_file('/var/log/clamav/clamav.log')) exec('chmod +r /var/log/clamav/clamav.log');
			if(@is_file('/var/log/clamav/freshclam.log')) exec('chmod +r /var/log/clamav/freshclam.log');

			//* Create the ispconfig log directory
			if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
			if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
			//* Create the ispconfig log file and directory
			if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
			if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755);
			touch($conf['ispconfig_log_dir'].'/ispconfig.log');
			}

			exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
			if(is_user('getmail')) exec('chown getmail /usr/local/bin/run-getmail.sh');
			exec('chmod 744 /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);

			//* Add Log-Rotation
			if (is_dir('/etc/logrotate.d')) {
			@unlink('/etc/logrotate.d/logispc3'); // ignore, if the file is not there
			/* We rotate these logs in cron_daily.php
			$fh = fopen('/etc/logrotate.d/logispc3', 'w');
			fwrite($fh,
			"/var/log/ispconfig/ispconfig.log { \n" .
			"$conf['ispconfig_log_dir']/ispconfig.log { \n" .
			" weekly \n" .
			" missingok \n" .
			" rotate 4 \n" .
			" compress \n" .
			" delaycompress \n" .
			"} \n" .
			"/var/log/ispconfig/cron.log { \n" .
			"$conf['ispconfig_log_dir']/cron.log { \n" .
			" weekly \n" .
			" missingok \n" .
			" rotate 4 \n" .
			@@ -1448,6 +1706,7 @@
			" delaycompress \n" .
			"}");
			fclose($fh);
			*/
			}
			}

			@@ -1460,22 +1719,25 @@
			// Create a file with the database login details which
			// are used to create the client databases.

			if(!is_dir("$install_dir/server/lib")) {
			if(!is_dir($install_dir.'/server/lib')) {
			$command = "mkdir $install_dir/server/lib";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}

			$content = rf("tpl/mysql_clientdb.conf.master");
			$content = rf('tpl/mysql_clientdb.conf.master');
			$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);
			exec('chmod 600 '."$install_dir/server/lib/mysql_clientdb.conf");
			exec('chown root:root '."$install_dir/server/lib/mysql_clientdb.conf");
			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');

			}

			public function install_crontab() {
			global $conf;

			$install_dir = $conf['ispconfig_install_dir'];

			//* Root Crontab
			exec('crontab -u root -l > crontab.txt');
			@@ -1483,12 +1745,12 @@

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

			$root_cron_jobs = array(
			'* * * * * /usr/local/ispconfig/server/server.sh > /dev/null 2>> /var/log/ispconfig/cron.log',
			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
			"* * * * * ".$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"
			);
			foreach($root_cron_jobs as $cron_job) {
			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
			@@ -1506,7 +1768,7 @@
			$existing_cron_jobs = file('crontab.txt');

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

			// remove existing ispconfig cronjobs, in case the syntax has changed
			@@ -1524,8 +1786,8 @@
			unlink('crontab.txt');
			}

			exec('touch /var/log/ispconfig/cron.log');
			exec('chmod 666 /var/log/ispconfig/cron.log');
			touch($conf['ispconfig_log_dir'].'/cron.log');
			chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);

			}

			@@ -1584,7 +1846,7 @@
			}

			if ( copy($tConf, $tConf.'~') ) {
			exec('chmod 400 '.$tConf.'~');
			chmod($tConf.'~', 0400);
			}
			}

			@@ -1610,7 +1872,8 @@
			}

			if (!empty($user) && !empty($group)) {
			exec("chown $user:$group $tConf");
			chown($tConf, $user);
			chgrp($tConf, $group);
			}

			if (!empty($access)) {
			@@ -1640,4 +1903,4 @@
			}
			}

			?>
			?>