@@ -50,7 +50,7 @@ |
||
50 | 50 | $arrFolders = $folderModel->getFoldersInfo(explode(",", $userData['folders_list'])); |
51 | 51 | $responseData = json_encode($arrFolders); |
52 | 52 | } catch (Error $e) { |
53 | - $strErrorDesc = $e->getMessage() . ' Something went wrong! Please contact support.'; |
|
53 | + $strErrorDesc = $e->getMessage().' Something went wrong! Please contact support.'; |
|
54 | 54 | $strErrorHeader = 'HTTP/1.1 500 Internal Server Error'; |
55 | 55 | } |
56 | 56 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | DB::debugmode(false); |
64 | 64 | $rows = DB::query( |
65 | 65 | 'SELECT * |
66 | - FROM ' . prefixTable('processes') . ' |
|
66 | + FROM ' . prefixTable('processes').' |
|
67 | 67 | WHERE is_in_progress = %i AND process_type = %s |
68 | 68 | ORDER BY increment_id ASC LIMIT 0,10', |
69 | 69 | 0, |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | { |
119 | 119 | //if ((int) $SETTINGS['enable_backlog_mail'] === 1) { |
120 | 120 | $row = DB::queryFirstRow( |
121 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
121 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
122 | 122 | 'cron', |
123 | 123 | 'sending_emails' |
124 | 124 | ); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
127 | 127 | $rows = DB::query( |
128 | 128 | 'SELECT * |
129 | - FROM ' . prefixTable('emails') . |
|
129 | + FROM ' . prefixTable('emails'). |
|
130 | 130 | ' WHERE status != %s', |
131 | 131 | 'sent' |
132 | 132 | ); |
@@ -128,8 +128,7 @@ |
||
128 | 128 | </div> |
129 | 129 | <?php |
130 | 130 | } |
131 | -} |
|
132 | -catch (Exception $e) { |
|
131 | +} catch (Exception $e) { |
|
133 | 132 | echo $e->getMessage(); |
134 | 133 | }?> |
135 | 134 | </div> |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === false) { |
68 | 68 | // Not allowed page |
69 | 69 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
70 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
70 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
71 | 71 | exit; |
72 | 72 | } |
73 | 73 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : []; |
230 | 230 | ?> |
231 | 231 | <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? langHdl($task[0])." ".(isset($task[2]) === true ? strtolower(langHdl('day')).' '.$task[2].' ' : '').langHdl('at')." ".$task[1] : langHdl('not_defined') ?>'> |
232 | - <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'> |
|
232 | + <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'> |
|
233 | 233 | </div> |
234 | 234 | <div class='col-2'> |
235 | 235 | <button class="btn btn-primary task-define" data-task="users_personal_folder_task"> |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : []; |
258 | 258 | ?> |
259 | 259 | <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? langHdl($task[0])." ".(isset($task[2]) === true ? strtolower(langHdl('day')).' '.$task[2].' ' : '').langHdl('at')." ".$task[1] : langHdl('not_defined') ?>'> |
260 | - <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'> |
|
260 | + <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'> |
|
261 | 261 | </div> |
262 | 262 | <div class='col-2'> |
263 | 263 | <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task"> |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : []; |
280 | 280 | ?> |
281 | 281 | <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? langHdl($task[0])." ".(isset($task[2]) === true ? strtolower(langHdl('day')).' '.$task[2].' ' : '').langHdl('at')." ".$task[1] : langHdl('not_defined') ?>'> |
282 | - <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'> |
|
282 | + <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'> |
|
283 | 283 | </div> |
284 | 284 | <div class='col-2'> |
285 | 285 | <button class="btn btn-primary task-define" data-task="purge_temporary_files_task"> |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : []; |
324 | 324 | ?> |
325 | 325 | <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? langHdl($task[0])." ".(isset($task[2]) === true ? strtolower(langHdl('day')).' '.$task[2].' ' : '').langHdl('at')." ".$task[1] : langHdl('not_defined') ?>'> |
326 | - <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'> |
|
326 | + <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'> |
|
327 | 327 | </div> |
328 | 328 | <div class='col-2'> |
329 | 329 | <button class="btn btn-primary task-define" data-task="reload_cache_table_task"> |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | <h5><?php echo langHdl('day_of_month'); ?></h5> |
508 | 508 | <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;"> |
509 | 509 | <?php |
510 | - for ($i=1; $i<=31; $i++) { |
|
510 | + for ($i = 1; $i <= 31; $i++) { |
|
511 | 511 | echo '<option value="'.$i.'">'.langHdl('day').' '.$i.'</option>'; |
512 | 512 | } |
513 | 513 | ?> |
@@ -207,8 +207,7 @@ |
||
207 | 207 | </div> |
208 | 208 | <?php |
209 | 209 | } |
210 | -} |
|
211 | -catch (Exception $e) { |
|
210 | +} catch (Exception $e) { |
|
212 | 211 | echo $e->getMessage(); |
213 | 212 | } |
214 | 213 | ?> |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
70 | 70 | // Not allowed page |
71 | 71 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | </div> |
211 | 211 | <?php |
212 | 212 | } else { |
213 | - $job = (array) $results[0];//print_r($job); |
|
213 | + $job = (array) $results[0]; //print_r($job); |
|
214 | 214 | ?> |
215 | 215 | <div> |
216 | 216 | <i class="fa-solid fa-circle-check text-success mr-2"></i><?php echo langHdl('tasks_cron_running'); ?> |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | <div class="card-body"> |
246 | 246 | <?php |
247 | 247 | // Display information about server |
248 | - $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '" . DB_NAME . "'"); |
|
248 | + $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '".DB_NAME."'"); |
|
249 | 249 | |
250 | 250 | // Get OS |
251 | 251 | $uname = php_uname('s'); |
@@ -283,16 +283,16 @@ discard block |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | echo |
286 | - '<p>' . $os. |
|
286 | + '<p>'.$os. |
|
287 | 287 | '<br><span class="ml-4"></span>'. |
288 | 288 | '</p>'. |
289 | - '<p><i class="fa-brands fa-php mr-2"></i>PHP version: ' . phpversion(). |
|
289 | + '<p><i class="fa-brands fa-php mr-2"></i>PHP version: '.phpversion(). |
|
290 | 290 | '<br><span class="ml-4">Memory limit: '.(ini_get('memory_limit')).'</span>'. |
291 | 291 | '<br><span class="ml-4">Memory usage: '.formatSizeUnits(memory_get_usage()).'</span>'. |
292 | 292 | '<br><span class="ml-4">Maximum time execution: '.ini_get('max_execution_time').'</span>'. |
293 | 293 | '<br><span class="ml-4">Maximum file size upload: '.ini_get('upload_max_filesize').'</span>'. |
294 | 294 | '</p>'. |
295 | - '<p><i class="fa-solid fa-server mr-2"></i>Server version: ' . DB::serverVersion(). |
|
295 | + '<p><i class="fa-solid fa-server mr-2"></i>Server version: '.DB::serverVersion(). |
|
296 | 296 | '<br><span class="ml-4">Database size: '.($dbSize['size']).'MB</span>'. |
297 | 297 | '</p>'; |
298 | 298 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | $serverTime = localtime(time(), true); |
301 | 301 | echo '<div class="row">'. |
302 | 302 | '<div class="col-6"><i class="fa-solid fa-clock mr-2"></i>Server time:</div>'. |
303 | - '<div class="col-6"><span class="badge badge-info">' . $serverTime['tm_hour'].':'.$serverTime['tm_min'].':'.$serverTime['tm_sec'].'</span></div>'. |
|
303 | + '<div class="col-6"><span class="badge badge-info">'.$serverTime['tm_hour'].':'.$serverTime['tm_min'].':'.$serverTime['tm_sec'].'</span></div>'. |
|
304 | 304 | '</div>'. |
305 | 305 | '<div class="row">'. |
306 | 306 | '<div class="col-6"><span class="ml-4">Timezone:</span></div>'. |
@@ -2603,7 +2603,9 @@ |
||
2603 | 2603 | } |
2604 | 2604 | |
2605 | 2605 | foreach ($results as $adUser) { |
2606 | - if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
|
2606 | + if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) { |
|
2607 | + continue; |
|
2608 | + } |
|
2607 | 2609 | // Build the list of all groups in AD |
2608 | 2610 | if (isset($adUser['memberof']) === true) { |
2609 | 2611 | foreach($adUser['memberof'] as $j => $adUserGroup) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
65 | 65 | // Not allowed page |
66 | 66 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
67 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
67 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
68 | 68 | exit; |
69 | 69 | } |
70 | 70 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | // Prepare variables |
128 | 128 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
129 | 129 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
130 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
|
130 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
|
131 | 131 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
132 | 132 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
133 | 133 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | // Check if user already exists |
159 | 159 | $data = DB::query( |
160 | 160 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
161 | - FROM ' . prefixTable('users') . ' |
|
161 | + FROM ' . prefixTable('users').' |
|
162 | 162 | WHERE login = %s |
163 | 163 | AND deleted_at IS NULL', |
164 | 164 | $login |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | |
396 | 396 | // Get info about user to delete |
397 | 397 | $data_user = DB::queryfirstrow( |
398 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
398 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
399 | 399 | WHERE id = %i', |
400 | 400 | $post_id |
401 | 401 | ); |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | ); |
430 | 430 | // delete personal folder and subfolders |
431 | 431 | $data = DB::queryfirstrow( |
432 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
432 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
433 | 433 | WHERE title = %s AND personal_folder = %i', |
434 | 434 | $post_id, |
435 | 435 | '1' |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
443 | 443 | // delete items & logs |
444 | 444 | $items = DB::query( |
445 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
445 | + 'SELECT id FROM '.prefixTable('items').' |
|
446 | 446 | WHERE id_tree=%i AND perso = %i', |
447 | 447 | $folder->id, |
448 | 448 | '1' |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | // Delete any process related to user |
467 | 467 | $processes = DB::query( |
468 | 468 | 'SELECT increment_id |
469 | - FROM ' . prefixTable('processes') . ' |
|
469 | + FROM ' . prefixTable('processes').' |
|
470 | 470 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
471 | 471 | $post_id |
472 | 472 | ); |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | |
527 | 527 | // Get info about user to delete |
528 | 528 | $data_user = DB::queryfirstrow( |
529 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
529 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
530 | 530 | WHERE id = %i', |
531 | 531 | $post_id |
532 | 532 | ); |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | |
569 | 569 | // Get info about user to delete |
570 | 570 | $data_user = DB::queryfirstrow( |
571 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
571 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
572 | 572 | WHERE id = %i', |
573 | 573 | $post_id |
574 | 574 | ); |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | // Get info about user to delete |
612 | 612 | $data_user = DB::queryfirstrow( |
613 | 613 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
614 | - FROM ' . prefixTable('users') . ' |
|
614 | + FROM ' . prefixTable('users').' |
|
615 | 615 | WHERE id = %i', |
616 | 616 | $post_id |
617 | 617 | ); |
@@ -655,7 +655,7 @@ discard block |
||
655 | 655 | |
656 | 656 | // Get info about user to delete |
657 | 657 | $data_user = DB::queryfirstrow( |
658 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
658 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
659 | 659 | WHERE id = %i', |
660 | 660 | $post_id |
661 | 661 | ); |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | // Get info about user to delete |
699 | 699 | $data_user = DB::queryfirstrow( |
700 | 700 | 'SELECT admin, isAdministratedByRole, gestionnaire |
701 | - FROM ' . prefixTable('users') . ' |
|
701 | + FROM ' . prefixTable('users').' |
|
702 | 702 | WHERE id = %i', |
703 | 703 | $post_id |
704 | 704 | ); |
@@ -741,7 +741,7 @@ discard block |
||
741 | 741 | // Get info about user to delete |
742 | 742 | $data_user = DB::queryfirstrow( |
743 | 743 | 'SELECT admin, isAdministratedByRole, gestionnaire |
744 | - FROM ' . prefixTable('users') . ' |
|
744 | + FROM ' . prefixTable('users').' |
|
745 | 745 | WHERE id = %i', |
746 | 746 | $post_id |
747 | 747 | ); |
@@ -781,7 +781,7 @@ discard block |
||
781 | 781 | // Get info about user to delete |
782 | 782 | $data_user = DB::queryfirstrow( |
783 | 783 | 'SELECT admin, isAdministratedByRole, gestionnaire |
784 | - FROM ' . prefixTable('users') . ' |
|
784 | + FROM ' . prefixTable('users').' |
|
785 | 785 | WHERE id = %i', |
786 | 786 | $post_id |
787 | 787 | ); |
@@ -820,7 +820,7 @@ discard block |
||
820 | 820 | $return = array(); |
821 | 821 | // Check if folder exists |
822 | 822 | $data = DB::query( |
823 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
823 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
824 | 824 | WHERE title = %s AND parent_id = %i', |
825 | 825 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
826 | 826 | '0' |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | } |
834 | 834 | // Check if role exists |
835 | 835 | $data = DB::query( |
836 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
836 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
837 | 837 | WHERE title = %s', |
838 | 838 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
839 | 839 | ); |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | case 'user_log_items': |
854 | 854 | $nb_pages = 1; |
855 | 855 | $logs = $sql_filter = ''; |
856 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . ' : </td>'; |
|
856 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').' : </td>'; |
|
857 | 857 | |
858 | 858 | // Prepare POST variables |
859 | 859 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -865,14 +865,14 @@ discard block |
||
865 | 865 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) |
866 | 866 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) !== 'all' |
867 | 867 | ) { |
868 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "'"; |
|
868 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."'"; |
|
869 | 869 | } |
870 | 870 | // get number of pages |
871 | 871 | DB::query( |
872 | 872 | 'SELECT * |
873 | - FROM ' . prefixTable('log_items') . ' as l |
|
874 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
875 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
873 | + FROM ' . prefixTable('log_items').' as l |
|
874 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
875 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
876 | 876 | WHERE l.id_user = %i ' . $sql_filter, |
877 | 877 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
878 | 878 | ); |
@@ -890,19 +890,19 @@ discard block |
||
890 | 890 | // launch query |
891 | 891 | $rows = DB::query( |
892 | 892 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
893 | - FROM ' . prefixTable('log_items') . ' as l |
|
894 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
895 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
896 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
893 | + FROM ' . prefixTable('log_items').' as l |
|
894 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
895 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
896 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
897 | 897 | ORDER BY date DESC |
898 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
898 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
899 | 899 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
900 | 900 | ); |
901 | 901 | } else { |
902 | 902 | // get number of pages |
903 | 903 | DB::query( |
904 | 904 | 'SELECT * |
905 | - FROM ' . prefixTable('log_system') . ' |
|
905 | + FROM ' . prefixTable('log_system').' |
|
906 | 906 | WHERE type = %s AND field_1=%i', |
907 | 907 | 'user_mngt', |
908 | 908 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -921,7 +921,7 @@ discard block |
||
921 | 921 | // launch query |
922 | 922 | $rows = DB::query( |
923 | 923 | 'SELECT * |
924 | - FROM ' . prefixTable('log_system') . ' |
|
924 | + FROM ' . prefixTable('log_system').' |
|
925 | 925 | WHERE type = %s AND field_1 = %i |
926 | 926 | ORDER BY date DESC |
927 | 927 | LIMIT %i, %i', |
@@ -935,7 +935,7 @@ discard block |
||
935 | 935 | if (isset($counter) && $counter != 0) { |
936 | 936 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
937 | 937 | for ($i = 1; $i <= $nb_pages; ++$i) { |
938 | - $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>'; |
|
938 | + $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>'; |
|
939 | 939 | } |
940 | 940 | } |
941 | 941 | $pages .= '</tr></table>'; |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | if ($post_scope === 'user_mngt') { |
945 | 945 | $user = DB::queryfirstrow( |
946 | 946 | 'SELECT login |
947 | - from ' . prefixTable('users') . ' |
|
947 | + from ' . prefixTable('users').' |
|
948 | 948 | WHERE id=%i', |
949 | 949 | $record['qui'] |
950 | 950 | ); |
@@ -954,7 +954,7 @@ discard block |
||
954 | 954 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
955 | 955 | $label = langHdl('log_user_initial_pwd_changed'); |
956 | 956 | } elseif ($tmp[0] == 'at_user_email_changed') { |
957 | - $label = langHdl('log_user_email_changed') . $tmp[1]; |
|
957 | + $label = langHdl('log_user_email_changed').$tmp[1]; |
|
958 | 958 | } elseif ($tmp[0] == 'at_user_added') { |
959 | 959 | $label = langHdl('log_user_created'); |
960 | 960 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -965,14 +965,14 @@ discard block |
||
965 | 965 | $label = langHdl('log_user_pwd_changed'); |
966 | 966 | } |
967 | 967 | // prepare log |
968 | - $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>'; |
|
968 | + $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>'; |
|
969 | 969 | } else { |
970 | - $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\">' . langHdl($record['action']) . '</td></tr>'; |
|
970 | + $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\">'.langHdl($record['action']).'</td></tr>'; |
|
971 | 971 | } |
972 | 972 | } |
973 | 973 | } |
974 | 974 | |
975 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
975 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
976 | 976 | break; |
977 | 977 | |
978 | 978 | /* |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | } else { |
998 | 998 | // Get folder id for Admin |
999 | 999 | $admin_folder = DB::queryFirstRow( |
1000 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
1000 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
1001 | 1001 | WHERE title = %i AND personal_folder = %i', |
1002 | 1002 | intval($_SESSION['user_id']), |
1003 | 1003 | '1' |
@@ -1008,15 +1008,15 @@ discard block |
||
1008 | 1008 | // Get each Items in PF |
1009 | 1009 | $rows = DB::query( |
1010 | 1010 | 'SELECT i.pw, i.label, l.id_user |
1011 | - FROM ' . prefixTable('items') . ' as i |
|
1012 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
1011 | + FROM ' . prefixTable('items').' as i |
|
1012 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
1013 | 1013 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
1014 | 1014 | 'at_creation', |
1015 | 1015 | '1', |
1016 | 1016 | intval($folder->id) |
1017 | 1017 | ); |
1018 | 1018 | foreach ($rows as $record) { |
1019 | - echo $record['label'] . ' - '; |
|
1019 | + echo $record['label'].' - '; |
|
1020 | 1020 | // Change user |
1021 | 1021 | DB::update( |
1022 | 1022 | prefixTable('log_items'), |
@@ -1051,7 +1051,7 @@ discard block |
||
1051 | 1051 | // Get info about user to delete |
1052 | 1052 | $data_user = DB::queryfirstrow( |
1053 | 1053 | 'SELECT admin, isAdministratedByRole, gestionnaire |
1054 | - FROM ' . prefixTable('users') . ' |
|
1054 | + FROM ' . prefixTable('users').' |
|
1055 | 1055 | WHERE id = %i', |
1056 | 1056 | $post_user_id |
1057 | 1057 | ); |
@@ -1088,7 +1088,7 @@ discard block |
||
1088 | 1088 | |
1089 | 1089 | // Do |
1090 | 1090 | $rows = DB::query( |
1091 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
1091 | + 'SELECT id FROM '.prefixTable('users').' |
|
1092 | 1092 | WHERE timestamp != %s AND admin != %i', |
1093 | 1093 | '', |
1094 | 1094 | '1' |
@@ -1097,7 +1097,7 @@ discard block |
||
1097 | 1097 | // Get info about user to delete |
1098 | 1098 | $data_user = DB::queryfirstrow( |
1099 | 1099 | 'SELECT admin, isAdministratedByRole, gestionnaire |
1100 | - FROM ' . prefixTable('users') . ' |
|
1100 | + FROM ' . prefixTable('users').' |
|
1101 | 1101 | WHERE id = %i', |
1102 | 1102 | $record['id'] |
1103 | 1103 | ); |
@@ -1158,7 +1158,7 @@ discard block |
||
1158 | 1158 | // Get info about user |
1159 | 1159 | $rowUser = DB::queryfirstrow( |
1160 | 1160 | 'SELECT * |
1161 | - FROM ' . prefixTable('users') . ' |
|
1161 | + FROM ' . prefixTable('users').' |
|
1162 | 1162 | WHERE id = %i', |
1163 | 1163 | $post_id |
1164 | 1164 | ); |
@@ -1185,7 +1185,7 @@ discard block |
||
1185 | 1185 | // array of roles for actual user |
1186 | 1186 | //$my_functions = explode(';', $rowUser['fonction_id']); |
1187 | 1187 | |
1188 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
1188 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
1189 | 1189 | foreach ($rows as $record) { |
1190 | 1190 | if ( |
1191 | 1191 | (int) $_SESSION['is_admin'] === 1 |
@@ -1222,7 +1222,7 @@ discard block |
||
1222 | 1222 | $rolesList = array(); |
1223 | 1223 | $managedBy = array(); |
1224 | 1224 | $selected = ''; |
1225 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
1225 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
1226 | 1226 | foreach ($rows as $reccord) { |
1227 | 1227 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
1228 | 1228 | } |
@@ -1253,7 +1253,7 @@ discard block |
||
1253 | 1253 | array_push( |
1254 | 1254 | $managedBy, |
1255 | 1255 | array( |
1256 | - 'title' => langHdl('managers_of') . ' ' . $fonction['title'], |
|
1256 | + 'title' => langHdl('managers_of').' '.$fonction['title'], |
|
1257 | 1257 | 'id' => $fonction['id'], |
1258 | 1258 | 'selected' => $selected, |
1259 | 1259 | ) |
@@ -1335,9 +1335,9 @@ discard block |
||
1335 | 1335 | |
1336 | 1336 | // get USER STATUS |
1337 | 1337 | if ($rowUser['disabled'] == 1) { |
1338 | - $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . langHdl('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">' . langHdl('user_info_delete_question') . '</label>'; |
|
1338 | + $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.langHdl('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">'.langHdl('user_info_delete_question').'</label>'; |
|
1339 | 1339 | } else { |
1340 | - $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . langHdl('user_info_lock_question'); |
|
1340 | + $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.langHdl('user_info_lock_question'); |
|
1341 | 1341 | } |
1342 | 1342 | |
1343 | 1343 | $arrData['error'] = false; |
@@ -1434,7 +1434,7 @@ discard block |
||
1434 | 1434 | // count number of admins |
1435 | 1435 | $users = DB::query( |
1436 | 1436 | 'SELECT id |
1437 | - FROM ' . prefixTable('users') . ' |
|
1437 | + FROM ' . prefixTable('users').' |
|
1438 | 1438 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
1439 | 1439 | $post_id |
1440 | 1440 | ); |
@@ -1457,7 +1457,7 @@ discard block |
||
1457 | 1457 | // Exclude roles from AD - PR #3635 |
1458 | 1458 | $adRoles = DB::query( |
1459 | 1459 | 'SELECT roles_from_ad_groups |
1460 | - FROM ' . prefixTable('users') . ' |
|
1460 | + FROM ' . prefixTable('users').' |
|
1461 | 1461 | WHERE id = '. $dataReceived['user_id'] |
1462 | 1462 | )[0]['roles_from_ad_groups']; |
1463 | 1463 | $fonctions = []; |
@@ -1536,7 +1536,7 @@ discard block |
||
1536 | 1536 | |
1537 | 1537 | // Get info about user to delete |
1538 | 1538 | $data_user = DB::queryfirstrow( |
1539 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
1539 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
1540 | 1540 | WHERE id = %i', |
1541 | 1541 | $post_id |
1542 | 1542 | ); |
@@ -1557,7 +1557,7 @@ discard block |
||
1557 | 1557 | ); |
1558 | 1558 | // delete personal folder and subfolders |
1559 | 1559 | $data = DB::queryfirstrow( |
1560 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
1560 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
1561 | 1561 | WHERE title = %s AND personal_folder = %i', |
1562 | 1562 | $post_id, |
1563 | 1563 | '1' |
@@ -1570,7 +1570,7 @@ discard block |
||
1570 | 1570 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
1571 | 1571 | // delete items & logs |
1572 | 1572 | $items = DB::query( |
1573 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
1573 | + 'SELECT id FROM '.prefixTable('items').' |
|
1574 | 1574 | WHERE id_tree=%i AND perso = %i', |
1575 | 1575 | $folder->id, |
1576 | 1576 | '1' |
@@ -1591,7 +1591,7 @@ discard block |
||
1591 | 1591 | } else { |
1592 | 1592 | // Get old data about user |
1593 | 1593 | $oldData = DB::queryfirstrow( |
1594 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1594 | + 'SELECT * FROM '.prefixTable('users').' |
|
1595 | 1595 | WHERE id = %i', |
1596 | 1596 | $post_id |
1597 | 1597 | ); |
@@ -1628,7 +1628,7 @@ discard block |
||
1628 | 1628 | |
1629 | 1629 | // update LOG |
1630 | 1630 | if ($oldData['email'] !== $post_email) { |
1631 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
1631 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
1632 | 1632 | } |
1633 | 1633 | } |
1634 | 1634 | echo prepareExchangedData( |
@@ -1686,7 +1686,7 @@ discard block |
||
1686 | 1686 | |
1687 | 1687 | // Get info about user to delete |
1688 | 1688 | $data_user = DB::queryfirstrow( |
1689 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
1689 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
1690 | 1690 | WHERE id = %i', |
1691 | 1691 | $post_id |
1692 | 1692 | ); |
@@ -1736,7 +1736,7 @@ discard block |
||
1736 | 1736 | } |
1737 | 1737 | |
1738 | 1738 | DB::queryfirstrow( |
1739 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
1739 | + 'SELECT * FROM '.prefixTable('users').' |
|
1740 | 1740 | WHERE login = %s |
1741 | 1741 | AND deleted_at IS NULL', |
1742 | 1742 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1788,7 +1788,7 @@ discard block |
||
1788 | 1788 | // get User info |
1789 | 1789 | $rowUser = DB::queryFirstRow( |
1790 | 1790 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
1791 | - FROM ' . prefixTable('users') . ' |
|
1791 | + FROM ' . prefixTable('users').' |
|
1792 | 1792 | WHERE id = %i', |
1793 | 1793 | $post_id |
1794 | 1794 | ); |
@@ -1798,7 +1798,7 @@ discard block |
||
1798 | 1798 | $html = ''; |
1799 | 1799 | |
1800 | 1800 | 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) { |
1801 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
1801 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
1802 | 1802 | } |
1803 | 1803 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
1804 | 1804 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1809,7 +1809,7 @@ discard block |
||
1809 | 1809 | // refine folders based upon roles |
1810 | 1810 | $rows = DB::query( |
1811 | 1811 | 'SELECT folder_id, type |
1812 | - FROM ' . prefixTable('roles_values') . ' |
|
1812 | + FROM ' . prefixTable('roles_values').' |
|
1813 | 1813 | WHERE role_id IN %ls |
1814 | 1814 | ORDER BY folder_id ASC', |
1815 | 1815 | $arrData['functions'] |
@@ -1832,7 +1832,7 @@ discard block |
||
1832 | 1832 | } |
1833 | 1833 | |
1834 | 1834 | // add allowed folders |
1835 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
1835 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
1836 | 1836 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
1837 | 1837 | } |
1838 | 1838 | |
@@ -1843,7 +1843,7 @@ discard block |
||
1843 | 1843 | // get folder name |
1844 | 1844 | $row = DB::queryFirstRow( |
1845 | 1845 | 'SELECT title, nlevel, id |
1846 | - FROM ' . prefixTable('nested_tree') . ' |
|
1846 | + FROM ' . prefixTable('nested_tree').' |
|
1847 | 1847 | WHERE id = %i', |
1848 | 1848 | $fld['id'] |
1849 | 1849 | ); |
@@ -1856,38 +1856,38 @@ discard block |
||
1856 | 1856 | |
1857 | 1857 | // manage right icon |
1858 | 1858 | if ($fld['type'] == 'W') { |
1859 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' . |
|
1860 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
1861 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
1859 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'. |
|
1860 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
1861 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
1862 | 1862 | } elseif ($fld['type'] == 'ND') { |
1863 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
1864 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
1865 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
1863 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
1864 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
1865 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
1866 | 1866 | } elseif ($fld['type'] == 'NE') { |
1867 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
1868 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
1869 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
1867 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
1868 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
1869 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
1870 | 1870 | } elseif ($fld['type'] == 'NDNE') { |
1871 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
1872 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
1873 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
1871 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
1872 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
1873 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
1874 | 1874 | } elseif ($fld['type'] == '') { |
1875 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . langHdl('no_access') . '"></i>'; |
|
1875 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.langHdl('no_access').'"></i>'; |
|
1876 | 1876 | } else { |
1877 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>'; |
|
1877 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>'; |
|
1878 | 1878 | } |
1879 | 1879 | |
1880 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
1881 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
1882 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : ''). |
|
1883 | - '</td><td>' . $label . '</td></tr>'; |
|
1880 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
1881 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
1882 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : ''). |
|
1883 | + '</td><td>'.$label.'</td></tr>'; |
|
1884 | 1884 | break; |
1885 | 1885 | } |
1886 | 1886 | } |
1887 | 1887 | } |
1888 | 1888 | |
1889 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
1890 | - $html . '</tbody></table>'; |
|
1889 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
1890 | + $html.'</tbody></table>'; |
|
1891 | 1891 | } else { |
1892 | 1892 | $html_full = ''; |
1893 | 1893 | } |
@@ -1933,7 +1933,7 @@ discard block |
||
1933 | 1933 | if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) { |
1934 | 1934 | $rows = DB::query( |
1935 | 1935 | 'SELECT * |
1936 | - FROM ' . prefixTable('users') . ' |
|
1936 | + FROM ' . prefixTable('users').' |
|
1937 | 1937 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
1938 | 1938 | '0', |
1939 | 1939 | array_filter($_SESSION['user_roles']) |
@@ -1941,7 +1941,7 @@ discard block |
||
1941 | 1941 | } else { |
1942 | 1942 | $rows = DB::query( |
1943 | 1943 | 'SELECT * |
1944 | - FROM ' . prefixTable('users') . ' |
|
1944 | + FROM ' . prefixTable('users').' |
|
1945 | 1945 | WHERE admin = %i', |
1946 | 1946 | '0' |
1947 | 1947 | ); |
@@ -1953,7 +1953,7 @@ discard block |
||
1953 | 1953 | $groupIds = []; |
1954 | 1954 | foreach (explode(';', $record['fonction_id']) as $group) { |
1955 | 1955 | $tmp = DB::queryfirstrow( |
1956 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1956 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1957 | 1957 | WHERE id = %i', |
1958 | 1958 | $group |
1959 | 1959 | ); |
@@ -1965,7 +1965,7 @@ discard block |
||
1965 | 1965 | |
1966 | 1966 | // Get managed_by |
1967 | 1967 | $managedBy = DB::queryfirstrow( |
1968 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
1968 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
1969 | 1969 | WHERE id = %i', |
1970 | 1970 | $record['isAdministratedByRole'] |
1971 | 1971 | ); |
@@ -1975,7 +1975,7 @@ discard block |
||
1975 | 1975 | $foldersAllowedIds = []; |
1976 | 1976 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
1977 | 1977 | $tmp = DB::queryfirstrow( |
1978 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
1978 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
1979 | 1979 | WHERE id = %i', |
1980 | 1980 | $role |
1981 | 1981 | ); |
@@ -1988,7 +1988,7 @@ discard block |
||
1988 | 1988 | $foldersForbiddenIds = []; |
1989 | 1989 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
1990 | 1990 | $tmp = DB::queryfirstrow( |
1991 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
1991 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
1992 | 1992 | WHERE id = %i', |
1993 | 1993 | $role |
1994 | 1994 | ); |
@@ -2006,7 +2006,7 @@ discard block |
||
2006 | 2006 | 'login' => $record['login'], |
2007 | 2007 | 'groups' => implode(', ', $groups), |
2008 | 2008 | 'groupIds' => $groupIds, |
2009 | - 'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'], |
|
2009 | + 'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'], |
|
2010 | 2010 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
2011 | 2011 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
2012 | 2012 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2087,7 +2087,7 @@ discard block |
||
2087 | 2087 | |
2088 | 2088 | // Get info about user |
2089 | 2089 | $data_user = DB::queryfirstrow( |
2090 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
2090 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
2091 | 2091 | WHERE id = %i', |
2092 | 2092 | $post_source_id |
2093 | 2093 | ); |
@@ -2279,14 +2279,14 @@ discard block |
||
2279 | 2279 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
2280 | 2280 | $data_user = DB::queryfirstrow( |
2281 | 2281 | 'SELECT fonction_id, public_key |
2282 | - FROM ' . prefixTable('users') . ' |
|
2282 | + FROM ' . prefixTable('users').' |
|
2283 | 2283 | WHERE id = %i', |
2284 | 2284 | $post_user_id |
2285 | 2285 | ); |
2286 | 2286 | |
2287 | 2287 | if ($data_user) { |
2288 | 2288 | // Ensure array is unique |
2289 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
2289 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
2290 | 2290 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
2291 | 2291 | } else { |
2292 | 2292 | // User not found |
@@ -2302,7 +2302,7 @@ discard block |
||
2302 | 2302 | } |
2303 | 2303 | |
2304 | 2304 | // Manage specific case of api key |
2305 | - if($post_field === 'user_api_key') { |
|
2305 | + if ($post_field === 'user_api_key') { |
|
2306 | 2306 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $_SESSION['user']['public_key']); |
2307 | 2307 | $_SESSION['user']['api-key'] = $post_new_value; |
2308 | 2308 | |
@@ -2411,7 +2411,7 @@ discard block |
||
2411 | 2411 | echo prepareExchangedData( |
2412 | 2412 | array( |
2413 | 2413 | 'error' => true, |
2414 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
2414 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
2415 | 2415 | ), |
2416 | 2416 | 'encode' |
2417 | 2417 | ); |
@@ -2438,7 +2438,7 @@ discard block |
||
2438 | 2438 | echo prepareExchangedData( |
2439 | 2439 | array( |
2440 | 2440 | 'error' => true, |
2441 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
2441 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
2442 | 2442 | ), |
2443 | 2443 | 'encode' |
2444 | 2444 | ); |
@@ -2449,7 +2449,7 @@ discard block |
||
2449 | 2449 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
2450 | 2450 | // Build the list of all groups in AD |
2451 | 2451 | if (isset($adUser['memberof']) === true) { |
2452 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
2452 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
2453 | 2453 | if (empty($adUserGroup) === false && $j !== "count") { |
2454 | 2454 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
2455 | 2455 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2465,7 +2465,7 @@ discard block |
||
2465 | 2465 | // Get his ID |
2466 | 2466 | $userInfo = DB::queryfirstrow( |
2467 | 2467 | 'SELECT id, login, fonction_id, auth_type |
2468 | - FROM ' . prefixTable('users') . ' |
|
2468 | + FROM ' . prefixTable('users').' |
|
2469 | 2469 | WHERE login = %s', |
2470 | 2470 | $userLogin |
2471 | 2471 | ); |
@@ -2501,7 +2501,7 @@ discard block |
||
2501 | 2501 | |
2502 | 2502 | // Get all groups in Teampass |
2503 | 2503 | $teampassRoles = array(); |
2504 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
2504 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
2505 | 2505 | foreach ($rows as $record) { |
2506 | 2506 | array_push( |
2507 | 2507 | $teampassRoles, |
@@ -2571,7 +2571,7 @@ discard block |
||
2571 | 2571 | // Check if user already exists |
2572 | 2572 | $data = DB::query( |
2573 | 2573 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
2574 | - FROM ' . prefixTable('users') . ' |
|
2574 | + FROM ' . prefixTable('users').' |
|
2575 | 2575 | WHERE login = %s', |
2576 | 2576 | $post_login |
2577 | 2577 | ); |
@@ -2751,12 +2751,12 @@ discard block |
||
2751 | 2751 | // Send mail to user with new OTP |
2752 | 2752 | $userInfo = DB::queryFirstRow( |
2753 | 2753 | 'SELECT email |
2754 | - FROM ' . prefixTable('users') . ' |
|
2754 | + FROM ' . prefixTable('users').' |
|
2755 | 2755 | WHERE id = %i', |
2756 | 2756 | $post_userId |
2757 | 2757 | ); |
2758 | 2758 | sendEmail( |
2759 | - 'TEAMPASS - ' . langHdl('temporary_encryption_code'), |
|
2759 | + 'TEAMPASS - '.langHdl('temporary_encryption_code'), |
|
2760 | 2760 | str_replace( |
2761 | 2761 | array('#enc_code#'), |
2762 | 2762 | array($post_otp), |
@@ -2818,7 +2818,7 @@ discard block |
||
2818 | 2818 | // Check if user already exists |
2819 | 2819 | DB::query( |
2820 | 2820 | 'SELECT id |
2821 | - FROM ' . prefixTable('users') . ' |
|
2821 | + FROM ' . prefixTable('users').' |
|
2822 | 2822 | WHERE id = %i', |
2823 | 2823 | $post_id |
2824 | 2824 | ); |
@@ -2897,7 +2897,7 @@ discard block |
||
2897 | 2897 | // Check if user already exists |
2898 | 2898 | $userInfo = DB::queryfirstrow( |
2899 | 2899 | 'SELECT id, private_key, public_key |
2900 | - FROM ' . prefixTable('users') . ' |
|
2900 | + FROM ' . prefixTable('users').' |
|
2901 | 2901 | WHERE id = %i', |
2902 | 2902 | $post_userid |
2903 | 2903 | ); |
@@ -2944,7 +2944,7 @@ discard block |
||
2944 | 2944 | if (count($_SESSION['personal_folders']) > 0) { |
2945 | 2945 | DB::query( |
2946 | 2946 | 'SELECT id |
2947 | - FROM ' . prefixTable('items') . ' |
|
2947 | + FROM ' . prefixTable('items').' |
|
2948 | 2948 | WHERE id_tree IN %ls', |
2949 | 2949 | $_SESSION['personal_folders'] |
2950 | 2950 | ); |
@@ -3025,7 +3025,7 @@ discard block |
||
3025 | 3025 | // Check if user already exists |
3026 | 3026 | DB::query( |
3027 | 3027 | 'SELECT id |
3028 | - FROM ' . prefixTable('users') . ' |
|
3028 | + FROM ' . prefixTable('users').' |
|
3029 | 3029 | WHERE id = %i', |
3030 | 3030 | $post_id |
3031 | 3031 | ); |
@@ -3103,10 +3103,10 @@ discard block |
||
3103 | 3103 | 'process_type' => 'create_user_keys', |
3104 | 3104 | 'arguments' => json_encode([ |
3105 | 3105 | 'new_user_id' => (int) $post_user_id, |
3106 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
3107 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
3106 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
3107 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
3108 | 3108 | 'owner_id' => (int) $_SESSION['user_id'], |
3109 | - 'creator_pwd' => cryption($_SESSION['user_pwd'], '','encrypt', $SETTINGS)['string'], |
|
3109 | + 'creator_pwd' => cryption($_SESSION['user_pwd'], '', 'encrypt', $SETTINGS)['string'], |
|
3110 | 3110 | 'email_body' => langHdl('email_body_user_config_5'), |
3111 | 3111 | 'send_email' => 1, |
3112 | 3112 | ]), |
@@ -3269,7 +3269,7 @@ discard block |
||
3269 | 3269 | // get user info |
3270 | 3270 | $userInfo = DB::queryFirstRow( |
3271 | 3271 | 'SELECT * |
3272 | - FROM ' . prefixTable('users') . ' |
|
3272 | + FROM ' . prefixTable('users').' |
|
3273 | 3273 | WHERE id = %i', |
3274 | 3274 | $user_id |
3275 | 3275 | ); |
@@ -3362,8 +3362,8 @@ discard block |
||
3362 | 3362 | // get user info |
3363 | 3363 | $processesProgress = DB::query( |
3364 | 3364 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
3365 | - FROM ' . prefixTable('users') . ' AS u |
|
3366 | - INNER JOIN ' . prefixTable('processes_tasks') . ' AS pt ON (pt.process_id = u.ongoing_process_id) |
|
3365 | + FROM ' . prefixTable('users').' AS u |
|
3366 | + INNER JOIN ' . prefixTable('processes_tasks').' AS pt ON (pt.process_id = u.ongoing_process_id) |
|
3367 | 3367 | WHERE u.id = %i', |
3368 | 3368 | $user_id |
3369 | 3369 | ); |
@@ -3371,9 +3371,9 @@ discard block |
||
3371 | 3371 | //print_r($processesProgress); |
3372 | 3372 | $finished_steps = 0; |
3373 | 3373 | $nb_steps = count($processesProgress); |
3374 | - foreach($processesProgress as $process) { |
|
3374 | + foreach ($processesProgress as $process) { |
|
3375 | 3375 | if ((int) $process['is_in_progress'] === -1) { |
3376 | - $finished_steps ++; |
|
3376 | + $finished_steps++; |
|
3377 | 3377 | } |
3378 | 3378 | } |
3379 | 3379 | |
@@ -3382,7 +3382,7 @@ discard block |
||
3382 | 3382 | 'error' => false, |
3383 | 3383 | 'message' => '', |
3384 | 3384 | 'user_id' => $user_id, |
3385 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
3385 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
3386 | 3386 | 'debug' => $finished_steps.",".$nb_steps, |
3387 | 3387 | ), |
3388 | 3388 | 'encode' |
@@ -3447,7 +3447,7 @@ discard block |
||
3447 | 3447 | |
3448 | 3448 | // Get info about user |
3449 | 3449 | $data_user = DB::queryfirstrow( |
3450 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
3450 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
3451 | 3451 | WHERE id = %i', |
3452 | 3452 | $value[1] |
3453 | 3453 | ); |
@@ -3480,7 +3480,7 @@ discard block |
||
3480 | 3480 | logEvents( |
3481 | 3481 | $SETTINGS, |
3482 | 3482 | 'user_mngt', |
3483 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
3483 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
3484 | 3484 | (string) $_SESSION['user_id'], |
3485 | 3485 | $_SESSION['login'], |
3486 | 3486 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3511,7 +3511,7 @@ discard block |
||
3511 | 3511 | |
3512 | 3512 | // Get info about user |
3513 | 3513 | $data_user = DB::queryfirstrow( |
3514 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
3514 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
3515 | 3515 | WHERE id = %i', |
3516 | 3516 | $value[1] |
3517 | 3517 | ); |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | function purgeTemporaryFiles(): void |
72 | 72 | { |
73 | 73 | // Load expected files |
74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
75 | - include __DIR__. '/../includes/config/tp.config.php'; |
|
74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
75 | + include __DIR__.'/../includes/config/tp.config.php'; |
|
76 | 76 | |
77 | 77 | if (isset($SETTINGS) === true) { |
78 | 78 | //read folder |
@@ -82,8 +82,8 @@ discard block |
||
82 | 82 | //delete file FILES |
83 | 83 | while (false !== ($f = readdir($dir))) { |
84 | 84 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
85 | - if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) { |
|
86 | - fileDelete($dir . '/' . $f, $SETTINGS); |
|
85 | + if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) { |
|
86 | + fileDelete($dir.'/'.$f, $SETTINGS); |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | while (false !== ($f = readdir($dir))) { |
103 | 103 | if ($f !== '.' && $f !== '..') { |
104 | 104 | if (strpos($f, '_delete.') > 0) { |
105 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
105 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
@@ -72,8 +72,8 @@ |
||
72 | 72 | function reloadCacheTable(): void |
73 | 73 | { |
74 | 74 | // Load expected files |
75 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
76 | - include __DIR__. '/../includes/config/tp.config.php'; |
|
75 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
76 | + include __DIR__.'/../includes/config/tp.config.php'; |
|
77 | 77 | |
78 | 78 | if (isset($SETTINGS) === true) { |
79 | 79 | updateCacheTable('reload', $SETTINGS, NULL); |
@@ -72,8 +72,8 @@ |
||
72 | 72 | function rebuildConfigFile(): void |
73 | 73 | { |
74 | 74 | // Load expected files |
75 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
76 | - include __DIR__. '/../includes/config/tp.config.php'; |
|
75 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
76 | + include __DIR__.'/../includes/config/tp.config.php'; |
|
77 | 77 | |
78 | 78 | if (isset($SETTINGS) === true) { |
79 | 79 | handleConfigFile('rebuild', $SETTINGS); |
@@ -1822,7 +1822,9 @@ |
||
1822 | 1822 | $inputData['itemId'] |
1823 | 1823 | ); |
1824 | 1824 | foreach ($rows as $record) { |
1825 | - if ($record['raison'] === NULL) continue; |
|
1825 | + if ($record['raison'] === NULL) { |
|
1826 | + continue; |
|
1827 | + } |
|
1826 | 1828 | $reason = explode(':', $record['raison']); |
1827 | 1829 | if (count($reason) > 0) { |
1828 | 1830 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | ) { |
69 | 69 | // Not allowed page |
70 | 70 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | date_default_timezone_set('UTC'); |
97 | 97 | } |
98 | 98 | |
99 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user']['user_language'] . '.php'; |
|
99 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user']['user_language'].'.php'; |
|
100 | 100 | header('Content-type: text/html; charset=utf-8'); |
101 | 101 | header('Cache-Control: no-cache, must-revalidate'); |
102 | 102 | |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | // About special settings |
349 | 349 | $dataFolderSettings = DB::queryFirstRow( |
350 | 350 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
351 | - FROM ' . prefixTable('nested_tree') . ' |
|
351 | + FROM ' . prefixTable('nested_tree').' |
|
352 | 352 | WHERE id = %i', |
353 | 353 | $inputData['folderId'] |
354 | 354 | ); |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | // Get folder complexity |
366 | 366 | $folderComplexity = DB::queryfirstrow( |
367 | 367 | 'SELECT valeur |
368 | - FROM ' . prefixTable('misc') . ' |
|
368 | + FROM ' . prefixTable('misc').' |
|
369 | 369 | WHERE type = %s AND intitule = %i', |
370 | 370 | 'complex', |
371 | 371 | $inputData['folderId'] |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | $itemExists = 0; |
391 | 391 | $newID = ''; |
392 | 392 | $data = DB::queryfirstrow( |
393 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
393 | + 'SELECT * FROM '.prefixTable('items').' |
|
394 | 394 | WHERE label = %s AND inactif = %i', |
395 | 395 | $inputData['label'], |
396 | 396 | 0 |
@@ -479,8 +479,8 @@ discard block |
||
479 | 479 | (int) $newID, |
480 | 480 | $objectKey['pwd'], |
481 | 481 | $SETTINGS, |
482 | - true, // only for the item creator |
|
483 | - false, // no delete all |
|
482 | + true, // only for the item creator |
|
483 | + false, // no delete all |
|
484 | 484 | ); |
485 | 485 | |
486 | 486 | // update fields |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | // should we encrypt the data |
494 | 494 | $dataTmp = DB::queryFirstRow( |
495 | 495 | 'SELECT encrypted_data |
496 | - FROM ' . prefixTable('categories') . ' |
|
496 | + FROM ' . prefixTable('categories').' |
|
497 | 497 | WHERE id = %i', |
498 | 498 | $field['id'] |
499 | 499 | ); |
@@ -533,8 +533,8 @@ discard block |
||
533 | 533 | (int) $newObjectId, |
534 | 534 | $cryptedStuff['objectKey'], |
535 | 535 | $SETTINGS, |
536 | - true, // only for the item creator |
|
537 | - false, // no delete all |
|
536 | + true, // only for the item creator |
|
537 | + false, // no delete all |
|
538 | 538 | ); |
539 | 539 | |
540 | 540 | } else { |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | ) { |
564 | 564 | DB::queryFirstRow( |
565 | 565 | 'SELECT * |
566 | - FROM ' . prefixTable('templates') . ' |
|
566 | + FROM ' . prefixTable('templates').' |
|
567 | 567 | WHERE item_id = %i', |
568 | 568 | $newID |
569 | 569 | ); |
@@ -632,11 +632,11 @@ discard block |
||
632 | 632 | ) { |
633 | 633 | foreach ($post_restricted_to as $userRest) { |
634 | 634 | if (empty($userRest) === false) { |
635 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
635 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
636 | 636 | if (empty($listOfRestricted)) { |
637 | 637 | $listOfRestricted = $dataTmp['login']; |
638 | 638 | } else { |
639 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
639 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
640 | 640 | } |
641 | 641 | } |
642 | 642 | } |
@@ -650,11 +650,11 @@ discard block |
||
650 | 650 | if (empty($data['restricted_to']) === false) { |
651 | 651 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
652 | 652 | if (empty($userRest) === false) { |
653 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
653 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
654 | 654 | if (empty($oldRestrictionList) === true) { |
655 | 655 | $oldRestrictionList = $dataTmp['login']; |
656 | 656 | } else { |
657 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
657 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
658 | 658 | } |
659 | 659 | } |
660 | 660 | } |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | if (empty($post_uploaded_file_id) === false) { |
718 | 718 | $rows = DB::query( |
719 | 719 | 'SELECT id |
720 | - FROM ' . prefixTable('files') . ' |
|
720 | + FROM ' . prefixTable('files').' |
|
721 | 721 | WHERE id_item = %s', |
722 | 722 | $post_uploaded_file_id |
723 | 723 | ); |
@@ -771,7 +771,7 @@ discard block |
||
771 | 771 | langHdl('email_subject_item_updated'), |
772 | 772 | str_replace( |
773 | 773 | array('#label', '#link'), |
774 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']), |
|
774 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']), |
|
775 | 775 | langHdl('new_item_email_body') |
776 | 776 | ), |
777 | 777 | $emailAddress, |
@@ -903,8 +903,7 @@ discard block |
||
903 | 903 | $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var( |
904 | 904 | $dataReceived['to_be_deleted_after_date'], |
905 | 905 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
906 | - ) : |
|
907 | - ''; |
|
906 | + ) : ''; |
|
908 | 907 | $post_fields = (filter_var_array( |
909 | 908 | $dataReceived['fields'], |
910 | 909 | FILTER_SANITIZE_FULL_SPECIAL_CHARS |
@@ -961,7 +960,7 @@ discard block |
||
961 | 960 | // About special settings |
962 | 961 | $dataFolderSettings = DB::queryFirstRow( |
963 | 962 | 'SELECT bloquer_creation, bloquer_modification, personal_folder, title |
964 | - FROM ' . prefixTable('nested_tree') . ' |
|
963 | + FROM ' . prefixTable('nested_tree').' |
|
965 | 964 | WHERE id = %i', |
966 | 965 | $inputData['folderId'] |
967 | 966 | ); |
@@ -977,7 +976,7 @@ discard block |
||
977 | 976 | // Get folder complexity |
978 | 977 | $folderComplexity = DB::queryfirstrow( |
979 | 978 | 'SELECT valeur |
980 | - FROM ' . prefixTable('misc') . ' |
|
979 | + FROM ' . prefixTable('misc').' |
|
981 | 980 | WHERE type = %s AND intitule = %i', |
982 | 981 | 'complex', |
983 | 982 | $inputData['folderId'] |
@@ -1015,8 +1014,8 @@ discard block |
||
1015 | 1014 | // Get all informations for this item |
1016 | 1015 | $dataItem = DB::queryfirstrow( |
1017 | 1016 | 'SELECT * |
1018 | - FROM ' . prefixTable('items') . ' as i |
|
1019 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1017 | + FROM ' . prefixTable('items').' as i |
|
1018 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1020 | 1019 | WHERE i.id=%i AND l.action = %s', |
1021 | 1020 | $inputData['itemId'], |
1022 | 1021 | 'at_creation' |
@@ -1026,7 +1025,7 @@ discard block |
||
1026 | 1025 | //db::debugmode(true); |
1027 | 1026 | DB::query( |
1028 | 1027 | 'SELECT * |
1029 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1028 | + FROM ' . prefixTable('sharekeys_items').' |
|
1030 | 1029 | WHERE object_id = %i AND user_id = %s', |
1031 | 1030 | $inputData['itemId'], |
1032 | 1031 | $_SESSION['user_id'] |
@@ -1074,9 +1073,9 @@ discard block |
||
1074 | 1073 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
1075 | 1074 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
1076 | 1075 | u.login as user_login, u.email as user_email |
1077 | - FROM ' . prefixTable('items') . ' as i |
|
1078 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
1079 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
1076 | + FROM ' . prefixTable('items').' as i |
|
1077 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
1078 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
1080 | 1079 | WHERE i.id=%i', |
1081 | 1080 | $inputData['itemId'] |
1082 | 1081 | ); |
@@ -1084,7 +1083,7 @@ discard block |
||
1084 | 1083 | // Should we log a password change? |
1085 | 1084 | $userKey = DB::queryFirstRow( |
1086 | 1085 | 'SELECT share_key |
1087 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1086 | + FROM ' . prefixTable('sharekeys_items').' |
|
1088 | 1087 | WHERE user_id = %i AND object_id = %i', |
1089 | 1088 | $_SESSION['user_id'], |
1090 | 1089 | $inputData['itemId'] |
@@ -1152,7 +1151,7 @@ discard block |
||
1152 | 1151 | // Get list of tags |
1153 | 1152 | $itemTags = DB::queryFirstColumn( |
1154 | 1153 | 'SELECT tag |
1155 | - FROM ' . prefixTable('tags') . ' |
|
1154 | + FROM ' . prefixTable('tags').' |
|
1156 | 1155 | WHERE item_id = %i', |
1157 | 1156 | $inputData['itemId'] |
1158 | 1157 | ); |
@@ -1198,7 +1197,7 @@ discard block |
||
1198 | 1197 | $_SESSION['user_id'], |
1199 | 1198 | 'at_modification', |
1200 | 1199 | $_SESSION['login'], |
1201 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
1200 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
1202 | 1201 | ); |
1203 | 1202 | } |
1204 | 1203 | |
@@ -1237,8 +1236,8 @@ discard block |
||
1237 | 1236 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
1238 | 1237 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
1239 | 1238 | c.masked AS masked, i.id AS field_item_id |
1240 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
1241 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
1239 | + FROM ' . prefixTable('categories_items').' AS i |
|
1240 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
1242 | 1241 | WHERE i.field_id = %i AND i.item_id = %i', |
1243 | 1242 | $field['id'], |
1244 | 1243 | $inputData['itemId'] |
@@ -1252,7 +1251,7 @@ discard block |
||
1252 | 1251 | // Perform new query |
1253 | 1252 | $dataTmpCat = DB::queryFirstRow( |
1254 | 1253 | 'SELECT id, title, encrypted_data, masked |
1255 | - FROM ' . prefixTable('categories') . ' |
|
1254 | + FROM ' . prefixTable('categories').' |
|
1256 | 1255 | WHERE id = %i', |
1257 | 1256 | $field['id'] |
1258 | 1257 | ); |
@@ -1324,7 +1323,7 @@ discard block |
||
1324 | 1323 | $_SESSION['user_id'], |
1325 | 1324 | 'at_modification', |
1326 | 1325 | $_SESSION['login'], |
1327 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
1326 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
1328 | 1327 | ); |
1329 | 1328 | } else { |
1330 | 1329 | // compare the old and new value |
@@ -1332,7 +1331,7 @@ discard block |
||
1332 | 1331 | // Get user sharekey for this field |
1333 | 1332 | $userKey = DB::queryFirstRow( |
1334 | 1333 | 'SELECT share_key |
1335 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
1334 | + FROM ' . prefixTable('sharekeys_fields').' |
|
1336 | 1335 | WHERE user_id = %i AND object_id = %i', |
1337 | 1336 | $_SESSION['user_id'], |
1338 | 1337 | $dataTmpCat['field_item_id'] |
@@ -1406,7 +1405,7 @@ discard block |
||
1406 | 1405 | $_SESSION['user_id'], |
1407 | 1406 | 'at_modification', |
1408 | 1407 | $_SESSION['login'], |
1409 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
1408 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
1410 | 1409 | ); |
1411 | 1410 | } |
1412 | 1411 | } |
@@ -1431,7 +1430,7 @@ discard block |
||
1431 | 1430 | ) { |
1432 | 1431 | DB::queryFirstRow( |
1433 | 1432 | 'SELECT * |
1434 | - FROM ' . prefixTable('templates') . ' |
|
1433 | + FROM ' . prefixTable('templates').' |
|
1435 | 1434 | WHERE item_id = %i', |
1436 | 1435 | $inputData['itemId'] |
1437 | 1436 | ); |
@@ -1474,7 +1473,7 @@ discard block |
||
1474 | 1473 | // check if elem exists in Table. If not add it or update it. |
1475 | 1474 | DB::query( |
1476 | 1475 | 'SELECT * |
1477 | - FROM ' . prefixTable('automatic_del') . ' |
|
1476 | + FROM ' . prefixTable('automatic_del').' |
|
1478 | 1477 | WHERE item_id = %i', |
1479 | 1478 | $inputData['itemId'] |
1480 | 1479 | ); |
@@ -1501,7 +1500,7 @@ discard block |
||
1501 | 1500 | // Store updates performed |
1502 | 1501 | array_push( |
1503 | 1502 | $arrayOfChanges, |
1504 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
1503 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
1505 | 1504 | ); |
1506 | 1505 | |
1507 | 1506 | // update LOG |
@@ -1544,7 +1543,7 @@ discard block |
||
1544 | 1543 | // Store updates performed |
1545 | 1544 | array_push( |
1546 | 1545 | $arrayOfChanges, |
1547 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
1546 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
1548 | 1547 | ); |
1549 | 1548 | |
1550 | 1549 | // update LOG |
@@ -1577,7 +1576,7 @@ discard block |
||
1577 | 1576 | if (empty($userId) === false) { |
1578 | 1577 | $dataTmp = DB::queryfirstrow( |
1579 | 1578 | 'SELECT id, name, lastname |
1580 | - FROM ' . prefixTable('users') . ' |
|
1579 | + FROM ' . prefixTable('users').' |
|
1581 | 1580 | WHERE id= %i', |
1582 | 1581 | $userId |
1583 | 1582 | ); |
@@ -1585,7 +1584,7 @@ discard block |
||
1585 | 1584 | // Add to array |
1586 | 1585 | array_push( |
1587 | 1586 | $arrayOfUsersRestriction, |
1588 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
1587 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
1589 | 1588 | ); |
1590 | 1589 | array_push( |
1591 | 1590 | $arrayOfUsersIdRestriction, |
@@ -1616,8 +1615,8 @@ discard block |
||
1616 | 1615 | // get values before deleting them |
1617 | 1616 | $rows = DB::query( |
1618 | 1617 | 'SELECT t.title, t.id AS id |
1619 | - FROM ' . prefixTable('roles_title') . ' as t |
|
1620 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
1618 | + FROM ' . prefixTable('roles_title').' as t |
|
1619 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
1621 | 1620 | WHERE r.item_id = %i |
1622 | 1621 | ORDER BY t.title ASC', |
1623 | 1622 | $inputData['itemId'] |
@@ -1651,7 +1650,7 @@ discard block |
||
1651 | 1650 | ); |
1652 | 1651 | $dataTmp = DB::queryfirstrow( |
1653 | 1652 | 'SELECT title |
1654 | - FROM ' . prefixTable('roles_title') . ' |
|
1653 | + FROM ' . prefixTable('roles_title').' |
|
1655 | 1654 | WHERE id = %i', |
1656 | 1655 | $role |
1657 | 1656 | ); |
@@ -1692,8 +1691,8 @@ discard block |
||
1692 | 1691 | $_SESSION['user_id'], |
1693 | 1692 | 'at_modification', |
1694 | 1693 | $_SESSION['login'], |
1695 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
1696 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1694 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
1695 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1697 | 1696 | ); |
1698 | 1697 | } |
1699 | 1698 | |
@@ -1713,7 +1712,7 @@ discard block |
||
1713 | 1712 | $_SESSION['user_id'], |
1714 | 1713 | 'at_modification', |
1715 | 1714 | $_SESSION['login'], |
1716 | - 'at_label : ' . $data['label'] . ' => ' . $inputData['label'] |
|
1715 | + 'at_label : '.$data['label'].' => '.$inputData['label'] |
|
1717 | 1716 | ); |
1718 | 1717 | } |
1719 | 1718 | // LOGIN |
@@ -1732,7 +1731,7 @@ discard block |
||
1732 | 1731 | $_SESSION['user_id'], |
1733 | 1732 | 'at_modification', |
1734 | 1733 | $_SESSION['login'], |
1735 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
1734 | + 'at_login : '.$data['login'].' => '.$post_login |
|
1736 | 1735 | ); |
1737 | 1736 | } |
1738 | 1737 | |
@@ -1751,7 +1750,7 @@ discard block |
||
1751 | 1750 | $_SESSION['user_id'], |
1752 | 1751 | 'at_modification', |
1753 | 1752 | $_SESSION['login'], |
1754 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
1753 | + 'at_email : '.$data['email'].' => '.$post_email |
|
1755 | 1754 | ); |
1756 | 1755 | } |
1757 | 1756 | // URL |
@@ -1770,7 +1769,7 @@ discard block |
||
1770 | 1769 | $_SESSION['user_id'], |
1771 | 1770 | 'at_modification', |
1772 | 1771 | $_SESSION['login'], |
1773 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
1772 | + 'at_url : '.$data['url'].' => '.$post_url |
|
1774 | 1773 | ); |
1775 | 1774 | } |
1776 | 1775 | // DESCRIPTION |
@@ -1795,7 +1794,7 @@ discard block |
||
1795 | 1794 | // FOLDER |
1796 | 1795 | if ((int) $data['id_tree'] !== (int) $inputData['folderId']) { |
1797 | 1796 | // Get name of folders |
1798 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1797 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId'])); |
|
1799 | 1798 | |
1800 | 1799 | // Store updates performed |
1801 | 1800 | array_push( |
@@ -1811,7 +1810,7 @@ discard block |
||
1811 | 1810 | $_SESSION['user_id'], |
1812 | 1811 | 'at_modification', |
1813 | 1812 | $_SESSION['login'], |
1814 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
1813 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
1815 | 1814 | ); |
1816 | 1815 | } |
1817 | 1816 | // ANYONE_CAN_MODIFY |
@@ -1819,7 +1818,7 @@ discard block |
||
1819 | 1818 | // Store updates performed |
1820 | 1819 | array_push( |
1821 | 1820 | $arrayOfChanges, |
1822 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
1821 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
1823 | 1822 | ); |
1824 | 1823 | |
1825 | 1824 | // Log |
@@ -1830,15 +1829,15 @@ discard block |
||
1830 | 1829 | $_SESSION['user_id'], |
1831 | 1830 | 'at_modification', |
1832 | 1831 | $_SESSION['login'], |
1833 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
1832 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
1834 | 1833 | ); |
1835 | 1834 | } |
1836 | 1835 | |
1837 | 1836 | // Reload new values |
1838 | 1837 | $dataItem = DB::queryfirstrow( |
1839 | 1838 | 'SELECT * |
1840 | - FROM ' . prefixTable('items') . ' as i |
|
1841 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1839 | + FROM ' . prefixTable('items').' as i |
|
1840 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1842 | 1841 | WHERE i.id = %i AND l.action = %s', |
1843 | 1842 | $inputData['itemId'], |
1844 | 1843 | 'at_creation' |
@@ -1847,8 +1846,8 @@ discard block |
||
1847 | 1846 | $history = ''; |
1848 | 1847 | $rows = DB::query( |
1849 | 1848 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
1850 | - FROM ' . prefixTable('log_items') . ' as l |
|
1851 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
1849 | + FROM ' . prefixTable('log_items').' as l |
|
1850 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
1852 | 1851 | WHERE l.action <> %s AND id_item=%s', |
1853 | 1852 | 'at_shown', |
1854 | 1853 | $inputData['itemId'] |
@@ -1857,14 +1856,14 @@ discard block |
||
1857 | 1856 | if ($record['raison'] === NULL) continue; |
1858 | 1857 | $reason = explode(':', $record['raison']); |
1859 | 1858 | if (count($reason) > 0) { |
1860 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
1861 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
1862 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
1859 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
1860 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
1861 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
1863 | 1862 | : langHdl(trim($reason[0]))) : ''); |
1864 | 1863 | if (empty($history)) { |
1865 | 1864 | $history = $sentence; |
1866 | 1865 | } else { |
1867 | - $history .= '<br />' . $sentence; |
|
1866 | + $history .= '<br />'.$sentence; |
|
1868 | 1867 | } |
1869 | 1868 | } |
1870 | 1869 | } |
@@ -1991,7 +1990,7 @@ discard block |
||
1991 | 1990 | ) { |
1992 | 1991 | // load the original record into an array |
1993 | 1992 | $originalRecord = DB::queryfirstrow( |
1994 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
1993 | + 'SELECT * FROM '.prefixTable('items').' |
|
1995 | 1994 | WHERE id = %i', |
1996 | 1995 | $inputData['itemId'] |
1997 | 1996 | ); |
@@ -2010,7 +2009,7 @@ discard block |
||
2010 | 2009 | |
2011 | 2010 | // Load the destination folder record into an array |
2012 | 2011 | $dataDestination = DB::queryfirstrow( |
2013 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
2012 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
2014 | 2013 | WHERE id = %i', |
2015 | 2014 | $post_dest_id |
2016 | 2015 | ); |
@@ -2018,7 +2017,7 @@ discard block |
||
2018 | 2017 | // Get the ITEM object key for the user |
2019 | 2018 | $userKey = DB::queryFirstRow( |
2020 | 2019 | 'SELECT share_key |
2021 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2020 | + FROM ' . prefixTable('sharekeys_items').' |
|
2022 | 2021 | WHERE user_id = %i AND object_id = %i', |
2023 | 2022 | $_SESSION['user_id'], |
2024 | 2023 | $inputData['itemId'] |
@@ -2099,7 +2098,7 @@ discard block |
||
2099 | 2098 | // Manage Custom Fields |
2100 | 2099 | $rows = DB::query( |
2101 | 2100 | 'SELECT * |
2102 | - FROM ' . prefixTable('categories_items') . ' |
|
2101 | + FROM ' . prefixTable('categories_items').' |
|
2103 | 2102 | WHERE item_id = %i', |
2104 | 2103 | $inputData['itemId'] |
2105 | 2104 | ); |
@@ -2157,15 +2156,15 @@ discard block |
||
2157 | 2156 | $rows = DB::query( |
2158 | 2157 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
2159 | 2158 | f.size AS size, f.type AS type, s.share_key AS share_key |
2160 | - FROM ' . prefixTable('files') . ' AS f |
|
2161 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
2159 | + FROM ' . prefixTable('files').' AS f |
|
2160 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
2162 | 2161 | WHERE s.user_id = %i AND f.id_item = %i', |
2163 | 2162 | $_SESSION['user_id'], |
2164 | 2163 | $inputData['itemId'] |
2165 | 2164 | ); |
2166 | 2165 | foreach ($rows as $record) { |
2167 | 2166 | // Check if file still exists |
2168 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
2167 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
2169 | 2168 | // Step1 - decrypt the file |
2170 | 2169 | $fileContent = decryptFile( |
2171 | 2170 | $record['file'], |
@@ -2174,8 +2173,8 @@ discard block |
||
2174 | 2173 | ); |
2175 | 2174 | |
2176 | 2175 | // Step2 - create file |
2177 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
2178 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
2176 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
2177 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
2179 | 2178 | if ($outstream === false) { |
2180 | 2179 | echo prepareExchangedData( |
2181 | 2180 | array( |
@@ -2248,7 +2247,7 @@ discard block |
||
2248 | 2247 | |
2249 | 2248 | // ------------------------- |
2250 | 2249 | // Add specific restrictions |
2251 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2250 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']); |
|
2252 | 2251 | foreach ($rows as $record) { |
2253 | 2252 | DB::insert( |
2254 | 2253 | prefixTable('restriction_to_roles'), |
@@ -2260,7 +2259,7 @@ discard block |
||
2260 | 2259 | } |
2261 | 2260 | |
2262 | 2261 | // Add Tags |
2263 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']); |
|
2262 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']); |
|
2264 | 2263 | foreach ($rows as $record) { |
2265 | 2264 | DB::insert( |
2266 | 2265 | prefixTable('tags'), |
@@ -2290,7 +2289,7 @@ discard block |
||
2290 | 2289 | $_SESSION['login'] |
2291 | 2290 | ); |
2292 | 2291 | // reload cache table |
2293 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
2292 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
2294 | 2293 | updateCacheTable('reload', $SETTINGS, null); |
2295 | 2294 | |
2296 | 2295 | echo (string) prepareExchangedData( |
@@ -2361,7 +2360,7 @@ discard block |
||
2361 | 2360 | // then we can show it |
2362 | 2361 | $item_deleted = DB::queryFirstRow( |
2363 | 2362 | 'SELECT * |
2364 | - FROM ' . prefixTable('log_items') . ' |
|
2363 | + FROM ' . prefixTable('log_items').' |
|
2365 | 2364 | WHERE id_item = %i AND action = %s |
2366 | 2365 | ORDER BY date DESC |
2367 | 2366 | LIMIT 0, 1', |
@@ -2372,7 +2371,7 @@ discard block |
||
2372 | 2371 | |
2373 | 2372 | $item_restored = DB::queryFirstRow( |
2374 | 2373 | 'SELECT * |
2375 | - FROM ' . prefixTable('log_items') . ' |
|
2374 | + FROM ' . prefixTable('log_items').' |
|
2376 | 2375 | WHERE id_item = %i AND action = %s |
2377 | 2376 | ORDER BY date DESC |
2378 | 2377 | LIMIT 0, 1', |
@@ -2396,8 +2395,8 @@ discard block |
||
2396 | 2395 | // Get all informations for this item |
2397 | 2396 | $dataItem = DB::queryfirstrow( |
2398 | 2397 | 'SELECT * |
2399 | - FROM ' . prefixTable('items') . ' as i |
|
2400 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2398 | + FROM ' . prefixTable('items').' as i |
|
2399 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2401 | 2400 | WHERE i.id = %i AND l.action = %s', |
2402 | 2401 | $inputData['id'], |
2403 | 2402 | 'at_creation' |
@@ -2406,7 +2405,7 @@ discard block |
||
2406 | 2405 | // Notification |
2407 | 2406 | DB::queryfirstrow( |
2408 | 2407 | 'SELECT * |
2409 | - FROM ' . prefixTable('notification') . ' |
|
2408 | + FROM ' . prefixTable('notification').' |
|
2410 | 2409 | WHERE item_id = %i AND user_id = %i', |
2411 | 2410 | $inputData['id'], |
2412 | 2411 | $_SESSION['user_id'] |
@@ -2449,7 +2448,7 @@ discard block |
||
2449 | 2448 | |
2450 | 2449 | // manage case of API user |
2451 | 2450 | if ($dataItem['id_user'] === API_USER_ID) { |
2452 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
2451 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
2453 | 2452 | $arrData['id_user'] = API_USER_ID; |
2454 | 2453 | $arrData['author_email'] = ''; |
2455 | 2454 | $arrData['notification_status'] = false; |
@@ -2459,7 +2458,7 @@ discard block |
||
2459 | 2458 | $tags = array(); |
2460 | 2459 | $rows = DB::query( |
2461 | 2460 | 'SELECT tag |
2462 | - FROM ' . prefixTable('tags') . ' |
|
2461 | + FROM ' . prefixTable('tags').' |
|
2463 | 2462 | WHERE item_id = %i', |
2464 | 2463 | $inputData['id'] |
2465 | 2464 | ); |
@@ -2484,7 +2483,7 @@ discard block |
||
2484 | 2483 | // Check if user has a role that is accepted |
2485 | 2484 | $rows_tmp = DB::query( |
2486 | 2485 | 'SELECT role_id |
2487 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2486 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2488 | 2487 | WHERE item_id=%i', |
2489 | 2488 | $inputData['id'] |
2490 | 2489 | ); |
@@ -2498,7 +2497,7 @@ discard block |
||
2498 | 2497 | // Get the object key for the user |
2499 | 2498 | $userKey = DB::queryFirstRow( |
2500 | 2499 | 'SELECT share_key |
2501 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2500 | + FROM ' . prefixTable('sharekeys_items').' |
|
2502 | 2501 | WHERE user_id = %i AND object_id = %i', |
2503 | 2502 | $_SESSION['user_id'], |
2504 | 2503 | $inputData['id'] |
@@ -2616,8 +2615,8 @@ discard block |
||
2616 | 2615 | // Add restriction if item is restricted to roles |
2617 | 2616 | $rows = DB::query( |
2618 | 2617 | 'SELECT t.title, t.id |
2619 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
2620 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
2618 | + FROM ' . prefixTable('roles_title').' AS t |
|
2619 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
2621 | 2620 | WHERE r.item_id = %i |
2622 | 2621 | ORDER BY t.title ASC', |
2623 | 2622 | $inputData['id'] |
@@ -2633,8 +2632,8 @@ discard block |
||
2633 | 2632 | $tmp = array(); |
2634 | 2633 | $rows = DB::query( |
2635 | 2634 | 'SELECT k.label, k.id |
2636 | - FROM ' . prefixTable('kb_items') . ' as i |
|
2637 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
2635 | + FROM ' . prefixTable('kb_items').' as i |
|
2636 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
2638 | 2637 | WHERE i.item_id = %i |
2639 | 2638 | ORDER BY k.label ASC', |
2640 | 2639 | $inputData['id'] |
@@ -2717,7 +2716,7 @@ discard block |
||
2717 | 2716 | $arrCatList = array(); |
2718 | 2717 | $rows_tmp = DB::query( |
2719 | 2718 | 'SELECT id_category |
2720 | - FROM ' . prefixTable('categories_folders') . ' |
|
2719 | + FROM ' . prefixTable('categories_folders').' |
|
2721 | 2720 | WHERE id_folder=%i', |
2722 | 2721 | $inputData['folderId'] |
2723 | 2722 | ); |
@@ -2732,8 +2731,8 @@ discard block |
||
2732 | 2731 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
2733 | 2732 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id, |
2734 | 2733 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
2735 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
2736 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
2734 | + FROM ' . prefixTable('categories_items').' AS i |
|
2735 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
2737 | 2736 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
2738 | 2737 | $inputData['id'], |
2739 | 2738 | $arrCatList |
@@ -2744,7 +2743,7 @@ discard block |
||
2744 | 2743 | //db::debugmode(true); |
2745 | 2744 | $userKey = DB::queryFirstRow( |
2746 | 2745 | 'SELECT share_key |
2747 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2746 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2748 | 2747 | WHERE user_id = %i AND object_id = %i', |
2749 | 2748 | $_SESSION['user_id'], |
2750 | 2749 | $row['id'] |
@@ -2804,7 +2803,7 @@ discard block |
||
2804 | 2803 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
2805 | 2804 | $rows_tmp = DB::queryfirstrow( |
2806 | 2805 | 'SELECT category_id |
2807 | - FROM ' . prefixTable('templates') . ' |
|
2806 | + FROM ' . prefixTable('templates').' |
|
2808 | 2807 | WHERE item_id = %i', |
2809 | 2808 | $inputData['id'] |
2810 | 2809 | ); |
@@ -2821,7 +2820,7 @@ discard block |
||
2821 | 2820 | // Evaluate if item is ready for all users |
2822 | 2821 | $rows_tmp = DB::queryfirstrow( |
2823 | 2822 | 'SELECT finished_at |
2824 | - FROM ' . prefixTable('processes') . ' |
|
2823 | + FROM ' . prefixTable('processes').' |
|
2825 | 2824 | WHERE item_id = %i', |
2826 | 2825 | $inputData['id'] |
2827 | 2826 | ); |
@@ -2838,7 +2837,7 @@ discard block |
||
2838 | 2837 | // Is the Item to be deleted? |
2839 | 2838 | $dataDelete = DB::queryfirstrow( |
2840 | 2839 | 'SELECT * |
2841 | - FROM ' . prefixTable('automatic_del') . ' |
|
2840 | + FROM ' . prefixTable('automatic_del').' |
|
2842 | 2841 | WHERE item_id = %i', |
2843 | 2842 | $inputData['id'] |
2844 | 2843 | ); |
@@ -2921,11 +2920,11 @@ discard block |
||
2921 | 2920 | if (empty($dataItem['restricted_to']) === false) { |
2922 | 2921 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
2923 | 2922 | if (empty($userRest) === false) { |
2924 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
2923 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
2925 | 2924 | if (empty($listOfRestricted)) { |
2926 | 2925 | $listOfRestricted = $dataTmp['login']; |
2927 | 2926 | } else { |
2928 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
2927 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
2929 | 2928 | } |
2930 | 2929 | } |
2931 | 2930 | } |
@@ -2985,8 +2984,8 @@ discard block |
||
2985 | 2984 | // Load item data |
2986 | 2985 | $dataItem = DB::queryFirstRow( |
2987 | 2986 | 'SELECT i.*, n.title AS folder_title |
2988 | - FROM ' . prefixTable('items') . ' AS i |
|
2989 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
2987 | + FROM ' . prefixTable('items').' AS i |
|
2988 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
2990 | 2989 | WHERE i.id = %i', |
2991 | 2990 | $inputData['id'] |
2992 | 2991 | ); |
@@ -3008,7 +3007,7 @@ discard block |
||
3008 | 3007 | // Check if user has a role that is accepted |
3009 | 3008 | $rows_tmp = DB::query( |
3010 | 3009 | 'SELECT role_id |
3011 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3010 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3012 | 3011 | WHERE item_id=%i', |
3013 | 3012 | $inputData['id'] |
3014 | 3013 | ); |
@@ -3054,7 +3053,7 @@ discard block |
||
3054 | 3053 | // launch query |
3055 | 3054 | $rows = DB::query( |
3056 | 3055 | 'SELECT id, name, file, extension, size |
3057 | - FROM ' . prefixTable('files') . ' |
|
3056 | + FROM ' . prefixTable('files').' |
|
3058 | 3057 | WHERE id_item = %i AND confirmed = 1', |
3059 | 3058 | $inputData['id'] |
3060 | 3059 | ); |
@@ -3063,7 +3062,7 @@ discard block |
||
3063 | 3062 | $attachments, |
3064 | 3063 | array( |
3065 | 3064 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
3066 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
3065 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
3067 | 3066 | 'extension' => $record['extension'], |
3068 | 3067 | 'size' => formatSizeUnits((int) $record['size']), |
3069 | 3068 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -3089,7 +3088,7 @@ discard block |
||
3089 | 3088 | array( |
3090 | 3089 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
3091 | 3090 | ), |
3092 | - 'id=' . $_SESSION['user_id'] |
|
3091 | + 'id='.$_SESSION['user_id'] |
|
3093 | 3092 | ); |
3094 | 3093 | } |
3095 | 3094 | |
@@ -3098,8 +3097,8 @@ discard block |
||
3098 | 3097 | $listOptionsForRoles = array(); |
3099 | 3098 | $rows = DB::query( |
3100 | 3099 | 'SELECT r.role_id AS role_id, t.title AS title |
3101 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
3102 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
3100 | + FROM ' . prefixTable('roles_values').' AS r |
|
3101 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
3103 | 3102 | WHERE r.folder_id = %i', |
3104 | 3103 | $dataItem['id_tree'] |
3105 | 3104 | ); |
@@ -3113,9 +3112,9 @@ discard block |
||
3113 | 3112 | ); |
3114 | 3113 | $rows2 = DB::query( |
3115 | 3114 | 'SELECT id, login, fonction_id, email, name, lastname |
3116 | - FROM ' . prefixTable('users') . ' |
|
3115 | + FROM ' . prefixTable('users').' |
|
3117 | 3116 | WHERE fonction_id LIKE %s', |
3118 | - '%' . $record['role_id'] . '%' |
|
3117 | + '%'.$record['role_id'].'%' |
|
3119 | 3118 | ); |
3120 | 3119 | foreach ($rows2 as $record2) { |
3121 | 3120 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -3128,7 +3127,7 @@ discard block |
||
3128 | 3127 | array( |
3129 | 3128 | 'id' => (int) $record2['id'], |
3130 | 3129 | 'login' => $record2['login'], |
3131 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
3130 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
3132 | 3131 | 'email' => $record2['email'], |
3133 | 3132 | ) |
3134 | 3133 | ); |
@@ -3147,16 +3146,16 @@ discard block |
||
3147 | 3146 | $path = ''; |
3148 | 3147 | foreach ($arbo as $elem) { |
3149 | 3148 | if (empty($path) === true) { |
3150 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
3149 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
3151 | 3150 | } else { |
3152 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3151 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
3153 | 3152 | } |
3154 | 3153 | } |
3155 | 3154 | // Build text to show user |
3156 | 3155 | if (empty($path) === true) { |
3157 | 3156 | $path = addslashes($dataItem['label']); |
3158 | 3157 | } else { |
3159 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
3158 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
3160 | 3159 | } |
3161 | 3160 | |
3162 | 3161 | // Add Admins to notification list if expected |
@@ -3179,7 +3178,7 @@ discard block |
||
3179 | 3178 | array( |
3180 | 3179 | addslashes($_SESSION['login']), |
3181 | 3180 | $path, |
3182 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
3181 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
3183 | 3182 | ), |
3184 | 3183 | langHdl('email_on_open_notification_mail') |
3185 | 3184 | ), |
@@ -3190,7 +3189,7 @@ discard block |
||
3190 | 3189 | } |
3191 | 3190 | |
3192 | 3191 | // has this item a change proposal |
3193 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']); |
|
3192 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']); |
|
3194 | 3193 | $returnArray['has_change_proposal'] = DB::count(); |
3195 | 3194 | |
3196 | 3195 | // Setting |
@@ -3201,7 +3200,7 @@ discard block |
||
3201 | 3200 | if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) { |
3202 | 3201 | DB::query( |
3203 | 3202 | 'SELECT * |
3204 | - FROM ' . prefixTable('otv') . ' |
|
3203 | + FROM ' . prefixTable('otv').' |
|
3205 | 3204 | WHERE item_id = %i |
3206 | 3205 | AND time_limit > %i', |
3207 | 3206 | $inputData['id'], |
@@ -3294,7 +3293,7 @@ discard block |
||
3294 | 3293 | // Load item data |
3295 | 3294 | $data = DB::queryFirstRow( |
3296 | 3295 | 'SELECT id_tree, id, label |
3297 | - FROM ' . prefixTable('items') . ' |
|
3296 | + FROM ' . prefixTable('items').' |
|
3298 | 3297 | WHERE id = %i OR item_key = %s', |
3299 | 3298 | $inputData['itemId'], |
3300 | 3299 | $inputData['itemKey'] |
@@ -3375,13 +3374,13 @@ discard block |
||
3375 | 3374 | |
3376 | 3375 | // Check if user is allowed to access this folder |
3377 | 3376 | if (!in_array($inputData['folderId'], $_SESSION['groupes_visibles'])) { |
3378 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3377 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3379 | 3378 | break; |
3380 | 3379 | } |
3381 | 3380 | |
3382 | 3381 | // Check if title doesn't contains html codes |
3383 | 3382 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
3384 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
3383 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
3385 | 3384 | break; |
3386 | 3385 | } |
3387 | 3386 | // check that title is not numeric |
@@ -3392,9 +3391,9 @@ discard block |
||
3392 | 3391 | |
3393 | 3392 | // Check if duplicate folders name are allowed |
3394 | 3393 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
3395 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
3394 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
3396 | 3395 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
3397 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
3396 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
3398 | 3397 | break; |
3399 | 3398 | } |
3400 | 3399 | } |
@@ -3402,7 +3401,7 @@ discard block |
||
3402 | 3401 | // query on folder |
3403 | 3402 | $data = DB::queryfirstrow( |
3404 | 3403 | 'SELECT parent_id, personal_folder |
3405 | - FROM ' . prefixTable('nested_tree') . ' |
|
3404 | + FROM ' . prefixTable('nested_tree').' |
|
3406 | 3405 | WHERE id = %i', |
3407 | 3406 | $inputData['folderId'] |
3408 | 3407 | ); |
@@ -3412,20 +3411,20 @@ discard block |
||
3412 | 3411 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
3413 | 3412 | $data = DB::queryfirstrow( |
3414 | 3413 | 'SELECT valeur |
3415 | - FROM ' . prefixTable('misc') . ' |
|
3414 | + FROM ' . prefixTable('misc').' |
|
3416 | 3415 | WHERE intitule = %i AND type = %s', |
3417 | 3416 | $data['parent_id'], |
3418 | 3417 | 'complex' |
3419 | 3418 | ); |
3420 | 3419 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
3421 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
3420 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
3422 | 3421 | break; |
3423 | 3422 | } |
3424 | 3423 | } |
3425 | 3424 | |
3426 | 3425 | // update Folders table |
3427 | 3426 | $tmp = DB::queryFirstRow( |
3428 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
3427 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
3429 | 3428 | $dataReceived['folder'] |
3430 | 3429 | ); |
3431 | 3430 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3493,42 +3492,42 @@ discard block |
||
3493 | 3492 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
3494 | 3493 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
3495 | 3494 | ) { |
3496 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3495 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3497 | 3496 | echo $returnValues; |
3498 | 3497 | break; |
3499 | 3498 | } |
3500 | 3499 | |
3501 | 3500 | $tmp_source = DB::queryFirstRow( |
3502 | 3501 | 'SELECT title, parent_id, personal_folder |
3503 | - FROM ' . prefixTable('nested_tree') . ' |
|
3502 | + FROM ' . prefixTable('nested_tree').' |
|
3504 | 3503 | WHERE id = %i', |
3505 | 3504 | $post_source_folder_id |
3506 | 3505 | ); |
3507 | 3506 | |
3508 | 3507 | $tmp_target = DB::queryFirstRow( |
3509 | 3508 | 'SELECT title, parent_id, personal_folder |
3510 | - FROM ' . prefixTable('nested_tree') . ' |
|
3509 | + FROM ' . prefixTable('nested_tree').' |
|
3511 | 3510 | WHERE id = %i', |
3512 | 3511 | $post_target_folder_id |
3513 | 3512 | ); |
3514 | 3513 | |
3515 | 3514 | // check if target is not a child of source |
3516 | 3515 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
3517 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3516 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3518 | 3517 | echo $returnValues; |
3519 | 3518 | break; |
3520 | 3519 | } |
3521 | 3520 | |
3522 | 3521 | // check if source or target folder is PF. If Yes, then cancel operation |
3523 | 3522 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
3524 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3523 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3525 | 3524 | echo $returnValues; |
3526 | 3525 | break; |
3527 | 3526 | } |
3528 | 3527 | |
3529 | 3528 | // check if source or target folder is PF. If Yes, then cancel operation |
3530 | 3529 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
3531 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3530 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3532 | 3531 | echo $returnValues; |
3533 | 3532 | break; |
3534 | 3533 | } |
@@ -3648,7 +3647,7 @@ discard block |
||
3648 | 3647 | $uniqueLoadData['path'] = $arr_arbo; |
3649 | 3648 | |
3650 | 3649 | // store last folder accessed in cookie |
3651 | - $arr_cookie_options = array ( |
|
3650 | + $arr_cookie_options = array( |
|
3652 | 3651 | 'expires' => time() + TP_ONE_DAY_SECONDS * 5, |
3653 | 3652 | 'path' => '/', |
3654 | 3653 | 'secure' => true, |
@@ -3666,7 +3665,7 @@ discard block |
||
3666 | 3665 | foreach ($_SESSION['user_roles'] as $role) { |
3667 | 3666 | $roleQ = DB::queryfirstrow( |
3668 | 3667 | 'SELECT allow_pw_change |
3669 | - FROM ' . prefixTable('roles_title') . ' |
|
3668 | + FROM ' . prefixTable('roles_title').' |
|
3670 | 3669 | WHERE id = %i', |
3671 | 3670 | $role |
3672 | 3671 | ); |
@@ -3691,11 +3690,11 @@ discard block |
||
3691 | 3690 | |
3692 | 3691 | foreach ($_SESSION['user_roles'] as $role) { |
3693 | 3692 | $access = DB::queryFirstRow( |
3694 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
3693 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
3695 | 3694 | $role, |
3696 | 3695 | $inputData['id'] |
3697 | 3696 | ); |
3698 | - if (DB::count()>0) { |
|
3697 | + if (DB::count() > 0) { |
|
3699 | 3698 | if ($access['type'] === 'R') { |
3700 | 3699 | array_push($arrTmp, 10); |
3701 | 3700 | } elseif ($access['type'] === 'W') { |
@@ -3759,7 +3758,7 @@ discard block |
||
3759 | 3758 | } else { |
3760 | 3759 | DB::query( |
3761 | 3760 | 'SELECT * |
3762 | - FROM ' . prefixTable('items') . ' |
|
3761 | + FROM ' . prefixTable('items').' |
|
3763 | 3762 | WHERE inactif = %i', |
3764 | 3763 | 0 |
3765 | 3764 | ); |
@@ -3769,7 +3768,7 @@ discard block |
||
3769 | 3768 | |
3770 | 3769 | // Get folder complexity |
3771 | 3770 | $folderComplexity = DB::queryFirstRow( |
3772 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
3771 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
3773 | 3772 | 'complex', |
3774 | 3773 | $inputData['id'] |
3775 | 3774 | ); |
@@ -3781,7 +3780,7 @@ discard block |
||
3781 | 3780 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
3782 | 3781 | $folderRow = DB::query( |
3783 | 3782 | 'SELECT id_category |
3784 | - FROM ' . prefixTable('categories_folders') . ' |
|
3783 | + FROM ' . prefixTable('categories_folders').' |
|
3785 | 3784 | WHERE id_folder = %i', |
3786 | 3785 | $inputData['id'] |
3787 | 3786 | ); |
@@ -3895,13 +3894,13 @@ discard block |
||
3895 | 3894 | // List all ITEMS |
3896 | 3895 | if ($folderIsPf === false) { |
3897 | 3896 | $where->add('i.inactif=%i', 0); |
3898 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
3897 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
3899 | 3898 | if (empty($limited_to_items) === false) { |
3900 | 3899 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
3901 | 3900 | } |
3902 | 3901 | |
3903 | - $query_limit = ' LIMIT ' . |
|
3904 | - $start . ',' . |
|
3902 | + $query_limit = ' LIMIT '. |
|
3903 | + $start.','. |
|
3905 | 3904 | $post_nb_items_to_display_once; |
3906 | 3905 | //db::debugmode(true); |
3907 | 3906 | $rows = DB::query( |
@@ -3912,9 +3911,9 @@ discard block |
||
3912 | 3911 | MIN(l.action) AS log_action, |
3913 | 3912 | l.id_user AS log_user, |
3914 | 3913 | i.url AS link |
3915 | - FROM ' . prefixTable('items') . ' AS i |
|
3916 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3917 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
3914 | + FROM ' . prefixTable('items').' AS i |
|
3915 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3916 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
3918 | 3917 | WHERE %l |
3919 | 3918 | GROUP BY i.id, l.date, l.id_user, l.action |
3920 | 3919 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3933,9 +3932,9 @@ discard block |
||
3933 | 3932 | MIN(l.action) AS log_action, |
3934 | 3933 | l.id_user AS log_user, |
3935 | 3934 | i.url AS link |
3936 | - FROM ' . prefixTable('items') . ' AS i |
|
3937 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3938 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
3935 | + FROM ' . prefixTable('items').' AS i |
|
3936 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3937 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
3939 | 3938 | WHERE %l |
3940 | 3939 | GROUP BY i.id, l.date, l.id_user, l.action |
3941 | 3940 | ORDER BY i.label ASC, l.date DESC', |
@@ -3966,7 +3965,7 @@ discard block |
||
3966 | 3965 | $item_is_restricted_to_role = false; |
3967 | 3966 | DB::queryfirstrow( |
3968 | 3967 | 'SELECT role_id |
3969 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3968 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3970 | 3969 | WHERE item_id = %i', |
3971 | 3970 | $record['id'] |
3972 | 3971 | ); |
@@ -3978,7 +3977,7 @@ discard block |
||
3978 | 3977 | $user_is_included_in_role = false; |
3979 | 3978 | DB::query( |
3980 | 3979 | 'SELECT role_id |
3981 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3980 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3982 | 3981 | WHERE item_id = %i AND role_id IN %ls', |
3983 | 3982 | $record['id'], |
3984 | 3983 | $_SESSION['user_roles'] |
@@ -4184,9 +4183,9 @@ discard block |
||
4184 | 4183 | if ((int) $start === 0) { |
4185 | 4184 | DB::query( |
4186 | 4185 | 'SELECT i.id |
4187 | - FROM ' . prefixTable('items') . ' as i |
|
4188 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
4189 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
4186 | + FROM ' . prefixTable('items').' as i |
|
4187 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
4188 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
4190 | 4189 | WHERE %l |
4191 | 4190 | ORDER BY i.label ASC, l.date DESC', |
4192 | 4191 | $where |
@@ -4250,8 +4249,8 @@ discard block |
||
4250 | 4249 | // Run query |
4251 | 4250 | $dataItem = DB::queryfirstrow( |
4252 | 4251 | 'SELECT i.pw AS pw, s.share_key AS share_key |
4253 | - FROM ' . prefixTable('items') . ' AS i |
|
4254 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
4252 | + FROM ' . prefixTable('items').' AS i |
|
4253 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
4255 | 4254 | WHERE user_id = %i AND i.item_key = %s', |
4256 | 4255 | $_SESSION['user_id'], |
4257 | 4256 | $inputData['itemKey'] |
@@ -4302,7 +4301,7 @@ discard block |
||
4302 | 4301 | if (null !== $inputData['itemId'] && empty($inputData['itemId']) === false) { |
4303 | 4302 | $dataItem = DB::queryfirstrow( |
4304 | 4303 | 'SELECT perso, anyone_can_modify |
4305 | - FROM ' . prefixTable('items') . ' |
|
4304 | + FROM ' . prefixTable('items').' |
|
4306 | 4305 | WHERE id=%i', |
4307 | 4306 | $inputData['itemId'] |
4308 | 4307 | ); |
@@ -4341,7 +4340,7 @@ discard block |
||
4341 | 4340 | */ |
4342 | 4341 | |
4343 | 4342 | // Lock Item (if already locked), go back and warn |
4344 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $inputData['itemId']); |
|
4343 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $inputData['itemId']); |
|
4345 | 4344 | |
4346 | 4345 | // If token is taken for this Item and delay is passed then delete it. |
4347 | 4346 | if ( |
@@ -4352,7 +4351,7 @@ discard block |
||
4352 | 4351 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $inputData['itemId']); |
4353 | 4352 | //reload the previous data |
4354 | 4353 | $dataTmp = DB::queryFirstRow( |
4355 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
4354 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
4356 | 4355 | $inputData['itemId'] |
4357 | 4356 | ); |
4358 | 4357 | } |
@@ -4395,7 +4394,7 @@ discard block |
||
4395 | 4394 | // do query on this folder |
4396 | 4395 | $data_this_folder = DB::queryFirstRow( |
4397 | 4396 | 'SELECT id, personal_folder, title |
4398 | - FROM ' . prefixTable('nested_tree') . ' |
|
4397 | + FROM ' . prefixTable('nested_tree').' |
|
4399 | 4398 | WHERE id = %s', |
4400 | 4399 | $inputData['folderId'] |
4401 | 4400 | ); |
@@ -4435,8 +4434,8 @@ discard block |
||
4435 | 4434 | $visibilite = ''; |
4436 | 4435 | $data = DB::queryFirstRow( |
4437 | 4436 | 'SELECT m.valeur, n.personal_folder |
4438 | - FROM ' . prefixTable('misc') . ' AS m |
|
4439 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
4437 | + FROM ' . prefixTable('misc').' AS m |
|
4438 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
4440 | 4439 | WHERE type=%s AND intitule = %s', |
4441 | 4440 | 'complex', |
4442 | 4441 | $inputData['folderId'] |
@@ -4449,8 +4448,8 @@ discard block |
||
4449 | 4448 | // Prepare Item actual visibility (what Users/Roles can see it) |
4450 | 4449 | $rows = DB::query( |
4451 | 4450 | 'SELECT t.title |
4452 | - FROM ' . prefixTable('roles_values') . ' as v |
|
4453 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
4451 | + FROM ' . prefixTable('roles_values').' as v |
|
4452 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
4454 | 4453 | WHERE v.folder_id = %i |
4455 | 4454 | GROUP BY title', |
4456 | 4455 | $inputData['folderId'] |
@@ -4459,7 +4458,7 @@ discard block |
||
4459 | 4458 | if (empty($visibilite)) { |
4460 | 4459 | $visibilite = $record['title']; |
4461 | 4460 | } else { |
4462 | - $visibilite .= ' - ' . $record['title']; |
|
4461 | + $visibilite .= ' - '.$record['title']; |
|
4463 | 4462 | } |
4464 | 4463 | } |
4465 | 4464 | } else { |
@@ -4469,14 +4468,14 @@ discard block |
||
4469 | 4468 | // do new query to know if current folder is pf |
4470 | 4469 | $data_pf = DB::queryFirstRow( |
4471 | 4470 | 'SELECT personal_folder |
4472 | - FROM ' . prefixTable('nested_tree') . ' |
|
4471 | + FROM ' . prefixTable('nested_tree').' |
|
4473 | 4472 | WHERE id = %s', |
4474 | 4473 | $inputData['folderId'] |
4475 | 4474 | ); |
4476 | 4475 | |
4477 | 4476 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
4478 | 4477 | |
4479 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
4478 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
4480 | 4479 | } |
4481 | 4480 | |
4482 | 4481 | recupDroitCreationSansComplexite($inputData['folderId']); |
@@ -4486,8 +4485,8 @@ discard block |
||
4486 | 4485 | $listOptionsForRoles = array(); |
4487 | 4486 | $rows = DB::query( |
4488 | 4487 | 'SELECT r.role_id AS role_id, t.title AS title |
4489 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
4490 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
4488 | + FROM ' . prefixTable('roles_values').' AS r |
|
4489 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
4491 | 4490 | WHERE r.folder_id = %i', |
4492 | 4491 | $inputData['folderId'] |
4493 | 4492 | ); |
@@ -4501,7 +4500,7 @@ discard block |
||
4501 | 4500 | ); |
4502 | 4501 | $rows2 = DB::query( |
4503 | 4502 | 'SELECT id, login, fonction_id, email, name, lastname |
4504 | - FROM ' . prefixTable('users') . ' |
|
4503 | + FROM ' . prefixTable('users').' |
|
4505 | 4504 | WHERE admin = 0 AND fonction_id is not null' |
4506 | 4505 | ); |
4507 | 4506 | foreach ($rows2 as $record2) { |
@@ -4515,7 +4514,7 @@ discard block |
||
4515 | 4514 | array( |
4516 | 4515 | 'id' => $record2['id'], |
4517 | 4516 | 'login' => $record2['login'], |
4518 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
4517 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
4519 | 4518 | 'email' => $record2['email'], |
4520 | 4519 | ) |
4521 | 4520 | ); |
@@ -4532,13 +4531,13 @@ discard block |
||
4532 | 4531 | //db::debugmode(true); |
4533 | 4532 | $access = DB::queryFirstRow( |
4534 | 4533 | 'SELECT type |
4535 | - FROM ' . prefixTable('roles_values') . ' |
|
4534 | + FROM ' . prefixTable('roles_values').' |
|
4536 | 4535 | WHERE role_id = %i AND folder_id = %i', |
4537 | 4536 | $role, |
4538 | 4537 | $inputData['folderId'] |
4539 | 4538 | ); |
4540 | 4539 | //db::debugmode(false); |
4541 | - if (DB::count()>0) { |
|
4540 | + if (DB::count() > 0) { |
|
4542 | 4541 | if ($access['type'] === 'R') { |
4543 | 4542 | array_push($arrTmp, 10); |
4544 | 4543 | } elseif ($access['type'] === 'W') { |
@@ -4611,7 +4610,7 @@ discard block |
||
4611 | 4610 | // Get some info before deleting |
4612 | 4611 | $data = DB::queryFirstRow( |
4613 | 4612 | 'SELECT name, id_item, file |
4614 | - FROM ' . prefixTable('files') . ' |
|
4613 | + FROM ' . prefixTable('files').' |
|
4615 | 4614 | WHERE id = %i', |
4616 | 4615 | $fileId |
4617 | 4616 | ); |
@@ -4619,7 +4618,7 @@ discard block |
||
4619 | 4618 | // Load item data |
4620 | 4619 | $data_item = DB::queryFirstRow( |
4621 | 4620 | 'SELECT id_tree |
4622 | - FROM ' . prefixTable('items') . ' |
|
4621 | + FROM ' . prefixTable('items').' |
|
4623 | 4622 | WHERE id = %i', |
4624 | 4623 | $data['id_item'] |
4625 | 4624 | ); |
@@ -4649,7 +4648,7 @@ discard block |
||
4649 | 4648 | $_SESSION['user_id'], |
4650 | 4649 | 'at_modification', |
4651 | 4650 | $_SESSION['login'], |
4652 | - 'at_del_file : ' . $data['name'] |
|
4651 | + 'at_del_file : '.$data['name'] |
|
4653 | 4652 | ); |
4654 | 4653 | |
4655 | 4654 | // DElete sharekeys |
@@ -4660,7 +4659,7 @@ discard block |
||
4660 | 4659 | ); |
4661 | 4660 | |
4662 | 4661 | // Delete file from server |
4663 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
4662 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
4664 | 4663 | } |
4665 | 4664 | |
4666 | 4665 | echo (string) prepareExchangedData( |
@@ -4711,13 +4710,13 @@ discard block |
||
4711 | 4710 | // Update SESSION with this new favourite |
4712 | 4711 | $data = DB::queryfirstrow( |
4713 | 4712 | 'SELECT label,id_tree |
4714 | - FROM ' . prefixTable('items') . ' |
|
4713 | + FROM ' . prefixTable('items').' |
|
4715 | 4714 | WHERE id = %i', |
4716 | 4715 | $inputData['itemId'] |
4717 | 4716 | ); |
4718 | 4717 | $_SESSION['favourites_tab'][$inputData['itemId']] = array( |
4719 | 4718 | 'label' => $data['label'], |
4720 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $inputData['itemId'], |
|
4719 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$inputData['itemId'], |
|
4721 | 4720 | ); |
4722 | 4721 | } elseif ((int) $inputData['action'] === 1) { |
4723 | 4722 | // delete from session |
@@ -4786,8 +4785,8 @@ discard block |
||
4786 | 4785 | // get data about item |
4787 | 4786 | $dataSource = DB::queryfirstrow( |
4788 | 4787 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
4789 | - FROM ' . prefixTable('items') . ' as i |
|
4790 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
4788 | + FROM ' . prefixTable('items').' as i |
|
4789 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
4791 | 4790 | WHERE i.id=%i', |
4792 | 4791 | $inputData['itemId'] |
4793 | 4792 | ); |
@@ -4795,7 +4794,7 @@ discard block |
||
4795 | 4794 | // get data about new folder |
4796 | 4795 | $dataDestination = DB::queryfirstrow( |
4797 | 4796 | 'SELECT personal_folder, title |
4798 | - FROM ' . prefixTable('nested_tree') . ' |
|
4797 | + FROM ' . prefixTable('nested_tree').' |
|
4799 | 4798 | WHERE id = %i', |
4800 | 4799 | $inputData['folderId'] |
4801 | 4800 | ); |
@@ -4848,7 +4847,7 @@ discard block |
||
4848 | 4847 | // Get fields for this Item |
4849 | 4848 | $rows = DB::query( |
4850 | 4849 | 'SELECT id |
4851 | - FROM ' . prefixTable('categories_items') . ' |
|
4850 | + FROM ' . prefixTable('categories_items').' |
|
4852 | 4851 | WHERE item_id = %i', |
4853 | 4852 | $inputData['itemId'] |
4854 | 4853 | ); |
@@ -4865,7 +4864,7 @@ discard block |
||
4865 | 4864 | // Get FILES for this Item |
4866 | 4865 | $rows = DB::query( |
4867 | 4866 | 'SELECT id |
4868 | - FROM ' . prefixTable('files') . ' |
|
4867 | + FROM ' . prefixTable('files').' |
|
4869 | 4868 | WHERE id_item = %i', |
4870 | 4869 | $inputData['itemId'] |
4871 | 4870 | ); |
@@ -4912,7 +4911,7 @@ discard block |
||
4912 | 4911 | // Get the ITEM object key for the user |
4913 | 4912 | $userKey = DB::queryFirstRow( |
4914 | 4913 | 'SELECT share_key |
4915 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
4914 | + FROM ' . prefixTable('sharekeys_items').' |
|
4916 | 4915 | WHERE user_id = %i AND object_id = %i', |
4917 | 4916 | $_SESSION['user_id'], |
4918 | 4917 | $inputData['itemId'] |
@@ -4923,8 +4922,8 @@ discard block |
||
4923 | 4922 | // This is a public object |
4924 | 4923 | $users = DB::query( |
4925 | 4924 | 'SELECT id, public_key |
4926 | - FROM ' . prefixTable('users') . ' |
|
4927 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4925 | + FROM ' . prefixTable('users').' |
|
4926 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4928 | 4927 | AND public_key != ""' |
4929 | 4928 | ); |
4930 | 4929 | foreach ($users as $user) { |
@@ -4944,14 +4943,14 @@ discard block |
||
4944 | 4943 | // Get fields for this Item |
4945 | 4944 | $rows = DB::query( |
4946 | 4945 | 'SELECT id |
4947 | - FROM ' . prefixTable('categories_items') . ' |
|
4946 | + FROM ' . prefixTable('categories_items').' |
|
4948 | 4947 | WHERE item_id = %i', |
4949 | 4948 | $inputData['itemId'] |
4950 | 4949 | ); |
4951 | 4950 | foreach ($rows as $field) { |
4952 | 4951 | $userKey = DB::queryFirstRow( |
4953 | 4952 | 'SELECT share_key |
4954 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
4953 | + FROM ' . prefixTable('sharekeys_fields').' |
|
4955 | 4954 | WHERE user_id = %i AND object_id = %i', |
4956 | 4955 | $_SESSION['user_id'], |
4957 | 4956 | $field['id'] |
@@ -4962,8 +4961,8 @@ discard block |
||
4962 | 4961 | // This is a public object |
4963 | 4962 | $users = DB::query( |
4964 | 4963 | 'SELECT id, public_key |
4965 | - FROM ' . prefixTable('users') . ' |
|
4966 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4964 | + FROM ' . prefixTable('users').' |
|
4965 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4967 | 4966 | AND public_key != ""' |
4968 | 4967 | ); |
4969 | 4968 | foreach ($users as $user) { |
@@ -4984,14 +4983,14 @@ discard block |
||
4984 | 4983 | // Get FILES for this Item |
4985 | 4984 | $rows = DB::query( |
4986 | 4985 | 'SELECT id |
4987 | - FROM ' . prefixTable('files') . ' |
|
4986 | + FROM ' . prefixTable('files').' |
|
4988 | 4987 | WHERE id_item = %i', |
4989 | 4988 | $inputData['itemId'] |
4990 | 4989 | ); |
4991 | 4990 | foreach ($rows as $attachment) { |
4992 | 4991 | $userKey = DB::queryFirstRow( |
4993 | 4992 | 'SELECT share_key |
4994 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
4993 | + FROM ' . prefixTable('sharekeys_files').' |
|
4995 | 4994 | WHERE user_id = %i AND object_id = %i', |
4996 | 4995 | $_SESSION['user_id'], |
4997 | 4996 | $attachment['id'] |
@@ -5002,8 +5001,8 @@ discard block |
||
5002 | 5001 | // This is a public object |
5003 | 5002 | $users = DB::query( |
5004 | 5003 | 'SELECT id, public_key |
5005 | - FROM ' . prefixTable('users') . ' |
|
5006 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5004 | + FROM ' . prefixTable('users').' |
|
5005 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5007 | 5006 | AND public_key != ""' |
5008 | 5007 | ); |
5009 | 5008 | foreach ($users as $user) { |
@@ -5041,7 +5040,7 @@ discard block |
||
5041 | 5040 | $_SESSION['user_id'], |
5042 | 5041 | 'at_modification', |
5043 | 5042 | $_SESSION['login'], |
5044 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5043 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5045 | 5044 | ); |
5046 | 5045 | |
5047 | 5046 | // Update cache table |
@@ -5104,8 +5103,8 @@ discard block |
||
5104 | 5103 | // get data about item |
5105 | 5104 | $dataSource = DB::queryfirstrow( |
5106 | 5105 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
5107 | - FROM ' . prefixTable('items') . ' as i |
|
5108 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
5106 | + FROM ' . prefixTable('items').' as i |
|
5107 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
5109 | 5108 | WHERE i.id=%i', |
5110 | 5109 | $item_id |
5111 | 5110 | ); |
@@ -5127,7 +5126,7 @@ discard block |
||
5127 | 5126 | |
5128 | 5127 | // get data about new folder |
5129 | 5128 | $dataDestination = DB::queryfirstrow( |
5130 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
5129 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
5131 | 5130 | $inputData['folderId'] |
5132 | 5131 | ); |
5133 | 5132 | |
@@ -5169,7 +5168,7 @@ discard block |
||
5169 | 5168 | // Get fields for this Item |
5170 | 5169 | $rows = DB::query( |
5171 | 5170 | 'SELECT id |
5172 | - FROM ' . prefixTable('categories_items') . ' |
|
5171 | + FROM ' . prefixTable('categories_items').' |
|
5173 | 5172 | WHERE item_id = %i', |
5174 | 5173 | $item_id |
5175 | 5174 | ); |
@@ -5186,7 +5185,7 @@ discard block |
||
5186 | 5185 | // Get FILES for this Item |
5187 | 5186 | $rows = DB::query( |
5188 | 5187 | 'SELECT id |
5189 | - FROM ' . prefixTable('files') . ' |
|
5188 | + FROM ' . prefixTable('files').' |
|
5190 | 5189 | WHERE id_item = %i', |
5191 | 5190 | $item_id |
5192 | 5191 | ); |
@@ -5241,7 +5240,7 @@ discard block |
||
5241 | 5240 | // Get the ITEM object key for the user |
5242 | 5241 | $userKey = DB::queryFirstRow( |
5243 | 5242 | 'SELECT share_key |
5244 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
5243 | + FROM ' . prefixTable('sharekeys_items').' |
|
5245 | 5244 | WHERE user_id = %i AND object_id = %i', |
5246 | 5245 | $_SESSION['user_id'], |
5247 | 5246 | $item_id |
@@ -5252,8 +5251,8 @@ discard block |
||
5252 | 5251 | // This is a public object |
5253 | 5252 | $users = DB::query( |
5254 | 5253 | 'SELECT id, public_key |
5255 | - FROM ' . prefixTable('users') . ' |
|
5256 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5254 | + FROM ' . prefixTable('users').' |
|
5255 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5257 | 5256 | AND public_key != ""' |
5258 | 5257 | ); |
5259 | 5258 | foreach ($users as $user) { |
@@ -5273,14 +5272,14 @@ discard block |
||
5273 | 5272 | // Get fields for this Item |
5274 | 5273 | $rows = DB::query( |
5275 | 5274 | 'SELECT id |
5276 | - FROM ' . prefixTable('categories_items') . ' |
|
5275 | + FROM ' . prefixTable('categories_items').' |
|
5277 | 5276 | WHERE item_id = %i', |
5278 | 5277 | $item_id |
5279 | 5278 | ); |
5280 | 5279 | foreach ($rows as $field) { |
5281 | 5280 | $userKey = DB::queryFirstRow( |
5282 | 5281 | 'SELECT share_key |
5283 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5282 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5284 | 5283 | WHERE user_id = %i AND object_id = %i', |
5285 | 5284 | $_SESSION['user_id'], |
5286 | 5285 | $field['id'] |
@@ -5291,8 +5290,8 @@ discard block |
||
5291 | 5290 | // This is a public object |
5292 | 5291 | $users = DB::query( |
5293 | 5292 | 'SELECT id, public_key |
5294 | - FROM ' . prefixTable('users') . ' |
|
5295 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5293 | + FROM ' . prefixTable('users').' |
|
5294 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5296 | 5295 | AND public_key != ""' |
5297 | 5296 | ); |
5298 | 5297 | foreach ($users as $user) { |
@@ -5313,14 +5312,14 @@ discard block |
||
5313 | 5312 | // Get FILES for this Item |
5314 | 5313 | $rows = DB::query( |
5315 | 5314 | 'SELECT id |
5316 | - FROM ' . prefixTable('files') . ' |
|
5315 | + FROM ' . prefixTable('files').' |
|
5317 | 5316 | WHERE id_item = %i', |
5318 | 5317 | $item_id |
5319 | 5318 | ); |
5320 | 5319 | foreach ($rows as $attachment) { |
5321 | 5320 | $userKey = DB::queryFirstRow( |
5322 | 5321 | 'SELECT share_key |
5323 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5322 | + FROM ' . prefixTable('sharekeys_files').' |
|
5324 | 5323 | WHERE user_id = %i AND object_id = %i', |
5325 | 5324 | $_SESSION['user_id'], |
5326 | 5325 | $attachment['id'] |
@@ -5331,8 +5330,8 @@ discard block |
||
5331 | 5330 | // This is a public object |
5332 | 5331 | $users = DB::query( |
5333 | 5332 | 'SELECT id, public_key |
5334 | - FROM ' . prefixTable('users') . ' |
|
5335 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5333 | + FROM ' . prefixTable('users').' |
|
5334 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5336 | 5335 | AND public_key != ""' |
5337 | 5336 | ); |
5338 | 5337 | foreach ($users as $user) { |
@@ -5369,13 +5368,13 @@ discard block |
||
5369 | 5368 | $_SESSION['user_id'], |
5370 | 5369 | 'at_modification', |
5371 | 5370 | $_SESSION['login'], |
5372 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5371 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5373 | 5372 | ); |
5374 | 5373 | } |
5375 | 5374 | } |
5376 | 5375 | |
5377 | 5376 | // reload cache table |
5378 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
5377 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
5379 | 5378 | updateCacheTable('reload', $SETTINGS, null); |
5380 | 5379 | |
5381 | 5380 | echo (string) prepareExchangedData( |
@@ -5439,7 +5438,7 @@ discard block |
||
5439 | 5438 | // get info |
5440 | 5439 | $dataSource = DB::queryfirstrow( |
5441 | 5440 | 'SELECT label, id_tree |
5442 | - FROM ' . prefixTable('items') . ' |
|
5441 | + FROM ' . prefixTable('items').' |
|
5443 | 5442 | WHERE id=%i', |
5444 | 5443 | $item_id |
5445 | 5444 | ); |
@@ -5538,8 +5537,8 @@ discard block |
||
5538 | 5537 | } |
5539 | 5538 | if ($inputData['cat'] === 'request_access_to_author') { |
5540 | 5539 | // Variables |
5541 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]); |
|
5542 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]); |
|
5540 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]); |
|
5541 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]); |
|
5543 | 5542 | |
5544 | 5543 | // Get path |
5545 | 5544 | $path = geItemReadablePath( |
@@ -5553,7 +5552,7 @@ discard block |
||
5553 | 5552 | langHdl('email_request_access_subject'), |
5554 | 5553 | str_replace( |
5555 | 5554 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
5556 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
5555 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
5557 | 5556 | langHdl('email_request_access_mail') |
5558 | 5557 | ), |
5559 | 5558 | $dataAuthor['email'], |
@@ -5563,7 +5562,7 @@ discard block |
||
5563 | 5562 | } elseif ($inputData['cat'] === 'share_this_item') { |
5564 | 5563 | $dataItem = DB::queryfirstrow( |
5565 | 5564 | 'SELECT label,id_tree |
5566 | - FROM ' . prefixTable('items') . ' |
|
5565 | + FROM ' . prefixTable('items').' |
|
5567 | 5566 | WHERE id= %i', |
5568 | 5567 | $inputData['id'] |
5569 | 5568 | ); |
@@ -5586,7 +5585,7 @@ discard block |
||
5586 | 5585 | ), |
5587 | 5586 | array( |
5588 | 5587 | empty($SETTINGS['email_server_url']) === false ? |
5589 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'], |
|
5588 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'], |
|
5590 | 5589 | addslashes($_SESSION['login']), |
5591 | 5590 | addslashes($path), |
5592 | 5591 | ), |
@@ -5686,8 +5685,8 @@ discard block |
||
5686 | 5685 | // Get all informations for this item |
5687 | 5686 | $dataItem = DB::queryfirstrow( |
5688 | 5687 | 'SELECT * |
5689 | - FROM ' . prefixTable('items') . ' as i |
|
5690 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
5688 | + FROM ' . prefixTable('items').' as i |
|
5689 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
5691 | 5690 | WHERE i.id=%i AND l.action = %s', |
5692 | 5691 | $item_id, |
5693 | 5692 | 'at_creation' |
@@ -5716,18 +5715,18 @@ discard block |
||
5716 | 5715 | $_SESSION['login'], |
5717 | 5716 | htmlspecialchars_decode($label, ENT_QUOTES), |
5718 | 5717 | null, |
5719 | - (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format']) |
|
5718 | + (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format']) |
|
5720 | 5719 | ); |
5721 | 5720 | // Prepare new line |
5722 | 5721 | $data = DB::queryfirstrow( |
5723 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
5722 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
5724 | 5723 | $item_id |
5725 | 5724 | ); |
5726 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
5725 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
5727 | 5726 | // send back |
5728 | 5727 | $data = array( |
5729 | 5728 | 'error' => '', |
5730 | - 'new_line' => '<br>' . addslashes($historic), |
|
5729 | + 'new_line' => '<br>'.addslashes($historic), |
|
5731 | 5730 | ); |
5732 | 5731 | echo (string) prepareExchangedData( |
5733 | 5732 | $data, |
@@ -5799,7 +5798,7 @@ discard block |
||
5799 | 5798 | ); |
5800 | 5799 | |
5801 | 5800 | // delete all existing old otv codes |
5802 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time()); |
|
5801 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time()); |
|
5803 | 5802 | foreach ($rows as $record) { |
5804 | 5803 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
5805 | 5804 | } |
@@ -5821,8 +5820,8 @@ discard block |
||
5821 | 5820 | // Should we log a password change? |
5822 | 5821 | $itemQ = DB::queryFirstRow( |
5823 | 5822 | 'SELECT s.share_key, i.pw |
5824 | - FROM ' . prefixTable('items') . ' AS i |
|
5825 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
5823 | + FROM ' . prefixTable('items').' AS i |
|
5824 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
5826 | 5825 | WHERE s.user_id = %i AND s.object_id = %i', |
5827 | 5826 | $_SESSION['user_id'], |
5828 | 5827 | $dataReceived['id'] |
@@ -5875,7 +5874,7 @@ discard block |
||
5875 | 5874 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
5876 | 5875 | $SETTINGS['otv_expiration_period'] = 7; |
5877 | 5876 | } |
5878 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
5877 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
5879 | 5878 | |
5880 | 5879 | echo json_encode( |
5881 | 5880 | array( |
@@ -5917,7 +5916,7 @@ discard block |
||
5917 | 5916 | ); |
5918 | 5917 | |
5919 | 5918 | $data = DB::queryFirstRow( |
5920 | - 'SELECT * FROM ' . prefixTable('otv') . ' WHERE id = %i', |
|
5919 | + 'SELECT * FROM '.prefixTable('otv').' WHERE id = %i', |
|
5921 | 5920 | $dataReceived['otv_id'] |
5922 | 5921 | ); |
5923 | 5922 | |
@@ -5926,13 +5925,13 @@ discard block |
||
5926 | 5925 | $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME); |
5927 | 5926 | $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST); |
5928 | 5927 | if (str_contains($domain_host, 'www.') === true) { |
5929 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4); |
|
5928 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4); |
|
5930 | 5929 | } else { |
5931 | - $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host; |
|
5930 | + $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host; |
|
5932 | 5931 | } |
5933 | - $url = $domain_scheme.'://'.$domain_host . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit']; |
|
5932 | + $url = $domain_scheme.'://'.$domain_host.'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit']; |
|
5934 | 5933 | } else { |
5935 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&code=' . $data['code'] . '&key=' . $data['encrypted'] . '&stamp=' . $data['time_limit']; |
|
5934 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&code='.$data['code'].'&key='.$data['encrypted'].'&stamp='.$data['time_limit']; |
|
5936 | 5935 | } |
5937 | 5936 | |
5938 | 5937 | echo (string) prepareExchangedData( |
@@ -5967,8 +5966,8 @@ discard block |
||
5967 | 5966 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
5968 | 5967 | f.extension AS extension, f.type AS type, |
5969 | 5968 | s.share_key AS share_key |
5970 | - FROM ' . prefixTable('files') . ' AS f |
|
5971 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
5969 | + FROM ' . prefixTable('files').' AS f |
|
5970 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
5972 | 5971 | WHERE s.user_id = %i AND s.object_id = %i', |
5973 | 5972 | $_SESSION['user_id'], |
5974 | 5973 | $inputData['id'] |
@@ -5989,7 +5988,7 @@ discard block |
||
5989 | 5988 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
5990 | 5989 | |
5991 | 5990 | // prepare image info |
5992 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
5991 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
5993 | 5992 | $post_title = isBase64($post_title) === true ? |
5994 | 5993 | base64_decode($post_title) : $post_title; |
5995 | 5994 | $image_code = $file_info['file']; |
@@ -6006,7 +6005,7 @@ discard block |
||
6006 | 6005 | echo (string) prepareExchangedData( |
6007 | 6006 | array( |
6008 | 6007 | 'error' => false, |
6009 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
6008 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
6010 | 6009 | 'file_type' => $file_info['type'], |
6011 | 6010 | 'file_content' => $fileContent, |
6012 | 6011 | ), |
@@ -6059,16 +6058,16 @@ discard block |
||
6059 | 6058 | $idFolder = $dataReceived['idFolder']; |
6060 | 6059 | |
6061 | 6060 | // don't check if Personal Folder |
6062 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
6061 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
6063 | 6062 | if ($data['title'] === $_SESSION['user_id']) { |
6064 | 6063 | // send data |
6065 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
6064 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
6066 | 6065 | } else { |
6067 | 6066 | if ($inputData['option'] === 'same_folder') { |
6068 | 6067 | // case unique folder |
6069 | 6068 | DB::query( |
6070 | 6069 | 'SELECT label |
6071 | - FROM ' . prefixTable('items') . ' |
|
6070 | + FROM ' . prefixTable('items').' |
|
6072 | 6071 | WHERE id_tree = %i AND label = %s', |
6073 | 6072 | $idFolder, |
6074 | 6073 | $label |
@@ -6080,7 +6079,7 @@ discard block |
||
6080 | 6079 | $arrayPf = array(); |
6081 | 6080 | if (empty($row['id']) === false) { |
6082 | 6081 | $rows = DB::query( |
6083 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
6082 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
6084 | 6083 | '1' |
6085 | 6084 | ); |
6086 | 6085 | foreach ($rows as $record) { |
@@ -6095,12 +6094,12 @@ discard block |
||
6095 | 6094 | $where->add('id_tree = %i', $idFolder); |
6096 | 6095 | $where->add('label = %s', $label); |
6097 | 6096 | if (empty($arrayPf) === false) { |
6098 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
6097 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
6099 | 6098 | } |
6100 | 6099 | |
6101 | 6100 | DB::query( |
6102 | 6101 | 'SELECT label |
6103 | - FROM ' . prefixTable('items') . ' |
|
6102 | + FROM ' . prefixTable('items').' |
|
6104 | 6103 | WHERE %l', |
6105 | 6104 | $where |
6106 | 6105 | ); |
@@ -6112,7 +6111,7 @@ discard block |
||
6112 | 6111 | } |
6113 | 6112 | |
6114 | 6113 | // send data |
6115 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
6114 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
6116 | 6115 | } |
6117 | 6116 | break; |
6118 | 6117 | |
@@ -6155,7 +6154,7 @@ discard block |
||
6155 | 6154 | if (isset($dataReceived['force_refresh_cache']) === true && $dataReceived['force_refresh_cache'] === false) { |
6156 | 6155 | $goCachedFolders = loadFoldersListByCache('visible_folders', 'folders'); |
6157 | 6156 | if ($goCachedFolders['state'] === true) { |
6158 | - $arr_data['folders'] = json_decode($goCachedFolders['data'], true);//print_r($arr_data); |
|
6157 | + $arr_data['folders'] = json_decode($goCachedFolders['data'], true); //print_r($arr_data); |
|
6159 | 6158 | // send data |
6160 | 6159 | echo (string) prepareExchangedData( |
6161 | 6160 | [ |
@@ -6239,7 +6238,7 @@ discard block |
||
6239 | 6238 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
6240 | 6239 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
6241 | 6240 | } else { |
6242 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6241 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
6243 | 6242 | } |
6244 | 6243 | } |
6245 | 6244 | |
@@ -6319,7 +6318,7 @@ discard block |
||
6319 | 6318 | if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') { |
6320 | 6319 | $rows = DB::query( |
6321 | 6320 | 'SELECT id, categories |
6322 | - FROM ' . prefixTable('nested_tree') . ' |
|
6321 | + FROM ' . prefixTable('nested_tree').' |
|
6323 | 6322 | WHERE id IN (%l)', |
6324 | 6323 | implode(',', $foldersArray) |
6325 | 6324 | ); |
@@ -6361,7 +6360,7 @@ discard block |
||
6361 | 6360 | // get item info |
6362 | 6361 | $dataItem = DB::queryFirstRow( |
6363 | 6362 | 'SELECT * |
6364 | - FROM ' . prefixTable('items') . ' |
|
6363 | + FROM ' . prefixTable('items').' |
|
6365 | 6364 | WHERE id=%i', |
6366 | 6365 | $inputData['itemId'] |
6367 | 6366 | ); |
@@ -6373,8 +6372,8 @@ discard block |
||
6373 | 6372 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
6374 | 6373 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname, |
6375 | 6374 | l.old_value as old_value |
6376 | - FROM ' . prefixTable('log_items') . ' as l |
|
6377 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
6375 | + FROM ' . prefixTable('log_items').' as l |
|
6376 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
6378 | 6377 | WHERE id_item=%i AND l.action NOT IN (%l) |
6379 | 6378 | ORDER BY date DESC', |
6380 | 6379 | $inputData['itemId'], |
@@ -6389,18 +6388,18 @@ discard block |
||
6389 | 6388 | |
6390 | 6389 | // imported via API |
6391 | 6390 | if (empty($record['login']) === true) { |
6392 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
6391 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
6393 | 6392 | } |
6394 | 6393 | |
6395 | 6394 | // Prepare avatar |
6396 | 6395 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
6397 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
6398 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
6396 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
6397 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
6399 | 6398 | } else { |
6400 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6399 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6401 | 6400 | } |
6402 | 6401 | } else { |
6403 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6402 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6404 | 6403 | } |
6405 | 6404 | |
6406 | 6405 | // Prepare action |
@@ -6420,7 +6419,7 @@ discard block |
||
6420 | 6419 | $previous_passwords, |
6421 | 6420 | [ |
6422 | 6421 | 'password' => htmlentities($previous_pwd['string']), |
6423 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6422 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6424 | 6423 | ] |
6425 | 6424 | ); |
6426 | 6425 | } |
@@ -6433,19 +6432,19 @@ discard block |
||
6433 | 6432 | $action = langHdl($reason[0]); |
6434 | 6433 | if ($reason[0] === 'at_moved') { |
6435 | 6434 | $tmp = explode(' -> ', $reason[1]); |
6436 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
6435 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
6437 | 6436 | } elseif ($reason[0] === 'at_field') { |
6438 | 6437 | $tmp = explode(' => ', $reason[1]); |
6439 | 6438 | if (count($tmp) > 1) { |
6440 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
6441 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
6439 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
6440 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
6442 | 6441 | } else { |
6443 | 6442 | $detail = trim($reason[1]); |
6444 | 6443 | } |
6445 | 6444 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
6446 | 6445 | $tmp = explode(' => ', $reason[1]); |
6447 | 6446 | $detail = empty(trim($tmp[0])) === true ? |
6448 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
6447 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
6449 | 6448 | } elseif ($reason[0] === 'at_automatic_del') { |
6450 | 6449 | $detail = langHdl($reason[1]); |
6451 | 6450 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6454,7 +6453,7 @@ discard block |
||
6454 | 6453 | $tmp = explode(':', $reason[1]); |
6455 | 6454 | $tmp = explode('.', $tmp[0]); |
6456 | 6455 | $detail = isBase64($tmp[0]) === true ? |
6457 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
6456 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
6458 | 6457 | } elseif ($reason[0] === 'at_import') { |
6459 | 6458 | $detail = ''; |
6460 | 6459 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6473,8 +6472,8 @@ discard block |
||
6473 | 6472 | array( |
6474 | 6473 | 'avatar' => $avatar, |
6475 | 6474 | 'login' => $record['login'], |
6476 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
6477 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6475 | + 'name' => $record['name'].' '.$record['lastname'], |
|
6476 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6478 | 6477 | 'action' => $action, |
6479 | 6478 | 'detail' => $detail, |
6480 | 6479 | ) |
@@ -6563,18 +6562,18 @@ discard block |
||
6563 | 6562 | |
6564 | 6563 | // get some info to add to the notification email |
6565 | 6564 | $resp_user = DB::queryfirstrow( |
6566 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
6565 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
6567 | 6566 | $_SESSION['user_id'] |
6568 | 6567 | ); |
6569 | 6568 | $resp_folder = DB::queryfirstrow( |
6570 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6569 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
6571 | 6570 | $folder |
6572 | 6571 | ); |
6573 | 6572 | |
6574 | 6573 | // notify Managers |
6575 | 6574 | $rows = DB::query( |
6576 | 6575 | 'SELECT email |
6577 | - FROM ' . prefixTable('users') . ' |
|
6576 | + FROM ' . prefixTable('users').' |
|
6578 | 6577 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
6579 | 6578 | 1 |
6580 | 6579 | ); |
@@ -6605,14 +6604,14 @@ discard block |
||
6605 | 6604 | // Get list of users |
6606 | 6605 | $usersList = array(); |
6607 | 6606 | $usersString = ''; |
6608 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
6607 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
6609 | 6608 | foreach ($rows as $record) { |
6610 | 6609 | $usersList[$record['login']] = array( |
6611 | 6610 | 'id' => $record['id'], |
6612 | 6611 | 'login' => $record['login'], |
6613 | 6612 | 'email' => $record['email'], |
6614 | 6613 | ); |
6615 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
6614 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
6616 | 6615 | } |
6617 | 6616 | |
6618 | 6617 | $data = array( |
@@ -6652,7 +6651,7 @@ discard block |
||
6652 | 6651 | // Send email |
6653 | 6652 | $dataItem = DB::queryfirstrow( |
6654 | 6653 | 'SELECT label, id_tree |
6655 | - FROM ' . prefixTable('items') . ' |
|
6654 | + FROM ' . prefixTable('items').' |
|
6656 | 6655 | WHERE id = %i', |
6657 | 6656 | $inputData['itemId'] |
6658 | 6657 | ); |
@@ -6749,7 +6748,7 @@ discard block |
||
6749 | 6748 | |
6750 | 6749 | DB::query( |
6751 | 6750 | 'SELECT * |
6752 | - FROM ' . prefixTable('notification') . ' |
|
6751 | + FROM ' . prefixTable('notification').' |
|
6753 | 6752 | WHERE item_id = %i AND user_id = %i', |
6754 | 6753 | $inputData['itemId'], |
6755 | 6754 | $_SESSION['user_id'] |
@@ -6821,7 +6820,7 @@ discard block |
||
6821 | 6820 | // And related logs |
6822 | 6821 | $rows = DB::query( |
6823 | 6822 | 'SELECT id, file AS filename |
6824 | - FROM ' . prefixTable('files') . ' |
|
6823 | + FROM ' . prefixTable('files').' |
|
6825 | 6824 | WHERE id_item = %i AND confirmed = %i', |
6826 | 6825 | $inputData['itemId'], |
6827 | 6826 | 0 |
@@ -6835,12 +6834,12 @@ discard block |
||
6835 | 6834 | ); |
6836 | 6835 | |
6837 | 6836 | // Delete file on server |
6838 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
6837 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
6839 | 6838 | |
6840 | 6839 | // Delete related logs |
6841 | 6840 | $logFile = DB::query( |
6842 | 6841 | 'SELECT increment_id, raison |
6843 | - FROM ' . prefixTable('log_items') . ' |
|
6842 | + FROM ' . prefixTable('log_items').' |
|
6844 | 6843 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
6845 | 6844 | $inputData['itemId'], |
6846 | 6845 | $_SESSION['user_id'], |
@@ -6899,7 +6898,7 @@ discard block |
||
6899 | 6898 | // Confirm attachments |
6900 | 6899 | $rows = DB::query( |
6901 | 6900 | 'SELECT id, file AS filename |
6902 | - FROM ' . prefixTable('files') . ' |
|
6901 | + FROM ' . prefixTable('files').' |
|
6903 | 6902 | WHERE id_item = %i AND confirmed = %i', |
6904 | 6903 | $inputData['itemId'], |
6905 | 6904 | 0 |
@@ -6957,7 +6956,7 @@ discard block |
||
6957 | 6956 | |
6958 | 6957 | $data = DB::queryFirstRow( |
6959 | 6958 | 'SELECT visible_folders |
6960 | - FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
6959 | + FROM ' . prefixTable('cache_tree').' WHERE user_id = %i', |
|
6961 | 6960 | $inputData['userId'] |
6962 | 6961 | ); |
6963 | 6962 | // Check if tree ID is in visible folders. |
@@ -6991,15 +6990,15 @@ discard block |
||
6991 | 6990 | case 'autocomplete_tags': |
6992 | 6991 | // Get a list off all existing TAGS |
6993 | 6992 | $listOfTags = ''; |
6994 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
6993 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']); |
|
6995 | 6994 | foreach ($rows as $record) { |
6996 | 6995 | if (empty($listOfTags)) { |
6997 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
6996 | + $listOfTags = '"'.$record['tag'].'"'; |
|
6998 | 6997 | } else { |
6999 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
6998 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
7000 | 6999 | } |
7001 | 7000 | } |
7002 | - echo '[' . $listOfTags . ']'; |
|
7001 | + echo '['.$listOfTags.']'; |
|
7003 | 7002 | break; |
7004 | 7003 | } |
7005 | 7004 | } |
@@ -7015,7 +7014,7 @@ discard block |
||
7015 | 7014 | { |
7016 | 7015 | $data = DB::queryFirstRow( |
7017 | 7016 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
7018 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
7017 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
7019 | 7018 | $groupe |
7020 | 7019 | ); |
7021 | 7020 | // Check if it's in a personal folder. If yes, then force complexity overhead. |