diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index 53ed1890092e7aad5e402a19eb8d0685abb779fa..4a1af3a181421b87634d61bd13c7eee9b8866637 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -1,296 +1,296 @@
-<?php
-/*
-Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-function prepareDBDump() {
-	global $conf;
-
-	//** load the pre update sql script do perform modifications on the database before the database is dumped
-	if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
-		if($conf['mysql']['admin_password'] == '') {
-			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
-		} else {
-			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
-		}
-	}
-
-	//** export the current database data
-	if( !empty($conf["mysql"]["admin_password"]) ) {
-
-		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
-	}
-	else {
-
-		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
-	}
-
-	/*
-	 * If we have a server with nothing in it except VE's then the database of thie server is empty.
-	 * so the following line will no longer work!
-	 */
-	//if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql');
-
-	// create a backup copy of the ispconfig database in the root folder
-	$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
-	copy('existing_db.sql',$backup_db_name);
-	chmod($backup_db_name, 0700);
-	chown($backup_db_name, 'root');
-	chgrp($backup_db_name, 'root');
-
-	if ($conf['powerdns']['installed']) {
-		//** export the current PowerDNS database data
-        	if( !empty($conf["mysql"]["admin_password"]) ) {
-            		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
-        	} else {
-            		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
-        	}
-
-		// create a backup copy of the PowerDNS database in the root folder
-		$backup_db_name = '/root/ispconfig_powerdns_db_backup_'.@date('Y-m-d_h-i').'.sql';
-	        copy('existing_powerdns_db.sql',$backup_db_name);
-		chmod($backup_db_name, 0700);
-	        chown($backup_db_name, 'root');
-	        chgrp($backup_db_name, 'root');
-	}
-}
-
-function checkDbHealth() {
-	global $conf;
-
-	//* Array containing non OK tables (can be repaired, crashed, corrupt)
-	$notok = array();
-
-	echo "Checking ISPConfig database .. ";
-	exec("mysqlcheck -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -r ".$conf["mysql"]["database"], $result);
-	for( $i=0; $i<sizeof($result);$i++) {
-		if ( substr($result[$i], -2) != "OK" ) {
-			$notok[] = $result[$i];
-		}
-	}
-
-	if ( sizeof($notok) > 0 ) {
-		echo "\nSome tables where not 'OK'. Please check the list below.\n\n";
-		foreach ($notok as $key => $value) {
-			echo "$value\n";
-		}
-		echo "\nPress enter to continue or CTRL-C to cancel the installation ..";
-		sread();
-	}
-	else
-	  echo "OK\n";
-}
-
-function updateDbAndIni() {
-	global $inst, $conf;
-
-	//* Update $conf array with values from the server.ini that shall be preserved
-	$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
-	$ini_array = ini_to_array(stripslashes($tmp['config']));
-	$current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
-
-	if(count($ini_array) == 0) die('Unable to read server configuration from database.');
-
-	$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
-	$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
-	$conf['services']['dns'] = ($tmp['dns_server'] == 1)?true:false;
-	$conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
-	$conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
-	$conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
-	$conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false;
-	$conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false;
-	
-	$conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];
-	
-	//* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
-	if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) >= 0) {
-		
-		swriteln($inst->lng('Starting incremental database update.'));
-		
-		//* get the version of the db schema from the server table 
-		$found = true;
-		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)) {
-				//* Load patch file into database
-				if( !empty($conf["mysql"]["admin_password"]) ) {
-					system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
-				} else {
-					system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
-				}
-				swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
-				$current_db_version = $next_db_version;
-			} else {
-				$found = false;
-			}
-		}
-		
-		//* update the database version in server table
-		$inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
-		
-	
-	//* If ISPConfig Version < 3.0.3, we will do a full db update
-	} else {
-		
-		swriteln($inst->lng('Starting full database update.'));
-		
-		//** Delete the old database
-		if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
-		$inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
-		}
-
-		//** Create the mysql database
-		$inst->configure_database();
-
-		//** empty all databases
-		$db_tables = $inst->db->getTables();
-
-		foreach($db_tables as $table) {
-			$inst->db->query("TRUNCATE $table");
-		}
-
-		//** load old data back into database
-		if( !empty($conf["mysql"]["admin_password"]) ) {
-			system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
-		} else {
-			system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
-		}
-		
-		//** Get the database version number based on the patchfile
-		$found = true;
-		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;
-			}
-		}
-		
-		//* update the database version in server table
-		$inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
-
-		if ($conf['powerdns']['installed']) {
-                                                 
-			swriteln($inst->lng('Starting full PowerDNS database update.'));
-
-            //** Delete the old PowerDNS database
-            if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['powerdns']['database']) ) {
-				$inst->error('Unable to drop MySQL database: '.$conf['powerdns']['database'].'.');
-            }
-
-            //** Create the mysql database
-            $inst->configure_powerdns();
-
-            //** load old data back into the PowerDNS database
-            if( !empty($conf["mysql"]["admin_password"]) ) {
-            	system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
-            } else {
-            	system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
-            }
-		}
-	}
-
-
-	//** Update server ini
-	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
-	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
-	unset($tmp_server_rec);
-	$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
-	
-	//* Update further distribution specific parameters for server config here
-	//* HINT: Every line added here has to be added in installer_base.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'];
-	$tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
-	$tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];
-	$tpl_ini_array['server']['hostname'] = $conf['hostname'];
-	$tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
-	$tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
-	$tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
-	$tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
-	$tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir'];
-	$tpl_ini_array['web']['security_level'] = 20;
-	$tpl_ini_array['web']['user'] = $conf['apache']['user'];
-	$tpl_ini_array['web']['group'] = $conf['apache']['group'];
-	$tpl_ini_array['web']['php_ini_path_apache'] = $conf['apache']['php_ini_path_apache'];
-	$tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi'];
-	$tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier';
-	$tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop';
-	$tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user'];
-	$tpl_ini_array['dns']['bind_group'] = $conf['bind']['bind_group'];
-	$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'];
-
-	// update the new template with the old values
-	if(is_array($old_ini_array)) {
-		foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
-			foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
-				$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
-			}
-		}
-	}
-
-	$new_ini = array_to_ini($tpl_ini_array);
-	$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']);
-	unset($old_ini_array);
-	unset($tpl_ini_array);
-	unset($new_ini);
-
-
-	//** Update system ini
-	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
-	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
-	unset($tmp_server_rec);
-	$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
-
-	// update the new template with the old values
-	if(is_array($old_ini_array)) {
-		foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
-			foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
-				$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
-			}
-		}
-	}
-
-	$new_ini = array_to_ini($tpl_ini_array);
-	$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
-	if($tmp['number'] == 0) {
-		$inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
-	} else {
-		$inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
-	}
-	unset($old_ini_array);
-	unset($tpl_ini_array);
-	unset($new_ini);
-}
-
-?>
+<?php
+/*
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+function prepareDBDump() {
+	global $conf;
+
+	//** load the pre update sql script do perform modifications on the database before the database is dumped
+	if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
+		if($conf['mysql']['admin_password'] == '') {
+			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+		} else {
+			caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+		}
+	}
+
+	//** export the current database data
+	if( !empty($conf["mysql"]["admin_password"]) ) {
+
+		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+	}
+	else {
+
+		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+	}
+
+	/*
+	 * If we have a server with nothing in it except VE's then the database of thie server is empty.
+	 * so the following line will no longer work!
+	 */
+	//if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql');
+
+	// create a backup copy of the ispconfig database in the root folder
+	$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
+	copy('existing_db.sql',$backup_db_name);
+	chmod($backup_db_name, 0700);
+	chown($backup_db_name, 'root');
+	chgrp($backup_db_name, 'root');
+
+	if ($conf['powerdns']['installed']) {
+		//** export the current PowerDNS database data
+        	if( !empty($conf["mysql"]["admin_password"]) ) {
+            		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+        	} else {
+            		system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+        	}
+
+		// create a backup copy of the PowerDNS database in the root folder
+		$backup_db_name = '/root/ispconfig_powerdns_db_backup_'.@date('Y-m-d_h-i').'.sql';
+	        copy('existing_powerdns_db.sql',$backup_db_name);
+		chmod($backup_db_name, 0700);
+	        chown($backup_db_name, 'root');
+	        chgrp($backup_db_name, 'root');
+	}
+}
+
+function checkDbHealth() {
+	global $conf;
+
+	//* Array containing non OK tables (can be repaired, crashed, corrupt)
+	$notok = array();
+
+	echo "Checking ISPConfig database .. ";
+	exec("mysqlcheck -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -r ".$conf["mysql"]["database"], $result);
+	for( $i=0; $i<sizeof($result);$i++) {
+		if ( substr($result[$i], -2) != "OK" ) {
+			$notok[] = $result[$i];
+		}
+	}
+
+	if ( sizeof($notok) > 0 ) {
+		echo "\nSome tables where not 'OK'. Please check the list below.\n\n";
+		foreach ($notok as $key => $value) {
+			echo "$value\n";
+		}
+		echo "\nPress enter to continue or CTRL-C to cancel the installation ..";
+		sread();
+	}
+	else
+	  echo "OK\n";
+}
+
+function updateDbAndIni() {
+	global $inst, $conf;
+
+	//* Update $conf array with values from the server.ini that shall be preserved
+	$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+	$ini_array = ini_to_array(stripslashes($tmp['config']));
+	$current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
+
+	if(count($ini_array) == 0) die('Unable to read server configuration from database.');
+
+	$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
+	$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
+	$conf['services']['dns'] = ($tmp['dns_server'] == 1)?true:false;
+	$conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
+	$conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
+	$conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
+	$conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false;
+	$conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false;
+	
+	$conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];
+	
+	//* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
+	if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) >= 0) {
+		
+		swriteln($inst->lng('Starting incremental database update.'));
+		
+		//* get the version of the db schema from the server table 
+		$found = true;
+		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)) {
+				//* Load patch file into database
+				if( !empty($conf["mysql"]["admin_password"]) ) {
+					system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
+				} else {
+					system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
+				}
+				swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
+				$current_db_version = $next_db_version;
+			} else {
+				$found = false;
+			}
+		}
+		
+		//* update the database version in server table
+		$inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
+		
+	
+	//* If ISPConfig Version < 3.0.3, we will do a full db update
+	} else {
+		
+		swriteln($inst->lng('Starting full database update.'));
+		
+		//** Delete the old database
+		if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
+		$inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
+		}
+
+		//** Create the mysql database
+		$inst->configure_database();
+
+		//** empty all databases
+		$db_tables = $inst->db->getTables();
+
+		foreach($db_tables as $table) {
+			$inst->db->query("TRUNCATE $table");
+		}
+
+		//** load old data back into database
+		if( !empty($conf["mysql"]["admin_password"]) ) {
+			system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
+		} else {
+			system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
+		}
+		
+		//** Get the database version number based on the patchfile
+		$found = true;
+		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;
+			}
+		}
+		
+		//* update the database version in server table
+		$inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
+
+		if ($conf['powerdns']['installed']) {
+                                                 
+			swriteln($inst->lng('Starting full PowerDNS database update.'));
+
+            //** Delete the old PowerDNS database
+            if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['powerdns']['database']) ) {
+				$inst->error('Unable to drop MySQL database: '.$conf['powerdns']['database'].'.');
+            }
+
+            //** Create the mysql database
+            $inst->configure_powerdns();
+
+            //** load old data back into the PowerDNS database
+            if( !empty($conf["mysql"]["admin_password"]) ) {
+            	system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+            } else {
+            	system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+            }
+		}
+	}
+
+
+	//** Update server ini
+	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
+	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
+	unset($tmp_server_rec);
+	$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
+	
+	//* Update further distribution specific parameters for server config here
+	//* HINT: Every line added here has to be added in installer_base.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'];
+	$tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
+	$tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];
+	$tpl_ini_array['server']['hostname'] = $conf['hostname'];
+	$tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
+	$tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
+	$tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
+	$tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
+	$tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir'];
+	$tpl_ini_array['web']['security_level'] = 20;
+	$tpl_ini_array['web']['user'] = $conf['apache']['user'];
+	$tpl_ini_array['web']['group'] = $conf['apache']['group'];
+	$tpl_ini_array['web']['php_ini_path_apache'] = $conf['apache']['php_ini_path_apache'];
+	$tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi'];
+	$tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier';
+	$tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop';
+	$tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user'];
+	$tpl_ini_array['dns']['bind_group'] = $conf['bind']['bind_group'];
+	$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'];
+
+	// update the new template with the old values
+	if(is_array($old_ini_array)) {
+		foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
+			foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
+				$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
+			}
+		}
+	}
+
+	$new_ini = array_to_ini($tpl_ini_array);
+	$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']);
+	unset($old_ini_array);
+	unset($tpl_ini_array);
+	unset($new_ini);
+
+
+	//** Update system ini
+	$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
+	$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
+	unset($tmp_server_rec);
+	$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
+
+	// update the new template with the old values
+	if(is_array($old_ini_array)) {
+		foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
+			foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
+				$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
+			}
+		}
+	}
+
+	$new_ini = array_to_ini($tpl_ini_array);
+	$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
+	if($tmp['number'] == 0) {
+		$inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
+	} else {
+		$inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+	}
+	unset($old_ini_array);
+	unset($tpl_ini_array);
+	unset($new_ini);
+}
+
+?>