From 76c72b5f436bfb44a3dd5e19786f3bdcb8d6c230 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 23 Apr 2016 20:02:16 +0200 Subject: Move \OC\Updater to PSR-4 --- lib/private/Updater/VersionCheck.php | 133 +++++++++++++++++++++++++++++++++++ lib/private/updater/versioncheck.php | 133 ----------------------------------- 2 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 lib/private/Updater/VersionCheck.php delete mode 100644 lib/private/updater/versioncheck.php (limited to 'lib/private') diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php new file mode 100644 index 00000000000..e42a1e2a40c --- /dev/null +++ b/lib/private/Updater/VersionCheck.php @@ -0,0 +1,133 @@ + + * @author Bart Visscher + * @author Björn Schießle + * @author Frank Karlitschek + * @author Joas Schilling + * @author Lukas Reschke + * @author Morris Jobke + * @author Robin Appelman + * @author Robin McCorkell + * @author Steffen Lindner + * @author Thomas Müller + * @author Victor Dubiniuk + * @author Vincent Petry + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +namespace OC\Updater; + +use OC_Util; +use OCP\Http\Client\IClientService; +use OCP\IConfig; +use OC\Setup; +use OCP\Util; + +class VersionCheck { + + /** @var IClientService */ + private $clientService; + + /** @var IConfig */ + private $config; + + /** + * @param IClientService $clientService + * @param IConfig $config + */ + public function __construct(IClientService $clientService, + IConfig $config) { + $this->clientService = $clientService; + $this->config = $config; + } + + + /** + * Check if a new version is available + * + * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' + * @return array|bool + */ + public function check($updaterUrl = null) { + + // Look up the cache - it is invalidated all 30 minutes + if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) { + return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); + } + + if (is_null($updaterUrl)) { + $updaterUrl = 'https://updates.owncloud.com/server/'; + } + + $this->config->setAppValue('core', 'lastupdatedat', time()); + + if ($this->config->getAppValue('core', 'installedat', '') === '') { + $this->config->setAppValue('core', 'installedat', microtime(true)); + } + + $version = Util::getVersion(); + $version['installed'] = $this->config->getAppValue('core', 'installedat'); + $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat'); + $version['updatechannel'] = \OC_Util::getChannel(); + $version['edition'] = \OC_Util::getEditionString(); + $version['build'] = \OC_Util::getBuild(); + $versionString = implode('x', $version); + + //fetch xml data from updater + $url = $updaterUrl . '?version=' . $versionString; + + $tmp = []; + $xml = $this->getUrlContent($url); + if ($xml) { + $loadEntities = libxml_disable_entity_loader(true); + $data = @simplexml_load_string($xml); + libxml_disable_entity_loader($loadEntities); + if ($data !== false) { + $tmp['version'] = (string)$data->version; + $tmp['versionstring'] = (string)$data->versionstring; + $tmp['url'] = (string)$data->url; + $tmp['web'] = (string)$data->web; + } else { + libxml_clear_errors(); + } + } else { + $data = []; + } + + // Cache the result + $this->config->setAppValue('core', 'lastupdateResult', json_encode($data)); + return $tmp; + } + + /** + * @codeCoverageIgnore + * @param string $url + * @return bool|resource|string + */ + protected function getUrlContent($url) { + try { + $client = $this->clientService->newClient(); + $response = $client->get($url); + return $response->getBody(); + } catch (\Exception $e) { + return false; + } + } +} + diff --git a/lib/private/updater/versioncheck.php b/lib/private/updater/versioncheck.php deleted file mode 100644 index e42a1e2a40c..00000000000 --- a/lib/private/updater/versioncheck.php +++ /dev/null @@ -1,133 +0,0 @@ - - * @author Bart Visscher - * @author Björn Schießle - * @author Frank Karlitschek - * @author Joas Schilling - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin Appelman - * @author Robin McCorkell - * @author Steffen Lindner - * @author Thomas Müller - * @author Victor Dubiniuk - * @author Vincent Petry - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OC\Updater; - -use OC_Util; -use OCP\Http\Client\IClientService; -use OCP\IConfig; -use OC\Setup; -use OCP\Util; - -class VersionCheck { - - /** @var IClientService */ - private $clientService; - - /** @var IConfig */ - private $config; - - /** - * @param IClientService $clientService - * @param IConfig $config - */ - public function __construct(IClientService $clientService, - IConfig $config) { - $this->clientService = $clientService; - $this->config = $config; - } - - - /** - * Check if a new version is available - * - * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' - * @return array|bool - */ - public function check($updaterUrl = null) { - - // Look up the cache - it is invalidated all 30 minutes - if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) { - return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); - } - - if (is_null($updaterUrl)) { - $updaterUrl = 'https://updates.owncloud.com/server/'; - } - - $this->config->setAppValue('core', 'lastupdatedat', time()); - - if ($this->config->getAppValue('core', 'installedat', '') === '') { - $this->config->setAppValue('core', 'installedat', microtime(true)); - } - - $version = Util::getVersion(); - $version['installed'] = $this->config->getAppValue('core', 'installedat'); - $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat'); - $version['updatechannel'] = \OC_Util::getChannel(); - $version['edition'] = \OC_Util::getEditionString(); - $version['build'] = \OC_Util::getBuild(); - $versionString = implode('x', $version); - - //fetch xml data from updater - $url = $updaterUrl . '?version=' . $versionString; - - $tmp = []; - $xml = $this->getUrlContent($url); - if ($xml) { - $loadEntities = libxml_disable_entity_loader(true); - $data = @simplexml_load_string($xml); - libxml_disable_entity_loader($loadEntities); - if ($data !== false) { - $tmp['version'] = (string)$data->version; - $tmp['versionstring'] = (string)$data->versionstring; - $tmp['url'] = (string)$data->url; - $tmp['web'] = (string)$data->web; - } else { - libxml_clear_errors(); - } - } else { - $data = []; - } - - // Cache the result - $this->config->setAppValue('core', 'lastupdateResult', json_encode($data)); - return $tmp; - } - - /** - * @codeCoverageIgnore - * @param string $url - * @return bool|resource|string - */ - protected function getUrlContent($url) { - try { - $client = $this->clientService->newClient(); - $response = $client->get($url); - return $response->getBody(); - } catch (\Exception $e) { - return false; - } - } -} - -- cgit v1.2.3