@@ -29,31 +29,31 @@ |
||
29 | 29 | use OCA\User_LDAP\User_Proxy; |
30 | 30 | |
31 | 31 | abstract class UUIDFix extends QueuedJob { |
32 | - /** @var AbstractMapping */ |
|
33 | - protected $mapper; |
|
32 | + /** @var AbstractMapping */ |
|
33 | + protected $mapper; |
|
34 | 34 | |
35 | - /** @var Proxy */ |
|
36 | - protected $proxy; |
|
35 | + /** @var Proxy */ |
|
36 | + protected $proxy; |
|
37 | 37 | |
38 | - public function run($argument) { |
|
39 | - $isUser = $this->proxy instanceof User_Proxy; |
|
40 | - foreach ($argument['records'] as $record) { |
|
41 | - $access = $this->proxy->getLDAPAccess($record['name']); |
|
42 | - $uuid = $access->getUUID($record['dn'], $isUser); |
|
43 | - if ($uuid === false) { |
|
44 | - // record not found, no prob, continue with the next |
|
45 | - continue; |
|
46 | - } |
|
47 | - if ($uuid !== $record['uuid']) { |
|
48 | - $this->mapper->setUUIDbyDN($uuid, $record['dn']); |
|
49 | - } |
|
50 | - } |
|
51 | - } |
|
38 | + public function run($argument) { |
|
39 | + $isUser = $this->proxy instanceof User_Proxy; |
|
40 | + foreach ($argument['records'] as $record) { |
|
41 | + $access = $this->proxy->getLDAPAccess($record['name']); |
|
42 | + $uuid = $access->getUUID($record['dn'], $isUser); |
|
43 | + if ($uuid === false) { |
|
44 | + // record not found, no prob, continue with the next |
|
45 | + continue; |
|
46 | + } |
|
47 | + if ($uuid !== $record['uuid']) { |
|
48 | + $this->mapper->setUUIDbyDN($uuid, $record['dn']); |
|
49 | + } |
|
50 | + } |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param Proxy $proxy |
|
55 | - */ |
|
56 | - public function overrideProxy(Proxy $proxy) { |
|
57 | - $this->proxy = $proxy; |
|
58 | - } |
|
53 | + /** |
|
54 | + * @param Proxy $proxy |
|
55 | + */ |
|
56 | + public function overrideProxy(Proxy $proxy) { |
|
57 | + $this->proxy = $proxy; |
|
58 | + } |
|
59 | 59 | } |
@@ -26,13 +26,13 @@ |
||
26 | 26 | namespace OCA\User_LDAP; |
27 | 27 | |
28 | 28 | abstract class BackendUtility { |
29 | - protected $access; |
|
29 | + protected $access; |
|
30 | 30 | |
31 | - /** |
|
32 | - * constructor, make sure the subclasses call this one! |
|
33 | - * @param Access $access an instance of Access for LDAP interaction |
|
34 | - */ |
|
35 | - public function __construct(Access $access) { |
|
36 | - $this->access = $access; |
|
37 | - } |
|
31 | + /** |
|
32 | + * constructor, make sure the subclasses call this one! |
|
33 | + * @param Access $access an instance of Access for LDAP interaction |
|
34 | + */ |
|
35 | + public function __construct(Access $access) { |
|
36 | + $this->access = $access; |
|
37 | + } |
|
38 | 38 | } |
@@ -38,12 +38,12 @@ |
||
38 | 38 | |
39 | 39 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
40 | 40 | if (isset($_POST['copyConfig'])) { |
41 | - $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
42 | - $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
41 | + $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
42 | + $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
43 | 43 | } else { |
44 | - $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
45 | - $newConfig->setConfiguration($configuration->getDefaults()); |
|
46 | - $resultData['defaults'] = $configuration->getDefaults(); |
|
44 | + $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
45 | + $newConfig->setConfiguration($configuration->getDefaults()); |
|
46 | + $resultData['defaults'] = $configuration->getDefaults(); |
|
47 | 47 | } |
48 | 48 | $newConfig->saveConfiguration(); |
49 | 49 |
@@ -26,35 +26,35 @@ |
||
26 | 26 | use OCA\Encryption\Hooks\Contracts\IHook; |
27 | 27 | |
28 | 28 | class HookManager { |
29 | - private $hookInstances = []; |
|
29 | + private $hookInstances = []; |
|
30 | 30 | |
31 | - /** |
|
32 | - * @param array|IHook $instances |
|
33 | - * - This accepts either a single instance of IHook or an array of instances of IHook |
|
34 | - * @return bool |
|
35 | - */ |
|
36 | - public function registerHook($instances) { |
|
37 | - if (is_array($instances)) { |
|
38 | - foreach ($instances as $instance) { |
|
39 | - if (!$instance instanceof IHook) { |
|
40 | - return false; |
|
41 | - } |
|
42 | - $this->hookInstances[] = $instance; |
|
43 | - } |
|
44 | - } elseif ($instances instanceof IHook) { |
|
45 | - $this->hookInstances[] = $instances; |
|
46 | - } |
|
47 | - return true; |
|
48 | - } |
|
31 | + /** |
|
32 | + * @param array|IHook $instances |
|
33 | + * - This accepts either a single instance of IHook or an array of instances of IHook |
|
34 | + * @return bool |
|
35 | + */ |
|
36 | + public function registerHook($instances) { |
|
37 | + if (is_array($instances)) { |
|
38 | + foreach ($instances as $instance) { |
|
39 | + if (!$instance instanceof IHook) { |
|
40 | + return false; |
|
41 | + } |
|
42 | + $this->hookInstances[] = $instance; |
|
43 | + } |
|
44 | + } elseif ($instances instanceof IHook) { |
|
45 | + $this->hookInstances[] = $instances; |
|
46 | + } |
|
47 | + return true; |
|
48 | + } |
|
49 | 49 | |
50 | - public function fireHooks() { |
|
51 | - foreach ($this->hookInstances as $instance) { |
|
52 | - /** |
|
53 | - * Fire off the add hooks method of each instance stored in cache |
|
54 | - * |
|
55 | - * @var $instance IHook |
|
56 | - */ |
|
57 | - $instance->addHooks(); |
|
58 | - } |
|
59 | - } |
|
50 | + public function fireHooks() { |
|
51 | + foreach ($this->hookInstances as $instance) { |
|
52 | + /** |
|
53 | + * Fire off the add hooks method of each instance stored in cache |
|
54 | + * |
|
55 | + * @var $instance IHook |
|
56 | + */ |
|
57 | + $instance->addHooks(); |
|
58 | + } |
|
59 | + } |
|
60 | 60 | } |
@@ -28,13 +28,13 @@ |
||
28 | 28 | |
29 | 29 | class PrivateKeyMissingException extends GenericEncryptionException { |
30 | 30 | |
31 | - /** |
|
32 | - * @param string $userId |
|
33 | - */ |
|
34 | - public function __construct($userId) { |
|
35 | - if (empty($userId)) { |
|
36 | - $userId = "<no-user-id-given>"; |
|
37 | - } |
|
38 | - parent::__construct("Private Key missing for user: $userId"); |
|
39 | - } |
|
31 | + /** |
|
32 | + * @param string $userId |
|
33 | + */ |
|
34 | + public function __construct($userId) { |
|
35 | + if (empty($userId)) { |
|
36 | + $userId = "<no-user-id-given>"; |
|
37 | + } |
|
38 | + parent::__construct("Private Key missing for user: $userId"); |
|
39 | + } |
|
40 | 40 | } |
@@ -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 | } |
@@ -15,10 +15,10 @@ |
||
15 | 15 | <td width="20px"> </td> |
16 | 16 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> |
17 | 17 | <?php |
18 | - print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']])); |
|
19 | - // TRANSLATORS term at the end of a mail |
|
20 | - p($l->t('Cheers!')); |
|
21 | - ?> |
|
18 | + print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', [$_['password']])); |
|
19 | + // TRANSLATORS term at the end of a mail |
|
20 | + p($l->t('Cheers!')); |
|
21 | + ?> |
|
22 | 22 | </td> |
23 | 23 | </tr> |
24 | 24 | <tr><td colspan="2"> </td></tr> |