@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * @param IRequest $request |
301 | 301 | * @throws LoginException |
302 | 302 | * @throws PasswordLoginForbiddenException |
303 | - * @return boolean |
|
303 | + * @return boolean|null |
|
304 | 304 | */ |
305 | 305 | public function logClientIn($user, $password, IRequest $request) { |
306 | 306 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -340,6 +340,9 @@ discard block |
||
340 | 340 | return $this->config->getSystemValue('token_auth_enforced', false); |
341 | 341 | } |
342 | 342 | |
343 | + /** |
|
344 | + * @param string $username |
|
345 | + */ |
|
343 | 346 | protected function isTwoFactorEnforced($username) { |
344 | 347 | Util::emitHook( |
345 | 348 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -27,13 +27,8 @@ |
||
27 | 27 | use OCA\Files_External\Lib\DefinitionParameter; |
28 | 28 | use OCA\Files_External\Service\BackendService; |
29 | 29 | use Symfony\Component\Console\Command\Command; |
30 | -use Symfony\Component\Console\Helper\Table; |
|
31 | -use Symfony\Component\Console\Helper\TableHelper; |
|
32 | -use Symfony\Component\Console\Input\ArrayInput; |
|
33 | 30 | use Symfony\Component\Console\Input\InputArgument; |
34 | 31 | use Symfony\Component\Console\Input\InputInterface; |
35 | -use Symfony\Component\Console\Input\InputOption; |
|
36 | -use Symfony\Component\Console\Input\Input; |
|
37 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
38 | 33 | |
39 | 34 | class Backends extends Base { |
@@ -103,6 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP |
106 | + * @param string $sitename |
|
106 | 107 | * @return bool |
107 | 108 | */ |
108 | 109 | private function isSiteReachable($sitename) { |
@@ -285,7 +286,7 @@ discard block |
||
285 | 286 | |
286 | 287 | /** |
287 | 288 | * @NoCSRFRequired |
288 | - * @return DataResponse |
|
289 | + * @return DataDisplayResponse |
|
289 | 290 | */ |
290 | 291 | public function getFailedIntegrityCheckFiles() { |
291 | 292 | if(!$this->checker->isCodeCheckEnforced()) { |
@@ -29,7 +29,6 @@ |
||
29 | 29 | */ |
30 | 30 | |
31 | 31 | namespace OC; |
32 | -use OCP\Defaults; |
|
33 | 32 | use OCP\ICacheFactory; |
34 | 33 | use OCP\IConfig; |
35 | 34 | use OCP\IURLGenerator; |
@@ -35,15 +35,6 @@ |
||
35 | 35 | */ |
36 | 36 | namespace OC; |
37 | 37 | |
38 | -use Assetic\Asset\AssetCollection; |
|
39 | -use Assetic\Asset\FileAsset; |
|
40 | -use Assetic\AssetWriter; |
|
41 | -use Assetic\Filter\CssImportFilter; |
|
42 | -use Assetic\Filter\CssMinFilter; |
|
43 | -use Assetic\Filter\CssRewriteFilter; |
|
44 | -use Assetic\Filter\JSqueezeFilter; |
|
45 | -use Assetic\Filter\SeparatorFilter; |
|
46 | - |
|
47 | 38 | class TemplateLayout extends \OC_Template { |
48 | 39 | |
49 | 40 | private static $versionHash = ''; |
@@ -219,7 +219,7 @@ |
||
219 | 219 | * @param array $groupSharesById |
220 | 220 | * @param array $subShares |
221 | 221 | * |
222 | - * @return true if the share is valid, false if it needs repair |
|
222 | + * @return boolean if the share is valid, false if it needs repair |
|
223 | 223 | */ |
224 | 224 | private function isThisShareValid($groupSharesById, $subShares) { |
225 | 225 | $foundTargets = []; |
@@ -21,12 +21,10 @@ |
||
21 | 21 | |
22 | 22 | namespace OCA\User_LDAP; |
23 | 23 | |
24 | -use OCP\IUserBackend; |
|
25 | 24 | use OCP\LDAP\ILDAPProvider; |
26 | 25 | use OCP\LDAP\IDeletionFlagSupport; |
27 | 26 | use OCP\IServerContainer; |
28 | 27 | use OCA\User_LDAP\User\DeletedUsersIndex; |
29 | -use OCA\User_LDAP\Mapping\UserMapping; |
|
30 | 28 | |
31 | 29 | /** |
32 | 30 | * LDAP provider for pulic access to the LDAP backend. |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | |
398 | 398 | /** |
399 | 399 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
400 | - * @param string $dn the dn of the user object |
|
400 | + * @param string $fdn the dn of the user object |
|
401 | 401 | * @param string $ldapName optional, the display name of the object |
402 | 402 | * @return string|false with with the name to use in ownCloud |
403 | 403 | */ |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | |
415 | 415 | /** |
416 | 416 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
417 | - * @param string $dn the dn of the user object |
|
417 | + * @param string $fdn the dn of the user object |
|
418 | 418 | * @param string $ldapName optional, the display name of the object |
419 | 419 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
420 | 420 | * @return string|false with with the name to use in ownCloud |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | * the login filter. |
675 | 675 | * |
676 | 676 | * @param string $loginName |
677 | - * @param array $attributes optional, list of attributes to read |
|
677 | + * @param string[] $attributes optional, list of attributes to read |
|
678 | 678 | * @return array |
679 | 679 | */ |
680 | 680 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | |
748 | 748 | /** |
749 | 749 | * @param string $filter |
750 | - * @param string|string[] $attr |
|
750 | + * @param string[] $attr |
|
751 | 751 | * @param int $limit |
752 | 752 | * @param int $offset |
753 | 753 | * @return array |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | |
796 | 796 | /** |
797 | 797 | * @param string $filter |
798 | - * @param string|string[] $attr |
|
798 | + * @param string[] $attr |
|
799 | 799 | * @param int $limit |
800 | 800 | * @param int $offset |
801 | 801 | * @return false|int |
@@ -845,6 +845,7 @@ discard block |
||
845 | 845 | * retrieved. Results will according to the order in the array. |
846 | 846 | * @param int $limit optional, maximum results to be counted |
847 | 847 | * @param int $offset optional, a starting point |
848 | + * @param string $filter |
|
848 | 849 | * @return array|false array with the search result as first value and pagedSearchOK as |
849 | 850 | * second | false if not successful |
850 | 851 | */ |
@@ -891,7 +892,7 @@ discard block |
||
891 | 892 | * @param bool $pagedSearchOK whether a paged search has been executed |
892 | 893 | * @param bool $skipHandling required for paged search when cookies to |
893 | 894 | * prior results need to be gained |
894 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
895 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
895 | 896 | */ |
896 | 897 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
897 | 898 | $cookie = null; |
@@ -1100,7 +1101,7 @@ discard block |
||
1100 | 1101 | |
1101 | 1102 | /** |
1102 | 1103 | * @param string $name |
1103 | - * @return bool|mixed|string |
|
1104 | + * @return string |
|
1104 | 1105 | */ |
1105 | 1106 | public function sanitizeUsername($name) { |
1106 | 1107 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1124,6 +1125,7 @@ discard block |
||
1124 | 1125 | * escapes (user provided) parts for LDAP filter |
1125 | 1126 | * @param string $input, the provided value |
1126 | 1127 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1128 | + * @param string $input |
|
1127 | 1129 | * @return string the escaped string |
1128 | 1130 | */ |
1129 | 1131 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1104,7 +1104,7 @@ |
||
1104 | 1104 | } |
1105 | 1105 | |
1106 | 1106 | /** |
1107 | - * @param array $reqs |
|
1107 | + * @param string[] $reqs |
|
1108 | 1108 | * @return bool |
1109 | 1109 | */ |
1110 | 1110 | private function checkRequirements($reqs) { |