nextcloud / passman

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

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'],

controller/credentialcontroller.php

Indentation +19 added lines, -19 removed lines

@@ -255,26 +255,26 @@
 	 * @NoAdminRequired
 	 */
 	public function getRevision($credential_guid) {
-	    try {
-            $credential = $this->credentialService->getCredentialByGUID($credential_guid);
-        }
-        catch (DoesNotExistException $ex){
-            return new NotFoundJSONResponse();
-        }
+		try {
+			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
+		}
+		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 {
-            $acl = $this->sharingService->getACL($this->userId, $credential_guid);
-            if ($acl->hasPermission(SharingACL::HISTORY)){
-                $result = $this->credentialRevisionService->getRevisions($credential->getId());
-            }
-            else {
-                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 {
+			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
+			if ($acl->hasPermission(SharingACL::HISTORY)){
+				$result = $this->credentialRevisionService->getRevisions($credential->getId());
+			}
+			else {
+				return new NotFoundJSONResponse();
+			}
+		}
 
 		return new JSONResponse($result);
 	}

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
 		);
 		$credential = $this->credentialService->createCredential($credential);
 		$link = ''; // @TODO create direct link to credential
-		if(!$credential->getHidden()) {
+		if (!$credential->getHidden()) {
 			$this->activityService->add(
 				Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId),
 				'', array(),
@@ -202,7 +202,7 @@ 
 
 			foreach ($acl_list as $sharingACL) {
 				$target_user = $sharingACL->getUserId();
-				if($target_user === $this->userId){
+				if ($target_user === $this->userId) {
 					continue;
 				}
 				$this->activityService->add(
@@ -217,15 +217,15 @@ 
 					$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
 			}
 		}
-		if($set_share_key === true){
+		if ($set_share_key === true) {
 			$storedCredential->setSharedKey($shared_key);
 			$credential['shared_key'] = $shared_key;
 		}
-		if($unshare_action === true){
+		if ($unshare_action === true) {
 			$storedCredential->setSharedKey('');
 			$credential['shared_key'] = '';
 		}
-		if(!$skip_revision) {
+		if (!$skip_revision) {
 			$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId);
 		}
 		$credential = $this->credentialService->updateCredential($credential);
@@ -258,7 +258,7 @@ 
 	    try {
             $credential = $this->credentialService->getCredentialByGUID($credential_guid);
         }
-        catch (DoesNotExistException $ex){
+        catch (DoesNotExistException $ex) {
             return new NotFoundJSONResponse();
         }
 
@@ -268,7 +268,7 @@ 
         }
         else {
             $acl = $this->sharingService->getACL($this->userId, $credential_guid);
-            if ($acl->hasPermission(SharingACL::HISTORY)){
+            if ($acl->hasPermission(SharingACL::HISTORY)) {
                 $result = $this->credentialRevisionService->getRevisions($credential->getId());
             }
             else {
@@ -290,7 +290,7 @@ 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
 		$revision = null;
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@@ -298,9 +298,9 @@ 
 			return new NotFoundJSONResponse();
 		}
 
-		try{
+		try {
 			$revision = $this->credentialRevisionService->getRevision($revision_id);
-		} catch(DoesNotExistException $exception){
+		} catch (DoesNotExistException $exception) {
 			return new NotFoundJSONResponse();
 		}
 

Braces +8 added lines, -11 removed lines

@@ -202,7 +202,7 @@ 
 
 			foreach ($acl_list as $sharingACL) {
 				$target_user = $sharingACL->getUserId();
-				if($target_user === $this->userId){
+				if($target_user === $this->userId) {
 					continue;
 				}
 				$this->activityService->add(
@@ -217,11 +217,11 @@ 
 					$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
 			}
 		}
-		if($set_share_key === true){
+		if($set_share_key === true) {
 			$storedCredential->setSharedKey($shared_key);
 			$credential['shared_key'] = $shared_key;
 		}
-		if($unshare_action === true){
+		if($unshare_action === true) {
 			$storedCredential->setSharedKey('');
 			$credential['shared_key'] = '';
 		}
@@ -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)){
+            if ($acl->hasPermission(SharingACL::HISTORY)) {
                 $result = $this->credentialRevisionService->getRevisions($credential->getId());
-            }
-            else {
+            } else {
                 return new NotFoundJSONResponse();
             }
         }
@@ -290,7 +287,7 @@ 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
 		$revision = null;
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);

lib/Service/CredentialService.php

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);
 	}

Indentation +15 added lines, -15 removed lines

@@ -23,11 +23,11 @@ 
 class CredentialService {
 
 	private $credentialMapper;
-    private $sharingACL;
+	private $sharingACL;
 
 	public function __construct(CredentialMapper $credentialMapper, SharingACLMapper $sharingACL) {
 		$this->credentialMapper = $credentialMapper;
-        $this->sharingACL = $sharingACL;
+		$this->sharingACL = $sharingACL;
 	}
 
 	/**
@@ -65,23 +65,23 @@ 
 	}
 
 	public function getCredentialById($credential_id, $user_id){
-        $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
-            return $credential;
-        }
-        else {
-            $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
-            if ($acl->hasPermission(SharingACL::READ));
-            return $credential;
-        }
-
-        throw new DoesNotExistException("Did expect one result but found none when executing");
+		$credential = $this->credentialMapper->getCredentialById($credential_id);
+		if ($credential->getUserId() === $user_id){
+			return $credential;
+		}
+		else {
+			$acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
+			if ($acl->hasPermission(SharingACL::READ));
+			return $credential;
+		}
+
+		throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
 	public function getCredentialLabelById($credential_id){
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}
 
 	public function getCredentialByGUID($credential_guid, $user_id = null){
-	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
-    }
+		return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 		return $this->credentialMapper->upd($credential);
 	}
 
-	public function deleteCredential($credential){
+	public function deleteCredential($credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -64,9 +64,9 @@ 
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
 	}
 
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
         }
         else {
@@ -77,11 +77,11 @@ 
 
         throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
-	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

Braces +6 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 		return $this->credentialMapper->upd($credential);
 	}
 
-	public function deleteCredential($credential){
+	public function deleteCredential($credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -64,12 +64,11 @@ 
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
 	}
 
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
-        }
-        else {
+        } else {
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
             if ($acl->hasPermission(SharingACL::READ));
             return $credential;
@@ -77,11 +76,11 @@ 
 
         throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
-	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

lib/Service/CronService.php

Spacing +5 added lines, -5 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=?';
@@ -45,9 +45,9 @@ 
 			$id = $credential->getId();
 			$query->bindParam(1, $id, \PDO::PARAM_INT);
 			$result = $query->execute();
-			$this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman'));
-			if($result->fetchRow()['rows'] === 0) {
-				$this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman'));
+			$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman'));
+			if ($result->fetchRow()['rows'] === 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()),
@@ -55,7 +55,7 @@ 
 					$link, $credential->getUserId(), Activity::TYPE_ITEM_EXPIRED);
 				$this->notificationService->credentialExpiredNotification($credential);
 			} else {
-				$this->logger->debug($credential->getLabel() .' is expired, already notified!', array('app' => 'passman'));
+				$this->logger->debug($credential->getLabel() . ' is expired, already notified!', array('app' => 'passman'));
 			}
 
 		}

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=?';

lib/Db/SharingACLMapper.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -33,7 +33,7 @@ 
      * @return SharingACL[]
      */
     public function getVaultEntries($user_id, $vault_id) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
         return $this->findEntities($q, [$user_id, $vault_id]);
     }
 
@@ -46,7 +46,7 @@ 
     public function getItemACL($user_id, $item_guid) {
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
         $filter = [$item_guid];
-        if ($user_id === null){
+        if ($user_id === null) {
             $q .= 'user_id is null';
         }
         else {
@@ -73,11 +73,11 @@ 
      * @return SharingACL[]
      */
     public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
         return $this->findEntities($q, [$item_guid]);
     }
 
-    public function deleteShareACL(SharingACL $ACL){
+    public function deleteShareACL(SharingACL $ACL) {
     	return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Braces +4 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -46,10 +46,9 @@ 
     public function getItemACL($user_id, $item_guid) {
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
         $filter = [$item_guid];
-        if ($user_id === null){
+        if ($user_id === null) {
             $q .= 'user_id is null';
-        }
-        else {
+        } else {
             $q .= 'user_id = ? ';
             $filter[] = $user_id;
         }
@@ -77,7 +76,7 @@ 
         return $this->findEntities($q, [$item_guid]);
     }
 
-    public function deleteShareACL(SharingACL $ACL){
+    public function deleteShareACL(SharingACL $ACL) {
     	return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Indentation +56 added lines, -56 removed lines

@@ -16,68 +16,68 @@
 use OCA\Passman\Utility\Utils;
 
 class SharingACLMapper extends Mapper {
-    const TABLE_NAME = '*PREFIX*passman_sharing_acl';
+	const TABLE_NAME = '*PREFIX*passman_sharing_acl';
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'passman_sharing_acl');
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'passman_sharing_acl');
+	}
 
-    public function createACLEntry(SharingACL $acl){
-        return $this->insert($acl);
-    }
+	public function createACLEntry(SharingACL $acl){
+		return $this->insert($acl);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_guid
-     * @return SharingACL[]
-     */
-    public function getVaultEntries($user_id, $vault_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
-        return $this->findEntities($q, [$user_id, $vault_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_guid
+	 * @return SharingACL[]
+	 */
+	public function getVaultEntries($user_id, $vault_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		return $this->findEntities($q, [$user_id, $vault_guid]);
+	}
 
-    /**
-     * Gets the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function getItemACL($user_id, $item_guid) {
-        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
-        $filter = [$item_guid];
-        if ($user_id === null){
-            $q .= 'user_id is null';
-        }
-        else {
-            $q .= 'user_id = ? ';
-            $filter[] = $user_id;
-        }
-        return $this->findEntity($q, $filter);
-    }
+	/**
+	 * Gets the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function getItemACL($user_id, $item_guid) {
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
+		$filter = [$item_guid];
+		if ($user_id === null){
+			$q .= 'user_id is null';
+		}
+		else {
+			$q .= 'user_id = ? ';
+			$filter[] = $user_id;
+		}
+		return $this->findEntity($q, $filter);
+	}
 
-    /**
-     * Update the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function updateCredentialACL(SharingACL $sharingACL) {
-        return $this->update($sharingACL);
-    }
+	/**
+	 * Update the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function updateCredentialACL(SharingACL $sharingACL) {
+		return $this->update($sharingACL);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_id
-     * @return SharingACL[]
-     */
-    public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
-        return $this->findEntities($q, [$item_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_id
+	 * @return SharingACL[]
+	 */
+	public function getCredentialAclList($item_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+		return $this->findEntities($q, [$item_guid]);
+	}
 
-    public function deleteShareACL(SharingACL $ACL){
-    	return $this->delete($ACL);
+	public function deleteShareACL(SharingACL $ACL){
+		return $this->delete($ACL);
 	}
 }
\ No newline at end of file

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')),
 				),
 			),
 		);