nextcloud / passman

lib/Db/CredentialRevision.php

Indentation +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	protected $userId;
 	protected $created;
 	protected $credentialData;
-    protected $editedBy;
+	protected $editedBy;
 
 
 	public function __construct() {
@@ -56,7 +56,7 @@ 
 			'guid' => $this->getGuid(),
 			'created' => $this->getCreated(),
 			'credential_data' => json_decode(base64_decode($this->getCredentialData())),
-            'edited_by' => $this->getEditedBy(),
+			'edited_by' => $this->getEditedBy(),
 		];
 	}
 }
\ No newline at end of file

lib/Utility/NotFoundJSONResponse.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 
 class NotFoundJSONResponse extends JSONResponse {
 
-    /**
-     * Creates a new json response with a not found status code.
-     * @param array $response_data
-     */
-    public function __construct($response_data = []) {
-        parent::__construct($response_data, Http::STATUS_NOT_FOUND);
-    }
+	/**
+	 * Creates a new json response with a not found status code.
+	 * @param array $response_data
+	 */
+	public function __construct($response_data = []) {
+		parent::__construct($response_data, Http::STATUS_NOT_FOUND);
+	}
 }
\ No newline at end of file

lib/Utility/PermissionEntity.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-    CONST READ  =   0b00000001;
-    CONST WRITE =   0b00000010;
-    CONST FILES =   0b00000100;
+    CONST READ  = 0b00000001;
+    CONST WRITE = 0b00000010;
+    CONST FILES = 0b00000100;
     CONST HISTORY = 0b00001000;
-    CONST OWNER =   0b10000000;
+    CONST OWNER = 0b10000000;
 
     /**
      * Checks wether a user matches one or more permissions at once

Indentation +33 added lines, -33 removed lines

@@ -13,40 +13,40 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-    CONST READ  =   0b00000001;
-    CONST WRITE =   0b00000010;
-    CONST FILES =   0b00000100;
-    CONST HISTORY = 0b00001000;
-    CONST OWNER =   0b10000000;
+	CONST READ  =   0b00000001;
+	CONST WRITE =   0b00000010;
+	CONST FILES =   0b00000100;
+	CONST HISTORY = 0b00001000;
+	CONST OWNER =   0b10000000;
 
-    /**
-     * Checks wether a user matches one or more permissions at once
-     * @param $permission
-     * @return bool
-     */
-    public function hasPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & $permission;
-        return $tmp === $permission;
-    }
+	/**
+	 * Checks wether a user matches one or more permissions at once
+	 * @param $permission
+	 * @return bool
+	 */
+	public function hasPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & $permission;
+		return $tmp === $permission;
+	}
 
-    /**
-     * Adds the given permission or permissions set to the user current permissions
-     * @param $permission
-     */
-    public function addPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp | $permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Adds the given permission or permissions set to the user current permissions
+	 * @param $permission
+	 */
+	public function addPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp | $permission;
+		$this->setPermissions($tmp);
+	}
 
-    /**
-     * Takes the given permission or permissions out from the user
-     * @param $permission
-     */
-    public function removePermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & ~$permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Takes the given permission or permissions out from the user
+	 * @param $permission
+	 */
+	public function removePermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & ~$permission;
+		$this->setPermissions($tmp);
+	}
 }
\ No newline at end of file

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-    CONST READ  =   0b00000001;
-    CONST WRITE =   0b00000010;
-    CONST FILES =   0b00000100;
-    CONST HISTORY = 0b00001000;
-    CONST OWNER =   0b10000000;
+    const READ  =   0b00000001;
+    const WRITE =   0b00000010;
+    const FILES =   0b00000100;
+    const HISTORY = 0b00001000;
+    const OWNER =   0b10000000;
 
     /**
      * Checks wether a user matches one or more permissions at once

lib/Utility/Utils.php

Indentation +8 added lines, -8 removed lines

@@ -12,10 +12,10 @@ 
 namespace OCA\Passman\Utility;
 
 class Utils {
-    /**
-     * Gets the unix epoch UTC timestamp
-     * @return int
-     */
+	/**
+	 * Gets the unix epoch UTC timestamp
+	 * @return int
+	 */
 	public static function getTime() {
 		return (new \DateTime())->getTimestamp();
 	}
