@@ -30,27 +30,27 @@ |
||
30 | 30 | use OCP\AppFramework\IAppContainer; |
31 | 31 | |
32 | 32 | class Application extends App { |
33 | - public function __construct (array $urlParams = array()) { |
|
34 | - parent::__construct('updatenotification', $urlParams); |
|
35 | - $container = $this->getContainer(); |
|
33 | + public function __construct (array $urlParams = array()) { |
|
34 | + parent::__construct('updatenotification', $urlParams); |
|
35 | + $container = $this->getContainer(); |
|
36 | 36 | |
37 | - $container->registerService('AdminController', function(IAppContainer $c) { |
|
38 | - $updater = new \OC\Updater\VersionCheck( |
|
39 | - \OC::$server->getHTTPClientService(), |
|
40 | - \OC::$server->getConfig() |
|
41 | - ); |
|
42 | - return new AdminController( |
|
43 | - $c->query('AppName'), |
|
44 | - $c->query('Request'), |
|
45 | - $c->getServer()->getJobList(), |
|
46 | - $c->getServer()->getSecureRandom(), |
|
47 | - $c->getServer()->getConfig(), |
|
48 | - new TimeFactory(), |
|
49 | - $c->getServer()->getL10N($c->query('AppName')), |
|
50 | - new UpdateChecker($updater), |
|
51 | - $c->getServer()->getDateTimeFormatter() |
|
52 | - ); |
|
53 | - }); |
|
54 | - } |
|
37 | + $container->registerService('AdminController', function(IAppContainer $c) { |
|
38 | + $updater = new \OC\Updater\VersionCheck( |
|
39 | + \OC::$server->getHTTPClientService(), |
|
40 | + \OC::$server->getConfig() |
|
41 | + ); |
|
42 | + return new AdminController( |
|
43 | + $c->query('AppName'), |
|
44 | + $c->query('Request'), |
|
45 | + $c->getServer()->getJobList(), |
|
46 | + $c->getServer()->getSecureRandom(), |
|
47 | + $c->getServer()->getConfig(), |
|
48 | + new TimeFactory(), |
|
49 | + $c->getServer()->getL10N($c->query('AppName')), |
|
50 | + new UpdateChecker($updater), |
|
51 | + $c->getServer()->getDateTimeFormatter() |
|
52 | + ); |
|
53 | + }); |
|
54 | + } |
|
55 | 55 | |
56 | 56 | } |
@@ -34,44 +34,44 @@ |
||
34 | 34 | * @package OCA\UpdateNotification |
35 | 35 | */ |
36 | 36 | class ResetTokenBackgroundJob extends TimedJob { |
37 | - /** @var IConfig */ |
|
38 | - private $config; |
|
39 | - /** @var ITimeFactory */ |
|
40 | - private $timeFactory; |
|
37 | + /** @var IConfig */ |
|
38 | + private $config; |
|
39 | + /** @var ITimeFactory */ |
|
40 | + private $timeFactory; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param IConfig|null $config |
|
44 | - * @param ITimeFactory|null $timeFactory |
|
45 | - */ |
|
46 | - public function __construct(IConfig $config = null, |
|
47 | - ITimeFactory $timeFactory = null) { |
|
48 | - // Run all 10 minutes |
|
49 | - $this->setInterval(60 * 10); |
|
42 | + /** |
|
43 | + * @param IConfig|null $config |
|
44 | + * @param ITimeFactory|null $timeFactory |
|
45 | + */ |
|
46 | + public function __construct(IConfig $config = null, |
|
47 | + ITimeFactory $timeFactory = null) { |
|
48 | + // Run all 10 minutes |
|
49 | + $this->setInterval(60 * 10); |
|
50 | 50 | |
51 | - if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) { |
|
52 | - $this->config = $config; |
|
53 | - $this->timeFactory = $timeFactory; |
|
54 | - } else { |
|
55 | - $this->fixDIForJobs(); |
|
56 | - } |
|
57 | - } |
|
51 | + if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) { |
|
52 | + $this->config = $config; |
|
53 | + $this->timeFactory = $timeFactory; |
|
54 | + } else { |
|
55 | + $this->fixDIForJobs(); |
|
56 | + } |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * DI for jobs |
|
61 | - */ |
|
62 | - private function fixDIForJobs() { |
|
63 | - $this->config = \OC::$server->getConfig(); |
|
64 | - $this->timeFactory = new TimeFactory(); |
|
65 | - } |
|
59 | + /** |
|
60 | + * DI for jobs |
|
61 | + */ |
|
62 | + private function fixDIForJobs() { |
|
63 | + $this->config = \OC::$server->getConfig(); |
|
64 | + $this->timeFactory = new TimeFactory(); |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * @param $argument |
|
69 | - */ |
|
70 | - protected function run($argument) { |
|
71 | - // Delete old tokens after 2 days |
|
72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | - $this->config->deleteSystemValue('updater.secret'); |
|
74 | - } |
|
75 | - } |
|
67 | + /** |
|
68 | + * @param $argument |
|
69 | + */ |
|
70 | + protected function run($argument) { |
|
71 | + // Delete old tokens after 2 days |
|
72 | + if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | + $this->config->deleteSystemValue('updater.secret'); |
|
74 | + } |
|
75 | + } |
|
76 | 76 | |
77 | 77 | } |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | $application = new Application(); |
27 | 27 | $application->registerRoutes($this, ['routes' => [ |
28 | - ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | - ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
28 | + ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | + ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
30 | 30 | ]]); |
@@ -23,33 +23,33 @@ |
||
23 | 23 | */ |
24 | 24 | |
25 | 25 | if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { |
26 | - $updater = new \OC\Updater\VersionCheck( |
|
27 | - \OC::$server->getHTTPClientService(), |
|
28 | - \OC::$server->getConfig() |
|
29 | - ); |
|
30 | - $updateChecker = new \OCA\UpdateNotification\UpdateChecker( |
|
31 | - $updater |
|
32 | - ); |
|
26 | + $updater = new \OC\Updater\VersionCheck( |
|
27 | + \OC::$server->getHTTPClientService(), |
|
28 | + \OC::$server->getConfig() |
|
29 | + ); |
|
30 | + $updateChecker = new \OCA\UpdateNotification\UpdateChecker( |
|
31 | + $updater |
|
32 | + ); |
|
33 | 33 | |
34 | - $userObject = \OC::$server->getUserSession()->getUser(); |
|
35 | - if($userObject !== null) { |
|
36 | - if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
37 | - !\OC::$server->getAppManager()->isEnabledForUser('notifications')) { |
|
38 | - if($updateChecker->getUpdateState() !== []) { |
|
39 | - \OCP\Util::addScript('updatenotification', 'notification'); |
|
40 | - OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); |
|
41 | - } |
|
42 | - } |
|
43 | - } |
|
34 | + $userObject = \OC::$server->getUserSession()->getUser(); |
|
35 | + if($userObject !== null) { |
|
36 | + if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && |
|
37 | + !\OC::$server->getAppManager()->isEnabledForUser('notifications')) { |
|
38 | + if($updateChecker->getUpdateState() !== []) { |
|
39 | + \OCP\Util::addScript('updatenotification', 'notification'); |
|
40 | + OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); |
|
41 | + } |
|
42 | + } |
|
43 | + } |
|
44 | 44 | |
45 | - $manager = \OC::$server->getNotificationManager(); |
|
46 | - $manager->registerNotifier(function() use ($manager) { |
|
47 | - return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class); |
|
48 | - }, function() { |
|
49 | - $l = \OC::$server->getL10N('updatenotification'); |
|
50 | - return [ |
|
51 | - 'id' => 'updatenotification', |
|
52 | - 'name' => $l->t('Update notifications'), |
|
53 | - ]; |
|
54 | - }); |
|
45 | + $manager = \OC::$server->getNotificationManager(); |
|
46 | + $manager->registerNotifier(function() use ($manager) { |
|
47 | + return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class); |
|
48 | + }, function() { |
|
49 | + $l = \OC::$server->getL10N('updatenotification'); |
|
50 | + return [ |
|
51 | + 'id' => 'updatenotification', |
|
52 | + 'name' => $l->t('Update notifications'), |
|
53 | + ]; |
|
54 | + }); |
|
55 | 55 | } |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - |
|
4 | 3 | * |
5 | 4 | * @author Bjoern Schiessle <[email protected]> |
6 | 5 | * @author Jan-Christoph Borchardt <[email protected]> |
@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'theming'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'theming'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('Theming'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('Theming'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 30; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 30; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -30,46 +30,46 @@ |
||
30 | 30 | |
31 | 31 | class SettingsController extends Controller { |
32 | 32 | |
33 | - /** @var BackupCodeStorage */ |
|
34 | - private $storage; |
|
33 | + /** @var BackupCodeStorage */ |
|
34 | + private $storage; |
|
35 | 35 | |
36 | - /** @var IUserSession */ |
|
37 | - private $userSession; |
|
36 | + /** @var IUserSession */ |
|
37 | + private $userSession; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param BackupCodeStorage $storage |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->userSession = $userSession; |
|
48 | - $this->storage = $storage; |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param BackupCodeStorage $storage |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->userSession = $userSession; |
|
48 | + $this->storage = $storage; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - * @return JSONResponse |
|
54 | - */ |
|
55 | - public function state() { |
|
56 | - $user = $this->userSession->getUser(); |
|
57 | - return $this->storage->getBackupCodesState($user); |
|
58 | - } |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + * @return JSONResponse |
|
54 | + */ |
|
55 | + public function state() { |
|
56 | + $user = $this->userSession->getUser(); |
|
57 | + return $this->storage->getBackupCodesState($user); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @NoAdminRequired |
|
62 | - * @PasswordConfirmationRequired |
|
63 | - * |
|
64 | - * @return JSONResponse |
|
65 | - */ |
|
66 | - public function createCodes() { |
|
67 | - $user = $this->userSession->getUser(); |
|
68 | - $codes = $this->storage->createCodes($user); |
|
69 | - return new JSONResponse([ |
|
70 | - 'codes' => $codes, |
|
71 | - 'state' => $this->storage->getBackupCodesState($user), |
|
72 | - ]); |
|
73 | - } |
|
60 | + /** |
|
61 | + * @NoAdminRequired |
|
62 | + * @PasswordConfirmationRequired |
|
63 | + * |
|
64 | + * @return JSONResponse |
|
65 | + */ |
|
66 | + public function createCodes() { |
|
67 | + $user = $this->userSession->getUser(); |
|
68 | + $codes = $this->storage->createCodes($user); |
|
69 | + return new JSONResponse([ |
|
70 | + 'codes' => $codes, |
|
71 | + 'state' => $this->storage->getBackupCodesState($user), |
|
72 | + ]); |
|
73 | + } |
|
74 | 74 | |
75 | 75 | } |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class BackupCode extends Entity { |
36 | 36 | |
37 | - /** @var string */ |
|
38 | - protected $userId; |
|
37 | + /** @var string */ |
|
38 | + protected $userId; |
|
39 | 39 | |
40 | - /** @var string */ |
|
41 | - protected $code; |
|
40 | + /** @var string */ |
|
41 | + protected $code; |
|
42 | 42 | |
43 | - /** @var int */ |
|
44 | - protected $used; |
|
43 | + /** @var int */ |
|
44 | + protected $used; |
|
45 | 45 | |
46 | 46 | } |
@@ -21,17 +21,17 @@ |
||
21 | 21 | */ |
22 | 22 | // @codeCoverageIgnoreStart |
23 | 23 | return [ |
24 | - 'routes' => [ |
|
25 | - [ |
|
26 | - 'name' => 'settings#state', |
|
27 | - 'url' => '/settings/state', |
|
28 | - 'verb' => 'GET' |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'settings#createCodes', |
|
32 | - 'url' => '/settings/create', |
|
33 | - 'verb' => 'POST' |
|
34 | - ], |
|
35 | - ] |
|
24 | + 'routes' => [ |
|
25 | + [ |
|
26 | + 'name' => 'settings#state', |
|
27 | + 'url' => '/settings/state', |
|
28 | + 'verb' => 'GET' |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'settings#createCodes', |
|
32 | + 'url' => '/settings/create', |
|
33 | + 'verb' => 'POST' |
|
34 | + ], |
|
35 | + ] |
|
36 | 36 | ]; |
37 | 37 | // @codeCoverageIgnoreEnd |