From 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 26 Sep 2010 09:36:55 -0400
Subject: [PATCH] Merged revisions 1917-2036 from trunk.
---
install/autoupdate.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index d273c6a..1629d6a 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -77,9 +77,9 @@
$conf_old = $conf;
unset($conf);
-if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
+if($dist['id'] == '') die('Linux distribution or version not recognized.');
-//** Include the distribution specific installer class library and configuration
+//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php');
@@ -128,7 +128,7 @@
/*
* Try to read the DB-admin settings
-*/
+ */
$clientdb_host = '';
$clientdb_user = '';
$clientdb_password = '';
@@ -174,12 +174,12 @@
/*
* dump the new Database and reconfigure the server.ini
-*/
+ */
updateDbAndIni();
/*
* Reconfigure all Services
-*/
+ */
if($conf['services']['mail'] == true) {
//** Configure postfix
swriteln('Configuring Postfix');
@@ -306,4 +306,4 @@
echo "Update finished.\n";
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1