nextcloud / passman

lib/Db/CredentialMapper.php

Doc Comments +6 added lines

@@ -33,12 +33,18 @@
 		return $this->findEntities($sql, [$user_id, $vault_id]);
 	}
 
+	/**
+	 * @param integer $vault_id
+	 */
 	public function getRandomCredentialByVaultId($vault_id, $user_id) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL ORDER BY RAND() LIMIT 1';
 		return $this->findEntities($sql, [$user_id, $vault_id]);
 	}
 
+	/**
+	 * @param integer $timestamp
+	 */
 	public function getExpiredCredentials($timestamp) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';

Spacing +8 added lines, -8 removed lines

@@ -50,28 +50,28 @@ 
 	 * @param null $user_id
 	 * @return Credential
 	 */
-	public function getCredentialById($credential_id, $user_id = null){
+	public function getCredentialById($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ?';
 		// If we want to check the owner, add it to the query
 		$params = [$credential_id];
-		if ($user_id !== null){
+		if ($user_id !== null) {
 			$sql .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
-		return $this->findEntity($sql,$params);
+		return $this->findEntity($sql, $params);
 	}
 
 	/**
 	 * @param integer $credential_id
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ? ';
-		return $this->findEntity($sql,[$credential_id]);
+		return $this->findEntity($sql, [$credential_id]);
 	}
 
-	public function create($raw_credential){
+	public function create($raw_credential) {
 		$credential = new Credential();
 
 		$credential->setGuid($this->utils->GUID());
@@ -144,10 +144,10 @@ 
 	 * @param $credential_guid
 	 * @return Credential
 	 */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
 		$params = [$credential_guid];
-		if ($user_id !== null){
+		if ($user_id !== null) {
 			$q .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}

controller/credentialcontroller.php

Braces +3 added lines, -6 removed lines

@@ -255,21 +255,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();
 			}
 		}

lib/Db/CredentialRevisionMapper.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 			'WHERE `credential_id` = ?';
 		$params = [$credential_id];
 		if ($user_id !== null) {
-			$sql.= ' and `user_id` = ? ';
+			$sql .= ' and `user_id` = ? ';
 			$params[] = $user_id;
 		}
 		return $this->findEntities($sql, $params);
@@ -48,7 +48,7 @@ 
 			'WHERE `id` = ?';
 		$params = [$revision_id];
 		if ($user_id !== null) {
-			$sql.= ' and `user_id` = ? ';
+			$sql .= ' and `user_id` = ? ';
 			$params[] = $user_id;
 		}
 		return $this->findEntity($sql, $params);

lib/Db/ShareRequestMapper.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 		$this->utils = $utils;
 	}
 
-	public function createRequest(ShareRequest $request){
+	public function createRequest(ShareRequest $request) {
 		return $this->insert($request);
 	}
 
@@ -32,7 +32,7 @@ 
 	 * @param $target_vault_guid
 	 * @return ShareRequest
 	 */
-	public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
+	public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
 		return $this->findEntity($q, [$item_guid, $target_vault_guid]);
 	}
@@ -42,7 +42,7 @@ 
 	 * @param $item_guid
 	 * @return ShareRequest[]
 	 */
-	public function getRequestsByItemGuid($item_guid){
+	public function getRequestsByItemGuid($item_guid) {
 		$this->db->executeQuery("SET sql_mode = '';");
 		$q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
 		return $this->findEntities($q, [$item_guid]);
@@ -54,7 +54,7 @@ 
 	 * @param $target_user_id   The target user
 	 * @return \PDOStatement    The result of running the db query
 	 */
-	public function cleanItemRequestsForUser($item_id, $target_user_id){
+	public function cleanItemRequestsForUser($item_id, $target_user_id) {
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
 		$this->execute($q, [$item_id, $target_user_id]);
 		return $this->execute($q, [$item_id, $target_user_id]);
@@ -65,8 +65,8 @@ 
 	 * @param $user_id
 	 * @return ShareRequest[]
 	 */
-	public function getUserPendingRequests($user_id){
-		$q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
+	public function getUserPendingRequests($user_id) {
+		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
 		return $this->findEntities($q, [$user_id]);
 	}
 
@@ -75,7 +75,7 @@ 
 	 * @param ShareRequest $shareRequest    Request to delete
 	 * @return ShareRequest                 The deleted request
 	 */
-	public function deleteShareRequest(ShareRequest $shareRequest){
+	public function deleteShareRequest(ShareRequest $shareRequest) {
 		return $this->delete($shareRequest);
 	}
 
@@ -84,7 +84,7 @@ 
 	 * @param $id
 	 * @return ShareRequest
 	 */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -94,7 +94,7 @@ 
 	 * @param $item_guid
 	 * @return ShareRequest[]
 	 */
-	public function getShareRequestsByItemGuid($item_guid){
+	public function getShareRequestsByItemGuid($item_guid) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
@@ -104,7 +104,7 @@ 
 	 * @param ShareRequest $shareRequest
 	 * @return ShareRequest
 	 */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param $user_id
 	 * @return ShareRequest[]
 	 */
-	public function getPendingShareRequests($item_guid, $user_id){
+	public function getPendingShareRequests($item_guid, $user_id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
 		return $this->findEntities($q, [$item_guid, $user_id]);
 	}
@@ -126,7 +126,7 @@ 
 	 * @param $permissions      The new permissions to apply
 	 * @return \PDOStatement    The result of the operation
 	 */
-	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) {
 		$q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
 		return $this->execute($q, [$permissions, $item_guid, $user_id]);
 	}

lib/Db/ShareRequest.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		];
 	}
 
-	function asACLJson(){
+	function asACLJson() {
 		return [
 			'item_id' => $this->getItemId(),
 			'item_guid' => $this->getItemGuid(),

lib/Service/CredentialService.php

Spacing +2 added lines, -2 removed lines

@@ -95,11 +95,11 @@
 	/**
 	 * @param integer $credential_id
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}
 
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 		return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
 	}
 }
\ No newline at end of file