@@ -46,7 +46,6 @@ |
||
| 46 | 46 | use OCA\User_LDAP\User\Manager; |
| 47 | 47 | use OCA\User_LDAP\User\OfflineUser; |
| 48 | 48 | use OCA\User_LDAP\Mapping\AbstractMapping; |
| 49 | - |
|
| 50 | 49 | use OC\ServerNotAvailableException; |
| 51 | 50 | |
| 52 | 51 | /** |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | |
| 492 | 492 | /** |
| 493 | 493 | * returns the internal Nextcloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
| 494 | - * @param string $dn the dn of the user object |
|
| 494 | + * @param string $fdn the dn of the user object |
|
| 495 | 495 | * @param string $ldapName optional, the display name of the object |
| 496 | 496 | * @return string|false with with the name to use in Nextcloud |
| 497 | 497 | */ |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | /** |
| 510 | 510 | * returns an internal Nextcloud name for the given LDAP DN, false on DN outside of search DN |
| 511 | - * @param string $dn the dn of the user object |
|
| 511 | + * @param string $fdn the dn of the user object |
|
| 512 | 512 | * @param string $ldapName optional, the display name of the object |
| 513 | 513 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
| 514 | 514 | * @return string|false with with the name to use in Nextcloud |
@@ -771,7 +771,7 @@ discard block |
||
| 771 | 771 | * the login filter. |
| 772 | 772 | * |
| 773 | 773 | * @param string $loginName |
| 774 | - * @param array $attributes optional, list of attributes to read |
|
| 774 | + * @param string[] $attributes optional, list of attributes to read |
|
| 775 | 775 | * @return array |
| 776 | 776 | */ |
| 777 | 777 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | |
| 845 | 845 | /** |
| 846 | 846 | * @param string $filter |
| 847 | - * @param string|string[] $attr |
|
| 847 | + * @param string[] $attr |
|
| 848 | 848 | * @param int $limit |
| 849 | 849 | * @param int $offset |
| 850 | 850 | * @return array |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | |
| 893 | 893 | /** |
| 894 | 894 | * @param string $filter |
| 895 | - * @param string|string[] $attr |
|
| 895 | + * @param string[] $attr |
|
| 896 | 896 | * @param int $limit |
| 897 | 897 | * @param int $offset |
| 898 | 898 | * @return false|int |
@@ -989,6 +989,7 @@ discard block |
||
| 989 | 989 | * retrieved. Results will according to the order in the array. |
| 990 | 990 | * @param int $limit optional, maximum results to be counted |
| 991 | 991 | * @param int $offset optional, a starting point |
| 992 | + * @param string $filter |
|
| 992 | 993 | * @return array|false array with the search result as first value and pagedSearchOK as |
| 993 | 994 | * second | false if not successful |
| 994 | 995 | * @throws \OC\ServerNotAvailableException |
@@ -1240,7 +1241,7 @@ discard block |
||
| 1240 | 1241 | |
| 1241 | 1242 | /** |
| 1242 | 1243 | * @param string $name |
| 1243 | - * @return bool|mixed|string |
|
| 1244 | + * @return string |
|
| 1244 | 1245 | */ |
| 1245 | 1246 | public function sanitizeUsername($name) { |
| 1246 | 1247 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1264,6 +1265,7 @@ discard block |
||
| 1264 | 1265 | * escapes (user provided) parts for LDAP filter |
| 1265 | 1266 | * @param string $input, the provided value |
| 1266 | 1267 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
| 1268 | + * @param string $input |
|
| 1267 | 1269 | * @return string the escaped string |
| 1268 | 1270 | */ |
| 1269 | 1271 | public function escapeFilterPart($input, $allowAsterisk = false) { |