holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Setup/EPL: do not autoinstall uninstalled EPL apps when container restarts

Browse Source
This commit is contained in:
Ralf Becker 2022-01-21 20:58:30 +02:00
parent c74b132448
commit 6d86eefc96
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/applications.php
View File

@ -446,7 +446,7 @@ else
case 'U':
$setup_tpl->set_var('instimg','incomplete.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
if (!@$value['currentver'])
if (empty($value['currentver']) || $value['currentver'] === 'uninstalled')
{
if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'],True))
{

5
setup/inc/class.setup_cmd.inc.php
View File

@ -319,7 +319,8 @@ abstract class setup_cmd extends admin_cmd
self::$apps_to_upgrade = self::$apps_to_install = array();
foreach($setup_info as $app => $data)
{
if ($data['currentver'] && $data['version'] && $data['version'] != 'deleted' && $data['version'] != $data['currentver'])
if ($data['currentver'] && $data['version'] && $data['version'] != 'deleted' && $data['version'] != $data['currentver'] &&
$data['currentversion'] !== 'uninstalled')
{
self::$apps_to_upgrade[] = $app;
}
@ -366,7 +367,7 @@ abstract class setup_cmd extends admin_cmd
$ret = array_filter(self::$apps_to_install, function($app)
{
global $setup_info;
return $setup_info[$app]['autoinstall'];
return !empty($setup_info[$app]['autoinstall']) && !isset($setup_info[$app]['currentversion']);
});
//error_log(__METHOD__."() apps_to_install=".array2string(self::$apps_to_install).' returning '.array2string($ret));
return $ret;

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

@ -62,7 +62,7 @@ class setup_detection
/* one of these tables exists. checking for post/pre beta version */
if($GLOBALS['egw_setup']->applications_table != 'applications')
{
foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', 'app_enabled != -1', __LINE__, __FILE__) as $row)
foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__) as $row)
{
$app = $row['app_name'];
if (!isset($setup_info[$app])) // app source no longer there

2
setup/index.php
View File

@ -484,7 +484,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
$to_upgrade = $to_install = array();
foreach($setup_info as $app => $data)
{
if ($data['currentver'] && $data['version'] && $data['version'] != $data['currentver'])
if (!empty($data['currentver']) && $data['currentver'] !== 'uninstalled' && $data['version'] && $data['version'] != $data['currentver'])
{
$to_upgrade[] = lang(!empty($data['title']) ? $data['title'] : $app);
$setup_tpl->set_var('apps_status_img',$incomplete);