@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('fields') === false) { |
66 | 66 | // Not allowed page |
67 | 67 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
68 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
68 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
69 | 69 | exit; |
70 | 70 | } |
71 | 71 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $folders = $tree->getDescendants(); |
178 | 178 | foreach ($folders as $folder) { |
179 | 179 | DB::query( |
180 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
180 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
181 | 181 | WHERE personal_folder = %i AND id = %i', |
182 | 182 | '0', |
183 | 183 | $folder->id |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | $ident .= '-'; |
190 | 190 | } |
191 | 191 | echo ' |
192 | - <option value="' . $folder->id . '">' . $ident . ' ' . str_replace('&', '&', $folder->title) . '</option>'; |
|
192 | + <option value="' . $folder->id.'">'.$ident.' '.str_replace('&', '&', $folder->title).'</option>'; |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | ?> |
@@ -220,9 +220,9 @@ discard block |
||
220 | 220 | <select class="form-control form-item-control select2" style="width:100%;" id="form-field-type"> |
221 | 221 | <?php |
222 | 222 | // Build list of Types |
223 | - echo '<option value="">-- ' . $lang->get('select') . ' --</option> |
|
224 | - <option value="text">' . $lang->get('text') . '</option> |
|
225 | - <option value="textarea">' . $lang->get('textarea') . '</option>'; |
|
223 | + echo '<option value="">-- '.$lang->get('select').' --</option> |
|
224 | + <option value="text">' . $lang->get('text').'</option> |
|
225 | + <option value="textarea">' . $lang->get('textarea').'</option>'; |
|
226 | 226 | ?> |
227 | 227 | </select> |
228 | 228 | </div> |
@@ -255,14 +255,14 @@ discard block |
||
255 | 255 | <select class="form-control form-item-control select2" multiple="multiple" style="width:100%;" id="form-field-roles"> |
256 | 256 | <?php |
257 | 257 | // Build list of Roles |
258 | - echo '<option value="all">' . $lang->get('every_roles') . '</option>'; |
|
258 | + echo '<option value="all">'.$lang->get('every_roles').'</option>'; |
|
259 | 259 | $rows = DB::query( |
260 | 260 | 'SELECT id, title |
261 | - FROM ' . prefixTable('roles_title') . ' |
|
261 | + FROM ' . prefixTable('roles_title').' |
|
262 | 262 | ORDER BY title ASC' |
263 | 263 | ); |
264 | 264 | foreach ($rows as $record) { |
265 | - echo '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>'; |
|
265 | + echo '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>'; |
|
266 | 266 | } |
267 | 267 | ?> |
268 | 268 | </select> |
@@ -71,7 +71,7 @@ |
||
71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === false) { |
72 | 72 | // Not allowed page |
73 | 73 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
74 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
74 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
75 | 75 | exit; |
76 | 76 | } |
77 | 77 | ?> |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ) { |
68 | 68 | // Not allowed page |
69 | 69 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
70 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
70 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
71 | 71 | exit; |
72 | 72 | } |
73 | 73 | |
@@ -538,8 +538,7 @@ discard block |
||
538 | 538 | $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
539 | 539 | $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
540 | 540 | $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
541 | - $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : |
|
542 | - filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
541 | + $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
543 | 542 | |
544 | 543 | if (empty($post_fieldId) === false) { |
545 | 544 | // UPDATE FIELD |
@@ -555,7 +554,7 @@ discard block |
||
555 | 554 | 'encrypted_data' => $post_encrypted, |
556 | 555 | 'is_mandatory' => $post_mandatory, |
557 | 556 | 'masked' => $post_masked, |
558 | - 'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles), |
|
557 | + 'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles), |
|
559 | 558 | 'order' => calculateOrder($post_fieldId, $post_order), |
560 | 559 | ), |
561 | 560 | 'id = %i', |
@@ -69,7 +69,7 @@ |
||
69 | 69 | ) { |
70 | 70 | // Not allowed page |
71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | ) { |
70 | 70 | // Not allowed page |
71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === false) { |
69 | 69 | // Not allowed page |
70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | ?> |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | // ERROR |
138 | 138 | toastr.remove(); |
139 | 139 | toastr.error( |
140 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
140 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
141 | 141 | '<?php echo $lang->get('error'); ?>', { |
142 | 142 | timeOut: 5000, |
143 | 143 | progressBar: true |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // error |
165 | 165 | toastr.remove(); |
166 | 166 | toastr.error( |
167 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
167 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
168 | 168 | '<?php echo $lang->get('error'); ?>', { |
169 | 169 | timeOut: 5000, |
170 | 170 | progressBar: true |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | // ERROR |
236 | 236 | toastr.remove(); |
237 | 237 | toastr.error( |
238 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
238 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
239 | 239 | '<?php echo $lang->get('error'); ?>', { |
240 | 240 | timeOut: 5000, |
241 | 241 | progressBar: true |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | // PREPARE UPLOADER with plupload |
272 | 272 | <?php |
273 | 273 | $maxFileSize = (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) |
274 | - ? $SETTINGS['upload_maxfilesize'] . 'mb' |
|
274 | + ? $SETTINGS['upload_maxfilesize'].'mb' |
|
275 | 275 | : $SETTINGS['upload_maxfilesize']; |
276 | 276 | ?> |
277 | 277 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === false) { |
67 | 67 | // Not allowed page |
68 | 68 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
70 | 70 | exit; |
71 | 71 | } |
72 | 72 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | echo $session->has('user-admin') && (int) $session->get('user-admin') && null !== $session->get('user-admin') && (int) $session->get('user-admin') === 1 ? '' : ' hidden'; |
204 | 204 | ?>"> |
205 | 205 | <div class="form-group"> |
206 | - <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge') . ' ' . $lang->get('date_range'); ?></h5> |
|
206 | + <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge').' '.$lang->get('date_range'); ?></h5> |
|
207 | 207 | <div class="input-group"> |
208 | 208 | <div class="input-group-prepend"> |
209 | 209 | <span class="input-group-text"> |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | <select class="form-control" id="purge-filter-user"> |
227 | 227 | <option value="-1"><?php echo $lang->get('all'); ?></option> |
228 | 228 | <?php |
229 | - $rows = DB::query('SELECT id, name, lastname FROM ' . prefixTable('users') . ' WHERE admin = 0'); |
|
229 | + $rows = DB::query('SELECT id, name, lastname FROM '.prefixTable('users').' WHERE admin = 0'); |
|
230 | 230 | foreach ($rows as $record) { |
231 | 231 | echo ' |
232 | 232 | <option value="'.$record['id'].'">'.$record['name'].' '.$record['lastname'].'</option>'; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | // Update table by deleting ID |
61 | 61 | if ($session->has('user-id') && null !== $session->get('user-id')) { |
62 | 62 | DB::update( |
63 | - DB_PREFIX . 'users', |
|
63 | + DB_PREFIX.'users', |
|
64 | 64 | [ |
65 | 65 | 'key_tempo' => '', |
66 | 66 | ], |
@@ -2225,7 +2225,7 @@ discard block |
||
2225 | 2225 | * <tt>exec("find ".$path." -type d -exec chmod 755 {} \;");</tt> |
2226 | 2226 | * |
2227 | 2227 | * @author Jeppe Toustrup (tenzer at tenzer dot dk) |
2228 | - * |
|
2228 | + * |
|
2229 | 2229 | * @param string $path An either relative or absolute path to a file or directory which should be processed. |
2230 | 2230 | * @param int $filePerm The permissions any found files should get. |
2231 | 2231 | * @param int $dirPerm The permissions any found folder should get. |
@@ -3848,7 +3848,6 @@ discard block |
||
3848 | 3848 | * @param integer $processId |
3849 | 3849 | * @param integer $nbItemsToTreat |
3850 | 3850 | * @return void |
3851 | - |
|
3852 | 3851 | */ |
3853 | 3852 | function createUserTasks($processId, $nbItemsToTreat): void |
3854 | 3853 | { |
@@ -2366,7 +2366,9 @@ discard block |
||
2366 | 2366 | function encryptUserObjectKey(string $key, string $publicKey): string |
2367 | 2367 | { |
2368 | 2368 | // Empty password |
2369 | - if (empty($key)) return ''; |
|
2369 | + if (empty($key)) { |
|
2370 | + return ''; |
|
2371 | + } |
|
2370 | 2372 | |
2371 | 2373 | // Sanitize |
2372 | 2374 | $antiXss = new AntiXSS(); |
@@ -2515,7 +2517,9 @@ discard block |
||
2515 | 2517 | ]; |
2516 | 2518 | } |
2517 | 2519 | |
2518 | - if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
2520 | + if (WIP) { |
|
2521 | + error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
2522 | + } |
|
2519 | 2523 | |
2520 | 2524 | // Decrypt file content and return |
2521 | 2525 | return base64_encode($cipher->decrypt($ciphertext)); |
@@ -2650,7 +2654,9 @@ discard block |
||
2650 | 2654 | foreach ($users as $user) { |
2651 | 2655 | // Insert in DB the new object key for this item by user |
2652 | 2656 | if (count($objectKeyArray) === 0) { |
2653 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2657 | + if (WIP === true) { |
|
2658 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2659 | + } |
|
2654 | 2660 | DB::insert( |
2655 | 2661 | $object_name, |
2656 | 2662 | [ |
@@ -2664,7 +2670,9 @@ discard block |
||
2664 | 2670 | ); |
2665 | 2671 | } else { |
2666 | 2672 | foreach ($objectKeyArray as $object) { |
2667 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2673 | + if (WIP === true) { |
|
2674 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2675 | + } |
|
2668 | 2676 | DB::insert( |
2669 | 2677 | $object_name, |
2670 | 2678 | [ |
@@ -3990,7 +3998,9 @@ discard block |
||
3990 | 3998 | $taskName = [$taskName]; |
3991 | 3999 | } |
3992 | 4000 | foreach($taskName as $task) { |
3993 | - if (WIP === true) error_log('createTaskForItem - task: '.$task); |
|
4001 | + if (WIP === true) { |
|
4002 | + error_log('createTaskForItem - task: '.$task); |
|
4003 | + } |
|
3994 | 4004 | switch ($task) { |
3995 | 4005 | case 'item_password': |
3996 | 4006 | |
@@ -4421,19 +4431,22 @@ discard block |
||
4421 | 4431 | |
4422 | 4432 | // Organisation name (removed username@ and .tld) |
4423 | 4433 | $domain = explode('.', $emailParts[1]); |
4424 | - if (count($domain) > 1) |
|
4425 | - $forbiddenWords[] = $domain[0]; |
|
4434 | + if (count($domain) > 1) { |
|
4435 | + $forbiddenWords[] = $domain[0]; |
|
4436 | + } |
|
4426 | 4437 | } |
4427 | 4438 | } |
4428 | 4439 | |
4429 | 4440 | // Search forbidden words in password |
4430 | 4441 | foreach ($forbiddenWords as $word) { |
4431 | - if (empty($word)) |
|
4432 | - continue; |
|
4442 | + if (empty($word)) { |
|
4443 | + continue; |
|
4444 | + } |
|
4433 | 4445 | |
4434 | 4446 | // Stop if forbidden word found in password |
4435 | - if (stripos($password, $word) !== false) |
|
4436 | - return false; |
|
4447 | + if (stripos($password, $word) !== false) { |
|
4448 | + return false; |
|
4449 | + } |
|
4437 | 4450 | } |
4438 | 4451 | |
4439 | 4452 | // Get password complexity |
@@ -129,19 +129,19 @@ discard block |
||
129 | 129 | $text = Crypto::decrypt($message, $key); |
130 | 130 | } |
131 | 131 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
132 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
132 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
133 | 133 | $err = 'wrong_key_or_modified_ciphertext'; |
134 | 134 | } catch (CryptoException\BadFormatException $ex) { |
135 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
135 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
136 | 136 | $err = 'bad_format'; |
137 | 137 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
138 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
138 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
139 | 139 | $err = 'environment_error'; |
140 | 140 | } catch (CryptoException\IOException $ex) { |
141 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
141 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
142 | 142 | $err = 'io_error'; |
143 | 143 | } catch (Exception $ex) { |
144 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
144 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
145 | 145 | $err = 'unexpected_error'; |
146 | 146 | } |
147 | 147 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | */ |
227 | 227 | function trimElement($chaine, string $element): string |
228 | 228 | { |
229 | - if (! empty($chaine)) { |
|
229 | + if (!empty($chaine)) { |
|
230 | 230 | if (is_array($chaine) === true) { |
231 | 231 | $chaine = implode(';', $chaine); |
232 | 232 | } |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | */ |
275 | 275 | function db_error_handler(array $params): void |
276 | 276 | { |
277 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
278 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
277 | + echo 'Error: '.$params['error']."<br>\n"; |
|
278 | + echo 'Query: '.$params['query']."<br>\n"; |
|
279 | 279 | throw new Exception('Error - Query', 1); |
280 | 280 | } |
281 | 281 | |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $session->set('user-forbiden_personal_folders', []); |
354 | 354 | |
355 | 355 | // Get list of Folders |
356 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
356 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
357 | 357 | foreach ($rows as $record) { |
358 | 358 | array_push($groupesVisibles, $record['id']); |
359 | 359 | } |
@@ -363,20 +363,20 @@ discard block |
||
363 | 363 | // get complete list of ROLES |
364 | 364 | $tmp = explode(';', $idFonctions); |
365 | 365 | $rows = DB::query( |
366 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
366 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
367 | 367 | ORDER BY title ASC' |
368 | 368 | ); |
369 | 369 | foreach ($rows as $record) { |
370 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
370 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
371 | 371 | array_push($tmp, $record['id']); |
372 | 372 | } |
373 | 373 | } |
374 | 374 | $session->set('user-roles', implode(';', $tmp)); |
375 | 375 | $session->set('user-admin', 1); |
376 | 376 | // Check if admin has created Folders and Roles |
377 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
377 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
378 | 378 | $session->set('user-nb_folders', DB::count()); |
379 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
379 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
380 | 380 | $session->set('user-nb_roles', DB::count()); |
381 | 381 | |
382 | 382 | return true; |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | // Does this user is allowed to see other items |
460 | 460 | $inc = 0; |
461 | 461 | $rows = DB::query( |
462 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
462 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
463 | 463 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
464 | 464 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
465 | 465 | $globalsUserId, |
@@ -476,8 +476,8 @@ discard block |
||
476 | 476 | // Check for the users roles if some specific rights exist on items |
477 | 477 | $rows = DB::query( |
478 | 478 | 'SELECT i.id_tree, r.item_id |
479 | - FROM ' . prefixTable('items') . ' as i |
|
480 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
479 | + FROM ' . prefixTable('items').' as i |
|
480 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
481 | 481 | WHERE i.id_tree <> "" '. |
482 | 482 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
483 | 483 | 'ORDER BY i.id_tree ASC', |
@@ -531,18 +531,18 @@ discard block |
||
531 | 531 | ), SORT_NUMERIC) |
532 | 532 | ); |
533 | 533 | // Folders and Roles numbers |
534 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
535 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
534 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
535 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
536 | 536 | $session->set('user-nb_folders', DB::count()); |
537 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
538 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
537 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
538 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
539 | 539 | $session->set('user-nb_roles', DB::count()); |
540 | 540 | // check if change proposals on User's items |
541 | 541 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
542 | 542 | $countNewItems = DB::query( |
543 | 543 | 'SELECT COUNT(*) |
544 | - FROM ' . prefixTable('items_change') . ' AS c |
|
545 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
544 | + FROM ' . prefixTable('items_change').' AS c |
|
545 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
546 | 546 | WHERE i.action = %s AND i.id_user = %i', |
547 | 547 | 'at_creation', |
548 | 548 | $globalsUserId |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | { |
570 | 570 | $rows = DB::query( |
571 | 571 | 'SELECT * |
572 | - FROM ' . prefixTable('roles_values') . ' |
|
572 | + FROM ' . prefixTable('roles_values').' |
|
573 | 573 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
574 | 574 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
575 | 575 | $userRoles, |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | ) { |
637 | 637 | $persoFld = DB::queryFirstRow( |
638 | 638 | 'SELECT id |
639 | - FROM ' . prefixTable('nested_tree') . ' |
|
639 | + FROM ' . prefixTable('nested_tree').' |
|
640 | 640 | WHERE title = %s AND personal_folder = %i'. |
641 | 641 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
642 | 642 | $globalsUserId, |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | } |
670 | 670 | $persoFlds = DB::query( |
671 | 671 | 'SELECT id |
672 | - FROM ' . prefixTable('nested_tree') . ' |
|
672 | + FROM ' . prefixTable('nested_tree').' |
|
673 | 673 | WHERE %l', |
674 | 674 | $where |
675 | 675 | ); |
@@ -737,12 +737,12 @@ discard block |
||
737 | 737 | //Load Tree |
738 | 738 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
739 | 739 | // truncate table |
740 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
740 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
741 | 741 | // reload date |
742 | 742 | $rows = DB::query( |
743 | 743 | 'SELECT * |
744 | - FROM ' . prefixTable('items') . ' as i |
|
745 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
744 | + FROM ' . prefixTable('items').' as i |
|
745 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
746 | 746 | AND l.action = %s |
747 | 747 | AND i.inactif = %i', |
748 | 748 | 'at_creation', |
@@ -754,18 +754,18 @@ discard block |
||
754 | 754 | $tags = ''; |
755 | 755 | $itemTags = DB::query( |
756 | 756 | 'SELECT tag |
757 | - FROM ' . prefixTable('tags') . ' |
|
757 | + FROM ' . prefixTable('tags').' |
|
758 | 758 | WHERE item_id = %i AND tag != ""', |
759 | 759 | $record['id'] |
760 | 760 | ); |
761 | 761 | foreach ($itemTags as $itemTag) { |
762 | - $tags .= $itemTag['tag'] . ' '; |
|
762 | + $tags .= $itemTag['tag'].' '; |
|
763 | 763 | } |
764 | 764 | |
765 | 765 | // Get renewal period |
766 | 766 | $resNT = DB::queryFirstRow( |
767 | 767 | 'SELECT renewal_period |
768 | - FROM ' . prefixTable('nested_tree') . ' |
|
768 | + FROM ' . prefixTable('nested_tree').' |
|
769 | 769 | WHERE id = %i', |
770 | 770 | $record['id_tree'] |
771 | 771 | ); |
@@ -778,7 +778,7 @@ discard block |
||
778 | 778 | // Is this a User id? |
779 | 779 | $user = DB::queryFirstRow( |
780 | 780 | 'SELECT id, login |
781 | - FROM ' . prefixTable('users') . ' |
|
781 | + FROM ' . prefixTable('users').' |
|
782 | 782 | WHERE id = %i', |
783 | 783 | $elem->title |
784 | 784 | ); |
@@ -796,11 +796,11 @@ discard block |
||
796 | 796 | 'id' => $record['id'], |
797 | 797 | 'label' => $record['label'], |
798 | 798 | 'description' => $record['description'] ?? '', |
799 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
799 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
800 | 800 | 'tags' => $tags, |
801 | 801 | 'id_tree' => $record['id_tree'], |
802 | 802 | 'perso' => $record['perso'], |
803 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
803 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
804 | 804 | 'login' => $record['login'] ?? '', |
805 | 805 | 'folder' => implode(' » ', $folder), |
806 | 806 | 'author' => $record['id_user'], |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | // get new value from db |
830 | 830 | $data = DB::queryFirstRow( |
831 | 831 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
832 | - FROM ' . prefixTable('items') . ' |
|
832 | + FROM ' . prefixTable('items').' |
|
833 | 833 | WHERE id=%i', |
834 | 834 | $ident |
835 | 835 | ); |
@@ -837,12 +837,12 @@ discard block |
||
837 | 837 | $tags = ''; |
838 | 838 | $itemTags = DB::query( |
839 | 839 | 'SELECT tag |
840 | - FROM ' . prefixTable('tags') . ' |
|
840 | + FROM ' . prefixTable('tags').' |
|
841 | 841 | WHERE item_id = %i AND tag != ""', |
842 | 842 | $ident |
843 | 843 | ); |
844 | 844 | foreach ($itemTags as $itemTag) { |
845 | - $tags .= $itemTag['tag'] . ' '; |
|
845 | + $tags .= $itemTag['tag'].' '; |
|
846 | 846 | } |
847 | 847 | // form id_tree to full foldername |
848 | 848 | $folder = []; |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | // Is this a User id? |
854 | 854 | $user = DB::queryFirstRow( |
855 | 855 | 'SELECT id, login |
856 | - FROM ' . prefixTable('users') . ' |
|
856 | + FROM ' . prefixTable('users').' |
|
857 | 857 | WHERE id = %i', |
858 | 858 | $elem->title |
859 | 859 | ); |
@@ -871,10 +871,10 @@ discard block |
||
871 | 871 | 'label' => $data['label'], |
872 | 872 | 'description' => $data['description'], |
873 | 873 | 'tags' => $tags, |
874 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
874 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
875 | 875 | 'id_tree' => $data['id_tree'], |
876 | 876 | 'perso' => $data['perso'], |
877 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
877 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
878 | 878 | 'login' => $data['login'] ?? '', |
879 | 879 | 'folder' => implode(' » ', $folder), |
880 | 880 | 'author' => $session->get('user-id'), |
@@ -904,8 +904,8 @@ discard block |
||
904 | 904 | // get new value from db |
905 | 905 | $data = DB::queryFirstRow( |
906 | 906 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
907 | - FROM ' . prefixTable('items') . ' as i |
|
908 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
907 | + FROM ' . prefixTable('items').' as i |
|
908 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
909 | 909 | WHERE i.id = %i |
910 | 910 | AND l.action = %s', |
911 | 911 | $ident, |
@@ -915,12 +915,12 @@ discard block |
||
915 | 915 | $tags = ''; |
916 | 916 | $itemTags = DB::query( |
917 | 917 | 'SELECT tag |
918 | - FROM ' . prefixTable('tags') . ' |
|
918 | + FROM ' . prefixTable('tags').' |
|
919 | 919 | WHERE item_id = %i AND tag != ""', |
920 | 920 | $ident |
921 | 921 | ); |
922 | 922 | foreach ($itemTags as $itemTag) { |
923 | - $tags .= $itemTag['tag'] . ' '; |
|
923 | + $tags .= $itemTag['tag'].' '; |
|
924 | 924 | } |
925 | 925 | // form id_tree to full foldername |
926 | 926 | $folder = []; |
@@ -931,7 +931,7 @@ discard block |
||
931 | 931 | // Is this a User id? |
932 | 932 | $user = DB::queryFirstRow( |
933 | 933 | 'SELECT id, login |
934 | - FROM ' . prefixTable('users') . ' |
|
934 | + FROM ' . prefixTable('users').' |
|
935 | 935 | WHERE id = %i', |
936 | 936 | $elem->title |
937 | 937 | ); |
@@ -950,7 +950,7 @@ discard block |
||
950 | 950 | 'label' => $data['label'], |
951 | 951 | 'description' => $data['description'], |
952 | 952 | 'tags' => empty($tags) === false ? $tags : 'None', |
953 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
953 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
954 | 954 | 'id_tree' => $data['id_tree'], |
955 | 955 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
956 | 956 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -972,53 +972,53 @@ discard block |
||
972 | 972 | function getStatisticsData(array $SETTINGS): array |
973 | 973 | { |
974 | 974 | DB::query( |
975 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
975 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
976 | 976 | 0 |
977 | 977 | ); |
978 | 978 | $counter_folders = DB::count(); |
979 | 979 | DB::query( |
980 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
980 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
981 | 981 | 1 |
982 | 982 | ); |
983 | 983 | $counter_folders_perso = DB::count(); |
984 | 984 | DB::query( |
985 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
985 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
986 | 986 | 0 |
987 | 987 | ); |
988 | 988 | $counter_items = DB::count(); |
989 | 989 | DB::query( |
990 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
990 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
991 | 991 | 1 |
992 | 992 | ); |
993 | 993 | $counter_items_perso = DB::count(); |
994 | 994 | DB::query( |
995 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
995 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
996 | 996 | 'OTV', 'TP', 'API' |
997 | 997 | ); |
998 | 998 | $counter_users = DB::count(); |
999 | 999 | DB::query( |
1000 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
1000 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
1001 | 1001 | 1 |
1002 | 1002 | ); |
1003 | 1003 | $admins = DB::count(); |
1004 | 1004 | DB::query( |
1005 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
1005 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
1006 | 1006 | 1 |
1007 | 1007 | ); |
1008 | 1008 | $managers = DB::count(); |
1009 | 1009 | DB::query( |
1010 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
1010 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
1011 | 1011 | 1 |
1012 | 1012 | ); |
1013 | 1013 | $readOnly = DB::count(); |
1014 | 1014 | // list the languages |
1015 | 1015 | $usedLang = []; |
1016 | 1016 | $tp_languages = DB::query( |
1017 | - 'SELECT name FROM ' . prefixTable('languages') |
|
1017 | + 'SELECT name FROM '.prefixTable('languages') |
|
1018 | 1018 | ); |
1019 | 1019 | foreach ($tp_languages as $tp_language) { |
1020 | 1020 | DB::query( |
1021 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
1021 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
1022 | 1022 | $tp_language['name'] |
1023 | 1023 | ); |
1024 | 1024 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1027,12 +1027,12 @@ discard block |
||
1027 | 1027 | // get list of ips |
1028 | 1028 | $usedIp = []; |
1029 | 1029 | $tp_ips = DB::query( |
1030 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
1030 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
1031 | 1031 | ); |
1032 | 1032 | foreach ($tp_ips as $ip) { |
1033 | 1033 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
1034 | 1034 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
1035 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1035 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1036 | 1036 | $usedIp[$ip['user_ip']] = 1; |
1037 | 1037 | } |
1038 | 1038 | } |
@@ -1127,7 +1127,7 @@ discard block |
||
1127 | 1127 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
1128 | 1128 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
1129 | 1129 | <br><div style="float:right;">' . |
1130 | - $textMail . |
|
1130 | + $textMail. |
|
1131 | 1131 | '<br><br></td></tr></table> |
1132 | 1132 | </td></tr></table> |
1133 | 1133 | <br></body></html>'; |
@@ -1208,7 +1208,7 @@ discard block |
||
1208 | 1208 | { |
1209 | 1209 | array_walk_recursive( |
1210 | 1210 | $array, |
1211 | - static function (&$item): void { |
|
1211 | + static function(&$item): void { |
|
1212 | 1212 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
1213 | 1213 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
1214 | 1214 | } |
@@ -1319,7 +1319,7 @@ discard block |
||
1319 | 1319 | */ |
1320 | 1320 | function prefixTable(string $table): string |
1321 | 1321 | { |
1322 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
1322 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
1323 | 1323 | return $safeTable; |
1324 | 1324 | } |
1325 | 1325 | |
@@ -1436,7 +1436,7 @@ discard block |
||
1436 | 1436 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
1437 | 1437 | { |
1438 | 1438 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
1439 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
1439 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
1440 | 1440 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
1441 | 1441 | socket_close($sock); |
1442 | 1442 | } |
@@ -1483,14 +1483,14 @@ discard block |
||
1483 | 1483 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
1484 | 1484 | if ($type === 'user_mngt') { |
1485 | 1485 | send_syslog( |
1486 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
1486 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
1487 | 1487 | $SETTINGS['syslog_host'], |
1488 | 1488 | $SETTINGS['syslog_port'], |
1489 | 1489 | 'teampass' |
1490 | 1490 | ); |
1491 | 1491 | } else { |
1492 | 1492 | send_syslog( |
1493 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
1493 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
1494 | 1494 | $SETTINGS['syslog_host'], |
1495 | 1495 | $SETTINGS['syslog_port'], |
1496 | 1496 | 'teampass' |
@@ -1565,7 +1565,7 @@ discard block |
||
1565 | 1565 | if (empty($item_label) === true) { |
1566 | 1566 | $dataItem = DB::queryFirstRow( |
1567 | 1567 | 'SELECT id, id_tree, label |
1568 | - FROM ' . prefixTable('items') . ' |
|
1568 | + FROM ' . prefixTable('items').' |
|
1569 | 1569 | WHERE id = %i', |
1570 | 1570 | $item_id |
1571 | 1571 | ); |
@@ -1573,11 +1573,11 @@ discard block |
||
1573 | 1573 | } |
1574 | 1574 | |
1575 | 1575 | send_syslog( |
1576 | - 'action=' . str_replace('at_', '', $action) . |
|
1577 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
1578 | - ' itemno=' . $item_id . |
|
1579 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
1580 | - ' itemname="' . addslashes($item_label) . '"', |
|
1576 | + 'action='.str_replace('at_', '', $action). |
|
1577 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
1578 | + ' itemno='.$item_id. |
|
1579 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
1580 | + ' itemname="'.addslashes($item_label).'"', |
|
1581 | 1581 | $SETTINGS['syslog_host'], |
1582 | 1582 | $SETTINGS['syslog_port'], |
1583 | 1583 | 'teampass' |
@@ -1608,8 +1608,8 @@ discard block |
||
1608 | 1608 | // send email to user that what to be notified |
1609 | 1609 | $notification = DB::queryFirstField( |
1610 | 1610 | 'SELECT email |
1611 | - FROM ' . prefixTable('notification') . ' AS n |
|
1612 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
1611 | + FROM ' . prefixTable('notification').' AS n |
|
1612 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
1613 | 1613 | WHERE n.item_id = %i AND n.user_id != %i', |
1614 | 1614 | $item_id, |
1615 | 1615 | $globalsUserId |
@@ -1620,7 +1620,7 @@ discard block |
||
1620 | 1620 | // Get list of changes |
1621 | 1621 | $htmlChanges = '<ul>'; |
1622 | 1622 | foreach ($changes as $change) { |
1623 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
1623 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
1624 | 1624 | } |
1625 | 1625 | $htmlChanges .= '</ul>'; |
1626 | 1626 | // send email |
@@ -1657,15 +1657,15 @@ discard block |
||
1657 | 1657 | $path = ''; |
1658 | 1658 | foreach ($arbo as $elem) { |
1659 | 1659 | if (empty($path) === true) { |
1660 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
1660 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
1661 | 1661 | } else { |
1662 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1662 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1663 | 1663 | } |
1664 | 1664 | } |
1665 | 1665 | |
1666 | 1666 | // Build text to show user |
1667 | 1667 | if (empty($label) === false) { |
1668 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
1668 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
1669 | 1669 | } |
1670 | 1670 | return empty($path) === true ? '' : $path; |
1671 | 1671 | } |
@@ -1721,7 +1721,7 @@ discard block |
||
1721 | 1721 | { |
1722 | 1722 | // Perform a copy if the file exists |
1723 | 1723 | if (file_exists($configFilePath)) { |
1724 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
1724 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
1725 | 1725 | if (!copy($configFilePath, $backupFilePath)) { |
1726 | 1726 | return "ERROR: Could not copy file '$configFilePath'"; |
1727 | 1727 | } |
@@ -1729,10 +1729,10 @@ discard block |
||
1729 | 1729 | |
1730 | 1730 | // Regenerate the config file |
1731 | 1731 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
1732 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
1732 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
1733 | 1733 | foreach ($rows as $record) { |
1734 | 1734 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
1735 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
1735 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
1736 | 1736 | } |
1737 | 1737 | $data[] = ");\n"; |
1738 | 1738 | $data = array_unique($data); |
@@ -1777,7 +1777,7 @@ discard block |
||
1777 | 1777 | { |
1778 | 1778 | global $SETTINGS; |
1779 | 1779 | /* LOAD CPASSMAN SETTINGS */ |
1780 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1780 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1781 | 1781 | $SETTINGS = []; |
1782 | 1782 | $SETTINGS['duplicate_folder'] = 0; |
1783 | 1783 | //by default, this is set to 0; |
@@ -1787,7 +1787,7 @@ discard block |
||
1787 | 1787 | //by default, this value is set to 5; |
1788 | 1788 | $settings = []; |
1789 | 1789 | $rows = DB::query( |
1790 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
1790 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
1791 | 1791 | [ |
1792 | 1792 | 'type' => 'admin', |
1793 | 1793 | 'type2' => 'settings', |
@@ -1819,7 +1819,7 @@ discard block |
||
1819 | 1819 | $source_cf = []; |
1820 | 1820 | $rows = DB::query( |
1821 | 1821 | 'SELECT id_category |
1822 | - FROM ' . prefixTable('categories_folders') . ' |
|
1822 | + FROM ' . prefixTable('categories_folders').' |
|
1823 | 1823 | WHERE id_folder = %i', |
1824 | 1824 | $source_id |
1825 | 1825 | ); |
@@ -1830,7 +1830,7 @@ discard block |
||
1830 | 1830 | $target_cf = []; |
1831 | 1831 | $rows = DB::query( |
1832 | 1832 | 'SELECT id_category |
1833 | - FROM ' . prefixTable('categories_folders') . ' |
|
1833 | + FROM ' . prefixTable('categories_folders').' |
|
1834 | 1834 | WHERE id_folder = %i', |
1835 | 1835 | $target_id |
1836 | 1836 | ); |
@@ -1925,10 +1925,10 @@ discard block |
||
1925 | 1925 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1926 | 1926 | $err = 'wrong_key'; |
1927 | 1927 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1928 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1928 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1929 | 1929 | $err = 'environment_error'; |
1930 | 1930 | } catch (CryptoException\IOException $ex) { |
1931 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1931 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1932 | 1932 | $err = 'general_error'; |
1933 | 1933 | } |
1934 | 1934 | |
@@ -1961,10 +1961,10 @@ discard block |
||
1961 | 1961 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1962 | 1962 | $err = 'wrong_key'; |
1963 | 1963 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1964 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1964 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1965 | 1965 | $err = 'environment_error'; |
1966 | 1966 | } catch (CryptoException\IOException $ex) { |
1967 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1967 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1968 | 1968 | $err = 'general_error'; |
1969 | 1969 | } |
1970 | 1970 | |
@@ -2050,7 +2050,7 @@ discard block |
||
2050 | 2050 | ) { |
2051 | 2051 | // Check if the path exists |
2052 | 2052 | $path = basename($path); |
2053 | - if (! file_exists($path)) { |
|
2053 | + if (!file_exists($path)) { |
|
2054 | 2054 | return false; |
2055 | 2055 | } |
2056 | 2056 | |
@@ -2103,7 +2103,7 @@ discard block |
||
2103 | 2103 | // Load item data |
2104 | 2104 | $data = DB::queryFirstRow( |
2105 | 2105 | 'SELECT id_tree |
2106 | - FROM ' . prefixTable('items') . ' |
|
2106 | + FROM ' . prefixTable('items').' |
|
2107 | 2107 | WHERE id = %i', |
2108 | 2108 | $item_id |
2109 | 2109 | ); |
@@ -2166,7 +2166,7 @@ discard block |
||
2166 | 2166 | } |
2167 | 2167 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
2168 | 2168 | } |
2169 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
2169 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
2170 | 2170 | return $email; |
2171 | 2171 | } |
2172 | 2172 | |
@@ -2197,11 +2197,11 @@ discard block |
||
2197 | 2197 | function formatSizeUnits(int $bytes): string |
2198 | 2198 | { |
2199 | 2199 | if ($bytes >= 1073741824) { |
2200 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
2200 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
2201 | 2201 | } elseif ($bytes >= 1048576) { |
2202 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
2202 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
2203 | 2203 | } elseif ($bytes >= 1024) { |
2204 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
2204 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
2205 | 2205 | } elseif ($bytes > 1) { |
2206 | 2206 | $bytes .= ' bytes'; |
2207 | 2207 | } elseif ($bytes === 1) { |
@@ -2450,7 +2450,7 @@ discard block |
||
2450 | 2450 | $cipher->enableContinuousBuffer(); |
2451 | 2451 | |
2452 | 2452 | // Encrypt the file content |
2453 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
2453 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
2454 | 2454 | $fileContent = file_get_contents($filePath); |
2455 | 2455 | $plaintext = $fileContent; |
2456 | 2456 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2458,9 +2458,9 @@ discard block |
||
2458 | 2458 | // Save new file |
2459 | 2459 | // deepcode ignore InsecureHash: is simply used to get a unique name |
2460 | 2460 | $hash = uniqid('', true); |
2461 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
2461 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
2462 | 2462 | file_put_contents($fileOut, $ciphertext); |
2463 | - unlink($fileInPath . '/' . $fileInName); |
|
2463 | + unlink($fileInPath.'/'.$fileInName); |
|
2464 | 2464 | return [ |
2465 | 2465 | 'fileHash' => base64_encode($hash), |
2466 | 2466 | 'objectKey' => base64_encode($objectKey), |
@@ -2476,9 +2476,9 @@ discard block |
||
2476 | 2476 | * |
2477 | 2477 | * @return string|array |
2478 | 2478 | */ |
2479 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
2479 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
2480 | 2480 | { |
2481 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
2481 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
2482 | 2482 | define('FILE_BUFFER_SIZE', 128 * 1024); |
2483 | 2483 | } |
2484 | 2484 | |
@@ -2495,7 +2495,7 @@ discard block |
||
2495 | 2495 | $cipher->enableContinuousBuffer(); |
2496 | 2496 | $cipher->disablePadding(); |
2497 | 2497 | // Get file content |
2498 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
2498 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
2499 | 2499 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
2500 | 2500 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
2501 | 2501 | } else { |
@@ -2591,7 +2591,7 @@ discard block |
||
2591 | 2591 | // Only create the sharekey for a user |
2592 | 2592 | $user = DB::queryFirstRow( |
2593 | 2593 | 'SELECT public_key |
2594 | - FROM ' . prefixTable('users') . ' |
|
2594 | + FROM ' . prefixTable('users').' |
|
2595 | 2595 | WHERE id = %i |
2596 | 2596 | AND public_key != ""', |
2597 | 2597 | $userId |
@@ -2632,7 +2632,7 @@ discard block |
||
2632 | 2632 | } |
2633 | 2633 | $users = DB::query( |
2634 | 2634 | 'SELECT id, public_key |
2635 | - FROM ' . prefixTable('users') . ' |
|
2635 | + FROM ' . prefixTable('users').' |
|
2636 | 2636 | WHERE id NOT IN %li |
2637 | 2637 | AND public_key != ""', |
2638 | 2638 | $user_ids |
@@ -2641,7 +2641,7 @@ discard block |
||
2641 | 2641 | foreach ($users as $user) { |
2642 | 2642 | // Insert in DB the new object key for this item by user |
2643 | 2643 | if (count($objectKeyArray) === 0) { |
2644 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2644 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
2645 | 2645 | DB::insert( |
2646 | 2646 | $object_name, |
2647 | 2647 | [ |
@@ -2655,7 +2655,7 @@ discard block |
||
2655 | 2655 | ); |
2656 | 2656 | } else { |
2657 | 2657 | foreach ($objectKeyArray as $object) { |
2658 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2658 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
2659 | 2659 | DB::insert( |
2660 | 2660 | $object_name, |
2661 | 2661 | [ |
@@ -2683,7 +2683,7 @@ discard block |
||
2683 | 2683 | function isBase64(string $str): bool |
2684 | 2684 | { |
2685 | 2685 | $str = (string) trim($str); |
2686 | - if (! isset($str[0])) { |
|
2686 | + if (!isset($str[0])) { |
|
2687 | 2687 | return false; |
2688 | 2688 | } |
2689 | 2689 | |
@@ -2757,7 +2757,7 @@ discard block |
||
2757 | 2757 | } catch (\LdapRecord\Auth\BindException $e) { |
2758 | 2758 | $error = $e->getDetailedError(); |
2759 | 2759 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2760 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2760 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2761 | 2761 | } |
2762 | 2762 | // deepcode ignore ServerLeak: No important data is sent |
2763 | 2763 | echo 'An error occurred.'; |
@@ -2774,7 +2774,7 @@ discard block |
||
2774 | 2774 | } catch (\LdapRecord\Auth\BindException $e) { |
2775 | 2775 | $error = $e->getDetailedError(); |
2776 | 2776 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2777 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2777 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2778 | 2778 | } |
2779 | 2779 | // deepcode ignore ServerLeak: No important data is sent |
2780 | 2780 | echo 'An error occurred.'; |
@@ -2801,7 +2801,7 @@ discard block |
||
2801 | 2801 | // expect if personal item |
2802 | 2802 | DB::delete( |
2803 | 2803 | prefixTable('sharekeys_items'), |
2804 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2804 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2805 | 2805 | $userId |
2806 | 2806 | ); |
2807 | 2807 | // Remove all item sharekeys files |
@@ -2809,8 +2809,8 @@ discard block |
||
2809 | 2809 | prefixTable('sharekeys_files'), |
2810 | 2810 | 'user_id = %i AND object_id NOT IN ( |
2811 | 2811 | SELECT f.id |
2812 | - FROM ' . prefixTable('items') . ' AS i |
|
2813 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
2812 | + FROM ' . prefixTable('items').' AS i |
|
2813 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
2814 | 2814 | WHERE i.perso = 1 |
2815 | 2815 | )', |
2816 | 2816 | $userId |
@@ -2820,8 +2820,8 @@ discard block |
||
2820 | 2820 | prefixTable('sharekeys_fields'), |
2821 | 2821 | 'user_id = %i AND object_id NOT IN ( |
2822 | 2822 | SELECT c.id |
2823 | - FROM ' . prefixTable('items') . ' AS i |
|
2824 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
2823 | + FROM ' . prefixTable('items').' AS i |
|
2824 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
2825 | 2825 | WHERE i.perso = 1 |
2826 | 2826 | )', |
2827 | 2827 | $userId |
@@ -2829,13 +2829,13 @@ discard block |
||
2829 | 2829 | // Remove all item sharekeys logs |
2830 | 2830 | DB::delete( |
2831 | 2831 | prefixTable('sharekeys_logs'), |
2832 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2832 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2833 | 2833 | $userId |
2834 | 2834 | ); |
2835 | 2835 | // Remove all item sharekeys suggestions |
2836 | 2836 | DB::delete( |
2837 | 2837 | prefixTable('sharekeys_suggestions'), |
2838 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2838 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2839 | 2839 | $userId |
2840 | 2840 | ); |
2841 | 2841 | return false; |
@@ -2856,7 +2856,7 @@ discard block |
||
2856 | 2856 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
2857 | 2857 | $now->setTimezone(new DateTimeZone($timezone)); |
2858 | 2858 | $offsets[] = $offset = $now->getOffset(); |
2859 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
2859 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
2860 | 2860 | } |
2861 | 2861 | |
2862 | 2862 | array_multisort($offsets, $timezones); |
@@ -2876,7 +2876,7 @@ discard block |
||
2876 | 2876 | { |
2877 | 2877 | $hours = intval($offset / 3600); |
2878 | 2878 | $minutes = abs(intval($offset % 3600 / 60)); |
2879 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2879 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2880 | 2880 | } |
2881 | 2881 | |
2882 | 2882 | /** |
@@ -2975,8 +2975,7 @@ discard block |
||
2975 | 2975 | { |
2976 | 2976 | if (isset($array[$key]) === true |
2977 | 2977 | && (is_int($value) === true ? |
2978 | - (int) $array[$key] === $value : |
|
2979 | - (string) $array[$key] === $value) |
|
2978 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
2980 | 2979 | ) { |
2981 | 2980 | return true; |
2982 | 2981 | } |
@@ -2998,8 +2997,7 @@ discard block |
||
2998 | 2997 | { |
2999 | 2998 | if (isset($var) === false |
3000 | 2999 | || (is_int($value) === true ? |
3001 | - (int) $var === $value : |
|
3002 | - (string) $var === $value) |
|
3000 | + (int) $var === $value : (string) $var === $value) |
|
3003 | 3001 | ) { |
3004 | 3002 | return true; |
3005 | 3003 | } |
@@ -3050,7 +3048,7 @@ discard block |
||
3050 | 3048 | */ |
3051 | 3049 | function isSetArrayOfValues(array $arrayOfValues): bool |
3052 | 3050 | { |
3053 | - foreach($arrayOfValues as $value) { |
|
3051 | + foreach ($arrayOfValues as $value) { |
|
3054 | 3052 | if (isset($value) === false) { |
3055 | 3053 | return false; |
3056 | 3054 | } |
@@ -3072,7 +3070,7 @@ discard block |
||
3072 | 3070 | /*PHP8 - integer|string*/$value |
3073 | 3071 | ) : bool |
3074 | 3072 | { |
3075 | - foreach($arrayOfVars as $variable) { |
|
3073 | + foreach ($arrayOfVars as $variable) { |
|
3076 | 3074 | if ($variable !== $value) { |
3077 | 3075 | return false; |
3078 | 3076 | } |
@@ -3092,7 +3090,7 @@ discard block |
||
3092 | 3090 | /*PHP8 - integer|string*/$value |
3093 | 3091 | ) : bool |
3094 | 3092 | { |
3095 | - foreach($arrayOfVars as $variable) { |
|
3093 | + foreach ($arrayOfVars as $variable) { |
|
3096 | 3094 | if ($variable === $value) { |
3097 | 3095 | return true; |
3098 | 3096 | } |
@@ -3106,7 +3104,7 @@ discard block |
||
3106 | 3104 | * @param string|int|null $value |
3107 | 3105 | * @return boolean |
3108 | 3106 | */ |
3109 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
3107 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
3110 | 3108 | { |
3111 | 3109 | if (is_null($value) === true || empty($value) === true) { |
3112 | 3110 | return true; |
@@ -3161,7 +3159,7 @@ discard block |
||
3161 | 3159 | * @param array $filters |
3162 | 3160 | * @return array|string |
3163 | 3161 | */ |
3164 | -function dataSanitizer(array $data, array $filters): array|string |
|
3162 | +function dataSanitizer(array $data, array $filters): array | string |
|
3165 | 3163 | { |
3166 | 3164 | // Load Sanitizer library |
3167 | 3165 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3190,7 +3188,7 @@ discard block |
||
3190 | 3188 | // Exists ? |
3191 | 3189 | $userCacheId = DB::queryFirstRow( |
3192 | 3190 | 'SELECT increment_id |
3193 | - FROM ' . prefixTable('cache_tree') . ' |
|
3191 | + FROM ' . prefixTable('cache_tree').' |
|
3194 | 3192 | WHERE user_id = %i', |
3195 | 3193 | $user_id |
3196 | 3194 | ); |
@@ -3241,7 +3239,7 @@ discard block |
||
3241 | 3239 | */ |
3242 | 3240 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
3243 | 3241 | { |
3244 | - $resultat = ($nombre/$total) * $pourcentage; |
|
3242 | + $resultat = ($nombre / $total) * $pourcentage; |
|
3245 | 3243 | return round($resultat); |
3246 | 3244 | } |
3247 | 3245 | |
@@ -3271,7 +3269,7 @@ discard block |
||
3271 | 3269 | |
3272 | 3270 | // Get last folder update |
3273 | 3271 | $lastFolderChange = DB::queryFirstRow( |
3274 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
3272 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
3275 | 3273 | WHERE type = %s AND intitule = %s', |
3276 | 3274 | 'timestamp', |
3277 | 3275 | 'last_folder_change' |
@@ -3302,7 +3300,7 @@ discard block |
||
3302 | 3300 | // Does this user has a tree cache |
3303 | 3301 | $userCacheTree = DB::queryFirstRow( |
3304 | 3302 | 'SELECT '.$fieldName.' |
3305 | - FROM ' . prefixTable('cache_tree') . ' |
|
3303 | + FROM ' . prefixTable('cache_tree').' |
|
3306 | 3304 | WHERE user_id = %i', |
3307 | 3305 | $session->get('user-id') |
3308 | 3306 | ); |
@@ -3345,7 +3343,7 @@ discard block |
||
3345 | 3343 | if (count($folderIds) === 0) { |
3346 | 3344 | $folderIds = DB::queryFirstColumn( |
3347 | 3345 | 'SELECT id |
3348 | - FROM ' . prefixTable('nested_tree') . ' |
|
3346 | + FROM ' . prefixTable('nested_tree').' |
|
3349 | 3347 | WHERE personal_folder=%i', |
3350 | 3348 | 0 |
3351 | 3349 | ); |
@@ -3362,8 +3360,8 @@ discard block |
||
3362 | 3360 | $rows_tmp = DB::query( |
3363 | 3361 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
3364 | 3362 | f.id_category AS category_id |
3365 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
3366 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
3363 | + FROM ' . prefixTable('categories_folders').' AS f |
|
3364 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
3367 | 3365 | WHERE id_folder=%i', |
3368 | 3366 | $folder |
3369 | 3367 | ); |
@@ -3389,7 +3387,7 @@ discard block |
||
3389 | 3387 | $valTemp = ''; |
3390 | 3388 | $data = DB::queryFirstRow( |
3391 | 3389 | 'SELECT valeur |
3392 | - FROM ' . prefixTable('misc') . ' |
|
3390 | + FROM ' . prefixTable('misc').' |
|
3393 | 3391 | WHERE type = %s AND intitule=%i', |
3394 | 3392 | 'complex', |
3395 | 3393 | $folder |
@@ -3406,14 +3404,14 @@ discard block |
||
3406 | 3404 | $valTemp = ''; |
3407 | 3405 | $rows_tmp = DB::query( |
3408 | 3406 | 'SELECT t.title |
3409 | - FROM ' . prefixTable('roles_values') . ' as v |
|
3410 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
3407 | + FROM ' . prefixTable('roles_values').' as v |
|
3408 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
3411 | 3409 | WHERE v.folder_id = %i |
3412 | 3410 | GROUP BY title', |
3413 | 3411 | $folder |
3414 | 3412 | ); |
3415 | 3413 | foreach ($rows_tmp as $record) { |
3416 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
3414 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
3417 | 3415 | } |
3418 | 3416 | $arr_data['visibilityRoles'] = $valTemp; |
3419 | 3417 | |
@@ -3446,7 +3444,7 @@ discard block |
||
3446 | 3444 | // loop on users and check if user has this role |
3447 | 3445 | $rows = DB::query( |
3448 | 3446 | 'SELECT id, fonction_id |
3449 | - FROM ' . prefixTable('users') . ' |
|
3447 | + FROM ' . prefixTable('users').' |
|
3450 | 3448 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
3451 | 3449 | $session->get('user-id') |
3452 | 3450 | ); |
@@ -3478,7 +3476,7 @@ discard block |
||
3478 | 3476 | |
3479 | 3477 | $val = DB::queryFirstRow( |
3480 | 3478 | 'SELECT * |
3481 | - FROM ' . prefixTable('users') . ' |
|
3479 | + FROM ' . prefixTable('users').' |
|
3482 | 3480 | WHERE id = %i', |
3483 | 3481 | $userId |
3484 | 3482 | ); |
@@ -3494,12 +3492,12 @@ discard block |
||
3494 | 3492 | function upgradeRequired(): bool |
3495 | 3493 | { |
3496 | 3494 | // Get settings.php |
3497 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
3495 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
3498 | 3496 | |
3499 | 3497 | // Get timestamp in DB |
3500 | 3498 | $val = DB::queryFirstRow( |
3501 | 3499 | 'SELECT valeur |
3502 | - FROM ' . prefixTable('misc') . ' |
|
3500 | + FROM ' . prefixTable('misc').' |
|
3503 | 3501 | WHERE type = %s AND intitule = %s', |
3504 | 3502 | 'admin', |
3505 | 3503 | 'upgrade_timestamp' |
@@ -3547,7 +3545,7 @@ discard block |
||
3547 | 3545 | $session = SessionManager::getSession(); |
3548 | 3546 | $lang = new Language($session->get('user-language') ?? 'english'); |
3549 | 3547 | |
3550 | - error_log('TEAMPASS Debug - handleUserKeys - userId: ' . $userId . ' - generate_user_new_password: ' . ($generate_user_new_password ? 'true' : 'false')); |
|
3548 | + error_log('TEAMPASS Debug - handleUserKeys - userId: '.$userId.' - generate_user_new_password: '.($generate_user_new_password ? 'true' : 'false')); |
|
3551 | 3549 | // Validate user existence |
3552 | 3550 | $userTP = validateUserExistence($userId); |
3553 | 3551 | if ($userTP === null) { |
@@ -3636,7 +3634,7 @@ discard block |
||
3636 | 3634 | function validateUserExistence(int $userId): ?array { |
3637 | 3635 | $userTP = DB::queryFirstRow( |
3638 | 3636 | 'SELECT pw, public_key, private_key |
3639 | - FROM ' . prefixTable('users') . ' |
|
3637 | + FROM ' . prefixTable('users').' |
|
3640 | 3638 | WHERE id = %i', |
3641 | 3639 | TP_USER_ID |
3642 | 3640 | ); |
@@ -3708,7 +3706,7 @@ discard block |
||
3708 | 3706 | ): bool { |
3709 | 3707 | $session = SessionManager::getSession(); |
3710 | 3708 | $passwordManager = new PasswordManager(); |
3711 | - $affectedRows = DB::update( |
|
3709 | + $affectedRows = DB::update( |
|
3712 | 3710 | prefixTable('users'), |
3713 | 3711 | [ |
3714 | 3712 | 'pw' => $passwordManager->hashPassword($passwordClear), |
@@ -3821,19 +3819,19 @@ discard block |
||
3821 | 3819 | |
3822 | 3820 | // Prepare the subtask queries |
3823 | 3821 | $queries = [ |
3824 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
3822 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
3825 | 3823 | |
3826 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
3824 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
3827 | 3825 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
3828 | 3826 | |
3829 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
3827 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
3830 | 3828 | ' WHERE encryption_type = "teampass_aes"', |
3831 | 3829 | |
3832 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
3830 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
3833 | 3831 | |
3834 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
3835 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
3836 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
3832 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
3833 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
3834 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
3837 | 3835 | ]; |
3838 | 3836 | |
3839 | 3837 | // Perform loop on $queries to create sub-tasks |
@@ -4023,7 +4021,7 @@ discard block |
||
4023 | 4021 | */ |
4024 | 4022 | function createTaskForItem( |
4025 | 4023 | string $processType, |
4026 | - string|array $taskName, |
|
4024 | + string | array $taskName, |
|
4027 | 4025 | int $itemId, |
4028 | 4026 | int $userId, |
4029 | 4027 | string $objectKey, |
@@ -4047,7 +4045,7 @@ discard block |
||
4047 | 4045 | 'object_key' => $objectKey, |
4048 | 4046 | 'author' => (int) $userId, |
4049 | 4047 | ]), |
4050 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
4048 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
4051 | 4049 | ) |
4052 | 4050 | ); |
4053 | 4051 | $processId = DB::insertId(); |
@@ -4057,7 +4055,7 @@ discard block |
||
4057 | 4055 | if (is_array($taskName) === false) { |
4058 | 4056 | $taskName = [$taskName]; |
4059 | 4057 | } |
4060 | - foreach($taskName as $task) { |
|
4058 | + foreach ($taskName as $task) { |
|
4061 | 4059 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
4062 | 4060 | switch ($task) { |
4063 | 4061 | case 'item_password': |
@@ -4154,7 +4152,7 @@ discard block |
||
4154 | 4152 | * @param integer $user_id |
4155 | 4153 | * @return void |
4156 | 4154 | */ |
4157 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
4155 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
4158 | 4156 | { |
4159 | 4157 | if ($allUsers === true) { |
4160 | 4158 | // Load class DB |
@@ -4164,7 +4162,7 @@ discard block |
||
4164 | 4162 | |
4165 | 4163 | $users = DB::query( |
4166 | 4164 | 'SELECT id |
4167 | - FROM ' . prefixTable('users') . ' |
|
4165 | + FROM ' . prefixTable('users').' |
|
4168 | 4166 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
4169 | 4167 | ORDER BY login ASC' |
4170 | 4168 | ); |
@@ -4182,7 +4180,7 @@ discard block |
||
4182 | 4180 | * @param integer $user_id |
4183 | 4181 | * @return void |
4184 | 4182 | */ |
4185 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
4183 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
4186 | 4184 | { |
4187 | 4185 | if ($user_id === 0) { |
4188 | 4186 | return; |
@@ -4193,8 +4191,8 @@ discard block |
||
4193 | 4191 | |
4194 | 4192 | $personalItems = DB::queryFirstColumn( |
4195 | 4193 | 'SELECT id |
4196 | - FROM ' . prefixTable('items') . ' AS i |
|
4197 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
4194 | + FROM ' . prefixTable('items').' AS i |
|
4195 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
4198 | 4196 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
4199 | 4197 | $user_id |
4200 | 4198 | ); |
@@ -4243,7 +4241,7 @@ discard block |
||
4243 | 4241 | // Check if user exists |
4244 | 4242 | $userInfo = DB::queryFirstRow( |
4245 | 4243 | 'SELECT login |
4246 | - FROM ' . prefixTable('users') . ' |
|
4244 | + FROM ' . prefixTable('users').' |
|
4247 | 4245 | WHERE id = %i', |
4248 | 4246 | $userId |
4249 | 4247 | ); |
@@ -4252,7 +4250,7 @@ discard block |
||
4252 | 4250 | $now = (int) time(); |
4253 | 4251 | // Prepare file content |
4254 | 4252 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
4255 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
4253 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
4256 | 4254 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
4257 | 4255 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
4258 | 4256 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4275,7 +4273,7 @@ discard block |
||
4275 | 4273 | return prepareExchangedData( |
4276 | 4274 | array( |
4277 | 4275 | 'error' => false, |
4278 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
4276 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
4279 | 4277 | 'timestamp' => $now, |
4280 | 4278 | 'content' => base64_encode($export_value), |
4281 | 4279 | 'login' => $userInfo['login'], |
@@ -4301,8 +4299,8 @@ discard block |
||
4301 | 4299 | */ |
4302 | 4300 | function loadClasses(string $className = ''): void |
4303 | 4301 | { |
4304 | - require_once __DIR__. '/../includes/config/include.php'; |
|
4305 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
4302 | + require_once __DIR__.'/../includes/config/include.php'; |
|
4303 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
4306 | 4304 | require_once __DIR__.'/../vendor/autoload.php'; |
4307 | 4305 | |
4308 | 4306 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4515,7 +4513,7 @@ discard block |
||
4515 | 4513 | |
4516 | 4514 | // Get current user hash |
4517 | 4515 | $userHash = DB::queryFirstRow( |
4518 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
4516 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
4519 | 4517 | $session->get('user-id') |
4520 | 4518 | )['pw']; |
4521 | 4519 | |
@@ -4563,11 +4561,11 @@ discard block |
||
4563 | 4561 | } |
4564 | 4562 | |
4565 | 4563 | // Alternative: serialize ou json selon le contexte |
4566 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
4564 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
4567 | 4565 | } |
4568 | 4566 | |
4569 | 4567 | if (is_resource($value)) { |
4570 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
4568 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
4571 | 4569 | } |
4572 | 4570 | |
4573 | 4571 | // Cas par défaut |