@@ -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 |
@@ -134,19 +134,19 @@ discard block |
||
134 | 134 | $text = Crypto::decrypt($message, $key); |
135 | 135 | } |
136 | 136 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
137 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
137 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
138 | 138 | $err = 'wrong_key_or_modified_ciphertext'; |
139 | 139 | } catch (CryptoException\BadFormatException $ex) { |
140 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
140 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
141 | 141 | $err = 'bad_format'; |
142 | 142 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
143 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
143 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
144 | 144 | $err = 'environment_error'; |
145 | 145 | } catch (CryptoException\IOException $ex) { |
146 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
146 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
147 | 147 | $err = 'io_error'; |
148 | 148 | } catch (Exception $ex) { |
149 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
149 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
150 | 150 | $err = 'unexpected_error'; |
151 | 151 | } |
152 | 152 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | function trimElement($chaine, string $element): string |
233 | 233 | { |
234 | - if (! empty($chaine)) { |
|
234 | + if (!empty($chaine)) { |
|
235 | 235 | if (is_array($chaine) === true) { |
236 | 236 | $chaine = implode(';', $chaine); |
237 | 237 | } |
@@ -279,8 +279,8 @@ discard block |
||
279 | 279 | */ |
280 | 280 | function db_error_handler(array $params): void |
281 | 281 | { |
282 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
283 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
282 | + echo 'Error: '.$params['error']."<br>\n"; |
|
283 | + echo 'Query: '.$params['query']."<br>\n"; |
|
284 | 284 | throw new Exception('Error - Query', 1); |
285 | 285 | } |
286 | 286 | |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | $session->set('user-forbiden_personal_folders', []); |
359 | 359 | |
360 | 360 | // Get list of Folders |
361 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
361 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
362 | 362 | foreach ($rows as $record) { |
363 | 363 | array_push($groupesVisibles, $record['id']); |
364 | 364 | } |
@@ -368,20 +368,20 @@ discard block |
||
368 | 368 | // get complete list of ROLES |
369 | 369 | $tmp = explode(';', $idFonctions); |
370 | 370 | $rows = DB::query( |
371 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
371 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
372 | 372 | ORDER BY title ASC' |
373 | 373 | ); |
374 | 374 | foreach ($rows as $record) { |
375 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
375 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
376 | 376 | array_push($tmp, $record['id']); |
377 | 377 | } |
378 | 378 | } |
379 | 379 | $session->set('user-roles', implode(';', $tmp)); |
380 | 380 | $session->set('user-admin', 1); |
381 | 381 | // Check if admin has created Folders and Roles |
382 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
382 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
383 | 383 | $session->set('user-nb_folders', DB::count()); |
384 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
384 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
385 | 385 | $session->set('user-nb_roles', DB::count()); |
386 | 386 | |
387 | 387 | return true; |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | // Does this user is allowed to see other items |
465 | 465 | $inc = 0; |
466 | 466 | $rows = DB::query( |
467 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
467 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
468 | 468 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
469 | 469 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
470 | 470 | $globalsUserId, |
@@ -481,8 +481,8 @@ discard block |
||
481 | 481 | // Check for the users roles if some specific rights exist on items |
482 | 482 | $rows = DB::query( |
483 | 483 | 'SELECT i.id_tree, r.item_id |
484 | - FROM ' . prefixTable('items') . ' as i |
|
485 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
484 | + FROM ' . prefixTable('items').' as i |
|
485 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
486 | 486 | WHERE i.id_tree <> "" '. |
487 | 487 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
488 | 488 | 'ORDER BY i.id_tree ASC', |
@@ -536,18 +536,18 @@ discard block |
||
536 | 536 | ), SORT_NUMERIC) |
537 | 537 | ); |
538 | 538 | // Folders and Roles numbers |
539 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
540 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
539 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
540 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
541 | 541 | $session->set('user-nb_folders', DB::count()); |
542 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
543 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
542 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
543 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
544 | 544 | $session->set('user-nb_roles', DB::count()); |
545 | 545 | // check if change proposals on User's items |
546 | 546 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
547 | 547 | $countNewItems = DB::query( |
548 | 548 | 'SELECT COUNT(*) |
549 | - FROM ' . prefixTable('items_change') . ' AS c |
|
550 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
549 | + FROM ' . prefixTable('items_change').' AS c |
|
550 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
551 | 551 | WHERE i.action = %s AND i.id_user = %i', |
552 | 552 | 'at_creation', |
553 | 553 | $globalsUserId |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | { |
575 | 575 | $rows = DB::query( |
576 | 576 | 'SELECT * |
577 | - FROM ' . prefixTable('roles_values') . ' |
|
577 | + FROM ' . prefixTable('roles_values').' |
|
578 | 578 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
579 | 579 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
580 | 580 | $userRoles, |
@@ -641,7 +641,7 @@ discard block |
||
641 | 641 | ) { |
642 | 642 | $persoFld = DB::queryFirstRow( |
643 | 643 | 'SELECT id |
644 | - FROM ' . prefixTable('nested_tree') . ' |
|
644 | + FROM ' . prefixTable('nested_tree').' |
|
645 | 645 | WHERE title = %s AND personal_folder = %i'. |
646 | 646 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
647 | 647 | $globalsUserId, |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | } |
675 | 675 | $persoFlds = DB::query( |
676 | 676 | 'SELECT id |
677 | - FROM ' . prefixTable('nested_tree') . ' |
|
677 | + FROM ' . prefixTable('nested_tree').' |
|
678 | 678 | WHERE %l', |
679 | 679 | $where |
680 | 680 | ); |
@@ -742,12 +742,12 @@ discard block |
||
742 | 742 | //Load Tree |
743 | 743 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
744 | 744 | // truncate table |
745 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
745 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
746 | 746 | // reload date |
747 | 747 | $rows = DB::query( |
748 | 748 | 'SELECT * |
749 | - FROM ' . prefixTable('items') . ' as i |
|
750 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
749 | + FROM ' . prefixTable('items').' as i |
|
750 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
751 | 751 | AND l.action = %s |
752 | 752 | AND i.inactif = %i', |
753 | 753 | 'at_creation', |
@@ -759,18 +759,18 @@ discard block |
||
759 | 759 | $tags = ''; |
760 | 760 | $itemTags = DB::query( |
761 | 761 | 'SELECT tag |
762 | - FROM ' . prefixTable('tags') . ' |
|
762 | + FROM ' . prefixTable('tags').' |
|
763 | 763 | WHERE item_id = %i AND tag != ""', |
764 | 764 | $record['id'] |
765 | 765 | ); |
766 | 766 | foreach ($itemTags as $itemTag) { |
767 | - $tags .= $itemTag['tag'] . ' '; |
|
767 | + $tags .= $itemTag['tag'].' '; |
|
768 | 768 | } |
769 | 769 | |
770 | 770 | // Get renewal period |
771 | 771 | $resNT = DB::queryFirstRow( |
772 | 772 | 'SELECT renewal_period |
773 | - FROM ' . prefixTable('nested_tree') . ' |
|
773 | + FROM ' . prefixTable('nested_tree').' |
|
774 | 774 | WHERE id = %i', |
775 | 775 | $record['id_tree'] |
776 | 776 | ); |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | // Is this a User id? |
784 | 784 | $user = DB::queryFirstRow( |
785 | 785 | 'SELECT id, login |
786 | - FROM ' . prefixTable('users') . ' |
|
786 | + FROM ' . prefixTable('users').' |
|
787 | 787 | WHERE id = %i', |
788 | 788 | $elem->title |
789 | 789 | ); |
@@ -801,11 +801,11 @@ discard block |
||
801 | 801 | 'id' => $record['id'], |
802 | 802 | 'label' => $record['label'], |
803 | 803 | 'description' => $record['description'] ?? '', |
804 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
804 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
805 | 805 | 'tags' => $tags, |
806 | 806 | 'id_tree' => $record['id_tree'], |
807 | 807 | 'perso' => $record['perso'], |
808 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
808 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
809 | 809 | 'login' => $record['login'] ?? '', |
810 | 810 | 'folder' => implode(' » ', $folder), |
811 | 811 | 'author' => $record['id_user'], |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | // get new value from db |
835 | 835 | $data = DB::queryFirstRow( |
836 | 836 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
837 | - FROM ' . prefixTable('items') . ' |
|
837 | + FROM ' . prefixTable('items').' |
|
838 | 838 | WHERE id=%i', |
839 | 839 | $ident |
840 | 840 | ); |
@@ -842,12 +842,12 @@ discard block |
||
842 | 842 | $tags = ''; |
843 | 843 | $itemTags = DB::query( |
844 | 844 | 'SELECT tag |
845 | - FROM ' . prefixTable('tags') . ' |
|
845 | + FROM ' . prefixTable('tags').' |
|
846 | 846 | WHERE item_id = %i AND tag != ""', |
847 | 847 | $ident |
848 | 848 | ); |
849 | 849 | foreach ($itemTags as $itemTag) { |
850 | - $tags .= $itemTag['tag'] . ' '; |
|
850 | + $tags .= $itemTag['tag'].' '; |
|
851 | 851 | } |
852 | 852 | // form id_tree to full foldername |
853 | 853 | $folder = []; |
@@ -858,7 +858,7 @@ discard block |
||
858 | 858 | // Is this a User id? |
859 | 859 | $user = DB::queryFirstRow( |
860 | 860 | 'SELECT id, login |
861 | - FROM ' . prefixTable('users') . ' |
|
861 | + FROM ' . prefixTable('users').' |
|
862 | 862 | WHERE id = %i', |
863 | 863 | $elem->title |
864 | 864 | ); |
@@ -876,10 +876,10 @@ discard block |
||
876 | 876 | 'label' => $data['label'], |
877 | 877 | 'description' => $data['description'], |
878 | 878 | 'tags' => $tags, |
879 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
879 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
880 | 880 | 'id_tree' => $data['id_tree'], |
881 | 881 | 'perso' => $data['perso'], |
882 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
882 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
883 | 883 | 'login' => $data['login'] ?? '', |
884 | 884 | 'folder' => implode(' » ', $folder), |
885 | 885 | 'author' => $session->get('user-id'), |
@@ -909,8 +909,8 @@ discard block |
||
909 | 909 | // get new value from db |
910 | 910 | $data = DB::queryFirstRow( |
911 | 911 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
912 | - FROM ' . prefixTable('items') . ' as i |
|
913 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
912 | + FROM ' . prefixTable('items').' as i |
|
913 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
914 | 914 | WHERE i.id = %i |
915 | 915 | AND l.action = %s', |
916 | 916 | $ident, |
@@ -920,12 +920,12 @@ discard block |
||
920 | 920 | $tags = ''; |
921 | 921 | $itemTags = DB::query( |
922 | 922 | 'SELECT tag |
923 | - FROM ' . prefixTable('tags') . ' |
|
923 | + FROM ' . prefixTable('tags').' |
|
924 | 924 | WHERE item_id = %i AND tag != ""', |
925 | 925 | $ident |
926 | 926 | ); |
927 | 927 | foreach ($itemTags as $itemTag) { |
928 | - $tags .= $itemTag['tag'] . ' '; |
|
928 | + $tags .= $itemTag['tag'].' '; |
|
929 | 929 | } |
930 | 930 | // form id_tree to full foldername |
931 | 931 | $folder = []; |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | // Is this a User id? |
937 | 937 | $user = DB::queryFirstRow( |
938 | 938 | 'SELECT id, login |
939 | - FROM ' . prefixTable('users') . ' |
|
939 | + FROM ' . prefixTable('users').' |
|
940 | 940 | WHERE id = %i', |
941 | 941 | $elem->title |
942 | 942 | ); |
@@ -955,7 +955,7 @@ discard block |
||
955 | 955 | 'label' => $data['label'], |
956 | 956 | 'description' => $data['description'], |
957 | 957 | 'tags' => empty($tags) === false ? $tags : 'None', |
958 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
958 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
959 | 959 | 'id_tree' => $data['id_tree'], |
960 | 960 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
961 | 961 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -977,53 +977,53 @@ discard block |
||
977 | 977 | function getStatisticsData(array $SETTINGS): array |
978 | 978 | { |
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 | 0 |
982 | 982 | ); |
983 | 983 | $counter_folders = DB::count(); |
984 | 984 | DB::query( |
985 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
985 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
986 | 986 | 1 |
987 | 987 | ); |
988 | 988 | $counter_folders_perso = 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 | 0 |
992 | 992 | ); |
993 | 993 | $counter_items = DB::count(); |
994 | 994 | DB::query( |
995 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
995 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
996 | 996 | 1 |
997 | 997 | ); |
998 | 998 | $counter_items_perso = DB::count(); |
999 | 999 | DB::query( |
1000 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
1000 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
1001 | 1001 | 'OTV', 'TP', 'API' |
1002 | 1002 | ); |
1003 | 1003 | $counter_users = DB::count(); |
1004 | 1004 | DB::query( |
1005 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
1005 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
1006 | 1006 | 1 |
1007 | 1007 | ); |
1008 | 1008 | $admins = DB::count(); |
1009 | 1009 | DB::query( |
1010 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
1010 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
1011 | 1011 | 1 |
1012 | 1012 | ); |
1013 | 1013 | $managers = DB::count(); |
1014 | 1014 | DB::query( |
1015 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
1015 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
1016 | 1016 | 1 |
1017 | 1017 | ); |
1018 | 1018 | $readOnly = DB::count(); |
1019 | 1019 | // list the languages |
1020 | 1020 | $usedLang = []; |
1021 | 1021 | $tp_languages = DB::query( |
1022 | - 'SELECT name FROM ' . prefixTable('languages') |
|
1022 | + 'SELECT name FROM '.prefixTable('languages') |
|
1023 | 1023 | ); |
1024 | 1024 | foreach ($tp_languages as $tp_language) { |
1025 | 1025 | DB::query( |
1026 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
1026 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
1027 | 1027 | $tp_language['name'] |
1028 | 1028 | ); |
1029 | 1029 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1032,12 +1032,12 @@ discard block |
||
1032 | 1032 | // get list of ips |
1033 | 1033 | $usedIp = []; |
1034 | 1034 | $tp_ips = DB::query( |
1035 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
1035 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
1036 | 1036 | ); |
1037 | 1037 | foreach ($tp_ips as $ip) { |
1038 | 1038 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
1039 | 1039 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
1040 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1040 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1041 | 1041 | $usedIp[$ip['user_ip']] = 1; |
1042 | 1042 | } |
1043 | 1043 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
1132 | 1132 | <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;"> |
1133 | 1133 | <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;"> |
1134 | 1134 | <br><div style="float:right;">' . |
1135 | - $textMail . |
|
1135 | + $textMail. |
|
1136 | 1136 | '<br><br></td></tr></table> |
1137 | 1137 | </td></tr></table> |
1138 | 1138 | <br></body></html>'; |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | { |
1214 | 1214 | array_walk_recursive( |
1215 | 1215 | $array, |
1216 | - static function (&$item): void { |
|
1216 | + static function(&$item): void { |
|
1217 | 1217 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
1218 | 1218 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
1219 | 1219 | } |
@@ -1324,7 +1324,7 @@ discard block |
||
1324 | 1324 | */ |
1325 | 1325 | function prefixTable(string $table): string |
1326 | 1326 | { |
1327 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
1327 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
1328 | 1328 | return $safeTable; |
1329 | 1329 | } |
1330 | 1330 | |
@@ -1441,7 +1441,7 @@ discard block |
||
1441 | 1441 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
1442 | 1442 | { |
1443 | 1443 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
1444 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
1444 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
1445 | 1445 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
1446 | 1446 | socket_close($sock); |
1447 | 1447 | } |
@@ -1488,14 +1488,14 @@ discard block |
||
1488 | 1488 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
1489 | 1489 | if ($type === 'user_mngt') { |
1490 | 1490 | send_syslog( |
1491 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
1491 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
1492 | 1492 | $SETTINGS['syslog_host'], |
1493 | 1493 | $SETTINGS['syslog_port'], |
1494 | 1494 | 'teampass' |
1495 | 1495 | ); |
1496 | 1496 | } else { |
1497 | 1497 | send_syslog( |
1498 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
1498 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
1499 | 1499 | $SETTINGS['syslog_host'], |
1500 | 1500 | $SETTINGS['syslog_port'], |
1501 | 1501 | 'teampass' |
@@ -1570,7 +1570,7 @@ discard block |
||
1570 | 1570 | if (empty($item_label) === true) { |
1571 | 1571 | $dataItem = DB::queryFirstRow( |
1572 | 1572 | 'SELECT id, id_tree, label |
1573 | - FROM ' . prefixTable('items') . ' |
|
1573 | + FROM ' . prefixTable('items').' |
|
1574 | 1574 | WHERE id = %i', |
1575 | 1575 | $item_id |
1576 | 1576 | ); |
@@ -1578,11 +1578,11 @@ discard block |
||
1578 | 1578 | } |
1579 | 1579 | |
1580 | 1580 | send_syslog( |
1581 | - 'action=' . str_replace('at_', '', $action) . |
|
1582 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
1583 | - ' itemno=' . $item_id . |
|
1584 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
1585 | - ' itemname="' . addslashes($item_label) . '"', |
|
1581 | + 'action='.str_replace('at_', '', $action). |
|
1582 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
1583 | + ' itemno='.$item_id. |
|
1584 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
1585 | + ' itemname="'.addslashes($item_label).'"', |
|
1586 | 1586 | $SETTINGS['syslog_host'], |
1587 | 1587 | $SETTINGS['syslog_port'], |
1588 | 1588 | 'teampass' |
@@ -1613,8 +1613,8 @@ discard block |
||
1613 | 1613 | // send email to user that what to be notified |
1614 | 1614 | $notification = DB::queryFirstField( |
1615 | 1615 | 'SELECT email |
1616 | - FROM ' . prefixTable('notification') . ' AS n |
|
1617 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
1616 | + FROM ' . prefixTable('notification').' AS n |
|
1617 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
1618 | 1618 | WHERE n.item_id = %i AND n.user_id != %i', |
1619 | 1619 | $item_id, |
1620 | 1620 | $globalsUserId |
@@ -1625,7 +1625,7 @@ discard block |
||
1625 | 1625 | // Get list of changes |
1626 | 1626 | $htmlChanges = '<ul>'; |
1627 | 1627 | foreach ($changes as $change) { |
1628 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
1628 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
1629 | 1629 | } |
1630 | 1630 | $htmlChanges .= '</ul>'; |
1631 | 1631 | // send email |
@@ -1662,15 +1662,15 @@ discard block |
||
1662 | 1662 | $path = ''; |
1663 | 1663 | foreach ($arbo as $elem) { |
1664 | 1664 | if (empty($path) === true) { |
1665 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
1665 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
1666 | 1666 | } else { |
1667 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1667 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1668 | 1668 | } |
1669 | 1669 | } |
1670 | 1670 | |
1671 | 1671 | // Build text to show user |
1672 | 1672 | if (empty($label) === false) { |
1673 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
1673 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
1674 | 1674 | } |
1675 | 1675 | return empty($path) === true ? '' : $path; |
1676 | 1676 | } |
@@ -1726,7 +1726,7 @@ discard block |
||
1726 | 1726 | { |
1727 | 1727 | // Perform a copy if the file exists |
1728 | 1728 | if (file_exists($configFilePath)) { |
1729 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
1729 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
1730 | 1730 | if (!copy($configFilePath, $backupFilePath)) { |
1731 | 1731 | return "ERROR: Could not copy file '$configFilePath'"; |
1732 | 1732 | } |
@@ -1734,10 +1734,10 @@ discard block |
||
1734 | 1734 | |
1735 | 1735 | // Regenerate the config file |
1736 | 1736 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
1737 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
1737 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
1738 | 1738 | foreach ($rows as $record) { |
1739 | 1739 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
1740 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
1740 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
1741 | 1741 | } |
1742 | 1742 | $data[] = ");\n"; |
1743 | 1743 | $data = array_unique($data); |
@@ -1782,7 +1782,7 @@ discard block |
||
1782 | 1782 | { |
1783 | 1783 | global $SETTINGS; |
1784 | 1784 | /* LOAD CPASSMAN SETTINGS */ |
1785 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1785 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1786 | 1786 | $SETTINGS = []; |
1787 | 1787 | $SETTINGS['duplicate_folder'] = 0; |
1788 | 1788 | //by default, this is set to 0; |
@@ -1792,7 +1792,7 @@ discard block |
||
1792 | 1792 | //by default, this value is set to 5; |
1793 | 1793 | $settings = []; |
1794 | 1794 | $rows = DB::query( |
1795 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
1795 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
1796 | 1796 | [ |
1797 | 1797 | 'type' => 'admin', |
1798 | 1798 | 'type2' => 'settings', |
@@ -1824,7 +1824,7 @@ discard block |
||
1824 | 1824 | $source_cf = []; |
1825 | 1825 | $rows = DB::query( |
1826 | 1826 | 'SELECT id_category |
1827 | - FROM ' . prefixTable('categories_folders') . ' |
|
1827 | + FROM ' . prefixTable('categories_folders').' |
|
1828 | 1828 | WHERE id_folder = %i', |
1829 | 1829 | $source_id |
1830 | 1830 | ); |
@@ -1835,7 +1835,7 @@ discard block |
||
1835 | 1835 | $target_cf = []; |
1836 | 1836 | $rows = DB::query( |
1837 | 1837 | 'SELECT id_category |
1838 | - FROM ' . prefixTable('categories_folders') . ' |
|
1838 | + FROM ' . prefixTable('categories_folders').' |
|
1839 | 1839 | WHERE id_folder = %i', |
1840 | 1840 | $target_id |
1841 | 1841 | ); |
@@ -1930,10 +1930,10 @@ discard block |
||
1930 | 1930 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1931 | 1931 | $err = 'wrong_key'; |
1932 | 1932 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1933 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1933 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1934 | 1934 | $err = 'environment_error'; |
1935 | 1935 | } catch (CryptoException\IOException $ex) { |
1936 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1936 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1937 | 1937 | $err = 'general_error'; |
1938 | 1938 | } |
1939 | 1939 | |
@@ -1966,10 +1966,10 @@ discard block |
||
1966 | 1966 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1967 | 1967 | $err = 'wrong_key'; |
1968 | 1968 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1969 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1969 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1970 | 1970 | $err = 'environment_error'; |
1971 | 1971 | } catch (CryptoException\IOException $ex) { |
1972 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1972 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1973 | 1973 | $err = 'general_error'; |
1974 | 1974 | } |
1975 | 1975 | |
@@ -2055,7 +2055,7 @@ discard block |
||
2055 | 2055 | ) { |
2056 | 2056 | // Check if the path exists |
2057 | 2057 | $path = basename($path); |
2058 | - if (! file_exists($path)) { |
|
2058 | + if (!file_exists($path)) { |
|
2059 | 2059 | return false; |
2060 | 2060 | } |
2061 | 2061 | |
@@ -2108,7 +2108,7 @@ discard block |
||
2108 | 2108 | // Load item data |
2109 | 2109 | $data = DB::queryFirstRow( |
2110 | 2110 | 'SELECT id_tree |
2111 | - FROM ' . prefixTable('items') . ' |
|
2111 | + FROM ' . prefixTable('items').' |
|
2112 | 2112 | WHERE id = %i', |
2113 | 2113 | $item_id |
2114 | 2114 | ); |
@@ -2171,7 +2171,7 @@ discard block |
||
2171 | 2171 | } |
2172 | 2172 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
2173 | 2173 | } |
2174 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
2174 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
2175 | 2175 | return $email; |
2176 | 2176 | } |
2177 | 2177 | |
@@ -2202,11 +2202,11 @@ discard block |
||
2202 | 2202 | function formatSizeUnits(int $bytes): string |
2203 | 2203 | { |
2204 | 2204 | if ($bytes >= 1073741824) { |
2205 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
2205 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
2206 | 2206 | } elseif ($bytes >= 1048576) { |
2207 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
2207 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
2208 | 2208 | } elseif ($bytes >= 1024) { |
2209 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
2209 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
2210 | 2210 | } elseif ($bytes > 1) { |
2211 | 2211 | $bytes .= ' bytes'; |
2212 | 2212 | } elseif ($bytes === 1) { |
@@ -2455,7 +2455,7 @@ discard block |
||
2455 | 2455 | $cipher->enableContinuousBuffer(); |
2456 | 2456 | |
2457 | 2457 | // Encrypt the file content |
2458 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
2458 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
2459 | 2459 | $fileContent = file_get_contents($filePath); |
2460 | 2460 | $plaintext = $fileContent; |
2461 | 2461 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2463,9 +2463,9 @@ discard block |
||
2463 | 2463 | // Save new file |
2464 | 2464 | // deepcode ignore InsecureHash: is simply used to get a unique name |
2465 | 2465 | $hash = uniqid('', true); |
2466 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
2466 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
2467 | 2467 | file_put_contents($fileOut, $ciphertext); |
2468 | - unlink($fileInPath . '/' . $fileInName); |
|
2468 | + unlink($fileInPath.'/'.$fileInName); |
|
2469 | 2469 | return [ |
2470 | 2470 | 'fileHash' => base64_encode($hash), |
2471 | 2471 | 'objectKey' => base64_encode($objectKey), |
@@ -2481,9 +2481,9 @@ discard block |
||
2481 | 2481 | * |
2482 | 2482 | * @return string|array |
2483 | 2483 | */ |
2484 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
2484 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
2485 | 2485 | { |
2486 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
2486 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
2487 | 2487 | define('FILE_BUFFER_SIZE', 128 * 1024); |
2488 | 2488 | } |
2489 | 2489 | |
@@ -2500,7 +2500,7 @@ discard block |
||
2500 | 2500 | $cipher->enableContinuousBuffer(); |
2501 | 2501 | $cipher->disablePadding(); |
2502 | 2502 | // Get file content |
2503 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
2503 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
2504 | 2504 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
2505 | 2505 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
2506 | 2506 | } else { |
@@ -2596,7 +2596,7 @@ discard block |
||
2596 | 2596 | // Only create the sharekey for a user |
2597 | 2597 | $user = DB::queryFirstRow( |
2598 | 2598 | 'SELECT public_key |
2599 | - FROM ' . prefixTable('users') . ' |
|
2599 | + FROM ' . prefixTable('users').' |
|
2600 | 2600 | WHERE id = %i |
2601 | 2601 | AND public_key != ""', |
2602 | 2602 | $userId |
@@ -2637,7 +2637,7 @@ discard block |
||
2637 | 2637 | } |
2638 | 2638 | $users = DB::query( |
2639 | 2639 | 'SELECT id, public_key |
2640 | - FROM ' . prefixTable('users') . ' |
|
2640 | + FROM ' . prefixTable('users').' |
|
2641 | 2641 | WHERE id NOT IN %li |
2642 | 2642 | AND public_key != ""', |
2643 | 2643 | $user_ids |
@@ -2646,7 +2646,7 @@ discard block |
||
2646 | 2646 | foreach ($users as $user) { |
2647 | 2647 | // Insert in DB the new object key for this item by user |
2648 | 2648 | if (count($objectKeyArray) === 0) { |
2649 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2649 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
2650 | 2650 | DB::insert( |
2651 | 2651 | $object_name, |
2652 | 2652 | [ |
@@ -2660,7 +2660,7 @@ discard block |
||
2660 | 2660 | ); |
2661 | 2661 | } else { |
2662 | 2662 | foreach ($objectKeyArray as $object) { |
2663 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2663 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
2664 | 2664 | DB::insert( |
2665 | 2665 | $object_name, |
2666 | 2666 | [ |
@@ -2688,7 +2688,7 @@ discard block |
||
2688 | 2688 | function isBase64(string $str): bool |
2689 | 2689 | { |
2690 | 2690 | $str = (string) trim($str); |
2691 | - if (! isset($str[0])) { |
|
2691 | + if (!isset($str[0])) { |
|
2692 | 2692 | return false; |
2693 | 2693 | } |
2694 | 2694 | |
@@ -2762,7 +2762,7 @@ discard block |
||
2762 | 2762 | } catch (\LdapRecord\Auth\BindException $e) { |
2763 | 2763 | $error = $e->getDetailedError(); |
2764 | 2764 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2765 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2765 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2766 | 2766 | } |
2767 | 2767 | // deepcode ignore ServerLeak: No important data is sent |
2768 | 2768 | echo 'An error occurred.'; |
@@ -2779,7 +2779,7 @@ discard block |
||
2779 | 2779 | } catch (\LdapRecord\Auth\BindException $e) { |
2780 | 2780 | $error = $e->getDetailedError(); |
2781 | 2781 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2782 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2782 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2783 | 2783 | } |
2784 | 2784 | // deepcode ignore ServerLeak: No important data is sent |
2785 | 2785 | echo 'An error occurred.'; |
@@ -2806,7 +2806,7 @@ discard block |
||
2806 | 2806 | // expect if personal item |
2807 | 2807 | DB::delete( |
2808 | 2808 | prefixTable('sharekeys_items'), |
2809 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2809 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2810 | 2810 | $userId |
2811 | 2811 | ); |
2812 | 2812 | // Remove all item sharekeys files |
@@ -2814,8 +2814,8 @@ discard block |
||
2814 | 2814 | prefixTable('sharekeys_files'), |
2815 | 2815 | 'user_id = %i AND object_id NOT IN ( |
2816 | 2816 | SELECT f.id |
2817 | - FROM ' . prefixTable('items') . ' AS i |
|
2818 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
2817 | + FROM ' . prefixTable('items').' AS i |
|
2818 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
2819 | 2819 | WHERE i.perso = 1 |
2820 | 2820 | )', |
2821 | 2821 | $userId |
@@ -2825,8 +2825,8 @@ discard block |
||
2825 | 2825 | prefixTable('sharekeys_fields'), |
2826 | 2826 | 'user_id = %i AND object_id NOT IN ( |
2827 | 2827 | SELECT c.id |
2828 | - FROM ' . prefixTable('items') . ' AS i |
|
2829 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
2828 | + FROM ' . prefixTable('items').' AS i |
|
2829 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
2830 | 2830 | WHERE i.perso = 1 |
2831 | 2831 | )', |
2832 | 2832 | $userId |
@@ -2834,13 +2834,13 @@ discard block |
||
2834 | 2834 | // Remove all item sharekeys logs |
2835 | 2835 | DB::delete( |
2836 | 2836 | prefixTable('sharekeys_logs'), |
2837 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2837 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2838 | 2838 | $userId |
2839 | 2839 | ); |
2840 | 2840 | // Remove all item sharekeys suggestions |
2841 | 2841 | DB::delete( |
2842 | 2842 | prefixTable('sharekeys_suggestions'), |
2843 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2843 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2844 | 2844 | $userId |
2845 | 2845 | ); |
2846 | 2846 | return false; |
@@ -2861,7 +2861,7 @@ discard block |
||
2861 | 2861 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
2862 | 2862 | $now->setTimezone(new DateTimeZone($timezone)); |
2863 | 2863 | $offsets[] = $offset = $now->getOffset(); |
2864 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
2864 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
2865 | 2865 | } |
2866 | 2866 | |
2867 | 2867 | array_multisort($offsets, $timezones); |
@@ -2881,7 +2881,7 @@ discard block |
||
2881 | 2881 | { |
2882 | 2882 | $hours = intval($offset / 3600); |
2883 | 2883 | $minutes = abs(intval($offset % 3600 / 60)); |
2884 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2884 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2885 | 2885 | } |
2886 | 2886 | |
2887 | 2887 | /** |
@@ -2980,8 +2980,7 @@ discard block |
||
2980 | 2980 | { |
2981 | 2981 | if (isset($array[$key]) === true |
2982 | 2982 | && (is_int($value) === true ? |
2983 | - (int) $array[$key] === $value : |
|
2984 | - (string) $array[$key] === $value) |
|
2983 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
2985 | 2984 | ) { |
2986 | 2985 | return true; |
2987 | 2986 | } |
@@ -3003,8 +3002,7 @@ discard block |
||
3003 | 3002 | { |
3004 | 3003 | if (isset($var) === false |
3005 | 3004 | || (is_int($value) === true ? |
3006 | - (int) $var === $value : |
|
3007 | - (string) $var === $value) |
|
3005 | + (int) $var === $value : (string) $var === $value) |
|
3008 | 3006 | ) { |
3009 | 3007 | return true; |
3010 | 3008 | } |
@@ -3055,7 +3053,7 @@ discard block |
||
3055 | 3053 | */ |
3056 | 3054 | function isSetArrayOfValues(array $arrayOfValues): bool |
3057 | 3055 | { |
3058 | - foreach($arrayOfValues as $value) { |
|
3056 | + foreach ($arrayOfValues as $value) { |
|
3059 | 3057 | if (isset($value) === false) { |
3060 | 3058 | return false; |
3061 | 3059 | } |
@@ -3077,7 +3075,7 @@ discard block |
||
3077 | 3075 | /*PHP8 - integer|string*/$value |
3078 | 3076 | ) : bool |
3079 | 3077 | { |
3080 | - foreach($arrayOfVars as $variable) { |
|
3078 | + foreach ($arrayOfVars as $variable) { |
|
3081 | 3079 | if ($variable !== $value) { |
3082 | 3080 | return false; |
3083 | 3081 | } |
@@ -3097,7 +3095,7 @@ discard block |
||
3097 | 3095 | /*PHP8 - integer|string*/$value |
3098 | 3096 | ) : bool |
3099 | 3097 | { |
3100 | - foreach($arrayOfVars as $variable) { |
|
3098 | + foreach ($arrayOfVars as $variable) { |
|
3101 | 3099 | if ($variable === $value) { |
3102 | 3100 | return true; |
3103 | 3101 | } |
@@ -3111,7 +3109,7 @@ discard block |
||
3111 | 3109 | * @param string|int|null $value |
3112 | 3110 | * @return boolean |
3113 | 3111 | */ |
3114 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
3112 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
3115 | 3113 | { |
3116 | 3114 | if (is_null($value) === true || empty($value) === true) { |
3117 | 3115 | return true; |
@@ -3166,7 +3164,7 @@ discard block |
||
3166 | 3164 | * @param array $filters |
3167 | 3165 | * @return array|string |
3168 | 3166 | */ |
3169 | -function dataSanitizer(array $data, array $filters): array|string |
|
3167 | +function dataSanitizer(array $data, array $filters): array | string |
|
3170 | 3168 | { |
3171 | 3169 | // Load Sanitizer library |
3172 | 3170 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3195,7 +3193,7 @@ discard block |
||
3195 | 3193 | // Exists ? |
3196 | 3194 | $userCacheId = DB::queryFirstRow( |
3197 | 3195 | 'SELECT increment_id |
3198 | - FROM ' . prefixTable('cache_tree') . ' |
|
3196 | + FROM ' . prefixTable('cache_tree').' |
|
3199 | 3197 | WHERE user_id = %i', |
3200 | 3198 | $user_id |
3201 | 3199 | ); |
@@ -3246,7 +3244,7 @@ discard block |
||
3246 | 3244 | */ |
3247 | 3245 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
3248 | 3246 | { |
3249 | - $resultat = ($nombre/$total) * $pourcentage; |
|
3247 | + $resultat = ($nombre / $total) * $pourcentage; |
|
3250 | 3248 | return round($resultat); |
3251 | 3249 | } |
3252 | 3250 | |
@@ -3276,7 +3274,7 @@ discard block |
||
3276 | 3274 | |
3277 | 3275 | // Get last folder update |
3278 | 3276 | $lastFolderChange = DB::queryFirstRow( |
3279 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
3277 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
3280 | 3278 | WHERE type = %s AND intitule = %s', |
3281 | 3279 | 'timestamp', |
3282 | 3280 | 'last_folder_change' |
@@ -3307,7 +3305,7 @@ discard block |
||
3307 | 3305 | // Does this user has a tree cache |
3308 | 3306 | $userCacheTree = DB::queryFirstRow( |
3309 | 3307 | 'SELECT '.$fieldName.' |
3310 | - FROM ' . prefixTable('cache_tree') . ' |
|
3308 | + FROM ' . prefixTable('cache_tree').' |
|
3311 | 3309 | WHERE user_id = %i', |
3312 | 3310 | $session->get('user-id') |
3313 | 3311 | ); |
@@ -3350,7 +3348,7 @@ discard block |
||
3350 | 3348 | if (count($folderIds) === 0) { |
3351 | 3349 | $folderIds = DB::queryFirstColumn( |
3352 | 3350 | 'SELECT id |
3353 | - FROM ' . prefixTable('nested_tree') . ' |
|
3351 | + FROM ' . prefixTable('nested_tree').' |
|
3354 | 3352 | WHERE personal_folder=%i', |
3355 | 3353 | 0 |
3356 | 3354 | ); |
@@ -3367,8 +3365,8 @@ discard block |
||
3367 | 3365 | $rows_tmp = DB::query( |
3368 | 3366 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
3369 | 3367 | f.id_category AS category_id |
3370 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
3371 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
3368 | + FROM ' . prefixTable('categories_folders').' AS f |
|
3369 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
3372 | 3370 | WHERE id_folder=%i', |
3373 | 3371 | $folder |
3374 | 3372 | ); |
@@ -3394,7 +3392,7 @@ discard block |
||
3394 | 3392 | $valTemp = ''; |
3395 | 3393 | $data = DB::queryFirstRow( |
3396 | 3394 | 'SELECT valeur |
3397 | - FROM ' . prefixTable('misc') . ' |
|
3395 | + FROM ' . prefixTable('misc').' |
|
3398 | 3396 | WHERE type = %s AND intitule=%i', |
3399 | 3397 | 'complex', |
3400 | 3398 | $folder |
@@ -3411,14 +3409,14 @@ discard block |
||
3411 | 3409 | $valTemp = ''; |
3412 | 3410 | $rows_tmp = DB::query( |
3413 | 3411 | 'SELECT t.title |
3414 | - FROM ' . prefixTable('roles_values') . ' as v |
|
3415 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
3412 | + FROM ' . prefixTable('roles_values').' as v |
|
3413 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
3416 | 3414 | WHERE v.folder_id = %i |
3417 | 3415 | GROUP BY title', |
3418 | 3416 | $folder |
3419 | 3417 | ); |
3420 | 3418 | foreach ($rows_tmp as $record) { |
3421 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
3419 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
3422 | 3420 | } |
3423 | 3421 | $arr_data['visibilityRoles'] = $valTemp; |
3424 | 3422 | |
@@ -3451,7 +3449,7 @@ discard block |
||
3451 | 3449 | // loop on users and check if user has this role |
3452 | 3450 | $rows = DB::query( |
3453 | 3451 | 'SELECT id, fonction_id |
3454 | - FROM ' . prefixTable('users') . ' |
|
3452 | + FROM ' . prefixTable('users').' |
|
3455 | 3453 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
3456 | 3454 | $session->get('user-id') |
3457 | 3455 | ); |
@@ -3483,7 +3481,7 @@ discard block |
||
3483 | 3481 | |
3484 | 3482 | $val = DB::queryFirstRow( |
3485 | 3483 | 'SELECT * |
3486 | - FROM ' . prefixTable('users') . ' |
|
3484 | + FROM ' . prefixTable('users').' |
|
3487 | 3485 | WHERE id = %i', |
3488 | 3486 | $userId |
3489 | 3487 | ); |
@@ -3499,12 +3497,12 @@ discard block |
||
3499 | 3497 | function upgradeRequired(): bool |
3500 | 3498 | { |
3501 | 3499 | // Get settings.php |
3502 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
3500 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
3503 | 3501 | |
3504 | 3502 | // Get timestamp in DB |
3505 | 3503 | $val = DB::queryFirstRow( |
3506 | 3504 | 'SELECT valeur |
3507 | - FROM ' . prefixTable('misc') . ' |
|
3505 | + FROM ' . prefixTable('misc').' |
|
3508 | 3506 | WHERE type = %s AND intitule = %s', |
3509 | 3507 | 'admin', |
3510 | 3508 | 'upgrade_timestamp' |
@@ -3555,7 +3553,7 @@ discard block |
||
3555 | 3553 | // prepapre background tasks for item keys generation |
3556 | 3554 | $userTP = DB::queryFirstRow( |
3557 | 3555 | 'SELECT pw, public_key, private_key |
3558 | - FROM ' . prefixTable('users') . ' |
|
3556 | + FROM ' . prefixTable('users').' |
|
3559 | 3557 | WHERE id = %i', |
3560 | 3558 | TP_USER_ID |
3561 | 3559 | ); |
@@ -3616,7 +3614,7 @@ discard block |
||
3616 | 3614 | } |
3617 | 3615 | |
3618 | 3616 | // Generate new keys |
3619 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
3617 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
3620 | 3618 | $userKeys = [ |
3621 | 3619 | 'public_key' => $recovery_public_key, |
3622 | 3620 | 'private_key_clear' => $recovery_private_key, |
@@ -3659,8 +3657,8 @@ discard block |
||
3659 | 3657 | 'process_type' => 'create_user_keys', |
3660 | 3658 | 'arguments' => json_encode([ |
3661 | 3659 | 'new_user_id' => (int) $userId, |
3662 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
3663 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
3660 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
3661 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
3664 | 3662 | 'owner_id' => (int) TP_USER_ID, |
3665 | 3663 | 'creator_pwd' => $userTP['pw'], |
3666 | 3664 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3731,19 +3729,19 @@ discard block |
||
3731 | 3729 | |
3732 | 3730 | // Prepare the subtask queries |
3733 | 3731 | $queries = [ |
3734 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
3732 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
3735 | 3733 | |
3736 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
3734 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
3737 | 3735 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
3738 | 3736 | |
3739 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
3737 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
3740 | 3738 | ' WHERE encryption_type = "teampass_aes"', |
3741 | 3739 | |
3742 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
3740 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
3743 | 3741 | |
3744 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
3745 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
3746 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
3742 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
3743 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
3744 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
3747 | 3745 | ]; |
3748 | 3746 | |
3749 | 3747 | // Perform loop on $queries to create sub-tasks |
@@ -3933,7 +3931,7 @@ discard block |
||
3933 | 3931 | */ |
3934 | 3932 | function createTaskForItem( |
3935 | 3933 | string $processType, |
3936 | - string|array $taskName, |
|
3934 | + string | array $taskName, |
|
3937 | 3935 | int $itemId, |
3938 | 3936 | int $userId, |
3939 | 3937 | string $objectKey, |
@@ -3957,7 +3955,7 @@ discard block |
||
3957 | 3955 | 'object_key' => $objectKey, |
3958 | 3956 | 'author' => (int) $userId, |
3959 | 3957 | ]), |
3960 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3958 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3961 | 3959 | ) |
3962 | 3960 | ); |
3963 | 3961 | $processId = DB::insertId(); |
@@ -3967,7 +3965,7 @@ discard block |
||
3967 | 3965 | if (is_array($taskName) === false) { |
3968 | 3966 | $taskName = [$taskName]; |
3969 | 3967 | } |
3970 | - foreach($taskName as $task) { |
|
3968 | + foreach ($taskName as $task) { |
|
3971 | 3969 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
3972 | 3970 | switch ($task) { |
3973 | 3971 | case 'item_password': |
@@ -4064,7 +4062,7 @@ discard block |
||
4064 | 4062 | * @param integer $user_id |
4065 | 4063 | * @return void |
4066 | 4064 | */ |
4067 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
4065 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
4068 | 4066 | { |
4069 | 4067 | if ($allUsers === true) { |
4070 | 4068 | // Load class DB |
@@ -4074,7 +4072,7 @@ discard block |
||
4074 | 4072 | |
4075 | 4073 | $users = DB::query( |
4076 | 4074 | 'SELECT id |
4077 | - FROM ' . prefixTable('users') . ' |
|
4075 | + FROM ' . prefixTable('users').' |
|
4078 | 4076 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
4079 | 4077 | ORDER BY login ASC' |
4080 | 4078 | ); |
@@ -4092,7 +4090,7 @@ discard block |
||
4092 | 4090 | * @param integer $user_id |
4093 | 4091 | * @return void |
4094 | 4092 | */ |
4095 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
4093 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
4096 | 4094 | { |
4097 | 4095 | if ($user_id === 0) { |
4098 | 4096 | return; |
@@ -4103,8 +4101,8 @@ discard block |
||
4103 | 4101 | |
4104 | 4102 | $personalItems = DB::queryFirstColumn( |
4105 | 4103 | 'SELECT id |
4106 | - FROM ' . prefixTable('items') . ' AS i |
|
4107 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
4104 | + FROM ' . prefixTable('items').' AS i |
|
4105 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
4108 | 4106 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
4109 | 4107 | $user_id |
4110 | 4108 | ); |
@@ -4153,7 +4151,7 @@ discard block |
||
4153 | 4151 | // Check if user exists |
4154 | 4152 | $userInfo = DB::queryFirstRow( |
4155 | 4153 | 'SELECT login |
4156 | - FROM ' . prefixTable('users') . ' |
|
4154 | + FROM ' . prefixTable('users').' |
|
4157 | 4155 | WHERE id = %i', |
4158 | 4156 | $userId |
4159 | 4157 | ); |
@@ -4162,7 +4160,7 @@ discard block |
||
4162 | 4160 | $now = (int) time(); |
4163 | 4161 | // Prepare file content |
4164 | 4162 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
4165 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
4163 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
4166 | 4164 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
4167 | 4165 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
4168 | 4166 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4185,7 +4183,7 @@ discard block |
||
4185 | 4183 | return prepareExchangedData( |
4186 | 4184 | array( |
4187 | 4185 | 'error' => false, |
4188 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
4186 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
4189 | 4187 | 'timestamp' => $now, |
4190 | 4188 | 'content' => base64_encode($export_value), |
4191 | 4189 | 'login' => $userInfo['login'], |
@@ -4211,8 +4209,8 @@ discard block |
||
4211 | 4209 | */ |
4212 | 4210 | function loadClasses(string $className = ''): void |
4213 | 4211 | { |
4214 | - require_once __DIR__. '/../includes/config/include.php'; |
|
4215 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
4212 | + require_once __DIR__.'/../includes/config/include.php'; |
|
4213 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
4216 | 4214 | require_once __DIR__.'/../vendor/autoload.php'; |
4217 | 4215 | |
4218 | 4216 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4425,7 +4423,7 @@ discard block |
||
4425 | 4423 | |
4426 | 4424 | // Get current user hash |
4427 | 4425 | $userHash = DB::queryFirstRow( |
4428 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
4426 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
4429 | 4427 | $session->get('user-id') |
4430 | 4428 | )['pw']; |
4431 | 4429 | |
@@ -4473,11 +4471,11 @@ discard block |
||
4473 | 4471 | } |
4474 | 4472 | |
4475 | 4473 | // Alternative: serialize ou json selon le contexte |
4476 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
4474 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
4477 | 4475 | } |
4478 | 4476 | |
4479 | 4477 | if (is_resource($value)) { |
4480 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
4478 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
4481 | 4479 | } |
4482 | 4480 | |
4483 | 4481 | // Cas par défaut |