| @@ -23,7 +23,7 @@ discard block | ||
| 23 | 23 | public function __construct($AppName, | 
| 24 | 24 | IRequest $request, | 
| 25 | 25 | $UserId, | 
| 26 | -								FileService $fileService){ | |
| 26 | +								FileService $fileService) { | |
| 27 | 27 | parent::__construct($AppName, $request); | 
| 28 | 28 | $this->userId = $UserId; | 
| 29 | 29 | $this->fileService = $fileService; | 
| @@ -56,20 +56,20 @@ discard block | ||
| 56 | 56 | return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId)); | 
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | -	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){ | |
| 60 | -		try{ | |
| 59 | +	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) { | |
| 60 | +		try { | |
| 61 | 61 | $file = $this->fileService->getFile($file_id, $this->userId); | 
| 62 | -		} catch (DoesNotExistException $doesNotExistException){ | |
| 62 | +		} catch (DoesNotExistException $doesNotExistException) { | |
| 63 | 63 | |
| 64 | 64 | } | 
| 65 | -		if($file){ | |
| 66 | -			if($file_data) { | |
| 65 | +		if ($file) { | |
| 66 | +			if ($file_data) { | |
| 67 | 67 | $file->setFileData($file_data); | 
| 68 | 68 | } | 
| 69 | -			if($filename) { | |
| 69 | +			if ($filename) { | |
| 70 | 70 | $file->setFilename($filename); | 
| 71 | 71 | } | 
| 72 | -			if($filename || $file_data){ | |
| 72 | +			if ($filename || $file_data) { | |
| 73 | 73 | new JSONResponse($this->fileService->updateFile($file)); | 
| 74 | 74 | } | 
| 75 | 75 | } | 
| @@ -79,7 +79,7 @@ | ||
| 79 | 79 |  		try { | 
| 80 | 80 | $vault = $this->vaultService->getByGuid($vault_guid, $this->userId); | 
| 81 | 81 |  		} catch (DoesNotExistException $e) { | 
| 82 | - return new NotFoundJSONResponse(); | |
| 82 | + return new NotFoundJSONResponse(); | |
| 83 | 83 | } | 
| 84 | 84 | $result = array(); | 
| 85 | 85 |  		if ($vault) { | 
| @@ -409,11 +409,11 @@ | ||
| 409 | 409 | //@TODO Check expire date | 
| 410 | 410 | $acl = $this->shareService->getACL(null, $credential_guid); | 
| 411 | 411 | |
| 412 | -        if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) { | |
| 412 | +		if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) { | |
| 413 | 413 | return new NotFoundJSONResponse(); | 
| 414 | 414 | } | 
| 415 | 415 | |
| 416 | - $views = $acl->getExpireViews(); | |
| 416 | + $views = $acl->getExpireViews(); | |
| 417 | 417 |  		if ($views === 0) { | 
| 418 | 418 | return new NotFoundJSONResponse(); | 
| 419 | 419 |  		} else if ($views != -1) { | 
| @@ -87,9 +87,9 @@ discard block | ||
| 87 | 87 | */ | 
| 88 | 88 |  	public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) { | 
| 89 | 89 | |
| 90 | -		try{ | |
| 90 | +		try { | |
| 91 | 91 | $credential = $this->credentialService->getCredentialByGUID($item_guid); | 
| 92 | -		} catch (DoesNotExistException $exception){ | |
| 92 | +		} catch (DoesNotExistException $exception) { | |
| 93 | 93 | return new NotFoundResponse(); | 
| 94 | 94 | } | 
| 95 | 95 | |
| @@ -230,21 +230,21 @@ discard block | ||
| 230 | 230 | } | 
| 231 | 231 | |
| 232 | 232 | |
| 233 | -	public function unshareCredentialFromUser($item_guid, $user_id){ | |
| 233 | +	public function unshareCredentialFromUser($item_guid, $user_id) { | |
| 234 | 234 | $acl = null; | 
| 235 | 235 | $sr = null; | 
| 236 | 236 |  		try { | 
| 237 | 237 | $acl = $this->shareService->getCredentialAclForUser($user_id, $item_guid); | 
| 238 | -		} catch (DoesNotExistException $e){ | |
| 238 | +		} catch (DoesNotExistException $e) { | |
| 239 | 239 | |
| 240 | 240 | } | 
| 241 | -		try{ | |
| 242 | - $sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id)); | |
| 243 | -		} catch (DoesNotExistException $e){ | |
| 241 | +		try { | |
| 242 | + $sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id)); | |
| 243 | +		} catch (DoesNotExistException $e) { | |
| 244 | 244 | |
| 245 | 245 | } | 
| 246 | 246 | |
| 247 | -		if($sr){ | |
| 247 | +		if ($sr) { | |
| 248 | 248 | $this->shareService->cleanItemRequestsForUser($sr); | 
| 249 | 249 | $manager = \OC::$server->getNotificationManager(); | 
| 250 | 250 | $notification = $manager->createNotification(); | 
| @@ -253,7 +253,7 @@ discard block | ||
| 253 | 253 | ->setUser($user_id); | 
| 254 | 254 | $manager->markProcessed($notification); | 
| 255 | 255 | } | 
| 256 | -		if($acl){ | |
| 256 | +		if ($acl) { | |
| 257 | 257 | $this->shareService->deleteShareACL($acl); | 
| 258 | 258 | } | 
| 259 | 259 |  		return new JSONResponse(array('result' => true)); | 
| @@ -462,15 +462,15 @@ discard block | ||
| 462 | 462 | * @return JSONResponse | 
| 463 | 463 | * @return NotFoundResponse | 
| 464 | 464 | */ | 
| 465 | -	public function getFile($item_guid, $file_guid){ | |
| 465 | +	public function getFile($item_guid, $file_guid) { | |
| 466 | 466 |  		try { | 
| 467 | 467 | $credential = $this->credentialService->getCredentialByGUID($item_guid); | 
| 468 | -		} catch (DoesNotExistException $e){ | |
| 468 | +		} catch (DoesNotExistException $e) { | |
| 469 | 469 | return new NotFoundJSONResponse(); | 
| 470 | 470 | } | 
| 471 | 471 | |
| 472 | 472 | $acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid()); | 
| 473 | -		if (!$acl->hasPermission(SharingACL::FILES)){ | |
| 473 | +		if (!$acl->hasPermission(SharingACL::FILES)) { | |
| 474 | 474 | return new NotFoundJSONResponse(); | 
| 475 | 475 |  		} else { | 
| 476 | 476 | return $this->fileService->getFileByGuid($file_guid); | 
| @@ -21,7 +21,7 @@ discard block | ||
| 21 | 21 | |
| 22 | 22 | private $userId; | 
| 23 | 23 | |
| 24 | -	public function __construct($AppName, IRequest $request, $UserId){ | |
| 24 | +	public function __construct($AppName, IRequest $request, $UserId) { | |
| 25 | 25 | parent::__construct($AppName, $request); | 
| 26 | 26 | $this->userId = $UserId; | 
| 27 | 27 | } | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | */ | 
| 39 | 39 |  	public function index() { | 
| 40 | 40 | $params = ['user' => $this->userId]; | 
| 41 | -		return new TemplateResponse('passman', 'main', $params);  // templates/main.php | |
| 41 | +		return new TemplateResponse('passman', 'main', $params); // templates/main.php | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 | |
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | * @NoAdminRequired | 
| 47 | 47 | * @NoCSRFRequired | 
| 48 | 48 | */ | 
| 49 | -	public function bookmarklet($url='',$title='') { | |
| 49 | +	public function bookmarklet($url = '', $title = '') { | |
| 50 | 50 |  		$params = array('url' => $url, 'label' => $title); | 
| 51 | 51 |  		return new TemplateResponse('passman', 'bookmarklet', $params); | 
| 52 | 52 | } | 
| @@ -55,10 +55,10 @@ discard block | ||
| 55 | 55 | $server->getUserManager(), | 
| 56 | 56 |   				$c->query('ActivityService'), | 
| 57 | 57 |   				$c->query('VaultService'), | 
| 58 | -                $c->query('ShareService'), | |
| 59 | -                $c->query('CredentialService'), | |
| 60 | -                $c->query('NotificationService'), | |
| 61 | -                $c->query('FileService') | |
| 58 | +				$c->query('ShareService'), | |
| 59 | +				$c->query('CredentialService'), | |
| 60 | +				$c->query('NotificationService'), | |
| 61 | +				$c->query('FileService') | |
| 62 | 62 | ); | 
| 63 | 63 | }); | 
| 64 | 64 | |
| @@ -94,7 +94,7 @@ discard block | ||
| 94 | 94 |  		$container->registerAlias('ActivityService', ActivityService::class); | 
| 95 | 95 |  		$container->registerAlias('VaultService', VaultService::class); | 
| 96 | 96 |  		$container->registerAlias('FileService', FileService::class); | 
| 97 | -        $container->registerAlias('ShareService', ShareService::class); | |
| 97 | +		$container->registerAlias('ShareService', ShareService::class); | |
| 98 | 98 |  		$container->registerAlias('Utils', Utils::class); | 
| 99 | 99 | } | 
| 100 | 100 | |
| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | use OCP\IL10N; | 
| 30 | 30 | use OCP\Util; | 
| 31 | 31 |  class Application extends App { | 
| 32 | -	public function __construct () { | |
| 32 | +	public function __construct() { | |
| 33 | 33 |  		parent::__construct('passman'); | 
| 34 | 34 | $container = $this->getContainer(); | 
| 35 | 35 | $server = $container->getServer(); | 
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | /** Cron **/ | 
| 68 | -		$container->registerService('CronService', function ($c) { | |
| 68 | +		$container->registerService('CronService', function($c) { | |
| 69 | 69 | return new CronService( | 
| 70 | 70 |  				$c->query('CredentialService'), | 
| 71 | 71 |  				$c->query('Logger'), | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | ); | 
| 77 | 77 | }); | 
| 78 | 78 | |
| 79 | -		$container->registerService('Db', function () { | |
| 79 | +		$container->registerService('Db', function() { | |
| 80 | 80 | return new Db(); | 
| 81 | 81 | }); | 
| 82 | 82 | |
| @@ -105,7 +105,7 @@ discard block | ||
| 105 | 105 | $c = $this->getContainer(); | 
| 106 | 106 | /** @var \OCP\IServerContainer $server */ | 
| 107 | 107 | $server = $c->getServer(); | 
| 108 | -		$navigationEntry = function () use ($c, $server) { | |
| 108 | +		$navigationEntry = function() use ($c, $server) { | |
| 109 | 109 | return [ | 
| 110 | 110 | 'id' => $c->getAppName(), | 
| 111 | 111 | 'order' => 10, | 
| @@ -47,11 +47,11 @@ | ||
| 47 | 47 | return $this->vaultMapper->updateVault($vault); | 
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | -	public function setLastAccess($vault_id, $user_id){ | |
| 50 | +	public function setLastAccess($vault_id, $user_id) { | |
| 51 | 51 | return $this->vaultMapper->setLastAccess($vault_id, $user_id); | 
| 52 | 52 | } | 
| 53 | 53 | |
| 54 | -	public function updateSharingKeys($vault_id, $privateKey, $publicKey){ | |
| 54 | +	public function updateSharingKeys($vault_id, $privateKey, $publicKey) { | |
| 55 | 55 | return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey); | 
| 56 | 56 | } | 
| 57 | 57 | } | 
| 58 | 58 | \ No newline at end of file | 
| @@ -49,9 +49,9 @@ | ||
| 49 | 49 | * @type = Can be passman_password or passman_password_shared | 
| 50 | 50 | * @priority = Int -> [10,20,30,40,50] | 
| 51 | 51 | */ | 
| 52 | - public function add($subject,$subjectParams=array(), | |
| 53 | - $message='',$messageParams=array(), | |
| 54 | -						$link='',$user=null,$type='') { | |
| 52 | + public function add($subject, $subjectParams = array(), | |
| 53 | + $message = '', $messageParams = array(), | |
| 54 | +						$link = '', $user = null, $type = '') { | |
| 55 | 55 | $activity = $this->manager->generateEvent(); | 
| 56 | 56 | $activity->setType($type); | 
| 57 | 57 |  		$activity->setApp('passman'); | 
| @@ -30,19 +30,19 @@ | ||
| 30 | 30 | return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by); | 
| 31 | 31 | } | 
| 32 | 32 | |
| 33 | -	public function getRevisions($credential_id, $user_id = null){ | |
| 33 | +	public function getRevisions($credential_id, $user_id = null) { | |
| 34 | 34 | return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id); | 
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | -	public function getRevision($credential_id, $user_id = null){ | |
| 37 | +	public function getRevision($credential_id, $user_id = null) { | |
| 38 | 38 | return $this->credentialRevisionMapper->getRevision($credential_id, $user_id); | 
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | -	public function deleteRevision($revision_id, $user_id){ | |
| 41 | +	public function deleteRevision($revision_id, $user_id) { | |
| 42 | 42 | return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id); | 
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | -	public function updateRevision(CredentialRevision $credentialRevision){ | |
| 45 | +	public function updateRevision(CredentialRevision $credentialRevision) { | |
| 46 | 46 | return $this->credentialRevisionMapper->update($credentialRevision); | 
| 47 | 47 | } | 
| 48 | 48 | } | 
| 49 | 49 | \ No newline at end of file | 
| @@ -25,18 +25,18 @@ discard block | ||
| 25 | 25 | $this->manager = \OC::$server->getNotificationManager(); | 
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | -	function credentialExpiredNotification($credential){ | |
| 28 | +	function credentialExpiredNotification($credential) { | |
| 29 | 29 | $urlGenerator = \OC::$server->getURLGenerator(); | 
| 30 | -		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId())); | |
| 30 | +		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/vault/' . $credential->getVaultId() . '/edit/' . $credential->getId())); | |
| 31 | 31 |  		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); | 
| 32 | 32 | $notification = $this->manager->createNotification(); | 
| 33 | 33 | $remindAction = $notification->createAction(); | 
| 34 | 34 |  		$remindAction->setLabel('remind') | 
| 35 | - ->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST'); | |
| 35 | + ->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST'); | |
| 36 | 36 | |
| 37 | 37 | $declineAction = $notification->createAction(); | 
| 38 | 38 |  		$declineAction->setLabel('ignore') | 
| 39 | - ->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE'); | |
| 39 | + ->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE'); | |
| 40 | 40 | |
| 41 | 41 |  		$notification->setApp('passman') | 
| 42 | 42 | ->setUser($credential->getUserId()) | 
| @@ -51,15 +51,15 @@ discard block | ||
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | 53 | |
| 54 | -	function credentialSharedNotification($data){ | |
| 54 | +	function credentialSharedNotification($data) { | |
| 55 | 55 | $urlGenerator = \OC::$server->getURLGenerator(); | 
| 56 | -		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/')); | |
| 56 | +		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/')); | |
| 57 | 57 |  		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); | 
| 58 | 58 | $notification = $this->manager->createNotification(); | 
| 59 | 59 | |
| 60 | 60 | $declineAction = $notification->createAction(); | 
| 61 | 61 |  		$declineAction->setLabel('decline') | 
| 62 | - ->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE'); | |
| 62 | + ->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE'); | |
| 63 | 63 | |
| 64 | 64 |  		$notification->setApp('passman') | 
| 65 | 65 | ->setUser($data['target_user']) | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | } | 
| 74 | 74 | |
| 75 | 75 | |
| 76 | -	function credentialDeclinedSharedNotification($data){ | |
| 76 | +	function credentialDeclinedSharedNotification($data) { | |
| 77 | 77 | $notification = $this->manager->createNotification(); | 
| 78 | 78 |  		$notification->setApp('passman') | 
| 79 | 79 | ->setUser($data['target_user']) | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | } | 
| 85 | 85 | |
| 86 | 86 | |
| 87 | -	function credentialAcceptedSharedNotification($data){ | |
| 87 | +	function credentialAcceptedSharedNotification($data) { | |
| 88 | 88 | $notification = $this->manager->createNotification(); | 
| 89 | 89 |  		$notification->setApp('passman') | 
| 90 | 90 | ->setUser($data['target_user']) |