From 2cbff3b553d2e65ef67797b85176e3d87c8a97ce Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 14 Jan 2010 10:02:28 -0500
Subject: [PATCH] Fixed: FS#1007 - add a stricter check for getmail domains names.
---
server/scripts/ispconfig_update.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index cd301d4..f7615e1 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -91,15 +91,17 @@
$method = simple_query('Select update method', array('stable','svn'), 'stable');
if($method == 'stable') {
- $new_version = file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
+ $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
$new_version = trim($new_version);
if($new_version != ISPC_APP_VERSION) {
- exec('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
+ exit;
} else {
- echo "There are no updates available.\n";
+ echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
}
} else {
- exec('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ exit;
}
--
Gitblit v1.9.1