Failed Conditions
Pull Request — master (#161)
by Sander
03:59
created
lib/Db/VaultMapper.php 1 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.
controller/filecontroller.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	public function __construct($AppName,
24 24
 								IRequest $request,
25 25
 								$UserId,
26
-								FileService $fileService){
26
+								FileService $fileService) {
27 27
 		parent::__construct($AppName, $request);
28 28
 		$this->userId = $UserId;
29 29
 		$this->fileService = $fileService;
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
57 57
 	}
58 58
 
59
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
59
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
60 60
 		try{
61 61
 			$file = $this->fileService->getFile($file_id, $this->userId);
62 62
 		} catch (DoesNotExistException $doesNotExistException){
63 63
 
64 64
 		}
65
-		if($file){
65
+		if($file) {
66 66
 			if($file_data) {
67 67
 				$file->setFileData($file_data);
68 68
 			}
69 69
 			if($filename) {
70 70
 				$file->setFilename($filename);
71 71
 			}
72
-			if($filename || $file_data){
72
+			if($filename || $file_data) {
73 73
 				new JSONResponse($this->fileService->updateFile($file));
74 74
 			}
75 75
 		}
Please login to merge, or discard this patch.
controller/pagecontroller.php 1 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/CronService.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	public function expireCredentials() {
38 38
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
39 39
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
40
-		foreach($expired_credentials as $credential){
40
+		foreach($expired_credentials as $credential) {
41 41
 			$link = ''; // @TODO create direct link to credential
42 42
 
43 43
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Braces   +4 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
 
@@ -46,10 +46,9 @@  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
-        }
52
-        else {
51
+        } else {
53 52
             $q .= 'user_id = ? ';
54 53
             $filter[] = $user_id;
55 54
         }
@@ -77,7 +76,7 @@  discard block
 block discarded – undo
77 76
         return $this->findEntities($q, [$item_guid]);
78 77
     }
79 78
 
80
-    public function deleteShareACL(SharingACL $ACL){
79
+    public function deleteShareACL(SharingACL $ACL) {
81 80
     	return $this->delete($ACL);
82 81
 	}
83 82
 }
84 83
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/ShareRequestMapper.php 1 patch
Braces   +12 added lines, -12 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,7 +67,7 @@  discard block
 block discarded – undo
67 67
      * @param $user_id
68 68
      * @return ShareRequest[]
69 69
      */
70
-    public function getUserPendingRequests($user_id){
70
+    public function getUserPendingRequests($user_id) {
71 71
         $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
72 72
         return $this->findEntities($q, [$user_id]);
73 73
     }
@@ -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
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/Service/CredentialService.php 1 patch
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @param Credential $credential
76 76
 	 * @return \OCP\AppFramework\Db\Entity
77 77
 	 */
78
-	public function deleteCredential(Credential $credential){
78
+	public function deleteCredential(Credential $credential) {
79 79
 		return $this->credentialMapper->deleteCredential($credential);
80 80
 	}
81 81
 
@@ -116,12 +116,11 @@  discard block
 block discarded – undo
116 116
 	 * @return Credential
117 117
 	 * @throws DoesNotExistException
118 118
 	 */
119
-	public function getCredentialById($credential_id, $user_id){
119
+	public function getCredentialById($credential_id, $user_id) {
120 120
         $credential = $this->credentialMapper->getCredentialById($credential_id);
121
-        if ($credential->getUserId() === $user_id){
121
+        if ($credential->getUserId() === $user_id) {
122 122
             return $credential;
123
-        }
124
-        else {
123
+        } else {
125 124
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
126 125
             if ($acl->hasPermission(SharingACL::READ));
127 126
             return $credential;
@@ -135,7 +134,7 @@  discard block
 block discarded – undo
135 134
 	 * @param $credential_id
136 135
 	 * @return Credential
137 136
 	 */
138
-	public function getCredentialLabelById($credential_id){
137
+	public function getCredentialLabelById($credential_id) {
139 138
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
140 139
 	}
141 140
 
@@ -145,7 +144,7 @@  discard block
 block discarded – undo
145 144
 	 * @param null $user_id
146 145
 	 * @return Credential
147 146
 	 */
148
-	public function getCredentialByGUID($credential_guid, $user_id = null){
147
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
149 148
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
150 149
     }
151 150
 }
152 151
\ No newline at end of file
Please login to merge, or discard this patch.