nextcloud / passman

lib/Db/SharingACLMapper.php

Indentation +67 added lines, -67 removed lines

@@ -16,81 +16,81 @@
 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, Utils $utils) {
-        parent::__construct($db, 'passman_sharing_acl');
-        $this->utils = $utils;
-    }
+	public function __construct(IDBConnection $db, Utils $utils) {
+		parent::__construct($db, 'passman_sharing_acl');
+		$this->utils = $utils;
+	}
 
-    /**
-     * Gets all the credential data for the given user
-     * @param $userId
-     * @param $item_guid
-     * @return SharingACL[]
-     */
-    public function getCredentialPermissions(IUser $userId, $item_guid){
-        $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
+	/**
+	 * Gets all the credential data for the given user
+	 * @param $userId
+	 * @param $item_guid
+	 * @return SharingACL[]
+	 */
+	public function getCredentialPermissions(IUser $userId, $item_guid){
+		$sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
 
-        return $this->findEntities($sql, [$userId, $item_guid]);
-    }
+		return $this->findEntities($sql, [$userId, $item_guid]);
+	}
 
-    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_id
-     * @return SharingACL[]
-     */
-    public function getVaultEntries($user_id, $vault_id) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
-        return $this->findEntities($q, [$user_id, $vault_id]);
-    }
+	/**
+	 * 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 getVaultEntries($user_id, $vault_id) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		return $this->findEntities($q, [$user_id, $vault_id]);
+	}
 
-    /**
-     * 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

Spacing +7 added lines, -7 removed lines

@@ -29,13 +29,13 @@ 
      * @param $item_guid
      * @return SharingACL[]
      */
-    public function getCredentialPermissions(IUser $userId, $item_guid){
-        $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
+    public function getCredentialPermissions(IUser $userId, $item_guid) {
+        $sql = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND item_guid = ?";
 
         return $this->findEntities($sql, [$userId, $item_guid]);
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -46,7 +46,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]);
     }
 
@@ -59,7 +59,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 {
@@ -86,11 +86,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

lib/Service/CredentialService.php

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

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

lib/Utility/PermissionEntity.php

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