Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-24 13:24:51 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Properly show token errors in ajax/update.php event source

Browse Source
This commit is contained in:
Vincent Petry 2015-08-26 10:30:24 +02:00
parent 08a490df32
commit 90ed32ebc5
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/ajax/update.php
View File

@ -28,15 +28,19 @@
set_time_limit(0);
require_once '../../lib/base.php';
\OCP\JSON::callCheck();
$l = \OC::$server->getL10N('core');
$eventSource = \OC::$server->createEventSource();
// need to send an initial message to force-init the event source,
// which will then trigger its own CSRF check and produces its own CSRF error
// message
$eventSource->send('success', (string)$l->t('Preparing update'));
if (OC::checkUpgrade(false)) {
// if a user is currently logged in, their session must be ignored to
// avoid side effects
\OC_User::setIncognitoMode(true);
$l = new \OC_L10N('core');
$eventSource = \OC::$server->createEventSource();
$logger = \OC::$server->getLogger();
$updater = new \OC\Updater(
\OC::$server->getHTTPHelper(),
@ -96,6 +100,10 @@ if (OC::checkUpgrade(false)) {
(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
}
$eventSource->send('done', '');
$eventSource->close();
} else {
$eventSource->send('notice', (string)$l->t('Already up to date'));
}
$eventSource->send('done', '');
$eventSource->close();