@@ -26,13 +26,13 @@ |
||
26 | 26 | namespace OCA\User_LDAP; |
27 | 27 | |
28 | 28 | abstract class LDAPUtility { |
29 | - protected $ldap; |
|
29 | + protected $ldap; |
|
30 | 30 | |
31 | - /** |
|
32 | - * constructor, make sure the subclasses call this one! |
|
33 | - * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper |
|
34 | - */ |
|
35 | - public function __construct(ILDAPWrapper $ldapWrapper) { |
|
36 | - $this->ldap = $ldapWrapper; |
|
37 | - } |
|
31 | + /** |
|
32 | + * constructor, make sure the subclasses call this one! |
|
33 | + * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper |
|
34 | + */ |
|
35 | + public function __construct(ILDAPWrapper $ldapWrapper) { |
|
36 | + $this->ldap = $ldapWrapper; |
|
37 | + } |
|
38 | 38 | } |
@@ -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 'ldap'; |
|
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 'ldap'; |
|
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('LDAP / AD integration'); |
|
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('LDAP / AD integration'); |
|
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 25; |
|
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 25; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('user_ldap', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('user_ldap', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -31,59 +31,59 @@ |
||
31 | 31 | use OCP\Template; |
32 | 32 | |
33 | 33 | class Admin implements ISettings { |
34 | - /** @var IL10N */ |
|
35 | - private $l; |
|
34 | + /** @var IL10N */ |
|
35 | + private $l; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IL10N $l) { |
|
41 | - $this->l = $l; |
|
42 | - } |
|
37 | + /** |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IL10N $l) { |
|
41 | + $this->l = $l; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @return TemplateResponse |
|
46 | - */ |
|
47 | - public function getForm() { |
|
48 | - $helper = new Helper(\OC::$server->getConfig()); |
|
49 | - $prefixes = $helper->getServerConfigurationPrefixes(); |
|
50 | - $hosts = $helper->getServerConfigurationHosts(); |
|
44 | + /** |
|
45 | + * @return TemplateResponse |
|
46 | + */ |
|
47 | + public function getForm() { |
|
48 | + $helper = new Helper(\OC::$server->getConfig()); |
|
49 | + $prefixes = $helper->getServerConfigurationPrefixes(); |
|
50 | + $hosts = $helper->getServerConfigurationHosts(); |
|
51 | 51 | |
52 | - $wControls = new Template('user_ldap', 'part.wizardcontrols'); |
|
53 | - $wControls = $wControls->fetchPage(); |
|
54 | - $sControls = new Template('user_ldap', 'part.settingcontrols'); |
|
55 | - $sControls = $sControls->fetchPage(); |
|
52 | + $wControls = new Template('user_ldap', 'part.wizardcontrols'); |
|
53 | + $wControls = $wControls->fetchPage(); |
|
54 | + $sControls = new Template('user_ldap', 'part.settingcontrols'); |
|
55 | + $sControls = $sControls->fetchPage(); |
|
56 | 56 | |
57 | - $parameters['serverConfigurationPrefixes'] = $prefixes; |
|
58 | - $parameters['serverConfigurationHosts'] = $hosts; |
|
59 | - $parameters['settingControls'] = $sControls; |
|
60 | - $parameters['wizardControls'] = $wControls; |
|
57 | + $parameters['serverConfigurationPrefixes'] = $prefixes; |
|
58 | + $parameters['serverConfigurationHosts'] = $hosts; |
|
59 | + $parameters['settingControls'] = $sControls; |
|
60 | + $parameters['wizardControls'] = $wControls; |
|
61 | 61 | |
62 | - // assign default values |
|
63 | - $config = new Configuration('', false); |
|
64 | - $defaults = $config->getDefaults(); |
|
65 | - foreach($defaults as $key => $default) { |
|
66 | - $parameters[$key.'_default'] = $default; |
|
67 | - } |
|
62 | + // assign default values |
|
63 | + $config = new Configuration('', false); |
|
64 | + $defaults = $config->getDefaults(); |
|
65 | + foreach($defaults as $key => $default) { |
|
66 | + $parameters[$key.'_default'] = $default; |
|
67 | + } |
|
68 | 68 | |
69 | - return new TemplateResponse('user_ldap', 'settings', $parameters); |
|
70 | - } |
|
69 | + return new TemplateResponse('user_ldap', 'settings', $parameters); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * @return string the section ID, e.g. 'sharing' |
|
74 | - */ |
|
75 | - public function getSection() { |
|
76 | - return 'ldap'; |
|
77 | - } |
|
72 | + /** |
|
73 | + * @return string the section ID, e.g. 'sharing' |
|
74 | + */ |
|
75 | + public function getSection() { |
|
76 | + return 'ldap'; |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * @return int whether the form should be rather on the top or bottom of |
|
81 | - * the admin section. The forms are arranged in ascending order of the |
|
82 | - * priority values. It is required to return a value between 0 and 100. |
|
83 | - * |
|
84 | - * E.g.: 70 |
|
85 | - */ |
|
86 | - public function getPriority() { |
|
87 | - return 5; |
|
88 | - } |
|
79 | + /** |
|
80 | + * @return int whether the form should be rather on the top or bottom of |
|
81 | + * the admin section. The forms are arranged in ascending order of the |
|
82 | + * priority values. It is required to return a value between 0 and 100. |
|
83 | + * |
|
84 | + * E.g.: 70 |
|
85 | + */ |
|
86 | + public function getPriority() { |
|
87 | + return 5; |
|
88 | + } |
|
89 | 89 | } |
@@ -33,155 +33,155 @@ |
||
33 | 33 | */ |
34 | 34 | class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport { |
35 | 35 | |
36 | - private $backend; |
|
37 | - private $logger; |
|
38 | - private $helper; |
|
39 | - private $deletedUsersIndex; |
|
36 | + private $backend; |
|
37 | + private $logger; |
|
38 | + private $helper; |
|
39 | + private $deletedUsersIndex; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Create new LDAPProvider |
|
43 | - * @param \OCP\IServerContainer $serverContainer |
|
44 | - * @throws \Exception if user_ldap app was not enabled |
|
45 | - */ |
|
46 | - public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) { |
|
47 | - $this->logger = $serverContainer->getLogger(); |
|
48 | - $this->helper = $helper; |
|
49 | - $this->deletedUsersIndex = $deletedUsersIndex; |
|
50 | - foreach ($serverContainer->getUserManager()->getBackends() as $backend){ |
|
51 | - $this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']); |
|
52 | - if ($backend instanceof IUserLDAP) { |
|
53 | - $this->backend = $backend; |
|
54 | - return; |
|
55 | - } |
|
41 | + /** |
|
42 | + * Create new LDAPProvider |
|
43 | + * @param \OCP\IServerContainer $serverContainer |
|
44 | + * @throws \Exception if user_ldap app was not enabled |
|
45 | + */ |
|
46 | + public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) { |
|
47 | + $this->logger = $serverContainer->getLogger(); |
|
48 | + $this->helper = $helper; |
|
49 | + $this->deletedUsersIndex = $deletedUsersIndex; |
|
50 | + foreach ($serverContainer->getUserManager()->getBackends() as $backend){ |
|
51 | + $this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']); |
|
52 | + if ($backend instanceof IUserLDAP) { |
|
53 | + $this->backend = $backend; |
|
54 | + return; |
|
55 | + } |
|
56 | 56 | } |
57 | - throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled'); |
|
58 | - } |
|
57 | + throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled'); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Translate an user id to LDAP DN |
|
62 | - * @param string $uid user id |
|
63 | - * @return string with the LDAP DN |
|
64 | - * @throws \Exception if translation was unsuccessful |
|
65 | - */ |
|
66 | - public function getUserDN($uid) { |
|
67 | - if(!$this->backend->userExists($uid)){ |
|
68 | - throw new \Exception('User id not found in LDAP'); |
|
69 | - } |
|
70 | - $result = $this->backend->getLDAPAccess($uid)->username2dn($uid); |
|
71 | - if(!$result){ |
|
72 | - throw new \Exception('Translation to LDAP DN unsuccessful'); |
|
73 | - } |
|
74 | - return $result; |
|
75 | - } |
|
60 | + /** |
|
61 | + * Translate an user id to LDAP DN |
|
62 | + * @param string $uid user id |
|
63 | + * @return string with the LDAP DN |
|
64 | + * @throws \Exception if translation was unsuccessful |
|
65 | + */ |
|
66 | + public function getUserDN($uid) { |
|
67 | + if(!$this->backend->userExists($uid)){ |
|
68 | + throw new \Exception('User id not found in LDAP'); |
|
69 | + } |
|
70 | + $result = $this->backend->getLDAPAccess($uid)->username2dn($uid); |
|
71 | + if(!$result){ |
|
72 | + throw new \Exception('Translation to LDAP DN unsuccessful'); |
|
73 | + } |
|
74 | + return $result; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * Translate a LDAP DN to an internal user name. If there is no mapping between |
|
79 | - * the DN and the user name, a new one will be created. |
|
80 | - * @param string $dn LDAP DN |
|
81 | - * @return string with the internal user name |
|
82 | - * @throws \Exception if translation was unsuccessful |
|
83 | - */ |
|
84 | - public function getUserName($dn) { |
|
85 | - $result = $this->backend->dn2UserName($dn); |
|
86 | - if(!$result){ |
|
87 | - throw new \Exception('Translation to internal user name unsuccessful'); |
|
88 | - } |
|
89 | - return $result; |
|
90 | - } |
|
77 | + /** |
|
78 | + * Translate a LDAP DN to an internal user name. If there is no mapping between |
|
79 | + * the DN and the user name, a new one will be created. |
|
80 | + * @param string $dn LDAP DN |
|
81 | + * @return string with the internal user name |
|
82 | + * @throws \Exception if translation was unsuccessful |
|
83 | + */ |
|
84 | + public function getUserName($dn) { |
|
85 | + $result = $this->backend->dn2UserName($dn); |
|
86 | + if(!$result){ |
|
87 | + throw new \Exception('Translation to internal user name unsuccessful'); |
|
88 | + } |
|
89 | + return $result; |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * Convert a stored DN so it can be used as base parameter for LDAP queries. |
|
94 | - * @param string $dn the DN in question |
|
95 | - * @return string |
|
96 | - */ |
|
97 | - public function DNasBaseParameter($dn) { |
|
98 | - return $this->helper->DNasBaseParameter($dn); |
|
99 | - } |
|
92 | + /** |
|
93 | + * Convert a stored DN so it can be used as base parameter for LDAP queries. |
|
94 | + * @param string $dn the DN in question |
|
95 | + * @return string |
|
96 | + */ |
|
97 | + public function DNasBaseParameter($dn) { |
|
98 | + return $this->helper->DNasBaseParameter($dn); |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * Sanitize a DN received from the LDAP server. |
|
103 | - * @param array $dn the DN in question |
|
104 | - * @return array the sanitized DN |
|
105 | - */ |
|
106 | - public function sanitizeDN($dn) { |
|
107 | - return $this->helper->sanitizeDN($dn); |
|
108 | - } |
|
101 | + /** |
|
102 | + * Sanitize a DN received from the LDAP server. |
|
103 | + * @param array $dn the DN in question |
|
104 | + * @return array the sanitized DN |
|
105 | + */ |
|
106 | + public function sanitizeDN($dn) { |
|
107 | + return $this->helper->sanitizeDN($dn); |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * Return a new LDAP connection resource for the specified user. |
|
112 | - * The connection must be closed manually. |
|
113 | - * @param string $uid user id |
|
114 | - * @return resource of the LDAP connection |
|
115 | - * @throws \Exception if user id was not found in LDAP |
|
116 | - */ |
|
117 | - public function getLDAPConnection($uid) { |
|
118 | - if(!$this->backend->userExists($uid)){ |
|
119 | - throw new \Exception('User id not found in LDAP'); |
|
120 | - } |
|
121 | - return $this->backend->getNewLDAPConnection($uid); |
|
122 | - } |
|
110 | + /** |
|
111 | + * Return a new LDAP connection resource for the specified user. |
|
112 | + * The connection must be closed manually. |
|
113 | + * @param string $uid user id |
|
114 | + * @return resource of the LDAP connection |
|
115 | + * @throws \Exception if user id was not found in LDAP |
|
116 | + */ |
|
117 | + public function getLDAPConnection($uid) { |
|
118 | + if(!$this->backend->userExists($uid)){ |
|
119 | + throw new \Exception('User id not found in LDAP'); |
|
120 | + } |
|
121 | + return $this->backend->getNewLDAPConnection($uid); |
|
122 | + } |
|
123 | 123 | |
124 | - /** |
|
125 | - * Get the LDAP base for users. |
|
126 | - * @param string $uid user id |
|
127 | - * @return string the base for users |
|
128 | - * @throws \Exception if user id was not found in LDAP |
|
129 | - */ |
|
130 | - public function getLDAPBaseUsers($uid) { |
|
131 | - if(!$this->backend->userExists($uid)){ |
|
132 | - throw new \Exception('User id not found in LDAP'); |
|
133 | - } |
|
134 | - return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users']; |
|
135 | - } |
|
124 | + /** |
|
125 | + * Get the LDAP base for users. |
|
126 | + * @param string $uid user id |
|
127 | + * @return string the base for users |
|
128 | + * @throws \Exception if user id was not found in LDAP |
|
129 | + */ |
|
130 | + public function getLDAPBaseUsers($uid) { |
|
131 | + if(!$this->backend->userExists($uid)){ |
|
132 | + throw new \Exception('User id not found in LDAP'); |
|
133 | + } |
|
134 | + return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users']; |
|
135 | + } |
|
136 | 136 | |
137 | - /** |
|
138 | - * Get the LDAP base for groups. |
|
139 | - * @param string $uid user id |
|
140 | - * @return string the base for groups |
|
141 | - * @throws \Exception if user id was not found in LDAP |
|
142 | - */ |
|
143 | - public function getLDAPBaseGroups($uid) { |
|
144 | - if(!$this->backend->userExists($uid)){ |
|
145 | - throw new \Exception('User id not found in LDAP'); |
|
146 | - } |
|
147 | - return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups']; |
|
148 | - } |
|
137 | + /** |
|
138 | + * Get the LDAP base for groups. |
|
139 | + * @param string $uid user id |
|
140 | + * @return string the base for groups |
|
141 | + * @throws \Exception if user id was not found in LDAP |
|
142 | + */ |
|
143 | + public function getLDAPBaseGroups($uid) { |
|
144 | + if(!$this->backend->userExists($uid)){ |
|
145 | + throw new \Exception('User id not found in LDAP'); |
|
146 | + } |
|
147 | + return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups']; |
|
148 | + } |
|
149 | 149 | |
150 | - /** |
|
151 | - * Clear the cache if a cache is used, otherwise do nothing. |
|
152 | - * @param string $uid user id |
|
153 | - * @throws \Exception if user id was not found in LDAP |
|
154 | - */ |
|
155 | - public function clearCache($uid) { |
|
156 | - if(!$this->backend->userExists($uid)){ |
|
157 | - throw new \Exception('User id not found in LDAP'); |
|
158 | - } |
|
159 | - $this->backend->getLDAPAccess($uid)->getConnection()->clearCache(); |
|
160 | - } |
|
150 | + /** |
|
151 | + * Clear the cache if a cache is used, otherwise do nothing. |
|
152 | + * @param string $uid user id |
|
153 | + * @throws \Exception if user id was not found in LDAP |
|
154 | + */ |
|
155 | + public function clearCache($uid) { |
|
156 | + if(!$this->backend->userExists($uid)){ |
|
157 | + throw new \Exception('User id not found in LDAP'); |
|
158 | + } |
|
159 | + $this->backend->getLDAPAccess($uid)->getConnection()->clearCache(); |
|
160 | + } |
|
161 | 161 | |
162 | - /** |
|
163 | - * Check whether a LDAP DN exists |
|
164 | - * @param string $dn LDAP DN |
|
165 | - * @return bool whether the DN exists |
|
166 | - */ |
|
167 | - public function dnExists($dn) { |
|
168 | - $result = $this->backend->dn2UserName($dn); |
|
169 | - return !$result ? false : true; |
|
170 | - } |
|
162 | + /** |
|
163 | + * Check whether a LDAP DN exists |
|
164 | + * @param string $dn LDAP DN |
|
165 | + * @return bool whether the DN exists |
|
166 | + */ |
|
167 | + public function dnExists($dn) { |
|
168 | + $result = $this->backend->dn2UserName($dn); |
|
169 | + return !$result ? false : true; |
|
170 | + } |
|
171 | 171 | |
172 | - /** |
|
173 | - * Flag record for deletion. |
|
174 | - * @param string $uid user id |
|
175 | - */ |
|
176 | - public function flagRecord($uid) { |
|
177 | - $this->deletedUsersIndex->markUser($uid); |
|
178 | - } |
|
172 | + /** |
|
173 | + * Flag record for deletion. |
|
174 | + * @param string $uid user id |
|
175 | + */ |
|
176 | + public function flagRecord($uid) { |
|
177 | + $this->deletedUsersIndex->markUser($uid); |
|
178 | + } |
|
179 | 179 | |
180 | - /** |
|
181 | - * Unflag record for deletion. |
|
182 | - * @param string $uid user id |
|
183 | - */ |
|
184 | - public function unflagRecord($uid) { |
|
185 | - //do nothing |
|
186 | - } |
|
180 | + /** |
|
181 | + * Unflag record for deletion. |
|
182 | + * @param string $uid user id |
|
183 | + */ |
|
184 | + public function unflagRecord($uid) { |
|
185 | + //do nothing |
|
186 | + } |
|
187 | 187 | } |
@@ -28,32 +28,32 @@ |
||
28 | 28 | use OCA\User_LDAP\Mapping\UserMapping; |
29 | 29 | |
30 | 30 | class LDAPProviderFactory implements ILDAPProviderFactory { |
31 | - /** |
|
32 | - * Server container |
|
33 | - * |
|
34 | - * @var IServerContainer |
|
35 | - */ |
|
36 | - private $serverContainer; |
|
31 | + /** |
|
32 | + * Server container |
|
33 | + * |
|
34 | + * @var IServerContainer |
|
35 | + */ |
|
36 | + private $serverContainer; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Constructor for the LDAP provider factory |
|
40 | - * |
|
41 | - * @param IServerContainer $serverContainer server container |
|
42 | - */ |
|
43 | - public function __construct(IServerContainer $serverContainer) { |
|
44 | - $this->serverContainer = $serverContainer; |
|
45 | - } |
|
38 | + /** |
|
39 | + * Constructor for the LDAP provider factory |
|
40 | + * |
|
41 | + * @param IServerContainer $serverContainer server container |
|
42 | + */ |
|
43 | + public function __construct(IServerContainer $serverContainer) { |
|
44 | + $this->serverContainer = $serverContainer; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * creates and returns an instance of the ILDAPProvider |
|
49 | - * |
|
50 | - * @return OCP\LDAP\ILDAPProvider |
|
51 | - */ |
|
52 | - public function getLDAPProvider() { |
|
53 | - $dbConnection = $this->serverContainer->getDatabaseConnection(); |
|
54 | - $userMapping = new UserMapping($dbConnection); |
|
55 | - return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()), |
|
56 | - new DeletedUsersIndex($this->serverContainer->getConfig(), |
|
57 | - $dbConnection, $userMapping)); |
|
58 | - } |
|
47 | + /** |
|
48 | + * creates and returns an instance of the ILDAPProvider |
|
49 | + * |
|
50 | + * @return OCP\LDAP\ILDAPProvider |
|
51 | + */ |
|
52 | + public function getLDAPProvider() { |
|
53 | + $dbConnection = $this->serverContainer->getDatabaseConnection(); |
|
54 | + $userMapping = new UserMapping($dbConnection); |
|
55 | + return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()), |
|
56 | + new DeletedUsersIndex($this->serverContainer->getConfig(), |
|
57 | + $dbConnection, $userMapping)); |
|
58 | + } |
|
59 | 59 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); |
25 | 25 | if($state === 'doSet') { |
26 | - OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); |
|
26 | + OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); |
@@ -1,47 +1,47 @@ discard block |
||
1 | 1 | <?php |
2 | - use \OCA\Files_External\Lib\Backend\Backend; |
|
3 | - use \OCA\Files_External\Lib\Auth\AuthMechanism; |
|
4 | - use \OCA\Files_External\Lib\DefinitionParameter; |
|
5 | - use \OCA\Files_External\Service\BackendService; |
|
2 | + use \OCA\Files_External\Lib\Backend\Backend; |
|
3 | + use \OCA\Files_External\Lib\Auth\AuthMechanism; |
|
4 | + use \OCA\Files_External\Lib\DefinitionParameter; |
|
5 | + use \OCA\Files_External\Service\BackendService; |
|
6 | 6 | |
7 | - $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']; |
|
7 | + $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']; |
|
8 | 8 | |
9 | - $l->t("Enable encryption"); |
|
10 | - $l->t("Enable previews"); |
|
11 | - $l->t("Enable sharing"); |
|
12 | - $l->t("Check for changes"); |
|
13 | - $l->t("Never"); |
|
14 | - $l->t("Once every direct access"); |
|
9 | + $l->t("Enable encryption"); |
|
10 | + $l->t("Enable previews"); |
|
11 | + $l->t("Enable sharing"); |
|
12 | + $l->t("Check for changes"); |
|
13 | + $l->t("Never"); |
|
14 | + $l->t("Once every direct access"); |
|
15 | 15 | |
16 | - script('files_external', 'settings'); |
|
17 | - style('files_external', 'settings'); |
|
16 | + script('files_external', 'settings'); |
|
17 | + style('files_external', 'settings'); |
|
18 | 18 | |
19 | - // load custom JS |
|
20 | - foreach ($_['backends'] as $backend) { |
|
21 | - /** @var Backend $backend */ |
|
22 | - $scripts = $backend->getCustomJs(); |
|
23 | - foreach ($scripts as $script) { |
|
24 | - script('files_external', $script); |
|
25 | - } |
|
26 | - } |
|
27 | - foreach ($_['authMechanisms'] as $authMechanism) { |
|
28 | - /** @var AuthMechanism $authMechanism */ |
|
29 | - $scripts = $authMechanism->getCustomJs(); |
|
30 | - foreach ($scripts as $script) { |
|
31 | - script('files_external', $script); |
|
32 | - } |
|
33 | - } |
|
19 | + // load custom JS |
|
20 | + foreach ($_['backends'] as $backend) { |
|
21 | + /** @var Backend $backend */ |
|
22 | + $scripts = $backend->getCustomJs(); |
|
23 | + foreach ($scripts as $script) { |
|
24 | + script('files_external', $script); |
|
25 | + } |
|
26 | + } |
|
27 | + foreach ($_['authMechanisms'] as $authMechanism) { |
|
28 | + /** @var AuthMechanism $authMechanism */ |
|
29 | + $scripts = $authMechanism->getCustomJs(); |
|
30 | + foreach ($scripts as $script) { |
|
31 | + script('files_external', $script); |
|
32 | + } |
|
33 | + } |
|
34 | 34 | |
35 | - function writeParameterInput($parameter, $options, $classes = []) { |
|
36 | - $value = ''; |
|
37 | - if (isset($options[$parameter->getName()])) { |
|
38 | - $value = $options[$parameter->getName()]; |
|
39 | - } |
|
40 | - $placeholder = $parameter->getText(); |
|
41 | - $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
35 | + function writeParameterInput($parameter, $options, $classes = []) { |
|
36 | + $value = ''; |
|
37 | + if (isset($options[$parameter->getName()])) { |
|
38 | + $value = $options[$parameter->getName()]; |
|
39 | + } |
|
40 | + $placeholder = $parameter->getText(); |
|
41 | + $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
42 | 42 | |
43 | - switch ($parameter->getType()) { |
|
44 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
43 | + switch ($parameter->getType()) { |
|
44 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | 45 | <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
46 | 46 | <input type="password" |
47 | 47 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | placeholder="<?php p($placeholder); ?>" |
51 | 51 | /> |
52 | 52 | <?php |
53 | - break; |
|
54 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
53 | + break; |
|
54 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | 55 | <?php $checkboxId = uniqid("checkbox_"); ?> |
56 | 56 | <div> |
57 | 57 | <label> |
@@ -65,16 +65,16 @@ discard block |
||
65 | 65 | </label> |
66 | 66 | </div> |
67 | 67 | <?php |
68 | - break; |
|
69 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
68 | + break; |
|
69 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | 70 | <input type="hidden" |
71 | 71 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
72 | 72 | data-parameter="<?php p($parameter->getName()); ?>" |
73 | 73 | value="<?php p($value); ?>" |
74 | 74 | /> |
75 | 75 | <?php |
76 | - break; |
|
77 | - default: ?> |
|
76 | + break; |
|
77 | + default: ?> |
|
78 | 78 | <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
79 | 79 | <input type="text" |
80 | 80 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | placeholder="<?php p($placeholder); ?>" |
84 | 84 | /> |
85 | 85 | <?php |
86 | - } |
|
87 | - } |
|
86 | + } |
|
87 | + } |
|
88 | 88 | ?> |
89 | 89 | |
90 | 90 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
@@ -122,13 +122,13 @@ discard block |
||
122 | 122 | <?php p($l->t('Add storage')); ?> |
123 | 123 | </option> |
124 | 124 | <?php |
125 | - $sortedBackends = array_filter($_['backends'], function($backend) use ($_) { |
|
126 | - return $backend->isVisibleFor($_['visibilityType']); |
|
127 | - }); |
|
128 | - uasort($sortedBackends, function($a, $b) { |
|
129 | - return strcasecmp($a->getText(), $b->getText()); |
|
130 | - }); |
|
131 | - ?> |
|
125 | + $sortedBackends = array_filter($_['backends'], function($backend) use ($_) { |
|
126 | + return $backend->isVisibleFor($_['visibilityType']); |
|
127 | + }); |
|
128 | + uasort($sortedBackends, function($a, $b) { |
|
129 | + return strcasecmp($a->getText(), $b->getText()); |
|
130 | + }); |
|
131 | + ?> |
|
132 | 132 | <?php foreach ($sortedBackends as $backend): ?> |
133 | 133 | <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
134 | 134 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | <p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>> |
170 | 170 | <?php p($l->t('Allow users to mount the following external storage')); ?><br /> |
171 | 171 | <?php |
172 | - $userBackends = array_filter($_['backends'], function($backend) { |
|
173 | - return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
174 | - }); |
|
175 | - ?> |
|
172 | + $userBackends = array_filter($_['backends'], function($backend) { |
|
173 | + return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
174 | + }); |
|
175 | + ?> |
|
176 | 176 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
177 | 177 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
178 | 178 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
@@ -33,42 +33,42 @@ |
||
33 | 33 | |
34 | 34 | // FIXME: currently hard-coded to Dropbox OAuth |
35 | 35 | if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { |
36 | - $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | - if (isset($_POST['step'])) { |
|
38 | - switch ($_POST['step']) { |
|
39 | - case 1: |
|
40 | - try { |
|
41 | - if (isset($_POST['callback'])) { |
|
42 | - $callback = (string)$_POST['callback']; |
|
43 | - } else { |
|
44 | - $callback = null; |
|
45 | - } |
|
46 | - $token = $oauth->getRequestToken(); |
|
47 | - OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | - 'request_token' => $token['token'], |
|
49 | - 'request_token_secret' => $token['token_secret']))); |
|
50 | - } catch (Exception $exception) { |
|
51 | - OCP\JSON::error(array('data' => array('message' => |
|
52 | - $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | - )); |
|
54 | - } |
|
55 | - break; |
|
56 | - case 2: |
|
57 | - if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | - try { |
|
59 | - $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | - $token = $oauth->getAccessToken(); |
|
61 | - OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | - 'access_token_secret' => $token['token_secret'])); |
|
63 | - } catch (Exception $exception) { |
|
64 | - OCP\JSON::error(array('data' => array('message' => |
|
65 | - $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | - )); |
|
67 | - } |
|
68 | - } |
|
69 | - break; |
|
70 | - } |
|
71 | - } |
|
36 | + $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | + if (isset($_POST['step'])) { |
|
38 | + switch ($_POST['step']) { |
|
39 | + case 1: |
|
40 | + try { |
|
41 | + if (isset($_POST['callback'])) { |
|
42 | + $callback = (string)$_POST['callback']; |
|
43 | + } else { |
|
44 | + $callback = null; |
|
45 | + } |
|
46 | + $token = $oauth->getRequestToken(); |
|
47 | + OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | + 'request_token' => $token['token'], |
|
49 | + 'request_token_secret' => $token['token_secret']))); |
|
50 | + } catch (Exception $exception) { |
|
51 | + OCP\JSON::error(array('data' => array('message' => |
|
52 | + $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | + )); |
|
54 | + } |
|
55 | + break; |
|
56 | + case 2: |
|
57 | + if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | + try { |
|
59 | + $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | + $token = $oauth->getAccessToken(); |
|
61 | + OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | + 'access_token_secret' => $token['token_secret'])); |
|
63 | + } catch (Exception $exception) { |
|
64 | + OCP\JSON::error(array('data' => array('message' => |
|
65 | + $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | + )); |
|
67 | + } |
|
68 | + } |
|
69 | + break; |
|
70 | + } |
|
71 | + } |
|
72 | 72 | } else { |
73 | - OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
73 | + OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
74 | 74 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | */ |
30 | 30 | set_include_path(get_include_path().PATH_SEPARATOR. |
31 | - \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); |
|
31 | + \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); |
|
32 | 32 | require_once 'Google/autoload.php'; |
33 | 33 | |
34 | 34 | OCP\JSON::checkAppEnabled('files_external'); |
@@ -38,37 +38,37 @@ discard block |
||
38 | 38 | |
39 | 39 | // FIXME: currently hard-coded to Google Drive |
40 | 40 | if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) { |
41 | - $client = new Google_Client(); |
|
42 | - $client->setClientId((string)$_POST['client_id']); |
|
43 | - $client->setClientSecret((string)$_POST['client_secret']); |
|
44 | - $client->setRedirectUri((string)$_POST['redirect']); |
|
45 | - $client->setScopes(array('https://www.googleapis.com/auth/drive')); |
|
46 | - $client->setApprovalPrompt('force'); |
|
47 | - $client->setAccessType('offline'); |
|
48 | - if (isset($_POST['step'])) { |
|
49 | - $step = $_POST['step']; |
|
50 | - if ($step == 1) { |
|
51 | - try { |
|
52 | - $authUrl = $client->createAuthUrl(); |
|
53 | - OCP\JSON::success(array('data' => array( |
|
54 | - 'url' => $authUrl |
|
55 | - ))); |
|
56 | - } catch (Exception $exception) { |
|
57 | - OCP\JSON::error(array('data' => array( |
|
58 | - 'message' => $l->t('Step 1 failed. Exception: %s', array($exception->getMessage())) |
|
59 | - ))); |
|
60 | - } |
|
61 | - } else if ($step == 2 && isset($_POST['code'])) { |
|
62 | - try { |
|
63 | - $token = $client->authenticate((string)$_POST['code']); |
|
64 | - OCP\JSON::success(array('data' => array( |
|
65 | - 'token' => $token |
|
66 | - ))); |
|
67 | - } catch (Exception $exception) { |
|
68 | - OCP\JSON::error(array('data' => array( |
|
69 | - 'message' => $l->t('Step 2 failed. Exception: %s', array($exception->getMessage())) |
|
70 | - ))); |
|
71 | - } |
|
72 | - } |
|
73 | - } |
|
41 | + $client = new Google_Client(); |
|
42 | + $client->setClientId((string)$_POST['client_id']); |
|
43 | + $client->setClientSecret((string)$_POST['client_secret']); |
|
44 | + $client->setRedirectUri((string)$_POST['redirect']); |
|
45 | + $client->setScopes(array('https://www.googleapis.com/auth/drive')); |
|
46 | + $client->setApprovalPrompt('force'); |
|
47 | + $client->setAccessType('offline'); |
|
48 | + if (isset($_POST['step'])) { |
|
49 | + $step = $_POST['step']; |
|
50 | + if ($step == 1) { |
|
51 | + try { |
|
52 | + $authUrl = $client->createAuthUrl(); |
|
53 | + OCP\JSON::success(array('data' => array( |
|
54 | + 'url' => $authUrl |
|
55 | + ))); |
|
56 | + } catch (Exception $exception) { |
|
57 | + OCP\JSON::error(array('data' => array( |
|
58 | + 'message' => $l->t('Step 1 failed. Exception: %s', array($exception->getMessage())) |
|
59 | + ))); |
|
60 | + } |
|
61 | + } else if ($step == 2 && isset($_POST['code'])) { |
|
62 | + try { |
|
63 | + $token = $client->authenticate((string)$_POST['code']); |
|
64 | + OCP\JSON::success(array('data' => array( |
|
65 | + 'token' => $token |
|
66 | + ))); |
|
67 | + } catch (Exception $exception) { |
|
68 | + OCP\JSON::error(array('data' => array( |
|
69 | + 'message' => $l->t('Step 2 failed. Exception: %s', array($exception->getMessage())) |
|
70 | + ))); |
|
71 | + } |
|
72 | + } |
|
73 | + } |
|
74 | 74 | } |