Completed
Pull Request — master (#160)
by Sander
05:12
created
controller/pagecontroller.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	private $userId;
23 23
 
24
-	public function __construct($AppName, IRequest $request, $UserId){
24
+	public function __construct($AppName, IRequest $request, $UserId) {
25 25
 		parent::__construct($AppName, $request);
26 26
 		$this->userId = $UserId;
27 27
 	}
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function index() {
40 40
 		$params = ['user' => $this->userId];
41
-		return new TemplateResponse('passman', 'main', $params);  // templates/main.php
41
+		return new TemplateResponse('passman', 'main', $params); // templates/main.php
42 42
 	}
43 43
 
44 44
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @NoAdminRequired
47 47
 	 * @NoCSRFRequired
48 48
 	 */
49
-	public function bookmarklet($url='',$title='') {
49
+	public function bookmarklet($url = '', $title = '') {
50 50
 		$params = array('url' => $url, 'label' => $title);
51 51
 		return new TemplateResponse('passman', 'bookmarklet', $params);
52 52
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 	private $userId;
23 23
 
24
-	public function __construct($AppName, IRequest $request, $UserId){
24
+	public function __construct($AppName, IRequest $request, $UserId) {
25 25
 		parent::__construct($AppName, $request);
26 26
 		$this->userId = $UserId;
27 27
 	}
Please login to merge, or discard this patch.
lib/Service/VaultService.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@
 block discarded – undo
47 47
 		return $this->vaultMapper->updateVault($vault);
48 48
 	}
49 49
 
50
-	public function setLastAccess($vault_id, $user_id){
50
+	public function setLastAccess($vault_id, $user_id) {
51 51
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
52 52
 	}
53 53
 
54
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
54
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
55 55
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@
 block discarded – undo
47 47
 		return $this->vaultMapper->updateVault($vault);
48 48
 	}
49 49
 
50
-	public function setLastAccess($vault_id, $user_id){
50
+	public function setLastAccess($vault_id, $user_id) {
51 51
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
52 52
 	}
53 53
 
54
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
54
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
55 55
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/NotificationService.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
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
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
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'));
32 32
 		$notification = $this->manager->createNotification();
33 33
 		$remindAction = $notification->createAction();
34 34
 		$remindAction->setLabel('remind')
35
-			->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST');
35
+			->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST');
36 36
 
37 37
 		$declineAction = $notification->createAction();
38 38
 		$declineAction->setLabel('ignore')
39
-			->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE');
39
+			->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE');
40 40
 
41 41
 		$notification->setApp('passman')
42 42
 			->setUser($credential->getUserId())
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
51 51
 	}
52 52
 
53 53
 
54
-	function credentialSharedNotification($data){
54
+	function credentialSharedNotification($data) {
55 55
 		$urlGenerator = \OC::$server->getURLGenerator();
56
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
56
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/'));
57 57
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
58 58
 		$notification = $this->manager->createNotification();
59 59
 
60 60
 		$declineAction = $notification->createAction();
61 61
 		$declineAction->setLabel('decline')
62
-			->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE');
62
+			->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE');
63 63
 
64 64
 		$notification->setApp('passman')
65 65
 			->setUser($data['target_user'])
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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'])
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'])
Please login to merge, or discard this patch.
lib/Db/SharingACL.php 2 patches
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -38,50 +38,50 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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(),
Please login to merge, or discard this patch.
lib/Db/Vault.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/Db/File.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 /**
16 16
  * @method integer getId()
17 17
  * @method void setId(integer $value)
18
-  * @method void setGuid(string $value)
18
+ * @method void setGuid(string $value)
19 19
  * @method string getGuid()
20 20
  * @method void setUserId(string $value)
21 21
  * @method string getUserid()
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/Db/Credential.php 3 patches
Indentation   -3 removed lines patch added patch discarded remove patch
@@ -57,9 +57,6 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/Db/CredentialRevisionMapper.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 			'WHERE `credential_id` = ?';
33 33
         $params = [$credential_id];
34 34
         if ($user_id !== null) {
35
-            $sql.= ' and `user_id` = ? ';
35
+            $sql .= ' and `user_id` = ? ';
36 36
             $params[] = $user_id;
37 37
         }
38 38
 		return $this->findEntities($sql, $params);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 			'WHERE `id` = ?';
49 49
         $params = [$revision_id];
50 50
         if ($user_id !== null) {
51
-            $sql.= ' and `user_id` = ? ';
51
+            $sql .= ' and `user_id` = ? ';
52 52
             $params[] = $user_id;
53 53
         }
54 54
 		return $this->findEntity($sql, $params);
Please login to merge, or discard this patch.
lib/Db/VaultMapper.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
50 50
 	 * @return Vault
51 51
 	 */
52
-	public function findVaultsFromUser($userId){
52
+	public function findVaultsFromUser($userId) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
54 54
 			'WHERE `user_id` = ? ';
55 55
 		$params = [$userId];
56 56
 		return $this->findEntities($sql, $params);
57 57
 	}
58 58
 
59
-	public function create($vault_name, $userId){
59
+	public function create($vault_name, $userId) {
60 60
 		$vault = new Vault();
61 61
 		$vault->setName($vault_name);
62 62
 		$vault->setUserId($userId);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		return parent::insert($vault);
67 67
 	}
68 68
 
69
-	public function setLastAccess($vault_id, $user_id){
69
+	public function setLastAccess($vault_id, $user_id) {
70 70
 		$vault = new Vault();
71 71
 		$vault->setId($vault_id);
72 72
 		$vault->setUserId($user_id);
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
 		$this->update($vault);
75 75
 	}
76 76
 
77
-	public function updateVault(Vault $vault){
77
+	public function updateVault(Vault $vault) {
78 78
 		$this->update($vault);
79 79
 	}
80 80
 
81
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
81
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
82 82
 		$vault = new Vault();
83 83
 		$vault->setId($vault_id);
84 84
 		$vault->setPrivateSharingKey($privateKey);
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
50 50
 	 * @return Vault[]
51 51
 	 */
52
-	public function findVaultsFromUser($userId){
52
+	public function findVaultsFromUser($userId) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
54 54
 			'WHERE `user_id` = ? ';
55 55
 		$params = [$userId];
56 56
 		return $this->findEntities($sql, $params);
57 57
 	}
58 58
 
59
-	public function create($vault_name, $userId){
59
+	public function create($vault_name, $userId) {
60 60
 		$vault = new Vault();
61 61
 		$vault->setName($vault_name);
62 62
 		$vault->setUserId($userId);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		return parent::insert($vault);
67 67
 	}
68 68
 
69
-	public function setLastAccess($vault_id, $user_id){
69
+	public function setLastAccess($vault_id, $user_id) {
70 70
 		$vault = new Vault();
71 71
 		$vault->setId($vault_id);
72 72
 		$vault->setUserId($user_id);
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
 		$this->update($vault);
75 75
 	}
76 76
 
77
-	public function updateVault(Vault $vault){
77
+	public function updateVault(Vault $vault) {
78 78
 		$this->update($vault);
79 79
 	}
80 80
 
81
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
81
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
82 82
 		$vault = new Vault();
83 83
 		$vault->setId($vault_id);
84 84
 		$vault->setPrivateSharingKey($privateKey);
Please login to merge, or discard this patch.