Completed
Push — master ( dbecc0...75f541 )
by Marcos
02:07 queued 02:01
created
controller/vaultcontroller.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 		try {
80 80
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
81 81
 		} catch (DoesNotExistException $e) {
82
-            return new NotFoundJSONResponse();
82
+			return new NotFoundJSONResponse();
83 83
 		}
84 84
 		$result = array();
85 85
 		if ($vault) {
Please login to merge, or discard this patch.
controller/sharecontroller.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -409,11 +409,11 @@
 block discarded – undo
409 409
 		//@TODO Check expire date
410 410
 		$acl = $this->shareService->getACL(null, $credential_guid);
411 411
 
412
-        if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
412
+		if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
413 413
 			return new NotFoundJSONResponse();
414 414
 		}
415 415
 
416
-        $views = $acl->getExpireViews();
416
+		$views = $acl->getExpireViews();
417 417
 		if ($views === 0) {
418 418
 			return new NotFoundJSONResponse();
419 419
 		} else if ($views != -1) {
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	}
231 231
 
232 232
 
233
-	public function unshareCredentialFromUser($item_guid, $user_id){
233
+	public function unshareCredentialFromUser($item_guid, $user_id) {
234 234
 		$acl = null;
235 235
 		$sr = null;
236 236
 		try {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 
245 245
 		}
246 246
 
247
-		if($sr){
247
+		if($sr) {
248 248
 			$this->shareService->cleanItemRequestsForUser($sr);
249 249
 			$manager = \OC::$server->getNotificationManager();
250 250
 			$notification = $manager->createNotification();
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 				->setUser($user_id);
254 254
 			$manager->markProcessed($notification);
255 255
 		}
256
-		if($acl){
256
+		if($acl) {
257 257
 			$this->shareService->deleteShareACL($acl);
258 258
 		}
259 259
 		return new JSONResponse(array('result' => true));
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
 	 * @return JSONResponse
463 463
 	 * @return NotFoundResponse
464 464
 	 */
465
-	public function getFile($item_guid, $file_guid){
465
+	public function getFile($item_guid, $file_guid) {
466 466
 		try {
467 467
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
468 468
 		} catch (DoesNotExistException $e){
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 		}
471 471
 
472 472
 		$acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid());
473
-		if (!$acl->hasPermission(SharingACL::FILES)){
473
+		if (!$acl->hasPermission(SharingACL::FILES)) {
474 474
 			return new NotFoundJSONResponse();
475 475
 		} else {
476 476
 			return $this->fileService->getFileByGuid($file_guid);
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 				$server->getUserManager(),
56 56
  				$c->query('ActivityService'),
57 57
  				$c->query('VaultService'),
58
-                $c->query('ShareService'),
59
-                $c->query('CredentialService'),
60
-                $c->query('NotificationService'),
61
-                $c->query('FileService')
58
+				$c->query('ShareService'),
59
+				$c->query('CredentialService'),
60
+				$c->query('NotificationService'),
61
+				$c->query('FileService')
62 62
 			);
63 63
 		});
64 64
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		$container->registerAlias('ActivityService', ActivityService::class);
95 95
 		$container->registerAlias('VaultService', VaultService::class);
96 96
 		$container->registerAlias('FileService', FileService::class);
97
-        $container->registerAlias('ShareService', ShareService::class);
97
+		$container->registerAlias('ShareService', ShareService::class);
98 98
 		$container->registerAlias('Utils', Utils::class);
99 99
 	}
100 100
 
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/CredentialMapper.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -44,18 +44,18 @@  discard block
 block discarded – undo
44 44
 		return $this->findEntities($sql, [$timestamp]);
45 45
 	}
46 46
 
47
-    /**
48
-     * @param $credential_id
49
-     * @param null $user_id
50
-     * @return Credential
51
-     */
47
+	/**
48
+	 * @param $credential_id
49
+	 * @param null $user_id
50
+	 * @return Credential
51
+	 */
52 52
 	public function getCredentialById($credential_id, $user_id = null){
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
54 54
 			'WHERE `id` = ?';
55
-        // If we want to check the owner, add it to the query
55
+		// If we want to check the owner, add it to the query
56 56
 		$params = [$credential_id];
57
-        if ($user_id !== null){
58
-        	$sql .= ' and `user_id` = ? ';
57
+		if ($user_id !== null){
58
+			$sql .= ' and `user_id` = ? ';
59 59
 			array_push($params, $user_id);
60 60
 		}
61 61
 		return $this->findEntity($sql,$params);
@@ -135,18 +135,18 @@  discard block
 block discarded – undo
135 135
 		$this->update($credential);
136 136
 	}
137 137
 
138
-    /**
139
-     * Finds a credential by the given guid
140
-     * @param $credential_guid
141
-     * @return Credential
142
-     */
138
+	/**
139
+	 * Finds a credential by the given guid
140
+	 * @param $credential_guid
141
+	 * @return Credential
142
+	 */
143 143
 	public function getCredentialByGUID($credential_guid, $user_id = null){
144
-	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
144
+		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
145 145
 		$params = [$credential_guid];
146 146
 		if ($user_id !== null){
147 147
 			$q .= ' and `user_id` = ? ';
148 148
 			array_push($params, $user_id);
149 149
 		}
150
-        return $this->findEntity($q, $params);
151
-    }
150
+		return $this->findEntity($q, $params);
151
+	}
152 152
 }
153 153
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @param $timestamp
51 51
 	 * @return Credential[]
52 52
 	 */
53
-	public function getExpiredCredentials($timestamp){
53
+	public function getExpiredCredentials($timestamp) {
54 54
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
55 55
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
56 56
 		return $this->findEntities($sql, [$timestamp]);
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
      * @param null $user_id
62 62
      * @return Credential
63 63
      */
64
-	public function getCredentialById($credential_id, $user_id = null){
64
+	public function getCredentialById($credential_id, $user_id = null) {
65 65
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
66 66
 			'WHERE `id` = ?';
67 67
         // If we want to check the owner, add it to the query
68 68
 		$params = [$credential_id];
69
-        if ($user_id !== null){
69
+        if ($user_id !== null) {
70 70
         	$sql .= ' and `user_id` = ? ';
71 71
 			array_push($params, $user_id);
72 72
 		}
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @param $credential_id
78 78
 	 * @return Credential
79 79
 	 */
80
-	public function getCredentialLabelById($credential_id){
80
+	public function getCredentialLabelById($credential_id) {
81 81
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
82 82
 			'WHERE `id` = ? ';
83 83
 		return $this->findEntity($sql,[$credential_id]);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @param $raw_credential
88 88
 	 * @return Credential
89 89
 	 */
90
-	public function create($raw_credential){
90
+	public function create($raw_credential) {
91 91
 		$credential = new Credential();
92 92
 
93 93
 		$credential->setGuid($this->utils->GUID());
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 * @param $raw_credential array An array containing all the credential fields
119 119
 	 * @return Credential The updated credential
120 120
 	 */
121
-	public function updateCredential($raw_credential){
121
+	public function updateCredential($raw_credential) {
122 122
 		$original = $this->getCredentialByGUID($raw_credential['guid']);
123 123
 		$credential = new Credential();
124 124
 		$credential->setId($original->getId());
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
 		return parent::update($credential);
147 147
 	}
148 148
 
149
-	public function deleteCredential(Credential $credential){
149
+	public function deleteCredential(Credential $credential) {
150 150
 		return $this->delete($credential);
151 151
 	}
152 152
 
153
-	public function upd(Credential $credential){
153
+	public function upd(Credential $credential) {
154 154
 		$this->update($credential);
155 155
 	}
156 156
 
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
      * @param $credential_guid
160 160
      * @return Credential
161 161
      */
162
-	public function getCredentialByGUID($credential_guid, $user_id = null){
162
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
163 163
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
164 164
 		$params = [$credential_guid];
165
-		if ($user_id !== null){
165
+		if ($user_id !== null) {
166 166
 			$q .= ' and `user_id` = ? ';
167 167
 			array_push($params, $user_id);
168 168
 		}
Please login to merge, or discard this patch.
lib/Db/File.php 2 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.
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 2 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.
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 1 patch
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.
lib/Db/CredentialRevision.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.