@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCP\IUser; |
| 28 | 28 | use OCP\ILogger; |
| 29 | 29 | use OCP\Files\Folder; |
| 30 | - |
|
| 31 | 30 | use OC\Share20\Exception\ShareNotFound; |
| 32 | 31 | |
| 33 | 32 | /** |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | 102 | * @param string $data |
| 103 | - * @return int |
|
| 103 | + * @return boolean |
|
| 104 | 104 | */ |
| 105 | 105 | public function stream_write($data) { |
| 106 | 106 | return false; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
| 209 | - * @param $pos |
|
| 209 | + * @param integer $pos |
|
| 210 | 210 | * @return IFile | null |
| 211 | 211 | */ |
| 212 | 212 | private function getNodeForPosition($pos) { |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | use OC\Share\MailNotifications; |
| 23 | -use OCP\IConfig; |
|
| 24 | 23 | use OCP\IL10N; |
| 25 | 24 | use OCP\IUser; |
| 26 | 25 | use OCP\Mail\IMailer; |
@@ -777,7 +777,7 @@ |
||
| 777 | 777 | /** |
| 778 | 778 | * check if path points to a files version |
| 779 | 779 | * |
| 780 | - * @param $path |
|
| 780 | + * @param string $path |
|
| 781 | 781 | * @return bool |
| 782 | 782 | */ |
| 783 | 783 | protected function isVersion($path) { |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | * if the size limit for the trash bin is reached, we delete the oldest |
| 656 | 656 | * files in the trash bin until we meet the limit again |
| 657 | 657 | * |
| 658 | - * @param array $files |
|
| 658 | + * @param \OCP\Files\FileInfo[] $files |
|
| 659 | 659 | * @param string $user |
| 660 | 660 | * @param int $availableSpace available disc space |
| 661 | 661 | * @return int size of deleted files |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | /** |
| 684 | 684 | * delete files older then max storage time |
| 685 | 685 | * |
| 686 | - * @param array $files list of files sorted by mtime |
|
| 686 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
| 687 | 687 | * @param string $user |
| 688 | 688 | * @return integer[] size of deleted files and number of deleted files |
| 689 | 689 | */ |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace OCA\Files\Service; |
| 26 | 26 | |
| 27 | -use OC\Files\FileInfo; |
|
| 28 | 27 | use OCP\Files\Node; |
| 29 | 28 | |
| 30 | 29 | /** |
@@ -24,13 +24,11 @@ |
||
| 24 | 24 | |
| 25 | 25 | use OCP\IGroupManager; |
| 26 | 26 | use OCP\IUserSession; |
| 27 | -use Sabre\DAV\Exception\NotFound; |
|
| 28 | 27 | use Sabre\DAV\PropFind; |
| 29 | 28 | use Sabre\DAV\PropPatch; |
| 30 | 29 | use Sabre\DAV\Exception\BadRequest; |
| 31 | 30 | use Sabre\DAV\Exception\UnsupportedMediaType; |
| 32 | 31 | use Sabre\DAV\Exception\Conflict; |
| 33 | - |
|
| 34 | 32 | use OCP\SystemTag\ISystemTag; |
| 35 | 33 | use OCP\SystemTag\ISystemTagManager; |
| 36 | 34 | use OCP\SystemTag\TagAlreadyExistsException; |
@@ -26,13 +26,11 @@ |
||
| 26 | 26 | use Sabre\DAV\Exception\NotFound; |
| 27 | 27 | use Sabre\DAV\Exception\BadRequest; |
| 28 | 28 | use Sabre\DAV\ICollection; |
| 29 | - |
|
| 30 | 29 | use OCP\SystemTag\ISystemTagManager; |
| 31 | 30 | use OCP\SystemTag\ISystemTag; |
| 32 | 31 | use OCP\SystemTag\TagNotFoundException; |
| 33 | 32 | use OCP\IGroupManager; |
| 34 | 33 | use OCP\IUserSession; |
| 35 | -use OC\User\NoUserException; |
|
| 36 | 34 | |
| 37 | 35 | class SystemTagsByIdCollection implements ICollection { |
| 38 | 36 | |
@@ -79,6 +79,10 @@ |
||
| 79 | 79 | // TODO: throw exceptions if necessary |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | + /** |
|
| 83 | + * @param Controller $controller |
|
| 84 | + * @param string $methodName |
|
| 85 | + */ |
|
| 82 | 86 | private function checkTwoFactor($controller, $methodName) { |
| 83 | 87 | // If two-factor auth is in progress disallow access to any controllers |
| 84 | 88 | // defined within "LoginController". |