@@ -25,13 +25,13 @@ |
||
25 | 25 | |
26 | 26 | class PublicKeyMissingException extends GenericEncryptionException { |
27 | 27 | |
28 | - /** |
|
29 | - * @param string $userId |
|
30 | - */ |
|
31 | - public function __construct($userId) { |
|
32 | - if (empty($userId)) { |
|
33 | - $userId = "<no-user-id-given>"; |
|
34 | - } |
|
35 | - parent::__construct("Public Key missing for user: $userId"); |
|
36 | - } |
|
28 | + /** |
|
29 | + * @param string $userId |
|
30 | + */ |
|
31 | + public function __construct($userId) { |
|
32 | + if (empty($userId)) { |
|
33 | + $userId = "<no-user-id-given>"; |
|
34 | + } |
|
35 | + parent::__construct("Public Key missing for user: $userId"); |
|
36 | + } |
|
37 | 37 | } |
@@ -32,63 +32,63 @@ |
||
32 | 32 | |
33 | 33 | class Personal implements ISettings { |
34 | 34 | |
35 | - /** @var IConfig */ |
|
36 | - private $config; |
|
37 | - /** @var Session */ |
|
38 | - private $session; |
|
39 | - /** @var Util */ |
|
40 | - private $util; |
|
41 | - /** @var IUserSession */ |
|
42 | - private $userSession; |
|
35 | + /** @var IConfig */ |
|
36 | + private $config; |
|
37 | + /** @var Session */ |
|
38 | + private $session; |
|
39 | + /** @var Util */ |
|
40 | + private $util; |
|
41 | + /** @var IUserSession */ |
|
42 | + private $userSession; |
|
43 | 43 | |
44 | - public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) { |
|
45 | - $this->config = $config; |
|
46 | - $this->session = $session; |
|
47 | - $this->util = $util; |
|
48 | - $this->userSession = $userSession; |
|
49 | - } |
|
44 | + public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) { |
|
45 | + $this->config = $config; |
|
46 | + $this->session = $session; |
|
47 | + $this->util = $util; |
|
48 | + $this->userSession = $userSession; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
53 | - * @since 9.1 |
|
54 | - */ |
|
55 | - public function getForm() { |
|
56 | - $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled'); |
|
57 | - $privateKeySet = $this->session->isPrivateKeySet(); |
|
51 | + /** |
|
52 | + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
53 | + * @since 9.1 |
|
54 | + */ |
|
55 | + public function getForm() { |
|
56 | + $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled'); |
|
57 | + $privateKeySet = $this->session->isPrivateKeySet(); |
|
58 | 58 | |
59 | - if (!$recoveryAdminEnabled && $privateKeySet) { |
|
60 | - return new TemplateResponse('settings', 'settings/empty', [], ''); |
|
61 | - } |
|
59 | + if (!$recoveryAdminEnabled && $privateKeySet) { |
|
60 | + return new TemplateResponse('settings', 'settings/empty', [], ''); |
|
61 | + } |
|
62 | 62 | |
63 | - $userId = $this->userSession->getUser()->getUID(); |
|
64 | - $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId); |
|
63 | + $userId = $this->userSession->getUser()->getUID(); |
|
64 | + $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId); |
|
65 | 65 | |
66 | - $parameters = [ |
|
67 | - 'recoveryEnabled' => $recoveryAdminEnabled, |
|
68 | - 'recoveryEnabledForUser' => $recoveryEnabledForUser, |
|
69 | - 'privateKeySet' => $privateKeySet, |
|
70 | - 'initialized' => $this->session->getStatus(), |
|
71 | - ]; |
|
72 | - return new TemplateResponse('encryption', 'settings-personal', $parameters, ''); |
|
73 | - } |
|
66 | + $parameters = [ |
|
67 | + 'recoveryEnabled' => $recoveryAdminEnabled, |
|
68 | + 'recoveryEnabledForUser' => $recoveryEnabledForUser, |
|
69 | + 'privateKeySet' => $privateKeySet, |
|
70 | + 'initialized' => $this->session->getStatus(), |
|
71 | + ]; |
|
72 | + return new TemplateResponse('encryption', 'settings-personal', $parameters, ''); |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @return string the section ID, e.g. 'sharing' |
|
77 | - * @since 9.1 |
|
78 | - */ |
|
79 | - public function getSection() { |
|
80 | - return 'security'; |
|
81 | - } |
|
75 | + /** |
|
76 | + * @return string the section ID, e.g. 'sharing' |
|
77 | + * @since 9.1 |
|
78 | + */ |
|
79 | + public function getSection() { |
|
80 | + return 'security'; |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @return int whether the form should be rather on the top or bottom of |
|
85 | - * the admin section. The forms are arranged in ascending order of the |
|
86 | - * priority values. It is required to return a value between 0 and 100. |
|
87 | - * |
|
88 | - * E.g.: 70 |
|
89 | - * @since 9.1 |
|
90 | - */ |
|
91 | - public function getPriority() { |
|
92 | - return 80; |
|
93 | - } |
|
83 | + /** |
|
84 | + * @return int whether the form should be rather on the top or bottom of |
|
85 | + * the admin section. The forms are arranged in ascending order of the |
|
86 | + * priority values. It is required to return a value between 0 and 100. |
|
87 | + * |
|
88 | + * E.g.: 70 |
|
89 | + * @since 9.1 |
|
90 | + */ |
|
91 | + public function getPriority() { |
|
92 | + return 80; |
|
93 | + } |
|
94 | 94 | } |
@@ -23,10 +23,10 @@ |
||
23 | 23 | namespace OCA\Encryption\Hooks\Contracts; |
24 | 24 | |
25 | 25 | interface IHook { |
26 | - /** |
|
27 | - * Connects Hooks |
|
28 | - * |
|
29 | - * @return null |
|
30 | - */ |
|
31 | - public function addHooks(); |
|
26 | + /** |
|
27 | + * Connects Hooks |
|
28 | + * |
|
29 | + * @return null |
|
30 | + */ |
|
31 | + public function addHooks(); |
|
32 | 32 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | <p id="encryptHomeStorageSetting"> |
14 | 14 | <input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage" |
15 | 15 | value="1" <?php if ($_['encryptHomeStorage']) { |
16 | - print_unescaped('checked="checked"'); |
|
16 | + print_unescaped('checked="checked"'); |
|
17 | 17 | } ?> /> |
18 | 18 | <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> |
19 | 19 | <em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em> |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | <br/><br/> |
46 | 46 | |
47 | 47 | <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') { |
48 | - print_unescaped('class="hidden"'); |
|
48 | + print_unescaped('class="hidden"'); |
|
49 | 49 | }?>> |
50 | 50 | <?php p($l->t("Change recovery key password:")); ?> |
51 | 51 | <span class="msg"></span> |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use OCP\AppFramework\Http; |
6 | 6 | |
7 | 7 | class NotSubAdminException extends \Exception { |
8 | - public function __construct() { |
|
9 | - parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | - } |
|
8 | + public function __construct() { |
|
9 | + parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | + } |
|
11 | 11 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Ajax extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'ajax'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'ajax'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Cron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'cron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'cron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class WebCron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'webcron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'webcron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -11,43 +11,43 @@ |
||
11 | 11 | use OCP\Share\IManager; |
12 | 12 | |
13 | 13 | class OCSShareAPIMiddleware extends Middleware { |
14 | - /** @var IManager */ |
|
15 | - private $shareManager; |
|
16 | - /** @var IL10N */ |
|
17 | - private $l; |
|
14 | + /** @var IManager */ |
|
15 | + private $shareManager; |
|
16 | + /** @var IL10N */ |
|
17 | + private $l; |
|
18 | 18 | |
19 | - public function __construct(IManager $shareManager, |
|
20 | - IL10N $l) { |
|
21 | - $this->shareManager = $shareManager; |
|
22 | - $this->l = $l; |
|
23 | - } |
|
19 | + public function __construct(IManager $shareManager, |
|
20 | + IL10N $l) { |
|
21 | + $this->shareManager = $shareManager; |
|
22 | + $this->l = $l; |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * @param Controller $controller |
|
27 | - * @param string $methodName |
|
28 | - * |
|
29 | - * @throws OCSNotFoundException |
|
30 | - */ |
|
31 | - public function beforeController($controller, $methodName) { |
|
32 | - if ($controller instanceof ShareAPIController) { |
|
33 | - if (!$this->shareManager->shareApiEnabled()) { |
|
34 | - throw new OCSNotFoundException($this->l->t('Share API is disabled')); |
|
35 | - } |
|
36 | - } |
|
37 | - } |
|
25 | + /** |
|
26 | + * @param Controller $controller |
|
27 | + * @param string $methodName |
|
28 | + * |
|
29 | + * @throws OCSNotFoundException |
|
30 | + */ |
|
31 | + public function beforeController($controller, $methodName) { |
|
32 | + if ($controller instanceof ShareAPIController) { |
|
33 | + if (!$this->shareManager->shareApiEnabled()) { |
|
34 | + throw new OCSNotFoundException($this->l->t('Share API is disabled')); |
|
35 | + } |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param Controller $controller |
|
41 | - * @param string $methodName |
|
42 | - * @param Response $response |
|
43 | - * @return Response |
|
44 | - */ |
|
45 | - public function afterController($controller, $methodName, Response $response) { |
|
46 | - if ($controller instanceof ShareAPIController) { |
|
47 | - /** @var ShareAPIController $controller */ |
|
48 | - $controller->cleanup(); |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param Controller $controller |
|
41 | + * @param string $methodName |
|
42 | + * @param Response $response |
|
43 | + * @return Response |
|
44 | + */ |
|
45 | + public function afterController($controller, $methodName, Response $response) { |
|
46 | + if ($controller instanceof ShareAPIController) { |
|
47 | + /** @var ShareAPIController $controller */ |
|
48 | + $controller->cleanup(); |
|
49 | + } |
|
50 | 50 | |
51 | - return $response; |
|
52 | - } |
|
51 | + return $response; |
|
52 | + } |
|
53 | 53 | } |