From 58e87deee711447b6d0929242dc25cd7c0af8d49 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Jan 2012 11:47:44 -0500
Subject: [PATCH] Added: FS#1955 - Add update instructions for the shell update on the system > update page in ISPConfig
---
interface/web/admin/lib/lang/en_remote_action.lng | 2 ++
interface/web/admin/templates/remote_action_ispcupdate.htm | 8 ++++++++
interface/web/admin/lib/module.conf.php | 4 ++--
interface/web/admin/remote_action_ispcupdate.php | 7 +++++--
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/interface/web/admin/lib/lang/en_remote_action.lng b/interface/web/admin/lib/lang/en_remote_action.lng
index 4d6a062..ad96e1f 100644
--- a/interface/web/admin/lib/lang/en_remote_action.lng
+++ b/interface/web/admin/lib/lang/en_remote_action.lng
@@ -7,4 +7,6 @@
$wb['do_ispcupdate_desc'] = "This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>";
$wb['action_scheduled'] = "The action is scheduled for execution";
$wb['select_all_server'] = "All servers";
+$wb['ispconfig_update_title'] = "ISPConfig update instructions";
+$wb['ispconfig_update_text'] = "Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href='http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/' target='_blank'>Click here for detailed update instructins</a>";
?>
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 20fb322..84959d6 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -193,13 +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 5bde7e1..a72f942 100644
--- a/interface/web/admin/remote_action_ispcupdate.php
+++ b/interface/web/admin/remote_action_ispcupdate.php
@@ -27,7 +27,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-die('Function has been removed.');
+//die('Function has been removed.');
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
@@ -50,6 +50,7 @@
/*
* We need a list of all Servers
*/
+
$sysServers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<option value='*'>" . $wb['select_all_server'] . "</option>";
foreach ($sysServers as $server) {
@@ -62,7 +63,9 @@
/*
* If the user wants to do the action, write this to our db
*/
-if (isset($_POST['server_select'])) {
+
+//* Note: Disabled post action
+if (1 == 0 && isset($_POST['server_select'])) {
$server = $_POST['server_select'];
$servers = array();
if ($server == '*') {
diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm
index 156949a..7baca7a 100644
--- a/interface/web/admin/templates/remote_action_ispcupdate.htm
+++ b/interface/web/admin/templates/remote_action_ispcupdate.htm
@@ -1,9 +1,15 @@
+<!--
<h2><tmpl_var name="do_ispcupdate_caption"></h2>
<p><tmpl_var name="do_ispcupdate_desc"></p>
+-->
+
+<h2><tmpl_var name="ispconfig_update_title"></h2>
+<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
<div class="panel panel_language_add">
<div class="pnl_formsarea">
+ <!--
<fieldset class="inlineLabels"><legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
<div class="ctrlHolder">
<label for="server_select">{tmpl_var name='select_server_txt'}</label>
@@ -17,9 +23,11 @@
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
+
<div class="buttonHolder buttons">
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_ispcupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
</div>
+ -->
</div>
</div>
--
Gitblit v1.9.1