@@ -284,6 +284,9 @@ discard block |
||
| 284 | 284 | return $this->leave(__FUNCTION__, $result); |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | + /** |
|
| 288 | + * @param string $path |
|
| 289 | + */ |
|
| 287 | 290 | private function removeFromCache($path) { |
| 288 | 291 | $path = trim($path, '/'); |
| 289 | 292 | // TODO The CappedCache does not really clear by prefix. It just clears all. |
@@ -673,7 +676,7 @@ discard block |
||
| 673 | 676 | * if smb.logging.enable is set to true in the config will log a leave line |
| 674 | 677 | * with the given function, the return value or the exception |
| 675 | 678 | * |
| 676 | - * @param $function |
|
| 679 | + * @param string $function |
|
| 677 | 680 | * @param mixed $result an exception will be logged and then returned |
| 678 | 681 | * @return mixed |
| 679 | 682 | */ |
@@ -700,6 +703,9 @@ discard block |
||
| 700 | 703 | return $result; |
| 701 | 704 | } |
| 702 | 705 | |
| 706 | + /** |
|
| 707 | + * @param string $function |
|
| 708 | + */ |
|
| 703 | 709 | private function swallow($function, \Exception $exception) { |
| 704 | 710 | if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true) { |
| 705 | 711 | Util::writeLog('smb', "$function swallowing ".get_class($exception) |
@@ -180,10 +180,10 @@ |
||
| 180 | 180 | * inform recipient about public link share |
| 181 | 181 | * |
| 182 | 182 | * @param string $recipient recipient email address |
| 183 | - * @param string $filename the shared file |
|
| 184 | - * @param string $link the public link |
|
| 185 | 183 | * @param array $options allows ['cc'] and ['bcc'] recipients |
| 186 | - * @param int $expiration expiration date (timestamp) |
|
| 184 | + * @param string $subject |
|
| 185 | + * @param boolean|string $htmlBody |
|
| 186 | + * @param boolean|string $textBody |
|
| 187 | 187 | * @return string[] $result of failed recipients |
| 188 | 188 | */ |
| 189 | 189 | public function sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody, $options = array()) { |
@@ -270,6 +270,9 @@ discard block |
||
| 270 | 270 | return array_values($calendars); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | + /** |
|
| 274 | + * @param string $principalUri |
|
| 275 | + */ |
|
| 273 | 276 | public function getUsersOwnCalendars($principalUri) { |
| 274 | 277 | $principalUri = $this->convertPrincipal($principalUri, true); |
| 275 | 278 | $fields = array_values($this->propertyMap); |
@@ -1279,7 +1282,7 @@ discard block |
||
| 1279 | 1282 | * @param string $principalUri |
| 1280 | 1283 | * @param string $uri |
| 1281 | 1284 | * @param array $properties |
| 1282 | - * @return mixed |
|
| 1285 | + * @return integer |
|
| 1283 | 1286 | * @throws Forbidden |
| 1284 | 1287 | */ |
| 1285 | 1288 | function createSubscription($principalUri, $uri, array $properties) { |
@@ -1685,6 +1688,9 @@ discard block |
||
| 1685 | 1688 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
| 1686 | 1689 | } |
| 1687 | 1690 | |
| 1691 | + /** |
|
| 1692 | + * @param boolean $toV2 |
|
| 1693 | + */ |
|
| 1688 | 1694 | private function convertPrincipal($principalUri, $toV2 = null) { |
| 1689 | 1695 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1690 | 1696 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | * @throws \InvalidArgumentException |
| 324 | 324 | * @throws LoginException |
| 325 | 325 | * @throws PasswordLoginForbiddenException |
| 326 | - * @return boolean |
|
| 326 | + * @return boolean|null |
|
| 327 | 327 | */ |
| 328 | 328 | public function logClientIn($user, $password, IRequest $request) { |
| 329 | 329 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -366,6 +366,9 @@ discard block |
||
| 366 | 366 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | + /** |
|
| 370 | + * @param string $username |
|
| 371 | + */ |
|
| 369 | 372 | protected function isTwoFactorEnforced($username) { |
| 370 | 373 | Util::emitHook( |
| 371 | 374 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -988,6 +991,9 @@ discard block |
||
| 988 | 991 | } |
| 989 | 992 | } |
| 990 | 993 | |
| 994 | + /** |
|
| 995 | + * @param IRequest $request |
|
| 996 | + */ |
|
| 991 | 997 | public function verifyAuthHeaders($request) { |
| 992 | 998 | $shallLogout = false; |
| 993 | 999 | try { |
@@ -1019,7 +1025,7 @@ discard block |
||
| 1019 | 1025 | } |
| 1020 | 1026 | |
| 1021 | 1027 | /** |
| 1022 | - * @param $includeBuiltIn |
|
| 1028 | + * @param boolean $includeBuiltIn |
|
| 1023 | 1029 | * @return \Generator | IAuthModule[] |
| 1024 | 1030 | * @throws Exception |
| 1025 | 1031 | */ |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | use OCP\Authentication\IAuthModule; |
| 31 | 31 | use OCP\IRequest; |
| 32 | 32 | use OCP\ISession; |
| 33 | -use OCP\IUser; |
|
| 34 | 33 | use OCP\IUserManager; |
| 35 | 34 | use OCP\Session\Exceptions\SessionNotAvailableException; |
| 36 | 35 | |