@@ -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/> |
@@ -51,17 +51,17 @@ discard block |
||
51 | 51 | parent::__construct('passman'); |
52 | 52 | $container = $this->getContainer(); |
53 | 53 | // Allow automatic DI for the View, until we migrated to Nodes API |
54 | - $container->registerService(View::class, function () { |
|
54 | + $container->registerService(View::class, function() { |
|
55 | 55 | return new View(''); |
56 | 56 | }, false); |
57 | - $container->registerService('isCLI', function () { |
|
57 | + $container->registerService('isCLI', function() { |
|
58 | 58 | return \OC::$CLI; |
59 | 59 | }); |
60 | 60 | |
61 | 61 | /** |
62 | 62 | * Middleware |
63 | 63 | */ |
64 | - $container->registerService('ShareMiddleware', function ($c) { |
|
64 | + $container->registerService('ShareMiddleware', function($c) { |
|
65 | 65 | return new ShareMiddleware($c->query('SettingsService')); |
66 | 66 | }); |
67 | 67 | $container->registerMiddleware('ShareMiddleware'); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * Controllers |
71 | 71 | */ |
72 | - $container->registerService('ShareController', function ($c) { |
|
72 | + $container->registerService('ShareController', function($c) { |
|
73 | 73 | $container = $this->getContainer(); |
74 | 74 | $server = $container->getServer(); |
75 | 75 | return new ShareController( |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | |
92 | 92 | /** Cron **/ |
93 | - $container->registerService('CronService', function ($c) { |
|
93 | + $container->registerService('CronService', function($c) { |
|
94 | 94 | return new CronService( |
95 | 95 | $c->query('CredentialService'), |
96 | 96 | $c->query('Logger'), |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | ); |
102 | 102 | }); |
103 | 103 | |
104 | - $container->registerService('Db', function () { |
|
104 | + $container->registerService('Db', function() { |
|
105 | 105 | return new Db(); |
106 | 106 | }); |
107 | 107 | |
108 | - $container->registerService('Logger', function ($c) { |
|
108 | + $container->registerService('Logger', function($c) { |
|
109 | 109 | return $c->query('ServerContainer')->getLogger(); |
110 | 110 | }); |
111 | 111 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $c = $this->getContainer(); |
134 | 134 | /** @var \OCP\IServerContainer $server */ |
135 | 135 | $server = $c->getServer(); |
136 | - $navigationEntry = function () use ($c, $server) { |
|
136 | + $navigationEntry = function() use ($c, $server) { |
|
137 | 137 | return [ |
138 | 138 | 'id' => $c->getAppName(), |
139 | 139 | 'order' => 10, |