Completed
Branch scrutinizer-patch-1 (ae73bf)
by Sander
02:42
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 1 patch
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.
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/Service/ShareService.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -176,31 +176,31 @@  discard block
 block discarded – undo
176 176
 	}
177 177
 
178 178
 
179
-    /**
180
-     * Deletes a share request by the item ID
181
-     * @param ShareRequest $request
182
-     * @return \PDOStatement
183
-     */
179
+	/**
180
+	 * Deletes a share request by the item ID
181
+	 * @param ShareRequest $request
182
+	 * @return \PDOStatement
183
+	 */
184 184
 	public function cleanItemRequestsForUser(ShareRequest $request) {
185 185
 		return $this->shareRequest->cleanItemRequestsForUser($request->getItemId(), $request->getTargetUserId());
186 186
 	}
187 187
 
188
-    /**
189
-     * Get an share request by id
190
-     * @param $id
191
-     * @return ShareRequest
192
-     */
188
+	/**
189
+	 * Get an share request by id
190
+	 * @param $id
191
+	 * @return ShareRequest
192
+	 */
193 193
 	public function getShareRequestById($id) {
194 194
 		return $this->shareRequest->getShareRequestById($id);
195 195
 	}
196 196
 
197
-    /**
198
-     * Get an share request by $item_guid and $target_vault_guid
199
-     *
200
-     * @param $item_guid
201
-     * @param $target_vault_guid
202
-     * @return ShareRequest
203
-     */
197
+	/**
198
+	 * Get an share request by $item_guid and $target_vault_guid
199
+	 *
200
+	 * @param $item_guid
201
+	 * @param $target_vault_guid
202
+	 * @return ShareRequest
203
+	 */
204 204
 	public function getRequestByGuid($item_guid, $target_vault_guid) {
205 205
 		return $this->shareRequest->getRequestByItemAndVaultGuid($item_guid, $target_vault_guid);
206 206
 	}
@@ -260,11 +260,11 @@  discard block
 block discarded – undo
260 260
 		return $this->sharingACL->deleteShareACL($ACL);
261 261
 	}
262 262
 
263
-    /**
264
-     * Updates the given ACL entry
265
-     * @param SharingACL $sharingACL
266
-     * @return SharingACL
267
-     */
263
+	/**
264
+	 * Updates the given ACL entry
265
+	 * @param SharingACL $sharingACL
266
+	 * @return SharingACL
267
+	 */
268 268
 	public function updateCredentialACL(SharingACL $sharingACL) {
269 269
 		return $this->sharingACL->updateCredentialACL($sharingACL);
270 270
 	}
@@ -286,6 +286,6 @@  discard block
 block discarded – undo
286 286
 
287 287
 
288 288
 	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
289
-	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
290
-    }
289
+		return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
290
+	}
291 291
 }
292 292
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/SharingACL.php 1 patch
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.
lib/Db/CredentialMapper.php 1 patch
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.
lib/Db/File.php 1 patch
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.
lib/Db/Credential.php 1 patch
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.
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.