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

Add back appstoreenabled config switch

Browse source 
Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
This commit is contained in:
Steffen Lindner 2017-01-26 19:02:45 +01:00 committed by Joas Schilling
parent 97b6c1496e
commit cfb6223de7
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/private/App/AppStore/Fetcher/Fetcher.php
View file

@ -69,6 +69,14 @@ abstract class Fetcher {
* @return array * @return array
*/ */
protected function fetch($ETag, $content) { protected function fetch($ETag, $content) {
$systemConfig = \OC::$server->getSystemConfig();
$appstoreenabled = $systemConfig->getValue('appstoreenabled', true);
if (!$appstoreenabled) {
return [];
}
$options = []; $options = [];
if ($ETag !== '') { if ($ETag !== '') {
@ -102,7 +110,14 @@ abstract class Fetcher {
* *
* @return array * @return array
*/ */
public function get() { public function get() {
$systemConfig = \OC::$server->getSystemConfig();
$appstoreenabled = $systemConfig->getValue('appstoreenabled', true);
if (!$appstoreenabled) {
return [];
}
$rootFolder = $this->appData->getFolder('/'); $rootFolder = $this->appData->getFolder('/');
$ETag = ''; $ETag = '';
@ -112,13 +127,14 @@ abstract class Fetcher {
// File does already exists // File does already exists
$file = $rootFolder->getFile($this->fileName); $file = $rootFolder->getFile($this->fileName);
$jsonBlob = json_decode($file->getContent(), true); $jsonBlob = json_decode($file->getContent(), true);
if(is_array($jsonBlob)) { if (is_array($jsonBlob)) {
/* /*
* If the timestamp is older than 300 seconds request the files new * If the timestamp is older than 300 seconds request the files new
* If the version changed (update!) also refresh * If the version changed (update!) also refresh
*/ */
if((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS) && if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS) &&
isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->config->getSystemValue('version', '0.0.0')) { isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->config->getSystemValue('version', '0.0.0')
) {
return $jsonBlob['data']; return $jsonBlob['data'];
} }