nextcloud / passman

lib/Service/ShareService.php

Doc Comments +1 added lines, -2 removed lines

@@ -49,6 +49,7 @@ 
 	 * @param $target_item_guid string      The shared item GUID
 	 * @param $request_array    array
 	 * @param $permissions      integer     Must be created with a bitmask from options on the ShareRequest class
+	 * @param string $credential_owner
 	 * @return array                        Array of sharing requests
 	 */
 	public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) {
@@ -253,7 +254,6 @@ 
 	/**
 	 * Delete ACL
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function deleteShareACL(SharingACL $ACL) {
@@ -277,7 +277,6 @@ 
 	/**
 	 * Get pending share requests by guid and uid
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function getPendingShareRequestsForCredential($item_guid, $user_id) {

Spacing +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
 	}
 
 
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
     }
 }
\ No newline at end of file

Braces +19 added lines, -7 removed lines

@@ -71,7 +71,9 @@ 
 	}
 
 	public function createACLEntry(SharingACL $acl) {
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
+		if ($acl->getCreated() === null) {
+			$acl->setCreated((new \DateTime())->getTimestamp());
+		}
 		return $this->sharingACL->createACLEntry($acl);
 	}
 
@@ -124,12 +126,16 @@ 
 		$return = [];
 		foreach ($entries as $entry) {
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
+			if (!$entry->hasPermission(SharingACL::READ)) {
+				continue;
+			}
 
 			$tmp = $entry->jsonSerialize();
 			$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
 
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+			if (!$entry->hasPermission(SharingACL::FILES)) {
+				unset($tmp['credential_data']['files']);
+			}
 			unset($tmp['credential_data']['shared_key']);
 			$return[] = $tmp;
 		}
@@ -150,12 +156,16 @@ 
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
 
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
+		if (!$acl->hasPermission(SharingACL::READ)) {
+			throw new DoesNotExistException("Item not found or wrong access level");
+		}
 
 		$tmp = $acl->jsonSerialize();
 		$tmp['credential_data'] = $this->credential->getCredentialById($acl->getItemId())->jsonSerialize();
 
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+		if (!$acl->hasPermission(SharingACL::FILES)) {
+			unset($tmp['credential_data']['files']);
+		}
 		unset($tmp['credential_data']['shared_key']);
 
 		return $tmp;
@@ -170,7 +180,9 @@ 
 	 */
 	public function getItemHistory($user_id, $item_guid) {
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
+			return [];
+		}
 
 		return $this->revisions->getRevisions($acl->getItemId());
 	}
@@ -285,7 +297,7 @@ 
 	}
 
 
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
     }
 }
\ No newline at end of file

Indentation +24 added lines, -24 removed lines

@@ -176,31 +176,31 @@ 
 	}
 
 
-    /**
-     * Deletes a share request by the item ID
-     * @param ShareRequest $request
-     * @return \PDOStatement
-     */
+	/**
+	 * Deletes a share request by the item ID
+	 * @param ShareRequest $request
+	 * @return \PDOStatement
+	 */
 	public function cleanItemRequestsForUser(ShareRequest $request) {
 		return $this->shareRequest->cleanItemRequestsForUser($request->getItemId(), $request->getTargetUserId());
 	}
 
-    /**
-     * Get an share request by id
-     * @param $id
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by id
+	 * @param $id
+	 * @return ShareRequest
+	 */
 	public function getShareRequestById($id) {
 		return $this->shareRequest->getShareRequestById($id);
 	}
 
