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) {

Braces +18 added lines, -6 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());
 	}

lib/Db/SharingACLMapper.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         $filter = [$item_guid];
         if ($user_id == null){
             $q .= 'user_id is null';
-        }
-        else {
+        } else {
             $q .= 'user_id = ? ';
             $filter[] = $user_id;
         }

lib/Service/CredentialService.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         $filter = [$item_guid];
         if ($user_id == null){
             $q .= 'user_id is null';
-        }
-        else {
+        } else {
             $q .= 'user_id = ? ';
             $filter[] = $user_id;
         }

Doc Comments +20 added lines

@@ -43,23 +43,39 @@ 
 	public function updateCredential($credential) {
 		return $this->credentialMapper->updateCredential($credential);
 	}
+
+	/**
+	 * @param Credential $credential
+	 */
 	public function upd($credential) {
 		return $this->credentialMapper->upd($credential);
 	}
 
+	/**
+	 * @param Credential $credential
+	 */
 	public function deleteCredential($credential){
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
+	/**
+	 * @param integer $vault_id
+	 */
 	public function getCredentialsByVaultId($vault_id, $user_id) {
 		return $this->credentialMapper->getCredentialsByVaultId($vault_id, $user_id);
 	}
 
+	/**
+	 * @param integer $vault_id
+	 */
 	public function getRandomCredentialByVaultId($vault_id, $user_id) {
 		$credentials = $this->credentialMapper->getRandomCredentialByVaultId($vault_id, $user_id);
 		return array_pop($credentials);
 	}
 
+	/**
+	 * @param integer $timestamp
+	 */
 	public function getExpiredCredentials($timestamp) {
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
 	}
@@ -77,6 +93,10 @@ 
 
         throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
+
+	/**
+	 * @param integer $credential_id
+	 */
 	public function getCredentialLabelById($credential_id){
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}

controller/credentialcontroller.php

Braces +3 added lines, -6 removed lines

@@ -257,21 +257,18 @@
 	public function getRevision($credential_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
-		}
-		catch (DoesNotExistException $ex){
+		} catch (DoesNotExistException $ex){
 			return new NotFoundJSONResponse();
 		}
 
 		// If the request was made by the owner of the credential
 		if ($this->userId === $credential->getUserId()) {
 			$result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
-		}
-		else {
+		} else {
 			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
 			if ($acl->hasPermission(SharingACL::HISTORY)){
 				$result = $this->credentialRevisionService->getRevisions($credential->getId());
-			}
-			else {
+			} else {
 				return new NotFoundJSONResponse();
 			}
 		}