| @@ -11,7 +11,6 @@ discard block | ||
| 11 | 11 | |
| 12 | 12 | namespace OCA\Passman\Controller; | 
| 13 | 13 | |
| 14 | -use OCA\Files_External\NotFoundException; | |
| 15 | 14 | use OCA\Passman\Db\SharingACL; | 
| 16 | 15 | use OCA\Passman\Utility\NotFoundJSONResponse; | 
| 17 | 16 | use OCP\AppFramework\Db\DoesNotExistException; | 
| @@ -25,7 +24,6 @@ discard block | ||
| 25 | 24 | use OCA\Passman\Service\ActivityService; | 
| 26 | 25 | use OCA\Passman\Service\CredentialRevisionService; | 
| 27 | 26 | use OCA\Passman\Service\ShareService; | 
| 28 | -use OCP\IUser; | |
| 29 | 27 | |
| 30 | 28 |  class CredentialController extends ApiController { | 
| 31 | 29 | private $userId; | 
| @@ -257,21 +257,18 @@ | ||
| 257 | 257 |  	public function getRevision($credential_guid) { | 
| 258 | 258 |  		try { | 
| 259 | 259 | $credential = $this->credentialService->getCredentialByGUID($credential_guid); | 
| 260 | - } | |
| 261 | -		catch (DoesNotExistException $ex){ | |
| 260 | +		} catch (DoesNotExistException $ex){ | |
| 262 | 261 | return new NotFoundJSONResponse(); | 
| 263 | 262 | } | 
| 264 | 263 | |
| 265 | 264 | // If the request was made by the owner of the credential | 
| 266 | 265 |  		if ($this->userId === $credential->getUserId()) { | 
| 267 | 266 | $result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId); | 
| 268 | - } | |
| 269 | -		else { | |
| 267 | +		} else { | |
| 270 | 268 | $acl = $this->sharingService->getACL($this->userId, $credential_guid); | 
| 271 | 269 |  			if ($acl->hasPermission(SharingACL::HISTORY)){ | 
| 272 | 270 | $result = $this->credentialRevisionService->getRevisions($credential->getId()); | 
| 273 | - } | |
| 274 | -			else { | |
| 271 | +			} else { | |
| 275 | 272 | return new NotFoundJSONResponse(); | 
| 276 | 273 | } | 
| 277 | 274 | } | 
| @@ -11,10 +11,7 @@ discard block | ||
| 11 | 11 | |
| 12 | 12 | namespace OCA\Passman\Controller; | 
| 13 | 13 | |
| 14 | -use OCA\Files_External\NotFoundException; | |
| 15 | -use OCA\Passman\Db\ShareRequest; | |
| 16 | 14 | use OCA\Passman\Db\SharingACL; | 
| 17 | -use OCA\Passman\Db\Vault; | |
| 18 | 15 | use OCA\Passman\Service\CredentialService; | 
| 19 | 16 | use OCA\Passman\Service\FileService; | 
| 20 | 17 | use OCA\Passman\Service\NotificationService; | 
| @@ -26,14 +23,9 @@ discard block | ||
| 26 | 23 | use OCP\IRequest; | 
| 27 | 24 | use OCP\AppFramework\Http\JSONResponse; | 
| 28 | 25 | use OCP\AppFramework\ApiController; | 
| 29 | -use OCP\AppFramework\Http; | |
| 30 | -use OCP\AppFramework\Http\DataResponse; | |
| 31 | - | |
| 32 | -use OCP\IGroup; | |
| 33 | 26 | use OCP\IGroupManager; | 
| 34 | 27 | use OCP\IUserManager; | 
| 35 | 28 | use OCP\IUser; | 
| 36 | - | |
| 37 | 29 | use OCA\Passman\Service\VaultService; | 
| 38 | 30 | use OCA\Passman\Service\ActivityService; | 
| 39 | 31 | use OCA\Passman\Activity; | 
| @@ -11,7 +11,6 @@ discard block | ||
| 11 | 11 | |
| 12 | 12 | namespace OCA\Passman\AppInfo; | 
| 13 | 13 | use OC\Files\View; | 
| 14 | - | |
| 15 | 14 | use OCA\Passman\Controller\CredentialController; | 
| 16 | 15 | use OCA\Passman\Controller\PageController; | 
| 17 | 16 | use OCA\Passman\Controller\ShareController; | 
| @@ -24,10 +23,8 @@ discard block | ||
| 24 | 23 | use OCA\Passman\Service\VaultService; | 
| 25 | 24 | use OCA\Passman\Utility\Utils; | 
| 26 | 25 | use OCA\Passman\Service\NotificationService; | 
| 27 | - | |
| 28 | 26 | use OCP\AppFramework\App; | 
| 29 | 27 | use OCP\IL10N; | 
| 30 | -use OCP\Util; | |
| 31 | 28 |  class Application extends App { | 
| 32 | 29 |  	public function __construct () { | 
| 33 | 30 |  		parent::__construct('passman'); | 
| @@ -8,7 +8,6 @@ | ||
| 8 | 8 | namespace OCA\Passman\Db; | 
| 9 | 9 | |
| 10 | 10 | use OCA\Passman\Utility\PermissionEntity; | 
| 11 | -use OCP\AppFramework\Db\Entity; | |
| 12 | 11 | |
| 13 | 12 | /** | 
| 14 | 13 | * @method void setId(integer $value) | 
| @@ -14,9 +14,7 @@ | ||
| 14 | 14 | use OCA\Passman\Db\Credential; | 
| 15 | 15 | use OCA\Passman\Db\SharingACL; | 
| 16 | 16 | use OCA\Passman\Db\SharingACLMapper; | 
| 17 | -use OCP\IConfig; | |
| 18 | 17 | use OCP\AppFramework\Db\DoesNotExistException; | 
| 19 | - | |
| 20 | 18 | use OCA\Passman\Db\CredentialMapper; | 
| 21 | 19 | |
| 22 | 20 | |
| @@ -61,8 +61,7 @@ | ||
| 61 | 61 | $filter = [$item_guid]; | 
| 62 | 62 |          if ($user_id == null){ | 
| 63 | 63 | $q .= 'user_id is null'; | 
| 64 | - } | |
| 65 | -        else { | |
| 64 | +        } else { | |
| 66 | 65 | $q .= 'user_id = ? '; | 
| 67 | 66 | $filter[] = $user_id; | 
| 68 | 67 | } | 
| @@ -11,9 +11,6 @@ | ||
| 11 | 11 | |
| 12 | 12 | namespace OCA\Passman\Service; | 
| 13 | 13 | |
| 14 | -use OCP\IConfig; | |
| 15 | -use OCP\AppFramework\Db\DoesNotExistException; | |
| 16 | - | |
| 17 | 14 | use OCA\Passman\Db\FileMapper; | 
| 18 | 15 | |
| 19 | 16 | |
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | namespace OCA\Passman\Service; | 
| 10 | 10 | |
| 11 | 11 | |
| 12 | -use Icewind\SMB\Share; | |
| 13 | 12 | use OCA\Passman\Db\CredentialMapper; | 
| 14 | 13 | use OCA\Passman\Db\CredentialRevision; | 
| 15 | 14 | use OCA\Passman\Db\ShareRequest; | 
| @@ -8,7 +8,6 @@ | ||
| 8 | 8 | namespace OCA\Passman\Db; | 
| 9 | 9 | |
| 10 | 10 | use OCA\Passman\Utility\PermissionEntity; | 
| 11 | -use OCP\AppFramework\Db\Entity; | |
| 12 | 11 | |
| 13 | 12 | /** | 
| 14 | 13 | * @method void setId(integer $value) | 
| @@ -61,8 +61,7 @@ | ||
| 61 | 61 | $filter = [$item_guid]; | 
| 62 | 62 |  		if ($user_id === null){ | 
| 63 | 63 | $q .= 'user_id is null'; | 
| 64 | - } | |
| 65 | -		else { | |
| 64 | +		} else { | |
| 66 | 65 | $q .= 'user_id = ? '; | 
| 67 | 66 | $filter[] = $user_id; | 
| 68 | 67 | } |