@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 74 | 74 | // Not allowed page |
| 75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 77 | 77 | exit; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | // Get info about user to modify |
| 146 | 146 | $targetUserInfos = DB::queryfirstrow( |
| 147 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 147 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 148 | 148 | WHERE id = %i', |
| 149 | 149 | (int) $dataReceived['user_id'] |
| 150 | 150 | ); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Check if user already exists |
| 265 | 265 | $data = DB::query( |
| 266 | 266 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 267 | - FROM ' . prefixTable('users') . ' |
|
| 267 | + FROM ' . prefixTable('users').' |
|
| 268 | 268 | WHERE login = %s |
| 269 | 269 | AND deleted_at IS NULL', |
| 270 | 270 | $login |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | |
| 484 | 484 | // Get info about user to delete |
| 485 | 485 | $data_user = DB::queryfirstrow( |
| 486 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 486 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 487 | 487 | WHERE id = %i', |
| 488 | 488 | $post_id |
| 489 | 489 | ); |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | ); |
| 518 | 518 | // delete personal folder and subfolders |
| 519 | 519 | $data = DB::queryfirstrow( |
| 520 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 520 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 521 | 521 | WHERE title = %s AND personal_folder = %i', |
| 522 | 522 | $post_id, |
| 523 | 523 | '1' |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 531 | 531 | // delete items & logs |
| 532 | 532 | $items = DB::query( |
| 533 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 533 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 534 | 534 | WHERE id_tree=%i AND perso = %i', |
| 535 | 535 | $folder->id, |
| 536 | 536 | '1' |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | // Delete any process related to user |
| 555 | 555 | $processes = DB::query( |
| 556 | 556 | 'SELECT increment_id |
| 557 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 557 | + FROM ' . prefixTable('background_tasks').' |
|
| 558 | 558 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 559 | 559 | $post_id |
| 560 | 560 | ); |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | |
| 615 | 615 | // Get info about user to delete |
| 616 | 616 | $data_user = DB::queryfirstrow( |
| 617 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 617 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 618 | 618 | WHERE id = %i', |
| 619 | 619 | $post_id |
| 620 | 620 | ); |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | |
| 657 | 657 | // Get info about user to delete |
| 658 | 658 | $data_user = DB::queryfirstrow( |
| 659 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 659 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 660 | 660 | WHERE id = %i', |
| 661 | 661 | $post_id |
| 662 | 662 | ); |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | // Get info about user to delete |
| 700 | 700 | $data_user = DB::queryfirstrow( |
| 701 | 701 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 702 | - FROM ' . prefixTable('users') . ' |
|
| 702 | + FROM ' . prefixTable('users').' |
|
| 703 | 703 | WHERE id = %i', |
| 704 | 704 | $post_id |
| 705 | 705 | ); |
@@ -743,7 +743,7 @@ discard block |
||
| 743 | 743 | |
| 744 | 744 | // Get info about user to delete |
| 745 | 745 | $data_user = DB::queryfirstrow( |
| 746 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 746 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 747 | 747 | WHERE id = %i', |
| 748 | 748 | $post_id |
| 749 | 749 | ); |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | // Get info about user to delete |
| 787 | 787 | $data_user = DB::queryfirstrow( |
| 788 | 788 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 789 | - FROM ' . prefixTable('users') . ' |
|
| 789 | + FROM ' . prefixTable('users').' |
|
| 790 | 790 | WHERE id = %i', |
| 791 | 791 | $post_id |
| 792 | 792 | ); |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | // Get info about user to delete |
| 830 | 830 | $data_user = DB::queryfirstrow( |
| 831 | 831 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 832 | - FROM ' . prefixTable('users') . ' |
|
| 832 | + FROM ' . prefixTable('users').' |
|
| 833 | 833 | WHERE id = %i', |
| 834 | 834 | $post_id |
| 835 | 835 | ); |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | // Get info about user to delete |
| 870 | 870 | $data_user = DB::queryfirstrow( |
| 871 | 871 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 872 | - FROM ' . prefixTable('users') . ' |
|
| 872 | + FROM ' . prefixTable('users').' |
|
| 873 | 873 | WHERE id = %i', |
| 874 | 874 | $post_id |
| 875 | 875 | ); |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | $return = array(); |
| 909 | 909 | // Check if folder exists |
| 910 | 910 | $data = DB::query( |
| 911 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 911 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 912 | 912 | WHERE title = %s AND parent_id = %i', |
| 913 | 913 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 914 | 914 | '0' |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | } |
| 922 | 922 | // Check if role exists |
| 923 | 923 | $data = DB::query( |
| 924 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 924 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 925 | 925 | WHERE title = %s', |
| 926 | 926 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 927 | 927 | ); |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | case 'user_log_items': |
| 942 | 942 | $nb_pages = 1; |
| 943 | 943 | $logs = $sql_filter = ''; |
| 944 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . $lang->get('pages') . ' : </td>'; |
|
| 944 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.$lang->get('pages').' : </td>'; |
|
| 945 | 945 | |
| 946 | 946 | // Prepare POST variables |
| 947 | 947 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -953,14 +953,14 @@ discard block |
||
| 953 | 953 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) |
| 954 | 954 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) !== 'all' |
| 955 | 955 | ) { |
| 956 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "'"; |
|
| 956 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."'"; |
|
| 957 | 957 | } |
| 958 | 958 | // get number of pages |
| 959 | 959 | DB::query( |
| 960 | 960 | 'SELECT * |
| 961 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 962 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 963 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 961 | + FROM ' . prefixTable('log_items').' as l |
|
| 962 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 963 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 964 | 964 | WHERE l.id_user = %i ' . $sql_filter, |
| 965 | 965 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 966 | 966 | ); |
@@ -978,19 +978,19 @@ discard block |
||
| 978 | 978 | // launch query |
| 979 | 979 | $rows = DB::query( |
| 980 | 980 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 981 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 982 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 983 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 984 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 981 | + FROM ' . prefixTable('log_items').' as l |
|
| 982 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 983 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 984 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 985 | 985 | ORDER BY date DESC |
| 986 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 986 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 987 | 987 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 988 | 988 | ); |
| 989 | 989 | } else { |
| 990 | 990 | // get number of pages |
| 991 | 991 | DB::query( |
| 992 | 992 | 'SELECT * |
| 993 | - FROM ' . prefixTable('log_system') . ' |
|
| 993 | + FROM ' . prefixTable('log_system').' |
|
| 994 | 994 | WHERE type = %s AND field_1=%i', |
| 995 | 995 | 'user_mngt', |
| 996 | 996 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | // launch query |
| 1010 | 1010 | $rows = DB::query( |
| 1011 | 1011 | 'SELECT * |
| 1012 | - FROM ' . prefixTable('log_system') . ' |
|
| 1012 | + FROM ' . prefixTable('log_system').' |
|
| 1013 | 1013 | WHERE type = %s AND field_1 = %i |
| 1014 | 1014 | ORDER BY date DESC |
| 1015 | 1015 | LIMIT %i, %i', |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | if (isset($counter) && $counter != 0) { |
| 1024 | 1024 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 1025 | 1025 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 1026 | - $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>'; |
|
| 1026 | + $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>'; |
|
| 1027 | 1027 | } |
| 1028 | 1028 | } |
| 1029 | 1029 | $pages .= '</tr></table>'; |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | if ($post_scope === 'user_mngt') { |
| 1033 | 1033 | $user = DB::queryfirstrow( |
| 1034 | 1034 | 'SELECT login |
| 1035 | - from ' . prefixTable('users') . ' |
|
| 1035 | + from ' . prefixTable('users').' |
|
| 1036 | 1036 | WHERE id=%i', |
| 1037 | 1037 | $record['qui'] |
| 1038 | 1038 | ); |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 1043 | 1043 | $label = $lang->get('log_user_initial_pwd_changed'); |
| 1044 | 1044 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 1045 | - $label = $lang->get('log_user_email_changed') . $tmp[1]; |
|
| 1045 | + $label = $lang->get('log_user_email_changed').$tmp[1]; |
|
| 1046 | 1046 | } elseif ($tmp[0] == 'at_user_added') { |
| 1047 | 1047 | $label = $lang->get('log_user_created'); |
| 1048 | 1048 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -1053,14 +1053,14 @@ discard block |
||
| 1053 | 1053 | $label = $lang->get('log_user_pwd_changed'); |
| 1054 | 1054 | } |
| 1055 | 1055 | // prepare log |
| 1056 | - $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>'; |
|
| 1056 | + $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>'; |
|
| 1057 | 1057 | } else { |
| 1058 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . $lang->get($record['action']) . '</td></tr>'; |
|
| 1058 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.$lang->get($record['action']).'</td></tr>'; |
|
| 1059 | 1059 | } |
| 1060 | 1060 | } |
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 1063 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 1064 | 1064 | break; |
| 1065 | 1065 | |
| 1066 | 1066 | /* |
@@ -1078,7 +1078,7 @@ discard block |
||
| 1078 | 1078 | } else { |
| 1079 | 1079 | // Get folder id for Admin |
| 1080 | 1080 | $admin_folder = DB::queryFirstRow( |
| 1081 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1081 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1082 | 1082 | WHERE title = %i AND personal_folder = %i', |
| 1083 | 1083 | (int) $session->get('user-id'), |
| 1084 | 1084 | '1' |
@@ -1089,15 +1089,15 @@ discard block |
||
| 1089 | 1089 | // Get each Items in PF |
| 1090 | 1090 | $rows = DB::query( |
| 1091 | 1091 | 'SELECT i.pw, i.label, l.id_user |
| 1092 | - FROM ' . prefixTable('items') . ' as i |
|
| 1093 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 1092 | + FROM ' . prefixTable('items').' as i |
|
| 1093 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 1094 | 1094 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 1095 | 1095 | 'at_creation', |
| 1096 | 1096 | '1', |
| 1097 | 1097 | intval($folder->id) |
| 1098 | 1098 | ); |
| 1099 | 1099 | foreach ($rows as $record) { |
| 1100 | - echo $record['label'] . ' - '; |
|
| 1100 | + echo $record['label'].' - '; |
|
| 1101 | 1101 | // Change user |
| 1102 | 1102 | DB::update( |
| 1103 | 1103 | prefixTable('log_items'), |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | // Get info about user to delete |
| 1133 | 1133 | $data_user = DB::queryfirstrow( |
| 1134 | 1134 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1135 | - FROM ' . prefixTable('users') . ' |
|
| 1135 | + FROM ' . prefixTable('users').' |
|
| 1136 | 1136 | WHERE id = %i', |
| 1137 | 1137 | $post_user_id |
| 1138 | 1138 | ); |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | |
| 1170 | 1170 | // Do |
| 1171 | 1171 | $rows = DB::query( |
| 1172 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1172 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1173 | 1173 | WHERE timestamp != %s AND admin != %i', |
| 1174 | 1174 | '', |
| 1175 | 1175 | '1' |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | // Get info about user to delete |
| 1179 | 1179 | $data_user = DB::queryfirstrow( |
| 1180 | 1180 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1181 | - FROM ' . prefixTable('users') . ' |
|
| 1181 | + FROM ' . prefixTable('users').' |
|
| 1182 | 1182 | WHERE id = %i', |
| 1183 | 1183 | $record['id'] |
| 1184 | 1184 | ); |
@@ -1233,7 +1233,7 @@ discard block |
||
| 1233 | 1233 | // Get info about user |
| 1234 | 1234 | $rowUser = DB::queryfirstrow( |
| 1235 | 1235 | 'SELECT * |
| 1236 | - FROM ' . prefixTable('users') . ' |
|
| 1236 | + FROM ' . prefixTable('users').' |
|
| 1237 | 1237 | WHERE id = %i', |
| 1238 | 1238 | $post_id |
| 1239 | 1239 | ); |
@@ -1258,7 +1258,7 @@ discard block |
||
| 1258 | 1258 | $selected = ''; |
| 1259 | 1259 | $users_functions = array_filter(array_unique(explode(';', empty($rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']) === true ? '' : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']))); |
| 1260 | 1260 | |
| 1261 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1261 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1262 | 1262 | foreach ($rows as $record) { |
| 1263 | 1263 | if ( |
| 1264 | 1264 | (int) $session->get('user-admin') === 1 |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | $rolesList = array(); |
| 1294 | 1294 | $managedBy = array(); |
| 1295 | 1295 | $selected = ''; |
| 1296 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1296 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1297 | 1297 | foreach ($rows as $reccord) { |
| 1298 | 1298 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1299 | 1299 | } |
@@ -1324,7 +1324,7 @@ discard block |
||
| 1324 | 1324 | array_push( |
| 1325 | 1325 | $managedBy, |
| 1326 | 1326 | array( |
| 1327 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 1327 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 1328 | 1328 | 'id' => $fonction['id'], |
| 1329 | 1329 | 'selected' => $selected, |
| 1330 | 1330 | ) |
@@ -1406,9 +1406,9 @@ discard block |
||
| 1406 | 1406 | |
| 1407 | 1407 | // get USER STATUS |
| 1408 | 1408 | if ($rowUser['disabled'] == 1) { |
| 1409 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>'; |
|
| 1409 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>'; |
|
| 1410 | 1410 | } else { |
| 1411 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 1411 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 1412 | 1412 | } |
| 1413 | 1413 | |
| 1414 | 1414 | $arrData['error'] = false; |
@@ -1495,7 +1495,7 @@ discard block |
||
| 1495 | 1495 | |
| 1496 | 1496 | // Get info about user to modify |
| 1497 | 1497 | $data_user = DB::queryfirstrow( |
| 1498 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1498 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1499 | 1499 | WHERE id = %i', |
| 1500 | 1500 | $post_id |
| 1501 | 1501 | ); |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | // count number of admins |
| 1507 | 1507 | $users = DB::query( |
| 1508 | 1508 | 'SELECT id |
| 1509 | - FROM ' . prefixTable('users') . ' |
|
| 1509 | + FROM ' . prefixTable('users').' |
|
| 1510 | 1510 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 1511 | 1511 | $post_id |
| 1512 | 1512 | ); |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | // Exclude roles from AD - PR #3635 |
| 1530 | 1530 | $adRoles = DB::query( |
| 1531 | 1531 | 'SELECT roles_from_ad_groups |
| 1532 | - FROM ' . prefixTable('users') . ' |
|
| 1532 | + FROM ' . prefixTable('users').' |
|
| 1533 | 1533 | WHERE id = %i', |
| 1534 | 1534 | $post_id |
| 1535 | 1535 | )[0]['roles_from_ad_groups']; |
@@ -1633,7 +1633,7 @@ discard block |
||
| 1633 | 1633 | ); |
| 1634 | 1634 | // delete personal folder and subfolders |
| 1635 | 1635 | $data = DB::queryfirstrow( |
| 1636 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1636 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1637 | 1637 | WHERE title = %s AND personal_folder = %i', |
| 1638 | 1638 | $post_id, |
| 1639 | 1639 | '1' |
@@ -1646,7 +1646,7 @@ discard block |
||
| 1646 | 1646 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1647 | 1647 | // delete items & logs |
| 1648 | 1648 | $items = DB::query( |
| 1649 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1649 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1650 | 1650 | WHERE id_tree=%i AND perso = %i', |
| 1651 | 1651 | $folder->id, |
| 1652 | 1652 | '1' |
@@ -1667,7 +1667,7 @@ discard block |
||
| 1667 | 1667 | } else { |
| 1668 | 1668 | // Get old data about user |
| 1669 | 1669 | $oldData = DB::queryfirstrow( |
| 1670 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1670 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1671 | 1671 | WHERE id = %i', |
| 1672 | 1672 | $post_id |
| 1673 | 1673 | ); |
@@ -1704,7 +1704,7 @@ discard block |
||
| 1704 | 1704 | |
| 1705 | 1705 | // update LOG |
| 1706 | 1706 | if ($oldData['email'] !== $post_email) { |
| 1707 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1707 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1708 | 1708 | } |
| 1709 | 1709 | } |
| 1710 | 1710 | echo prepareExchangedData( |
@@ -1756,7 +1756,7 @@ discard block |
||
| 1756 | 1756 | |
| 1757 | 1757 | // Get info about user to delete |
| 1758 | 1758 | $data_user = DB::queryfirstrow( |
| 1759 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1759 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1760 | 1760 | WHERE id = %i', |
| 1761 | 1761 | $post_id |
| 1762 | 1762 | ); |
@@ -1806,7 +1806,7 @@ discard block |
||
| 1806 | 1806 | } |
| 1807 | 1807 | |
| 1808 | 1808 | DB::queryfirstrow( |
| 1809 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1809 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1810 | 1810 | WHERE login = %s |
| 1811 | 1811 | AND deleted_at IS NULL', |
| 1812 | 1812 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1858,7 +1858,7 @@ discard block |
||
| 1858 | 1858 | // get User info |
| 1859 | 1859 | $rowUser = DB::queryFirstRow( |
| 1860 | 1860 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1861 | - FROM ' . prefixTable('users') . ' |
|
| 1861 | + FROM ' . prefixTable('users').' |
|
| 1862 | 1862 | WHERE id = %i', |
| 1863 | 1863 | $post_id |
| 1864 | 1864 | ); |
@@ -1868,7 +1868,7 @@ discard block |
||
| 1868 | 1868 | $html = ''; |
| 1869 | 1869 | |
| 1870 | 1870 | 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) { |
| 1871 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1871 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1872 | 1872 | } |
| 1873 | 1873 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1874 | 1874 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1879,7 +1879,7 @@ discard block |
||
| 1879 | 1879 | // refine folders based upon roles |
| 1880 | 1880 | $rows = DB::query( |
| 1881 | 1881 | 'SELECT folder_id, type |
| 1882 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1882 | + FROM ' . prefixTable('roles_values').' |
|
| 1883 | 1883 | WHERE role_id IN %ls |
| 1884 | 1884 | ORDER BY folder_id ASC', |
| 1885 | 1885 | $arrData['functions'] |
@@ -1902,7 +1902,7 @@ discard block |
||
| 1902 | 1902 | } |
| 1903 | 1903 | |
| 1904 | 1904 | // add allowed folders |
| 1905 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1905 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1906 | 1906 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1907 | 1907 | } |
| 1908 | 1908 | |
@@ -1913,7 +1913,7 @@ discard block |
||
| 1913 | 1913 | // get folder name |
| 1914 | 1914 | $row = DB::queryFirstRow( |
| 1915 | 1915 | 'SELECT title, nlevel, id |
| 1916 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1916 | + FROM ' . prefixTable('nested_tree').' |
|
| 1917 | 1917 | WHERE id = %i', |
| 1918 | 1918 | $fld['id'] |
| 1919 | 1919 | ); |
@@ -1926,38 +1926,38 @@ discard block |
||
| 1926 | 1926 | |
| 1927 | 1927 | // manage right icon |
| 1928 | 1928 | if ($fld['type'] == 'W') { |
| 1929 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1930 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1931 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1929 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1930 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1931 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1932 | 1932 | } elseif ($fld['type'] == 'ND') { |
| 1933 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1934 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1935 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1933 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1934 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1935 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1936 | 1936 | } elseif ($fld['type'] == 'NE') { |
| 1937 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1938 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1939 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1937 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1938 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1939 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1940 | 1940 | } elseif ($fld['type'] == 'NDNE') { |
| 1941 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1942 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1943 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1941 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1942 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1943 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1944 | 1944 | } elseif ($fld['type'] == '') { |
| 1945 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1945 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1946 | 1946 | } else { |
| 1947 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1947 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1948 | 1948 | } |
| 1949 | 1949 | |
| 1950 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1951 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1952 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1953 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1950 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1951 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1952 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1953 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1954 | 1954 | break; |
| 1955 | 1955 | } |
| 1956 | 1956 | } |
| 1957 | 1957 | } |
| 1958 | 1958 | |
| 1959 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1960 | - $html . '</tbody></table>'; |
|
| 1959 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1960 | + $html.'</tbody></table>'; |
|
| 1961 | 1961 | } else { |
| 1962 | 1962 | $html_full = ''; |
| 1963 | 1963 | } |
@@ -2003,7 +2003,7 @@ discard block |
||
| 2003 | 2003 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 2004 | 2004 | $rows = DB::query( |
| 2005 | 2005 | 'SELECT * |
| 2006 | - FROM ' . prefixTable('users') . ' |
|
| 2006 | + FROM ' . prefixTable('users').' |
|
| 2007 | 2007 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 2008 | 2008 | '0', |
| 2009 | 2009 | array_filter($session->get('user-roles_array')) |
@@ -2011,7 +2011,7 @@ discard block |
||
| 2011 | 2011 | } else { |
| 2012 | 2012 | $rows = DB::query( |
| 2013 | 2013 | 'SELECT * |
| 2014 | - FROM ' . prefixTable('users') . ' |
|
| 2014 | + FROM ' . prefixTable('users').' |
|
| 2015 | 2015 | WHERE admin = %i', |
| 2016 | 2016 | '0' |
| 2017 | 2017 | ); |
@@ -2023,7 +2023,7 @@ discard block |
||
| 2023 | 2023 | $groupIds = []; |
| 2024 | 2024 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 2025 | 2025 | $tmp = DB::queryfirstrow( |
| 2026 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 2026 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 2027 | 2027 | WHERE id = %i', |
| 2028 | 2028 | $group |
| 2029 | 2029 | ); |
@@ -2035,7 +2035,7 @@ discard block |
||
| 2035 | 2035 | |
| 2036 | 2036 | // Get managed_by |
| 2037 | 2037 | $managedBy = DB::queryfirstrow( |
| 2038 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 2038 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 2039 | 2039 | WHERE id = %i', |
| 2040 | 2040 | $record['isAdministratedByRole'] |
| 2041 | 2041 | ); |
@@ -2045,7 +2045,7 @@ discard block |
||
| 2045 | 2045 | $foldersAllowedIds = []; |
| 2046 | 2046 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 2047 | 2047 | $tmp = DB::queryfirstrow( |
| 2048 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 2048 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 2049 | 2049 | WHERE id = %i', |
| 2050 | 2050 | $role |
| 2051 | 2051 | ); |
@@ -2058,7 +2058,7 @@ discard block |
||
| 2058 | 2058 | $foldersForbiddenIds = []; |
| 2059 | 2059 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 2060 | 2060 | $tmp = DB::queryfirstrow( |
| 2061 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 2061 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 2062 | 2062 | WHERE id = %i', |
| 2063 | 2063 | $role |
| 2064 | 2064 | ); |
@@ -2076,7 +2076,7 @@ discard block |
||
| 2076 | 2076 | 'login' => $record['login'], |
| 2077 | 2077 | 'groups' => implode(', ', $groups), |
| 2078 | 2078 | 'groupIds' => $groupIds, |
| 2079 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2079 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2080 | 2080 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 2081 | 2081 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 2082 | 2082 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2177,7 +2177,7 @@ discard block |
||
| 2177 | 2177 | |
| 2178 | 2178 | // Get info about user |
| 2179 | 2179 | $data_user = DB::queryfirstrow( |
| 2180 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2180 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2181 | 2181 | WHERE id = %i', |
| 2182 | 2182 | $inputData['source_id'] |
| 2183 | 2183 | ); |
@@ -2379,14 +2379,14 @@ discard block |
||
| 2379 | 2379 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2380 | 2380 | $data_user = DB::queryfirstrow( |
| 2381 | 2381 | 'SELECT fonction_id, public_key |
| 2382 | - FROM ' . prefixTable('users') . ' |
|
| 2382 | + FROM ' . prefixTable('users').' |
|
| 2383 | 2383 | WHERE id = %i', |
| 2384 | 2384 | $post_user_id |
| 2385 | 2385 | ); |
| 2386 | 2386 | |
| 2387 | 2387 | if ($data_user) { |
| 2388 | 2388 | // Ensure array is unique |
| 2389 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2389 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2390 | 2390 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2391 | 2391 | } else { |
| 2392 | 2392 | // User not found |
@@ -2402,14 +2402,14 @@ discard block |
||
| 2402 | 2402 | } |
| 2403 | 2403 | |
| 2404 | 2404 | // Manage specific case of api key |
| 2405 | - if($post_field === 'user_api_key') { |
|
| 2405 | + if ($post_field === 'user_api_key') { |
|
| 2406 | 2406 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 2407 | 2407 | $session->set('user-api_key', $post_new_value); |
| 2408 | 2408 | |
| 2409 | 2409 | // test if user has an api key |
| 2410 | 2410 | $data_user = DB::queryfirstrow( |
| 2411 | 2411 | 'SELECT value |
| 2412 | - FROM ' . prefixTable('api') . ' |
|
| 2412 | + FROM ' . prefixTable('api').' |
|
| 2413 | 2413 | WHERE user_id = %i', |
| 2414 | 2414 | $post_user_id |
| 2415 | 2415 | ); |
@@ -2529,7 +2529,7 @@ discard block |
||
| 2529 | 2529 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2530 | 2530 | $error = $e->getDetailedError(); |
| 2531 | 2531 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2532 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2532 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2533 | 2533 | } |
| 2534 | 2534 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2535 | 2535 | echo prepareExchangedData( |
@@ -2559,7 +2559,7 @@ discard block |
||
| 2559 | 2559 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2560 | 2560 | $error = $e->getDetailedError(); |
| 2561 | 2561 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2562 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2562 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2563 | 2563 | } |
| 2564 | 2564 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2565 | 2565 | echo prepareExchangedData( |
@@ -2576,7 +2576,7 @@ discard block |
||
| 2576 | 2576 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2577 | 2577 | // Build the list of all groups in AD |
| 2578 | 2578 | if (isset($adUser['memberof']) === true) { |
| 2579 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2579 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2580 | 2580 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2581 | 2581 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2582 | 2582 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2592,7 +2592,7 @@ discard block |
||
| 2592 | 2592 | // Get his ID |
| 2593 | 2593 | $userInfo = DB::queryfirstrow( |
| 2594 | 2594 | 'SELECT id, login, fonction_id, auth_type |
| 2595 | - FROM ' . prefixTable('users') . ' |
|
| 2595 | + FROM ' . prefixTable('users').' |
|
| 2596 | 2596 | WHERE login = %s', |
| 2597 | 2597 | $userLogin |
| 2598 | 2598 | ); |
@@ -2628,7 +2628,7 @@ discard block |
||
| 2628 | 2628 | |
| 2629 | 2629 | // Get all groups in Teampass |
| 2630 | 2630 | $teampassRoles = array(); |
| 2631 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2631 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2632 | 2632 | foreach ($rows as $record) { |
| 2633 | 2633 | array_push( |
| 2634 | 2634 | $teampassRoles, |
@@ -2692,7 +2692,7 @@ discard block |
||
| 2692 | 2692 | // Check if user already exists |
| 2693 | 2693 | $data = DB::query( |
| 2694 | 2694 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2695 | - FROM ' . prefixTable('users') . ' |
|
| 2695 | + FROM ' . prefixTable('users').' |
|
| 2696 | 2696 | WHERE login = %s', |
| 2697 | 2697 | $post_login |
| 2698 | 2698 | ); |
@@ -2867,14 +2867,14 @@ discard block |
||
| 2867 | 2867 | // Send mail to user with new OTP |
| 2868 | 2868 | $userInfo = DB::queryFirstRow( |
| 2869 | 2869 | 'SELECT email |
| 2870 | - FROM ' . prefixTable('users') . ' |
|
| 2870 | + FROM ' . prefixTable('users').' |
|
| 2871 | 2871 | WHERE id = %i', |
| 2872 | 2872 | $post_userId |
| 2873 | 2873 | ); |
| 2874 | 2874 | $emailSettings = new EmailSettings($SETTINGS); |
| 2875 | 2875 | $emailService = new EmailService(); |
| 2876 | 2876 | $emailService->sendMail( |
| 2877 | - 'TEAMPASS - ' . $lang->get('temporary_encryption_code'), |
|
| 2877 | + 'TEAMPASS - '.$lang->get('temporary_encryption_code'), |
|
| 2878 | 2878 | str_replace( |
| 2879 | 2879 | array('#enc_code#'), |
| 2880 | 2880 | array($post_otp), |
@@ -2929,7 +2929,7 @@ discard block |
||
| 2929 | 2929 | // Check if user already exists |
| 2930 | 2930 | DB::query( |
| 2931 | 2931 | 'SELECT id |
| 2932 | - FROM ' . prefixTable('users') . ' |
|
| 2932 | + FROM ' . prefixTable('users').' |
|
| 2933 | 2933 | WHERE id = %i', |
| 2934 | 2934 | $post_id |
| 2935 | 2935 | ); |
@@ -3002,7 +3002,7 @@ discard block |
||
| 3002 | 3002 | // Check if user already exists |
| 3003 | 3003 | $userInfo = DB::queryfirstrow( |
| 3004 | 3004 | 'SELECT id, private_key, public_key |
| 3005 | - FROM ' . prefixTable('users') . ' |
|
| 3005 | + FROM ' . prefixTable('users').' |
|
| 3006 | 3006 | WHERE id = %i', |
| 3007 | 3007 | $post_userid |
| 3008 | 3008 | ); |
@@ -3049,7 +3049,7 @@ discard block |
||
| 3049 | 3049 | if (count($session->get('user-personal_folders')) > 0) { |
| 3050 | 3050 | DB::query( |
| 3051 | 3051 | 'SELECT id |
| 3052 | - FROM ' . prefixTable('items') . ' |
|
| 3052 | + FROM ' . prefixTable('items').' |
|
| 3053 | 3053 | WHERE id_tree IN %ls', |
| 3054 | 3054 | $session->get('user-personal_folders') |
| 3055 | 3055 | ); |
@@ -3139,7 +3139,7 @@ discard block |
||
| 3139 | 3139 | // Check if user already exists |
| 3140 | 3140 | DB::query( |
| 3141 | 3141 | 'SELECT id |
| 3142 | - FROM ' . prefixTable('users') . ' |
|
| 3142 | + FROM ' . prefixTable('users').' |
|
| 3143 | 3143 | WHERE id = %i', |
| 3144 | 3144 | $post_id |
| 3145 | 3145 | ); |
@@ -3206,7 +3206,7 @@ discard block |
||
| 3206 | 3206 | // Search TP_USER un db |
| 3207 | 3207 | $userTP = DB::queryFirstRow( |
| 3208 | 3208 | 'SELECT pw |
| 3209 | - FROM ' . prefixTable('users') . ' |
|
| 3209 | + FROM ' . prefixTable('users').' |
|
| 3210 | 3210 | WHERE id = %i', |
| 3211 | 3211 | TP_USER_ID |
| 3212 | 3212 | ); |
@@ -3228,8 +3228,8 @@ discard block |
||
| 3228 | 3228 | 'process_type' => 'create_user_keys', |
| 3229 | 3229 | 'arguments' => json_encode([ |
| 3230 | 3230 | 'new_user_id' => (int) $post_user_id, |
| 3231 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 3232 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 3231 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 3232 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 3233 | 3233 | 'owner_id' => (int) TP_USER_ID, |
| 3234 | 3234 | 'creator_pwd' => $userTP['pw'], |
| 3235 | 3235 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -3388,7 +3388,7 @@ discard block |
||
| 3388 | 3388 | // get user info |
| 3389 | 3389 | $userInfo = DB::queryFirstRow( |
| 3390 | 3390 | 'SELECT * |
| 3391 | - FROM ' . prefixTable('users') . ' |
|
| 3391 | + FROM ' . prefixTable('users').' |
|
| 3392 | 3392 | WHERE id = %i', |
| 3393 | 3393 | $user_id |
| 3394 | 3394 | ); |
@@ -3475,8 +3475,8 @@ discard block |
||
| 3475 | 3475 | // get user info |
| 3476 | 3476 | $processesProgress = DB::query( |
| 3477 | 3477 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 3478 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3479 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3478 | + FROM ' . prefixTable('users').' AS u |
|
| 3479 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3480 | 3480 | WHERE u.id = %i', |
| 3481 | 3481 | $user_id |
| 3482 | 3482 | ); |
@@ -3484,9 +3484,9 @@ discard block |
||
| 3484 | 3484 | //print_r($processesProgress); |
| 3485 | 3485 | $finished_steps = 0; |
| 3486 | 3486 | $nb_steps = count($processesProgress); |
| 3487 | - foreach($processesProgress as $process) { |
|
| 3487 | + foreach ($processesProgress as $process) { |
|
| 3488 | 3488 | if ((int) $process['is_in_progress'] === -1) { |
| 3489 | - $finished_steps ++; |
|
| 3489 | + $finished_steps++; |
|
| 3490 | 3490 | } |
| 3491 | 3491 | } |
| 3492 | 3492 | |
@@ -3495,7 +3495,7 @@ discard block |
||
| 3495 | 3495 | 'error' => false, |
| 3496 | 3496 | 'message' => '', |
| 3497 | 3497 | 'user_id' => $user_id, |
| 3498 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 3498 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 3499 | 3499 | 'debug' => $finished_steps.",".$nb_steps, |
| 3500 | 3500 | ), |
| 3501 | 3501 | 'encode' |
@@ -3559,7 +3559,7 @@ discard block |
||
| 3559 | 3559 | |
| 3560 | 3560 | // Get info about user |
| 3561 | 3561 | $data_user = DB::queryfirstrow( |
| 3562 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3562 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3563 | 3563 | WHERE id = %i', |
| 3564 | 3564 | $value[1] |
| 3565 | 3565 | ); |
@@ -3593,7 +3593,7 @@ discard block |
||
| 3593 | 3593 | logEvents( |
| 3594 | 3594 | $SETTINGS, |
| 3595 | 3595 | 'user_mngt', |
| 3596 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3596 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3597 | 3597 | (string) $session->get('user-id'), |
| 3598 | 3598 | $session->get('user-login'), |
| 3599 | 3599 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3627,7 +3627,7 @@ discard block |
||
| 3627 | 3627 | |
| 3628 | 3628 | // Get info about user |
| 3629 | 3629 | $data_user = DB::queryfirstrow( |
| 3630 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3630 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3631 | 3631 | WHERE id = %i', |
| 3632 | 3632 | $value[1] |
| 3633 | 3633 | ); |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | */ |
| 227 | 227 | function trimElement($chaine, string $element): string |
| 228 | 228 | { |
| 229 | - if (! empty($chaine)) { |
|
| 229 | + if (!empty($chaine)) { |
|
| 230 | 230 | if (is_array($chaine) === true) { |
| 231 | 231 | $chaine = implode(';', $chaine); |
| 232 | 232 | } |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | function db_error_handler(array $params): void |
| 276 | 276 | { |
| 277 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 278 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 277 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 278 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 279 | 279 | throw new Exception('Error - Query', 1); |
| 280 | 280 | } |
| 281 | 281 | |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | $globalsVisibleFolders = $session->get('user-accessible_folders'); |
| 356 | 356 | $globalsPersonalVisibleFolders = $session->get('user-personal_visible_folders'); |
| 357 | 357 | // Get list of Folders |
| 358 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 358 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 359 | 359 | foreach ($rows as $record) { |
| 360 | 360 | array_push($groupesVisibles, $record['id']); |
| 361 | 361 | } |
@@ -365,20 +365,20 @@ discard block |
||
| 365 | 365 | // get complete list of ROLES |
| 366 | 366 | $tmp = explode(';', $idFonctions); |
| 367 | 367 | $rows = DB::query( |
| 368 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 368 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 369 | 369 | ORDER BY title ASC' |
| 370 | 370 | ); |
| 371 | 371 | foreach ($rows as $record) { |
| 372 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 372 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 373 | 373 | array_push($tmp, $record['id']); |
| 374 | 374 | } |
| 375 | 375 | } |
| 376 | 376 | $session->set('user-roles', implode(';', $tmp)); |
| 377 | 377 | $session->set('user-admin', 1); |
| 378 | 378 | // Check if admin has created Folders and Roles |
| 379 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 379 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 380 | 380 | $session->set('user-nb_folders', DB::count()); |
| 381 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 381 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 382 | 382 | $session->set('user-nb_roles', DB::count()); |
| 383 | 383 | |
| 384 | 384 | return true; |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | // Does this user is allowed to see other items |
| 462 | 462 | $inc = 0; |
| 463 | 463 | $rows = DB::query( |
| 464 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 464 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 465 | 465 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 466 | 466 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 467 | 467 | $globalsUserId, |
@@ -478,8 +478,8 @@ discard block |
||
| 478 | 478 | // Check for the users roles if some specific rights exist on items |
| 479 | 479 | $rows = DB::query( |
| 480 | 480 | 'SELECT i.id_tree, r.item_id |
| 481 | - FROM ' . prefixTable('items') . ' as i |
|
| 482 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 481 | + FROM ' . prefixTable('items').' as i |
|
| 482 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 483 | 483 | WHERE i.id_tree <> "" '. |
| 484 | 484 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
| 485 | 485 | 'ORDER BY i.id_tree ASC', |
@@ -533,16 +533,16 @@ discard block |
||
| 533 | 533 | ), SORT_NUMERIC) |
| 534 | 534 | ); |
| 535 | 535 | // Folders and Roles numbers |
| 536 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 536 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 537 | 537 | $session->set('user-nb_folders', DB::count()); |
| 538 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 538 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 539 | 539 | $session->set('user-nb_roles', DB::count()); |
| 540 | 540 | // check if change proposals on User's items |
| 541 | 541 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 542 | 542 | $countNewItems = DB::query( |
| 543 | 543 | 'SELECT COUNT(*) |
| 544 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 545 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 544 | + FROM ' . prefixTable('items_change').' AS c |
|
| 545 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 546 | 546 | WHERE i.action = %s AND i.id_user = %i', |
| 547 | 547 | 'at_creation', |
| 548 | 548 | $globalsUserId |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | { |
| 570 | 570 | $rows = DB::query( |
| 571 | 571 | 'SELECT * |
| 572 | - FROM ' . prefixTable('roles_values') . ' |
|
| 572 | + FROM ' . prefixTable('roles_values').' |
|
| 573 | 573 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
| 574 | 574 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
| 575 | 575 | $userRoles, |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | ) { |
| 637 | 637 | $persoFld = DB::queryfirstrow( |
| 638 | 638 | 'SELECT id |
| 639 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 639 | + FROM ' . prefixTable('nested_tree').' |
|
| 640 | 640 | WHERE title = %s AND personal_folder = %i'. |
| 641 | 641 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 642 | 642 | $globalsUserId, |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | } |
| 670 | 670 | $persoFlds = DB::query( |
| 671 | 671 | 'SELECT id |
| 672 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 672 | + FROM ' . prefixTable('nested_tree').' |
|
| 673 | 673 | WHERE %l', |
| 674 | 674 | $where |
| 675 | 675 | ); |
@@ -737,12 +737,12 @@ discard block |
||
| 737 | 737 | //Load Tree |
| 738 | 738 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 739 | 739 | // truncate table |
| 740 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 740 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 741 | 741 | // reload date |
| 742 | 742 | $rows = DB::query( |
| 743 | 743 | 'SELECT * |
| 744 | - FROM ' . prefixTable('items') . ' as i |
|
| 745 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 744 | + FROM ' . prefixTable('items').' as i |
|
| 745 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 746 | 746 | AND l.action = %s |
| 747 | 747 | AND i.inactif = %i', |
| 748 | 748 | 'at_creation', |
@@ -754,18 +754,18 @@ discard block |
||
| 754 | 754 | $tags = ''; |
| 755 | 755 | $itemTags = DB::query( |
| 756 | 756 | 'SELECT tag |
| 757 | - FROM ' . prefixTable('tags') . ' |
|
| 757 | + FROM ' . prefixTable('tags').' |
|
| 758 | 758 | WHERE item_id = %i AND tag != ""', |
| 759 | 759 | $record['id'] |
| 760 | 760 | ); |
| 761 | 761 | foreach ($itemTags as $itemTag) { |
| 762 | - $tags .= $itemTag['tag'] . ' '; |
|
| 762 | + $tags .= $itemTag['tag'].' '; |
|
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | // Get renewal period |
| 766 | 766 | $resNT = DB::queryfirstrow( |
| 767 | 767 | 'SELECT renewal_period |
| 768 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 768 | + FROM ' . prefixTable('nested_tree').' |
|
| 769 | 769 | WHERE id = %i', |
| 770 | 770 | $record['id_tree'] |
| 771 | 771 | ); |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | // Is this a User id? |
| 779 | 779 | $user = DB::queryfirstrow( |
| 780 | 780 | 'SELECT id, login |
| 781 | - FROM ' . prefixTable('users') . ' |
|
| 781 | + FROM ' . prefixTable('users').' |
|
| 782 | 782 | WHERE id = %i', |
| 783 | 783 | $elem->title |
| 784 | 784 | ); |
@@ -796,11 +796,11 @@ discard block |
||
| 796 | 796 | 'id' => $record['id'], |
| 797 | 797 | 'label' => $record['label'], |
| 798 | 798 | 'description' => $record['description'] ?? '', |
| 799 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 799 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 800 | 800 | 'tags' => $tags, |
| 801 | 801 | 'id_tree' => $record['id_tree'], |
| 802 | 802 | 'perso' => $record['perso'], |
| 803 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 803 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 804 | 804 | 'login' => $record['login'] ?? '', |
| 805 | 805 | 'folder' => implode(' > ', $folder), |
| 806 | 806 | 'author' => $record['id_user'], |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | // get new value from db |
| 830 | 830 | $data = DB::queryfirstrow( |
| 831 | 831 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 832 | - FROM ' . prefixTable('items') . ' |
|
| 832 | + FROM ' . prefixTable('items').' |
|
| 833 | 833 | WHERE id=%i', |
| 834 | 834 | $ident |
| 835 | 835 | ); |
@@ -837,12 +837,12 @@ discard block |
||
| 837 | 837 | $tags = ''; |
| 838 | 838 | $itemTags = DB::query( |
| 839 | 839 | 'SELECT tag |
| 840 | - FROM ' . prefixTable('tags') . ' |
|
| 840 | + FROM ' . prefixTable('tags').' |
|
| 841 | 841 | WHERE item_id = %i AND tag != ""', |
| 842 | 842 | $ident |
| 843 | 843 | ); |
| 844 | 844 | foreach ($itemTags as $itemTag) { |
| 845 | - $tags .= $itemTag['tag'] . ' '; |
|
| 845 | + $tags .= $itemTag['tag'].' '; |
|
| 846 | 846 | } |
| 847 | 847 | // form id_tree to full foldername |
| 848 | 848 | $folder = []; |
@@ -853,7 +853,7 @@ discard block |
||
| 853 | 853 | // Is this a User id? |
| 854 | 854 | $user = DB::queryfirstrow( |
| 855 | 855 | 'SELECT id, login |
| 856 | - FROM ' . prefixTable('users') . ' |
|
| 856 | + FROM ' . prefixTable('users').' |
|
| 857 | 857 | WHERE id = %i', |
| 858 | 858 | $elem->title |
| 859 | 859 | ); |
@@ -871,10 +871,10 @@ discard block |
||
| 871 | 871 | 'label' => $data['label'], |
| 872 | 872 | 'description' => $data['description'], |
| 873 | 873 | 'tags' => $tags, |
| 874 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 874 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 875 | 875 | 'id_tree' => $data['id_tree'], |
| 876 | 876 | 'perso' => $data['perso'], |
| 877 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 877 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 878 | 878 | 'login' => $data['login'] ?? '', |
| 879 | 879 | 'folder' => implode(' » ', $folder), |
| 880 | 880 | 'author' => $session->get('user-id'), |
@@ -904,8 +904,8 @@ discard block |
||
| 904 | 904 | // get new value from db |
| 905 | 905 | $data = DB::queryFirstRow( |
| 906 | 906 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 907 | - FROM ' . prefixTable('items') . ' as i |
|
| 908 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 907 | + FROM ' . prefixTable('items').' as i |
|
| 908 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 909 | 909 | WHERE i.id = %i |
| 910 | 910 | AND l.action = %s', |
| 911 | 911 | $ident, |
@@ -915,12 +915,12 @@ discard block |
||
| 915 | 915 | $tags = ''; |
| 916 | 916 | $itemTags = DB::query( |
| 917 | 917 | 'SELECT tag |
| 918 | - FROM ' . prefixTable('tags') . ' |
|
| 918 | + FROM ' . prefixTable('tags').' |
|
| 919 | 919 | WHERE item_id = %i AND tag != ""', |
| 920 | 920 | $ident |
| 921 | 921 | ); |
| 922 | 922 | foreach ($itemTags as $itemTag) { |
| 923 | - $tags .= $itemTag['tag'] . ' '; |
|
| 923 | + $tags .= $itemTag['tag'].' '; |
|
| 924 | 924 | } |
| 925 | 925 | // form id_tree to full foldername |
| 926 | 926 | $folder = []; |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | // Is this a User id? |
| 932 | 932 | $user = DB::queryfirstrow( |
| 933 | 933 | 'SELECT id, login |
| 934 | - FROM ' . prefixTable('users') . ' |
|
| 934 | + FROM ' . prefixTable('users').' |
|
| 935 | 935 | WHERE id = %i', |
| 936 | 936 | $elem->title |
| 937 | 937 | ); |
@@ -950,7 +950,7 @@ discard block |
||
| 950 | 950 | 'label' => $data['label'], |
| 951 | 951 | 'description' => $data['description'], |
| 952 | 952 | 'tags' => isset($tags) && empty($tags) === false ? $tags : 'None', |
| 953 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 953 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 954 | 954 | 'id_tree' => $data['id_tree'], |
| 955 | 955 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 956 | 956 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -972,53 +972,53 @@ discard block |
||
| 972 | 972 | function getStatisticsData(array $SETTINGS): array |
| 973 | 973 | { |
| 974 | 974 | DB::query( |
| 975 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 975 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 976 | 976 | 0 |
| 977 | 977 | ); |
| 978 | 978 | $counter_folders = DB::count(); |
| 979 | 979 | DB::query( |
| 980 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 980 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 981 | 981 | 1 |
| 982 | 982 | ); |
| 983 | 983 | $counter_folders_perso = DB::count(); |
| 984 | 984 | DB::query( |
| 985 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 985 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 986 | 986 | 0 |
| 987 | 987 | ); |
| 988 | 988 | $counter_items = DB::count(); |
| 989 | 989 | DB::query( |
| 990 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 990 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 991 | 991 | 1 |
| 992 | 992 | ); |
| 993 | 993 | $counter_items_perso = DB::count(); |
| 994 | 994 | DB::query( |
| 995 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
| 995 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
| 996 | 996 | 'OTV', 'TP', 'API' |
| 997 | 997 | ); |
| 998 | 998 | $counter_users = DB::count(); |
| 999 | 999 | DB::query( |
| 1000 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 1000 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 1001 | 1001 | 1 |
| 1002 | 1002 | ); |
| 1003 | 1003 | $admins = DB::count(); |
| 1004 | 1004 | DB::query( |
| 1005 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 1005 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 1006 | 1006 | 1 |
| 1007 | 1007 | ); |
| 1008 | 1008 | $managers = DB::count(); |
| 1009 | 1009 | DB::query( |
| 1010 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 1010 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 1011 | 1011 | 1 |
| 1012 | 1012 | ); |
| 1013 | 1013 | $readOnly = DB::count(); |
| 1014 | 1014 | // list the languages |
| 1015 | 1015 | $usedLang = []; |
| 1016 | 1016 | $tp_languages = DB::query( |
| 1017 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 1017 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 1018 | 1018 | ); |
| 1019 | 1019 | foreach ($tp_languages as $tp_language) { |
| 1020 | 1020 | DB::query( |
| 1021 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 1021 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 1022 | 1022 | $tp_language['name'] |
| 1023 | 1023 | ); |
| 1024 | 1024 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1027,12 +1027,12 @@ discard block |
||
| 1027 | 1027 | // get list of ips |
| 1028 | 1028 | $usedIp = []; |
| 1029 | 1029 | $tp_ips = DB::query( |
| 1030 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 1030 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 1031 | 1031 | ); |
| 1032 | 1032 | foreach ($tp_ips as $ip) { |
| 1033 | 1033 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 1034 | 1034 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 1035 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1035 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1036 | 1036 | $usedIp[$ip['user_ip']] = 1; |
| 1037 | 1037 | } |
| 1038 | 1038 | } |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
| 1128 | 1128 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
| 1129 | 1129 | <br><div style="float:right;">' . |
| 1130 | - $textMail . |
|
| 1130 | + $textMail. |
|
| 1131 | 1131 | '<br><br></td></tr></table> |
| 1132 | 1132 | </td></tr></table> |
| 1133 | 1133 | <br></body></html>'; |
@@ -1208,7 +1208,7 @@ discard block |
||
| 1208 | 1208 | { |
| 1209 | 1209 | array_walk_recursive( |
| 1210 | 1210 | $array, |
| 1211 | - static function (&$item): void { |
|
| 1211 | + static function(&$item): void { |
|
| 1212 | 1212 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1213 | 1213 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
| 1214 | 1214 | } |
@@ -1318,7 +1318,7 @@ discard block |
||
| 1318 | 1318 | */ |
| 1319 | 1319 | function prefixTable(string $table): string |
| 1320 | 1320 | { |
| 1321 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1321 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1322 | 1322 | if (empty($safeTable) === false) { |
| 1323 | 1323 | // sanitize string |
| 1324 | 1324 | return $safeTable; |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1441 | 1441 | { |
| 1442 | 1442 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1443 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1443 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1444 | 1444 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1445 | 1445 | socket_close($sock); |
| 1446 | 1446 | } |
@@ -1487,14 +1487,14 @@ discard block |
||
| 1487 | 1487 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1488 | 1488 | if ($type === 'user_mngt') { |
| 1489 | 1489 | send_syslog( |
| 1490 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1490 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1491 | 1491 | $SETTINGS['syslog_host'], |
| 1492 | 1492 | $SETTINGS['syslog_port'], |
| 1493 | 1493 | 'teampass' |
| 1494 | 1494 | ); |
| 1495 | 1495 | } else { |
| 1496 | 1496 | send_syslog( |
| 1497 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1497 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1498 | 1498 | $SETTINGS['syslog_host'], |
| 1499 | 1499 | $SETTINGS['syslog_port'], |
| 1500 | 1500 | 'teampass' |
@@ -1569,7 +1569,7 @@ discard block |
||
| 1569 | 1569 | if (empty($item_label) === true) { |
| 1570 | 1570 | $dataItem = DB::queryfirstrow( |
| 1571 | 1571 | 'SELECT id, id_tree, label |
| 1572 | - FROM ' . prefixTable('items') . ' |
|
| 1572 | + FROM ' . prefixTable('items').' |
|
| 1573 | 1573 | WHERE id = %i', |
| 1574 | 1574 | $item_id |
| 1575 | 1575 | ); |
@@ -1577,11 +1577,11 @@ discard block |
||
| 1577 | 1577 | } |
| 1578 | 1578 | |
| 1579 | 1579 | send_syslog( |
| 1580 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1581 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1582 | - ' itemno=' . $item_id . |
|
| 1583 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
| 1584 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1580 | + 'action='.str_replace('at_', '', $action). |
|
| 1581 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1582 | + ' itemno='.$item_id. |
|
| 1583 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
| 1584 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1585 | 1585 | $SETTINGS['syslog_host'], |
| 1586 | 1586 | $SETTINGS['syslog_port'], |
| 1587 | 1587 | 'teampass' |
@@ -1613,8 +1613,8 @@ discard block |
||
| 1613 | 1613 | $notification = DB::queryOneColumn( |
| 1614 | 1614 | 'email', |
| 1615 | 1615 | 'SELECT * |
| 1616 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1617 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1616 | + FROM ' . prefixTable('notification').' AS n |
|
| 1617 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1618 | 1618 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1619 | 1619 | $item_id, |
| 1620 | 1620 | $globalsUserId |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | // Get list of changes |
| 1626 | 1626 | $htmlChanges = '<ul>'; |
| 1627 | 1627 | foreach ($changes as $change) { |
| 1628 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1628 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1629 | 1629 | } |
| 1630 | 1630 | $htmlChanges .= '</ul>'; |
| 1631 | 1631 | // send email |
@@ -1662,15 +1662,15 @@ discard block |
||
| 1662 | 1662 | $path = ''; |
| 1663 | 1663 | foreach ($arbo as $elem) { |
| 1664 | 1664 | if (empty($path) === true) { |
| 1665 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1665 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1666 | 1666 | } else { |
| 1667 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1667 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1668 | 1668 | } |
| 1669 | 1669 | } |
| 1670 | 1670 | |
| 1671 | 1671 | // Build text to show user |
| 1672 | 1672 | if (empty($label) === false) { |
| 1673 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1673 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1674 | 1674 | } |
| 1675 | 1675 | return empty($path) === true ? '' : $path; |
| 1676 | 1676 | } |
@@ -1726,7 +1726,7 @@ discard block |
||
| 1726 | 1726 | { |
| 1727 | 1727 | // Perform a copy if the file exists |
| 1728 | 1728 | if (file_exists($configFilePath)) { |
| 1729 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
| 1729 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
| 1730 | 1730 | if (!copy($configFilePath, $backupFilePath)) { |
| 1731 | 1731 | return "ERROR: Could not copy file '$configFilePath'"; |
| 1732 | 1732 | } |
@@ -1734,10 +1734,10 @@ discard block |
||
| 1734 | 1734 | |
| 1735 | 1735 | // Regenerate the config file |
| 1736 | 1736 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
| 1737 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
| 1737 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
| 1738 | 1738 | foreach ($rows as $record) { |
| 1739 | 1739 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
| 1740 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
| 1740 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
| 1741 | 1741 | } |
| 1742 | 1742 | $data[] = ");\n"; |
| 1743 | 1743 | $data = array_unique($data); |
@@ -1782,7 +1782,7 @@ discard block |
||
| 1782 | 1782 | { |
| 1783 | 1783 | global $SETTINGS; |
| 1784 | 1784 | /* LOAD CPASSMAN SETTINGS */ |
| 1785 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1785 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1786 | 1786 | $SETTINGS = []; |
| 1787 | 1787 | $SETTINGS['duplicate_folder'] = 0; |
| 1788 | 1788 | //by default, this is set to 0; |
@@ -1792,7 +1792,7 @@ discard block |
||
| 1792 | 1792 | //by default, this value is set to 5; |
| 1793 | 1793 | $settings = []; |
| 1794 | 1794 | $rows = DB::query( |
| 1795 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1795 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1796 | 1796 | [ |
| 1797 | 1797 | 'type' => 'admin', |
| 1798 | 1798 | 'type2' => 'settings', |
@@ -1824,7 +1824,7 @@ discard block |
||
| 1824 | 1824 | $source_cf = []; |
| 1825 | 1825 | $rows = DB::QUERY( |
| 1826 | 1826 | 'SELECT id_category |
| 1827 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1827 | + FROM ' . prefixTable('categories_folders').' |
|
| 1828 | 1828 | WHERE id_folder = %i', |
| 1829 | 1829 | $source_id |
| 1830 | 1830 | ); |
@@ -1835,7 +1835,7 @@ discard block |
||
| 1835 | 1835 | $target_cf = []; |
| 1836 | 1836 | $rows = DB::QUERY( |
| 1837 | 1837 | 'SELECT id_category |
| 1838 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1838 | + FROM ' . prefixTable('categories_folders').' |
|
| 1839 | 1839 | WHERE id_folder = %i', |
| 1840 | 1840 | $target_id |
| 1841 | 1841 | ); |
@@ -2054,7 +2054,7 @@ discard block |
||
| 2054 | 2054 | ) { |
| 2055 | 2055 | // Check if the path exists |
| 2056 | 2056 | $path = basename($path); |
| 2057 | - if (! file_exists($path)) { |
|
| 2057 | + if (!file_exists($path)) { |
|
| 2058 | 2058 | return false; |
| 2059 | 2059 | } |
| 2060 | 2060 | |
@@ -2107,7 +2107,7 @@ discard block |
||
| 2107 | 2107 | // Load item data |
| 2108 | 2108 | $data = DB::queryFirstRow( |
| 2109 | 2109 | 'SELECT id_tree |
| 2110 | - FROM ' . prefixTable('items') . ' |
|
| 2110 | + FROM ' . prefixTable('items').' |
|
| 2111 | 2111 | WHERE id = %i', |
| 2112 | 2112 | $item_id |
| 2113 | 2113 | ); |
@@ -2170,7 +2170,7 @@ discard block |
||
| 2170 | 2170 | } |
| 2171 | 2171 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2172 | 2172 | } |
| 2173 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2173 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2174 | 2174 | return $email; |
| 2175 | 2175 | } |
| 2176 | 2176 | |
@@ -2193,7 +2193,7 @@ discard block |
||
| 2193 | 2193 | |
| 2194 | 2194 | // Insert log in DB |
| 2195 | 2195 | return DB::query( |
| 2196 | - 'SELECT ' . $fields . ' |
|
| 2196 | + 'SELECT '.$fields.' |
|
| 2197 | 2197 | FROM ' . prefixTable($table) |
| 2198 | 2198 | ); |
| 2199 | 2199 | } |
@@ -2208,11 +2208,11 @@ discard block |
||
| 2208 | 2208 | function formatSizeUnits(int $bytes): string |
| 2209 | 2209 | { |
| 2210 | 2210 | if ($bytes >= 1073741824) { |
| 2211 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2211 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2212 | 2212 | } elseif ($bytes >= 1048576) { |
| 2213 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2213 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2214 | 2214 | } elseif ($bytes >= 1024) { |
| 2215 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2215 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2216 | 2216 | } elseif ($bytes > 1) { |
| 2217 | 2217 | $bytes .= ' bytes'; |
| 2218 | 2218 | } elseif ($bytes === 1) { |
@@ -2457,7 +2457,7 @@ discard block |
||
| 2457 | 2457 | $cipher->enableContinuousBuffer(); |
| 2458 | 2458 | |
| 2459 | 2459 | // Encrypt the file content |
| 2460 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
| 2460 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
| 2461 | 2461 | $fileContent = file_get_contents($filePath); |
| 2462 | 2462 | $plaintext = $fileContent; |
| 2463 | 2463 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2465,9 +2465,9 @@ discard block |
||
| 2465 | 2465 | // Save new file |
| 2466 | 2466 | // deepcode ignore InsecureHash: is simply used to get a unique name |
| 2467 | 2467 | $hash = md5($plaintext); |
| 2468 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2468 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2469 | 2469 | file_put_contents($fileOut, $ciphertext); |
| 2470 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2470 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2471 | 2471 | return [ |
| 2472 | 2472 | 'fileHash' => base64_encode($hash), |
| 2473 | 2473 | 'objectKey' => base64_encode($objectKey), |
@@ -2483,9 +2483,9 @@ discard block |
||
| 2483 | 2483 | * |
| 2484 | 2484 | * @return string|array |
| 2485 | 2485 | */ |
| 2486 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
| 2486 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
| 2487 | 2487 | { |
| 2488 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2488 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2489 | 2489 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2490 | 2490 | } |
| 2491 | 2491 | |
@@ -2502,7 +2502,7 @@ discard block |
||
| 2502 | 2502 | $cipher->enableContinuousBuffer(); |
| 2503 | 2503 | $cipher->disablePadding(); |
| 2504 | 2504 | // Get file content |
| 2505 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
| 2505 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
| 2506 | 2506 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
| 2507 | 2507 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
| 2508 | 2508 | } else { |
@@ -2596,8 +2596,8 @@ discard block |
||
| 2596 | 2596 | // Only create the sharekey for a user |
| 2597 | 2597 | $user = DB::queryFirstRow( |
| 2598 | 2598 | 'SELECT public_key |
| 2599 | - FROM ' . prefixTable('users') . ' |
|
| 2600 | - WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . ' |
|
| 2599 | + FROM ' . prefixTable('users').' |
|
| 2600 | + WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).' |
|
| 2601 | 2601 | AND public_key != ""' |
| 2602 | 2602 | ); |
| 2603 | 2603 | |
@@ -2633,17 +2633,16 @@ discard block |
||
| 2633 | 2633 | //DB::debugmode(true); |
| 2634 | 2634 | $users = DB::query( |
| 2635 | 2635 | 'SELECT id, public_key |
| 2636 | - FROM ' . prefixTable('users') . ' |
|
| 2636 | + FROM ' . prefixTable('users').' |
|
| 2637 | 2637 | WHERE ' . ($onlyForUser === true ? |
| 2638 | - 'id IN ("' . TP_USER_ID . '","' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . '") ' : |
|
| 2639 | - 'id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ') . ' |
|
| 2638 | + 'id IN ("'.TP_USER_ID.'","'.($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).'") ' : 'id NOT IN ("'.OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ').' |
|
| 2640 | 2639 | AND public_key != ""' |
| 2641 | 2640 | ); |
| 2642 | 2641 | //DB::debugmode(false); |
| 2643 | 2642 | foreach ($users as $user) { |
| 2644 | 2643 | // Insert in DB the new object key for this item by user |
| 2645 | 2644 | if (count($objectKeyArray) === 0) { |
| 2646 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2645 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
| 2647 | 2646 | DB::insert( |
| 2648 | 2647 | $object_name, |
| 2649 | 2648 | [ |
@@ -2657,7 +2656,7 @@ discard block |
||
| 2657 | 2656 | ); |
| 2658 | 2657 | } else { |
| 2659 | 2658 | foreach ($objectKeyArray as $object) { |
| 2660 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2659 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
| 2661 | 2660 | DB::insert( |
| 2662 | 2661 | $object_name, |
| 2663 | 2662 | [ |
@@ -2685,7 +2684,7 @@ discard block |
||
| 2685 | 2684 | function isBase64(string $str): bool |
| 2686 | 2685 | { |
| 2687 | 2686 | $str = (string) trim($str); |
| 2688 | - if (! isset($str[0])) { |
|
| 2687 | + if (!isset($str[0])) { |
|
| 2689 | 2688 | return false; |
| 2690 | 2689 | } |
| 2691 | 2690 | |
@@ -2759,7 +2758,7 @@ discard block |
||
| 2759 | 2758 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2760 | 2759 | $error = $e->getDetailedError(); |
| 2761 | 2760 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2762 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2761 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2763 | 2762 | } |
| 2764 | 2763 | // deepcode ignore ServerLeak: No important data is sent |
| 2765 | 2764 | echo 'An error occurred.'; |
@@ -2776,7 +2775,7 @@ discard block |
||
| 2776 | 2775 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2777 | 2776 | $error = $e->getDetailedError(); |
| 2778 | 2777 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2779 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2778 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2780 | 2779 | } |
| 2781 | 2780 | // deepcode ignore ServerLeak: No important data is sent |
| 2782 | 2781 | echo 'An error occurred.'; |
@@ -2803,7 +2802,7 @@ discard block |
||
| 2803 | 2802 | // expect if personal item |
| 2804 | 2803 | DB::delete( |
| 2805 | 2804 | prefixTable('sharekeys_items'), |
| 2806 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2805 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2807 | 2806 | $userId |
| 2808 | 2807 | ); |
| 2809 | 2808 | // Remove all item sharekeys files |
@@ -2811,8 +2810,8 @@ discard block |
||
| 2811 | 2810 | prefixTable('sharekeys_files'), |
| 2812 | 2811 | 'user_id = %i AND object_id NOT IN ( |
| 2813 | 2812 | SELECT f.id |
| 2814 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2815 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
| 2813 | + FROM ' . prefixTable('items').' AS i |
|
| 2814 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
| 2816 | 2815 | WHERE i.perso = 1 |
| 2817 | 2816 | )', |
| 2818 | 2817 | $userId |
@@ -2822,8 +2821,8 @@ discard block |
||
| 2822 | 2821 | prefixTable('sharekeys_fields'), |
| 2823 | 2822 | 'user_id = %i AND object_id NOT IN ( |
| 2824 | 2823 | SELECT c.id |
| 2825 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2826 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
| 2824 | + FROM ' . prefixTable('items').' AS i |
|
| 2825 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
| 2827 | 2826 | WHERE i.perso = 1 |
| 2828 | 2827 | )', |
| 2829 | 2828 | $userId |
@@ -2831,13 +2830,13 @@ discard block |
||
| 2831 | 2830 | // Remove all item sharekeys logs |
| 2832 | 2831 | DB::delete( |
| 2833 | 2832 | prefixTable('sharekeys_logs'), |
| 2834 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2833 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2835 | 2834 | $userId |
| 2836 | 2835 | ); |
| 2837 | 2836 | // Remove all item sharekeys suggestions |
| 2838 | 2837 | DB::delete( |
| 2839 | 2838 | prefixTable('sharekeys_suggestions'), |
| 2840 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2839 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2841 | 2840 | $userId |
| 2842 | 2841 | ); |
| 2843 | 2842 | return false; |
@@ -2858,7 +2857,7 @@ discard block |
||
| 2858 | 2857 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 2859 | 2858 | $now->setTimezone(new DateTimeZone($timezone)); |
| 2860 | 2859 | $offsets[] = $offset = $now->getOffset(); |
| 2861 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 2860 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 2862 | 2861 | } |
| 2863 | 2862 | |
| 2864 | 2863 | array_multisort($offsets, $timezones); |
@@ -2878,7 +2877,7 @@ discard block |
||
| 2878 | 2877 | { |
| 2879 | 2878 | $hours = intval($offset / 3600); |
| 2880 | 2879 | $minutes = abs(intval($offset % 3600 / 60)); |
| 2881 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2880 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2882 | 2881 | } |
| 2883 | 2882 | |
| 2884 | 2883 | /** |
@@ -2978,8 +2977,7 @@ discard block |
||
| 2978 | 2977 | { |
| 2979 | 2978 | if (isset($array[$key]) === true |
| 2980 | 2979 | && (is_int($value) === true ? |
| 2981 | - (int) $array[$key] === $value : |
|
| 2982 | - (string) $array[$key] === $value) |
|
| 2980 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 2983 | 2981 | ) { |
| 2984 | 2982 | return true; |
| 2985 | 2983 | } |
@@ -3001,8 +2999,7 @@ discard block |
||
| 3001 | 2999 | { |
| 3002 | 3000 | if (isset($var) === false |
| 3003 | 3001 | || (is_int($value) === true ? |
| 3004 | - (int) $var === $value : |
|
| 3005 | - (string) $var === $value) |
|
| 3002 | + (int) $var === $value : (string) $var === $value) |
|
| 3006 | 3003 | ) { |
| 3007 | 3004 | return true; |
| 3008 | 3005 | } |
@@ -3053,7 +3050,7 @@ discard block |
||
| 3053 | 3050 | */ |
| 3054 | 3051 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3055 | 3052 | { |
| 3056 | - foreach($arrayOfValues as $value) { |
|
| 3053 | + foreach ($arrayOfValues as $value) { |
|
| 3057 | 3054 | if (isset($value) === false) { |
| 3058 | 3055 | return false; |
| 3059 | 3056 | } |
@@ -3075,7 +3072,7 @@ discard block |
||
| 3075 | 3072 | /*PHP8 - integer|string*/$value |
| 3076 | 3073 | ) : bool |
| 3077 | 3074 | { |
| 3078 | - foreach($arrayOfVars as $variable) { |
|
| 3075 | + foreach ($arrayOfVars as $variable) { |
|
| 3079 | 3076 | if ($variable !== $value) { |
| 3080 | 3077 | return false; |
| 3081 | 3078 | } |
@@ -3095,7 +3092,7 @@ discard block |
||
| 3095 | 3092 | /*PHP8 - integer|string*/$value |
| 3096 | 3093 | ) : bool |
| 3097 | 3094 | { |
| 3098 | - foreach($arrayOfVars as $variable) { |
|
| 3095 | + foreach ($arrayOfVars as $variable) { |
|
| 3099 | 3096 | if ($variable === $value) { |
| 3100 | 3097 | return true; |
| 3101 | 3098 | } |
@@ -3164,7 +3161,7 @@ discard block |
||
| 3164 | 3161 | * @param array $filters |
| 3165 | 3162 | * @return array|string |
| 3166 | 3163 | */ |
| 3167 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3164 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3168 | 3165 | { |
| 3169 | 3166 | // Load Sanitizer library |
| 3170 | 3167 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3193,7 +3190,7 @@ discard block |
||
| 3193 | 3190 | // Exists ? |
| 3194 | 3191 | $userCacheId = DB::queryfirstrow( |
| 3195 | 3192 | 'SELECT increment_id |
| 3196 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3193 | + FROM ' . prefixTable('cache_tree').' |
|
| 3197 | 3194 | WHERE user_id = %i', |
| 3198 | 3195 | $user_id |
| 3199 | 3196 | ); |
@@ -3244,7 +3241,7 @@ discard block |
||
| 3244 | 3241 | */ |
| 3245 | 3242 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3246 | 3243 | { |
| 3247 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3244 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3248 | 3245 | return round($resultat); |
| 3249 | 3246 | } |
| 3250 | 3247 | |
@@ -3274,7 +3271,7 @@ discard block |
||
| 3274 | 3271 | |
| 3275 | 3272 | // Get last folder update |
| 3276 | 3273 | $lastFolderChange = DB::queryfirstrow( |
| 3277 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3274 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3278 | 3275 | WHERE type = %s AND intitule = %s', |
| 3279 | 3276 | 'timestamp', |
| 3280 | 3277 | 'last_folder_change' |
@@ -3305,7 +3302,7 @@ discard block |
||
| 3305 | 3302 | // Does this user has a tree cache |
| 3306 | 3303 | $userCacheTree = DB::queryfirstrow( |
| 3307 | 3304 | 'SELECT '.$fieldName.' |
| 3308 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3305 | + FROM ' . prefixTable('cache_tree').' |
|
| 3309 | 3306 | WHERE user_id = %i', |
| 3310 | 3307 | $session->get('user-id') |
| 3311 | 3308 | ); |
@@ -3348,7 +3345,7 @@ discard block |
||
| 3348 | 3345 | if (count($folderIds) === 0) { |
| 3349 | 3346 | $folderIds = DB::queryFirstColumn( |
| 3350 | 3347 | 'SELECT id |
| 3351 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3348 | + FROM ' . prefixTable('nested_tree').' |
|
| 3352 | 3349 | WHERE personal_folder=%i', |
| 3353 | 3350 | 0 |
| 3354 | 3351 | ); |
@@ -3365,8 +3362,8 @@ discard block |
||
| 3365 | 3362 | $rows_tmp = DB::query( |
| 3366 | 3363 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3367 | 3364 | f.id_category AS category_id |
| 3368 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3369 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3365 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3366 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3370 | 3367 | WHERE id_folder=%i', |
| 3371 | 3368 | $folder |
| 3372 | 3369 | ); |
@@ -3392,7 +3389,7 @@ discard block |
||
| 3392 | 3389 | $valTemp = ''; |
| 3393 | 3390 | $data = DB::queryFirstRow( |
| 3394 | 3391 | 'SELECT valeur |
| 3395 | - FROM ' . prefixTable('misc') . ' |
|
| 3392 | + FROM ' . prefixTable('misc').' |
|
| 3396 | 3393 | WHERE type = %s AND intitule=%i', |
| 3397 | 3394 | 'complex', |
| 3398 | 3395 | $folder |
@@ -3409,14 +3406,14 @@ discard block |
||
| 3409 | 3406 | $valTemp = ''; |
| 3410 | 3407 | $rows_tmp = DB::query( |
| 3411 | 3408 | 'SELECT t.title |
| 3412 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3413 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3409 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3410 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3414 | 3411 | WHERE v.folder_id = %i |
| 3415 | 3412 | GROUP BY title', |
| 3416 | 3413 | $folder |
| 3417 | 3414 | ); |
| 3418 | 3415 | foreach ($rows_tmp as $record) { |
| 3419 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3416 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3420 | 3417 | } |
| 3421 | 3418 | $arr_data['visibilityRoles'] = $valTemp; |
| 3422 | 3419 | |
@@ -3449,7 +3446,7 @@ discard block |
||
| 3449 | 3446 | // loop on users and check if user has this role |
| 3450 | 3447 | $rows = DB::query( |
| 3451 | 3448 | 'SELECT id, fonction_id |
| 3452 | - FROM ' . prefixTable('users') . ' |
|
| 3449 | + FROM ' . prefixTable('users').' |
|
| 3453 | 3450 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3454 | 3451 | $session->get('user-id') |
| 3455 | 3452 | ); |
@@ -3481,7 +3478,7 @@ discard block |
||
| 3481 | 3478 | |
| 3482 | 3479 | $val = DB::queryfirstrow( |
| 3483 | 3480 | 'SELECT * |
| 3484 | - FROM ' . prefixTable('users') . ' |
|
| 3481 | + FROM ' . prefixTable('users').' |
|
| 3485 | 3482 | WHERE id = %i', |
| 3486 | 3483 | $userId |
| 3487 | 3484 | ); |
@@ -3497,12 +3494,12 @@ discard block |
||
| 3497 | 3494 | function upgradeRequired(): bool |
| 3498 | 3495 | { |
| 3499 | 3496 | // Get settings.php |
| 3500 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3497 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3501 | 3498 | |
| 3502 | 3499 | // Get timestamp in DB |
| 3503 | 3500 | $val = DB::queryfirstrow( |
| 3504 | 3501 | 'SELECT valeur |
| 3505 | - FROM ' . prefixTable('misc') . ' |
|
| 3502 | + FROM ' . prefixTable('misc').' |
|
| 3506 | 3503 | WHERE type = %s AND intitule = %s', |
| 3507 | 3504 | 'admin', |
| 3508 | 3505 | 'upgrade_timestamp' |
@@ -3553,7 +3550,7 @@ discard block |
||
| 3553 | 3550 | // prepapre background tasks for item keys generation |
| 3554 | 3551 | $userTP = DB::queryFirstRow( |
| 3555 | 3552 | 'SELECT pw, public_key, private_key |
| 3556 | - FROM ' . prefixTable('users') . ' |
|
| 3553 | + FROM ' . prefixTable('users').' |
|
| 3557 | 3554 | WHERE id = %i', |
| 3558 | 3555 | TP_USER_ID |
| 3559 | 3556 | ); |
@@ -3614,7 +3611,7 @@ discard block |
||
| 3614 | 3611 | } |
| 3615 | 3612 | |
| 3616 | 3613 | // Generate new keys |
| 3617 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3614 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3618 | 3615 | $userKeys = [ |
| 3619 | 3616 | 'public_key' => $recovery_public_key, |
| 3620 | 3617 | 'private_key_clear' => $recovery_private_key, |
@@ -3654,8 +3651,8 @@ discard block |
||
| 3654 | 3651 | 'process_type' => 'create_user_keys', |
| 3655 | 3652 | 'arguments' => json_encode([ |
| 3656 | 3653 | 'new_user_id' => (int) $userId, |
| 3657 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3658 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3654 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3655 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3659 | 3656 | 'owner_id' => (int) TP_USER_ID, |
| 3660 | 3657 | 'creator_pwd' => $userTP['pw'], |
| 3661 | 3658 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3945,7 +3942,7 @@ discard block |
||
| 3945 | 3942 | */ |
| 3946 | 3943 | function createTaskForItem( |
| 3947 | 3944 | string $processType, |
| 3948 | - string|array $taskName, |
|
| 3945 | + string | array $taskName, |
|
| 3949 | 3946 | int $itemId, |
| 3950 | 3947 | int $userId, |
| 3951 | 3948 | string $objectKey, |
@@ -3969,7 +3966,7 @@ discard block |
||
| 3969 | 3966 | 'object_key' => $objectKey, |
| 3970 | 3967 | 'author' => (int) $userId, |
| 3971 | 3968 | ]), |
| 3972 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 3969 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 3973 | 3970 | ) |
| 3974 | 3971 | ); |
| 3975 | 3972 | $processId = DB::insertId(); |
@@ -3979,7 +3976,7 @@ discard block |
||
| 3979 | 3976 | if (is_array($taskName) === false) { |
| 3980 | 3977 | $taskName = [$taskName]; |
| 3981 | 3978 | } |
| 3982 | - foreach($taskName as $task) { |
|
| 3979 | + foreach ($taskName as $task) { |
|
| 3983 | 3980 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 3984 | 3981 | switch ($task) { |
| 3985 | 3982 | case 'item_password': |
@@ -4076,7 +4073,7 @@ discard block |
||
| 4076 | 4073 | * @param integer $user_id |
| 4077 | 4074 | * @return void |
| 4078 | 4075 | */ |
| 4079 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4076 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4080 | 4077 | { |
| 4081 | 4078 | if ($allUsers === true) { |
| 4082 | 4079 | // Load class DB |
@@ -4086,7 +4083,7 @@ discard block |
||
| 4086 | 4083 | |
| 4087 | 4084 | $users = DB::query( |
| 4088 | 4085 | 'SELECT id |
| 4089 | - FROM ' . prefixTable('users') . ' |
|
| 4086 | + FROM ' . prefixTable('users').' |
|
| 4090 | 4087 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4091 | 4088 | ORDER BY login ASC' |
| 4092 | 4089 | ); |
@@ -4104,7 +4101,7 @@ discard block |
||
| 4104 | 4101 | * @param integer $user_id |
| 4105 | 4102 | * @return void |
| 4106 | 4103 | */ |
| 4107 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4104 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4108 | 4105 | { |
| 4109 | 4106 | if ($user_id === 0) { |
| 4110 | 4107 | return; |
@@ -4115,8 +4112,8 @@ discard block |
||
| 4115 | 4112 | |
| 4116 | 4113 | $personalItems = DB::queryFirstColumn( |
| 4117 | 4114 | 'SELECT id |
| 4118 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4119 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4115 | + FROM ' . prefixTable('items').' AS i |
|
| 4116 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4120 | 4117 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4121 | 4118 | $user_id |
| 4122 | 4119 | ); |
@@ -4165,7 +4162,7 @@ discard block |
||
| 4165 | 4162 | // Check if user exists |
| 4166 | 4163 | $userInfo = DB::queryFirstRow( |
| 4167 | 4164 | 'SELECT login |
| 4168 | - FROM ' . prefixTable('users') . ' |
|
| 4165 | + FROM ' . prefixTable('users').' |
|
| 4169 | 4166 | WHERE id = %i', |
| 4170 | 4167 | $userId |
| 4171 | 4168 | ); |
@@ -4174,7 +4171,7 @@ discard block |
||
| 4174 | 4171 | $now = (int) time(); |
| 4175 | 4172 | // Prepare file content |
| 4176 | 4173 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4177 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4174 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4178 | 4175 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4179 | 4176 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4180 | 4177 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4197,7 +4194,7 @@ discard block |
||
| 4197 | 4194 | return prepareExchangedData( |
| 4198 | 4195 | array( |
| 4199 | 4196 | 'error' => false, |
| 4200 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4197 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4201 | 4198 | 'timestamp' => $now, |
| 4202 | 4199 | 'content' => base64_encode($export_value), |
| 4203 | 4200 | 'login' => $userInfo['login'], |
@@ -4223,8 +4220,8 @@ discard block |
||
| 4223 | 4220 | */ |
| 4224 | 4221 | function loadClasses(string $className = ''): void |
| 4225 | 4222 | { |
| 4226 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4227 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4223 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4224 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4228 | 4225 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4229 | 4226 | |
| 4230 | 4227 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4395,10 +4392,10 @@ discard block |
||
| 4395 | 4392 | } |
| 4396 | 4393 | |
| 4397 | 4394 | // Nettoyage des IDs pour éviter les injections SQL |
| 4398 | - $ids = array_map('intval', $ids); // Assure que chaque ID est un entier |
|
| 4395 | + $ids = array_map('intval', $ids); // Assure que chaque ID est un entier |
|
| 4399 | 4396 | |
| 4400 | 4397 | // Construction de la requête SQL pour vérifier les IDs dans la table |
| 4401 | - $result = DB::query('SELECT id FROM ' . prefixTable($tableName) . ' WHERE ' . $fieldName . ' IN %li', $ids); |
|
| 4398 | + $result = DB::query('SELECT id FROM '.prefixTable($tableName).' WHERE '.$fieldName.' IN %li', $ids); |
|
| 4402 | 4399 | |
| 4403 | 4400 | // Extraire les IDs existants de la table |
| 4404 | 4401 | $existingIds = array_column($result, 'id'); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | ) { |
| 82 | 82 | // Not allowed page |
| 83 | 83 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 84 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 84 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 85 | 85 | exit; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | * @param string $post_key |
| 279 | 279 | * @return string |
| 280 | 280 | */ |
| 281 | -function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 281 | +function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 282 | 282 | { |
| 283 | 283 | $session = SessionManager::getSession(); |
| 284 | 284 | |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | if (isset($dataReceived['user_id'])) { |
| 314 | 314 | // Get info about user to modify |
| 315 | 315 | $targetUserInfos = DB::queryfirstrow( |
| 316 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 316 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 317 | 317 | WHERE id = %i', |
| 318 | 318 | $dataReceived['user_id'] |
| 319 | 319 | ); |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | case 'mail_me'://action_mail |
| 464 | 464 | // Get info about user to send email |
| 465 | 465 | $data_user = DB::queryfirstrow( |
| 466 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 466 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 467 | 467 | WHERE email = %s', |
| 468 | 468 | filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 469 | 469 | ); |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | if (isset($dataReceived['user_id'])) { |
| 577 | 577 | // Get info about user to modify |
| 578 | 578 | $targetUserInfos = DB::queryfirstrow( |
| 579 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 579 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 580 | 580 | WHERE id = %i', |
| 581 | 581 | $dataReceived['user_id'] |
| 582 | 582 | ); |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | |
| 668 | 668 | // Get current user hash |
| 669 | 669 | $userHash = DB::queryFirstRow( |
| 670 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 670 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 671 | 671 | $session->get('user-id') |
| 672 | 672 | )['pw']; |
| 673 | 673 | |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | * @param array $SETTINGS |
| 731 | 731 | * @return string |
| 732 | 732 | */ |
| 733 | -function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 733 | +function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 734 | 734 | { |
| 735 | 735 | $session = SessionManager::getSession(); |
| 736 | 736 | switch ($post_type) { |
@@ -845,7 +845,7 @@ discard block |
||
| 845 | 845 | ) |
| 846 | 846 | ); |
| 847 | 847 | |
| 848 | - return '[{"token" : "' . $token . '"}]'; |
|
| 848 | + return '[{"token" : "'.$token.'"}]'; |
|
| 849 | 849 | |
| 850 | 850 | /* |
| 851 | 851 | * Default case |
@@ -861,7 +861,7 @@ discard block |
||
| 861 | 861 | } |
| 862 | 862 | |
| 863 | 863 | |
| 864 | -function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 864 | +function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 865 | 865 | { |
| 866 | 866 | switch ($post_type) { |
| 867 | 867 | /* |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | array( |
| 931 | 931 | 'error' => false, |
| 932 | 932 | 'timestamp' => $session->get('user-session_duration'), |
| 933 | - 'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 933 | + 'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 934 | 934 | 'max_session_duration' => $maximum_session_expiration_time, |
| 935 | 935 | ), |
| 936 | 936 | 'encode' |
@@ -982,7 +982,7 @@ discard block |
||
| 982 | 982 | // get number of items |
| 983 | 983 | DB::queryFirstRow( |
| 984 | 984 | 'SELECT increment_id |
| 985 | - FROM ' . prefixTable('sharekeys_items') . |
|
| 985 | + FROM ' . prefixTable('sharekeys_items'). |
|
| 986 | 986 | ' WHERE user_id = %i', |
| 987 | 987 | $userId |
| 988 | 988 | ); |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | // check if expected security level is reached |
| 1038 | 1038 | $dataUser = DB::queryfirstrow( |
| 1039 | 1039 | 'SELECT * |
| 1040 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 1040 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
| 1041 | 1041 | $post_user_id |
| 1042 | 1042 | ); |
| 1043 | 1043 | |
@@ -1058,8 +1058,8 @@ discard block |
||
| 1058 | 1058 | if (empty($dataUser['fonction_id']) === false) { |
| 1059 | 1059 | $data = DB::queryFirstRow( |
| 1060 | 1060 | 'SELECT complexity |
| 1061 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1062 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
| 1061 | + FROM ' . prefixTable('roles_title').' |
|
| 1062 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
| 1063 | 1063 | ORDER BY complexity DESC' |
| 1064 | 1064 | ); |
| 1065 | 1065 | } else { |
@@ -1072,8 +1072,8 @@ discard block |
||
| 1072 | 1072 | return prepareExchangedData( |
| 1073 | 1073 | array( |
| 1074 | 1074 | 'error' => true, |
| 1075 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' . |
|
| 1076 | - $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
| 1075 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'. |
|
| 1076 | + $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
| 1077 | 1077 | ), |
| 1078 | 1078 | 'encode' |
| 1079 | 1079 | ); |
@@ -1177,14 +1177,14 @@ discard block |
||
| 1177 | 1177 | // Get data about user |
| 1178 | 1178 | $dataUser = DB::queryfirstrow( |
| 1179 | 1179 | 'SELECT id, email, pw |
| 1180 | - FROM ' . prefixTable('users') . ' |
|
| 1180 | + FROM ' . prefixTable('users').' |
|
| 1181 | 1181 | WHERE login = %s', |
| 1182 | 1182 | $post_login |
| 1183 | 1183 | ); |
| 1184 | 1184 | } else { |
| 1185 | 1185 | $dataUser = DB::queryfirstrow( |
| 1186 | 1186 | 'SELECT id, login, email, pw |
| 1187 | - FROM ' . prefixTable('users') . ' |
|
| 1187 | + FROM ' . prefixTable('users').' |
|
| 1188 | 1188 | WHERE id = %i', |
| 1189 | 1189 | $post_id |
| 1190 | 1190 | ); |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | // Check if token already used |
| 1239 | 1239 | $dataToken = DB::queryfirstrow( |
| 1240 | 1240 | 'SELECT end_timestamp, reason |
| 1241 | - FROM ' . prefixTable('tokens') . ' |
|
| 1241 | + FROM ' . prefixTable('tokens').' |
|
| 1242 | 1242 | WHERE token = %s AND user_id = %i', |
| 1243 | 1243 | $post_token, |
| 1244 | 1244 | $dataUser['id'] |
@@ -1249,11 +1249,11 @@ discard block |
||
| 1249 | 1249 | return prepareExchangedData( |
| 1250 | 1250 | array( |
| 1251 | 1251 | 'error' => true, |
| 1252 | - 'message' => 'TOKEN already used',//$lang->get('no_email_set'), |
|
| 1252 | + 'message' => 'TOKEN already used', //$lang->get('no_email_set'), |
|
| 1253 | 1253 | ), |
| 1254 | 1254 | 'encode' |
| 1255 | 1255 | ); |
| 1256 | - } elseif(DB::count() === 0) { |
|
| 1256 | + } elseif (DB::count() === 0) { |
|
| 1257 | 1257 | // Store token for this action |
| 1258 | 1258 | DB::insert( |
| 1259 | 1259 | prefixTable('tokens'), |
@@ -1315,7 +1315,7 @@ discard block |
||
| 1315 | 1315 | 'email' => $dataUser['email'], |
| 1316 | 1316 | 'email_result' => str_replace( |
| 1317 | 1317 | '#email#', |
| 1318 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1318 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1319 | 1319 | addslashes($lang->get('admin_email_result_ok')) |
| 1320 | 1320 | ), |
| 1321 | 1321 | ), |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | 'email' => $dataUser['email'], |
| 1332 | 1332 | 'email_result' => str_replace( |
| 1333 | 1333 | '#email#', |
| 1334 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1334 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1335 | 1335 | addslashes($lang->get('admin_email_result_ok')) |
| 1336 | 1336 | ), |
| 1337 | 1337 | ), |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | |
| 1349 | 1349 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
| 1350 | 1350 | $row = DB::queryFirstRow( |
| 1351 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
| 1351 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
| 1352 | 1352 | 'cron', |
| 1353 | 1353 | 'sending_emails' |
| 1354 | 1354 | ); |
@@ -1356,7 +1356,7 @@ discard block |
||
| 1356 | 1356 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
| 1357 | 1357 | $rows = DB::query( |
| 1358 | 1358 | 'SELECT * |
| 1359 | - FROM ' . prefixTable('emails') . |
|
| 1359 | + FROM ' . prefixTable('emails'). |
|
| 1360 | 1360 | ' WHERE status != %s', |
| 1361 | 1361 | 'sent' |
| 1362 | 1362 | ); |
@@ -1408,8 +1408,8 @@ discard block |
||
| 1408 | 1408 | $arr_html = array(); |
| 1409 | 1409 | $rows = DB::query( |
| 1410 | 1410 | 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted |
| 1411 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 1412 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 1411 | + FROM ' . prefixTable('log_items').' AS l |
|
| 1412 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 1413 | 1413 | WHERE l.action = %s AND l.id_user = %i |
| 1414 | 1414 | ORDER BY l.date DESC |
| 1415 | 1415 | LIMIT 0, 100', |
@@ -1441,7 +1441,7 @@ discard block |
||
| 1441 | 1441 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
| 1442 | 1442 | && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1) |
| 1443 | 1443 | ) { |
| 1444 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
| 1444 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
| 1445 | 1445 | $nb_suggestions_waiting = DB::count(); |
| 1446 | 1446 | } |
| 1447 | 1447 | |
@@ -1476,13 +1476,13 @@ discard block |
||
| 1476 | 1476 | if ($data === 'stat_languages') { |
| 1477 | 1477 | $tmp = ''; |
| 1478 | 1478 | foreach ($stats_data[$data] as $key => $value) { |
| 1479 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1479 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1480 | 1480 | } |
| 1481 | 1481 | $statsToSend[$data] = $tmp; |
| 1482 | 1482 | } elseif ($data === 'stat_country') { |
| 1483 | 1483 | $tmp = ''; |
| 1484 | 1484 | foreach ($stats_data[$data] as $key => $value) { |
| 1485 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1485 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1486 | 1486 | } |
| 1487 | 1487 | $statsToSend[$data] = $tmp; |
| 1488 | 1488 | } else { |
@@ -1569,7 +1569,7 @@ discard block |
||
| 1569 | 1569 | $url_found = $value; |
| 1570 | 1570 | if (empty($url_found) === false) { |
| 1571 | 1571 | $tmp = parse_url($url_found); |
| 1572 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1572 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1573 | 1573 | $value = $anonym_url; |
| 1574 | 1574 | } else { |
| 1575 | 1575 | $value = ''; |
@@ -1599,7 +1599,7 @@ discard block |
||
| 1599 | 1599 | $teampass_errors = ''; |
| 1600 | 1600 | $rows = DB::query( |
| 1601 | 1601 | 'SELECT label, date AS error_date |
| 1602 | - FROM ' . prefixTable('log_system') . " |
|
| 1602 | + FROM ' . prefixTable('log_system')." |
|
| 1603 | 1603 | WHERE `type` LIKE 'error' |
| 1604 | 1604 | ORDER BY `date` DESC |
| 1605 | 1605 | LIMIT 0, 10" |
@@ -1607,9 +1607,9 @@ discard block |
||
| 1607 | 1607 | if (DB::count() > 0) { |
| 1608 | 1608 | foreach ($rows as $record) { |
| 1609 | 1609 | if (empty($teampass_errors) === true) { |
| 1610 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1610 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1611 | 1611 | } else { |
| 1612 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1612 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | 1615 | } |
@@ -1618,7 +1618,7 @@ discard block |
||
| 1618 | 1618 | |
| 1619 | 1619 | // Now prepare text |
| 1620 | 1620 | $txt = '### Page on which it happened |
| 1621 | -' . $data['current_page'] . ' |
|
| 1621 | +' . $data['current_page'].' |
|
| 1622 | 1622 | |
| 1623 | 1623 | ### Steps to reproduce |
| 1624 | 1624 | 1. |
@@ -1633,39 +1633,39 @@ discard block |
||
| 1633 | 1633 | Tell us what happens instead |
| 1634 | 1634 | |
| 1635 | 1635 | ### Server configuration |
| 1636 | -**Operating system**: ' . php_uname() . ' |
|
| 1636 | +**Operating system**: ' . php_uname().' |
|
| 1637 | 1637 | |
| 1638 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
| 1638 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
| 1639 | 1639 | |
| 1640 | -**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . ' |
|
| 1640 | +**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).' |
|
| 1641 | 1641 | |
| 1642 | -**PHP version:** ' . PHP_VERSION . ' |
|
| 1642 | +**PHP version:** ' . PHP_VERSION.' |
|
| 1643 | 1643 | |
| 1644 | -**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . ' |
|
| 1644 | +**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.' |
|
| 1645 | 1645 | |
| 1646 | 1646 | **Teampass configuration variables:** |
| 1647 | 1647 | ``` |
| 1648 | -' . $list_of_options . ' |
|
| 1648 | +' . $list_of_options.' |
|
| 1649 | 1649 | ``` |
| 1650 | 1650 | |
| 1651 | 1651 | **Updated from an older Teampass or fresh install:** |
| 1652 | 1652 | |
| 1653 | 1653 | ### Client configuration |
| 1654 | 1654 | |
| 1655 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
| 1655 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
| 1656 | 1656 | |
| 1657 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
| 1657 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
| 1658 | 1658 | |
| 1659 | 1659 | ### Logs |
| 1660 | 1660 | |
| 1661 | 1661 | #### Web server error log |
| 1662 | 1662 | ``` |
| 1663 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
| 1663 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
| 1664 | 1664 | ``` |
| 1665 | 1665 | |
| 1666 | 1666 | #### Teampass 10 last system errors |
| 1667 | 1667 | ``` |
| 1668 | -' . $teampass_errors . ' |
|
| 1668 | +' . $teampass_errors.' |
|
| 1669 | 1669 | ``` |
| 1670 | 1670 | |
| 1671 | 1671 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | // Check if user exists |
| 1706 | 1706 | $userInfo = DB::queryFirstRow( |
| 1707 | 1707 | 'SELECT public_key, private_key, pw, auth_type |
| 1708 | - FROM ' . prefixTable('users') . ' |
|
| 1708 | + FROM ' . prefixTable('users').' |
|
| 1709 | 1709 | WHERE id = %i', |
| 1710 | 1710 | $post_user_id |
| 1711 | 1711 | ); |
@@ -1714,9 +1714,9 @@ discard block |
||
| 1714 | 1714 | // Get one item |
| 1715 | 1715 | $currentUserKey = DB::queryFirstRow( |
| 1716 | 1716 | 'SELECT object_id, share_key, increment_id |
| 1717 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
| 1718 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id) |
|
| 1719 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON (i.id_tree = nt.id) |
|
| 1717 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
| 1718 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id) |
|
| 1719 | + INNER JOIN ' . prefixTable('nested_tree').' AS nt ON (i.id_tree = nt.id) |
|
| 1720 | 1720 | WHERE user_id = %i AND nt.personal_folder = %i', |
| 1721 | 1721 | $post_user_id, |
| 1722 | 1722 | 0 |
@@ -1810,7 +1810,7 @@ discard block |
||
| 1810 | 1810 | // Get user info |
| 1811 | 1811 | $userData = DB::queryFirstRow( |
| 1812 | 1812 | 'SELECT private_key |
| 1813 | - FROM ' . prefixTable('users') . ' |
|
| 1813 | + FROM ' . prefixTable('users').' |
|
| 1814 | 1814 | WHERE id = %i', |
| 1815 | 1815 | $post_user_id |
| 1816 | 1816 | ); |
@@ -1891,7 +1891,7 @@ discard block |
||
| 1891 | 1891 | // Get user info |
| 1892 | 1892 | $userData = DB::queryFirstRow( |
| 1893 | 1893 | 'SELECT email, auth_type, login |
| 1894 | - FROM ' . prefixTable('users') . ' |
|
| 1894 | + FROM ' . prefixTable('users').' |
|
| 1895 | 1895 | WHERE id = %i', |
| 1896 | 1896 | $post_user_id |
| 1897 | 1897 | ); |
@@ -1989,7 +1989,7 @@ discard block |
||
| 1989 | 1989 | // Get user info |
| 1990 | 1990 | $userData = DB::queryFirstRow( |
| 1991 | 1991 | 'SELECT email, auth_type, login |
| 1992 | - FROM ' . prefixTable('users') . ' |
|
| 1992 | + FROM ' . prefixTable('users').' |
|
| 1993 | 1993 | WHERE id = %i', |
| 1994 | 1994 | $post_user_id |
| 1995 | 1995 | ); |
@@ -2055,7 +2055,7 @@ discard block |
||
| 2055 | 2055 | // Check if user exists |
| 2056 | 2056 | DB::queryFirstRow( |
| 2057 | 2057 | 'SELECT * |
| 2058 | - FROM ' . prefixTable('users') . ' |
|
| 2058 | + FROM ' . prefixTable('users').' |
|
| 2059 | 2059 | WHERE id = %i', |
| 2060 | 2060 | $post_user_id |
| 2061 | 2061 | ); |
@@ -2125,7 +2125,7 @@ discard block |
||
| 2125 | 2125 | // Check if user exists |
| 2126 | 2126 | $userInfo = DB::queryFirstRow( |
| 2127 | 2127 | 'SELECT public_key |
| 2128 | - FROM ' . prefixTable('users') . ' |
|
| 2128 | + FROM ' . prefixTable('users').' |
|
| 2129 | 2129 | WHERE id = %i', |
| 2130 | 2130 | $post_user_id |
| 2131 | 2131 | ); |
@@ -2273,15 +2273,15 @@ discard block |
||
| 2273 | 2273 | // Loop on items |
| 2274 | 2274 | $rows = DB::query( |
| 2275 | 2275 | 'SELECT id, pw |
| 2276 | - FROM ' . prefixTable('items') . ' |
|
| 2276 | + FROM ' . prefixTable('items').' |
|
| 2277 | 2277 | WHERE perso = 0 |
| 2278 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2278 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2279 | 2279 | ); |
| 2280 | 2280 | foreach ($rows as $record) { |
| 2281 | 2281 | // Get itemKey from current user |
| 2282 | 2282 | $currentUserKey = DB::queryFirstRow( |
| 2283 | 2283 | 'SELECT share_key, increment_id |
| 2284 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2284 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2285 | 2285 | WHERE object_id = %i AND user_id = %i', |
| 2286 | 2286 | $record['id'], |
| 2287 | 2287 | $session->get('user-id') |
@@ -2313,7 +2313,7 @@ discard block |
||
| 2313 | 2313 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2314 | 2314 | $currentUserKey = DB::queryFirstRow( |
| 2315 | 2315 | 'SELECT increment_id |
| 2316 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2316 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2317 | 2317 | WHERE object_id = %i AND user_id = %i', |
| 2318 | 2318 | $record['id'], |
| 2319 | 2319 | $post_user_id |
@@ -2346,7 +2346,7 @@ discard block |
||
| 2346 | 2346 | // SHould we change step? |
| 2347 | 2347 | DB::query( |
| 2348 | 2348 | 'SELECT * |
| 2349 | - FROM ' . prefixTable('items') . ' |
|
| 2349 | + FROM ' . prefixTable('items').' |
|
| 2350 | 2350 | WHERE perso = 0' |
| 2351 | 2351 | ); |
| 2352 | 2352 | |
@@ -2371,15 +2371,15 @@ discard block |
||
| 2371 | 2371 | // Loop on logs |
| 2372 | 2372 | $rows = DB::query( |
| 2373 | 2373 | 'SELECT increment_id |
| 2374 | - FROM ' . prefixTable('log_items') . ' |
|
| 2374 | + FROM ' . prefixTable('log_items').' |
|
| 2375 | 2375 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
| 2376 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2376 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2377 | 2377 | ); |
| 2378 | 2378 | foreach ($rows as $record) { |
| 2379 | 2379 | // Get itemKey from current user |
| 2380 | 2380 | $currentUserKey = DB::queryFirstRow( |
| 2381 | 2381 | 'SELECT share_key |
| 2382 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
| 2382 | + FROM ' . prefixTable('sharekeys_logs').' |
|
| 2383 | 2383 | WHERE object_id = %i AND user_id = %i', |
| 2384 | 2384 | $record['increment_id'], |
| 2385 | 2385 | $session->get('user-id') |
@@ -2411,7 +2411,7 @@ discard block |
||
| 2411 | 2411 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2412 | 2412 | $currentUserKey = DB::queryFirstRow( |
| 2413 | 2413 | 'SELECT increment_id |
| 2414 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2414 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2415 | 2415 | WHERE object_id = %i AND user_id = %i', |
| 2416 | 2416 | $record['id'], |
| 2417 | 2417 | $post_user_id |
@@ -2433,7 +2433,7 @@ discard block |
||
| 2433 | 2433 | // SHould we change step? |
| 2434 | 2434 | DB::query( |
| 2435 | 2435 | 'SELECT increment_id |
| 2436 | - FROM ' . prefixTable('log_items') . ' |
|
| 2436 | + FROM ' . prefixTable('log_items').' |
|
| 2437 | 2437 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 2438 | 2438 | ); |
| 2439 | 2439 | |
@@ -2458,15 +2458,15 @@ discard block |
||
| 2458 | 2458 | // Loop on fields |
| 2459 | 2459 | $rows = DB::query( |
| 2460 | 2460 | 'SELECT id |
| 2461 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2461 | + FROM ' . prefixTable('categories_items').' |
|
| 2462 | 2462 | WHERE encryption_type = "teampass_aes" |
| 2463 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2463 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2464 | 2464 | ); |
| 2465 | 2465 | foreach ($rows as $record) { |
| 2466 | 2466 | // Get itemKey from current user |
| 2467 | 2467 | $currentUserKey = DB::queryFirstRow( |
| 2468 | 2468 | 'SELECT share_key |
| 2469 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2469 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2470 | 2470 | WHERE object_id = %i AND user_id = %i', |
| 2471 | 2471 | $record['id'], |
| 2472 | 2472 | $session->get('user-id') |
@@ -2498,7 +2498,7 @@ discard block |
||
| 2498 | 2498 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2499 | 2499 | $currentUserKey = DB::queryFirstRow( |
| 2500 | 2500 | 'SELECT increment_id |
| 2501 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2501 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2502 | 2502 | WHERE object_id = %i AND user_id = %i', |
| 2503 | 2503 | $record['id'], |
| 2504 | 2504 | $post_user_id |
@@ -2520,7 +2520,7 @@ discard block |
||
| 2520 | 2520 | // SHould we change step? |
| 2521 | 2521 | DB::query( |
| 2522 | 2522 | 'SELECT * |
| 2523 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2523 | + FROM ' . prefixTable('categories_items').' |
|
| 2524 | 2524 | WHERE encryption_type = "teampass_aes"' |
| 2525 | 2525 | ); |
| 2526 | 2526 | |
@@ -2545,14 +2545,14 @@ discard block |
||
| 2545 | 2545 | // Loop on suggestions |
| 2546 | 2546 | $rows = DB::query( |
| 2547 | 2547 | 'SELECT id |
| 2548 | - FROM ' . prefixTable('suggestion') . ' |
|
| 2549 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2548 | + FROM ' . prefixTable('suggestion').' |
|
| 2549 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2550 | 2550 | ); |
| 2551 | 2551 | foreach ($rows as $record) { |
| 2552 | 2552 | // Get itemKey from current user |
| 2553 | 2553 | $currentUserKey = DB::queryFirstRow( |
| 2554 | 2554 | 'SELECT share_key |
| 2555 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
| 2555 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
| 2556 | 2556 | WHERE object_id = %i AND user_id = %i', |
| 2557 | 2557 | $record['id'], |
| 2558 | 2558 | $session->get('user-id') |
@@ -2584,7 +2584,7 @@ discard block |
||
| 2584 | 2584 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2585 | 2585 | $currentUserKey = DB::queryFirstRow( |
| 2586 | 2586 | 'SELECT increment_id |
| 2587 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2587 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2588 | 2588 | WHERE object_id = %i AND user_id = %i', |
| 2589 | 2589 | $record['id'], |
| 2590 | 2590 | $post_user_id |
@@ -2630,15 +2630,15 @@ discard block |
||
| 2630 | 2630 | // Loop on files |
| 2631 | 2631 | $rows = DB::query( |
| 2632 | 2632 | 'SELECT id |
| 2633 | - FROM ' . prefixTable('files') . ' |
|
| 2634 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
| 2635 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2633 | + FROM ' . prefixTable('files').' |
|
| 2634 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
| 2635 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2636 | 2636 | ); //aes_encryption |
| 2637 | 2637 | foreach ($rows as $record) { |
| 2638 | 2638 | // Get itemKey from current user |
| 2639 | 2639 | $currentUserKey = DB::queryFirstRow( |
| 2640 | 2640 | 'SELECT share_key |
| 2641 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 2641 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 2642 | 2642 | WHERE object_id = %i AND user_id = %i', |
| 2643 | 2643 | $record['id'], |
| 2644 | 2644 | $session->get('user-id') |
@@ -2670,7 +2670,7 @@ discard block |
||
| 2670 | 2670 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2671 | 2671 | $currentUserKey = DB::queryFirstRow( |
| 2672 | 2672 | 'SELECT increment_id |
| 2673 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2673 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2674 | 2674 | WHERE object_id = %i AND user_id = %i', |
| 2675 | 2675 | $record['id'], |
| 2676 | 2676 | $post_user_id |
@@ -2692,8 +2692,8 @@ discard block |
||
| 2692 | 2692 | // SHould we change step? |
| 2693 | 2693 | DB::query( |
| 2694 | 2694 | 'SELECT * |
| 2695 | - FROM ' . prefixTable('files') . ' |
|
| 2696 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 2695 | + FROM ' . prefixTable('files').' |
|
| 2696 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 2697 | 2697 | ); |
| 2698 | 2698 | |
| 2699 | 2699 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2726,9 +2726,9 @@ discard block |
||
| 2726 | 2726 | if (count($session->get('user-personal_folders')) > 0) { |
| 2727 | 2727 | $rows = DB::query( |
| 2728 | 2728 | 'SELECT id, pw |
| 2729 | - FROM ' . prefixTable('items') . ' |
|
| 2729 | + FROM ' . prefixTable('items').' |
|
| 2730 | 2730 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s |
| 2731 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 2731 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 2732 | 2732 | $session->get('user-personal_folders'), |
| 2733 | 2733 | "defuse" |
| 2734 | 2734 | ); |
@@ -2736,7 +2736,7 @@ discard block |
||
| 2736 | 2736 | // Get itemKey from current user |
| 2737 | 2737 | $currentUserKey = DB::queryFirstRow( |
| 2738 | 2738 | 'SELECT share_key, increment_id |
| 2739 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2739 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2740 | 2740 | WHERE object_id = %i AND user_id = %i', |
| 2741 | 2741 | $record['id'], |
| 2742 | 2742 | $session->get('user-id') |
@@ -2763,7 +2763,7 @@ discard block |
||
| 2763 | 2763 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2764 | 2764 | $currentUserKey = DB::queryFirstRow( |
| 2765 | 2765 | 'SELECT increment_id |
| 2766 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2766 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2767 | 2767 | WHERE object_id = %i AND user_id = %i', |
| 2768 | 2768 | $record['id'], |
| 2769 | 2769 | $post_user_id |
@@ -2786,7 +2786,7 @@ discard block |
||
| 2786 | 2786 | // SHould we change step? |
| 2787 | 2787 | DB::query( |
| 2788 | 2788 | 'SELECT * |
| 2789 | - FROM ' . prefixTable('items') . ' |
|
| 2789 | + FROM ' . prefixTable('items').' |
|
| 2790 | 2790 | WHERE perso = 0' |
| 2791 | 2791 | ); |
| 2792 | 2792 | |
@@ -2814,7 +2814,7 @@ discard block |
||
| 2814 | 2814 | // Check if user exists |
| 2815 | 2815 | $userInfo = DB::queryFirstRow( |
| 2816 | 2816 | 'SELECT public_key, encrypted_psk |
| 2817 | - FROM ' . prefixTable('users') . ' |
|
| 2817 | + FROM ' . prefixTable('users').' |
|
| 2818 | 2818 | WHERE id = %i', |
| 2819 | 2819 | $post_user_id |
| 2820 | 2820 | ); |
@@ -2840,7 +2840,7 @@ discard block |
||
| 2840 | 2840 | if ($post_counterItemsToTreat === -1) { |
| 2841 | 2841 | DB::query( |
| 2842 | 2842 | 'SELECT id |
| 2843 | - FROM ' . prefixTable('items') . ' |
|
| 2843 | + FROM ' . prefixTable('items').' |
|
| 2844 | 2844 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 2845 | 2845 | $session->get('user-personal_folders'), |
| 2846 | 2846 | 'teampass_aes' |
@@ -2853,7 +2853,7 @@ discard block |
||
| 2853 | 2853 | // Loop on persoanl items |
| 2854 | 2854 | $rows = DB::query( |
| 2855 | 2855 | 'SELECT id, pw |
| 2856 | - FROM ' . prefixTable('items') . ' |
|
| 2856 | + FROM ' . prefixTable('items').' |
|
| 2857 | 2857 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s |
| 2858 | 2858 | LIMIT ' . $post_length, |
| 2859 | 2859 | $session->get('user-personal_folders'), |
@@ -2897,7 +2897,7 @@ discard block |
||
| 2897 | 2897 | // Loop on files |
| 2898 | 2898 | $rows = DB::query( |
| 2899 | 2899 | 'SELECT id, file |
| 2900 | - FROM ' . prefixTable('files') . ' |
|
| 2900 | + FROM ' . prefixTable('files').' |
|
| 2901 | 2901 | WHERE status != %s |
| 2902 | 2902 | AND id_item = %i', |
| 2903 | 2903 | TP_ENCRYPTION_NAME, |
@@ -2908,14 +2908,14 @@ discard block |
||
| 2908 | 2908 | // Now decrypt the file |
| 2909 | 2909 | prepareFileWithDefuse( |
| 2910 | 2910 | 'decrypt', |
| 2911 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
| 2912 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
| 2911 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
| 2912 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
| 2913 | 2913 | $SETTINGS, |
| 2914 | 2914 | $post_user_psk |
| 2915 | 2915 | ); |
| 2916 | 2916 | |
| 2917 | 2917 | // Encrypt the file |
| 2918 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
| 2918 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
| 2919 | 2919 | |
| 2920 | 2920 | DB::update( |
| 2921 | 2921 | prefixTable('files'), |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | ); |
| 2939 | 2939 | |
| 2940 | 2940 | // Unlink original file |
| 2941 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
| 2941 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
| 2942 | 2942 | } |
| 2943 | 2943 | } |
| 2944 | 2944 | |
@@ -2946,7 +2946,7 @@ discard block |
||
| 2946 | 2946 | $next_start = (int) $post_start + (int) $post_length; |
| 2947 | 2947 | DB::query( |
| 2948 | 2948 | 'SELECT id |
| 2949 | - FROM ' . prefixTable('items') . ' |
|
| 2949 | + FROM ' . prefixTable('items').' |
|
| 2950 | 2950 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 2951 | 2951 | $session->get('user-personal_folders'), |
| 2952 | 2952 | 'teampass_aes' |
@@ -3017,7 +3017,7 @@ discard block |
||
| 3017 | 3017 | // Get user info |
| 3018 | 3018 | $userData = DB::queryFirstRow( |
| 3019 | 3019 | 'SELECT '.$post_fields.' |
| 3020 | - FROM ' . prefixTable('users') . ' |
|
| 3020 | + FROM ' . prefixTable('users').' |
|
| 3021 | 3021 | WHERE id = %i', |
| 3022 | 3022 | $post_user_id |
| 3023 | 3023 | ); |
@@ -3064,7 +3064,7 @@ discard block |
||
| 3064 | 3064 | // Get user info |
| 3065 | 3065 | $userData = DB::queryFirstRow( |
| 3066 | 3066 | 'SELECT auth_type, login, private_key |
| 3067 | - FROM ' . prefixTable('users') . ' |
|
| 3067 | + FROM ' . prefixTable('users').' |
|
| 3068 | 3068 | WHERE id = %i', |
| 3069 | 3069 | $post_user_id |
| 3070 | 3070 | ); |
@@ -3114,7 +3114,7 @@ discard block |
||
| 3114 | 3114 | return prepareExchangedData( |
| 3115 | 3115 | array( |
| 3116 | 3116 | 'error' => false, |
| 3117 | - 'message' => $lang->get('done'),'', |
|
| 3117 | + 'message' => $lang->get('done'), '', |
|
| 3118 | 3118 | ), |
| 3119 | 3119 | 'encode' |
| 3120 | 3120 | ); |
@@ -3164,7 +3164,7 @@ discard block |
||
| 3164 | 3164 | // Get user info |
| 3165 | 3165 | $userData = DB::queryFirstRow( |
| 3166 | 3166 | 'SELECT auth_type, login, private_key, special |
| 3167 | - FROM ' . prefixTable('users') . ' |
|
| 3167 | + FROM ' . prefixTable('users').' |
|
| 3168 | 3168 | WHERE id = %i', |
| 3169 | 3169 | $post_user_id |
| 3170 | 3170 | ); |
@@ -3198,7 +3198,7 @@ discard block |
||
| 3198 | 3198 | return prepareExchangedData( |
| 3199 | 3199 | array( |
| 3200 | 3200 | 'error' => false, |
| 3201 | - 'message' => $lang->get('done'),'', |
|
| 3201 | + 'message' => $lang->get('done'), '', |
|
| 3202 | 3202 | ), |
| 3203 | 3203 | 'encode' |
| 3204 | 3204 | ); |
@@ -3221,7 +3221,7 @@ discard block |
||
| 3221 | 3221 | // Get one itemKey from current user |
| 3222 | 3222 | $currentUserKey = DB::queryFirstRow( |
| 3223 | 3223 | 'SELECT share_key, increment_id |
| 3224 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 3224 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 3225 | 3225 | WHERE user_id = %i |
| 3226 | 3226 | LIMIT 1', |
| 3227 | 3227 | $post_user_id |
@@ -3310,7 +3310,7 @@ discard block |
||
| 3310 | 3310 | $session->get('user-id') |
| 3311 | 3311 | ); |
| 3312 | 3312 | // Return data |
| 3313 | - return '[{"new_value":"' . $session->get('user-session_duration') . '"}]'; |
|
| 3313 | + return '[{"new_value":"'.$session->get('user-session_duration').'"}]'; |
|
| 3314 | 3314 | } |
| 3315 | 3315 | |
| 3316 | 3316 | return '[{"new_value":"expired"}]'; |