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

remove legacy class OC_Updater

Browse source
This commit is contained in:
Thomas Müller 2014-10-17 11:42:10 +02:00
parent 8da6e4b9f0
commit 6af0e76a03
3 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/legacy/updater.php
View file

@ -1,19 +0,0 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
/**
* provides an interface to all search providers
*
* @deprecated use \OC\Updater instead
*/
class OC_Updater {
public static function check() {
$updater = new \OC\Updater();
return $updater->check('http://apps.owncloud.com/updater.php');
}
}

2
lib/private/templatelayout.php
View file

@ -46,7 +46,7 @@ class OC_TemplateLayout extends OC_Template {
if($this->config->getSystemValue('updatechecker', true) === true && if($this->config->getSystemValue('updatechecker', true) === true &&
OC_User::isAdminUser(OC_User::getUser())) { OC_User::isAdminUser(OC_User::getUser())) {
$updater = new \OC\Updater(); $updater = new \OC\Updater();
$data = $updater->check('http://apps.owncloud.com/updater.php'); $data = $updater->check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) { if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
$this->assign('updateAvailable', true); $this->assign('updateAvailable', true);

6
lib/private/updater.php
View file

@ -66,13 +66,17 @@ class Updater extends BasicEmitter {
* @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
* @return array|bool * @return array|bool
*/ */
public function check($updaterUrl) { public function check($updaterUrl = null) {
// Look up the cache - it is invalidated all 30 minutes // Look up the cache - it is invalidated all 30 minutes
if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) { if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true); return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
} }
if (is_null($updaterUrl)) {
$updaterUrl = 'https://apps.owncloud.com/updater.php';
}
\OC_Appconfig::setValue('core', 'lastupdatedat', time()); \OC_Appconfig::setValue('core', 'lastupdatedat', time());
if (\OC_Appconfig::getValue('core', 'installedat', '') == '') { if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {