@@ -163,13 +163,13 @@ |
||
163 | 163 | $activity . '_self', array($label, $this->userId, $revision_created), |
164 | 164 | '', array(), |
165 | 165 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
166 | - } else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) { |
|
166 | + } else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) { |
|
167 | 167 | $activity = 'item_deleted'; |
168 | 168 | $this->activityService->add( |
169 | 169 | $activity . '_self', array($label, $this->userId), |
170 | 170 | '', array(), |
171 | 171 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
172 | - } else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) { |
|
172 | + } else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) { |
|
173 | 173 | $activity = 'item_recovered'; |
174 | 174 | $this->activityService->add( |
175 | 175 | $activity . '_self', array($label, $this->userId), |
@@ -57,7 +57,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -23,7 +23,7 @@ discard block |
||
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 |
||
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 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | <h2><?php p($l->t('Passman Settings')); ?></h2> |
31 | 31 | <?php |
32 | 32 | if ($checkVersion) { |
33 | - p($l->t('Github version:'). ' '. $githubVersion); |
|
33 | + p($l->t('Github version:') . ' ' . $githubVersion); |
|
34 | 34 | print '<br />'; |
35 | 35 | } ?> |
36 | 36 | Local version: <?php p($localVersion); ?><br/> |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param $value mixed Value of the setting |
98 | 98 | */ |
99 | 99 | |
100 | - public function setUserSetting($key, $value){ |
|
100 | + public function setUserSetting($key, $value) { |
|
101 | 101 | return $this->config->setUserValue($this->userId, $this->appName, $key, $value); |
102 | 102 | } |
103 | 103 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @param $setting |
108 | 108 | * @return bool |
109 | 109 | */ |
110 | - public function isEnabled($setting){ |
|
110 | + public function isEnabled($setting) { |
|
111 | 111 | $value = intval($this->config->getAppValue('passman', $setting, false)); |
112 | 112 | return ($value === 1); |
113 | 113 | } |