extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

- updated documentation

Browse Source 
- add feature to allow apps to choose to be automatic installed on
  updated: $setup_info[$app]['autoinstall'] = {true|'1.x.xxx'};
- run default_records.inc.php (if exists) also for apps without tables,
  as they might need to initialise some stuff
This commit is contained in:
Ralf Becker 2009-05-28 11:33:30 +00:00
parent 88c9aca3f3
commit 6503d6d0cc
3 changed files with 676 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/applications.php
View File

@ -127,7 +127,7 @@ if(@get_var('submit',Array('POST')))
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name']; $app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[$appname] = $setup_info[$appname];
if ($setup_info[$appname]['tables']) if ($setup_info[$appname]['tables'])
{ {
@ -162,7 +162,7 @@ if(@get_var('submit',Array('POST')))
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name']; $app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[$appname] = $setup_info[$appname];
if ($setup_info[$appname]['tables']) if ($setup_info[$appname]['tables'])
{ {
@ -173,6 +173,8 @@ if(@get_var('submit',Array('POST')))
} }
else else
{ {
// check default_records for apps without tables, they might need some initial work too
$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name'])) if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name']))
{ {
$GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']); $GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']);
@ -199,7 +201,7 @@ if(@get_var('submit',Array('POST')))
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name']; $app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[$appname] = $setup_info[$appname];
$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG); $GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
if ($setup_info[$appname]['tables']) if ($setup_info[$appname]['tables'])

53
setup/inc/class.setup_detection.inc.php
View File

