diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-17 12:00:39 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-24 12:02:36 +0100 |
commit | bbf7f56f949f48ec0cf95d416b431d0cd739582f (patch) | |
tree | adb18b5b46738e81093444ae1fa860e48647373a /core/ajax/update.php | |
parent | e5c6af51027f786d74f859584f0aa6c85db6ead6 (diff) | |
download | nextcloud-server-bbf7f56f949f48ec0cf95d416b431d0cd739582f.tar.gz nextcloud-server-bbf7f56f949f48ec0cf95d416b431d0cd739582f.zip |
3rd-party apps are disabled on upgrade - refs #14026
Diffstat (limited to 'core/ajax/update.php')
-rw-r--r-- | core/ajax/update.php | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index baa01b4f208..656fe2736ac 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -36,9 +36,12 @@ if (OC::checkUpgrade(false)) { $eventSource = \OC::$server->createEventSource(); $updater = new \OC\Updater( \OC::$server->getHTTPHelper(), - \OC::$server->getAppConfig(), + \OC::$server->getConfig(), \OC_Log::$object ); + $incompatibleApps = []; + $disabledThirdPartyApps = []; + $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Turned on maintenance mode')); }); @@ -57,13 +60,11 @@ if (OC::checkUpgrade(false)) { $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version))); }); - $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) { - $list = array(); - foreach ($appList as $appId) { - $info = OC_App::getAppInfo($appId); - $list[] = $info['name'] . ' (' . $info['id'] . ')'; - } - $eventSource->send('success', (string)$l->t('Disabled incompatible apps: %s', implode(', ', $list))); + $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) { + $incompatibleApps[]= $app; + }); + $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) { + $disabledThirdPartyApps[]= $app; }); $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) { $eventSource->send('failure', $message); @@ -73,6 +74,15 @@ if (OC::checkUpgrade(false)) { $updater->upgrade(); + if (!empty($incompatibleApps)) { + $eventSource->send('notice', + (string)$l->t('Following incompatible apps have been disabled: %s', implode(', ', $incompatibleApps))); + } + if (!empty($disabledThirdPartyApps)) { + $eventSource->send('notice', + (string)$l->t('Following 3rd party apps have been disabled: %s', implode(', ', $disabledThirdPartyApps))); + } + $eventSource->send('done', ''); $eventSource->close(); } |