-    /**
-     * Get an share request by $item_guid and $target_vault_guid
-     *
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by $item_guid and $target_vault_guid
+	 *
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
 	public function getRequestByGuid($item_guid, $target_vault_guid) {
 		return $this->shareRequest->getRequestByItemAndVaultGuid($item_guid, $target_vault_guid);
 	}
@@ -260,11 +260,11 @@ 
 		return $this->sharingACL->deleteShareACL($ACL);
 	}
 
-    /**
-     * Updates the given ACL entry
-     * @param SharingACL $sharingACL
-     * @return SharingACL
-     */
+	/**
+	 * Updates the given ACL entry
+	 * @param SharingACL $sharingACL
+	 * @return SharingACL
+	 */
 	public function updateCredentialACL(SharingACL $sharingACL) {
 		return $this->sharingACL->updateCredentialACL($sharingACL);
 	}
@@ -286,6 +286,6 @@ 
 
 
 	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
-	    return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
-    }
+		return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
+	}
 }
\ No newline at end of file

controller/filecontroller.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	public function __construct($AppName,
 								IRequest $request,
 								$UserId,
-								FileService $fileService){
+								FileService $fileService) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->fileService = $fileService;
@@ -56,20 +56,20 @@ 
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
-		try{
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
+		try {
 			$file = $this->fileService->getFile($file_id, $this->userId);
-		} catch (DoesNotExistException $doesNotExistException){
+		} catch (DoesNotExistException $doesNotExistException) {
 
 		}
-		if($file){
-			if($file_data) {
+		if ($file) {
+			if ($file_data) {
 				$file->setFileData($file_data);
 			}
-			if($filename) {
+			if ($filename) {
 				$file->setFilename($filename);
 			}
-			if($filename || $file_data){
+			if ($filename || $file_data) {
 				new JSONResponse($this->fileService->updateFile($file));
 			}
 		}

Braces +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 	public function __construct($AppName,
 								IRequest $request,
 								$UserId,
-								FileService $fileService){
+								FileService $fileService) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->fileService = $fileService;
@@ -56,20 +56,20 @@ 
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
 		try{
 			$file = $this->fileService->getFile($file_id, $this->userId);
 		} catch (DoesNotExistException $doesNotExistException){
 
 		}
-		if($file){
+		if($file) {
 			if($file_data) {
 				$file->setFileData($file_data);
 			}
 			if($filename) {
 				$file->setFilename($filename);
 			}
-			if($filename || $file_data){
+			if($filename || $file_data) {
 				new JSONResponse($this->fileService->updateFile($file));
 			}
 		}

controller/vaultcontroller.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		try {
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
 		} catch (DoesNotExistException $e) {
-            return new NotFoundJSONResponse();
+			return new NotFoundJSONResponse();
 		}
 		$result = array();
 		if ($vault) {

controller/sharecontroller.php

Indentation +2 added lines, -2 removed lines

@@ -409,11 +409,11 @@
 		//@TODO Check expire date
 		$acl = $this->shareService->getACL(null, $credential_guid);
 
-        if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
+		if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
 			return new NotFoundJSONResponse();
 		}
 
-        $views = $acl->getExpireViews();
+		$views = $acl->getExpireViews();
 		if ($views === 0) {
 			return new NotFoundJSONResponse();
 		} else if ($views != -1) {

Spacing +12 added lines, -12 removed lines

@@ -87,9 +87,9 @@ 
 	 */
 	public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) {
 
-		try{
+		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
-		} catch (DoesNotExistException $exception){
+		} catch (DoesNotExistException $exception) {
 			return new NotFoundResponse();
 		}
 
@@ -230,21 +230,21 @@ 
 	}
 
 
-	public function unshareCredentialFromUser($item_guid, $user_id){
+	public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
 			$acl = $this->shareService->getCredentialAclForUser($user_id, $item_guid);
-		} catch (DoesNotExistException $e){
+		} catch (DoesNotExistException $e) {
 
 		}
-		try{
-			$sr =  array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id));
-		} catch (DoesNotExistException $e){
+		try {
+			$sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id));
+		} catch (DoesNotExistException $e) {
 
 		}
 
-		if($sr){
+		if ($sr) {
 			$this->shareService->cleanItemRequestsForUser($sr);
 			$manager = \OC::$server->getNotificationManager();
 			$notification = $manager->createNotification();
@@ -253,7 +253,7 @@ 
 				->setUser($user_id);
 			$manager->markProcessed($notification);
 		}
-		if($acl){
+		if ($acl) {
 			$this->shareService->deleteShareACL($acl);
 		}
 		return new JSONResponse(array('result' => true));
@@ -462,15 +462,15 @@ 
 	 * @return JSONResponse
 	 * @return NotFoundResponse
 	 */
-	public function getFile($item_guid, $file_guid){
+	public function getFile($item_guid, $file_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
-		} catch (DoesNotExistException $e){
+		} catch (DoesNotExistException $e) {
 			return new NotFoundJSONResponse();
 		}
 
 		$acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid());
-		if (!$acl->hasPermission(SharingACL::FILES)){
+		if (!$acl->hasPermission(SharingACL::FILES)) {
 			return new NotFoundJSONResponse();
 		} else {
 			return $this->fileService->getFileByGuid($file_guid);

Braces +5 added lines, -5 removed lines

@@ -230,7 +230,7 @@ 
 	}
 
 
-	public function unshareCredentialFromUser($item_guid, $user_id){
+	public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
@@ -244,7 +244,7 @@ 
 
 		}
 
-		if($sr){
+		if($sr) {
 			$this->shareService->cleanItemRequestsForUser($sr);
 			$manager = \OC::$server->getNotificationManager();
 			$notification = $manager->createNotification();
@@ -253,7 +253,7 @@ 
 				->setUser($user_id);
 			$manager->markProcessed($notification);
 		}
-		if($acl){
+		if($acl) {
 			$this->shareService->deleteShareACL($acl);
 		}
 		return new JSONResponse(array('result' => true));
@@ -462,7 +462,7 @@ 
 	 * @return JSONResponse
 	 * @return NotFoundResponse
 	 */
-	public function getFile($item_guid, $file_guid){
+	public function getFile($item_guid, $file_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
 		} catch (DoesNotExistException $e){
@@ -470,7 +470,7 @@ 
 		}
 
 		$acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid());
-		if (!$acl->hasPermission(SharingACL::FILES)){
+		if (!$acl->hasPermission(SharingACL::FILES)) {
 			return new NotFoundJSONResponse();
 		} else {
 			return $this->fileService->getFileByGuid($file_guid);

controller/pagecontroller.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 	private $userId;
 
-	public function __construct($AppName, IRequest $request, $UserId){
+	public function __construct($AppName, IRequest $request, $UserId) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 	}
@@ -38,7 +38,7 @@ 
 	 */
 	public function index() {
 		$params = ['user' => $this->userId];
-		return new TemplateResponse('passman', 'main', $params);  // templates/main.php
+		return new TemplateResponse('passman', 'main', $params); // templates/main.php
 	}
 
 
@@ -46,7 +46,7 @@ 
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function bookmarklet($url='',$title='') {
+	public function bookmarklet($url = '', $title = '') {
 		$params = array('url' => $url, 'label' => $title);
 		return new TemplateResponse('passman', 'bookmarklet', $params);
 	}

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 	private $userId;
 
-	public function __construct($AppName, IRequest $request, $UserId){
+	public function __construct($AppName, IRequest $request, $UserId) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 	}

lib/AppInfo/Application.php

Indentation +5 added lines, -5 removed lines

@@ -55,10 +55,10 @@ 
 				$server->getUserManager(),
  				$c->query('ActivityService'),
  				$c->query('VaultService'),
-                $c->query('ShareService'),
-                $c->query('CredentialService'),
-                $c->query('NotificationService'),
-                $c->query('FileService')
+				$c->query('ShareService'),
+				$c->query('CredentialService'),
+				$c->query('NotificationService'),
+				$c->query('FileService')
 			);
 		});
 
@@ -94,7 +94,7 @@ 
 		$container->registerAlias('ActivityService', ActivityService::class);
 		$container->registerAlias('VaultService', VaultService::class);
 		$container->registerAlias('FileService', FileService::class);
-        $container->registerAlias('ShareService', ShareService::class);
+		$container->registerAlias('ShareService', ShareService::class);
 		$container->registerAlias('Utils', Utils::class);
 	}
 

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 use OCP\IL10N;
 use OCP\Util;
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('passman');
 		$container = $this->getContainer();
 		$server = $container->getServer();
@@ -65,7 +65,7 @@ 
 
 
 		/** Cron  **/
-		$container->registerService('CronService', function ($c) {
+		$container->registerService('CronService', function($c) {
 			return new CronService(
 				$c->query('CredentialService'),
 				$c->query('Logger'),
@@ -76,7 +76,7 @@ 
 			);
 		});
 
-		$container->registerService('Db', function () {
+		$container->registerService('Db', function() {
 			return new Db();
 		});
 
@@ -105,7 +105,7 @@ 
 		$c = $this->getContainer();
 		/** @var \OCP\IServerContainer $server */
 		$server = $c->getServer();
-		$navigationEntry = function () use ($c, $server) {
+		$navigationEntry = function() use ($c, $server) {
 			return [
 				'id' => $c->getAppName(),
 				'order' => 10,

lib/Service/VaultService.php

Spacing +2 added lines, -2 removed lines

@@ -47,11 +47,11 @@
 		return $this->vaultMapper->updateVault($vault);
 	}
 
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -47,11 +47,11 @@
 		return $this->vaultMapper->updateVault($vault);
 	}
 
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 }
\ No newline at end of file

lib/Service/ActivityService.php

Spacing +3 added lines, -3 removed lines

@@ -49,9 +49,9 @@
 	 * @type = Can be passman_password or passman_password_shared
 	 * @priority = Int -> [10,20,30,40,50]
 	 */
-	public function add($subject,$subjectParams=array(),
-						$message='',$messageParams=array(),
-						$link='',$user=null,$type='') {
+	public function add($subject, $subjectParams = array(),
+						$message = '', $messageParams = array(),
+						$link = '', $user = null, $type = '') {
 		$activity = $this->manager->generateEvent();
 		$activity->setType($type);
 		$activity->setApp('passman');

lib/Service/CredentialRevisionService.php

Spacing +4 added lines, -4 removed lines

@@ -30,19 +30,19 @@
 		return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by);
 	}
 
-	public function getRevisions($credential_id, $user_id = null){
+	public function getRevisions($credential_id, $user_id = null) {
 		return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
 	}
 
-	public function getRevision($credential_id, $user_id = null){
+	public function getRevision($credential_id, $user_id = null) {
 		return $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
 	}
 
-	public function deleteRevision($revision_id, $user_id){
+	public function deleteRevision($revision_id, $user_id) {
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
 	}
 
-	public function updateRevision(CredentialRevision $credentialRevision){
+	public function updateRevision(CredentialRevision $credentialRevision) {
 		return $this->credentialRevisionMapper->update($credentialRevision);
 	}
 }
\ No newline at end of file

Braces +4 added lines, -4 removed lines

@@ -30,19 +30,19 @@
 		return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by);
 	}
 
-	public function getRevisions($credential_id, $user_id = null){
+	public function getRevisions($credential_id, $user_id = null) {
 		return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
 	}
 
-	public function getRevision($credential_id, $user_id = null){
+	public function getRevision($credential_id, $user_id = null) {
 		return $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
 	}
 
-	public function deleteRevision($revision_id, $user_id){
+	public function deleteRevision($revision_id, $user_id) {
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
 	}
 
-	public function updateRevision(CredentialRevision $credentialRevision){
+	public function updateRevision(CredentialRevision $credentialRevision) {
 		return $this->credentialRevisionMapper->update($credentialRevision);
 	}
 }
\ No newline at end of file