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

@@ -90,7 +90,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);
 	}
 
@@ -143,13 +145,17 @@ 
 		$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();
 			$credential = $this->credential->getCredentialById($entry->getItemId());
 			$credential = $this->encryptService->decryptCredential($credential);
 			$tmp['credential_data'] = $credential->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;
 		}
@@ -171,7 +177,9 @@ 
 		$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();
 		$credential = $this->credential->getCredentialById($acl->getItemId());
@@ -179,7 +187,9 @@ 
 
 		$tmp['credential_data'] = $credential->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;
@@ -194,7 +204,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/Service/NotificationService.php

Spacing +9 added lines, -9 removed lines

@@ -25,18 +25,18 @@ 
 		$this->manager = \OC::$server->getNotificationManager();
 	}
 
-	function credentialExpiredNotification($credential){
+	function credentialExpiredNotification($credential) {
 		$urlGenerator = \OC::$server->getURLGenerator();
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/vault/' . $credential->getVaultId() . '/edit/' . $credential->getId()));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
 		$notification = $this->manager->createNotification();
 		$remindAction = $notification->createAction();
 		$remindAction->setLabel('remind')
-			->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST');
+			->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST');
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('ignore')
-			->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE');
+			->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE');
 
 		$notification->setApp('passman')
 			->setUser($credential->getUserId())
@@ -51,15 +51,15 @@ 
 	}
 
 
-	function credentialSharedNotification($data){
+	function credentialSharedNotification($data) {
 		$urlGenerator = \OC::$server->getURLGenerator();
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/'));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
 		$notification = $this->manager->createNotification();
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('decline')
-			->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE');
+			->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE');
 
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
@@ -73,7 +73,7 @@ 
 	}
 
 
-	function credentialDeclinedSharedNotification($data){
+	function credentialDeclinedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
@@ -84,7 +84,7 @@ 
 	}
 
 
-	function credentialAcceptedSharedNotification($data){
+	function credentialAcceptedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])

Braces +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 		$this->manager = \OC::$server->getNotificationManager();
 	}
 
