7f2e9d10a3
Sometimes it could be the case that after a channel change the last updated timestamp is reset, but the check for updates is not yet completed. In this case the update notification showed "You are up to date" and the date was "1970-01-01 00:00:00". With this fix the state is properly shown. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
175 lines
5.2 KiB
PHP
175 lines
5.2 KiB
PHP
<?php
|
|
/**
|
|
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
*
|
|
* @author Joas Schilling <coding@schilljs.com>
|
|
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
*
|
|
* @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 <http://www.gnu.org/licenses/>
|
|
*
|
|
*/
|
|
|
|
namespace OCA\UpdateNotification\Controller;
|
|
|
|
use OCA\UpdateNotification\UpdateChecker;
|
|
use OCP\AppFramework\Controller;
|
|
use OCP\AppFramework\Http\DataResponse;
|
|
use OCP\AppFramework\Http\TemplateResponse;
|
|
use OCP\AppFramework\Utility\ITimeFactory;
|
|
use OCP\BackgroundJob\IJobList;
|
|
use OCP\IConfig;
|
|
use OCP\IDateTimeFormatter;
|
|
use OCP\IL10N;
|
|
use OCP\IRequest;
|
|
use OCP\Security\ISecureRandom;
|
|
use OCP\Settings\ISettings;
|
|
|
|
class AdminController extends Controller implements ISettings {
|
|
/** @var IJobList */
|
|
private $jobList;
|
|
/** @var ISecureRandom */
|
|
private $secureRandom;
|
|
/** @var IConfig */
|
|
private $config;
|
|
/** @var ITimeFactory */
|
|
private $timeFactory;
|
|
/** @var UpdateChecker */
|
|
private $updateChecker;
|
|
/** @var IL10N */
|
|
private $l10n;
|
|
/** @var IDateTimeFormatter */
|
|
private $dateTimeFormatter;
|
|
|
|
/**
|
|
* @param string $appName
|
|
* @param IRequest $request
|
|
* @param IJobList $jobList
|
|
* @param ISecureRandom $secureRandom
|
|
* @param IConfig $config
|
|
* @param ITimeFactory $timeFactory
|
|
* @param IL10N $l10n
|
|
* @param UpdateChecker $updateChecker
|
|
* @param IDateTimeFormatter $dateTimeFormatter
|
|
*/
|
|
public function __construct($appName,
|
|
IRequest $request,
|
|
IJobList $jobList,
|
|
ISecureRandom $secureRandom,
|
|
IConfig $config,
|
|
ITimeFactory $timeFactory,
|
|
IL10N $l10n,
|
|
UpdateChecker $updateChecker,
|
|
IDateTimeFormatter $dateTimeFormatter) {
|
|
parent::__construct($appName, $request);
|
|
$this->jobList = $jobList;
|
|
$this->secureRandom = $secureRandom;
|
|
$this->config = $config;
|
|
$this->timeFactory = $timeFactory;
|
|
$this->l10n = $l10n;
|
|
$this->updateChecker = $updateChecker;
|
|
$this->dateTimeFormatter = $dateTimeFormatter;
|
|
}
|
|
|
|
/**
|
|
* @return TemplateResponse
|
|
*/
|
|
public function displayPanel() {
|
|
$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
|
|
$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
|
|
|
|
$channels = [
|
|
'daily',
|
|
'beta',
|
|
'stable',
|
|
'production',
|
|
];
|
|
$currentChannel = \OCP\Util::getChannel();
|
|
|
|
// Remove the currently used channel from the channels list
|
|
if(($key = array_search($currentChannel, $channels)) !== false) {
|
|
unset($channels[$key]);
|
|
}
|
|
$updateState = $this->updateChecker->getUpdateState();
|
|
|
|
$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
|
|
|
|
$params = [
|
|
'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
|
|
'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
|
|
'lastChecked' => $lastUpdateCheck,
|
|
'currentChannel' => $currentChannel,
|
|
'channels' => $channels,
|
|
'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
|
|
'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
|
|
'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
|
|
|
|
'notify_groups' => implode('|', $notifyGroups),
|
|
];
|
|
|
|
return new TemplateResponse($this->appName, 'admin', $params, '');
|
|
}
|
|
|
|
/**
|
|
* @UseSession
|
|
*
|
|
* @param string $channel
|
|
* @return DataResponse
|
|
*/
|
|
public function setChannel($channel) {
|
|
\OCP\Util::setChannel($channel);
|
|
$this->config->setAppValue('core', 'lastupdatedat', 0);
|
|
return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
|
|
}
|
|
|
|
/**
|
|
* @return DataResponse
|
|
*/
|
|
public function createCredentials() {
|
|
// Create a new job and store the creation date
|
|
$this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
|
|
$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
|
|
|
|
// Create a new token
|
|
$newToken = $this->secureRandom->generate(64);
|
|
$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
|
|
|
|
return new DataResponse($newToken);
|
|
}
|
|
|
|
/**
|
|
* @return TemplateResponse returns the instance with all parameters set, ready to be rendered
|
|
*/
|
|
public function getForm() {
|
|
return $this->displayPanel();
|
|
}
|
|
|
|
/**
|
|
* @return string the section ID, e.g. 'sharing'
|
|
*/
|
|
public function getSection() {
|
|
return 'server';
|
|
}
|
|
|
|
/**
|
|
* @return int whether the form should be rather on the top or bottom of
|
|
* the admin section. The forms are arranged in ascending order of the
|
|
* priority values. It is required to return a value between 0 and 100.
|
|
*
|
|
* E.g.: 70
|
|
*/
|
|
public function getPriority() {
|
|
return 1;
|
|
}
|
|
}
|