@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | DB::update( |
112 | 112 | prefixTable('background_subtasks'), |
113 | 113 | array( |
114 | - 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
114 | + 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
115 | 115 | 'is_in_progress' => 0, |
116 | 116 | 'finished_at' => time(), |
117 | 117 | 'updated_at' => time(), |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | // Check if user exists |
148 | 148 | $userInfo = DB::queryFirstRow( |
149 | 149 | 'SELECT public_key, private_key |
150 | - FROM ' . prefixTable('users') . ' |
|
150 | + FROM ' . prefixTable('users').' |
|
151 | 151 | WHERE id = %i', |
152 | 152 | $post_user_id |
153 | 153 | ); |
@@ -260,13 +260,13 @@ discard block |
||
260 | 260 | { |
261 | 261 | $userInfo = DB::queryFirstRow( |
262 | 262 | 'SELECT pw, public_key, private_key, login, name |
263 | - FROM ' . prefixTable('users') . ' |
|
263 | + FROM ' . prefixTable('users').' |
|
264 | 264 | WHERE id = %i', |
265 | 265 | $owner_id |
266 | 266 | ); |
267 | 267 | |
268 | 268 | // decrypt owner password |
269 | - $pwd = cryption($owner_pwd, '','decrypt', $SETTINGS)['string']; |
|
269 | + $pwd = cryption($owner_pwd, '', 'decrypt', $SETTINGS)['string']; |
|
270 | 270 | // decrypt private key and send back |
271 | 271 | return [ |
272 | 272 | 'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']), |
@@ -306,17 +306,17 @@ discard block |
||
306 | 306 | // Loop on items |
307 | 307 | $rows = DB::query( |
308 | 308 | 'SELECT id, pw, perso |
309 | - FROM ' . prefixTable('items') . ' |
|
309 | + FROM ' . prefixTable('items').' |
|
310 | 310 | '.(isset($extra_arguments['only_personal_items']) === true && $extra_arguments['only_personal_items'] === 1 ? 'WHERE perso = 1' : '').' |
311 | 311 | ORDER BY id ASC |
312 | - LIMIT ' . $post_start . ', ' . $post_length |
|
312 | + LIMIT ' . $post_start.', '.$post_length |
|
313 | 313 | ); |
314 | 314 | // WHERE perso = 0 |
315 | 315 | foreach ($rows as $record) { |
316 | 316 | // Get itemKey from current user |
317 | 317 | $currentUserKey = DB::queryFirstRow( |
318 | 318 | 'SELECT share_key, increment_id |
319 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
319 | + FROM ' . prefixTable('sharekeys_items').' |
|
320 | 320 | WHERE object_id = %i AND user_id = %i', |
321 | 321 | $record['id'], |
322 | 322 | //$extra_arguments['owner_id'] |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | |
346 | 346 | $currentUserKey = DB::queryFirstRow( |
347 | 347 | 'SELECT increment_id |
348 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
348 | + FROM ' . prefixTable('sharekeys_items').' |
|
349 | 349 | WHERE object_id = %i AND user_id = %i', |
350 | 350 | $record['id'], |
351 | 351 | $post_user_id |
@@ -419,15 +419,15 @@ discard block |
||
419 | 419 | // Loop on logs |
420 | 420 | $rows = DB::query( |
421 | 421 | 'SELECT increment_id |
422 | - FROM ' . prefixTable('log_items') . ' |
|
422 | + FROM ' . prefixTable('log_items').' |
|
423 | 423 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
424 | - LIMIT ' . $post_start . ', ' . $post_length |
|
424 | + LIMIT ' . $post_start.', '.$post_length |
|
425 | 425 | ); |
426 | 426 | foreach ($rows as $record) { |
427 | 427 | // Get itemKey from current user |
428 | 428 | $currentUserKey = DB::queryFirstRow( |
429 | 429 | 'SELECT share_key |
430 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
430 | + FROM ' . prefixTable('sharekeys_logs').' |
|
431 | 431 | WHERE object_id = %i AND user_id = %i', |
432 | 432 | $record['increment_id'], |
433 | 433 | $extra_arguments['owner_id'] |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) { |
460 | 460 | $currentUserKey = DB::queryFirstRow( |
461 | 461 | 'SELECT increment_id |
462 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
462 | + FROM ' . prefixTable('sharekeys_items').' |
|
463 | 463 | WHERE object_id = %i AND user_id = %i', |
464 | 464 | $record['id'], |
465 | 465 | $post_user_id |
@@ -481,7 +481,7 @@ discard block |
||
481 | 481 | // SHould we change step? |
482 | 482 | DB::query( |
483 | 483 | 'SELECT increment_id |
484 | - FROM ' . prefixTable('log_items') . ' |
|
484 | + FROM ' . prefixTable('log_items').' |
|
485 | 485 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
486 | 486 | ); |
487 | 487 | |
@@ -521,15 +521,15 @@ discard block |
||
521 | 521 | // Loop on fields |
522 | 522 | $rows = DB::query( |
523 | 523 | 'SELECT id |
524 | - FROM ' . prefixTable('categories_items') . ' |
|
524 | + FROM ' . prefixTable('categories_items').' |
|
525 | 525 | WHERE encryption_type = "teampass_aes" |
526 | - LIMIT ' . $post_start . ', ' . $post_length |
|
526 | + LIMIT ' . $post_start.', '.$post_length |
|
527 | 527 | ); |
528 | 528 | foreach ($rows as $record) { |
529 | 529 | // Get itemKey from current user |
530 | 530 | $currentUserKey = DB::queryFirstRow( |
531 | 531 | 'SELECT share_key |
532 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
532 | + FROM ' . prefixTable('sharekeys_fields').' |
|
533 | 533 | WHERE object_id = %i AND user_id = %i', |
534 | 534 | $record['id'], |
535 | 535 | $extra_arguments['owner_id'] |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) { |
558 | 558 | $currentUserKey = DB::queryFirstRow( |
559 | 559 | 'SELECT increment_id |
560 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
560 | + FROM ' . prefixTable('sharekeys_items').' |
|
561 | 561 | WHERE object_id = %i AND user_id = %i', |
562 | 562 | $record['id'], |
563 | 563 | $post_user_id |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | // SHould we change step? |
581 | 581 | DB::query( |
582 | 582 | 'SELECT * |
583 | - FROM ' . prefixTable('categories_items') . ' |
|
583 | + FROM ' . prefixTable('categories_items').' |
|
584 | 584 | WHERE encryption_type = "teampass_aes"' |
585 | 585 | ); |
586 | 586 | |
@@ -620,14 +620,14 @@ discard block |
||
620 | 620 | // Loop on suggestions |
621 | 621 | $rows = DB::query( |
622 | 622 | 'SELECT id |
623 | - FROM ' . prefixTable('suggestion') . ' |
|
624 | - LIMIT ' . $post_start . ', ' . $post_length |
|
623 | + FROM ' . prefixTable('suggestion').' |
|
624 | + LIMIT ' . $post_start.', '.$post_length |
|
625 | 625 | ); |
626 | 626 | foreach ($rows as $record) { |
627 | 627 | // Get itemKey from current user |
628 | 628 | $currentUserKey = DB::queryFirstRow( |
629 | 629 | 'SELECT share_key |
630 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
630 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
631 | 631 | WHERE object_id = %i AND user_id = %i', |
632 | 632 | $record['id'], |
633 | 633 | $extra_arguments['owner_id'] |
@@ -659,7 +659,7 @@ discard block |
||
659 | 659 | if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) { |
660 | 660 | $currentUserKey = DB::queryFirstRow( |
661 | 661 | 'SELECT increment_id |
662 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
662 | + FROM ' . prefixTable('sharekeys_items').' |
|
663 | 663 | WHERE object_id = %i AND user_id = %i', |
664 | 664 | $record['id'], |
665 | 665 | $post_user_id |
@@ -719,16 +719,16 @@ discard block |
||
719 | 719 | // Loop on files |
720 | 720 | $rows = DB::query( |
721 | 721 | 'SELECT f.id AS id, i.perso AS perso |
722 | - FROM ' . prefixTable('files') . ' AS f |
|
723 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
724 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '" |
|
725 | - LIMIT ' . $post_start . ', ' . $post_length |
|
722 | + FROM ' . prefixTable('files').' AS f |
|
723 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
724 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'" |
|
725 | + LIMIT ' . $post_start.', '.$post_length |
|
726 | 726 | ); //aes_encryption |
727 | 727 | foreach ($rows as $record) { |
728 | 728 | // Get itemKey from current user |
729 | 729 | $currentUserKey = DB::queryFirstRow( |
730 | 730 | 'SELECT share_key, increment_id |
731 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
731 | + FROM ' . prefixTable('sharekeys_files').' |
|
732 | 732 | WHERE object_id = %i AND user_id = %i', |
733 | 733 | $record['id'], |
734 | 734 | (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id'] |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | |
757 | 757 | $currentUserKey = DB::queryFirstRow( |
758 | 758 | 'SELECT increment_id |
759 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
759 | + FROM ' . prefixTable('sharekeys_files').' |
|
760 | 760 | WHERE object_id = %i AND user_id = %i', |
761 | 761 | $record['id'], |
762 | 762 | $post_user_id |
@@ -787,8 +787,8 @@ discard block |
||
787 | 787 | // SHould we change step? Finished ? |
788 | 788 | DB::query( |
789 | 789 | 'SELECT * |
790 | - FROM ' . prefixTable('files') . ' |
|
791 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
790 | + FROM ' . prefixTable('files').' |
|
791 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
792 | 792 | ); |
793 | 793 | $counter = DB::count(); |
794 | 794 | $next_start = (int) $post_start + (int) $post_length; |
@@ -854,7 +854,7 @@ discard block |
||
854 | 854 | // get user info |
855 | 855 | $userInfo = DB::queryFirstRow( |
856 | 856 | 'SELECT email, login, auth_type, special, lastname, name |
857 | - FROM ' . prefixTable('users') . ' |
|
857 | + FROM ' . prefixTable('users').' |
|
858 | 858 | WHERE id = %i', |
859 | 859 | $extra_arguments['new_user_id'] |
860 | 860 | ); |
@@ -869,10 +869,10 @@ discard block |
||
869 | 869 | filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
870 | 870 | // @scrutinizer ignore-type |
871 | 871 | empty($extra_arguments['email_body']) === false ? $extra_arguments['email_body'] : $lang->get('email_body_user_config_1'), |
872 | - 'TEAMPASS - ' . $lang->get('login_credentials'), |
|
872 | + 'TEAMPASS - '.$lang->get('login_credentials'), |
|
873 | 873 | (array) filter_var_array( |
874 | 874 | [ |
875 | - '#code#' => cryption($extra_arguments['new_user_code'], '','decrypt', $SETTINGS)['string'], |
|
875 | + '#code#' => cryption($extra_arguments['new_user_code'], '', 'decrypt', $SETTINGS)['string'], |
|
876 | 876 | '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '', |
877 | 877 | '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '', |
878 | 878 | ], |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ) { |
74 | 74 | // Not allowed page |
75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
77 | 77 | exit; |
78 | 78 | } |
79 | 79 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $post_isNewItem = $request->request->filter('isNewItem', null, FILTER_SANITIZE_NUMBER_INT); |
107 | 107 | $post_randomId = $request->request->filter('randomId', null, FILTER_SANITIZE_NUMBER_INT); |
108 | 108 | $post_isPersonal = $request->request->filter('isPersonal', null, FILTER_SANITIZE_NUMBER_INT); |
109 | -$post_fileSize= $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
109 | +$post_fileSize = $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
110 | 110 | $chunk = $request->request->filter('chunk', 0, FILTER_SANITIZE_NUMBER_INT); |
111 | 111 | $chunks = $request->request->filter('chunks', 0, FILTER_SANITIZE_NUMBER_INT); |
112 | 112 | $fileName = $request->request->filter('name', '', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | // check if token is expired |
166 | 166 | $data = DB::queryFirstRow( |
167 | 167 | 'SELECT end_timestamp |
168 | - FROM ' . prefixTable('tokens') . ' |
|
168 | + FROM ' . prefixTable('tokens').' |
|
169 | 169 | WHERE user_id = %i AND token = %s', |
170 | 170 | $session->get('user-id'), |
171 | 171 | $post_user_token |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | |
199 | 199 | // HTTP headers for no cache etc |
200 | 200 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
201 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
201 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
202 | 202 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
203 | 203 | header('Cache-Control: post-check=0, pre-check=0', false); |
204 | 204 | |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | // Validate file name (for our purposes we'll just remove invalid characters) |
245 | 245 | $file_name = preg_replace('[^A-Za-z0-9]', '', strtolower(basename($_FILES['file']['name']))); |
246 | 246 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
247 | - handleAttachmentError('Invalid file name: ' . $file_name . '.', 114); |
|
247 | + handleAttachmentError('Invalid file name: '.$file_name.'.', 114); |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | // Validate file extension |
@@ -254,8 +254,8 @@ discard block |
||
254 | 254 | $ext, |
255 | 255 | explode( |
256 | 256 | ',', |
257 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
258 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
257 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
258 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
259 | 259 | ) |
260 | 260 | ) === false |
261 | 261 | ) { |
@@ -267,24 +267,24 @@ discard block |
||
267 | 267 | |
268 | 268 | // Clean the fileName for security reasons |
269 | 269 | $fileInfo = pathinfo($fileName); |
270 | -$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension']; |
|
270 | +$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension']; |
|
271 | 271 | $fileFullSize = 0; |
272 | 272 | |
273 | 273 | // Make sure the fileName is unique but only if chunking is disabled |
274 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
274 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
275 | 275 | $ext = strrpos($fileName, '.'); |
276 | 276 | $fileNameA = substr($fileName, 0, $ext); |
277 | 277 | $fileNameB = substr($fileName, $ext); |
278 | 278 | |
279 | 279 | $count = 1; |
280 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
280 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
281 | 281 | ++$count; |
282 | 282 | } |
283 | 283 | |
284 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
284 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
285 | 285 | } |
286 | 286 | |
287 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
287 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
288 | 288 | |
289 | 289 | // Create target dir |
290 | 290 | if (file_exists($targetDir) === false) { |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | // Remove old temp files |
299 | 299 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
300 | 300 | while (($file = readdir($dir)) !== false) { |
301 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
301 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
302 | 302 | |
303 | 303 | // Remove temp file if it is older than the max age and is not the current file |
304 | 304 | if ( |
@@ -420,8 +420,8 @@ discard block |
||
420 | 420 | // This is a public object |
421 | 421 | $users = DB::query( |
422 | 422 | 'SELECT id, public_key |
423 | - FROM ' . prefixTable('users') . ' |
|
424 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
423 | + FROM ' . prefixTable('users').' |
|
424 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
425 | 425 | AND public_key != ""' |
426 | 426 | ); |
427 | 427 | foreach ($users as $user) { |
@@ -459,14 +459,14 @@ discard block |
||
459 | 459 | 'date' => time(), |
460 | 460 | 'id_user' => $session->get('user-id'), |
461 | 461 | 'action' => 'at_modification', |
462 | - 'raison' => 'at_add_file : ' . $fileName . ':' . $newID, |
|
462 | + 'raison' => 'at_add_file : '.$fileName.':'.$newID, |
|
463 | 463 | ) |
464 | 464 | ); |
465 | 465 | } |
466 | 466 | } |
467 | 467 | |
468 | 468 | // Return JSON-RPC response |
469 | -die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}'); |
|
469 | +die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}'); |
|
470 | 470 | |
471 | 471 | /** |
472 | 472 | * Handle errors and kill script. |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | http_response_code($http_code); |
483 | 483 | |
484 | 484 | // json error message |
485 | - echo '{"jsonrpc" : "2.0", "error" : {"code": ' . htmlentities((string) $code, ENT_QUOTES) . ', "message": "' . htmlentities((string) $message, ENT_QUOTES) . '"}, "id" : "id"}'; |
|
485 | + echo '{"jsonrpc" : "2.0", "error" : {"code": '.htmlentities((string) $code, ENT_QUOTES).', "message": "'.htmlentities((string) $message, ENT_QUOTES).'"}, "id" : "id"}'; |
|
486 | 486 | |
487 | 487 | // Force exit to avoid bypass filters. |
488 | 488 | exit; |
@@ -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 | |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | $globalsVisibleFolders = $session->get('user-accessible_folders'); |
356 | 356 | $globalsPersonalVisibleFolders = $session->get('user-personal_visible_folders'); |
357 | 357 | // Get list of Folders |
358 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
358 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
359 | 359 | foreach ($rows as $record) { |
360 | 360 | array_push($groupesVisibles, $record['id']); |
361 | 361 | } |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | } |
375 | 375 | // Get ID of personal folder |
376 | 376 | $persfld = DB::queryfirstrow( |
377 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', |
|
377 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s', |
|
378 | 378 | $globalsUserId |
379 | 379 | ); |
380 | 380 | if (empty($persfld['id']) === false) { |
@@ -394,20 +394,20 @@ discard block |
||
394 | 394 | // get complete list of ROLES |
395 | 395 | $tmp = explode(';', $idFonctions); |
396 | 396 | $rows = DB::query( |
397 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
397 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
398 | 398 | ORDER BY title ASC' |
399 | 399 | ); |
400 | 400 | foreach ($rows as $record) { |
401 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
401 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
402 | 402 | array_push($tmp, $record['id']); |
403 | 403 | } |
404 | 404 | } |
405 | 405 | $session->set('user-roles', implode(';', $tmp)); |
406 | 406 | $session->set('user-admin', 1); |
407 | 407 | // Check if admin has created Folders and Roles |
408 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
408 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
409 | 409 | $session->set('user-nb_folders', DB::count()); |
410 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
410 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
411 | 411 | $session->set('user-nb_roles', DB::count()); |
412 | 412 | |
413 | 413 | return true; |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | // Does this user is allowed to see other items |
491 | 491 | $inc = 0; |
492 | 492 | $rows = DB::query( |
493 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
493 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
494 | 494 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
495 | 495 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
496 | 496 | $globalsUserId, |
@@ -507,8 +507,8 @@ discard block |
||
507 | 507 | // Check for the users roles if some specific rights exist on items |
508 | 508 | $rows = DB::query( |
509 | 509 | 'SELECT i.id_tree, r.item_id |
510 | - FROM ' . prefixTable('items') . ' as i |
|
511 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
510 | + FROM ' . prefixTable('items').' as i |
|
511 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
512 | 512 | WHERE i.id_tree <> "" '. |
513 | 513 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
514 | 514 | 'ORDER BY i.id_tree ASC', |
@@ -562,16 +562,16 @@ discard block |
||
562 | 562 | ), SORT_NUMERIC) |
563 | 563 | ); |
564 | 564 | // Folders and Roles numbers |
565 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
565 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
566 | 566 | $session->set('user-nb_folders', DB::count()); |
567 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title')); |
|
567 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title')); |
|
568 | 568 | $session->set('user-nb_roles', DB::count()); |
569 | 569 | // check if change proposals on User's items |
570 | 570 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
571 | 571 | $countNewItems = DB::query( |
572 | 572 | 'SELECT COUNT(*) |
573 | - FROM ' . prefixTable('items_change') . ' AS c |
|
574 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
573 | + FROM ' . prefixTable('items_change').' AS c |
|
574 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
575 | 575 | WHERE i.action = %s AND i.id_user = %i', |
576 | 576 | 'at_creation', |
577 | 577 | $globalsUserId |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | { |
599 | 599 | $rows = DB::query( |
600 | 600 | 'SELECT * |
601 | - FROM ' . prefixTable('roles_values') . ' |
|
601 | + FROM ' . prefixTable('roles_values').' |
|
602 | 602 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
603 | 603 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
604 | 604 | $userRoles, |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | ) { |
666 | 666 | $persoFld = DB::queryfirstrow( |
667 | 667 | 'SELECT id |
668 | - FROM ' . prefixTable('nested_tree') . ' |
|
668 | + FROM ' . prefixTable('nested_tree').' |
|
669 | 669 | WHERE title = %s AND personal_folder = %i'. |
670 | 670 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
671 | 671 | $globalsUserId, |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | } |
699 | 699 | $persoFlds = DB::query( |
700 | 700 | 'SELECT id |
701 | - FROM ' . prefixTable('nested_tree') . ' |
|
701 | + FROM ' . prefixTable('nested_tree').' |
|
702 | 702 | WHERE %l', |
703 | 703 | $where |
704 | 704 | ); |
@@ -766,12 +766,12 @@ discard block |
||
766 | 766 | //Load Tree |
767 | 767 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
768 | 768 | // truncate table |
769 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
769 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
770 | 770 | // reload date |
771 | 771 | $rows = DB::query( |
772 | 772 | 'SELECT * |
773 | - FROM ' . prefixTable('items') . ' as i |
|
774 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
773 | + FROM ' . prefixTable('items').' as i |
|
774 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
775 | 775 | AND l.action = %s |
776 | 776 | AND i.inactif = %i', |
777 | 777 | 'at_creation', |
@@ -783,18 +783,18 @@ discard block |
||
783 | 783 | $tags = ''; |
784 | 784 | $itemTags = DB::query( |
785 | 785 | 'SELECT tag |
786 | - FROM ' . prefixTable('tags') . ' |
|
786 | + FROM ' . prefixTable('tags').' |
|
787 | 787 | WHERE item_id = %i AND tag != ""', |
788 | 788 | $record['id'] |
789 | 789 | ); |
790 | 790 | foreach ($itemTags as $itemTag) { |
791 | - $tags .= $itemTag['tag'] . ' '; |
|
791 | + $tags .= $itemTag['tag'].' '; |
|
792 | 792 | } |
793 | 793 | |
794 | 794 | // Get renewal period |
795 | 795 | $resNT = DB::queryfirstrow( |
796 | 796 | 'SELECT renewal_period |
797 | - FROM ' . prefixTable('nested_tree') . ' |
|
797 | + FROM ' . prefixTable('nested_tree').' |
|
798 | 798 | WHERE id = %i', |
799 | 799 | $record['id_tree'] |
800 | 800 | ); |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | // Is this a User id? |
808 | 808 | $user = DB::queryfirstrow( |
809 | 809 | 'SELECT id, login |
810 | - FROM ' . prefixTable('users') . ' |
|
810 | + FROM ' . prefixTable('users').' |
|
811 | 811 | WHERE id = %i', |
812 | 812 | $elem->title |
813 | 813 | ); |
@@ -825,11 +825,11 @@ discard block |
||
825 | 825 | 'id' => $record['id'], |
826 | 826 | 'label' => $record['label'], |
827 | 827 | 'description' => $record['description'] ?? '', |
828 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
828 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
829 | 829 | 'tags' => $tags, |
830 | 830 | 'id_tree' => $record['id_tree'], |
831 | 831 | 'perso' => $record['perso'], |
832 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
832 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
833 | 833 | 'login' => $record['login'] ?? '', |
834 | 834 | 'folder' => implode(' > ', $folder), |
835 | 835 | 'author' => $record['id_user'], |
@@ -858,7 +858,7 @@ discard block |
||
858 | 858 | // get new value from db |
859 | 859 | $data = DB::queryfirstrow( |
860 | 860 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
861 | - FROM ' . prefixTable('items') . ' |
|
861 | + FROM ' . prefixTable('items').' |
|
862 | 862 | WHERE id=%i', |
863 | 863 | $ident |
864 | 864 | ); |
@@ -866,12 +866,12 @@ discard block |
||
866 | 866 | $tags = ''; |
867 | 867 | $itemTags = DB::query( |
868 | 868 | 'SELECT tag |
869 | - FROM ' . prefixTable('tags') . ' |
|
869 | + FROM ' . prefixTable('tags').' |
|
870 | 870 | WHERE item_id = %i AND tag != ""', |
871 | 871 | $ident |
872 | 872 | ); |
873 | 873 | foreach ($itemTags as $itemTag) { |
874 | - $tags .= $itemTag['tag'] . ' '; |
|
874 | + $tags .= $itemTag['tag'].' '; |
|
875 | 875 | } |
876 | 876 | // form id_tree to full foldername |
877 | 877 | $folder = []; |
@@ -882,7 +882,7 @@ discard block |
||
882 | 882 | // Is this a User id? |
883 | 883 | $user = DB::queryfirstrow( |
884 | 884 | 'SELECT id, login |
885 | - FROM ' . prefixTable('users') . ' |
|
885 | + FROM ' . prefixTable('users').' |
|
886 | 886 | WHERE id = %i', |
887 | 887 | $elem->title |
888 | 888 | ); |
@@ -900,10 +900,10 @@ discard block |
||
900 | 900 | 'label' => $data['label'], |
901 | 901 | 'description' => $data['description'], |
902 | 902 | 'tags' => $tags, |
903 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
903 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
904 | 904 | 'id_tree' => $data['id_tree'], |
905 | 905 | 'perso' => $data['perso'], |
906 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
906 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
907 | 907 | 'login' => $data['login'] ?? '', |
908 | 908 | 'folder' => implode(' » ', $folder), |
909 | 909 | 'author' => $session->get('user-id'), |
@@ -933,8 +933,8 @@ discard block |
||
933 | 933 | // get new value from db |
934 | 934 | $data = DB::queryFirstRow( |
935 | 935 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
936 | - FROM ' . prefixTable('items') . ' as i |
|
937 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
936 | + FROM ' . prefixTable('items').' as i |
|
937 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
938 | 938 | WHERE i.id = %i |
939 | 939 | AND l.action = %s', |
940 | 940 | $ident, |
@@ -944,12 +944,12 @@ discard block |
||
944 | 944 | $tags = ''; |
945 | 945 | $itemTags = DB::query( |
946 | 946 | 'SELECT tag |
947 | - FROM ' . prefixTable('tags') . ' |
|
947 | + FROM ' . prefixTable('tags').' |
|
948 | 948 | WHERE item_id = %i AND tag != ""', |
949 | 949 | $ident |
950 | 950 | ); |
951 | 951 | foreach ($itemTags as $itemTag) { |
952 | - $tags .= $itemTag['tag'] . ' '; |
|
952 | + $tags .= $itemTag['tag'].' '; |
|
953 | 953 | } |
954 | 954 | // form id_tree to full foldername |
955 | 955 | $folder = []; |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | // Is this a User id? |
961 | 961 | $user = DB::queryfirstrow( |
962 | 962 | 'SELECT id, login |
963 | - FROM ' . prefixTable('users') . ' |
|
963 | + FROM ' . prefixTable('users').' |
|
964 | 964 | WHERE id = %i', |
965 | 965 | $elem->title |
966 | 966 | ); |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | 'label' => $data['label'], |
980 | 980 | 'description' => $data['description'], |
981 | 981 | 'tags' => isset($tags) && empty($tags) === false ? $tags : 'None', |
982 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
982 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
983 | 983 | 'id_tree' => $data['id_tree'], |
984 | 984 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
985 | 985 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -1001,53 +1001,53 @@ discard block |
||
1001 | 1001 | function getStatisticsData(array $SETTINGS): array |
1002 | 1002 | { |
1003 | 1003 | DB::query( |
1004 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
1004 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
1005 | 1005 | 0 |
1006 | 1006 | ); |
1007 | 1007 | $counter_folders = DB::count(); |
1008 | 1008 | DB::query( |
1009 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
1009 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
1010 | 1010 | 1 |
1011 | 1011 | ); |
1012 | 1012 | $counter_folders_perso = DB::count(); |
1013 | 1013 | DB::query( |
1014 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
1014 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
1015 | 1015 | 0 |
1016 | 1016 | ); |
1017 | 1017 | $counter_items = DB::count(); |
1018 | 1018 | DB::query( |
1019 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
1019 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
1020 | 1020 | 1 |
1021 | 1021 | ); |
1022 | 1022 | $counter_items_perso = DB::count(); |
1023 | 1023 | DB::query( |
1024 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
1024 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
1025 | 1025 | 'OTV', 'TP', 'API' |
1026 | 1026 | ); |
1027 | 1027 | $counter_users = DB::count(); |
1028 | 1028 | DB::query( |
1029 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
1029 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
1030 | 1030 | 1 |
1031 | 1031 | ); |
1032 | 1032 | $admins = DB::count(); |
1033 | 1033 | DB::query( |
1034 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
1034 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
1035 | 1035 | 1 |
1036 | 1036 | ); |
1037 | 1037 | $managers = DB::count(); |
1038 | 1038 | DB::query( |
1039 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
1039 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
1040 | 1040 | 1 |
1041 | 1041 | ); |
1042 | 1042 | $readOnly = DB::count(); |
1043 | 1043 | // list the languages |
1044 | 1044 | $usedLang = []; |
1045 | 1045 | $tp_languages = DB::query( |
1046 | - 'SELECT name FROM ' . prefixTable('languages') |
|
1046 | + 'SELECT name FROM '.prefixTable('languages') |
|
1047 | 1047 | ); |
1048 | 1048 | foreach ($tp_languages as $tp_language) { |
1049 | 1049 | DB::query( |
1050 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
1050 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
1051 | 1051 | $tp_language['name'] |
1052 | 1052 | ); |
1053 | 1053 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1056,12 +1056,12 @@ discard block |
||
1056 | 1056 | // get list of ips |
1057 | 1057 | $usedIp = []; |
1058 | 1058 | $tp_ips = DB::query( |
1059 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
1059 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
1060 | 1060 | ); |
1061 | 1061 | foreach ($tp_ips as $ip) { |
1062 | 1062 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
1063 | 1063 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
1064 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1064 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
1065 | 1065 | $usedIp[$ip['user_ip']] = 1; |
1066 | 1066 | } |
1067 | 1067 | } |
@@ -1154,7 +1154,7 @@ discard block |
||
1154 | 1154 | <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;"> |
1155 | 1155 | <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;"> |
1156 | 1156 | <br><div style="float:right;">' . |
1157 | - $textMail . |
|
1157 | + $textMail. |
|
1158 | 1158 | '<br><br></td></tr></table> |
1159 | 1159 | </td></tr></table> |
1160 | 1160 | <br></body></html>'; |
@@ -1235,7 +1235,7 @@ discard block |
||
1235 | 1235 | { |
1236 | 1236 | array_walk_recursive( |
1237 | 1237 | $array, |
1238 | - static function (&$item): void { |
|
1238 | + static function(&$item): void { |
|
1239 | 1239 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
1240 | 1240 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
1241 | 1241 | } |
@@ -1340,7 +1340,7 @@ discard block |
||
1340 | 1340 | */ |
1341 | 1341 | function prefixTable(string $table): string |
1342 | 1342 | { |
1343 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
1343 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
1344 | 1344 | if (empty($safeTable) === false) { |
1345 | 1345 | // sanitize string |
1346 | 1346 | return $safeTable; |
@@ -1462,7 +1462,7 @@ discard block |
||
1462 | 1462 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
1463 | 1463 | { |
1464 | 1464 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
1465 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
1465 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
1466 | 1466 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
1467 | 1467 | socket_close($sock); |
1468 | 1468 | } |
@@ -1509,14 +1509,14 @@ discard block |
||
1509 | 1509 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
1510 | 1510 | if ($type === 'user_mngt') { |
1511 | 1511 | send_syslog( |
1512 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
1512 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
1513 | 1513 | $SETTINGS['syslog_host'], |
1514 | 1514 | $SETTINGS['syslog_port'], |
1515 | 1515 | 'teampass' |
1516 | 1516 | ); |
1517 | 1517 | } else { |
1518 | 1518 | send_syslog( |
1519 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
1519 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
1520 | 1520 | $SETTINGS['syslog_host'], |
1521 | 1521 | $SETTINGS['syslog_port'], |
1522 | 1522 | 'teampass' |
@@ -1591,7 +1591,7 @@ discard block |
||
1591 | 1591 | if (empty($item_label) === true) { |
1592 | 1592 | $dataItem = DB::queryfirstrow( |
1593 | 1593 | 'SELECT id, id_tree, label |
1594 | - FROM ' . prefixTable('items') . ' |
|
1594 | + FROM ' . prefixTable('items').' |
|
1595 | 1595 | WHERE id = %i', |
1596 | 1596 | $item_id |
1597 | 1597 | ); |
@@ -1599,11 +1599,11 @@ discard block |
||
1599 | 1599 | } |
1600 | 1600 | |
1601 | 1601 | send_syslog( |
1602 | - 'action=' . str_replace('at_', '', $action) . |
|
1603 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
1604 | - ' itemno=' . $item_id . |
|
1605 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
1606 | - ' itemname="' . addslashes($item_label) . '"', |
|
1602 | + 'action='.str_replace('at_', '', $action). |
|
1603 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
1604 | + ' itemno='.$item_id. |
|
1605 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
1606 | + ' itemname="'.addslashes($item_label).'"', |
|
1607 | 1607 | $SETTINGS['syslog_host'], |
1608 | 1608 | $SETTINGS['syslog_port'], |
1609 | 1609 | 'teampass' |
@@ -1635,8 +1635,8 @@ discard block |
||
1635 | 1635 | $notification = DB::queryOneColumn( |
1636 | 1636 | 'email', |
1637 | 1637 | 'SELECT * |
1638 | - FROM ' . prefixTable('notification') . ' AS n |
|
1639 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
1638 | + FROM ' . prefixTable('notification').' AS n |
|
1639 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
1640 | 1640 | WHERE n.item_id = %i AND n.user_id != %i', |
1641 | 1641 | $item_id, |
1642 | 1642 | $globalsUserId |
@@ -1647,7 +1647,7 @@ discard block |
||
1647 | 1647 | // Get list of changes |
1648 | 1648 | $htmlChanges = '<ul>'; |
1649 | 1649 | foreach ($changes as $change) { |
1650 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
1650 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
1651 | 1651 | } |
1652 | 1652 | $htmlChanges .= '</ul>'; |
1653 | 1653 | // send email |
@@ -1684,15 +1684,15 @@ discard block |
||
1684 | 1684 | $path = ''; |
1685 | 1685 | foreach ($arbo as $elem) { |
1686 | 1686 | if (empty($path) === true) { |
1687 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
1687 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
1688 | 1688 | } else { |
1689 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1689 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
1690 | 1690 | } |
1691 | 1691 | } |
1692 | 1692 | |
1693 | 1693 | // Build text to show user |
1694 | 1694 | if (empty($label) === false) { |
1695 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
1695 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
1696 | 1696 | } |
1697 | 1697 | return empty($path) === true ? '' : $path; |
1698 | 1698 | } |
@@ -1748,7 +1748,7 @@ discard block |
||
1748 | 1748 | { |
1749 | 1749 | // Perform a copy if the file exists |
1750 | 1750 | if (file_exists($configFilePath)) { |
1751 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
1751 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
1752 | 1752 | if (!copy($configFilePath, $backupFilePath)) { |
1753 | 1753 | return "ERROR: Could not copy file '$configFilePath'"; |
1754 | 1754 | } |
@@ -1756,10 +1756,10 @@ discard block |
||
1756 | 1756 | |
1757 | 1757 | // Regenerate the config file |
1758 | 1758 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
1759 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
1759 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
1760 | 1760 | foreach ($rows as $record) { |
1761 | 1761 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
1762 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
1762 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
1763 | 1763 | } |
1764 | 1764 | $data[] = ");\n"; |
1765 | 1765 | $data = array_unique($data); |
@@ -1804,7 +1804,7 @@ discard block |
||
1804 | 1804 | { |
1805 | 1805 | global $SETTINGS; |
1806 | 1806 | /* LOAD CPASSMAN SETTINGS */ |
1807 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1807 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
1808 | 1808 | $SETTINGS = []; |
1809 | 1809 | $SETTINGS['duplicate_folder'] = 0; |
1810 | 1810 | //by default, this is set to 0; |
@@ -1814,7 +1814,7 @@ discard block |
||
1814 | 1814 | //by default, this value is set to 5; |
1815 | 1815 | $settings = []; |
1816 | 1816 | $rows = DB::query( |
1817 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
1817 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
1818 | 1818 | [ |
1819 | 1819 | 'type' => 'admin', |
1820 | 1820 | 'type2' => 'settings', |
@@ -1846,7 +1846,7 @@ discard block |
||
1846 | 1846 | $source_cf = []; |
1847 | 1847 | $rows = DB::QUERY( |
1848 | 1848 | 'SELECT id_category |
1849 | - FROM ' . prefixTable('categories_folders') . ' |
|
1849 | + FROM ' . prefixTable('categories_folders').' |
|
1850 | 1850 | WHERE id_folder = %i', |
1851 | 1851 | $source_id |
1852 | 1852 | ); |
@@ -1857,7 +1857,7 @@ discard block |
||
1857 | 1857 | $target_cf = []; |
1858 | 1858 | $rows = DB::QUERY( |
1859 | 1859 | 'SELECT id_category |
1860 | - FROM ' . prefixTable('categories_folders') . ' |
|
1860 | + FROM ' . prefixTable('categories_folders').' |
|
1861 | 1861 | WHERE id_folder = %i', |
1862 | 1862 | $target_id |
1863 | 1863 | ); |
@@ -2076,7 +2076,7 @@ discard block |
||
2076 | 2076 | ) { |
2077 | 2077 | // Check if the path exists |
2078 | 2078 | $path = basename($path); |
2079 | - if (! file_exists($path)) { |
|
2079 | + if (!file_exists($path)) { |
|
2080 | 2080 | return false; |
2081 | 2081 | } |
2082 | 2082 | |
@@ -2129,7 +2129,7 @@ discard block |
||
2129 | 2129 | // Load item data |
2130 | 2130 | $data = DB::queryFirstRow( |
2131 | 2131 | 'SELECT id_tree |
2132 | - FROM ' . prefixTable('items') . ' |
|
2132 | + FROM ' . prefixTable('items').' |
|
2133 | 2133 | WHERE id = %i', |
2134 | 2134 | $item_id |
2135 | 2135 | ); |
@@ -2192,7 +2192,7 @@ discard block |
||
2192 | 2192 | } |
2193 | 2193 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
2194 | 2194 | } |
2195 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
2195 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
2196 | 2196 | return $email; |
2197 | 2197 | } |
2198 | 2198 | |
@@ -2215,7 +2215,7 @@ discard block |
||
2215 | 2215 | |
2216 | 2216 | // Insert log in DB |
2217 | 2217 | return DB::query( |
2218 | - 'SELECT ' . $fields . ' |
|
2218 | + 'SELECT '.$fields.' |
|
2219 | 2219 | FROM ' . prefixTable($table) |
2220 | 2220 | ); |
2221 | 2221 | } |
@@ -2230,11 +2230,11 @@ discard block |
||
2230 | 2230 | function formatSizeUnits(int $bytes): string |
2231 | 2231 | { |
2232 | 2232 | if ($bytes >= 1073741824) { |
2233 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
2233 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
2234 | 2234 | } elseif ($bytes >= 1048576) { |
2235 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
2235 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
2236 | 2236 | } elseif ($bytes >= 1024) { |
2237 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
2237 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
2238 | 2238 | } elseif ($bytes > 1) { |
2239 | 2239 | $bytes .= ' bytes'; |
2240 | 2240 | } elseif ($bytes === 1) { |
@@ -2477,7 +2477,7 @@ discard block |
||
2477 | 2477 | $cipher->enableContinuousBuffer(); |
2478 | 2478 | |
2479 | 2479 | // Encrypt the file content |
2480 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
2480 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
2481 | 2481 | $fileContent = file_get_contents($filePath); |
2482 | 2482 | $plaintext = $fileContent; |
2483 | 2483 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2485,9 +2485,9 @@ discard block |
||
2485 | 2485 | // Save new file |
2486 | 2486 | // deepcode ignore InsecureHash: is simply used to get a unique name |
2487 | 2487 | $hash = md5($plaintext); |
2488 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
2488 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
2489 | 2489 | file_put_contents($fileOut, $ciphertext); |
2490 | - unlink($fileInPath . '/' . $fileInName); |
|
2490 | + unlink($fileInPath.'/'.$fileInName); |
|
2491 | 2491 | return [ |
2492 | 2492 | 'fileHash' => base64_encode($hash), |
2493 | 2493 | 'objectKey' => base64_encode($objectKey), |
@@ -2505,7 +2505,7 @@ discard block |
||
2505 | 2505 | */ |
2506 | 2506 | function decryptFile(string $fileName, string $filePath, string $key): string |
2507 | 2507 | { |
2508 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
2508 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
2509 | 2509 | define('FILE_BUFFER_SIZE', 128 * 1024); |
2510 | 2510 | } |
2511 | 2511 | |
@@ -2522,7 +2522,7 @@ discard block |
||
2522 | 2522 | $cipher->enableContinuousBuffer(); |
2523 | 2523 | $cipher->disablePadding(); |
2524 | 2524 | // Get file content |
2525 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
2525 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
2526 | 2526 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
2527 | 2527 | |
2528 | 2528 | if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
@@ -2608,8 +2608,8 @@ discard block |
||
2608 | 2608 | // Only create the sharekey for a user |
2609 | 2609 | $user = DB::queryFirstRow( |
2610 | 2610 | 'SELECT public_key |
2611 | - FROM ' . prefixTable('users') . ' |
|
2612 | - WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . ' |
|
2611 | + FROM ' . prefixTable('users').' |
|
2612 | + WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).' |
|
2613 | 2613 | AND public_key != ""' |
2614 | 2614 | ); |
2615 | 2615 | |
@@ -2646,17 +2646,16 @@ discard block |
||
2646 | 2646 | //DB::debugmode(true); |
2647 | 2647 | $users = DB::query( |
2648 | 2648 | 'SELECT id, public_key |
2649 | - FROM ' . prefixTable('users') . ' |
|
2649 | + FROM ' . prefixTable('users').' |
|
2650 | 2650 | WHERE ' . ($onlyForUser === true ? |
2651 | - 'id IN ("' . TP_USER_ID . '","' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . '") ' : |
|
2652 | - 'id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ') . ' |
|
2651 | + 'id IN ("'.TP_USER_ID.'","'.($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).'") ' : 'id NOT IN ("'.OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ').' |
|
2653 | 2652 | AND public_key != ""' |
2654 | 2653 | ); |
2655 | 2654 | //DB::debugmode(false); |
2656 | 2655 | foreach ($users as $user) { |
2657 | 2656 | // Insert in DB the new object key for this item by user |
2658 | 2657 | if (count($objectKeyArray) === 0) { |
2659 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
2658 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
2660 | 2659 | DB::insert( |
2661 | 2660 | $object_name, |
2662 | 2661 | [ |
@@ -2670,7 +2669,7 @@ discard block |
||
2670 | 2669 | ); |
2671 | 2670 | } else { |
2672 | 2671 | foreach ($objectKeyArray as $object) { |
2673 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
2672 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
2674 | 2673 | DB::insert( |
2675 | 2674 | $object_name, |
2676 | 2675 | [ |
@@ -2698,7 +2697,7 @@ discard block |
||
2698 | 2697 | function isBase64(string $str): bool |
2699 | 2698 | { |
2700 | 2699 | $str = (string) trim($str); |
2701 | - if (! isset($str[0])) { |
|
2700 | + if (!isset($str[0])) { |
|
2702 | 2701 | return false; |
2703 | 2702 | } |
2704 | 2703 | |
@@ -2772,7 +2771,7 @@ discard block |
||
2772 | 2771 | } catch (\LdapRecord\Auth\BindException $e) { |
2773 | 2772 | $error = $e->getDetailedError(); |
2774 | 2773 | if ($error) { |
2775 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2774 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2776 | 2775 | } else { |
2777 | 2776 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
2778 | 2777 | } |
@@ -2791,7 +2790,7 @@ discard block |
||
2791 | 2790 | } catch (\LdapRecord\Auth\BindException $e) { |
2792 | 2791 | $error = $e->getDetailedError(); |
2793 | 2792 | if ($error) { |
2794 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2793 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2795 | 2794 | } else { |
2796 | 2795 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
2797 | 2796 | } |
@@ -2820,7 +2819,7 @@ discard block |
||
2820 | 2819 | // expect if personal item |
2821 | 2820 | DB::delete( |
2822 | 2821 | prefixTable('sharekeys_items'), |
2823 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2822 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2824 | 2823 | $userId |
2825 | 2824 | ); |
2826 | 2825 | // Remove all item sharekeys files |
@@ -2828,8 +2827,8 @@ discard block |
||
2828 | 2827 | prefixTable('sharekeys_files'), |
2829 | 2828 | 'user_id = %i AND object_id NOT IN ( |
2830 | 2829 | SELECT f.id |
2831 | - FROM ' . prefixTable('items') . ' AS i |
|
2832 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
2830 | + FROM ' . prefixTable('items').' AS i |
|
2831 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
2833 | 2832 | WHERE i.perso = 1 |
2834 | 2833 | )', |
2835 | 2834 | $userId |
@@ -2839,8 +2838,8 @@ discard block |
||
2839 | 2838 | prefixTable('sharekeys_fields'), |
2840 | 2839 | 'user_id = %i AND object_id NOT IN ( |
2841 | 2840 | SELECT c.id |
2842 | - FROM ' . prefixTable('items') . ' AS i |
|
2843 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
2841 | + FROM ' . prefixTable('items').' AS i |
|
2842 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
2844 | 2843 | WHERE i.perso = 1 |
2845 | 2844 | )', |
2846 | 2845 | $userId |
@@ -2848,13 +2847,13 @@ discard block |
||
2848 | 2847 | // Remove all item sharekeys logs |
2849 | 2848 | DB::delete( |
2850 | 2849 | prefixTable('sharekeys_logs'), |
2851 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2850 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2852 | 2851 | $userId |
2853 | 2852 | ); |
2854 | 2853 | // Remove all item sharekeys suggestions |
2855 | 2854 | DB::delete( |
2856 | 2855 | prefixTable('sharekeys_suggestions'), |
2857 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
2856 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
2858 | 2857 | $userId |
2859 | 2858 | ); |
2860 | 2859 | return false; |
@@ -2875,7 +2874,7 @@ discard block |
||
2875 | 2874 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
2876 | 2875 | $now->setTimezone(new DateTimeZone($timezone)); |
2877 | 2876 | $offsets[] = $offset = $now->getOffset(); |
2878 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
2877 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
2879 | 2878 | } |
2880 | 2879 | |
2881 | 2880 | array_multisort($offsets, $timezones); |
@@ -2895,7 +2894,7 @@ discard block |
||
2895 | 2894 | { |
2896 | 2895 | $hours = intval($offset / 3600); |
2897 | 2896 | $minutes = abs(intval($offset % 3600 / 60)); |
2898 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2897 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
2899 | 2898 | } |
2900 | 2899 | |
2901 | 2900 | /** |
@@ -2995,8 +2994,7 @@ discard block |
||
2995 | 2994 | { |
2996 | 2995 | if (isset($array[$key]) === true |
2997 | 2996 | && (is_int($value) === true ? |
2998 | - (int) $array[$key] === $value : |
|
2999 | - (string) $array[$key] === $value) |
|
2997 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
3000 | 2998 | ) { |
3001 | 2999 | return true; |
3002 | 3000 | } |
@@ -3018,8 +3016,7 @@ discard block |
||
3018 | 3016 | { |
3019 | 3017 | if (isset($var) === false |
3020 | 3018 | || (is_int($value) === true ? |
3021 | - (int) $var === $value : |
|
3022 | - (string) $var === $value) |
|
3019 | + (int) $var === $value : (string) $var === $value) |
|
3023 | 3020 | ) { |
3024 | 3021 | return true; |
3025 | 3022 | } |
@@ -3070,7 +3067,7 @@ discard block |
||
3070 | 3067 | */ |
3071 | 3068 | function isSetArrayOfValues(array $arrayOfValues): bool |
3072 | 3069 | { |
3073 | - foreach($arrayOfValues as $value) { |
|
3070 | + foreach ($arrayOfValues as $value) { |
|
3074 | 3071 | if (isset($value) === false) { |
3075 | 3072 | return false; |
3076 | 3073 | } |
@@ -3092,7 +3089,7 @@ discard block |
||
3092 | 3089 | /*PHP8 - integer|string*/$value |
3093 | 3090 | ) : bool |
3094 | 3091 | { |
3095 | - foreach($arrayOfVars as $variable) { |
|
3092 | + foreach ($arrayOfVars as $variable) { |
|
3096 | 3093 | if ($variable !== $value) { |
3097 | 3094 | return false; |
3098 | 3095 | } |
@@ -3112,7 +3109,7 @@ discard block |
||
3112 | 3109 | /*PHP8 - integer|string*/$value |
3113 | 3110 | ) : bool |
3114 | 3111 | { |
3115 | - foreach($arrayOfVars as $variable) { |
|
3112 | + foreach ($arrayOfVars as $variable) { |
|
3116 | 3113 | if ($variable === $value) { |
3117 | 3114 | return true; |
3118 | 3115 | } |
@@ -3181,7 +3178,7 @@ discard block |
||
3181 | 3178 | * @param array $filters |
3182 | 3179 | * @return array|string |
3183 | 3180 | */ |
3184 | -function dataSanitizer(array $data, array $filters): array|string |
|
3181 | +function dataSanitizer(array $data, array $filters): array | string |
|
3185 | 3182 | { |
3186 | 3183 | // Load Sanitizer library |
3187 | 3184 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3210,7 +3207,7 @@ discard block |
||
3210 | 3207 | // Exists ? |
3211 | 3208 | $userCacheId = DB::queryfirstrow( |
3212 | 3209 | 'SELECT increment_id |
3213 | - FROM ' . prefixTable('cache_tree') . ' |
|
3210 | + FROM ' . prefixTable('cache_tree').' |
|
3214 | 3211 | WHERE user_id = %i', |
3215 | 3212 | $user_id |
3216 | 3213 | ); |
@@ -3261,7 +3258,7 @@ discard block |
||
3261 | 3258 | */ |
3262 | 3259 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
3263 | 3260 | { |
3264 | - $resultat = ($nombre/$total) * $pourcentage; |
|
3261 | + $resultat = ($nombre / $total) * $pourcentage; |
|
3265 | 3262 | return round($resultat); |
3266 | 3263 | } |
3267 | 3264 | |
@@ -3291,7 +3288,7 @@ discard block |
||
3291 | 3288 | |
3292 | 3289 | // Get last folder update |
3293 | 3290 | $lastFolderChange = DB::queryfirstrow( |
3294 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
3291 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
3295 | 3292 | WHERE type = %s AND intitule = %s', |
3296 | 3293 | 'timestamp', |
3297 | 3294 | 'last_folder_change' |
@@ -3322,7 +3319,7 @@ discard block |
||
3322 | 3319 | // Does this user has a tree cache |
3323 | 3320 | $userCacheTree = DB::queryfirstrow( |
3324 | 3321 | 'SELECT '.$fieldName.' |
3325 | - FROM ' . prefixTable('cache_tree') . ' |
|
3322 | + FROM ' . prefixTable('cache_tree').' |
|
3326 | 3323 | WHERE user_id = %i', |
3327 | 3324 | $session->get('user-id') |
3328 | 3325 | ); |
@@ -3365,7 +3362,7 @@ discard block |
||
3365 | 3362 | if (count($folderIds) === 0) { |
3366 | 3363 | $folderIds = DB::queryFirstColumn( |
3367 | 3364 | 'SELECT id |
3368 | - FROM ' . prefixTable('nested_tree') . ' |
|
3365 | + FROM ' . prefixTable('nested_tree').' |
|
3369 | 3366 | WHERE personal_folder=%i', |
3370 | 3367 | 0 |
3371 | 3368 | ); |
@@ -3382,8 +3379,8 @@ discard block |
||
3382 | 3379 | $rows_tmp = DB::query( |
3383 | 3380 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
3384 | 3381 | f.id_category AS category_id |
3385 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
3386 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
3382 | + FROM ' . prefixTable('categories_folders').' AS f |
|
3383 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
3387 | 3384 | WHERE id_folder=%i', |
3388 | 3385 | $folder |
3389 | 3386 | ); |
@@ -3409,7 +3406,7 @@ discard block |
||
3409 | 3406 | $valTemp = ''; |
3410 | 3407 | $data = DB::queryFirstRow( |
3411 | 3408 | 'SELECT valeur |
3412 | - FROM ' . prefixTable('misc') . ' |
|
3409 | + FROM ' . prefixTable('misc').' |
|
3413 | 3410 | WHERE type = %s AND intitule=%i', |
3414 | 3411 | 'complex', |
3415 | 3412 | $folder |
@@ -3426,14 +3423,14 @@ discard block |
||
3426 | 3423 | $valTemp = ''; |
3427 | 3424 | $rows_tmp = DB::query( |
3428 | 3425 | 'SELECT t.title |
3429 | - FROM ' . prefixTable('roles_values') . ' as v |
|
3430 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
3426 | + FROM ' . prefixTable('roles_values').' as v |
|
3427 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
3431 | 3428 | WHERE v.folder_id = %i |
3432 | 3429 | GROUP BY title', |
3433 | 3430 | $folder |
3434 | 3431 | ); |
3435 | 3432 | foreach ($rows_tmp as $record) { |
3436 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
3433 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
3437 | 3434 | } |
3438 | 3435 | $arr_data['visibilityRoles'] = $valTemp; |
3439 | 3436 | |
@@ -3466,7 +3463,7 @@ discard block |
||
3466 | 3463 | // loop on users and check if user has this role |
3467 | 3464 | $rows = DB::query( |
3468 | 3465 | 'SELECT id, fonction_id |
3469 | - FROM ' . prefixTable('users') . ' |
|
3466 | + FROM ' . prefixTable('users').' |
|
3470 | 3467 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
3471 | 3468 | $session->get('user-id') |
3472 | 3469 | ); |
@@ -3498,7 +3495,7 @@ discard block |
||
3498 | 3495 | |
3499 | 3496 | $val = DB::queryfirstrow( |
3500 | 3497 | 'SELECT * |
3501 | - FROM ' . prefixTable('users') . ' |
|
3498 | + FROM ' . prefixTable('users').' |
|
3502 | 3499 | WHERE id = %i', |
3503 | 3500 | $userId |
3504 | 3501 | ); |
@@ -3514,12 +3511,12 @@ discard block |
||
3514 | 3511 | function upgradeRequired(): bool |
3515 | 3512 | { |
3516 | 3513 | // Get settings.php |
3517 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
3514 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
3518 | 3515 | |
3519 | 3516 | // Get timestamp in DB |
3520 | 3517 | $val = DB::queryfirstrow( |
3521 | 3518 | 'SELECT valeur |
3522 | - FROM ' . prefixTable('misc') . ' |
|
3519 | + FROM ' . prefixTable('misc').' |
|
3523 | 3520 | WHERE type = %s AND intitule = %s', |
3524 | 3521 | 'admin', |
3525 | 3522 | 'upgrade_timestamp' |
@@ -3574,7 +3571,7 @@ discard block |
||
3574 | 3571 | // prepapre background tasks for item keys generation |
3575 | 3572 | $userTP = DB::queryFirstRow( |
3576 | 3573 | 'SELECT pw, public_key, private_key |
3577 | - FROM ' . prefixTable('users') . ' |
|
3574 | + FROM ' . prefixTable('users').' |
|
3578 | 3575 | WHERE id = %i', |
3579 | 3576 | TP_USER_ID |
3580 | 3577 | ); |
@@ -3634,7 +3631,7 @@ discard block |
||
3634 | 3631 | } |
3635 | 3632 | |
3636 | 3633 | // Generate new keys |
3637 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
3634 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
3638 | 3635 | $userKeys = [ |
3639 | 3636 | 'public_key' => $recovery_public_key, |
3640 | 3637 | 'private_key_clear' => $recovery_private_key, |
@@ -3674,8 +3671,8 @@ discard block |
||
3674 | 3671 | 'process_type' => 'create_user_keys', |
3675 | 3672 | 'arguments' => json_encode([ |
3676 | 3673 | 'new_user_id' => (int) $userId, |
3677 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
3678 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
3674 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
3675 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
3679 | 3676 | 'owner_id' => (int) TP_USER_ID, |
3680 | 3677 | 'creator_pwd' => $userTP['pw'], |
3681 | 3678 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3965,7 +3962,7 @@ discard block |
||
3965 | 3962 | */ |
3966 | 3963 | function createTaskForItem( |
3967 | 3964 | string $processType, |
3968 | - string|array $taskName, |
|
3965 | + string | array $taskName, |
|
3969 | 3966 | int $itemId, |
3970 | 3967 | int $userId, |
3971 | 3968 | string $objectKey, |
@@ -3989,7 +3986,7 @@ discard block |
||
3989 | 3986 | 'object_key' => $objectKey, |
3990 | 3987 | 'author' => (int) $userId, |
3991 | 3988 | ]), |
3992 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3989 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
3993 | 3990 | ) |
3994 | 3991 | ); |
3995 | 3992 | $processId = DB::insertId(); |
@@ -3999,7 +3996,7 @@ discard block |
||
3999 | 3996 | if (is_array($taskName) === false) { |
4000 | 3997 | $taskName = [$taskName]; |
4001 | 3998 | } |
4002 | - foreach($taskName as $task) { |
|
3999 | + foreach ($taskName as $task) { |
|
4003 | 4000 | error_log('createTaskForItem - task: '.$task); |
4004 | 4001 | switch ($task) { |
4005 | 4002 | case 'item_password': |
@@ -4096,7 +4093,7 @@ discard block |
||
4096 | 4093 | * @param integer $user_id |
4097 | 4094 | * @return void |
4098 | 4095 | */ |
4099 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
4096 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
4100 | 4097 | { |
4101 | 4098 | if ($allUsers === true) { |
4102 | 4099 | // Load class DB |
@@ -4106,7 +4103,7 @@ discard block |
||
4106 | 4103 | |
4107 | 4104 | $users = DB::query( |
4108 | 4105 | 'SELECT id |
4109 | - FROM ' . prefixTable('users') . ' |
|
4106 | + FROM ' . prefixTable('users').' |
|
4110 | 4107 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
4111 | 4108 | ORDER BY login ASC' |
4112 | 4109 | ); |
@@ -4124,7 +4121,7 @@ discard block |
||
4124 | 4121 | * @param integer $user_id |
4125 | 4122 | * @return void |
4126 | 4123 | */ |
4127 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
4124 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
4128 | 4125 | { |
4129 | 4126 | if ($user_id === 0) { |
4130 | 4127 | return; |
@@ -4135,8 +4132,8 @@ discard block |
||
4135 | 4132 | |
4136 | 4133 | $personalItems = DB::queryFirstColumn( |
4137 | 4134 | 'SELECT id |
4138 | - FROM ' . prefixTable('items') . ' AS i |
|
4139 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
4135 | + FROM ' . prefixTable('items').' AS i |
|
4136 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
4140 | 4137 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
4141 | 4138 | $user_id |
4142 | 4139 | ); |
@@ -4185,7 +4182,7 @@ discard block |
||
4185 | 4182 | // Check if user exists |
4186 | 4183 | $userInfo = DB::queryFirstRow( |
4187 | 4184 | 'SELECT pw, public_key, private_key, login, name |
4188 | - FROM ' . prefixTable('users') . ' |
|
4185 | + FROM ' . prefixTable('users').' |
|
4189 | 4186 | WHERE id = %i', |
4190 | 4187 | $userId |
4191 | 4188 | ); |
@@ -4194,7 +4191,7 @@ discard block |
||
4194 | 4191 | $now = (int) time(); |
4195 | 4192 | // Prepare file content |
4196 | 4193 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
4197 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
4194 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
4198 | 4195 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
4199 | 4196 | "Public Key:\n".$userInfo['public_key']."\n\n". |
4200 | 4197 | "Private Key:\n".decryptPrivateKey($session->get('user-password'), $userInfo['private_key'])."\n\n"; |
@@ -4217,7 +4214,7 @@ discard block |
||
4217 | 4214 | return prepareExchangedData( |
4218 | 4215 | array( |
4219 | 4216 | 'error' => false, |
4220 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
4217 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
4221 | 4218 | 'timestamp' => $now, |
4222 | 4219 | 'content' => base64_encode($export_value), |
4223 | 4220 | 'login' => $userInfo['login'], |
@@ -4243,8 +4240,8 @@ discard block |
||
4243 | 4240 | */ |
4244 | 4241 | function loadClasses(string $className = ''): void |
4245 | 4242 | { |
4246 | - require_once __DIR__. '/../includes/config/include.php'; |
|
4247 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
4243 | + require_once __DIR__.'/../includes/config/include.php'; |
|
4244 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
4248 | 4245 | require_once __DIR__.'/../vendor/autoload.php'; |
4249 | 4246 | |
4250 | 4247 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4404,10 +4401,10 @@ discard block |
||
4404 | 4401 | } |
4405 | 4402 | |
4406 | 4403 | // Nettoyage des IDs pour éviter les injections SQL |
4407 | - $ids = array_map('intval', $ids); // Assure que chaque ID est un entier |
|
4404 | + $ids = array_map('intval', $ids); // Assure que chaque ID est un entier |
|
4408 | 4405 | |
4409 | 4406 | // Construction de la requête SQL pour vérifier les IDs dans la table |
4410 | - $result = DB::query('SELECT id FROM ' . prefixTable($tableName) . ' WHERE ' . $fieldName . ' IN %li', $ids); |
|
4407 | + $result = DB::query('SELECT id FROM '.prefixTable($tableName).' WHERE '.$fieldName.' IN %li', $ids); |
|
4411 | 4408 | |
4412 | 4409 | // Extraire les IDs existants de la table |
4413 | 4410 | $existingIds = array_column($result, 'id'); |
@@ -25,18 +25,18 @@ discard block |
||
25 | 25 | |
26 | 26 | use TeampassClasses\ConfigManager\ConfigManager; |
27 | 27 | |
28 | -define("API_ROOT_PATH", __DIR__ . "/.."); |
|
28 | +define("API_ROOT_PATH", __DIR__."/.."); |
|
29 | 29 | |
30 | 30 | // include main configuration file |
31 | -require API_ROOT_PATH . '/../sources/main.functions.php'; |
|
31 | +require API_ROOT_PATH.'/../sources/main.functions.php'; |
|
32 | 32 | |
33 | 33 | // include the base controller file |
34 | -require API_ROOT_PATH . "/Controller/Api/BaseController.php"; |
|
34 | +require API_ROOT_PATH."/Controller/Api/BaseController.php"; |
|
35 | 35 | |
36 | 36 | // include the use model file |
37 | -require API_ROOT_PATH . "/Model/UserModel.php"; |
|
38 | -require API_ROOT_PATH . "/Model/ItemModel.php"; |
|
39 | -require API_ROOT_PATH . "/Model/FolderModel.php"; |
|
37 | +require API_ROOT_PATH."/Model/UserModel.php"; |
|
38 | +require API_ROOT_PATH."/Model/ItemModel.php"; |
|
39 | +require API_ROOT_PATH."/Model/FolderModel.php"; |
|
40 | 40 | |
41 | 41 | /** |
42 | 42 | * Launch expected action for ITEM |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | ); |
56 | 56 | } |
57 | 57 | // Perform the action |
58 | - require API_ROOT_PATH . "/Controller/Api/ItemController.php"; |
|
58 | + require API_ROOT_PATH."/Controller/Api/ItemController.php"; |
|
59 | 59 | $objFeedController = new ItemController(); |
60 | - $strMethodName = $actions[0] . 'Action'; |
|
60 | + $strMethodName = $actions[0].'Action'; |
|
61 | 61 | $objFeedController->{$strMethodName}($userData); |
62 | 62 | } |
63 | 63 | |
@@ -78,9 +78,9 @@ discard block |
||
78 | 78 | ); |
79 | 79 | } |
80 | 80 | // Perform the action |
81 | - require API_ROOT_PATH . "/Controller/Api/FolderController.php"; |
|
81 | + require API_ROOT_PATH."/Controller/Api/FolderController.php"; |
|
82 | 82 | $objFeedController = new FolderController(); |
83 | - $strMethodName = $actions[0] . 'Action'; |
|
83 | + $strMethodName = $actions[0].'Action'; |
|
84 | 84 | $objFeedController->{$strMethodName}($userData); |
85 | 85 | } |
86 | 86 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | function verifyAuth(): string |
139 | 139 | { |
140 | - include_once API_ROOT_PATH . '/inc/jwt_utils.php'; |
|
140 | + include_once API_ROOT_PATH.'/inc/jwt_utils.php'; |
|
141 | 141 | $bearer_token = get_bearer_token(); |
142 | 142 | |
143 | 143 | if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) { |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | */ |
168 | 168 | function getDataFromToken(): string |
169 | 169 | { |
170 | - include_once API_ROOT_PATH . '/inc/jwt_utils.php'; |
|
170 | + include_once API_ROOT_PATH.'/inc/jwt_utils.php'; |
|
171 | 171 | $bearer_token = get_bearer_token(); |
172 | 172 | |
173 | 173 | if (empty($bearer_token) === false) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | return DB::query( |
31 | 31 | 'SELECT * |
32 | - FROM ' . prefixTable('users') . ' |
|
32 | + FROM ' . prefixTable('users').' |
|
33 | 33 | ORDER BY id ASC LIMIT %i', |
34 | 34 | $limit |
35 | 35 | ); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | // Get folders |
38 | 38 | $rows = DB::query( |
39 | 39 | 'SELECT id, title |
40 | - FROM ' . prefixTable('nested_tree') . ' |
|
40 | + FROM ' . prefixTable('nested_tree').' |
|
41 | 41 | WHERE nlevel = %i', |
42 | 42 | 1 |
43 | 43 | ); |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | $ret = []; |
70 | 70 | $childrens = DB::query( |
71 | 71 | 'SELECT id, title |
72 | - FROM ' . prefixTable('nested_tree') . ' |
|
72 | + FROM ' . prefixTable('nested_tree').' |
|
73 | 73 | WHERE parent_id = %i', |
74 | 74 | $parentId |
75 | 75 | ); |
76 | 76 | |
77 | - if ( count($childrens) > 0) { |
|
77 | + if (count($childrens) > 0) { |
|
78 | 78 | foreach ($childrens as $children) { |
79 | 79 | $isVisible = in_array((int) $children['id'], $foldersId); |
80 | 80 | $childs = $this->getFoldersChildren($children['id'], $foldersId); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | ): array |
117 | 117 | { |
118 | 118 | // Validate inputs |
119 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
119 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
120 | 120 | $data = [ |
121 | 121 | 'title' => $title, |
122 | 122 | 'parent_id' => $parent_id, |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | 'error' => true, |
182 | 182 | 'error_header' => 'HTTP/1.1 422 Unprocessable Entity', |
183 | 183 | 'error_message' => 'Invalid parameters' |
184 | - ];} |
|
184 | + ]; } |
|
185 | 185 | |
186 | 186 | // Create folder |
187 | 187 | require_once TEAMPASS_ROOT_PATH.'/sources/folders.class.php'; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function getUserAuth(string $login, string $password, string $apikey): array |
50 | 50 | { |
51 | 51 | // Sanitize |
52 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
52 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
53 | 53 | $inputData = dataSanitizer( |
54 | 54 | [ |
55 | 55 | 'login' => isset($login) === true ? $login : '', |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | // Check if user exists |
75 | 75 | $userInfo = DB::queryfirstrow( |
76 | 76 | "SELECT u.id, u.pw, u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.fonction_id, u.can_create_root_folder, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key, a.allowed_folders as user_api_allowed_folders, a.enabled, a.allowed_to_create, a.allowed_to_read, a.allowed_to_update, a.allowed_to_delete |
77 | - FROM " . prefixTable('users') . " AS u |
|
78 | - INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id=u.id) |
|
77 | + FROM " . prefixTable('users')." AS u |
|
78 | + INNER JOIN " . prefixTable('api')." AS a ON (a.user_id=u.id) |
|
79 | 79 | WHERE login = %s", |
80 | 80 | $inputData['login'] |
81 | 81 | ); |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | if (count($userFunctionId) > 0) { |
252 | 252 | $rows = DB::query( |
253 | 253 | 'SELECT * |
254 | - FROM ' . prefixTable('roles_values') . ' |
|
254 | + FROM ' . prefixTable('roles_values').' |
|
255 | 255 | WHERE role_id IN %li AND type IN ("W", "ND", "NE", "NDNE", "R")', |
256 | 256 | $userFunctionId |
257 | 257 | ); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $inc = 0; |
278 | 278 | $rows = DB::query( |
279 | 279 | 'SELECT id, id_tree |
280 | - FROM ' . prefixTable('items') . ' |
|
280 | + FROM ' . prefixTable('items').' |
|
281 | 281 | WHERE restricted_to LIKE %s'. |
282 | 282 | (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''), |
283 | 283 | $userInfo['id'], |
@@ -292,8 +292,8 @@ discard block |
||
292 | 292 | // Check for the users roles if some specific rights exist on items |
293 | 293 | $rows = DB::query( |
294 | 294 | 'SELECT i.id_tree, r.item_id |
295 | - FROM ' . prefixTable('items') . ' AS i |
|
296 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (r.item_id=i.id) |
|
295 | + FROM ' . prefixTable('items').' AS i |
|
296 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (r.item_id=i.id) |
|
297 | 297 | WHERE '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != "" |
298 | 298 | ORDER BY i.id_tree ASC', |
299 | 299 | count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0') |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | // Add all personal folders |
310 | 310 | $rows = DB::queryFirstRow( |
311 | 311 | 'SELECT id |
312 | - FROM ' . prefixTable('nested_tree') . ' |
|
312 | + FROM ' . prefixTable('nested_tree').' |
|
313 | 313 | WHERE title = %i AND personal_folder = 1'. |
314 | 314 | (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''), |
315 | 315 | $userInfo['id'], |
@@ -50,18 +50,18 @@ discard block |
||
50 | 50 | // Get items |
51 | 51 | $rows = DB::query( |
52 | 52 | 'SELECT i.id, label, description, i.pw, i.url, i.id_tree, i.login, i.email, i.viewed_no, i.fa_icon, i.inactif, i.perso, t.title as folder_label |
53 | - FROM ' . prefixTable('items') . ' AS i |
|
53 | + FROM ' . prefixTable('items').' AS i |
|
54 | 54 | LEFT JOIN '.prefixTable('nested_tree').' as t ON (t.id = i.id_tree) '. |
55 | - $sqlExtra . |
|
56 | - " ORDER BY i.id ASC" . |
|
57 | - ($limit > 0 ? " LIMIT ". $limit : '') |
|
55 | + $sqlExtra. |
|
56 | + " ORDER BY i.id ASC". |
|
57 | + ($limit > 0 ? " LIMIT ".$limit : '') |
|
58 | 58 | ); |
59 | 59 | |
60 | 60 | $ret = []; |
61 | 61 | foreach ($rows as $row) { |
62 | 62 | $userKey = DB::queryfirstrow( |
63 | 63 | 'SELECT share_key |
64 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
64 | + FROM ' . prefixTable('sharekeys_items').' |
|
65 | 65 | WHERE user_id = %i AND object_id = %i', |
66 | 66 | $userId, |
67 | 67 | $row['id'] |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | if (empty($path) === true) { |
99 | 99 | $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
100 | 100 | } else { |
101 | - $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
101 | + $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | ) : array |
149 | 149 | { |
150 | 150 | try { |
151 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
151 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
152 | 152 | |
153 | 153 | // Load config |
154 | 154 | $configManager = new ConfigManager(); |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | } |
272 | 272 | |
273 | 273 | if (strlen($password) > $SETTINGS['pwd_maximum_length']) { |
274 | - throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)'); |
|
274 | + throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)'); |
|
275 | 275 | } |
276 | 276 | } |
277 | 277 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | { |
285 | 285 | $dataFolderSettings = DB::queryFirstRow( |
286 | 286 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
287 | - FROM ' . prefixTable('nested_tree') . ' |
|
287 | + FROM ' . prefixTable('nested_tree').' |
|
288 | 288 | WHERE id = %i', |
289 | 289 | $folderId |
290 | 290 | ); |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | { |
308 | 308 | $folderComplexity = DB::queryFirstRow( |
309 | 309 | 'SELECT valeur |
310 | - FROM ' . prefixTable('misc') . ' |
|
310 | + FROM ' . prefixTable('misc').' |
|
311 | 311 | WHERE type = %s AND intitule = %i', |
312 | 312 | 'complex', |
313 | 313 | $itemInfos['folderId'] |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void |
336 | 336 | { |
337 | 337 | DB::queryFirstRow( |
338 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
338 | + 'SELECT * FROM '.prefixTable('items').' |
|
339 | 339 | WHERE label = %s AND inactif = %i', |
340 | 340 | $label, |
341 | 341 | 0 |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
74 | 74 | // Not allowed page |
75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
77 | 77 | exit; |
78 | 78 | } |
79 | 79 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | // Check if user already exists |
176 | 176 | $data = DB::query( |
177 | 177 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
178 | - FROM ' . prefixTable('users') . ' |
|
178 | + FROM ' . prefixTable('users').' |
|
179 | 179 | WHERE login = %s |
180 | 180 | AND deleted_at IS NULL', |
181 | 181 | $login |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | |
413 | 413 | // Get info about user to delete |
414 | 414 | $data_user = DB::queryfirstrow( |
415 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
415 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
416 | 416 | WHERE id = %i', |
417 | 417 | $post_id |
418 | 418 | ); |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | ); |
447 | 447 | // delete personal folder and subfolders |
448 | 448 | $data = DB::queryfirstrow( |
449 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
449 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
450 | 450 | WHERE title = %s AND personal_folder = %i', |
451 | 451 | $post_id, |
452 | 452 | '1' |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
460 | 460 | // delete items & logs |
461 | 461 | $items = DB::query( |
462 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
462 | + 'SELECT id FROM '.prefixTable('items').' |
|
463 | 463 | WHERE id_tree=%i AND perso = %i', |
464 | 464 | $folder->id, |
465 | 465 | '1' |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | // Delete any process related to user |
484 | 484 | $processes = DB::query( |
485 | 485 | 'SELECT increment_id |
486 | - FROM ' . prefixTable('background_tasks') . ' |
|
486 | + FROM ' . prefixTable('background_tasks').' |
|
487 | 487 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
488 | 488 | $post_id |
489 | 489 | ); |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | |
544 | 544 | // Get info about user to delete |
545 | 545 | $data_user = DB::queryfirstrow( |
546 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
546 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
547 | 547 | WHERE id = %i', |
548 | 548 | $post_id |
549 | 549 | ); |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | |
586 | 586 | // Get info about user to delete |
587 | 587 | $data_user = DB::queryfirstrow( |
588 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
588 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
589 | 589 | WHERE id = %i', |
590 | 590 | $post_id |
591 | 591 | ); |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | // Get info about user to delete |
629 | 629 | $data_user = DB::queryfirstrow( |
630 | 630 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
631 | - FROM ' . prefixTable('users') . ' |
|
631 | + FROM ' . prefixTable('users').' |
|
632 | 632 | WHERE id = %i', |
633 | 633 | $post_id |
634 | 634 | ); |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | |
673 | 673 | // Get info about user to delete |
674 | 674 | $data_user = DB::queryfirstrow( |
675 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
675 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
676 | 676 | WHERE id = %i', |
677 | 677 | $post_id |
678 | 678 | ); |
@@ -715,7 +715,7 @@ discard block |
||
715 | 715 | // Get info about user to delete |
716 | 716 | $data_user = DB::queryfirstrow( |
717 | 717 | 'SELECT admin, isAdministratedByRole, gestionnaire |
718 | - FROM ' . prefixTable('users') . ' |
|
718 | + FROM ' . prefixTable('users').' |
|
719 | 719 | WHERE id = %i', |
720 | 720 | $post_id |
721 | 721 | ); |
@@ -758,7 +758,7 @@ discard block |
||
758 | 758 | // Get info about user to delete |
759 | 759 | $data_user = DB::queryfirstrow( |
760 | 760 | 'SELECT admin, isAdministratedByRole, gestionnaire |
761 | - FROM ' . prefixTable('users') . ' |
|
761 | + FROM ' . prefixTable('users').' |
|
762 | 762 | WHERE id = %i', |
763 | 763 | $post_id |
764 | 764 | ); |
@@ -798,7 +798,7 @@ discard block |
||
798 | 798 | // Get info about user to delete |
799 | 799 | $data_user = DB::queryfirstrow( |
800 | 800 | 'SELECT admin, isAdministratedByRole, gestionnaire |
801 | - FROM ' . prefixTable('users') . ' |
|
801 | + FROM ' . prefixTable('users').' |
|
802 | 802 | WHERE id = %i', |
803 | 803 | $post_id |
804 | 804 | ); |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | $return = array(); |
838 | 838 | // Check if folder exists |
839 | 839 | $data = DB::query( |
840 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
840 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
841 | 841 | WHERE title = %s AND parent_id = %i', |
842 | 842 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
843 | 843 | '0' |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | } |
851 | 851 | // Check if role exists |
852 | 852 | $data = DB::query( |
853 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
853 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
854 | 854 | WHERE title = %s', |
855 | 855 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
856 | 856 | ); |
@@ -870,7 +870,7 @@ discard block |
||
870 | 870 | case 'user_log_items': |
871 | 871 | $nb_pages = 1; |
872 | 872 | $logs = $sql_filter = ''; |
873 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . $lang->get('pages') . ' : </td>'; |
|
873 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.$lang->get('pages').' : </td>'; |
|
874 | 874 | |
875 | 875 | // Prepare POST variables |
876 | 876 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -882,14 +882,14 @@ discard block |
||
882 | 882 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) |
883 | 883 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) !== 'all' |
884 | 884 | ) { |
885 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "'"; |
|
885 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."'"; |
|
886 | 886 | } |
887 | 887 | // get number of pages |
888 | 888 | DB::query( |
889 | 889 | 'SELECT * |
890 | - FROM ' . prefixTable('log_items') . ' as l |
|
891 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
892 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
890 | + FROM ' . prefixTable('log_items').' as l |
|
891 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
892 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
893 | 893 | WHERE l.id_user = %i ' . $sql_filter, |
894 | 894 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
895 | 895 | ); |
@@ -907,19 +907,19 @@ discard block |
||
907 | 907 | // launch query |
908 | 908 | $rows = DB::query( |
909 | 909 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
910 | - FROM ' . prefixTable('log_items') . ' as l |
|
911 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
912 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
913 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
910 | + FROM ' . prefixTable('log_items').' as l |
|
911 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
912 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
913 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
914 | 914 | ORDER BY date DESC |
915 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
915 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
916 | 916 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
917 | 917 | ); |
918 | 918 | } else { |
919 | 919 | // get number of pages |
920 | 920 | DB::query( |
921 | 921 | 'SELECT * |
922 | - FROM ' . prefixTable('log_system') . ' |
|
922 | + FROM ' . prefixTable('log_system').' |
|
923 | 923 | WHERE type = %s AND field_1=%i', |
924 | 924 | 'user_mngt', |
925 | 925 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -938,7 +938,7 @@ discard block |
||
938 | 938 | // launch query |
939 | 939 | $rows = DB::query( |
940 | 940 | 'SELECT * |
941 | - FROM ' . prefixTable('log_system') . ' |
|
941 | + FROM ' . prefixTable('log_system').' |
|
942 | 942 | WHERE type = %s AND field_1 = %i |
943 | 943 | ORDER BY date DESC |
944 | 944 | LIMIT %i, %i', |
@@ -952,7 +952,7 @@ discard block |
||
952 | 952 | if (isset($counter) && $counter != 0) { |
953 | 953 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
954 | 954 | for ($i = 1; $i <= $nb_pages; ++$i) { |
955 | - $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>'; |
|
955 | + $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>'; |
|
956 | 956 | } |
957 | 957 | } |
958 | 958 | $pages .= '</tr></table>'; |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | if ($post_scope === 'user_mngt') { |
962 | 962 | $user = DB::queryfirstrow( |
963 | 963 | 'SELECT login |
964 | - from ' . prefixTable('users') . ' |
|
964 | + from ' . prefixTable('users').' |
|
965 | 965 | WHERE id=%i', |
966 | 966 | $record['qui'] |
967 | 967 | ); |
@@ -971,7 +971,7 @@ discard block |
||
971 | 971 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
972 | 972 | $label = $lang->get('log_user_initial_pwd_changed'); |
973 | 973 | } elseif ($tmp[0] == 'at_user_email_changed') { |
974 | - $label = $lang->get('log_user_email_changed') . $tmp[1]; |
|
974 | + $label = $lang->get('log_user_email_changed').$tmp[1]; |
|
975 | 975 | } elseif ($tmp[0] == 'at_user_added') { |
976 | 976 | $label = $lang->get('log_user_created'); |
977 | 977 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -982,14 +982,14 @@ discard block |
||
982 | 982 | $label = $lang->get('log_user_pwd_changed'); |
983 | 983 | } |
984 | 984 | // prepare log |
985 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>'; |
|
985 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>'; |
|
986 | 986 | } else { |
987 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . $lang->get($record['action']) . '</td></tr>'; |
|
987 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.$lang->get($record['action']).'</td></tr>'; |
|
988 | 988 | } |
989 | 989 | } |
990 | 990 | } |
991 | 991 | |
992 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
992 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
993 | 993 | break; |
994 | 994 | |
995 | 995 | /* |
@@ -1012,7 +1012,7 @@ discard block |
||
1012 | 1012 | } else { |
1013 | 1013 | // Get folder id for Admin |
1014 | 1014 | $admin_folder = DB::queryFirstRow( |
1015 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
1015 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
1016 | 1016 | WHERE title = %i AND personal_folder = %i', |
1017 | 1017 | (int) $session->get('user-id'), |
1018 | 1018 | '1' |
@@ -1023,15 +1023,15 @@ discard block |
||
1023 | 1023 | // Get each Items in PF |
1024 | 1024 | $rows = DB::query( |
1025 | 1025 | 'SELECT i.pw, i.label, l.id_user |
1026 | - FROM ' . prefixTable('items') . ' as i |
|
1027 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
1026 | + FROM ' . prefixTable('items').' as i |
|
1027 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
1028 | 1028 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
1029 | 1029 | 'at_creation', |
1030 | 1030 | '1', |
1031 | 1031 | intval($folder->id) |
1032 | 1032 | ); |
1033 | 1033 | foreach ($rows as $record) { |
1034 | - echo $record['label'] . ' - '; |
|
1034 | + echo $record['label'].' - '; |
|
1035 | 1035 | // Change user |
1036 | 1036 | DB::update( |
1037 | 1037 | prefixTable('log_items'), |
@@ -1066,7 +1066,7 @@ discard block |
||
1066 | 1066 | // Get info about user to delete |
1067 | 1067 | $data_user = DB::queryfirstrow( |
1068 | 1068 | 'SELECT admin, isAdministratedByRole, gestionnaire |
1069 | - FROM ' . prefixTable('users') . ' |
|
1069 | + FROM ' . prefixTable('users').' |
|
1070 | 1070 | WHERE id = %i', |
1071 | 1071 | $post_user_id |
1072 | 1072 | ); |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | |
1104 | 1104 | // Do |
1105 | 1105 | $rows = DB::query( |
1106 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
1106 | + 'SELECT id FROM '.prefixTable('users').' |
|
1107 | 1107 | WHERE timestamp != %s AND admin != %i', |
1108 | 1108 | '', |
1109 | 1109 | '1' |
@@ -1112,7 +1112,7 @@ discard block |
||
1112 | 1112 | // Get info about user to delete |
1113 | 1113 | $data_user = DB::queryfirstrow( |
1114 | 1114 | 'SELECT admin, isAdministratedByRole, gestionnaire |
1115 | - FROM ' . prefixTable('users') . ' |
|
1115 | + FROM ' . prefixTable('users').' |
|
1116 | 1116 | WHERE id = %i', |
1117 | 1117 | $record['id'] |
1118 | 1118 | ); |
@@ -1173,7 +1173,7 @@ discard block |
||
1173 | 1173 | // Get info about user |
1174 | 1174 | $rowUser = DB::queryfirstrow( |
1175 | 1175 | 'SELECT * |
1176 | - FROM ' . prefixTable('users') . ' |
|
1176 | + FROM ' . prefixTable('users').' |
|
1177 | 1177 | WHERE id = %i', |
1178 | 1178 | $post_id |
1179 | 1179 | ); |
@@ -1200,7 +1200,7 @@ discard block |
||
1200 | 1200 | // array of roles for actual user |
1201 | 1201 | //$my_functions = explode(';', $rowUser['fonction_id']); |
1202 | 1202 | |
1203 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
1203 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
1204 | 1204 | foreach ($rows as $record) { |
1205 | 1205 | if ( |
1206 | 1206 | (int) $session->get('user-admin') === 1 |
@@ -1237,7 +1237,7 @@ discard block |
||
1237 | 1237 | $rolesList = array(); |
1238 | 1238 | $managedBy = array(); |
1239 | 1239 | $selected = ''; |
1240 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
1240 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
1241 | 1241 | foreach ($rows as $reccord) { |
1242 | 1242 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
1243 | 1243 | } |
@@ -1268,7 +1268,7 @@ discard block |
||
1268 | 1268 | array_push( |
1269 | 1269 | $managedBy, |
1270 | 1270 | array( |
1271 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
1271 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
1272 | 1272 | 'id' => $fonction['id'], |
1273 | 1273 | 'selected' => $selected, |
1274 | 1274 | ) |
@@ -1350,9 +1350,9 @@ discard block |
||
1350 | 1350 | |
1351 | 1351 | // get USER STATUS |
1352 | 1352 | if ($rowUser['disabled'] == 1) { |
1353 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>'; |
|
1353 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>'; |
|
1354 | 1354 | } else { |
1355 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
1355 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
1356 | 1356 | } |
1357 | 1357 | |
1358 | 1358 | $arrData['error'] = false; |
@@ -1449,7 +1449,7 @@ discard block |
||
1449 | 1449 | // count number of admins |
1450 | 1450 | $users = DB::query( |
1451 | 1451 | 'SELECT id |
1452 | - FROM ' . prefixTable('users') . ' |
|
1452 | + FROM ' . prefixTable('users').' |
|
1453 | 1453 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
1454 | 1454 | $post_id |
1455 | 1455 | ); |
@@ -1472,7 +1472,7 @@ discard block |
||
1472 | 1472 | // Exclude roles from AD - PR #3635 |
1473 | 1473 | $adRoles = DB::query( |
1474 | 1474 | 'SELECT roles_from_ad_groups |
1475 | - FROM ' . prefixTable('users') . ' |
|
1475 | + FROM ' . prefixTable('users').' |
|
1476 | 1476 | WHERE id = '. $dataReceived['user_id'] |
1477 | 1477 | )[0]['roles_from_ad_groups']; |
1478 | 1478 | $fonctions = []; |
@@ -1551,7 +1551,7 @@ discard block |
||
1551 | 1551 | |
1552 | 1552 | // Get info about user to delete |
1553 | 1553 | $data_user = DB::queryfirstrow( |
1554 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
1554 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
1555 | 1555 | WHERE id = %i', |
1556 | 1556 | $post_id |
1557 | 1557 | ); |
@@ -1572,7 +1572,7 @@ discard block |
||
1572 | 1572 | ); |
1573 | 1573 | // delete personal folder and subfolders |
1574 | 1574 | $data = DB::queryfirstrow( |
1575 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
1575 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
1576 | 1576 | WHERE title = %s AND personal_folder = %i', |
1577 | 1577 | $post_id, |
1578 | 1578 | '1' |
@@ -1585,7 +1585,7 @@ discard block |
||
1585 | 1585 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
1586 | 1586 | // delete items & logs |
1587 | 1587 | $items = DB::query( |
1588 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
1588 | + 'SELECT id FROM '.prefixTable('items').' |
|
1589 | 1589 | WHERE id_tree=%i AND perso = %i', |
1590 | 1590 | $folder->id, |
1591 | 1591 | '1' |
@@ -1606,7 +1606,7 @@ discard block |
||
1606 | 1606 | } else { |
1607 | 1607 | // Get old data about user |
1608 | 1608 | $oldData = DB::queryfirstrow( |
1609 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1609 | + 'SELECT * FROM '.prefixTable('users').' |
|
1610 | 1610 | WHERE id = %i', |
1611 | 1611 | $post_id |
1612 | 1612 | ); |
@@ -1643,7 +1643,7 @@ discard block |
||
1643 | 1643 | |
1644 | 1644 | // update LOG |
1645 | 1645 | if ($oldData['email'] !== $post_email) { |
1646 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
1646 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
1647 | 1647 | } |
1648 | 1648 | } |
1649 | 1649 | echo prepareExchangedData( |
@@ -1701,7 +1701,7 @@ discard block |
||
1701 | 1701 | |
1702 | 1702 | // Get info about user to delete |
1703 | 1703 | $data_user = DB::queryfirstrow( |
1704 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
1704 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
1705 | 1705 | WHERE id = %i', |
1706 | 1706 | $post_id |
1707 | 1707 | ); |
@@ -1751,7 +1751,7 @@ discard block |
||
1751 | 1751 | } |
1752 | 1752 | |
1753 | 1753 | DB::queryfirstrow( |
1754 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1754 | + 'SELECT * FROM '.prefixTable('users').' |
|
1755 | 1755 | WHERE login = %s |
1756 | 1756 | AND deleted_at IS NULL', |
1757 | 1757 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1803,7 +1803,7 @@ discard block |
||
1803 | 1803 | // get User info |
1804 | 1804 | $rowUser = DB::queryFirstRow( |
1805 | 1805 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
1806 | - FROM ' . prefixTable('users') . ' |
|
1806 | + FROM ' . prefixTable('users').' |
|
1807 | 1807 | WHERE id = %i', |
1808 | 1808 | $post_id |
1809 | 1809 | ); |
@@ -1813,7 +1813,7 @@ discard block |
||
1813 | 1813 | $html = ''; |
1814 | 1814 | |
1815 | 1815 | if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
1816 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
1816 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
1817 | 1817 | } |
1818 | 1818 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
1819 | 1819 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1824,7 +1824,7 @@ discard block |
||
1824 | 1824 | // refine folders based upon roles |
1825 | 1825 | $rows = DB::query( |
1826 | 1826 | 'SELECT folder_id, type |
1827 | - FROM ' . prefixTable('roles_values') . ' |
|
1827 | + FROM ' . prefixTable('roles_values').' |
|
1828 | 1828 | WHERE role_id IN %ls |
1829 | 1829 | ORDER BY folder_id ASC', |
1830 | 1830 | $arrData['functions'] |
@@ -1847,7 +1847,7 @@ discard block |
||
1847 | 1847 | } |
1848 | 1848 | |
1849 | 1849 | // add allowed folders |
1850 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
1850 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
1851 | 1851 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
1852 | 1852 | } |
1853 | 1853 | |
@@ -1858,7 +1858,7 @@ discard block |
||
1858 | 1858 | // get folder name |
1859 | 1859 | $row = DB::queryFirstRow( |
1860 | 1860 | 'SELECT title, nlevel, id |
1861 | - FROM ' . prefixTable('nested_tree') . ' |
|
1861 | + FROM ' . prefixTable('nested_tree').' |
|
1862 | 1862 | WHERE id = %i', |
1863 | 1863 | $fld['id'] |
1864 | 1864 | ); |
@@ -1871,38 +1871,38 @@ discard block |
||
1871 | 1871 | |
1872 | 1872 | // manage right icon |
1873 | 1873 | if ($fld['type'] == 'W') { |
1874 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1875 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
1876 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
1874 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
1875 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
1876 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
1877 | 1877 | } elseif ($fld['type'] == 'ND') { |
1878 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1879 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
1880 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
1878 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1879 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
1880 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
1881 | 1881 | } elseif ($fld['type'] == 'NE') { |
1882 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1883 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
1884 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
1882 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1883 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
1884 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
1885 | 1885 | } elseif ($fld['type'] == 'NDNE') { |
1886 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
1887 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
1888 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
1886 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
1887 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
1888 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
1889 | 1889 | } elseif ($fld['type'] == '') { |
1890 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
1890 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
1891 | 1891 | } else { |
1892 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
1892 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
1893 | 1893 | } |
1894 | 1894 | |
1895 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
1896 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
1897 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
1898 | - '</td><td>' . $label . '</td></tr>'; |
|
1895 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
1896 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
1897 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
1898 | + '</td><td>'.$label.'</td></tr>'; |
|
1899 | 1899 | break; |
1900 | 1900 | } |
1901 | 1901 | } |
1902 | 1902 | } |
1903 | 1903 | |
1904 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
1905 | - $html . '</tbody></table>'; |
|
1904 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
1905 | + $html.'</tbody></table>'; |
|
1906 | 1906 | } else { |
1907 | 1907 | $html_full = ''; |
1908 | 1908 | } |
@@ -1948,7 +1948,7 @@ discard block |
||
1948 | 1948 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
1949 | 1949 | $rows = DB::query( |
1950 | 1950 | 'SELECT * |
1951 | - FROM ' . prefixTable('users') . ' |
|
1951 | + FROM ' . prefixTable('users').' |
|
1952 | 1952 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
1953 | 1953 | '0', |
1954 | 1954 | array_filter($session->get('user-roles_array')) |
@@ -1956,7 +1956,7 @@ discard block |
||
1956 | 1956 | } else { |
1957 | 1957 | $rows = DB::query( |
1958 | 1958 | 'SELECT * |
1959 | - FROM ' . prefixTable('users') . ' |
|
1959 | + FROM ' . prefixTable('users').' |
|
1960 | 1960 | WHERE admin = %i', |
1961 | 1961 | '0' |
1962 | 1962 | ); |
@@ -1968,7 +1968,7 @@ discard block |
||
1968 | 1968 | $groupIds = []; |
1969 | 1969 | foreach (explode(';', $record['fonction_id']) as $group) { |
1970 | 1970 | $tmp = DB::queryfirstrow( |
1971 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1971 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1972 | 1972 | WHERE id = %i', |
1973 | 1973 | $group |
1974 | 1974 | ); |
@@ -1980,7 +1980,7 @@ discard block |
||
1980 | 1980 | |
1981 | 1981 | // Get managed_by |
1982 | 1982 | $managedBy = DB::queryfirstrow( |
1983 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1983 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1984 | 1984 | WHERE id = %i', |
1985 | 1985 | $record['isAdministratedByRole'] |
1986 | 1986 | ); |
@@ -1990,7 +1990,7 @@ discard block |
||
1990 | 1990 | $foldersAllowedIds = []; |
1991 | 1991 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
1992 | 1992 | $tmp = DB::queryfirstrow( |
1993 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
1993 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
1994 | 1994 | WHERE id = %i', |
1995 | 1995 | $role |
1996 | 1996 | ); |
@@ -2003,7 +2003,7 @@ discard block |
||
2003 | 2003 | $foldersForbiddenIds = []; |
2004 | 2004 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
2005 | 2005 | $tmp = DB::queryfirstrow( |
2006 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
2006 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
2007 | 2007 | WHERE id = %i', |
2008 | 2008 | $role |
2009 | 2009 | ); |
@@ -2021,7 +2021,7 @@ discard block |
||
2021 | 2021 | 'login' => $record['login'], |
2022 | 2022 | 'groups' => implode(', ', $groups), |
2023 | 2023 | 'groupIds' => $groupIds, |
2024 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
2024 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
2025 | 2025 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
2026 | 2026 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
2027 | 2027 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2129,7 +2129,7 @@ discard block |
||
2129 | 2129 | |
2130 | 2130 | // Get info about user |
2131 | 2131 | $data_user = DB::queryfirstrow( |
2132 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
2132 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
2133 | 2133 | WHERE id = %i', |
2134 | 2134 | $inputData['source_id'] |
2135 | 2135 | ); |
@@ -2343,14 +2343,14 @@ discard block |
||
2343 | 2343 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
2344 | 2344 | $data_user = DB::queryfirstrow( |
2345 | 2345 | 'SELECT fonction_id, public_key |
2346 | - FROM ' . prefixTable('users') . ' |
|
2346 | + FROM ' . prefixTable('users').' |
|
2347 | 2347 | WHERE id = %i', |
2348 | 2348 | $post_user_id |
2349 | 2349 | ); |
2350 | 2350 | |
2351 | 2351 | if ($data_user) { |
2352 | 2352 | // Ensure array is unique |
2353 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
2353 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
2354 | 2354 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
2355 | 2355 | } else { |
2356 | 2356 | // User not found |
@@ -2366,14 +2366,14 @@ discard block |
||
2366 | 2366 | } |
2367 | 2367 | |
2368 | 2368 | // Manage specific case of api key |
2369 | - if($post_field === 'user_api_key') { |
|
2369 | + if ($post_field === 'user_api_key') { |
|
2370 | 2370 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
2371 | 2371 | $session->set('user-api_key', $post_new_value); |
2372 | 2372 | |
2373 | 2373 | // test if user has an api key |
2374 | 2374 | $data_user = DB::queryfirstrow( |
2375 | 2375 | 'SELECT value |
2376 | - FROM ' . prefixTable('api') . ' |
|
2376 | + FROM ' . prefixTable('api').' |
|
2377 | 2377 | WHERE user_id = %i', |
2378 | 2378 | $post_user_id |
2379 | 2379 | ); |
@@ -2493,7 +2493,7 @@ discard block |
||
2493 | 2493 | } catch (\LdapRecord\Auth\BindException $e) { |
2494 | 2494 | $error = $e->getDetailedError(); |
2495 | 2495 | if ($error) { |
2496 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2496 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2497 | 2497 | } else { |
2498 | 2498 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
2499 | 2499 | } |
@@ -2525,7 +2525,7 @@ discard block |
||
2525 | 2525 | } catch (\LdapRecord\Auth\BindException $e) { |
2526 | 2526 | $error = $e->getDetailedError(); |
2527 | 2527 | if ($error) { |
2528 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
2528 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
2529 | 2529 | } else { |
2530 | 2530 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
2531 | 2531 | } |
@@ -2544,7 +2544,7 @@ discard block |
||
2544 | 2544 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
2545 | 2545 | // Build the list of all groups in AD |
2546 | 2546 | if (isset($adUser['memberof']) === true) { |
2547 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
2547 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
2548 | 2548 | if (empty($adUserGroup) === false && $j !== "count") { |
2549 | 2549 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
2550 | 2550 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2560,7 +2560,7 @@ discard block |
||
2560 | 2560 | // Get his ID |
2561 | 2561 | $userInfo = DB::queryfirstrow( |
2562 | 2562 | 'SELECT id, login, fonction_id, auth_type |
2563 | - FROM ' . prefixTable('users') . ' |
|
2563 | + FROM ' . prefixTable('users').' |
|
2564 | 2564 | WHERE login = %s', |
2565 | 2565 | $userLogin |
2566 | 2566 | ); |
@@ -2596,7 +2596,7 @@ discard block |
||
2596 | 2596 | |
2597 | 2597 | // Get all groups in Teampass |
2598 | 2598 | $teampassRoles = array(); |
2599 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
2599 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
2600 | 2600 | foreach ($rows as $record) { |
2601 | 2601 | array_push( |
2602 | 2602 | $teampassRoles, |
@@ -2666,7 +2666,7 @@ discard block |
||
2666 | 2666 | // Check if user already exists |
2667 | 2667 | $data = DB::query( |
2668 | 2668 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
2669 | - FROM ' . prefixTable('users') . ' |
|
2669 | + FROM ' . prefixTable('users').' |
|
2670 | 2670 | WHERE login = %s', |
2671 | 2671 | $post_login |
2672 | 2672 | ); |
@@ -2849,14 +2849,14 @@ discard block |
||
2849 | 2849 | // Send mail to user with new OTP |
2850 | 2850 | $userInfo = DB::queryFirstRow( |
2851 | 2851 | 'SELECT email |
2852 | - FROM ' . prefixTable('users') . ' |
|
2852 | + FROM ' . prefixTable('users').' |
|
2853 | 2853 | WHERE id = %i', |
2854 | 2854 | $post_userId |
2855 | 2855 | ); |
2856 | 2856 | $emailSettings = new EmailSettings($SETTINGS); |
2857 | 2857 | $emailService = new EmailService(); |
2858 | 2858 | $emailService->sendMail( |
2859 | - 'TEAMPASS - ' . $lang->get('temporary_encryption_code'), |
|
2859 | + 'TEAMPASS - '.$lang->get('temporary_encryption_code'), |
|
2860 | 2860 | str_replace( |
2861 | 2861 | array('#enc_code#'), |
2862 | 2862 | array($post_otp), |
@@ -2918,7 +2918,7 @@ discard block |
||
2918 | 2918 | // Check if user already exists |
2919 | 2919 | DB::query( |
2920 | 2920 | 'SELECT id |
2921 | - FROM ' . prefixTable('users') . ' |
|
2921 | + FROM ' . prefixTable('users').' |
|
2922 | 2922 | WHERE id = %i', |
2923 | 2923 | $post_id |
2924 | 2924 | ); |
@@ -2997,7 +2997,7 @@ discard block |
||
2997 | 2997 | // Check if user already exists |
2998 | 2998 | $userInfo = DB::queryfirstrow( |
2999 | 2999 | 'SELECT id, private_key, public_key |
3000 | - FROM ' . prefixTable('users') . ' |
|
3000 | + FROM ' . prefixTable('users').' |
|
3001 | 3001 | WHERE id = %i', |
3002 | 3002 | $post_userid |
3003 | 3003 | ); |
@@ -3044,7 +3044,7 @@ discard block |
||
3044 | 3044 | if (count($session->get('user-personal_folders')) > 0) { |
3045 | 3045 | DB::query( |
3046 | 3046 | 'SELECT id |
3047 | - FROM ' . prefixTable('items') . ' |
|
3047 | + FROM ' . prefixTable('items').' |
|
3048 | 3048 | WHERE id_tree IN %ls', |
3049 | 3049 | $session->get('user-personal_folders') |
3050 | 3050 | ); |
@@ -3140,7 +3140,7 @@ discard block |
||
3140 | 3140 | // Check if user already exists |
3141 | 3141 | DB::query( |
3142 | 3142 | 'SELECT id |
3143 | - FROM ' . prefixTable('users') . ' |
|
3143 | + FROM ' . prefixTable('users').' |
|
3144 | 3144 | WHERE id = %i', |
3145 | 3145 | $post_id |
3146 | 3146 | ); |
@@ -3218,10 +3218,10 @@ discard block |
||
3218 | 3218 | 'process_type' => 'create_user_keys', |
3219 | 3219 | 'arguments' => json_encode([ |
3220 | 3220 | 'new_user_id' => (int) $post_user_id, |
3221 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
3222 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
3221 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
3222 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
3223 | 3223 | 'owner_id' => (int) $session->get('user-id'), |
3224 | - 'creator_pwd' => cryption($session->get('user-password'), '','encrypt', $SETTINGS)['string'], |
|
3224 | + 'creator_pwd' => cryption($session->get('user-password'), '', 'encrypt', $SETTINGS)['string'], |
|
3225 | 3225 | 'email_body' => $lang->get('email_body_user_config_5'), |
3226 | 3226 | 'send_email' => 1, |
3227 | 3227 | ]), |
@@ -3384,7 +3384,7 @@ discard block |
||
3384 | 3384 | // get user info |
3385 | 3385 | $userInfo = DB::queryFirstRow( |
3386 | 3386 | 'SELECT * |
3387 | - FROM ' . prefixTable('users') . ' |
|
3387 | + FROM ' . prefixTable('users').' |
|
3388 | 3388 | WHERE id = %i', |
3389 | 3389 | $user_id |
3390 | 3390 | ); |
@@ -3477,8 +3477,8 @@ discard block |
||
3477 | 3477 | // get user info |
3478 | 3478 | $processesProgress = DB::query( |
3479 | 3479 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
3480 | - FROM ' . prefixTable('users') . ' AS u |
|
3481 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
3480 | + FROM ' . prefixTable('users').' AS u |
|
3481 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
3482 | 3482 | WHERE u.id = %i', |
3483 | 3483 | $user_id |
3484 | 3484 | ); |
@@ -3486,9 +3486,9 @@ discard block |
||
3486 | 3486 | //print_r($processesProgress); |
3487 | 3487 | $finished_steps = 0; |
3488 | 3488 | $nb_steps = count($processesProgress); |
3489 | - foreach($processesProgress as $process) { |
|
3489 | + foreach ($processesProgress as $process) { |
|
3490 | 3490 | if ((int) $process['is_in_progress'] === -1) { |
3491 | - $finished_steps ++; |
|
3491 | + $finished_steps++; |
|
3492 | 3492 | } |
3493 | 3493 | } |
3494 | 3494 | |
@@ -3497,7 +3497,7 @@ discard block |
||
3497 | 3497 | 'error' => false, |
3498 | 3498 | 'message' => '', |
3499 | 3499 | 'user_id' => $user_id, |
3500 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
3500 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
3501 | 3501 | 'debug' => $finished_steps.",".$nb_steps, |
3502 | 3502 | ), |
3503 | 3503 | 'encode' |
@@ -3562,7 +3562,7 @@ discard block |
||
3562 | 3562 | |
3563 | 3563 | // Get info about user |
3564 | 3564 | $data_user = DB::queryfirstrow( |
3565 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
3565 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
3566 | 3566 | WHERE id = %i', |
3567 | 3567 | $value[1] |
3568 | 3568 | ); |
@@ -3596,7 +3596,7 @@ discard block |
||
3596 | 3596 | logEvents( |
3597 | 3597 | $SETTINGS, |
3598 | 3598 | 'user_mngt', |
3599 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
3599 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
3600 | 3600 | (string) $session->get('user-id'), |
3601 | 3601 | $session->get('user-login'), |
3602 | 3602 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3630,7 +3630,7 @@ discard block |
||
3630 | 3630 | |
3631 | 3631 | // Get info about user |
3632 | 3632 | $data_user = DB::queryfirstrow( |
3633 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
3633 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
3634 | 3634 | WHERE id = %i', |
3635 | 3635 | $value[1] |
3636 | 3636 | ); |