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

Updater: pass update url as argument to update check

This commit is contained in:
Robin Appelman 2013-07-06 17:05:38 +02:00
parent 58f473d734
commit 9cd7ecd502
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/legacy/updater.php
View File

@ -9,6 +9,6 @@
class OC_Updater {
public static function check() {
$updater = new \OC\Updater();
return $updater->check();
return $updater->check('http://apps.owncloud.com/updater.php');
}
}

10
lib/updater.php
View File

@ -37,9 +37,10 @@ class Updater extends BasicEmitter {
/**
* Check if a new version is available
* @param string $updateUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
* @return array | bool
*/
public function check() {
public function check($updaterUrl) {
// Look up the cache - it is invalidated all 30 minutes
if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
@ -51,17 +52,16 @@ class Updater extends BasicEmitter {
if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {
\OC_Appconfig::setValue('core', 'installedat', microtime(true));
}
$updaterurl = 'http://apps.owncloud.com/updater.php';
;
$version = \OC_Util::getVersion();
$version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
$version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
$version['updatechannel'] = 'stable';
$version['edition'] = \OC_Util::getEditionString();
$versionstring = implode('x', $version);
$versionString = implode('x', $version);
//fetch xml data from updater
$url = $updaterurl . '?version=' . $versionstring;
$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(