@@ -27,10 +27,10 @@ 
 		return $secs . substr($millisecs, 2, 6);
 	}
 
-    /**
-     * Generates a Globally Unique ID
-     * @return string
-     */
+	/**
+	 * Generates a Globally Unique ID
+	 * @return string
+	 */
 	public static function GUID() {
 		if (function_exists('com_create_guid') === true)
 		{

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      * @return string
      */
 	public static function GUID() {
-		if (function_exists('com_create_guid') === true)
-		{
+		if (function_exists('com_create_guid') === true) {
 			return trim(com_create_guid(), '{}');
 		}
 

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

@@ -52,19 +52,19 @@
 		//Sharing stuff
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
-        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
-        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
-        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
-        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
-        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
-        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
-        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
-        ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
-        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
-        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
-        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
+		['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
+		['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+		['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
+		['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
+		['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
+		['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
+		['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
+		['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
+		['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
+		['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
+		['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
 
 		//Internal API
 		['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'],

lib/Service/CronService.php

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	public function expireCredentials() {
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
-		foreach($expired_credentials as $credential){
+		foreach($expired_credentials as $credential) {
 			$link = ''; // @TODO create direct link to credential
 
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';

Spacing +4 added lines, -4 removed lines

@@ -50,16 +50,16 @@
 	public function expireCredentials() {
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
-		foreach($expired_credentials as $credential){
+		foreach ($expired_credentials as $credential) {
 			$link = ''; // @TODO create direct link to credential
 
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';
 			$id = $credential->getId();
 			$result = $this->db->executeQuery($sql, array($id));
-			$this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman'));
+			$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman'));
 			$notifications = intval($result->fetch()['rows']);
-			if($notifications === 0) {
-				$this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman'));
+			if ($notifications === 0) {
+				$this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman'));
 				$this->activityService->add(
 					Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()),
 					'', array(),

lib/Activity.php

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
 				array(
 					'id' => 'passman',
 					'name' => (string) $l->t('Passwords'),
-					'url' => '',//FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
+					'url' => '', //FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
 				),
 			),
 		);

lib/Db/ShareRequestMapper.php

Indentation +91 added lines, -91 removed lines

@@ -16,122 +16,122 @@
 use OCP\IDBConnection;
 
 class ShareRequestMapper extends Mapper {
-    const TABLE_NAME = 'passman_share_request';
-
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, self::TABLE_NAME);
-    }
-
-    public function createRequest(ShareRequest $request){
-        return $this->insert($request);
-    }
-
-    /**
-     * Obtains a request by the given item and vault GUID pair
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
-    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]);
-    }
-
-    /**
-     * Get shared items for the given item_guid
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
-    		$this->db->executeQuery("SET sql_mode = '';");
+	const TABLE_NAME = 'passman_share_request';
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, self::TABLE_NAME);
+	}
+
+	public function createRequest(ShareRequest $request){
+		return $this->insert($request);
+	}
+
+	/**
+	 * Obtains a request by the given item and vault GUID pair
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
+	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]);
+	}
+
+	/**
+	 * Get shared items for the given item_guid
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
+	public function getRequestsByItemGuidGroupedByUser($item_guid){
+		if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+			$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]);
-    }
-
-    /**
-     * Deletes all pending requests for the given user to the given item
-     * @param $item_id          The item ID
-     * @param $target_user_id   The target user
-     * @return \PDOStatement    The result of running the db query
-     */
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
+		$q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
+		return $this->findEntities($q, [$item_guid]);
+	}
+
+	/**
+	 * Deletes all pending requests for the given user to the given item
+	 * @param $item_id          The item ID
+	 * @param $target_user_id   The target user
+	 * @return \PDOStatement    The result of running the db query
+	 */
+	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]);
-    }
-
-    /**
-     * Obtains all pending share requests for the given user ID
-     * @param $user_id
-     * @return ShareRequest[]
-     */
-    public function getUserPendingRequests($user_id){
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
-        return $this->findEntities($q, [$user_id]);
-    }
-
-    /**
-     * Deletes the given share request
-     * @param ShareRequest $shareRequest    Request to delete
-     * @return ShareRequest                 The deleted request
-     */
-    public function deleteShareRequest(ShareRequest $shareRequest){
-    	return $this->delete($shareRequest);
+		return $this->execute($q, [$item_id, $target_user_id]);
+	}
+
+	/**
+	 * Obtains all pending share requests for the given user ID
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
+	public function getUserPendingRequests($user_id){
+		$q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
+		return $this->findEntities($q, [$user_id]);
 	}
 
-    /**
-     * Gets a share request by it's unique incremental id
-     * @param $id
-     * @return ShareRequest
+	/**
+	 * Deletes the given share request
+	 * @param ShareRequest $shareRequest    Request to delete
+	 * @return ShareRequest                 The deleted request
+	 */
+	public function deleteShareRequest(ShareRequest $shareRequest){
+		return $this->delete($shareRequest);
+	}
+
+	/**
+	 * Gets a share request by it's unique incremental id
+	 * @param $id
+	 * @return ShareRequest
 	 * @throws DoesNotExistException
-     */
+	 */
 	public function getShareRequestById($id){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
 
-    /**
-     * Gets all share requests by a given item GUID
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
+	/**
+	 * Gets all share requests by a given item GUID
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
 	public function getShareRequestsByItemGuid($item_guid){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
 
-    /**
-     * Updates the given share request,
-     * @param ShareRequest $shareRequest
-     * @return ShareRequest
-     */
+	/**
+	 * Updates the given share request,
+	 * @param ShareRequest $shareRequest
+	 * @return ShareRequest
+	 */
 	public function updateShareRequest(ShareRequest $shareRequest){
 		return $this->update($shareRequest);
 	}
 
-    /**
-     * Finds pending requests sent to the given user to the given item.
-     * @param $item_guid
-     * @param $user_id
-     * @return ShareRequest[]
-     */
+	/**
+	 * Finds pending requests sent to the given user to the given item.
+	 * @param $item_guid
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
 	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]);
 	}
 
-    /**
-     * Updates all pending requests with the given permissions
-     * @param $item_guid        The item for which to update the requests
-     * @param $user_id          The user for which to update the requests
-     * @param $permissions      The new permissions to apply
-     * @return \PDOStatement    The result of the operation
-     */
+	/**
+	 * Updates all pending requests with the given permissions
+	 * @param $item_guid        The item for which to update the requests
+	 * @param $user_id          The user for which to update the requests
+	 * @param $permissions      The new permissions to apply
+	 * @return \PDOStatement    The result of the operation
+	 */
 	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]);
-    }
+		$q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
+		return $this->execute($q, [$permissions, $item_guid, $user_id]);
+	}
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, self::TABLE_NAME);
     }
 
-    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,8 +42,8 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
     		$this->db->executeQuery("SET sql_mode = '';");
 		}
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,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]);
@@ -67,8 +67,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]);
     }
 
@@ -77,7 +77,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);
 	}
 
@@ -87,7 +87,7 @@ 
      * @return ShareRequest
 	 * @throws DoesNotExistException
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -97,7 +97,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]);
 	}