-	function credentialExpiredNotification($credential){
+	function credentialExpiredNotification($credential) {
 		$urlGenerator = \OC::$server->getURLGenerator();
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -51,7 +51,7 @@ 
 	}
 
 
-	function credentialSharedNotification($data){
+	function credentialSharedNotification($data) {
 		$urlGenerator = \OC::$server->getURLGenerator();
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -73,7 +73,7 @@ 
 	}
 
 
-	function credentialDeclinedSharedNotification($data){
+	function credentialDeclinedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
@@ -84,7 +84,7 @@ 
 	}
 
 
-	function credentialAcceptedSharedNotification($data){
+	function credentialAcceptedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])

lib/Db/SharingACL.php

Indentation +42 added lines, -42 removed lines

@@ -38,50 +38,50 @@
 class SharingACL extends PermissionEntity implements \JsonSerializable
 {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $userId,
-        $created,
-        $expire,
+	protected
+		$itemId,
+		$itemGuid,
+		$userId,
+		$created,
+		$expire,
 		$expireViews,
-        $permissions,
-        $vaultId,
-        $vaultGuid,
-        $sharedKey;
+		$permissions,
+		$vaultId,
+		$vaultGuid,
+		$sharedKey;
 
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('created', 'integer');
-        $this->addType('expire', 'integer');
-        $this->addType('expireViews', 'integer');
-        $this->addType('permissions', 'integer');
-    }
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('created', 'integer');
+		$this->addType('expire', 'integer');
+		$this->addType('expireViews', 'integer');
+		$this->addType('permissions', 'integer');
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'acl_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getUserId(),
-            'created' => $this->getCreated(),
-            'expire' => $this->getExpire(),
-            'expire_views' => $this->getExpireViews(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getVaultId(),
-            'vault_guid' => $this->getVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending' => false,
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'acl_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getUserId(),
+			'created' => $this->getCreated(),
+			'expire' => $this->getExpire(),
+			'expire_views' => $this->getExpireViews(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getVaultId(),
+			'vault_guid' => $this->getVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending' => false,
+		];
+	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -35,8 +35,7 @@ 
  * @method string getSharedKey()
  */
 
-class SharingACL extends PermissionEntity implements \JsonSerializable
-{
+class SharingACL extends PermissionEntity implements \JsonSerializable {
 
     protected
         $itemId,
@@ -67,8 +66,7 @@ 
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    function jsonSerialize()
-    {
+    function jsonSerialize() {
         return [
             'acl_id' => $this->getId(),
             'item_id' => $this->getItemId(),

lib/Db/Vault.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
  */
 
 
-class Vault extends Entity implements  \JsonSerializable{
+class Vault extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
  */
 
 
-class Vault extends Entity implements  \JsonSerializable{
+class Vault extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

lib/Db/File.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 
-class File extends Entity implements  \JsonSerializable{
+class File extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 
-class File extends Entity implements  \JsonSerializable{
+class File extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 /**
  * @method integer getId()
  * @method void setId(integer $value)
-  * @method void setGuid(string $value)
+ * @method void setGuid(string $value)
  * @method string getGuid()
  * @method void setUserId(string $value)
  * @method string getUserId()

lib/Db/Credential.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
  */
 
 
-class Credential extends Entity implements  \JsonSerializable{
+class Credential extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
  */
 
 
-class Credential extends Entity implements  \JsonSerializable{
+class Credential extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Indentation -3 removed lines

@@ -72,9 +72,6 @@
  * @method string getSharedKey()
  * @method void setCompromised(bool $value)
  * @method bool getCompromised()
-
-
-
  */
 
 

lib/Db/CredentialRevisionMapper.php

Indentation +10 added lines, -10 removed lines

@@ -30,11 +30,11 @@ 
 	public function getRevisions($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `credential_id` = ?';
-        $params = [$credential_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$credential_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntities($sql, $params);
 	}
 
@@ -46,11 +46,11 @@ 
 	public function getRevision($revision_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `id` = ?';
-        $params = [$revision_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$revision_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntity($sql, $params);
 	}
 

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/ShareRequest.php

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -3 removed lines

@@ -62,8 +62,7 @@ 
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    function jsonSerialize()
-    {
+    function jsonSerialize() {
         return [
             'req_id' => $this->getId(),
             'item_id' => $this->getItemId(),
@@ -78,7 +77,7 @@ 
         ];
     }
 
-    function asACLJson(){
+    function asACLJson() {
         return [
             'item_id' => $this->getItemId(),
             'item_guid' => $this->getItemGuid(),

Indentation +50 added lines, -50 removed lines

@@ -37,60 +37,60 @@
 
 class ShareRequest extends PermissionEntity implements \JsonSerializable {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $targetUserId,
-        $targetVaultId,
-        $targetVaultGuid,
-        $sharedKey,
-        $permissions,
-        $created,
+	protected
+		$itemId,
+		$itemGuid,
+		$targetUserId,
+		$targetVaultId,
+		$targetVaultGuid,
+		$sharedKey,
+		$permissions,
+		$created,
 		$fromUserId;
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('vaultId', 'integer');
-        $this->addType('permissions', 'integer');
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('vaultId', 'integer');
+		$this->addType('permissions', 'integer');
 		$this->addType('created', 'integer');
 		$this->addType('targetVaultId', 'integer');
-    }
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'req_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'target_user_id' => $this->getTargetUserId(),
-            'target_vault_id' => $this->getTargetVaultId(),
-            'target_vault_guid' => $this->getTargetVaultGuid(),
-            'from_user_id' => $this->getFromUserId(),
-            'shared_key' => $this->getSharedKey(),
-            'permissions' => $this->getPermissions(),
-            'created' => $this->getCreated(),
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'req_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'target_user_id' => $this->getTargetUserId(),
+			'target_vault_id' => $this->getTargetVaultId(),
+			'target_vault_guid' => $this->getTargetVaultGuid(),
+			'from_user_id' => $this->getFromUserId(),
+			'shared_key' => $this->getSharedKey(),
+			'permissions' => $this->getPermissions(),
+			'created' => $this->getCreated(),
+		];
+	}
 
-    function asACLJson(){
-        return [
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getTargetUserId(),
-            'created' => $this->getCreated(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getTargetVaultId(),
-            'vault_guid' => $this->getTargetVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending'   => true,
-        ];
-    }
+	function asACLJson(){
+		return [
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getTargetUserId(),
+			'created' => $this->getCreated(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getTargetVaultId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

lib/Db/EntityJSONSerializer.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 trait EntityJSONSerializer {
 	public function serializeFields($properties) {
 		$result = [];
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$result[$property] = $this->$property;
 		}
 		return $result;