| @@ -38,50 +38,50 @@ | ||
| 38 | 38 | class SharingACL extends PermissionEntity implements \JsonSerializable | 
| 39 | 39 |  { | 
| 40 | 40 | |
| 41 | - protected | |
| 42 | - $itemId, | |
| 43 | - $itemGuid, | |
| 44 | - $userId, | |
| 45 | - $created, | |
| 46 | - $expire, | |
| 41 | + protected | |
| 42 | + $itemId, | |
| 43 | + $itemGuid, | |
| 44 | + $userId, | |
| 45 | + $created, | |
| 46 | + $expire, | |
| 47 | 47 | $expireViews, | 
| 48 | - $permissions, | |
| 49 | - $vaultId, | |
| 50 | - $vaultGuid, | |
| 51 | - $sharedKey; | |
| 48 | + $permissions, | |
| 49 | + $vaultId, | |
| 50 | + $vaultGuid, | |
| 51 | + $sharedKey; | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | -    public function __construct() { | |
| 55 | - // add types in constructor | |
| 56 | -        $this->addType('itemId', 'integer'); | |
| 57 | -        $this->addType('created', 'integer'); | |
| 58 | -        $this->addType('expire', 'integer'); | |
| 59 | -        $this->addType('expireViews', 'integer'); | |
| 60 | -        $this->addType('permissions', 'integer'); | |
| 61 | - } | |
| 54 | +	public function __construct() { | |
| 55 | + // add types in constructor | |
| 56 | +		$this->addType('itemId', 'integer'); | |
| 57 | +		$this->addType('created', 'integer'); | |
| 58 | +		$this->addType('expire', 'integer'); | |
| 59 | +		$this->addType('expireViews', 'integer'); | |
| 60 | +		$this->addType('permissions', 'integer'); | |
| 61 | + } | |
| 62 | 62 | |
| 63 | - /** | |
| 64 | - * Specify data which should be serialized to JSON | |
| 65 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php | |
| 66 | - * @return mixed data which can be serialized by <b>json_encode</b>, | |
| 67 | - * which is a value of any type other than a resource. | |
| 68 | - * @since 5.4.0 | |
| 69 | - */ | |
| 70 | - function jsonSerialize() | |
| 71 | -    { | |
| 72 | - return [ | |
| 73 | - 'acl_id' => $this->getId(), | |
| 74 | - 'item_id' => $this->getItemId(), | |
| 75 | - 'item_guid' => $this->getItemGuid(), | |
| 76 | - 'user_id' => $this->getUserId(), | |
| 77 | - 'created' => $this->getCreated(), | |
| 78 | - 'expire' => $this->getExpire(), | |
| 79 | - 'expire_views' => $this->getExpireViews(), | |
| 80 | - 'permissions' => $this->getPermissions(), | |
| 81 | - 'vault_id' => $this->getVaultId(), | |
| 82 | - 'vault_guid' => $this->getVaultGuid(), | |
| 83 | - 'shared_key' => $this->getSharedKey(), | |
| 84 | - 'pending' => false, | |
| 85 | - ]; | |
| 86 | - } | |
| 63 | + /** | |
| 64 | + * Specify data which should be serialized to JSON | |
| 65 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php | |
| 66 | + * @return mixed data which can be serialized by <b>json_encode</b>, | |
| 67 | + * which is a value of any type other than a resource. | |
| 68 | + * @since 5.4.0 | |
| 69 | + */ | |
| 70 | + function jsonSerialize() | |
| 71 | +	{ | |
| 72 | + return [ | |
| 73 | + 'acl_id' => $this->getId(), | |
| 74 | + 'item_id' => $this->getItemId(), | |
| 75 | + 'item_guid' => $this->getItemGuid(), | |
| 76 | + 'user_id' => $this->getUserId(), | |
| 77 | + 'created' => $this->getCreated(), | |
| 78 | + 'expire' => $this->getExpire(), | |
| 79 | + 'expire_views' => $this->getExpireViews(), | |
| 80 | + 'permissions' => $this->getPermissions(), | |
| 81 | + 'vault_id' => $this->getVaultId(), | |
| 82 | + 'vault_guid' => $this->getVaultGuid(), | |
| 83 | + 'shared_key' => $this->getSharedKey(), | |
| 84 | + 'pending' => false, | |
| 85 | + ]; | |
| 86 | + } | |
| 87 | 87 | } | 
| 88 | 88 | \ No newline at end of file | 
| @@ -35,8 +35,7 @@ discard block | ||
| 35 | 35 | * @method string getSharedKey() | 
| 36 | 36 | */ | 
| 37 | 37 | |
| 38 | -class SharingACL extends PermissionEntity implements \JsonSerializable | |
| 39 | -{ | |
| 38 | +class SharingACL extends PermissionEntity implements \JsonSerializable { | |
| 40 | 39 | |
| 41 | 40 | protected | 
| 42 | 41 | $itemId, | 
| @@ -67,8 +66,7 @@ discard block | ||
| 67 | 66 | * which is a value of any type other than a resource. | 
| 68 | 67 | * @since 5.4.0 | 
| 69 | 68 | */ | 
| 70 | - function jsonSerialize() | |
| 71 | -    { | |
| 69 | +    function jsonSerialize() { | |
| 72 | 70 | return [ | 
| 73 | 71 | 'acl_id' => $this->getId(), | 
| 74 | 72 | 'item_id' => $this->getItemId(), | 
| @@ -57,9 +57,6 @@ | ||
| 57 | 57 | * @method string getHidden() | 
| 58 | 58 | * @method void setSharedKey(string $value) | 
| 59 | 59 | * @method string getSharedKey() | 
| 60 | - | |
| 61 | - | |
| 62 | - | |
| 63 | 60 | */ | 
| 64 | 61 | |
| 65 | 62 | |
| @@ -63,7 +63,7 @@ | ||
| 63 | 63 | */ | 
| 64 | 64 | |
| 65 | 65 | |
| 66 | -class Credential extends Entity implements  \JsonSerializable{ | |
| 66 | +class Credential extends Entity implements  \JsonSerializable { | |
| 67 | 67 | |
| 68 | 68 | use EntityJSONSerializer; | 
| 69 | 69 | |
| @@ -30,11 +30,11 @@ discard block | ||
| 30 | 30 |  	public function getRevisions($credential_id, $user_id = null) { | 
| 31 | 31 | $sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' . | 
| 32 | 32 | 'WHERE `credential_id` = ?'; | 
| 33 | - $params = [$credential_id]; | |
| 34 | -        if ($user_id !== null) { | |
| 35 | - $sql.= ' and `user_id` = ? '; | |
| 36 | - $params[] = $user_id; | |
| 37 | - } | |
| 33 | + $params = [$credential_id]; | |
| 34 | +		if ($user_id !== null) { | |
| 35 | + $sql.= ' and `user_id` = ? '; | |
| 36 | + $params[] = $user_id; | |
| 37 | + } | |
| 38 | 38 | return $this->findEntities($sql, $params); | 
| 39 | 39 | } | 
| 40 | 40 | |
| @@ -46,11 +46,11 @@ discard block | ||
| 46 | 46 |  	public function getRevision($revision_id, $user_id = null) { | 
| 47 | 47 | $sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' . | 
| 48 | 48 | 'WHERE `id` = ?'; | 
| 49 | - $params = [$revision_id]; | |
| 50 | -        if ($user_id !== null) { | |
| 51 | - $sql.= ' and `user_id` = ? '; | |
| 52 | - $params[] = $user_id; | |
| 53 | - } | |
| 49 | + $params = [$revision_id]; | |
| 50 | +		if ($user_id !== null) { | |
| 51 | + $sql.= ' and `user_id` = ? '; | |
| 52 | + $params[] = $user_id; | |
| 53 | + } | |
| 54 | 54 | return $this->findEntity($sql, $params); | 
| 55 | 55 | } | 
| 56 | 56 | |
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | protected $userId; | 
| 39 | 39 | protected $created; | 
| 40 | 40 | protected $credentialData; | 
| 41 | - protected $editedBy; | |
| 41 | + protected $editedBy; | |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 |  	public function __construct() { | 
| @@ -56,7 +56,7 @@ discard block | ||
| 56 | 56 | 'guid' => $this->getGuid(), | 
| 57 | 57 | 'created' => $this->getCreated(), | 
| 58 | 58 | 'credential_data' => json_decode(base64_decode($this->getCredentialData())), | 
| 59 | - 'edited_by' => $this->getEditedBy(), | |
| 59 | + 'edited_by' => $this->getEditedBy(), | |
| 60 | 60 | ]; | 
| 61 | 61 | } | 
| 62 | 62 | } | 
| 63 | 63 | \ No newline at end of file | 
| @@ -14,11 +14,11 @@ | ||
| 14 | 14 | |
| 15 | 15 |  class NotFoundJSONResponse extends JSONResponse { | 
| 16 | 16 | |
| 17 | - /** | |
| 18 | - * Creates a new json response with a not found status code. | |
| 19 | - * @param array $response_data | |
| 20 | - */ | |
| 21 | -    public function __construct($response_data = []) { | |
| 22 | - parent::__construct($response_data, Http::STATUS_NOT_FOUND); | |
| 23 | - } | |
| 17 | + /** | |
| 18 | + * Creates a new json response with a not found status code. | |
| 19 | + * @param array $response_data | |
| 20 | + */ | |
| 21 | +	public function __construct($response_data = []) { | |
| 22 | + parent::__construct($response_data, Http::STATUS_NOT_FOUND); | |
| 23 | + } | |
| 24 | 24 | } | 
| 25 | 25 | \ No newline at end of file | 
| @@ -13,40 +13,40 @@ | ||
| 13 | 13 | use OCP\AppFramework\Db\Entity; | 
| 14 | 14 | |
| 15 | 15 |  class PermissionEntity extends Entity { | 
| 16 | - CONST READ = 0b00000001; | |
| 17 | - CONST WRITE = 0b00000010; | |
| 18 | - CONST FILES = 0b00000100; | |
| 19 | - CONST HISTORY = 0b00001000; | |
| 20 | - CONST OWNER = 0b10000000; | |
| 16 | + CONST READ = 0b00000001; | |
| 17 | + CONST WRITE = 0b00000010; | |
| 18 | + CONST FILES = 0b00000100; | |
| 19 | + CONST HISTORY = 0b00001000; | |
| 20 | + CONST OWNER = 0b10000000; | |
| 21 | 21 | |
| 22 | - /** | |
| 23 | - * Checks wether a user matches one or more permissions at once | |
| 24 | - * @param $permission | |
| 25 | - * @return bool | |
| 26 | - */ | |
| 27 | -    public function hasPermission($permission) { | |
| 28 | - $tmp = $this->getPermissions(); | |
| 29 | - $tmp = $tmp & $permission; | |
| 30 | - return $tmp === $permission; | |
| 31 | - } | |
| 22 | + /** | |
| 23 | + * Checks wether a user matches one or more permissions at once | |
| 24 | + * @param $permission | |
| 25 | + * @return bool | |
| 26 | + */ | |
| 27 | +	public function hasPermission($permission) { | |
| 28 | + $tmp = $this->getPermissions(); | |
| 29 | + $tmp = $tmp & $permission; | |
| 30 | + return $tmp === $permission; | |
| 31 | + } | |
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * Adds the given permission or permissions set to the user current permissions | |
| 35 | - * @param $permission | |
| 36 | - */ | |
| 37 | -    public function addPermission($permission) { | |
| 38 | - $tmp = $this->getPermissions(); | |
| 39 | - $tmp = $tmp | $permission; | |
| 40 | - $this->setPermissions($tmp); | |
| 41 | - } | |
| 33 | + /** | |
| 34 | + * Adds the given permission or permissions set to the user current permissions | |
| 35 | + * @param $permission | |
| 36 | + */ | |
| 37 | +	public function addPermission($permission) { | |
| 38 | + $tmp = $this->getPermissions(); | |
| 39 | + $tmp = $tmp | $permission; | |
| 40 | + $this->setPermissions($tmp); | |
| 41 | + } | |
| 42 | 42 | |
| 43 | - /** | |
| 44 | - * Takes the given permission or permissions out from the user | |
| 45 | - * @param $permission | |
| 46 | - */ | |
| 47 | -    public function removePermission($permission) { | |
| 48 | - $tmp = $this->getPermissions(); | |
| 49 | - $tmp = $tmp & ~$permission; | |
| 50 | - $this->setPermissions($tmp); | |
| 51 | - } | |
| 43 | + /** | |
| 44 | + * Takes the given permission or permissions out from the user | |
| 45 | + * @param $permission | |
| 46 | + */ | |
| 47 | +	public function removePermission($permission) { | |
| 48 | + $tmp = $this->getPermissions(); | |
| 49 | + $tmp = $tmp & ~$permission; | |
| 50 | + $this->setPermissions($tmp); | |
| 51 | + } | |
| 52 | 52 | } | 
| 53 | 53 | \ No newline at end of file | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | $this->manager = \OC::$server->getNotificationManager(); | 
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | -	function credentialExpiredNotification($credential){ | |
| 28 | +	function credentialExpiredNotification($credential) { | |
| 29 | 29 | $urlGenerator = \OC::$server->getURLGenerator(); | 
| 30 | 30 |  		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId())); | 
| 31 | 31 |  		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); | 
| @@ -51,7 +51,7 @@ discard block | ||
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | 53 | |
| 54 | -	function credentialSharedNotification($data){ | |
| 54 | +	function credentialSharedNotification($data) { | |
| 55 | 55 | $urlGenerator = \OC::$server->getURLGenerator(); | 
| 56 | 56 |  		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/')); | 
| 57 | 57 |  		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | } | 
| 74 | 74 | |
| 75 | 75 | |
| 76 | -	function credentialDeclinedSharedNotification($data){ | |
| 76 | +	function credentialDeclinedSharedNotification($data) { | |
| 77 | 77 | $notification = $this->manager->createNotification(); | 
| 78 | 78 |  		$notification->setApp('passman') | 
| 79 | 79 | ->setUser($data['target_user']) | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | } | 
| 85 | 85 | |
| 86 | 86 | |
| 87 | -	function credentialAcceptedSharedNotification($data){ | |
| 87 | +	function credentialAcceptedSharedNotification($data) { | |
| 88 | 88 | $notification = $this->manager->createNotification(); | 
| 89 | 89 |  		$notification->setApp('passman') | 
| 90 | 90 | ->setUser($data['target_user']) | 
| @@ -32,7 +32,7 @@ | ||
| 32 | 32 | */ | 
| 33 | 33 | |
| 34 | 34 | |
| 35 | -class File extends Entity implements  \JsonSerializable{ | |
| 35 | +class File extends Entity implements  \JsonSerializable { | |
| 36 | 36 | |
| 37 | 37 | use EntityJSONSerializer; | 
| 38 | 38 | |
| @@ -27,7 +27,7 @@ | ||
| 27 | 27 | /** | 
| 28 | 28 | * @method integer getId() | 
| 29 | 29 | * @method void setId(integer $value) | 
| 30 | - * @method void setGuid(string $value) | |
| 30 | + * @method void setGuid(string $value) | |
| 31 | 31 | * @method string getGuid() | 
| 32 | 32 | * @method void setUserId(string $value) | 
| 33 | 33 | * @method string getUserId() | 
| @@ -36,7 +36,7 @@ | ||
| 36 | 36 | */ | 
| 37 | 37 | |
| 38 | 38 | |
| 39 | -class Vault extends Entity implements  \JsonSerializable{ | |
| 39 | +class Vault extends Entity implements  \JsonSerializable { | |
| 40 | 40 | |
| 41 | 41 | use EntityJSONSerializer; | 
| 42 | 42 | |