From a2b6197881fabdb417bd03fea15e2750f1160490 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 25 Nov 2011 14:03:48 -0500
Subject: [PATCH] Removed ISPConfig update function from interface. Use ispconfig_update.sh on the shell instead.
---
server/server.sh | 22 ++--------------------
server/mods-available/remoteaction_core_module.inc.php | 6 ++++--
install/autoupdate.php | 2 ++
interface/web/admin/lib/module.conf.php | 4 +++-
interface/web/admin/remote_action_ispcupdate.php | 2 ++
5 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index ba5b1a1..e43cd51 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -31,6 +31,8 @@
ISPConfig 3 updater.
*/
+die("Autoupdate has been removed.\nPlease start the update on the shell with the command ispconfig_update.sh as root user.\n");
+
error_reporting(E_ALL|E_STRICT);
/*
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 4a0b48e..20fb322 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -193,11 +193,13 @@
'target' => 'content',
'link' => 'admin/remote_action_osupdate.php',
'html_id'=> 'osupdate');
-
+/*
+// ISPConfig interface update has been removed. Please use ispconfig_update.sh on the shell instead.
$items[] = array( 'title' => 'Do ISPConfig-Update',
'target' => 'content',
'link' => 'admin/remote_action_ispcupdate.php',
'html_id'=> 'ispcupdate');
+*/
$module['nav'][] = array( 'title' => 'Remote Actions',
'open' => 1,
diff --git a/interface/web/admin/remote_action_ispcupdate.php b/interface/web/admin/remote_action_ispcupdate.php
index e23bb99..5bde7e1 100644
--- a/interface/web/admin/remote_action_ispcupdate.php
+++ b/interface/web/admin/remote_action_ispcupdate.php
@@ -27,6 +27,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+die('Function has been removed.');
+
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 1f6ab09..49294f4 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -119,12 +119,14 @@
* we stop executing the actions not to waste more time */
return;
}
+
if ($action['action_type'] == 'ispc_update') {
/* do the update */
- $this->_doIspCUpdate($action);
+ // Update function has been removed
+ // $this->_doIspCUpdate($action);
/* this action takes so much time,
* we stop executing the actions not to waste more time */
- return;
+ $this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_start_vm') {
$veid = intval($action['action_param']);
diff --git a/server/server.sh b/server/server.sh
index 2a6b2c4..86adc00 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -4,23 +4,5 @@
. /etc/profile
-if [ -f /tmp/ispconfig3_install/install/autoupdate ]; then
- #
- # there is a auto-update waiting for update, so let's do it
- #
- cd /tmp/ispconfig3_install/install
- /usr/bin/php -q autoupdate.php
- cd /
-
- #
- # do some clean-up
- #
- rm /tmp/ispconfig3_install -R
-
-else
- #
- # there is no update waiting, so lets start the ISPConfig-System
- #
- cd /usr/local/ispconfig/server
- /usr/bin/php -q /usr/local/ispconfig/server/server.php
-fi
\ No newline at end of file
+cd /usr/local/ispconfig/server
+/usr/bin/php -q /usr/local/ispconfig/server/server.php
--
Gitblit v1.9.1