@@ -132,7 +132,7 @@ |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | /** |
135 | - * @param $message |
|
135 | + * @param string $message |
|
136 | 136 | * @param array $additional |
137 | 137 | * @return array |
138 | 138 | */ |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | |
362 | 362 | /** |
363 | 363 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
364 | - * @param string $dn the dn of the user object |
|
364 | + * @param string $fdn the dn of the user object |
|
365 | 365 | * @param string $ldapName optional, the display name of the object |
366 | 366 | * @return string|false with with the name to use in ownCloud |
367 | 367 | */ |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /** |
380 | 380 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
381 | - * @param string $dn the dn of the user object |
|
381 | + * @param string $fdn the dn of the user object |
|
382 | 382 | * @param string $ldapName optional, the display name of the object |
383 | 383 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
384 | 384 | * @return string|false with with the name to use in ownCloud |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | * the login filter. |
639 | 639 | * |
640 | 640 | * @param string $loginName |
641 | - * @param array $attributes optional, list of attributes to read |
|
641 | + * @param string[] $attributes optional, list of attributes to read |
|
642 | 642 | * @return array |
643 | 643 | */ |
644 | 644 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | |
712 | 712 | /** |
713 | 713 | * @param string $filter |
714 | - * @param string|string[] $attr |
|
714 | + * @param string[] $attr |
|
715 | 715 | * @param int $limit |
716 | 716 | * @param int $offset |
717 | 717 | * @return array |
@@ -759,7 +759,7 @@ discard block |
||
759 | 759 | |
760 | 760 | /** |
761 | 761 | * @param string $filter |
762 | - * @param string|string[] $attr |
|
762 | + * @param string[] $attr |
|
763 | 763 | * @param int $limit |
764 | 764 | * @param int $offset |
765 | 765 | * @return false|int |
@@ -809,6 +809,7 @@ discard block |
||
809 | 809 | * retrieved. Results will according to the order in the array. |
810 | 810 | * @param int $limit optional, maximum results to be counted |
811 | 811 | * @param int $offset optional, a starting point |
812 | + * @param string $filter |
|
812 | 813 | * @return array|false array with the search result as first value and pagedSearchOK as |
813 | 814 | * second | false if not successful |
814 | 815 | */ |
@@ -1063,7 +1064,7 @@ discard block |
||
1063 | 1064 | |
1064 | 1065 | /** |
1065 | 1066 | * @param string $name |
1066 | - * @return bool|mixed|string |
|
1067 | + * @return string |
|
1067 | 1068 | */ |
1068 | 1069 | public function sanitizeUsername($name) { |
1069 | 1070 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1087,6 +1088,7 @@ discard block |
||
1087 | 1088 | * escapes (user provided) parts for LDAP filter |
1088 | 1089 | * @param string $input, the provided value |
1089 | 1090 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1091 | + * @param string $input |
|
1090 | 1092 | * @return string the escaped string |
1091 | 1093 | */ |
1092 | 1094 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -35,7 +35,6 @@ |
||
35 | 35 | use OC\Core\Controller\LostController; |
36 | 36 | use OC\Core\Controller\TokenController; |
37 | 37 | use OC\Core\Controller\TwoFactorChallengeController; |
38 | -use OC\Core\Controller\UserController; |
|
39 | 38 | use OCP\AppFramework\App; |
40 | 39 | use OCP\Util; |
41 | 40 |