Completed
Push — master ( 197620...ce588f )
by Sander
02:30
created
lib/Service/ShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 	}
286 286
 
287 287
 
288
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
288
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
289 289
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
290 290
     }
291 291
 }
292 292
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Activity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
 				array(
242 242
 					'id' => 'passman',
243 243
 					'name' => (string) $l->t('Passwords'),
244
-					'url' => '',//FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
244
+					'url' => '', //FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
245 245
 				),
246 246
 			),
247 247
 		);
Please login to merge, or discard this patch.
lib/Db/CredentialMapper.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		return $this->findEntities($sql, [$user_id, $vault_id]);
39 39
 	}
40 40
 
41
-	public function getExpiredCredentials($timestamp){
41
+	public function getExpiredCredentials($timestamp) {
42 42
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
43 43
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
44 44
 		return $this->findEntities($sql, [$timestamp]);
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
      * @param null $user_id
50 50
      * @return Credential
51 51
      */
52
-	public function getCredentialById($credential_id, $user_id = null){
52
+	public function getCredentialById($credential_id, $user_id = null) {
53 53
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
54 54
 			'WHERE `id` = ?';
55 55
         // If we want to check the owner, add it to the query
56 56
 		$params = [$credential_id];
57
-        if ($user_id !== null){
57
+        if ($user_id !== null) {
58 58
         	$sql .= ' and `user_id` = ? ';
59 59
 			array_push($params, $user_id);
60 60
 		}
61
-		return $this->findEntity($sql,$params);
61
+		return $this->findEntity($sql, $params);
62 62
 	}
63 63
 
64
-	public function getCredentialLabelById($credential_id){
64
+	public function getCredentialLabelById($credential_id) {
65 65
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
66 66
 			'WHERE `id` = ? ';
67
-		return $this->findEntity($sql,[$credential_id]);
67
+		return $this->findEntity($sql, [$credential_id]);
68 68
 	}
69 69
 
70
-	public function create($raw_credential){
70
+	public function create($raw_credential) {
71 71
 		$credential = new Credential();
72 72
 
73 73
 		$credential->setGuid($this->utils->GUID());
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 		return parent::insert($credential);
95 95
 	}
96 96
 
97
-	public function updateCredential($raw_credential){
98
-		if(!$raw_credential['guid']){
99
-			$raw_credential['guid'] =  $this->utils->GUID();
97
+	public function updateCredential($raw_credential) {
98
+		if (!$raw_credential['guid']) {
99
+			$raw_credential['guid'] = $this->utils->GUID();
100 100
 		}
101
-		if(!$raw_credential['created']){
101
+		if (!$raw_credential['created']) {
102 102
 			$raw_credential['created'] = $this->utils->getTime();
103 103
 		}
104 104
 		$credential = new Credential();
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 		return parent::update($credential);
128 128
 	}
129 129
 
130
-	public function deleteCredential(Credential $credential){
130
+	public function deleteCredential(Credential $credential) {
131 131
 		$this->delete($credential);
132 132
 	}
133 133
 
134
-	public function upd(Credential $credential){
134
+	public function upd(Credential $credential) {
135 135
 		$this->update($credential);
136 136
 	}
137 137
 
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
140 140
      * @param $credential_guid
141 141
      * @return Credential
142 142
      */
143
-	public function getCredentialByGUID($credential_guid, $user_id = null){
143
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
144 144
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
145 145
 		$params = [$credential_guid];
146
-		if ($user_id !== null){
146
+		if ($user_id !== null) {
147 147
 			$q .= ' and `user_id` = ? ';
148 148
 			array_push($params, $user_id);
149 149
 		}
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
      * @param $item_guid
30 30
      * @return SharingACL[]
31 31
      */
32
-    public function getCredentialPermissions(IUser $userId, $item_guid){
33
-        $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
32
+    public function getCredentialPermissions(IUser $userId, $item_guid) {
33
+        $sql = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND item_guid = ?";
34 34
 
35 35
         return $this->findEntities($sql, [$userId, $item_guid]);
36 36
     }
37 37
 
38
-    public function createACLEntry(SharingACL $acl){
38
+    public function createACLEntry(SharingACL $acl) {
39 39
         return $this->insert($acl);
40 40
     }
41 41
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      * @return SharingACL[]
47 47
      */
48 48
     public function getVaultEntries($user_id, $vault_id) {
49
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
49
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
50 50
         return $this->findEntities($q, [$user_id, $vault_id]);
51 51
     }
52 52
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     public function getItemACL($user_id, $item_guid) {
60 60
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
61 61
         $filter = [$item_guid];
62
-        if ($user_id == null){
62
+        if ($user_id == null) {
63 63
             $q .= 'user_id is null';
64 64
         }
65 65
         else {
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
86 86
      * @return SharingACL[]
87 87
      */
88 88
     public function getCredentialAclList($item_guid) {
89
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
89
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
90 90
         return $this->findEntities($q, [$item_guid]);
91 91
     }
92 92
 
93
-    public function deleteShareACL(SharingACL $ACL){
93
+    public function deleteShareACL(SharingACL $ACL) {
94 94
     	return $this->delete($ACL);
95 95
 	}
96 96
 }
97 97
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/Vault.php 1 patch
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.
lib/Db/File.php 1 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.
lib/Db/Credential.php 1 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.
lib/Db/CredentialRevisionMapper.php 1 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/ShareRequestMapper.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $this->utils = $utils;
23 23
     }
24 24
 
25
-    public function createRequest(ShareRequest $request){
25
+    public function createRequest(ShareRequest $request) {
26 26
         return $this->insert($request);
27 27
     }
28 28
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      * @param $target_vault_guid
33 33
      * @return ShareRequest
34 34
      */
35
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
35
+    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
36 36
         $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
37 37
         return $this->findEntity($q, [$item_guid, $target_vault_guid]);
38 38
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * @param $item_guid
43 43
      * @return ShareRequest[]
44 44
      */
45
-    public function getRequestsByItemGuid($item_guid){
45
+    public function getRequestsByItemGuid($item_guid) {
46 46
         $this->db->executeQuery("SET sql_mode = '';");
47 47
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
48 48
         return $this->findEntities($q, [$item_guid]);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      * @param $target_user_id   The target user
55 55
      * @return \PDOStatement    The result of running the db query
56 56
      */
57
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
57
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
58 58
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
59 59
 		$this->execute($q, [$item_id, $target_user_id]);
60 60
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
      * @param $user_id
66 66
      * @return ShareRequest[]
67 67
      */
68
-    public function getUserPendingRequests($user_id){
69
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
68
+    public function getUserPendingRequests($user_id) {
69
+        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
70 70
         return $this->findEntities($q, [$user_id]);
71 71
     }
72 72
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * @param ShareRequest $shareRequest    Request to delete
76 76
      * @return ShareRequest                 The deleted request
77 77
      */
78
-    public function deleteShareRequest(ShareRequest $shareRequest){
78
+    public function deleteShareRequest(ShareRequest $shareRequest) {
79 79
     	return $this->delete($shareRequest);
80 80
 	}
81 81
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
      * @param $id
85 85
      * @return ShareRequest
86 86
      */
87
-	public function getShareRequestById($id){
87
+	public function getShareRequestById($id) {
88 88
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
89 89
 		return $this->findEntity($q, [$id]);
90 90
 	}
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
      * @param $item_guid
95 95
      * @return ShareRequest[]
96 96
      */
97
-	public function getShareRequestsByItemGuid($item_guid){
97
+	public function getShareRequestsByItemGuid($item_guid) {
98 98
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
99 99
 		return $this->findEntities($q, [$item_guid]);
100 100
 	}
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      * @param ShareRequest $shareRequest
105 105
      * @return ShareRequest
106 106
      */
107
-	public function updateShareRequest(ShareRequest $shareRequest){
107
+	public function updateShareRequest(ShareRequest $shareRequest) {
108 108
 		return $this->update($shareRequest);
109 109
 	}
110 110
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      * @param $user_id
115 115
      * @return ShareRequest[]
116 116
      */
117
-	public function getPendingShareRequests($item_guid, $user_id){
117
+	public function getPendingShareRequests($item_guid, $user_id) {
118 118
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
119 119
 		return $this->findEntities($q, [$item_guid, $user_id]);
120 120
 	}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
      * @param $permissions      The new permissions to apply
127 127
      * @return \PDOStatement    The result of the operation
128 128
      */
129
-	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
129
+	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) {
130 130
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
131 131
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
132 132
     }
Please login to merge, or discard this patch.