@@ -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 | } |
@@ -362,20 +362,20 @@ discard block |
||
362 | 362 | // get complete list of ROLES |
363 | 363 | $tmp = explode(';', $idFonctions); |
364 | 364 | $rows = DB::query( |
365 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
365 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
366 | 366 | ORDER BY title ASC' |
367 | 367 | ); |
368 | 368 | foreach ($rows as $record) { |
369 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
369 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
370 | 370 | array_push($tmp, $record['id']); |
371 | 371 | } |
372 | 372 | } |
373 | 373 | $session->set('user-roles', implode(';', $tmp)); |
374 | 374 | $session->set('user-admin', 1); |
375 | 375 | // Check if admin has created Folders and Roles |
376 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
376 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
377 | 377 | $session->set('user-nb_folders', DB::count()); |
378 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
378 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
379 | 379 | $session->set('user-nb_roles', DB::count()); |
380 | 380 | |
381 | 381 | return true; |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | // Does this user is allowed to see other items |
459 | 459 | $inc = 0; |
460 | 460 | $rows = DB::query( |
461 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
461 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
462 | 462 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
463 | 463 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
464 | 464 | $globalsUserId, |
@@ -475,8 +475,8 @@ discard block |
||
475 | 475 | // Check for the users roles if some specific rights exist on items |
476 | 476 | $rows = DB::query( |
477 | 477 | 'SELECT i.id_tree, r.item_id |
478 | - FROM ' . prefixTable('items') . ' as i |
|
479 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
478 | + FROM ' . prefixTable('items').' as i |
|
479 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
480 | 480 | WHERE i.id_tree <> "" '. |
481 | 481 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
482 | 482 | 'ORDER BY i.id_tree ASC', |
@@ -520,18 +520,18 @@ discard block |
||
520 | 520 | $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems); |
521 | 521 | $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders); |
522 | 522 | // Folders and Roles numbers |
523 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
524 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
523 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
524 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
525 | 525 | $session->set('user-nb_folders', DB::count()); |
526 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
527 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
526 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
527 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
528 | 528 | $session->set('user-nb_roles', DB::count()); |
529 | 529 | // check if change proposals on User's items |
530 | 530 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
531 | 531 | $countNewItems = DB::query( |
532 | 532 | 'SELECT COUNT(*) |
533 | - FROM ' . prefixTable('items_change') . ' AS c |
|
534 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
533 | + FROM ' . prefixTable('items_change').' AS c |
|
534 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
535 | 535 | WHERE i.action = %s AND i.id_user = %i', |
536 | 536 | 'at_creation', |
537 | 537 | $globalsUserId |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | { |
559 | 559 | $rows = DB::query( |
560 | 560 | 'SELECT * |
561 | - FROM ' . prefixTable('roles_values') . ' |
|
561 | + FROM ' . prefixTable('roles_values').' |
|
562 | 562 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
563 | 563 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
564 | 564 | $userRoles, |
@@ -625,7 +625,7 @@ discard block |
||
625 | 625 | ) { |
626 | 626 | $persoFld = DB::queryFirstRow( |
627 | 627 | 'SELECT id |
628 | - FROM ' . prefixTable('nested_tree') . ' |
|
628 | + FROM ' . prefixTable('nested_tree').' |
|
629 | 629 | WHERE title = %s AND personal_folder = %i'. |
630 | 630 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
631 | 631 | $globalsUserId, |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | } |
659 | 659 | $persoFlds = DB::query( |
660 | 660 | 'SELECT id |
661 | - FROM ' . prefixTable('nested_tree') . ' |
|
661 | + FROM ' . prefixTable('nested_tree').' |
|
662 | 662 | WHERE %l', |
663 | 663 | $where |
664 | 664 | ); |
@@ -726,12 +726,12 @@ discard block |
||
726 | 726 | //Load Tree |
727 | 727 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
728 | 728 | // truncate table |
729 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
729 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
730 | 730 | // reload date |
731 | 731 | $rows = DB::query( |
732 | 732 | 'SELECT * |
733 | - FROM ' . prefixTable('items') . ' as i |
|
734 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
733 | + FROM ' . prefixTable('items').' as i |
|
734 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
735 | 735 | AND l.action = %s |
736 | 736 | AND i.inactif = %i', |
737 | 737 | 'at_creation', |
@@ -743,18 +743,18 @@ discard block |
||
743 | 743 | $tags = ''; |
744 | 744 | $itemTags = DB::query( |
745 | 745 | 'SELECT tag |
746 | - FROM ' . prefixTable('tags') . ' |
|
746 | + FROM ' . prefixTable('tags').' |
|
747 | 747 | WHERE item_id = %i AND tag != ""', |
748 | 748 | $record['id'] |
749 | 749 | ); |
750 | 750 | foreach ($itemTags as $itemTag) { |
751 | - $tags .= $itemTag['tag'] . ' '; |
|
751 | + $tags .= $itemTag['tag'].' '; |
|
752 | 752 | } |
753 | 753 | |
754 | 754 | // Get renewal period |
755 | 755 | $resNT = DB::queryFirstRow( |
756 | 756 | 'SELECT renewal_period |
757 | - FROM ' . prefixTable('nested_tree') . ' |
|
757 | + FROM ' . prefixTable('nested_tree').' |
|
758 | 758 | WHERE id = %i', |
759 | 759 | $record['id_tree'] |
760 | 760 | ); |
@@ -767,7 +767,7 @@ discard block |
||
767 | 767 | // Is this a User id? |
768 | 768 | $user = DB::queryFirstRow( |
769 | 769 | 'SELECT id, login |
770 | - FROM ' . prefixTable('users') . ' |
|
770 | + FROM ' . prefixTable('users').' |
|
771 | 771 | WHERE id = %i', |
772 | 772 | $elem->title |
773 | 773 | ); |
@@ -785,11 +785,11 @@ discard block |
||
785 | 785 | 'id' => $record['id'], |
786 | 786 | 'label' => $record['label'], |
787 | 787 | 'description' => $record['description'] ?? '', |
788 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
788 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
789 | 789 | 'tags' => $tags, |
790 | 790 | 'id_tree' => $record['id_tree'], |
791 | 791 | 'perso' => $record['perso'], |
792 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
792 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
793 | 793 | 'login' => $record['login'] ?? '', |
794 | 794 | 'folder' => implode(' » ', $folder), |
795 | 795 | 'author' => $record['id_user'], |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | // get new value from db |
819 | 819 | $data = DB::queryFirstRow( |
820 | 820 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
821 | - FROM ' . prefixTable('items') . ' |
|
821 | + FROM ' . prefixTable('items').' |
|
822 | 822 | WHERE id=%i', |
823 | 823 | $ident |
824 | 824 | ); |
@@ -826,12 +826,12 @@ discard block |
||
826 | 826 | $tags = ''; |
827 | 827 | $itemTags = DB::query( |
828 | 828 | 'SELECT tag |
829 | - FROM ' . prefixTable('tags') . ' |
|
829 | + FROM ' . prefixTable('tags').' |
|
830 | 830 | WHERE item_id = %i AND tag != ""', |
831 | 831 | $ident |
832 | 832 | ); |
833 | 833 | foreach ($itemTags as $itemTag) { |
834 | - $tags .= $itemTag['tag'] . ' '; |
|
834 | + $tags .= $itemTag['tag'].' '; |
|
835 | 835 | } |
836 | 836 | // form id_tree to full foldername |
837 | 837 | $folder = []; |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | // Is this a User id? |
843 | 843 | $user = DB::queryFirstRow( |
844 | 844 | 'SELECT id, login |
845 | - FROM ' . prefixTable('users') . ' |
|
845 | + FROM ' . prefixTable('users').' |
|
846 | 846 | WHERE id = %i', |
847 | 847 | $elem->title |
848 | 848 | ); |
@@ -860,10 +860,10 @@ discard block |
||
860 | 860 | 'label' => $data['label'], |
861 | 861 | 'description' => $data['description'], |
862 | 862 | 'tags' => $tags, |
863 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
863 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
864 | 864 | 'id_tree' => $data['id_tree'], |
865 | 865 | 'perso' => $data['perso'], |
866 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
866 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
867 | 867 | 'login' => $data['login'] ?? '', |
868 | 868 | 'folder' => implode(' » ', $folder), |
869 | 869 | 'author' => $session->get('user-id'), |
@@ -893,8 +893,8 @@ discard block |
||
893 | 893 | // get new value from db |
894 | 894 | $data = DB::queryFirstRow( |
895 | 895 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
896 | - FROM ' . prefixTable('items') . ' as i |
|
897 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
896 | + FROM ' . prefixTable('items').' as i |
|
897 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
898 | 898 | WHERE i.id = %i |
899 | 899 | AND l.action = %s', |
900 | 900 | $ident, |
@@ -904,12 +904,12 @@ discard block |
||
904 | 904 | $tags = ''; |
905 | 905 | $itemTags = DB::query( |
906 | 906 | 'SELECT tag |
907 | - FROM ' . prefixTable('tags') . ' |
|
907 | + FROM ' . prefixTable('tags').' |
|
908 | 908 | WHERE item_id = %i AND tag != ""', |
909 | 909 | $ident |
910 | 910 | ); |
911 | 911 | foreach ($itemTags as $itemTag) { |
912 | - $tags .= $itemTag['tag'] . ' '; |
|
912 | + $tags .= $itemTag['tag'].' '; |
|
913 | 913 | } |
914 | 914 | // form id_tree to full foldername |
915 | 915 | $folder = []; |
@@ -920,7 +920,7 @@ discard block |
||
920 | 920 | // Is this a User id? |
921 | 921 | $user = DB::queryFirstRow( |
922 | 922 | 'SELECT id, login |
923 | - FROM ' . prefixTable('users') . ' |
|
923 | + FROM ' . prefixTable('users').' |
|
924 | 924 | WHERE id = %i', |
925 | 925 | $elem->title |
926 | 926 | ); |
@@ -939,7 +939,7 @@ discard block |
||
939 | 939 | 'label' => $data['label'], |
940 | 940 | 'description' => $data['description'], |
941 | 941 | 'tags' => empty($tags) === false ? $tags : 'None', |
942 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
942 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
943 | 943 | 'id_tree' => $data['id_tree'], |
944 | 944 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
945 | 945 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -961,53 +961,53 @@ discard block |
||
961 | 961 | function getStatisticsData(array $SETTINGS): array |
962 | 962 | { |
963 | 963 | DB::query( |
964 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
964 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
965 | 965 | 0 |
966 | 966 | ); |
967 | 967 | $counter_folders = DB::count(); |
968 | 968 | DB::query( |
969 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
969 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
970 | 970 | 1 |
971 | 971 | ); |
972 | 972 | $counter_folders_perso = DB::count(); |
973 | 973 | DB::query( |
974 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
974 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
975 | 975 | 0 |
976 | 976 | ); |
977 | 977 | $counter_items = DB::count(); |
978 | 978 | DB::query( |
979 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
979 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
980 | 980 | 1 |
981 | 981 | ); |
982 | 982 | $counter_items_perso = DB::count(); |
983 | 983 | DB::query( |
984 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
984 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
985 | 985 | 'OTV', 'TP', 'API' |
986 | 986 | ); |
987 | 987 | $counter_users = DB::count(); |
988 | 988 | DB::query( |
989 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
989 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
990 | 990 | 1 |
991 | 991 | ); |
992 | 992 | $admins = DB::count(); |
993 | 993 | DB::query( |
994 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
994 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
995 | 995 | 1 |
996 | 996 | ); |
997 | 997 | $managers = DB::count(); |
998 | 998 | DB::query( |
999 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
999 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
1000 | 1000 | 1 |
1001 | 1001 | ); |
1002 | 1002 | $readOnly = DB::count(); |
1003 | 1003 | // list the languages |
1004 | 1004 | $usedLang = []; |
1005 | 1005 | $tp_languages = DB::query( |
1006 | - 'SELECT name FROM ' . prefixTable('languages') |
|
1006 | + 'SELECT name FROM '.prefixTable('languages') |
|
1007 | 1007 | ); |
1008 | 1008 | foreach ($tp_languages as $tp_language) { |
1009 | 1009 | DB::query( |
1010 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
1010 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
1011 | 1011 | $tp_language['name'] |
1012 | 1012 | ); |
1013 | 1013 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1016,12 +1016,12 @@ discard block |
||
1016 | 1016 | // get list of ips |
1017 | 1017 | $usedIp = []; |
1018 | 1018 | $tp_ips = DB::query( |
1019 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
1019 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
1020 | 1020 | ); |
1021 | 1021 | foreach ($tp_ips as $ip) { |
1022 | 1022 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
1023 | 1023 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
1024 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1024 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1025 | 1025 | $usedIp[$ip['user_ip']] = 1; |
1026 | 1026 | } |
1027 | 1027 | } |
@@ -1116,7 +1116,7 @@ discard block |
||
1116 | 1116 | <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;"> |
1117 | 1117 | <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;"> |
1118 | 1118 | <br><div style="float:right;">' . |
1119 | - $textMail . |
|
1119 | + $textMail. |
|
1120 | 1120 | '<br><br></td></tr></table> |
1121 | 1121 | </td></tr></table> |
1122 | 1122 | <br></body></html>'; |
@@ -1197,7 +1197,7 @@ discard block |
||
1197 | 1197 | { |
1198 | 1198 | array_walk_recursive( |
1199 | 1199 | $array, |
1200 | - static function (&$item): void { |
|
1200 | + static function(&$item): void { |
|
1201 | 1201 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
1202 | 1202 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
1203 | 1203 | } |
@@ -1308,7 +1308,7 @@ discard block |
||
1308 | 1308 | */ |
1309 | 1309 | function prefixTable(string $table): string |
1310 | 1310 | { |
1311 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
1311 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
1312 | 1312 | return $safeTable; |
1313 | 1313 | } |
1314 | 1314 | |
@@ -1425,7 +1425,7 @@ discard block |
||
1425 | 1425 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
1426 | 1426 | { |
1427 | 1427 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
1428 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
1428 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
1429 | 1429 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
1430 | 1430 | socket_close($sock); |
1431 | 1431 | } |
@@ -1472,14 +1472,14 @@ discard block |
||
1472 | 1472 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
1473 | 1473 | if ($type === 'user_mngt') { |
1474 | 1474 | send_syslog( |
1475 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
1475 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
1476 | 1476 | $SETTINGS['syslog_host'], |
1477 | 1477 | $SETTINGS['syslog_port'], |
1478 | 1478 | 'teampass' |
1479 | 1479 | ); |
1480 | 1480 | } else { |
1481 | 1481 | send_syslog( |
1482 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
1482 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
1483 | 1483 | $SETTINGS['syslog_host'], |
1484 | 1484 | $SETTINGS['syslog_port'], |
1485 | 1485 | 'teampass' |
@@ -1554,7 +1554,7 @@ discard block |
||
1554 | 1554 | if (empty($item_label) === true) { |
1555 | 1555 | $dataItem = DB::queryFirstRow( |
1556 | 1556 | 'SELECT id, id_tree, label |
1557 | - FROM ' . prefixTable('items') . ' |
|
1557 | + FROM ' . prefixTable('items').' |
|
1558 | 1558 | WHERE id = %i', |
1559 | 1559 | $item_id |
1560 | 1560 | ); |
@@ -1562,11 +1562,11 @@ discard block |
||
1562 | 1562 | } |
1563 | 1563 | |
1564 | 1564 | send_syslog( |
1565 | - 'action=' . str_replace('at_', '', $action) . |
|
1566 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
1567 | - ' itemno=' . $item_id . |
|
1568 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
1569 | - ' itemname="' . addslashes($item_label) . '"', |
|
1565 | + 'action='.str_replace('at_', '', $action). |
|
1566 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
1567 | + ' itemno='.$item_id. |
|
1568 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
1569 | + ' itemname="'.addslashes($item_label).'"', |
|
1570 | 1570 | $SETTINGS['syslog_host'], |
1571 | 1571 | $SETTINGS['syslog_port'], |
1572 | 1572 | 'teampass' |
@@ -1597,8 +1597,8 @@ discard block |
||
1597 | 1597 | // send email to user that what to be notified |
1598 | 1598 | $notification = DB::queryFirstField( |
1599 | 1599 | 'SELECT email |
1600 | - FROM ' . prefixTable('notification') . ' AS n |
|
1601 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
1600 | + FROM ' . prefixTable('notification').' AS n |
|
1601 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
1602 | 1602 | WHERE n.item_id = %i AND n.user_id != %i', |
1603 | 1603 | $item_id, |
1604 | 1604 | $globalsUserId |
@@ -1609,7 +1609,7 @@ discard block |
||
1609 | 1609 | // Get list of changes |
1610 | 1610 | $htmlChanges = '<ul>'; |
1611 | 1611 | foreach ($changes as $change) { |
1612 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
1612 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
1613 | 1613 | } |
1614 | 1614 | $htmlChanges .= '</ul>'; |
1615 | 1615 | // send email |
@@ -1646,15 +1646,15 @@ discard block |
||
1646 | 1646 | $path = ''; |
1647 | 1647 | foreach ($arbo as $elem) { |
1648 | 1648 | if (empty($path) === true) { |
1649 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
1649 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
1650 | 1650 | } else { |
1651 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1651 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1652 | 1652 | } |
1653 | 1653 | } |
1654 | 1654 | |
1655 | 1655 | // Build text to show user |
1656 | 1656 | if (empty($label) === false) { |
1657 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
1657 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
1658 | 1658 | } |
1659 | 1659 | return empty($path) === true ? '' : $path; |
1660 | 1660 | } |
@@ -1710,7 +1710,7 @@ discard block |
||
1710 | 1710 | { |
1711 | 1711 | // Perform a copy if the file exists |
1712 | 1712 | if (file_exists($configFilePath)) { |
1713 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
1713 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
1714 | 1714 | if (!copy($configFilePath, $backupFilePath)) { |
1715 | 1715 | return "ERROR: Could not copy file '$configFilePath'"; |
1716 | 1716 | } |
@@ -1718,10 +1718,10 @@ discard block |
||
1718 | 1718 | |
1719 | 1719 | // Regenerate the config file |
1720 | 1720 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
1721 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
1721 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
1722 | 1722 | foreach ($rows as $record) { |
1723 | 1723 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
1724 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
1724 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
1725 | 1725 | } |
1726 | 1726 | $data[] = ");\n"; |
1727 | 1727 | $data = array_unique($data); |
@@ -1766,7 +1766,7 @@ discard block |
||
1766 | 1766 | { |
1767 | 1767 | global $SETTINGS; |
1768 | 1768 | /* LOAD CPASSMAN SETTINGS */ |
1769 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1769 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1770 | 1770 | $SETTINGS = []; |
1771 | 1771 | $SETTINGS['duplicate_folder'] = 0; |
1772 | 1772 | //by default, this is set to 0; |
@@ -1776,7 +1776,7 @@ discard block |
||
1776 | 1776 | //by default, this value is set to 5; |
1777 | 1777 | $settings = []; |
1778 | 1778 | $rows = DB::query( |
1779 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
1779 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
1780 | 1780 | [ |
1781 | 1781 | 'type' => 'admin', |
1782 | 1782 | 'type2' => 'settings', |
@@ -1808,7 +1808,7 @@ discard block |
||
1808 | 1808 | $source_cf = []; |
1809 | 1809 | $rows = DB::query( |
1810 | 1810 | 'SELECT id_category |
1811 | - FROM ' . prefixTable('categories_folders') . ' |
|
1811 | + FROM ' . prefixTable('categories_folders').' |
|
1812 | 1812 | WHERE id_folder = %i', |
1813 | 1813 | $source_id |
1814 | 1814 | ); |
@@ -1819,7 +1819,7 @@ discard block |
||
1819 | 1819 | $target_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 | $target_id |
1825 | 1825 | ); |
@@ -1914,10 +1914,10 @@ discard block |
||
1914 | 1914 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1915 | 1915 | $err = 'wrong_key'; |
1916 | 1916 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1917 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1917 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1918 | 1918 | $err = 'environment_error'; |
1919 | 1919 | } catch (CryptoException\IOException $ex) { |
1920 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1920 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1921 | 1921 | $err = 'general_error'; |
1922 | 1922 | } |
1923 | 1923 | |
@@ -1950,10 +1950,10 @@ discard block |
||
1950 | 1950 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
1951 | 1951 | $err = 'wrong_key'; |
1952 | 1952 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
1953 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
1953 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
1954 | 1954 | $err = 'environment_error'; |
1955 | 1955 | } catch (CryptoException\IOException $ex) { |
1956 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
1956 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
1957 | 1957 | $err = 'general_error'; |
1958 | 1958 | } |
1959 | 1959 | |
@@ -2039,7 +2039,7 @@ discard block |
||
2039 | 2039 | ) { |
2040 | 2040 | // Check if the path exists |
2041 | 2041 | $path = basename($path); |
2042 | - if (! file_exists($path)) { |
|
2042 | + if (!file_exists($path)) { |
|
2043 | 2043 | return false; |
2044 | 2044 | } |
2045 | 2045 | |
@@ -2092,7 +2092,7 @@ discard block |
||
2092 | 2092 | // Load item data |
2093 | 2093 | $data = DB::queryFirstRow( |
2094 | 2094 | 'SELECT id_tree |
2095 | - FROM ' . prefixTable('items') . ' |
|
2095 | + FROM ' . prefixTable('items').' |
|
2096 | 2096 | WHERE id = %i', |
2097 | 2097 | $item_id |
2098 | 2098 | ); |
@@ -2155,7 +2155,7 @@ discard block |
||
2155 | 2155 | } |
2156 | 2156 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
2157 | 2157 | } |
2158 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
2158 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
2159 | 2159 | return $email; |
2160 | 2160 | } |
2161 | 2161 | |
@@ -2186,11 +2186,11 @@ discard block |
||
2186 | 2186 | function formatSizeUnits(int $bytes): string |
2187 | 2187 | { |
2188 | 2188 | if ($bytes >= 1073741824) { |
2189 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
2189 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
2190 | 2190 | } elseif ($bytes >= 1048576) { |
2191 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
2191 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
2192 | 2192 | } elseif ($bytes >= 1024) { |
2193 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
2193 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
2194 | 2194 | } elseif ($bytes > 1) { |
2195 | 2195 | $bytes .= ' bytes'; |
2196 | 2196 | } elseif ($bytes === 1) { |
@@ -2439,7 +2439,7 @@ discard block |
||
2439 | 2439 | $cipher->enableContinuousBuffer(); |
2440 | 2440 | |
2441 | 2441 | // Encrypt the file content |
2442 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
2442 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
2443 | 2443 | $fileContent = file_get_contents($filePath); |
2444 | 2444 | $plaintext = $fileContent; |
2445 | 2445 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2447,9 +2447,9 @@ discard block |
||
2447 | 2447 | // Save new file |
2448 | 2448 | // deepcode ignore InsecureHash: is simply used to get a unique name |
2449 | 2449 | $hash = uniqid('', true); |
2450 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
2450 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
2451 | 2451 | file_put_contents($fileOut, $ciphertext); |
2452 | - unlink($fileInPath . '/' . $fileInName); |
|
2452 | + unlink($fileInPath.'/'.$fileInName); |
|
2453 | 2453 | return [ |
2454 | 2454 | 'fileHash' => base64_encode($hash), |
2455 | 2455 | 'objectKey' => base64_encode($objectKey), |
@@ -2465,9 +2465,9 @@ discard block |
||
2465 | 2465 | * |
2466 | 2466 | * @return string|array |
2467 | 2467 | */ |
2468 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
2468 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
2469 | 2469 | { |
2470 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
2470 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
2471 | 2471 | define('FILE_BUFFER_SIZE', 128 * 1024); |
2472 | 2472 | } |
2473 | 2473 | |
@@ -2484,7 +2484,7 @@ discard block |
||
2484 | 2484 | $cipher->enableContinuousBuffer(); |
2485 | 2485 | $cipher->disablePadding(); |
2486 | 2486 | // Get file content |
2487 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
2487 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
2488 | 2488 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
2489 | 2489 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
2490 | 2490 | } else { |
@@ -2580,7 +2580,7 @@ discard block |
||
2580 | 2580 | // Only create the sharekey for a user |
2581 | 2581 | $user = DB::queryFirstRow( |
2582 | 2582 | 'SELECT public_key |
2583 | - FROM ' . prefixTable('users') . ' |
|
2583 | + FROM ' . prefixTable('users').' |
|
2584 | 2584 | WHERE id = %i |
2585 | 2585 | AND public_key != ""', |
2586 | 2586 | $userId |
@@ -2621,7 +2621,7 @@ discard block |
||
2621 | 2621 | } |
2622 | 2622 | $users = DB::query( |
2623 | 2623 | 'SELECT id, public_key |
2624 | - FROM ' . prefixTable('users') . ' |
|
2624 | + FROM ' . prefixTable('users').' |
|
2625 | 2625 | WHERE id NOT IN %li |
2626 | 2626 | AND public_key != ""', |
2627 | 2627 | $user_ids |
@@ -2630,7 +2630,7 @@ discard block |
||
2630 | 2630 | foreach ($users as $user) { |
2631 | 2631 | // Insert in DB the new object key for this item by user |
2632 | 2632 | if (count($objectKeyArray) === 0) { |
2633 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2633 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
2634 | 2634 | DB::insert( |
2635 | 2635 | $object_name, |
2636 | 2636 | [ |
@@ -2644,7 +2644,7 @@ discard block |
||
2644 | 2644 | ); |
2645 | 2645 | } else { |
2646 | 2646 | foreach ($objectKeyArray as $object) { |
2647 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2647 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
2648 | 2648 | DB::insert( |
2649 | 2649 | $object_name, |
2650 | 2650 | [ |
@@ -2672,7 +2672,7 @@ discard block |
||
2672 | 2672 | function isBase64(string $str): bool |
2673 | 2673 | { |
2674 | 2674 | $str = (string) trim($str); |
2675 | - if (! isset($str[0])) { |
|
2675 | + if (!isset($str[0])) { |
|
2676 | 2676 | return false; |
2677 | 2677 | } |
2678 | 2678 | |
@@ -2746,7 +2746,7 @@ discard block |
||
2746 | 2746 | } catch (\LdapRecord\Auth\BindException $e) { |
2747 | 2747 | $error = $e->getDetailedError(); |
2748 | 2748 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2749 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2749 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2750 | 2750 | } |
2751 | 2751 | // deepcode ignore ServerLeak: No important data is sent |
2752 | 2752 | echo 'An error occurred.'; |
@@ -2763,7 +2763,7 @@ discard block |
||
2763 | 2763 | } catch (\LdapRecord\Auth\BindException $e) { |
2764 | 2764 | $error = $e->getDetailedError(); |
2765 | 2765 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
2766 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2766 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2767 | 2767 | } |
2768 | 2768 | // deepcode ignore ServerLeak: No important data is sent |
2769 | 2769 | echo 'An error occurred.'; |
@@ -2790,7 +2790,7 @@ discard block |
||
2790 | 2790 | // expect if personal item |
2791 | 2791 | DB::delete( |
2792 | 2792 | prefixTable('sharekeys_items'), |
2793 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2793 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2794 | 2794 | $userId |
2795 | 2795 | ); |
2796 | 2796 | // Remove all item sharekeys files |
@@ -2798,8 +2798,8 @@ discard block |
||
2798 | 2798 | prefixTable('sharekeys_files'), |
2799 | 2799 | 'user_id = %i AND object_id NOT IN ( |
2800 | 2800 | SELECT f.id |
2801 | - FROM ' . prefixTable('items') . ' AS i |
|
2802 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
2801 | + FROM ' . prefixTable('items').' AS i |
|
2802 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
2803 | 2803 | WHERE i.perso = 1 |
2804 | 2804 | )', |
2805 | 2805 | $userId |
@@ -2809,8 +2809,8 @@ discard block |
||
2809 | 2809 | prefixTable('sharekeys_fields'), |
2810 | 2810 | 'user_id = %i AND object_id NOT IN ( |
2811 | 2811 | SELECT c.id |
2812 | - FROM ' . prefixTable('items') . ' AS i |
|
2813 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
2812 | + FROM ' . prefixTable('items').' AS i |
|
2813 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
2814 | 2814 | WHERE i.perso = 1 |
2815 | 2815 | )', |
2816 | 2816 | $userId |
@@ -2818,13 +2818,13 @@ discard block |
||
2818 | 2818 | // Remove all item sharekeys logs |
2819 | 2819 | DB::delete( |
2820 | 2820 | prefixTable('sharekeys_logs'), |
2821 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2821 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2822 | 2822 | $userId |
2823 | 2823 | ); |
2824 | 2824 | // Remove all item sharekeys suggestions |
2825 | 2825 | DB::delete( |
2826 | 2826 | prefixTable('sharekeys_suggestions'), |
2827 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2827 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2828 | 2828 | $userId |
2829 | 2829 | ); |
2830 | 2830 | return false; |
@@ -2845,7 +2845,7 @@ discard block |
||
2845 | 2845 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
2846 | 2846 | $now->setTimezone(new DateTimeZone($timezone)); |
2847 | 2847 | $offsets[] = $offset = $now->getOffset(); |
2848 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
2848 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
2849 | 2849 | } |
2850 | 2850 | |
2851 | 2851 | array_multisort($offsets, $timezones); |
@@ -2865,7 +2865,7 @@ discard block |
||
2865 | 2865 | { |
2866 | 2866 | $hours = intval($offset / 3600); |
2867 | 2867 | $minutes = abs(intval($offset % 3600 / 60)); |
2868 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2868 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2869 | 2869 | } |
2870 | 2870 | |
2871 | 2871 | /** |
@@ -2964,8 +2964,7 @@ discard block |
||
2964 | 2964 | { |
2965 | 2965 | if (isset($array[$key]) === true |
2966 | 2966 | && (is_int($value) === true ? |
2967 | - (int) $array[$key] === $value : |
|
2968 | - (string) $array[$key] === $value) |
|
2967 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
2969 | 2968 | ) { |
2970 | 2969 | return true; |
2971 | 2970 | } |
@@ -2987,8 +2986,7 @@ discard block |
||
2987 | 2986 | { |
2988 | 2987 | if (isset($var) === false |
2989 | 2988 | || (is_int($value) === true ? |
2990 | - (int) $var === $value : |
|
2991 | - (string) $var === $value) |
|
2989 | + (int) $var === $value : (string) $var === $value) |
|
2992 | 2990 | ) { |
2993 | 2991 | return true; |
2994 | 2992 | } |
@@ -3039,7 +3037,7 @@ discard block |
||
3039 | 3037 | */ |
3040 | 3038 | function isSetArrayOfValues(array $arrayOfValues): bool |
3041 | 3039 | { |
3042 | - foreach($arrayOfValues as $value) { |
|
3040 | + foreach ($arrayOfValues as $value) { |
|
3043 | 3041 | if (isset($value) === false) { |
3044 | 3042 | return false; |
3045 | 3043 | } |
@@ -3061,7 +3059,7 @@ discard block |
||
3061 | 3059 | /*PHP8 - integer|string*/$value |
3062 | 3060 | ) : bool |
3063 | 3061 | { |
3064 | - foreach($arrayOfVars as $variable) { |
|
3062 | + foreach ($arrayOfVars as $variable) { |
|
3065 | 3063 | if ($variable !== $value) { |
3066 | 3064 | return false; |
3067 | 3065 | } |
@@ -3081,7 +3079,7 @@ discard block |
||
3081 | 3079 | /*PHP8 - integer|string*/$value |
3082 | 3080 | ) : bool |
3083 | 3081 | { |
3084 | - foreach($arrayOfVars as $variable) { |
|
3082 | + foreach ($arrayOfVars as $variable) { |
|
3085 | 3083 | if ($variable === $value) { |
3086 | 3084 | return true; |
3087 | 3085 | } |
@@ -3095,7 +3093,7 @@ discard block |
||
3095 | 3093 | * @param string|int|null $value |
3096 | 3094 | * @return boolean |
3097 | 3095 | */ |
3098 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
3096 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
3099 | 3097 | { |
3100 | 3098 | if (is_null($value) === true || empty($value) === true) { |
3101 | 3099 | return true; |
@@ -3150,7 +3148,7 @@ discard block |
||
3150 | 3148 | * @param array $filters |
3151 | 3149 | * @return array|string |
3152 | 3150 | */ |
3153 | -function dataSanitizer(array $data, array $filters): array|string |
|
3151 | +function dataSanitizer(array $data, array $filters): array | string |
|
3154 | 3152 | { |
3155 | 3153 | // Load Sanitizer library |
3156 | 3154 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3179,7 +3177,7 @@ discard block |
||
3179 | 3177 | // Exists ? |
3180 | 3178 | $userCacheId = DB::queryFirstRow( |
3181 | 3179 | 'SELECT increment_id |
3182 | - FROM ' . prefixTable('cache_tree') . ' |
|
3180 | + FROM ' . prefixTable('cache_tree').' |
|
3183 | 3181 | WHERE user_id = %i', |
3184 | 3182 | $user_id |
3185 | 3183 | ); |
@@ -3230,7 +3228,7 @@ discard block |
||
3230 | 3228 | */ |
3231 | 3229 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
3232 | 3230 | { |
3233 | - $resultat = ($nombre/$total) * $pourcentage; |
|
3231 | + $resultat = ($nombre / $total) * $pourcentage; |
|
3234 | 3232 | return round($resultat); |
3235 | 3233 | } |
3236 | 3234 | |
@@ -3260,7 +3258,7 @@ discard block |
||
3260 | 3258 | |
3261 | 3259 | // Get last folder update |
3262 | 3260 | $lastFolderChange = DB::queryFirstRow( |
3263 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
3261 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
3264 | 3262 | WHERE type = %s AND intitule = %s', |
3265 | 3263 | 'timestamp', |
3266 | 3264 | 'last_folder_change' |
@@ -3281,7 +3279,7 @@ discard block |
||
3281 | 3279 | // Does this user has a tree cache |
3282 | 3280 | $userCacheTree = DB::queryFirstRow( |
3283 | 3281 | 'SELECT '.$fieldName.' |
3284 | - FROM ' . prefixTable('cache_tree') . ' |
|
3282 | + FROM ' . prefixTable('cache_tree').' |
|
3285 | 3283 | WHERE user_id = %i', |
3286 | 3284 | $session->get('user-id') |
3287 | 3285 | ); |
@@ -3319,7 +3317,7 @@ discard block |
||
3319 | 3317 | if (count($folderIds) === 0) { |
3320 | 3318 | $folderIds = DB::queryFirstColumn( |
3321 | 3319 | 'SELECT id |
3322 | - FROM ' . prefixTable('nested_tree') . ' |
|
3320 | + FROM ' . prefixTable('nested_tree').' |
|
3323 | 3321 | WHERE personal_folder=%i', |
3324 | 3322 | 0 |
3325 | 3323 | ); |
@@ -3336,8 +3334,8 @@ discard block |
||
3336 | 3334 | $rows_tmp = DB::query( |
3337 | 3335 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
3338 | 3336 | f.id_category AS category_id |
3339 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
3340 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
3337 | + FROM ' . prefixTable('categories_folders').' AS f |
|
3338 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
3341 | 3339 | WHERE id_folder=%i', |
3342 | 3340 | $folder |
3343 | 3341 | ); |
@@ -3363,7 +3361,7 @@ discard block |
||
3363 | 3361 | $valTemp = ''; |
3364 | 3362 | $data = DB::queryFirstRow( |
3365 | 3363 | 'SELECT valeur |
3366 | - FROM ' . prefixTable('misc') . ' |
|
3364 | + FROM ' . prefixTable('misc').' |
|
3367 | 3365 | WHERE type = %s AND intitule=%i', |
3368 | 3366 | 'complex', |
3369 | 3367 | $folder |
@@ -3380,14 +3378,14 @@ discard block |
||
3380 | 3378 | $valTemp = ''; |
3381 | 3379 | $rows_tmp = DB::query( |
3382 | 3380 | 'SELECT t.title |
3383 | - FROM ' . prefixTable('roles_values') . ' as v |
|
3384 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
3381 | + FROM ' . prefixTable('roles_values').' as v |
|
3382 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
3385 | 3383 | WHERE v.folder_id = %i |
3386 | 3384 | GROUP BY title', |
3387 | 3385 | $folder |
3388 | 3386 | ); |
3389 | 3387 | foreach ($rows_tmp as $record) { |
3390 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
3388 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
3391 | 3389 | } |
3392 | 3390 | $arr_data['visibilityRoles'] = $valTemp; |
3393 | 3391 | |
@@ -3420,7 +3418,7 @@ discard block |
||
3420 | 3418 | // loop on users and check if user has this role |
3421 | 3419 | $rows = DB::query( |
3422 | 3420 | 'SELECT id, fonction_id |
3423 | - FROM ' . prefixTable('users') . ' |
|
3421 | + FROM ' . prefixTable('users').' |
|
3424 | 3422 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
3425 | 3423 | $session->get('user-id') |
3426 | 3424 | ); |
@@ -3452,7 +3450,7 @@ discard block |
||
3452 | 3450 | |
3453 | 3451 | $val = DB::queryFirstRow( |
3454 | 3452 | 'SELECT * |
3455 | - FROM ' . prefixTable('users') . ' |
|
3453 | + FROM ' . prefixTable('users').' |
|
3456 | 3454 | WHERE id = %i', |
3457 | 3455 | $userId |
3458 | 3456 | ); |
@@ -3468,12 +3466,12 @@ discard block |
||
3468 | 3466 | function upgradeRequired(): bool |
3469 | 3467 | { |
3470 | 3468 | // Get settings.php |
3471 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
3469 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
3472 | 3470 | |
3473 | 3471 | // Get timestamp in DB |
3474 | 3472 | $val = DB::queryFirstRow( |
3475 | 3473 | 'SELECT valeur |
3476 | - FROM ' . prefixTable('misc') . ' |
|
3474 | + FROM ' . prefixTable('misc').' |
|
3477 | 3475 | WHERE type = %s AND intitule = %s', |
3478 | 3476 | 'admin', |
3479 | 3477 | 'upgrade_timestamp' |
@@ -3524,7 +3522,7 @@ discard block |
||
3524 | 3522 | // prepapre background tasks for item keys generation |
3525 | 3523 | $userTP = DB::queryFirstRow( |
3526 | 3524 | 'SELECT pw, public_key, private_key |
3527 | - FROM ' . prefixTable('users') . ' |
|
3525 | + FROM ' . prefixTable('users').' |
|
3528 | 3526 | WHERE id = %i', |
3529 | 3527 | TP_USER_ID |
3530 | 3528 | ); |
@@ -3585,7 +3583,7 @@ discard block |
||
3585 | 3583 | } |
3586 | 3584 | |
3587 | 3585 | // Generate new keys |
3588 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
3586 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
3589 | 3587 | $userKeys = [ |
3590 | 3588 | 'public_key' => $recovery_public_key, |
3591 | 3589 | 'private_key_clear' => $recovery_private_key, |
@@ -3628,8 +3626,8 @@ discard block |
||
3628 | 3626 | 'process_type' => 'create_user_keys', |
3629 | 3627 | 'arguments' => json_encode([ |
3630 | 3628 | 'new_user_id' => (int) $userId, |
3631 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
3632 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
3629 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
3630 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
3633 | 3631 | 'owner_id' => (int) TP_USER_ID, |
3634 | 3632 | 'creator_pwd' => $userTP['pw'], |
3635 | 3633 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3700,19 +3698,19 @@ discard block |
||
3700 | 3698 | |
3701 | 3699 | // Prepare the subtask queries |
3702 | 3700 | $queries = [ |
3703 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
3701 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
3704 | 3702 | |
3705 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
3703 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
3706 | 3704 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
3707 | 3705 | |
3708 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
3706 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
3709 | 3707 | ' WHERE encryption_type = "teampass_aes"', |
3710 | 3708 | |
3711 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
3709 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
3712 | 3710 | |
3713 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
3714 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
3715 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
3711 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
3712 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
3713 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
3716 | 3714 | ]; |
3717 | 3715 | |
3718 | 3716 | // Perform loop on $queries to create sub-tasks |
@@ -3902,7 +3900,7 @@ discard block |
||
3902 | 3900 | */ |
3903 | 3901 | function createTaskForItem( |
3904 | 3902 | string $processType, |
3905 | - string|array $taskName, |
|
3903 | + string | array $taskName, |
|
3906 | 3904 | int $itemId, |
3907 | 3905 | int $userId, |
3908 | 3906 | string $objectKey, |
@@ -3926,7 +3924,7 @@ discard block |
||
3926 | 3924 | 'object_key' => $objectKey, |
3927 | 3925 | 'author' => (int) $userId, |
3928 | 3926 | ]), |
3929 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3927 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3930 | 3928 | ) |
3931 | 3929 | ); |
3932 | 3930 | $processId = DB::insertId(); |
@@ -3936,7 +3934,7 @@ discard block |
||
3936 | 3934 | if (is_array($taskName) === false) { |
3937 | 3935 | $taskName = [$taskName]; |
3938 | 3936 | } |
3939 | - foreach($taskName as $task) { |
|
3937 | + foreach ($taskName as $task) { |
|
3940 | 3938 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
3941 | 3939 | switch ($task) { |
3942 | 3940 | case 'item_password': |
@@ -4033,7 +4031,7 @@ discard block |
||
4033 | 4031 | * @param integer $user_id |
4034 | 4032 | * @return void |
4035 | 4033 | */ |
4036 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
4034 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
4037 | 4035 | { |
4038 | 4036 | if ($allUsers === true) { |
4039 | 4037 | // Load class DB |
@@ -4043,7 +4041,7 @@ discard block |
||
4043 | 4041 | |
4044 | 4042 | $users = DB::query( |
4045 | 4043 | 'SELECT id |
4046 | - FROM ' . prefixTable('users') . ' |
|
4044 | + FROM ' . prefixTable('users').' |
|
4047 | 4045 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
4048 | 4046 | ORDER BY login ASC' |
4049 | 4047 | ); |
@@ -4061,7 +4059,7 @@ discard block |
||
4061 | 4059 | * @param integer $user_id |
4062 | 4060 | * @return void |
4063 | 4061 | */ |
4064 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
4062 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
4065 | 4063 | { |
4066 | 4064 | if ($user_id === 0) { |
4067 | 4065 | return; |
@@ -4072,8 +4070,8 @@ discard block |
||
4072 | 4070 | |
4073 | 4071 | $personalItems = DB::queryFirstColumn( |
4074 | 4072 | 'SELECT id |
4075 | - FROM ' . prefixTable('items') . ' AS i |
|
4076 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
4073 | + FROM ' . prefixTable('items').' AS i |
|
4074 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
4077 | 4075 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
4078 | 4076 | $user_id |
4079 | 4077 | ); |
@@ -4122,7 +4120,7 @@ discard block |
||
4122 | 4120 | // Check if user exists |
4123 | 4121 | $userInfo = DB::queryFirstRow( |
4124 | 4122 | 'SELECT login |
4125 | - FROM ' . prefixTable('users') . ' |
|
4123 | + FROM ' . prefixTable('users').' |
|
4126 | 4124 | WHERE id = %i', |
4127 | 4125 | $userId |
4128 | 4126 | ); |
@@ -4131,7 +4129,7 @@ discard block |
||
4131 | 4129 | $now = (int) time(); |
4132 | 4130 | // Prepare file content |
4133 | 4131 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
4134 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
4132 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
4135 | 4133 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
4136 | 4134 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
4137 | 4135 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4154,7 +4152,7 @@ discard block |
||
4154 | 4152 | return prepareExchangedData( |
4155 | 4153 | array( |
4156 | 4154 | 'error' => false, |
4157 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
4155 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
4158 | 4156 | 'timestamp' => $now, |
4159 | 4157 | 'content' => base64_encode($export_value), |
4160 | 4158 | 'login' => $userInfo['login'], |
@@ -4180,8 +4178,8 @@ discard block |
||
4180 | 4178 | */ |
4181 | 4179 | function loadClasses(string $className = ''): void |
4182 | 4180 | { |
4183 | - require_once __DIR__. '/../includes/config/include.php'; |
|
4184 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
4181 | + require_once __DIR__.'/../includes/config/include.php'; |
|
4182 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
4185 | 4183 | require_once __DIR__.'/../vendor/autoload.php'; |
4186 | 4184 | |
4187 | 4185 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4394,7 +4392,7 @@ discard block |
||
4394 | 4392 | |
4395 | 4393 | // Get current user hash |
4396 | 4394 | $userHash = DB::queryFirstRow( |
4397 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
4395 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
4398 | 4396 | $session->get('user-id') |
4399 | 4397 | )['pw']; |
4400 | 4398 | |
@@ -4442,11 +4440,11 @@ discard block |
||
4442 | 4440 | } |
4443 | 4441 | |
4444 | 4442 | // Alternative: serialize ou json selon le contexte |
4445 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
4443 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
4446 | 4444 | } |
4447 | 4445 | |
4448 | 4446 | if (is_resource($value)) { |
4449 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
4447 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
4450 | 4448 | } |
4451 | 4449 | |
4452 | 4450 | // Cas par défaut |
@@ -4466,7 +4464,7 @@ discard block |
||
4466 | 4464 | // Refuse access if user does not exist and/or is admin |
4467 | 4465 | $user = DB::queryFirstRow( |
4468 | 4466 | 'SELECT admin |
4469 | - FROM ' . prefixTable('users') . ' |
|
4467 | + FROM ' . prefixTable('users').' |
|
4470 | 4468 | WHERE id = %i', |
4471 | 4469 | $userId |
4472 | 4470 | ); |
@@ -4477,8 +4475,8 @@ discard block |
||
4477 | 4475 | // Get file info |
4478 | 4476 | $file = DB::queryFirstRow( |
4479 | 4477 | 'SELECT f.id_item, i.id_tree |
4480 | - FROM ' . prefixTable('files') . ' as f |
|
4481 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
4478 | + FROM ' . prefixTable('files').' as f |
|
4479 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
4482 | 4480 | WHERE f.id = %i', |
4483 | 4481 | $fileId |
4484 | 4482 | ); |
@@ -4487,7 +4485,7 @@ discard block |
||
4487 | 4485 | } |
4488 | 4486 | |
4489 | 4487 | // Check if user has access to the item |
4490 | - include_once __DIR__. '/items.queries.php'; |
|
4488 | + include_once __DIR__.'/items.queries.php'; |
|
4491 | 4489 | $itemAccess = getCurrentAccessRights( |
4492 | 4490 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
4493 | 4491 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |