Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-04-11 17:58:08 +0300
committerThomas Müller <thomas.mueller@tmit.eu>2016-04-18 18:09:21 +0300
commit739dfb5c6638301799ee8dafd6b10460b493319d (patch)
tree1bb734784ec8ca83653068f21d59e0a27d0f6323 /core
parentfd1740deb604894a8bef515d98c5992a392e6f0a (diff)
Suggest cli based updater in case the instance is bigger - #23913
Diffstat (limited to 'core')
-rw-r--r--core/ajax/update.php10
-rw-r--r--core/templates/update.use-cli.php14
2 files changed, 23 insertions, 1 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 631a8a7871c..cf6e2659516 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -37,9 +37,17 @@ $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'));
+//$eventSource->send('success', (string)$l->t('Preparing update'));
if (OC::checkUpgrade(false)) {
+
+ $config = \OC::$server->getSystemConfig();
+ if ($config->getValue('upgrade.disable-web', true)) {
+ $eventSource->send('failure', (string)$l->t('Updates need to be installed. Please use the command line updater.'));
+ $eventSource->close();
+ exit();
+ }
+
// if a user is currently logged in, their session must be ignored to
// avoid side effects
\OC_User::setIncognitoMode(true);
diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
new file mode 100644
index 00000000000..52d40cdea55
--- /dev/null
+++ b/core/templates/update.use-cli.php
@@ -0,0 +1,14 @@
+<div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
+ <div class="updateOverview">
+ <h2 class="title"><?php p($l->t('Update needed')) ?></h2>
+ <div class="infogroup">
+ <?php if ($_['tooBig']) {
+ p($l->t('Please use the command line updater because you have a big instance.'));
+ } else {
+ p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+ } ?><br><br>
+ <?php
+ print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
+ </div>
+ </div>
+</div>