@@ -107,7 +107,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -117,7 +117,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]);
 	}
@@ -129,7 +129,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendingRequestPermissions($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]);
     }

Braces +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, self::TABLE_NAME);
     }
 
-    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,8 +42,8 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
     		$this->db->executeQuery("SET sql_mode = '';");
 		}
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,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]);
@@ -67,7 +67,7 @@ 
      * @param $user_id
      * @return ShareRequest[]
      */
-    public function getUserPendingRequests($user_id){
+    public function getUserPendingRequests($user_id) {
         $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
         return $this->findEntities($q, [$user_id]);
     }
@@ -77,7 +77,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);
 	}
 
@@ -87,7 +87,7 @@ 
      * @return ShareRequest
 	 * @throws DoesNotExistException
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -97,7 +97,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]);
 	}
@@ -107,7 +107,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -117,7 +117,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]);
 	}
@@ -129,7 +129,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendingRequestPermissions($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/Service/ActivityService.php

Spacing +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
 	 * @param $type string
 	 * @return array
 	 */
-	public function add($subject,$subjectParams=array(),
-						$message='',$messageParams=array(),
-						$link='',$user=null,$type='') {
-		if($user) {
+	public function add($subject, $subjectParams = array(),
+						$message = '', $messageParams = array(),
+						$link = '', $user = null, $type = '') {
+		if ($user) {
 			$activity = $this->manager->generateEvent();
 			$activity->setType($type);
 			$activity->setApp('passman');