Removed ISPConfig update function from interface. Use ispconfig_update.sh o...

tbrehm

2011-11-25 a2b6197881fabdb417bd03fea15e2750f1160490

Removed ISPConfig update function from interface. Use ispconfig_update.sh on the shell instead.

 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);

/*

 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,

 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');


 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']);

 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
cd /usr/local/ispconfig/server
/usr/bin/php -q /usr/local/ispconfig/server/server.php