Completed
Pull Request — master (#152)
by Sander
02:27
created
lib/Db/CredentialMapper.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
58 58
 			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20';
59 59
 		$entities = $this->findEntities($sql, [$user_id, $vault_id]);
60
-		$count = count($entities)-1;
60
+		$count = count($entities) - 1;
61 61
 		$entities = array_splice($entities, rand(0, $count), 1);
62 62
 		return $entities;
63 63
 	}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 * @param $timestamp
68 68
 	 * @return Credential[]
69 69
 	 */
70
-	public function getExpiredCredentials($timestamp){
70
+	public function getExpiredCredentials($timestamp) {
71 71
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
72 72
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
73 73
 		return $this->findEntities($sql, [$timestamp]);
@@ -80,16 +80,16 @@  discard block
 block discarded – undo
80 80
      * @param null $user_id
81 81
      * @return Credential
82 82
      */
83
-	public function getCredentialById($credential_id, $user_id = null){
83
+	public function getCredentialById($credential_id, $user_id = null) {
84 84
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
85 85
 			'WHERE `id` = ?';
86 86
         // If we want to check the owner, add it to the query
87 87
 		$params = [$credential_id];
88
-        if ($user_id !== null){
88
+        if ($user_id !== null) {
89 89
         	$sql .= ' and `user_id` = ? ';
90 90
 			array_push($params, $user_id);
91 91
 		}
92
-		return $this->findEntity($sql,$params);
92
+		return $this->findEntity($sql, $params);
93 93
 	}
94 94
 
95 95
 	/**
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
 	 * @param $credential_id
98 98
 	 * @return Credential
99 99
 	 */
100
-	public function getCredentialLabelById($credential_id){
100
+	public function getCredentialLabelById($credential_id) {
101 101
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
102 102
 			'WHERE `id` = ? ';
103
-		return $this->findEntity($sql,[$credential_id]);
103
+		return $this->findEntity($sql, [$credential_id]);
104 104
 	}
105 105
 
106 106
 	/**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param $raw_credential
109 109
 	 * @return Credential
110 110
 	 */
111
-	public function create($raw_credential){
111
+	public function create($raw_credential) {
112 112
 		$credential = new Credential();
113 113
 
114 114
 		$credential->setGuid($this->utils->GUID());
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$credential->setCustomFields($raw_credential['custom_fields']);
132 132
 		$credential->setOtp($raw_credential['otp']);
133 133
 		$credential->setHidden($raw_credential['hidden']);
134
-		if(isset($raw_credential['shared_key'])) {
134
+		if (isset($raw_credential['shared_key'])) {
135 135
 			$credential->setSharedKey($raw_credential['shared_key']);
136 136
 		}
137 137
 		return parent::insert($credential);
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param $raw_credential array An array containing all the credential fields
143 143
 	 * @return Credential The updated credential
144 144
 	 */
145
-	public function updateCredential($raw_credential){
145
+	public function updateCredential($raw_credential) {
146 146
 		$original = $this->getCredentialByGUID($raw_credential['guid']);
147 147
 		$credential = new Credential();
148 148
 		$credential->setId($original->getId());
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 		return parent::update($credential);
171 171
 	}
172 172
 
173
-	public function deleteCredential(Credential $credential){
173
+	public function deleteCredential(Credential $credential) {
174 174
 		return $this->delete($credential);
175 175
 	}
176 176
 
177
-	public function upd(Credential $credential){
177
+	public function upd(Credential $credential) {
178 178
 		$this->update($credential);
179 179
 	}
180 180
 
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
      * @param $credential_guid
184 184
      * @return Credential
185 185
      */
186
-	public function getCredentialByGUID($credential_guid, $user_id = null){
186
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
187 187
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
188 188
 		$params = [$credential_guid];
189
-		if ($user_id !== null){
189
+		if ($user_id !== null) {
190 190
 			$q .= ' and `user_id` = ? ';
191 191
 			array_push($params, $user_id);
192 192
 		}
Please login to merge, or discard this patch.
controller/filecontroller.php 1 patch
Spacing   +8 added lines, -8 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;
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
60 60
 	}
61 61
 
62
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
63
-		try{
62
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
63
+		try {
64 64
 			$file = $this->fileService->getFile($file_id, $this->userId);
65
-		} catch (\Exception $doesNotExistException){
65
+		} catch (\Exception $doesNotExistException) {
66 66
 
67 67
 		}
68
-		if($file){
69
-			if($file_data) {
68
+		if ($file) {
69
+			if ($file_data) {
70 70
 				$file->setFileData($file_data);
71 71
 			}
72
-			if($filename) {
72
+			if ($filename) {
73 73
 				$file->setFilename($filename);
74 74
 			}
75
-			if($filename || $file_data){
75
+			if ($filename || $file_data) {
76 76
 				new JSONResponse($this->fileService->updateFile($file));
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.