@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | * @param IRequest $request |
| 305 | 305 | * @throws LoginException |
| 306 | 306 | * @throws PasswordLoginForbiddenException |
| 307 | - * @return boolean |
|
| 307 | + * @return boolean|null |
|
| 308 | 308 | */ |
| 309 | 309 | public function logClientIn($user, $password, IRequest $request) { |
| 310 | 310 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -347,6 +347,9 @@ discard block |
||
| 347 | 347 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | + /** |
|
| 351 | + * @param string $username |
|
| 352 | + */ |
|
| 350 | 353 | protected function isTwoFactorEnforced($username) { |
| 351 | 354 | Util::emitHook( |
| 352 | 355 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -790,7 +793,7 @@ discard block |
||
| 790 | 793 | /** |
| 791 | 794 | * logout the user from the session |
| 792 | 795 | * |
| 793 | - * @return bool |
|
| 796 | + * @return boolean|null |
|
| 794 | 797 | */ |
| 795 | 798 | public function logout() { |
| 796 | 799 | |
@@ -871,6 +874,9 @@ discard block |
||
| 871 | 874 | } |
| 872 | 875 | } |
| 873 | 876 | |
| 877 | + /** |
|
| 878 | + * @param IRequest $request |
|
| 879 | + */ |
|
| 874 | 880 | public function verifyAuthHeaders($request) { |
| 875 | 881 | foreach ($this->getAuthModules(true) as $module) { |
| 876 | 882 | $user = $module->auth($request); |
@@ -890,7 +896,7 @@ discard block |
||
| 890 | 896 | } |
| 891 | 897 | |
| 892 | 898 | /** |
| 893 | - * @param $includeBuiltIn |
|
| 899 | + * @param boolean $includeBuiltIn |
|
| 894 | 900 | * @return \Generator | IAuthModule[] |
| 895 | 901 | * @throws Exception |
| 896 | 902 | */ |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | * Set the flag to true, so that the file would be |
| 673 | 673 | * in the decrypted state. |
| 674 | 674 | * |
| 675 | - * @param $isDisabled bool |
|
| 675 | + * @param boolean $isDisabled bool |
|
| 676 | 676 | */ |
| 677 | 677 | public static function setDisableWriteEncryption($isDisabled) { |
| 678 | 678 | self::$disableWriteEncryption = $isDisabled; |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | /** |
| 930 | 930 | * return header size of given file |
| 931 | 931 | * |
| 932 | - * @param string|resource $path |
|
| 932 | + * @param string $path |
|
| 933 | 933 | * @return int |
| 934 | 934 | */ |
| 935 | 935 | protected function getHeaderSize($path) { |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | /** |
| 981 | 981 | * read header from file |
| 982 | 982 | * |
| 983 | - * @param string|resource $path |
|
| 983 | + * @param string $path |
|
| 984 | 984 | * @return array |
| 985 | 985 | */ |
| 986 | 986 | protected function getHeader($path) { |
@@ -1076,7 +1076,7 @@ discard block |
||
| 1076 | 1076 | /** |
| 1077 | 1077 | * check if path points to a files version |
| 1078 | 1078 | * |
| 1079 | - * @param $path |
|
| 1079 | + * @param string $path |
|
| 1080 | 1080 | * @return bool |
| 1081 | 1081 | */ |
| 1082 | 1082 | protected function isVersion($path) { |
@@ -449,7 +449,7 @@ |
||
| 449 | 449 | * In some environments the system config file is readonly. Find out if this |
| 450 | 450 | * is the case. |
| 451 | 451 | * |
| 452 | - * @return boolean |
|
| 452 | + * @return false|string |
|
| 453 | 453 | * @since 10.0.3 |
| 454 | 454 | */ |
| 455 | 455 | public function isSystemConfigReadOnly() { |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | namespace OC\DB; |
| 23 | 23 | |
| 24 | 24 | use Doctrine\DBAL\DBALException; |
| 25 | -use Doctrine\DBAL\Driver\ServerInfoAwareConnection; |
|
| 26 | 25 | use Doctrine\DBAL\Event\SchemaColumnDefinitionEventArgs; |
| 27 | 26 | use Doctrine\DBAL\Platforms\MySqlPlatform; |
| 28 | 27 | use Doctrine\DBAL\Schema\Column; |
@@ -699,7 +699,7 @@ |
||
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | /** |
| 702 | - * @param $internalPath |
|
| 702 | + * @param string $internalPath |
|
| 703 | 703 | * @return array |
| 704 | 704 | */ |
| 705 | 705 | private function convertInternalPathToGlobalPath($internalPath) { |
@@ -32,7 +32,6 @@ |
||
| 32 | 32 | |
| 33 | 33 | use OC\AppFramework\Http\Request; |
| 34 | 34 | use OCA\DAV\Files\IProvidesAdditionalHeaders; |
| 35 | -use OCA\DAV\Meta\MetaFile; |
|
| 36 | 35 | use OCP\Files\ForbiddenException; |
| 37 | 36 | use Sabre\DAV\Exception\Forbidden; |
| 38 | 37 | use Sabre\DAV\Exception\NotFound; |
@@ -310,6 +310,9 @@ |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | |
| 313 | + /** |
|
| 314 | + * @param string $revision |
|
| 315 | + */ |
|
| 313 | 316 | public static function restoreVersion($uid, $filename, $fileToRestore, $revision) { |
| 314 | 317 | if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED) !== true) { |
| 315 | 318 | return false; |