Completed
Push — master ( c9ad65...a1f8ac )
by Sander
02:25
created
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/VaultMapper.php 1 patch
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.
lib/Db/ShareRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
         ];
79 79
     }
80 80
 
81
-    function asACLJson(){
81
+    function asACLJson() {
82 82
         return [
83 83
             'item_id' => $this->getItemId(),
84 84
             'item_guid' => $this->getItemGuid(),
Please login to merge, or discard this patch.
lib/Db/EntityJSONSerializer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 trait EntityJSONSerializer {
13 13
 	public function serializeFields($properties) {
14 14
 		$result = [];
15
-		foreach($properties as $property) {
15
+		foreach ($properties as $property) {
16 16
 			$result[$property] = $this->$property;
17 17
 		}
18 18
 		return $result;
Please login to merge, or discard this patch.
lib/Utility/PermissionEntity.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@
 block discarded – undo
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;
16
+    CONST READ  = 0b00000001;
17
+    CONST WRITE = 0b00000010;
18
+    CONST FILES = 0b00000100;
19 19
     CONST HISTORY = 0b00001000;
20
-    CONST OWNER =   0b10000000;
20
+    CONST OWNER = 0b10000000;
21 21
 
22 22
     /**
23 23
      * Checks wether a user matches one or more permissions at once
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         parent::__construct($db, 'passman_sharing_acl');
23 23
     }
24 24
 
25
-    public function createACLEntry(SharingACL $acl){
25
+    public function createACLEntry(SharingACL $acl) {
26 26
         return $this->insert($acl);
27 27
     }
28 28
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      * @return SharingACL[]
34 34
      */
35 35
     public function getVaultEntries($user_id, $vault_id) {
36
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
36
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
37 37
         return $this->findEntities($q, [$user_id, $vault_id]);
38 38
     }
39 39
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     public function getItemACL($user_id, $item_guid) {
47 47
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
48 48
         $filter = [$item_guid];
49
-        if ($user_id === null){
49
+        if ($user_id === null) {
50 50
             $q .= 'user_id is null';
51 51
         }
52 52
         else {
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
      * @return SharingACL[]
74 74
      */
75 75
     public function getCredentialAclList($item_guid) {
76
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
76
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
77 77
         return $this->findEntities($q, [$item_guid]);
78 78
     }
79 79
 
80
-    public function deleteShareACL(SharingACL $ACL){
80
+    public function deleteShareACL(SharingACL $ACL) {
81 81
     	return $this->delete($ACL);
82 82
 	}
83 83
 }
84 84
\ 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: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
244
+					'url' => '', //FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... 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/ShareRequestMapper.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         parent::__construct($db, self::TABLE_NAME);
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,8 +42,8 @@  discard block
 block discarded – undo
42 42
      * @param $item_guid
43 43
      * @return ShareRequest[]
44 44
      */
45
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
46
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
45
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
46
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
47 47
     		$this->db->executeQuery("SET sql_mode = '';");
48 48
 		}
49 49
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * @param $target_user_id   The target user
57 57
      * @return \PDOStatement    The result of running the db query
58 58
      */
59
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
59
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
60 60
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
61 61
 		$this->execute($q, [$item_id, $target_user_id]);
62 62
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
      * @param $user_id
68 68
      * @return ShareRequest[]
69 69
      */
70
-    public function getUserPendingRequests($user_id){
71
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
70
+    public function getUserPendingRequests($user_id) {
71
+        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
72 72
         return $this->findEntities($q, [$user_id]);
73 73
     }
74 74
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      * @param ShareRequest $shareRequest    Request to delete
78 78
      * @return ShareRequest                 The deleted request
79 79
      */
80
-    public function deleteShareRequest(ShareRequest $shareRequest){
80
+    public function deleteShareRequest(ShareRequest $shareRequest) {
81 81
     	return $this->delete($shareRequest);
82 82
 	}
83 83
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @return ShareRequest
88 88
 	 * @throws DoesNotExistException
89 89
      */
90
-	public function getShareRequestById($id){
90
+	public function getShareRequestById($id) {
91 91
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
92 92
 		return $this->findEntity($q, [$id]);
93 93
 	}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
      * @param $item_guid
98 98
      * @return ShareRequest[]
99 99
      */
100
-	public function getShareRequestsByItemGuid($item_guid){
100
+	public function getShareRequestsByItemGuid($item_guid) {
101 101
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
102 102
 		return $this->findEntities($q, [$item_guid]);
103 103
 	}
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
      * @param ShareRequest $shareRequest
108 108
      * @return ShareRequest
109 109
      */
110
-	public function updateShareRequest(ShareRequest $shareRequest){
110
+	public function updateShareRequest(ShareRequest $shareRequest) {
111 111
 		return $this->update($shareRequest);
112 112
 	}
113 113
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      * @param $user_id
118 118
      * @return ShareRequest[]
119 119
      */
120
-	public function getPendingShareRequests($item_guid, $user_id){
120
+	public function getPendingShareRequests($item_guid, $user_id) {
121 121
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
122 122
 		return $this->findEntities($q, [$item_guid, $user_id]);
123 123
 	}
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
      * @param $permissions      The new permissions to apply
130 130
      * @return \PDOStatement    The result of the operation
131 131
      */
132
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
132
+	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) {
133 133
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
134 134
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
135 135
     }
Please login to merge, or discard this patch.
lib/Db/CredentialMapper.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
42 42
 			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20';
43 43
 		$entities = $this->findEntities($sql, [$user_id, $vault_id]);
44
-		$count = count($entities)-1;
44
+		$count = count($entities) - 1;
45 45
 		$entities = array_splice($entities, rand(0, $count), 1);
46 46
 		return $entities;
47 47
 	}
@@ -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,33 +61,33 @@  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
 		}
73
-		return $this->findEntity($sql,$params);
73
+		return $this->findEntity($sql, $params);
74 74
 	}
75 75
 
76 76
 	/**
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
-		return $this->findEntity($sql,[$credential_id]);
83
+		return $this->findEntity($sql, [$credential_id]);
84 84
 	}
85 85
 
86 86
 	/**
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.