From 9ac95d21faf99ad14918d0ad36f9bcb3dfa27513 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 29 Jun 2008 07:43:17 -0400
Subject: [PATCH] 

---
 install/lib/installer_base.lib.php |  713 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 425 insertions(+), 288 deletions(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 838e322..d94b94c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -33,17 +33,17 @@
 	var $wb = array();
 	var $language = 'en';
 	var $db;
-	private $conf;
-	/*
-	
-	*/
+	public $conf;
+	public $install_ispconfig_interface = true;
+
+
     public function __construct()
     {
         global $conf; //TODO: maybe $conf  should be passed to constructor
         $this->conf = $conf;
     }
 	
-    //TODO  uh ?
+    //: TODO  Implement the translation function and language files for the installer.
 	public function lng($text)
     {
 		return $text;
@@ -101,20 +101,15 @@
 		return $answer;
 	}
 	
+	/*
 	// TODO: this function is not used atmo I think - pedro
 	function request_language(){
 		
 		swriteln(lng('Enter your language'));
 		swriteln(lng('de, en'));
 		
-		/*
-		do {
-			$lang = sread(2);
-		} while (!$this->check_break($lang) or $this-> 
-		*/
-		
-		
 	}
+	*/
 	
 	/** Create the database for ISPConfig */ 
 	public function configure_database()
@@ -125,17 +120,6 @@
 		if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'])) {
 			$this->error('Unable to create MySQL database: '.$cf['database'].'.');
 		}
-		
-		//* Create the ISPConfig database user
-        $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
-                ."TO '".$cf['ispconfig_user']."'@'".$cf['host']."' "
-                ."IDENTIFIED BY '".$cf['ispconfig_password']."';";
-		if(!$this->db->query($query)) {
-			$this->error('Unable to create database user: '.$cf['ispconfig_user']);
-		}
-		
-		//* Reload database privelages
-		$this->db->query('FLUSH PRIVILEGES;');
 		
 		//* Set the database name in the DB library
 		$this->db->dbName = $cf['database'];
@@ -159,14 +143,46 @@
 		}
 	}
 	
-	/*
-		Create postfix configuration files
-	*/
+	//** Create the server record in the database
+	public function add_database_server_record() {
+		
+		global $conf;
+		$cf = $conf['mysql']; // make $conf['mysql'] more accessible
+		
+		if($cf['host'] == 'localhost') {
+			$from_host = 'localhost';
+		} else {
+			$from_host = $this->conf['hostname'];
+		}
+		
+		//* Create the ISPConfig database user
+        $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
+                ."TO '".$cf['ispconfig_user']."'@'".$from_host."' "
+                ."IDENTIFIED BY '".$cf['ispconfig_password']."';";
+		if(!$this->db->query($query)) {
+			$this->error('Unable to create database user: '.$cf['ispconfig_user']);
+		}
+		
+		//* Reload database privelages
+		$this->db->query('FLUSH PRIVILEGES;');
+		
+		//* Set the database name in the DB library
+		$this->db->dbName = $cf['database'];
+		
+		$server_ini_content = rf("tpl/server.ini.master");
+		$server_ini_content = addslashes($server_ini_content);
+		
+		$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', 'Server', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
+		$this->db->query($sql);
+		$conf['server_id'] = $this->db->insertID();
+		$this->conf['server_id'] = $conf['server_id'];
+	}
+	
 