@ -6,12 +6,21 @@
* @package setup * @package setup
* @author Dan Kuykendall <seek3r@phpgroupware.org> * @author Dan Kuykendall <seek3r@phpgroupware.org>
* @author Miles Lott <milos@groupwhere.org> * @author Miles Lott <milos@groupwhere.org>
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
/**
* Class detecting the current installation status of EGroupware
*/
class setup_detection class setup_detection
{ {
/**
* Get available application versions and data from filesystem
*
* @return array $setup_info
*/
function get_versions() function get_versions()
{ {
$d = dir(EGW_SERVER_ROOT); $d = dir(EGW_SERVER_ROOT);
@ -34,7 +43,13 @@ class setup_detection
return $setup_info; return $setup_info;
} }
function get_db_versions($setup_info='') /**
* Get versions of installed applications from database
*
* @param array $setup_info
* @return array $setup_info
*/
function get_db_versions($setup_info=null)
{ {
$tname = Array(); $tname = Array();
$GLOBALS['egw_setup']->db->Halt_On_Error = 'no'; $GLOBALS['egw_setup']->db->Halt_On_Error = 'no';
@ -97,15 +112,16 @@ class setup_detection
return $setup_info; return $setup_info;
} }
/* app status values: /**
U Upgrade required/available * Compare versions from filesystem and database and set status:
R upgrade in pRogress * U Upgrade required/available
C upgrade Completed successfully * R upgrade in pRogress
D Dependency failure * C upgrade Completed successfully
P Post-install dependency failure * D Dependency failure
F upgrade Failed * P Post-install dependency failure
V Version mismatch at end of upgrade (Not used, proposed only) * F upgrade Failed
M Missing files at start of upgrade (Not used, proposed only) * V Version mismatch at end of upgrade (Not used, proposed only)
* M Missing files at start of upgrade (Not used, proposed only)
*/ */
function compare_versions($setup_info) function compare_versions($setup_info)
{ {
@ -208,9 +224,9 @@ class setup_detection
return $setup_info; return $setup_info;
} }
/* /**
Called during the mass upgrade routine (Stage 1) to check for apps * Called during the mass upgrade routine (Stage 1) to check for apps
that wish to be excluded from this process. * that wish to be excluded from this process.
*/ */
function upgrade_exclude($setup_info) function upgrade_exclude($setup_info)
{ {
@ -224,6 +240,11 @@ class setup_detection
return $setup_info; return $setup_info;
} }
/**
* Check if header exists and is up to date
*
* @return int 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
*/
function check_header() function check_header()
{ {
if(!file_exists('../header.inc.php')) if(!file_exists('../header.inc.php'))
@ -254,6 +275,12 @@ class setup_detection
return '10'; return '10';
} }
/**
* Check if database exists
*
* @param array $setup_info
* @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
*/
function check_db($setup_info='') function check_db($setup_info='')
{ {
$setup_info = $setup_info ? $setup_info : $GLOBALS['setup_info']; $setup_info = $setup_info ? $setup_info : $GLOBALS['setup_info'];

212
setup/inc/class.setup_process.inc.php
View File

@ -1,41 +1,54 @@
<?php <?php
/**************************************************************************\ /**
* eGroupWare - Setup * * EGroupware setup - update / install an EGroupware instance
* http://www.egroupware.org * *
* -------------------------------------------- * * @link http://www.egroupware.org
* This file written by Miles Lott <milos@groupwhere.org> * * @author Miles Lott <milos@groupwhere.org>
* Originally written for phpGroupWare. * * @copyright 2001-2004 Miles Lott <milos@groupwhere.org>
* (C) 2001-2004 Miles Lott * * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* Upgrade process rewritten by <RalfBecker@outdoor-training.de> to no * * Upgrade process rewritten by <RalfBecker@outdoor-training.de> to no longer require tables_baseline files and delta-upgrades
* longer require tables_baseline files and delta-upgrades * * @package setup
* -------------------------------------------- * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* This program is free software; you can redistribute it and/or modify it * * @version $Id$
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
/* app status values:
U Upgrade required/available
R upgrade in pRogress
C upgrade Completed successfully
D Dependency failure
F upgrade Failed
V Version mismatch at end of upgrade (Not used, proposed only)
M Missing files at start of upgrade (Not used, proposed only)
*/ */
/**
* Update / install an EGroupware instance
*
* app status values:
* U Upgrade required/available
* R upgrade in pRogress
* C upgrade Completed successfully
* D Dependency failure
* F upgrade Failed
* V Version mismatch at end of upgrade (Not used, proposed only)
* M Missing files at start of upgrade (Not used, proposed only)
*/
class setup_process class setup_process
{ {
var $oProc;
var $tables; var $tables;
var $updateincluded = array(); var $updateincluded = array();
/**
* Target version of a complete upgrade, set by pass()
*
* @var string
*/
var $api_version_target;
/**
* instance of setup's translation class
*
* @var setup_translation
*/
var $translation; var $translation;
function setup_process() /**
* Constructor
*/
function __construct()
{ {
$this->translation =& CreateObject('setup.setup_translation'); $this->translation = new setup_translation();
} }
/** /**
@ -45,7 +58,7 @@
*/ */
function init_process() function init_process()
{ {
$GLOBALS['egw_setup']->oProc =& CreateObject('phpgwapi.schema_proc'); $GLOBALS['egw_setup']->oProc = new schema_proc();
} }
/** /**
@ -58,7 +71,7 @@
* @param string $system_charset=null charset to use * @param string $system_charset=null charset to use
* @param array $preset_config=array() * @param array $preset_config=array()
*/ */
function pass($setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array()) function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())
{ {
if(!$method) if(!$method)
{ {
@ -68,10 +81,14 @@
$pass['phpgwapi'] = $setup_info['phpgwapi']; $pass['phpgwapi'] = $setup_info['phpgwapi'];
$pass['admin'] = $setup_info['admin']; $pass['admin'] = $setup_info['admin'];
$pass['preferences'] = $setup_info['preferences']; $pass['preferences'] = $setup_info['preferences'];
$pass['etemplate'] = $setup_info['etemplate']; // helps to minimize passes, as many apps depend on it
@reset($setup_info); @reset($setup_info);
$setup_info = $GLOBALS['egw_setup']->detection->get_versions($setup_info); $setup_info = $GLOBALS['egw_setup']->detection->get_versions($setup_info);
@reset($setup_info); @reset($setup_info);
// setting api-target-version for general use
$this->api_version_target = $setup_info['phpgwapi']['version'];
$i = 1; $i = 1;
$passed = array(); $passed = array();
$passing = array(); $passing = array();
@ -90,7 +107,7 @@
//if($i==2) { _debug_array($passed);exit; } //if($i==2) { _debug_array($passed);exit; }
/* stuff the rest of the apps, but only those with available upgrades */ /* stuff the rest of the apps, but only those with available upgrades */
while(list($key,$value) = @each($setup_info)) foreach($setup_info as $key => $value)
{ {
if (isset($value['only_db']) && ( if (isset($value['only_db']) && (
is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type,$value['only_db']) || is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type,$value['only_db']) ||
@ -98,20 +115,13 @@
{ {
continue; // app does not support this db-type, dont try installing it continue; // app does not support this db-type, dont try installing it
} }
if(($value['name'] != 'phpgwapi') && ($value['status'] == 'U')) if($value['name'] != 'phpgwapi' && $value['status'] == 'U')
{ {
if(($passed[$value['name']]['status'] != 'F') && ($passed[$value['name']]['status'] != 'C')) if($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
{ {
$pass[$value['name']] = $setup_info[$value['name']]; $pass[$value['name']] = $setup_info[$value['name']];
} }
} }
/*
Now if we are on the 2nd or more passes, add api in
if (!$pass['phpgwapi'])
{
$pass['phpgwapi'] = $setup_info['phpgwapi'];
}
*/
} }
switch($method) switch($method)
@ -136,8 +146,7 @@
} }
$pass = array(); $pass = array();
@reset($passing); foreach($passing as $key => $value)
while(list($key,$value) = @each($passing))
{ {
if($value['status'] == 'C') if($value['status'] == 'C')
{ {
@ -208,17 +217,25 @@
$egroupwareDirName = end($parts); $egroupwareDirName = end($parts);
if(!$is_windows) { if(!$is_windows) {
if(@is_dir('/tmp')) { if(@is_dir('/tmp'))
{
$current_config['temp_dir'] = '/tmp'; $current_config['temp_dir'] = '/tmp';
} else { }
else
{
$current_config['temp_dir'] = '/path/to/temp/dir'; $current_config['temp_dir'] = '/path/to/temp/dir';
} }
$current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files'; $current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files';
$current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup'; $current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup';
} else { }
if(@is_dir('c:\\windows\\temp')) { else
{
if(@is_dir('c:\\windows\\temp'))
{
$current_config['temp_dir'] = 'c:\\windows\\temp'; $current_config['temp_dir'] = 'c:\\windows\\temp';
} else { }
else
{
$current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir'; $current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir';
} }
$current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files'; $current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files';
@ -262,7 +279,7 @@
* *
* @param $setup_info array of application info from setup.inc.php files, etc. * @param $setup_info array of application info from setup.inc.php files, etc.
*/ */
function droptables($setup_info,$DEBUG=False) function droptables(array $setup_info,$DEBUG=False)
{ {
if(!@$GLOBALS['egw_setup']->oProc) if(!@$GLOBALS['egw_setup']->oProc)
{ {
@ -310,26 +327,26 @@
* process current table setup in each application/setup dir * process current table setup in each application/setup dir
* *
* @param array $setup_info array of application info from setup.inc.php files, etc. * @param array $setup_info array of application info from setup.inc.php files, etc.
* @param boolean $DEBUG=false * @param boolean $DEBUG=false output further diagnostics
* @return array $setup_info
*/ */
function current($setup_info,$DEBUG=False) function current(array $setup_info,$DEBUG=False)
{ {
if(!@$GLOBALS['egw_setup']->oProc) //echo __METHOD__; _debug_array($setup_info);
if(!isset($GLOBALS['egw_setup']->oProc))
{ {
$this->init_process(); $this->init_process();
} }
@reset($setup_info); foreach($setup_info as $appname => &$appdata)
while(list($key,$null) = @each($setup_info))
{ {
$enabled = False; $enabled = False;
$appname = $setup_info[$key]['name']; $apptitle = $appdata['title'];
$apptitle = $setup_info[$key]['title'];
if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $setup_info[$key]['status']; } if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
$appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
if($setup_info[$key]['tables'] && file_exists($appdir.'tables_current.inc.php')) if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
{ {
if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; } if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
include ($appdir.'tables_current.inc.php'); include ($appdir.'tables_current.inc.php');
@ -347,13 +364,13 @@
$GLOBALS['egw_setup']->register_hooks($appname); $GLOBALS['egw_setup']->register_hooks($appname);
} }
// Update the array values for return below // Update the array values for return below
$setup_info[$key]['status'] = 'C'; $appdata['status'] = 'C';
} }
else else
{ {
/* script processing failed */ /* script processing failed */
if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $setup_info[$key]['status']; } if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
$setup_info[$key]['status'] = 'F'; $appdata['status'] = 'F';
} }
} }
else else
@ -364,7 +381,7 @@
A manual sql script install is needed, but we do add the hooks A manual sql script install is needed, but we do add the hooks
*/ */
$enabled = 99; $enabled = 99;
if($setup_info[$key]['tables'][0] != '') if($appdata['tables'][0] != '')
{ {
$enabled = False; $enabled = False;
} }
@ -378,33 +395,34 @@
$GLOBALS['egw_setup']->register_app($appname,$enabled); $GLOBALS['egw_setup']->register_app($appname,$enabled);
$GLOBALS['egw_setup']->register_hooks($appname); $GLOBALS['egw_setup']->register_hooks($appname);
} }
$setup_info[$key]['status'] = 'C'; $appdata['status'] = 'C';
} }
if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $setup_info[$key]['status']; } if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
} }
/* Done, return current status */ /* Done, return current status */
return ($setup_info); return $setup_info;
} }
/** /**
* process default_records.inc.php in each application/setup dir * process default_records.inc.php in each application/setup dir
* *
* @param $setup_info array of application info from setup.inc.php files, etc. * @param array $setup_info array of application info from setup.inc.php files, etc.
* @param boolean $DEBUG=false output further diagnostics
* @return array $setup_info
*/ */
function default_records($setup_info,$DEBUG=False) function default_records(array $setup_info,$DEBUG=False)
{ {
//echo __METHOD__; _debug_array($setup_info);
if(!@$GLOBALS['egw_setup']->oProc) if(!@$GLOBALS['egw_setup']->oProc)
{ {
$this->init_process(); $this->init_process();
} }
@reset($setup_info); foreach($setup_info as $appname => &$appdata)
while(list($key,$null) = @each($setup_info))
{ {
$appname = $setup_info[$key]['name'];
$appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
if($setup_info[$key]['tables'] && file_exists($appdir.'default_records.inc.php')) if(file_exists($appdir.'default_records.inc.php'))
{ {
if($DEBUG) if($DEBUG)
{ {
@ -415,7 +433,7 @@
include ($appdir.'default_records.inc.php'); include ($appdir.'default_records.inc.php');
$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit(); $GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
} }
/* $setup_info[$key]['status'] = 'C'; */ /* $appdata['status'] = 'C'; */
} }
/* Done, return current status */ /* Done, return current status */
@ -426,18 +444,19 @@
* process test_data.inc.php in each application/setup dir for developer tests * process test_data.inc.php in each application/setup dir for developer tests
* *
* This data should work with the baseline tables * This data should work with the baseline tables
* @param $setup_info array of application info from setup.inc.php files, etc. *
* @param array $setup_info array of application info from setup.inc.php files, etc.
* @param boolean $DEBUG=false output further diagnostics
* @return array $setup_info
*/ */
function test_data($setup_info,$DEBUG=False) function test_data(array $setup_info,$DEBUG=False)
{ {
if(!@$GLOBALS['egw_setup']->oProc) if(!@$GLOBALS['egw_setup']->oProc)
{ {
$this->init_process(); $this->init_process();
} }
@reset($setup_info); foreach($setup_info as $appname => &$appdata)
while(list($key,$null) = @each($setup_info))
{ {
$appname = $setup_info[$key]['name'];
$appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
if(file_exists($appdir.'test_data.inc.php')) if(file_exists($appdir.'test_data.inc.php'))
@ -459,19 +478,18 @@
/** /**
* process baseline table setup in each application/setup dir * process baseline table setup in each application/setup dir
* *
* @param $appinfo array of application info from setup.inc.php files, etc. * @param array $setup_info array of application info from setup.inc.php files, etc.
* @param boolean $DEBUG=false output further diagnostics
* @return array $setup_info
*/ */
function baseline($setup_info,$DEBUG=False) function baseline(array $setup_info,$DEBUG=False)
{ {
if(!@$GLOBALS['egw_setup']->oProc) if(!@$GLOBALS['egw_setup']->oProc)
{ {
$this->init_process(); $this->init_process();
} }
foreach($setup_info as $appname => &$appdata)
@reset($setup_info);
while(list($key,$null) = @each($setup_info))
{ {
$appname = $setup_info[$key]['name'];
$appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP; $appdir = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
if(file_exists($appdir.'tables_baseline.inc.php')) if(file_exists($appdir.'tables_baseline.inc.php'))
@ -504,22 +522,34 @@
/** /**
* process available upgrades in each application/setup dir * process available upgrades in each application/setup dir
* *
* @param $appinfo array of application info from setup.inc.php files, etc. * @param array $setup_info array of application info from setup.inc.php files, etc.
* @param boolean $DEBUG=false output further diagnostics
* @return array $setup_info
*/ */
function upgrade($setup_info,$DEBUG=False) function upgrade($setup_info,$DEBUG=False)
{ {
//echo __METHOD__; _debug_array($setup_info);
if(!@$GLOBALS['egw_setup']->oProc) if(!@$GLOBALS['egw_setup']->oProc)
{ {
$this->init_process(); $this->init_process();
} }
$GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes'; $GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes';
foreach($setup_info as $key => $appdata) foreach($setup_info as $appname => &$appdata)
{ {
$appname = $appdata['name']; // check if app is NOT installed
/* Don't try to upgrade an app that is not installed */
if(!$GLOBALS['egw_setup']->app_registered($appname)) if(!$GLOBALS['egw_setup']->app_registered($appname))
{ {
// check if app wants to be automatically installed on update to version x or allways
if (isset($appdata['autoinstall']) && ($appdata['autoinstall'] === true ||
$appdata['autoinstall'] === $this->api_version_target))
{
$info = $this->current(array($appname => $appdata),$DEBUG);
$info = $this->default_records($info,$DEBUG);
$appdata = $info[$appname];
continue;
}
/* Don't try to upgrade an app that is not installed */
if($DEBUG) if($DEBUG)
{ {
echo "<p>process->upgrade(): Application not installed: $appname</p>\n"; echo "<p>process->upgrade(): Application not installed: $appname</p>\n";
@ -583,7 +613,7 @@
{ {
echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n"; echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n";
} }
$setup_info[$key]['currentver'] = $targetver; $appdate['currentver'] = $targetver;
$appstatus = 'F'; $appstatus = 'F';
} }
} }
@ -597,7 +627,7 @@
} }
if ($appstatus == 'C') // update successful completed if ($appstatus == 'C') // update successful completed
{ {
$setup_info[$key]['currentver'] = $targetver; $appdata['currentver'] = $targetver;
if($GLOBALS['egw_setup']->app_registered($appname)) if($GLOBALS['egw_setup']->app_registered($appname))
{ {
@ -625,11 +655,11 @@
{ {
echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n"; echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n";
} }
$setup_info[$key]['status'] = $appstatus; $appdate['status'] = $appstatus;
} }
/* Done, return current status */ /* Done, return current status */
return ($setup_info); return $setup_info;
} }
/** /**
@ -642,7 +672,6 @@
{ {
return False; return False;
} }
return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG); return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
} }
@ -677,4 +706,3 @@
return array($arr,$pk,$fk,$ix,$uc); return array($arr,$pk,$fk,$ix,$uc);
} }
} }
?>