wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use httphelper and cache response even when it empty

Browse source
This commit is contained in:
Victor Dubiniuk 2014-11-25 22:41:15 +03:00
parent 94eb2e782f
commit 303fce44f4
4 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/ajax/update.php
View file

@ -9,7 +9,10 @@ if (OC::checkUpgrade(false)) {
$l = new \OC_L10N('core');
$eventSource = \OC::$server->createEventSource();
$updater = new \OC\Updater(\OC_Log::$object);
$updater = new \OC\Updater(
\OC::$server->getHTTPHelper(),
\OC_Log::$object
);
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
});

2
core/command/upgrade.php
View file

@ -84,7 +84,7 @@ class Upgrade extends Command {
if(\OC::checkUpgrade(false)) {
$self = $this;
$updater = new Updater();
$updater = new Updater(\OC::$server->getHTTPHelper());
$updater->setSimulateStepEnabled($simulateStepEnabled);
$updater->setUpdateStepEnabled($updateStepEnabled);

2
lib/private/templatelayout.php
View file

@ -44,7 +44,7 @@ class OC_TemplateLayout extends OC_Template {
// Update notification
if($this->config->getSystemValue('updatechecker', true) === true &&
OC_User::isAdminUser(OC_User::getUser())) {
$updater = new \OC\Updater();
$updater = new \OC\Updater(\OC::$server->getHTTPHelper());
$data = $updater->check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {

28
lib/private/updater.php
View file

@ -26,6 +26,11 @@ class Updater extends BasicEmitter {
*/
private $log;
/**
* @var \OC\HTTPHelper $helper;
*/
private $httpHelper;
private $simulateStepEnabled;
private $updateStepEnabled;
@ -33,7 +38,8 @@ class Updater extends BasicEmitter {
/**
* @param \OC\Log $log
*/
public function __construct($log = null) {
public function __construct($httpHelper, $log = null) {
$this->httpHelper = $httpHelper;
$this->log = $log;
$this->simulateStepEnabled = true;
$this->updateStepEnabled = true;
@ -95,30 +101,24 @@ class Updater extends BasicEmitter {
$url = $updaterUrl . '?version=' . $versionString;
// set a sensible timeout of 10 sec to stay responsive even if the update server is down.
$ctx = stream_context_create(
array(
'http' => array(
'timeout' => 10
)
)
);
$xml = @file_get_contents($url, 0, $ctx);
if ($xml == false) {
return array();
}
$tmp = array();
$xml = $this->httpHelper->getUrlContent($url);
if ($xml !== false) {
$loadEntities = libxml_disable_entity_loader(true);
$data = @simplexml_load_string($xml);
libxml_disable_entity_loader($loadEntities);
$tmp = array();
$tmp['version'] = $data->version;
$tmp['versionstring'] = $data->versionstring;
$tmp['url'] = $data->url;
$tmp['web'] = $data->web;
} else {
$data = array();
}
// Cache the result
\OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
return $tmp;
}