+    //** writes postfix configuration files
     private function process_postfix_config($configfile)
     {
-        //$configfile = 'mysql-virtual_domains.cf';
-        $config_dir = $this->conf['dist']['postfix']['config_dir'].'/';
+        $config_dir = $this->conf['postfix']['config_dir'].'/';
         $full_file_name = $config_dir.$configfile; 
         //* Backup exiting file
         if(is_file($full_file_name)){
@@ -181,11 +197,29 @@
         wf($full_file_name, $content);
     }
 
-	
+	public function configure_jailkit()
+    {
+        $cf = $this->conf['jailkit'];
+		$config_dir = $cf['config_dir'];
+		$jk_init = $cf['jk_init'];
+		$jk_chrootsh = $cf['jk_chrootsh'];
+		
+		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.'~');
+			
+			copy('tpl/'.$jk_init.".master", $config_dir.'/'.$jk_init);
+			copy('tpl/'.$jk_chrootsh.".master", $config_dir.'/'.$jk_chrootsh);
+		}
+		
+    }
+        
 	public function configure_postfix($options = '')
     {
-		global $conf;
-		$config_dir = $this->conf['dist']['postfix']['config_dir'];
+        $cf = $this->conf['postfix'];
+		$config_dir = $cf['config_dir'];
+        
 		if(!is_dir($config_dir)){
             $this->error("The postfix configuration directory '$config_dir' does not exist.");
         }
@@ -213,121 +247,130 @@
 
 		//* mysql-virtual_client.cf
         $this->process_postfix_config('mysql-virtual_client.cf');
+		
+		//* mysql-virtual_relaydomains.cf
+        $this->process_postfix_config('mysql-virtual_relaydomains.cf');
 
 		//* Changing mode and group of the new created config files.
-		caselog("chmod o= ".$conf["dist"]["postfix"]["config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chmod on mysql-virtual_*.cf*","chmod on mysql-virtual_*.cf* failed");
-		caselog("chgrp ".$conf["dist"]["postfix"]["groupname"]." ".$conf["dist"]["postfix"]["config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chgrp on mysql-virtual_*.cf*","chgrp on mysql-virtual_*.cf* failed");
+		caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
+                 __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');
 		
-		// Creating virtual mail user and group
-		$command = "groupadd -g ".$conf["dist"]["postfix"]["vmail_groupid"]." ".$conf["dist"]["postfix"]["vmail_groupname"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		$command = "useradd -g ".$conf["dist"]["postfix"]["vmail_groupname"]." -u ".$conf["dist"]["postfix"]["vmail_userid"]." ".$conf["dist"]["postfix"]["vmail_username"]." -d ".$conf["dist"]["postfix"]["vmail_mailbox_base"]." -m";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);		
+		//* Creating virtual mail user and group
+		$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+
+		$command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
+		caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");		
 
 		$postconf_commands = array (
-			'myhostname = '.$conf["hostname"],
-			'mydestination = '.$conf["hostname"].', localhost, localhost.localdomain',
+			'myhostname = '.$this->conf['hostname'],
+			'mydestination = '.$this->conf['hostname'].', localhost, localhost.localdomain',
 			'mynetworks = 127.0.0.0/8',
 			'virtual_alias_domains =',
-			'virtual_alias_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_forwardings.cf, mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_email2email.cf',
-			'virtual_mailbox_domains = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_domains.cf',
-			'virtual_mailbox_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_mailboxes.cf',
-			'virtual_mailbox_base = '.$conf["dist"]["postfix"]["vmail_mailbox_base"],
-			'virtual_uid_maps = static:'.$conf["dist"]["postfix"]["vmail_userid"],
-			'virtual_gid_maps = static:'.$conf["dist"]["postfix"]["vmail_groupid"],
+			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
+			'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'],
 			'smtpd_sasl_auth_enable = yes',
 			'broken_sasl_auth_clients = yes',
-			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_recipient.cf, reject_unauth_destination',
+			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
 			'smtpd_use_tls = yes',
-			'smtpd_tls_cert_file = '.$conf["dist"]["postfix"]["config_dir"].'/smtpd.cert',
-			'smtpd_tls_key_file = '.$conf["dist"]["postfix"]["config_dir"].'/smtpd.key',
-			'transport_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_transports.cf',
+			'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',
 			'virtual_create_maildirsize = yes',
 			'virtual_mailbox_extended = yes',
-			'virtual_mailbox_limit_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_mailbox_limit_maps.cf',
+			'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:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_sender.cf',
-			'smtpd_client_restrictions = check_client_access mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_client.cf',
+			'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',
 			'maildrop_destination_concurrency_limit = 1',
 			'maildrop_destination_recipient_limit   = 1',
 			'virtual_transport = maildrop',
-			'header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/header_checks',
-			'mime_header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/mime_header_checks',
-			'nested_header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/nested_header_checks',
-			'body_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/body_checks'
+			'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'
 		);
 		
-		// Create the header ynd body check files
-		touch($conf["dist"]["postfix"]["config_dir"].'/header_checks');
-		touch($conf["dist"]["postfix"]["config_dir"].'/mime_header_checks');
-		touch($conf["dist"]["postfix"]["config_dir"].'/nested_header_checks');
-		touch($conf["dist"]["postfix"]["config_dir"].'/body_checks');
+		//* Create the header and body check files
+		touch($config_dir.'/header_checks');
+		touch($config_dir.'/mime_header_checks');
+		touch($config_dir.'/nested_header_checks');
+		touch($config_dir.'/body_checks');
 		
 		
-		// Make a backup copy of the main.cf file
-		copy($conf["dist"]["postfix"]["config_dir"].'/main.cf',$conf["dist"]["postfix"]["config_dir"].'/main.cf~');
+		//* Make a backup copy of the main.cf file
+		copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
 		
-		// Executing the postconf commands
+		//* Executing the postconf commands
 		foreach($postconf_commands as $cmd) {
 			$command = "postconf -e '$cmd'";
-			caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+			caselog($command." &> /dev/null", __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
 		}
 		
 		// TODO: Change the master.cf file
 		/*
 		Add:
-maildrop  unix  -       n       n       -       -       pipe
-  flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
-		
+        maildrop  unix  -       n       n       -       -       pipe
+        flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
 		*/
 		if(!stristr($options,'dont-create-certs')) {
-			// Create the SSL certificate
-			$command = "cd ".$conf["dist"]["postfix"]["config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
+			//* 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';
 			exec($command);
 		
-			$command = "chmod o= ".$conf["dist"]["postfix"]["config_dir"]."/smtpd.key";
-			caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+			$command = 'chmod o= '.$config_dir.'/smtpd.key';
+			caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
 		}
 		
-		/*
-		We have to change the permissions of the courier authdaemon directory
-		to make it accessible for maildrop.
-		*/
+		//** We have to change the permissions of the courier authdaemon directory to make it accessible for maildrop.
+		$command = 'chmod 755  /var/run/courier/authdaemon/';
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
 		
-		$command = "chmod 755  /var/run/courier/authdaemon/";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		// Changing maildrop lines in posfix master.cf
-		if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf')) copy($conf["dist"]["postfix"]["config_dir"].'/master.cf',$conf["dist"]["postfix"]["config_dir"].'/master.cf~');
-		if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf~')) exec('chmod 400 '.$conf["dist"]["postfix"]["config_dir"].'/master.cf~');
-		$configfile = $conf["dist"]["postfix"]["config_dir"].'/master.cf';
+		//* Changing maildrop lines in posfix master.cf
+		if(is_file($config_dir.'/master.cf')){
+            copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
+        }
+		if(is_file($config_dir.'/master.cf~')){
+            exec('chmod 400 '.$config_dir.'/master.cf~');
+        }
+		$configfile = $config_dir.'/master.cf';
 		$content = rf($configfile);
-		$content = str_replace('  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}','  flags=R user='.$conf["dist"]["postfix"]["vmail_username"].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',$content);
-		wf($configfile,$content);
+		$content = str_replace('  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}', 
+                   '  flags=R user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
+                     $content);
+		wf($configfile, $content);
 		
-		// Writing the Maildrop mailfilter file
+		//* Writing the Maildrop mailfilter file
 		$configfile = 'mailfilter';
-		if(is_file($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile)) copy($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile,$conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile.'~');
-		$content = rf("tpl/".$configfile.".master");
-		$content = str_replace('{dist_postfix_vmail_mailbox_base}',$conf["dist"]["postfix"]["vmail_mailbox_base"],$content);
-		wf($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile,$content);
+		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 = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
+		wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);
 		
-		// Create the directory for the custom mailfilters
-		$command = "mkdir ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/mailfilters";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		//* Create the directory for the custom mailfilters
+		$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
+		caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		// Chmod and chown the .mailfilter file
-		$command = "chown -R ".$conf["dist"]["postfix"]["vmail_username"].":".$conf["dist"]["postfix"]["vmail_groupname"]." ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/.mailfilter";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		//* Chmod and chown the .mailfilter file
+		$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
+		caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		$command = "chmod -R 600 ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/.mailfilter";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		
+		$command = 'chmod -R 600 '.$cf['vmail_mailbox_base'].'/.mailfilter';
+		caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
 	}
 	
@@ -336,14 +379,14 @@
 		
 	
 		$configfile = 'sasl_smtpd.conf';
-		if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf')) copy($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~');
-		if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["dist"]["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~')) exec('chmod 400 '.$conf["postfix"]["config_dir"].'/sasl/smtpd.conf~');
 		$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["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$content);
+		$content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
+		$content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
+		$content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
+		$content = str_replace('{mysql_server_ip}',$this->conf['mysql']['ip'],$content);
+		wf($conf["postfix"]["config_dir"].'/sasl/smtpd.conf',$content);
 		
 		// TODO: Chmod and chown on the config file
 		
@@ -353,7 +396,7 @@
 		exec('mkdir -p /var/spool/postfix/var/run/saslauthd');
 		
 		// Edit the file /etc/default/saslauthd
-		$configfile = $conf['dist']["saslauthd"]["config"];
+		$configfile = $conf["saslauthd"]["config"];
 		if(is_file($configfile)) copy($configfile,$configfile.'~');
 		if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
 		$content = rf($configfile);
@@ -362,7 +405,7 @@
 		wf($configfile,$content);
 		
 		// Edit the file /etc/init.d/saslauthd
-		$configfile = $conf["dist"]["init_scripts"].'/'.$conf["dist"]["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);
@@ -370,50 +413,55 @@
 		
 	}
 	
-	function configure_pam() {
-		global $conf;
-		
-		// configure pam for SMTP authentication agains the ispconfig database
+	public function configure_pam()
+    {
+		$pam = $this->conf['pam'];
+		//* configure pam for SMTP authentication agains the ispconfig database
 		$configfile = 'pamd_smtp';
-		if(is_file($conf['dist']['pam'].'/smtp')) copy($conf['dist']['pam'].'/smtp',$conf['dist']['pam'].'/smtp~');
-		if(is_file($conf['dist']['pam'].'/smtp~')) exec('chmod 400 '.$conf['dist']['pam'].'/smtp~');
-		$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['dist']['pam'].'/smtp',$content);
-		exec('chmod 660 '.$conf['dist']['pam'].'/smtp');
-		exec('chown daemon:daemon '.$conf['dist']['pam'].'/smtp');
+		if(is_file("$pam/smtp"))    copy("$pam/smtp", "$pam/smtp~");
+		if(is_file("$pam/smtp~"))   exec("chmod 400 $pam/smtp~");
+
+		$content = rf("tpl/$configfile.master");
+		$content = str_replace('{mysql_server_ispconfig_user}', $this->conf['mysql']['ispconfig_user'], $content);
+		$content = str_replace('{mysql_server_ispconfig_password}', $this->conf['mysql']['ispconfig_password'], $content);
+		$content = str_replace('{mysql_server_database}', $this->conf['mysql']['database'], $content);
+		$content = str_replace('{mysql_server_ip}', $this->conf['mysql']['ip'], $content);
+		wf("$pam/smtp", $content);
+		exec("chmod 660 $pam/smtp");
+		exec("chown daemon:daemon $pam/smtp");
 	
 	}
 	
-	function configure_courier() {
-		global $conf;
-		
-		// authmysqlrc
+	public function configure_courier()
+    {
+		$config_dir = $this->conf['courier']['config_dir'];
+		//* authmysqlrc
 		$configfile = 'authmysqlrc';
-		if(is_file($conf["dist"]["courier"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$conf["dist"]["courier"]["config_dir"].'/'.$configfile.'~');
-		exec('chmod 400 '.$conf["dist"]["courier"]["config_dir"].'/'.$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);
-		wf($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$content);
+		if(is_file("$config_dir/$configfile")){
+            copy("$config_dir/$configfile", "$config_dir/$configfile~");
+        }
+		exec("chmod 400 $config_dir/$configfile~");
+		$content = rf("tpl/$configfile.master");
+		$content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
+		$content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
+		$content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
+		$content = str_replace('{mysql_server_host}',$this->conf['mysql']['host'],$content);
+		wf("$config_dir/$configfile", $content);
 		
-		exec('chmod 660 '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
-		exec('chown daemon:daemon '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
+		exec("chmod 660 $config_dir/$configfile");
+		exec("chown daemon:daemon $config_dir/$configfile");
 		
-		//authdaemonrc
-		$configfile = $conf["dist"]["courier"]["config_dir"].'/authdaemonrc';
-		if(is_file($configfile)) copy($configfile,$configfile.'~');
-		if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
+		//* authdaemonrc
+		$configfile = $this->conf['courier']['config_dir'].'/authdaemonrc';
+		if(is_file($configfile)){
+            copy($configfile, $configfile.'~');
+        }
+		if(is_file($configfile.'~')){
+            exec('chmod 400 '.$configfile.'~');
+        }
 		$content = rf($configfile);
-		$content = str_replace('authmodulelist="authpam"','authmodulelist="authmysql"',$content);
-		wf($configfile,$content);
-		
-		
+		$content = str_replace('authmodulelist="authpam"', 'authmodulelist="authmysql"', $content);
+		wf($configfile, $content);
 	}
 	
 	function configure_amavis() {
@@ -421,15 +469,15 @@
 		
 		// amavisd user config file
 		$configfile = 'amavisd_user_config';
-		if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$conf["dist"]["courier"]["config_dir"].'/50-user~');
-		if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~');
+		if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["amavis"]["config_dir"].'/conf.d/50-user',$conf["courier"]["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");
-		$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_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
+		$content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
+		$content = str_replace('{mysql_server_database}',$this->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["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$content);
+		$content = str_replace('{mysql_server_ip}',$this->conf['mysql']['ip'],$content);
+		wf($conf["amavis"]["config_dir"].'/conf.d/50-user',$content);
 		
 		// TODO: chmod and chown on the config file
 		
@@ -441,20 +489,20 @@
 		);
 		
 		// Make a backup copy of the main.cf file
-		copy($conf["dist"]["postfix"]["config_dir"].'/main.cf',$conf["dist"]["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) {
 			$command = "postconf -e '$cmd'";
-			caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+			caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		}
 		
 		// Append the configuration for amavisd to the master.cf file
-		if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf')) copy($conf["dist"]["postfix"]["config_dir"].'/master.cf',$conf["dist"]["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("tpl/master_cf_amavis.master");
 		// Only add the content if we had not addded it before
 		if(!stristr("127.0.0.1:10025 inet n - - - - smtpd",$content)) {
-			af($conf["dist"]["postfix"]["config_dir"].'/master.cf',$content);
+			af($conf["postfix"]["config_dir"].'/master.cf',$content);
 		}
 		
 		// Add the clamav user to the amavis group
@@ -463,196 +511,285 @@
 		
 	}
 	
-	function configure_spamassassin() {
-		global $conf;
-		
-		// Enable spamasasssin in debian and ubunti
+	public function configure_spamassassin()
+    {
+		//* Enable spamasasssin on debian and ubuntu
 		$configfile = '/etc/default/spamassassin';
-		if(is_file($configfile)) copy($configfile,$configfile.'~');
+		if(is_file($configfile)){
+            copy($configfile, $configfile.'~');
+        }
 		$content = rf($configfile);
-		$content = str_replace('ENABLED=0','ENABLED=1',$content);
-		wf($configfile,$content);
+		$content = str_replace('ENABLED=0', 'ENABLED=1', $content);
+		wf($configfile, $content);
 	}
 	
-	function configure_getmail() {
-		global $conf;
+	public function configure_getmail()
+    {
+		$config_dir = $this->conf['getmail']['config_dir'];
 		
-		$command = 'useradd -d '.$conf["dist"]["getmail"]["config_dir"].' getmail';
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
+
+		$command = "useradd -d $config_dir getmail";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		$command = 'chown -R getmail '.$conf["dist"]["getmail"]["config_dir"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		$command = "chown -R getmail $config_dir";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		$command = 'chmod -R 700 '.$conf["dist"]["getmail"]["config_dir"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		$command = "chmod -R 700 $config_dir";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 	}
 	
 	
-	function configure_pureftpd() {
+	public function configure_pureftpd()
+    {
 		global $conf;
 		
-		// configure pam for SMTP authentication agains the ispconfig database
+		$config_dir = $this->conf['pureftpd']['config_dir'];
+
+		//* configure pam for SMTP authentication agains the ispconfig database
 		$configfile = 'db/mysql.conf';
-		if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~');
-		if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~');
-		$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($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$content);
-		exec('chmod 600 '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
-		exec('chown root:root '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
-		// enable chrooting
-		exec('mkdir -p '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
-		exec('echo "yes" > '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
-	
+		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~");
+        }
+		$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");
+		// **enable chrooting
+		//exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone');
+		exec('echo "yes" > '.$config_dir.'/conf/ChrootEveryone');
 	}
 	
-	function configure_mydns() {
+	public function configure_mydns()
+    {
 		global $conf;
 		
 		// configure pam for SMTP authentication agains the ispconfig database
 		$configfile = 'mydns.conf';
-		if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["mydns"]["config_dir"].'/'.$configfile,$conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~');
-		if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["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.'~')) exec('chmod 400 '.$conf["mydns"]["config_dir"].'/'.$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_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["dist"]["mydns"]["config_dir"].'/'.$configfile,$content);
-		exec('chmod 600 '.$conf["dist"]["mydns"]["config_dir"].'/'.$configfile);
-		exec('chown root:root '.$conf["dist"]["mydns"]["config_dir"].'/'.$configfile);
+		wf($conf["mydns"]["config_dir"].'/'.$configfile,$content);
+		exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile);
+		exec('chown root:root '.$conf["mydns"]["config_dir"].'/'.$configfile);
 	
 	}
 	
-	function configure_apache() {
-		global $conf;
-		
-		// Create the logging directory for the vhost logfiles
-		exec("mkdir -p /var/log/ispconfig/httpd");
+	public function configure_apache()
+    {	
+		//* Create the logging directory for the vhost logfiles
+		exec('mkdir -p /var/log/ispconfig/httpd');
 		
 	}
 	
 	
-	function install_ispconfig() {
+	public function install_ispconfig()
+    {
 		global $conf;
 		
-		// Create the ISPConfig installation directory
-		$command = "mkdir ".$conf["ispconfig_install_dir"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		// Create a ISPConfig user and group
-		$command = "groupadd ispconfig";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		$command = "useradd -g ispconfig -d ".$conf["ispconfig_install_dir"]." ispconfig";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		// copy the ISPConfig interface part
-		$command = "cp -rf ../interface ".$conf["ispconfig_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 ".$conf["ispconfig_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
-		$command = "ln -s ".$conf["ispconfig_install_dir"]."/interface/web/ /var/www/ispconfig";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-		
-		// Create the config file for ISPConfig interface
-		$configfile = 'config.inc.php';
-		if(is_file($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$conf["ispconfig_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);
-		wf($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$content);
-		
-		// Create the config file for ISPConfig server
-		$configfile = 'config.inc.php';
-		if(is_file($conf["ispconfig_install_dir"].'/server/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$conf["ispconfig_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('{server_id}',$conf["server_id"],$content);
-		wf($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$content);
-		
-		
-		// Chmod the files
-		$command = "chmod -R 750 ".$conf["ispconfig_install_dir"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		$install_dir = $this->conf['ispconfig_install_dir'];
 
-		// chown the files to the ispconfig user and group
-		$command = "chown -R ispconfig:ispconfig ".$conf["ispconfig_install_dir"];
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		//* Create the ISPConfig installation directory
+		$command = "mkdir $install_dir";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		// make sure that the server config file (not the interface one) is only readable by the root user
-		exec('chmod 600 '.$conf["ispconfig_install_dir"].'/server/lib/'.$configfile);
-		exec('chown root:root '.$conf["ispconfig_install_dir"].'/server/lib/'.$configfile);
+		//* Create a ISPConfig user and group
+		$command = 'groupadd ispconfig';
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+		
+		$command = "useradd -g ispconfig -d $install_dir ispconfig";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+		
+		//* copy the ISPConfig interface part
+		$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";
+		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
+		// $command = "ln -s $install_dir/interface/web/ /var/www/ispconfig";
+		// caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+		
+		//* 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~");
+        }
+		$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("$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 = 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("$install_dir/server/lib/$configfile", $content);
+		
+		
+		//* Enable the server modules and plugins.
+		// TODO: Implement a selector which modules and plugins shall be enabled.
+		$dir = $install_dir.'/server/mods-available/';
+		if (is_dir($dir)) {
+			if ($dh = opendir($dir)) {
+				while (($file = readdir($dh)) !== false) {
+					if($file != '.' && $file != '..') {
+						if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
+					}
+				}
+				closedir($dh);
+			}
+		}
+		
+		$dir = $install_dir.'/server/plugins-available/';
+		if (is_dir($dir)) {
+			if ($dh = opendir($dir)) {
+				while (($file = readdir($dh)) !== false) {
+					if($file != '.' && $file != '..') {
+						if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
+					}
+				}
+				closedir($dh);
+			}
+		}
+		
+		//* Chmod the files
+		$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";
+		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
+		exec("chmod -R 770 $install_dir/interface/web/temp");
+		
+		//* Make all interface language file directories group writable
+		$handle = @opendir($install_dir.'/interface/web');
+		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)) {
+						if ($lang_file != '.' && $lang_file != '..') {
+							chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file,0770);
+						}
+					}
+				}
+			}
+		}
+		
+		//* 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");
 		
 		// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
 		// and must be fixed as this will allow the apache user to read the ispconfig files.
 		// Later this must run as own apache server or via suexec!
+		$command = 'adduser www-data ispconfig';
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		$command = "adduser www-data ispconfig";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		//* Make the shell scripts executable
+		$command = "chmod +x $install_dir/server/scripts/*.sh";
+		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 		
-		// Make the shell scripts executable
-		$command = "chmod +x ".$conf["ispconfig_install_dir"]."/server/scripts/*.sh";
-		caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+		//* Copy the ISPConfig vhost for the controlpanel
+        // TODO: These are missing! should they be "vhost_dist_*_dir" ?
+        $vhost_conf_dir = $this->conf['apache']['vhost_conf_dir'];
+        $vhost_conf_enabled_dir = $this->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}', $this->conf['apache']['vhost_port'], $content);
+		wf("$vhost_conf_dir/ispconfig.vhost", $content);
 		
-		// Copy the ISPConfig vhost for the controlpanel
-		copy('tpl/apache_ispconfig.vhost.master',$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost');
-		// and create the symlink
-		if(!is_link($conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost')) {
-			exec('ln -s '.$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost '.$conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost');
+		//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/ispconfig.vhost")) {
+				exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+			}
 		}
 		
+		// Make the Clamav log files readable by ISPConfig
+		exec('chmod +r /var/log/clamav/clamav.log');
+		exec('chmod +r /var/log/clamav/freshclam.log');
+		
+		//* Install the SVN update script
+		exec('cp ../helper_scripts/update_from_svn.sh /usr/local/bin/ispconfig_update_from_svn.sh');
+		exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
+		exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
+		
+		//set the fast cgi starter script to executable
+		exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
 	}
 	
-	function install_crontab() {
-		global $conf;
-		
-		// Root Crontab
-		exec("crontab -u root -l > crontab.txt");
+	public function install_crontab()
+    {		
+		//* Root Crontab
+		exec('crontab -u root -l > crontab.txt');
 		$existing_root_cron_jobs = file('crontab.txt');
 		
-		$root_cron_jobs = array('* * * * * /usr/bin/php -q /usr/local/ispconfig/server/server.php &> /dev/null');
+		$root_cron_jobs = array(
+			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
+			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
+		);
 		foreach($root_cron_jobs as $cron_job) {
-			if(!in_array($cron_job."\n",$existing_root_cron_jobs)) {
+			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";
 			}
 		}
-		file_put_contents('crontab.txt',$existing_root_cron_jobs);
-		exec("crontab -u root crontab.txt &> /dev/null");
+		file_put_contents('crontab.txt', $existing_root_cron_jobs);
+		exec('crontab -u root crontab.txt &> /dev/null');
 		unlink('crontab.txt');
 		
-		// Getmail crontab
-		exec("crontab -u getmail -l > crontab.txt");
+		//* Getmail crontab
+        $cf = $this->conf['getmail'];
+		exec('crontab -u getmail -l > crontab.txt');
 		$existing_cron_jobs = file('crontab.txt');
 		
-		$cron_jobs = array('*/5 * * * * '.$conf["dist"]["getmail"]["program"].' -g '.$conf["dist"]["getmail"]["config_dir"].' -r '.$conf["dist"]["getmail"]["config_dir"].'/*.conf &> /dev/null');
+		$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
 		foreach($cron_jobs as $cron_job) {
-			if(!in_array($cron_job."\n",$existing_cron_jobs)) {
+			if(!in_array($cron_job."\n", $existing_cron_jobs)) {
 				$existing_cron_jobs[] = $cron_job."\n";
 			}
 		}
-		file_put_contents('crontab.txt',$existing_cron_jobs);
-		exec("crontab -u getmail crontab.txt &> /dev/null");
+		file_put_contents('crontab.txt', $existing_cron_jobs);
+		exec('crontab -u getmail crontab.txt &> /dev/null');
 		unlink('crontab.txt');
-		
 	}
-	
-	
 	
 }
 
-?>
+?>
\ No newline at end of file

--
Gitblit v1.9.1