mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over 

Refresh if maintenance mode is over
This commit is contained in:
Lukas Reschke 2014-09-11 11:34:39 +02:00
parent bfebbe47de 69f2c0544e
commit 8d7926543b
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/js/maintenance-check.js Normal file
View File

@ -0,0 +1,20 @@
// Check every 20 seconds via status.php if maintenance is over
window.setInterval(checkStatus, 20000);
function checkStatus() {
var request = new XMLHttpRequest();
var ocroot = location.pathname.substr(
0, location.pathname.indexOf('index.php')
);
request.open("GET", ocroot+'status.php', true);
request.send();
request.onreadystatechange = function() {
if (request.readyState === 4) {
var response = request.responseText;
var responseobj = JSON.parse(response);
if (responseobj.maintenance === 'false') {
window.location.reload();
}
}
};
}

2
core/templates/update.user.php
View File

@ -1,7 +1,7 @@
<ul>
<li class='update'>
<?php p($l->t('This ownCloud instance is currently being updated, which may take a while.')) ?><br/><br/>
<?php p($l->t('Please reload this page after a short time to continue using ownCloud.')) ?><br/><br/>
<?php p($l->t('This page will refresh itself when the ownCloud instance is available again.')) ?><br/><br/>
<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?><br/><br/>
<?php p($l->t('Thank you for your patience.')); ?><br/><br/>
</li>

1
lib/base.php
View File

@ -255,6 +255,7 @@ class OC {
// render error page
$tmpl = new OC_Template('', 'update.user', 'guest');
OC_Util::addscript('maintenance-check');
$tmpl->printPage();
die();
}

4
status.php
View File

@ -25,9 +25,11 @@ try {
require_once 'lib/base.php';
if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
$installed = OC_Config::getValue('installed') == 1;
$maintenance = OC_Config::getValue('maintenance', false);
$values=array(
'installed'=>$installed,
'maintenance' => $maintenance,
'version'=>implode('.', OC_Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());