@@ -32,39 +32,39 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class DeleteConfig extends Command { |
35 | - /** @var \OCA\User_LDAP\Helper */ |
|
36 | - protected $helper; |
|
35 | + /** @var \OCA\User_LDAP\Helper */ |
|
36 | + protected $helper; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param Helper $helper |
|
40 | - */ |
|
41 | - public function __construct(Helper $helper) { |
|
42 | - $this->helper = $helper; |
|
43 | - parent::__construct(); |
|
44 | - } |
|
38 | + /** |
|
39 | + * @param Helper $helper |
|
40 | + */ |
|
41 | + public function __construct(Helper $helper) { |
|
42 | + $this->helper = $helper; |
|
43 | + parent::__construct(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function configure() { |
|
47 | - $this |
|
48 | - ->setName('ldap:delete-config') |
|
49 | - ->setDescription('deletes an existing LDAP configuration') |
|
50 | - ->addArgument( |
|
51 | - 'configID', |
|
52 | - InputArgument::REQUIRED, |
|
53 | - 'the configuration ID' |
|
54 | - ) |
|
55 | - ; |
|
56 | - } |
|
46 | + protected function configure() { |
|
47 | + $this |
|
48 | + ->setName('ldap:delete-config') |
|
49 | + ->setDescription('deletes an existing LDAP configuration') |
|
50 | + ->addArgument( |
|
51 | + 'configID', |
|
52 | + InputArgument::REQUIRED, |
|
53 | + 'the configuration ID' |
|
54 | + ) |
|
55 | + ; |
|
56 | + } |
|
57 | 57 | |
58 | 58 | |
59 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
60 | - $configPrefix = $input->getArgument('configID'); |
|
59 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
60 | + $configPrefix = $input->getArgument('configID'); |
|
61 | 61 | |
62 | - $success = $this->helper->deleteServerConfiguration($configPrefix); |
|
62 | + $success = $this->helper->deleteServerConfiguration($configPrefix); |
|
63 | 63 | |
64 | - if ($success) { |
|
65 | - $output->writeln("Deleted configuration with configID '{$configPrefix}'"); |
|
66 | - } else { |
|
67 | - $output->writeln("Cannot delete configuration with configID '{$configPrefix}'"); |
|
68 | - } |
|
69 | - } |
|
64 | + if ($success) { |
|
65 | + $output->writeln("Deleted configuration with configID '{$configPrefix}'"); |
|
66 | + } else { |
|
67 | + $output->writeln("Cannot delete configuration with configID '{$configPrefix}'"); |
|
68 | + } |
|
69 | + } |
|
70 | 70 | } |
@@ -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 | } |
@@ -29,11 +29,11 @@ |
||
29 | 29 | */ |
30 | 30 | class GroupMapping extends AbstractMapping { |
31 | 31 | |
32 | - /** |
|
33 | - * returns the DB table name which holds the mappings |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - protected function getTableName() { |
|
37 | - return '*PREFIX*ldap_group_mapping'; |
|
38 | - } |
|
32 | + /** |
|
33 | + * returns the DB table name which holds the mappings |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + protected function getTableName() { |
|
37 | + return '*PREFIX*ldap_group_mapping'; |
|
38 | + } |
|
39 | 39 | } |
@@ -29,11 +29,11 @@ |
||
29 | 29 | */ |
30 | 30 | class UserMapping extends AbstractMapping { |
31 | 31 | |
32 | - /** |
|
33 | - * returns the DB table name which holds the mappings |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - protected function getTableName() { |
|
37 | - return '*PREFIX*ldap_user_mapping'; |
|
38 | - } |
|
32 | + /** |
|
33 | + * returns the DB table name which holds the mappings |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + protected function getTableName() { |
|
37 | + return '*PREFIX*ldap_user_mapping'; |
|
38 | + } |
|
39 | 39 | } |
@@ -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 | } |