nilsteampassnet /
TeamPass
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | "error" => '', |
| 39 | 39 | ); |
| 40 | 40 | |
| 41 | - }catch (Exception $e) { |
|
| 41 | + } catch (Exception $e) { |
|
| 42 | 42 | return false; |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | "error" => '', |
| 41 | 41 | ); |
| 42 | 42 | |
| 43 | - }catch (Exception $e) { |
|
| 43 | + } catch (Exception $e) { |
|
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $ret = []; |
| 35 | 35 | |
| 36 | 36 | foreach ($rows as $row) { |
| 37 | - $isVisible = in_array((int) $row['id'], $foldersId); |
|
| 37 | + $isVisible = in_array((int) $row['id'], $foldersId); |
|
| 38 | 38 | $childrens = $this->getFoldersChildren($row['id'], $foldersId); |
| 39 | 39 | |
| 40 | 40 | if ($isVisible || count($childrens) > 0) { |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | [ |
| 44 | 44 | 'id' => (int) $row['id'], |
| 45 | 45 | 'title' => $row['title'], |
| 46 | - 'isVisible' => $isVisible, |
|
| 46 | + 'isVisible' => $isVisible, |
|
| 47 | 47 | 'childrens' => $childrens |
| 48 | 48 | ] |
| 49 | 49 | ); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | if ( count($childrens) > 0) { |
| 65 | 65 | foreach ($childrens as $children) { |
| 66 | - $isVisible = in_array((int) $children['id'], $foldersId); |
|
| 66 | + $isVisible = in_array((int) $children['id'], $foldersId); |
|
| 67 | 67 | $childs = $this->getFoldersChildren($children['id'], $foldersId); |
| 68 | 68 | |
| 69 | 69 | if (in_array((int) $children['id'], $foldersId) || count($childs) > 0) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | [ |
| 73 | 73 | 'id' => (int) $children['id'], |
| 74 | 74 | 'title' => $children['title'], |
| 75 | - 'isVisible' => $isVisible, |
|
| 75 | + 'isVisible' => $isVisible, |
|
| 76 | 76 | 'childrens' => $childs |
| 77 | 77 | ] |
| 78 | 78 | ); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | // Get folders |
| 38 | 38 | $rows = DB::query( |
| 39 | 39 | 'SELECT id, title |
| 40 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 40 | + FROM ' . prefixTable('nested_tree').' |
|
| 41 | 41 | WHERE nlevel = %i', |
| 42 | 42 | 1 |
| 43 | 43 | ); |
@@ -69,12 +69,12 @@ discard block |
||
| 69 | 69 | $ret = []; |
| 70 | 70 | $childrens = DB::query( |
| 71 | 71 | 'SELECT id, title |
| 72 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 72 | + FROM ' . prefixTable('nested_tree').' |
|
| 73 | 73 | WHERE parent_id = %i', |
| 74 | 74 | $parentId |
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | - if ( count($childrens) > 0) { |
|
| 77 | + if (count($childrens) > 0) { |
|
| 78 | 78 | foreach ($childrens as $children) { |
| 79 | 79 | $isVisible = in_array((int) $children['id'], $foldersId); |
| 80 | 80 | $childs = $this->getFoldersChildren($children['id'], $foldersId); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | ): array |
| 117 | 117 | { |
| 118 | 118 | // Validate inputs |
| 119 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
| 119 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
| 120 | 120 | $data = [ |
| 121 | 121 | 'title' => $title, |
| 122 | 122 | 'parent_id' => $parent_id, |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | 'error' => true, |
| 182 | 182 | 'error_header' => 'HTTP/1.1 422 Unprocessable Entity', |
| 183 | 183 | 'error_message' => 'Invalid parameters' |
| 184 | - ];} |
|
| 184 | + ]; } |
|
| 185 | 185 | |
| 186 | 186 | // Create folder |
| 187 | 187 | require_once TEAMPASS_ROOT_PATH.'/sources/folders.class.php'; |
@@ -2603,7 +2603,9 @@ |
||
| 2603 | 2603 | } |
| 2604 | 2604 | |
| 2605 | 2605 | foreach ($results as $adUser) { |
| 2606 | - if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
|
| 2606 | + if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) { |
|
| 2607 | + continue; |
|
| 2608 | + } |
|
| 2607 | 2609 | // Build the list of all groups in AD |
| 2608 | 2610 | if (isset($adUser['memberof']) === true) { |
| 2609 | 2611 | foreach($adUser['memberof'] as $j => $adUserGroup) { |
@@ -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 | |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | // Check if user already exists |
| 190 | 190 | $data = DB::query( |
| 191 | 191 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 192 | - FROM ' . prefixTable('users') . ' |
|
| 192 | + FROM ' . prefixTable('users').' |
|
| 193 | 193 | WHERE login = %s |
| 194 | 194 | AND deleted_at IS NULL', |
| 195 | 195 | $login |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | |
| 415 | 415 | // Get info about user to delete |
| 416 | 416 | $data_user = DB::queryfirstrow( |
| 417 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 417 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 418 | 418 | WHERE id = %i', |
| 419 | 419 | $post_id |
| 420 | 420 | ); |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | ); |
| 449 | 449 | // delete personal folder and subfolders |
| 450 | 450 | $data = DB::queryfirstrow( |
| 451 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 451 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 452 | 452 | WHERE title = %s AND personal_folder = %i', |
| 453 | 453 | $post_id, |
| 454 | 454 | '1' |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 462 | 462 | // delete items & logs |
| 463 | 463 | $items = DB::query( |
| 464 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 464 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 465 | 465 | WHERE id_tree=%i AND perso = %i', |
| 466 | 466 | $folder->id, |
| 467 | 467 | '1' |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | // Delete any process related to user |
| 486 | 486 | $processes = DB::query( |
| 487 | 487 | 'SELECT increment_id |
| 488 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 488 | + FROM ' . prefixTable('background_tasks').' |
|
| 489 | 489 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 490 | 490 | $post_id |
| 491 | 491 | ); |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | |
| 546 | 546 | // Get info about user to delete |
| 547 | 547 | $data_user = DB::queryfirstrow( |
| 548 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 548 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 549 | 549 | WHERE id = %i', |
| 550 | 550 | $post_id |
| 551 | 551 | ); |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | |
| 588 | 588 | // Get info about user to delete |
| 589 | 589 | $data_user = DB::queryfirstrow( |
| 590 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 590 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 591 | 591 | WHERE id = %i', |
| 592 | 592 | $post_id |
| 593 | 593 | ); |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | // Get info about user to delete |
| 631 | 631 | $data_user = DB::queryfirstrow( |
| 632 | 632 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 633 | - FROM ' . prefixTable('users') . ' |
|
| 633 | + FROM ' . prefixTable('users').' |
|
| 634 | 634 | WHERE id = %i', |
| 635 | 635 | $post_id |
| 636 | 636 | ); |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | |
| 675 | 675 | // Get info about user to delete |
| 676 | 676 | $data_user = DB::queryfirstrow( |
| 677 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 677 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 678 | 678 | WHERE id = %i', |
| 679 | 679 | $post_id |
| 680 | 680 | ); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | // Get info about user to delete |
| 718 | 718 | $data_user = DB::queryfirstrow( |
| 719 | 719 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 720 | - FROM ' . prefixTable('users') . ' |
|
| 720 | + FROM ' . prefixTable('users').' |
|
| 721 | 721 | WHERE id = %i', |
| 722 | 722 | $post_id |
| 723 | 723 | ); |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | // Get info about user to delete |
| 761 | 761 | $data_user = DB::queryfirstrow( |
| 762 | 762 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 763 | - FROM ' . prefixTable('users') . ' |
|
| 763 | + FROM ' . prefixTable('users').' |
|
| 764 | 764 | WHERE id = %i', |
| 765 | 765 | $post_id |
| 766 | 766 | ); |
@@ -800,7 +800,7 @@ discard block |
||
| 800 | 800 | // Get info about user to delete |
| 801 | 801 | $data_user = DB::queryfirstrow( |
| 802 | 802 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 803 | - FROM ' . prefixTable('users') . ' |
|
| 803 | + FROM ' . prefixTable('users').' |
|
| 804 | 804 | WHERE id = %i', |
| 805 | 805 | $post_id |
| 806 | 806 | ); |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | $return = array(); |
| 840 | 840 | // Check if folder exists |
| 841 | 841 | $data = DB::query( |
| 842 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 842 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 843 | 843 | WHERE title = %s AND parent_id = %i', |
| 844 | 844 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 845 | 845 | '0' |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | // Check if role exists |
| 854 | 854 | $data = DB::query( |
| 855 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 855 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 856 | 856 | WHERE title = %s', |
| 857 | 857 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 858 | 858 | ); |
@@ -872,7 +872,7 @@ discard block |
||
| 872 | 872 | case 'user_log_items': |
| 873 | 873 | $nb_pages = 1; |
| 874 | 874 | $logs = $sql_filter = ''; |
| 875 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . $lang->get('pages') . ' : </td>'; |
|
| 875 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.$lang->get('pages').' : </td>'; |
|
| 876 | 876 | |
| 877 | 877 | // Prepare POST variables |
| 878 | 878 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -884,14 +884,14 @@ discard block |
||
| 884 | 884 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) |
| 885 | 885 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) !== 'all' |
| 886 | 886 | ) { |
| 887 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "'"; |
|
| 887 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."'"; |
|
| 888 | 888 | } |
| 889 | 889 | // get number of pages |
| 890 | 890 | DB::query( |
| 891 | 891 | 'SELECT * |
| 892 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 893 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 894 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 892 | + FROM ' . prefixTable('log_items').' as l |
|
| 893 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 894 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 895 | 895 | WHERE l.id_user = %i ' . $sql_filter, |
| 896 | 896 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 897 | 897 | ); |
@@ -909,19 +909,19 @@ discard block |
||
| 909 | 909 | // launch query |
| 910 | 910 | $rows = DB::query( |
| 911 | 911 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 912 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 913 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 914 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 915 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 912 | + FROM ' . prefixTable('log_items').' as l |
|
| 913 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 914 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 915 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 916 | 916 | ORDER BY date DESC |
| 917 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 917 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 918 | 918 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 919 | 919 | ); |
| 920 | 920 | } else { |
| 921 | 921 | // get number of pages |
| 922 | 922 | DB::query( |
| 923 | 923 | 'SELECT * |
| 924 | - FROM ' . prefixTable('log_system') . ' |
|
| 924 | + FROM ' . prefixTable('log_system').' |
|
| 925 | 925 | WHERE type = %s AND field_1=%i', |
| 926 | 926 | 'user_mngt', |
| 927 | 927 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | // launch query |
| 941 | 941 | $rows = DB::query( |
| 942 | 942 | 'SELECT * |
| 943 | - FROM ' . prefixTable('log_system') . ' |
|
| 943 | + FROM ' . prefixTable('log_system').' |
|
| 944 | 944 | WHERE type = %s AND field_1 = %i |
| 945 | 945 | ORDER BY date DESC |
| 946 | 946 | LIMIT %i, %i', |
@@ -954,7 +954,7 @@ discard block |
||
| 954 | 954 | if (isset($counter) && $counter != 0) { |
| 955 | 955 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 956 | 956 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 957 | - $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>'; |
|
| 957 | + $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>'; |
|
| 958 | 958 | } |
| 959 | 959 | } |
| 960 | 960 | $pages .= '</tr></table>'; |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | if ($post_scope === 'user_mngt') { |
| 964 | 964 | $user = DB::queryfirstrow( |
| 965 | 965 | 'SELECT login |
| 966 | - from ' . prefixTable('users') . ' |
|
| 966 | + from ' . prefixTable('users').' |
|
| 967 | 967 | WHERE id=%i', |
| 968 | 968 | $record['qui'] |
| 969 | 969 | ); |
@@ -973,7 +973,7 @@ discard block |
||
| 973 | 973 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 974 | 974 | $label = $lang->get('log_user_initial_pwd_changed'); |
| 975 | 975 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 976 | - $label = $lang->get('log_user_email_changed') . $tmp[1]; |
|
| 976 | + $label = $lang->get('log_user_email_changed').$tmp[1]; |
|
| 977 | 977 | } elseif ($tmp[0] == 'at_user_added') { |
| 978 | 978 | $label = $lang->get('log_user_created'); |
| 979 | 979 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -984,14 +984,14 @@ discard block |
||
| 984 | 984 | $label = $lang->get('log_user_pwd_changed'); |
| 985 | 985 | } |
| 986 | 986 | // prepare log |
| 987 | - $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>'; |
|
| 987 | + $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>'; |
|
| 988 | 988 | } else { |
| 989 | - $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>'; |
|
| 989 | + $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>'; |
|
| 990 | 990 | } |
| 991 | 991 | } |
| 992 | 992 | } |
| 993 | 993 | |
| 994 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 994 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 995 | 995 | break; |
| 996 | 996 | |
| 997 | 997 | /* |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | } else { |
| 1015 | 1015 | // Get folder id for Admin |
| 1016 | 1016 | $admin_folder = DB::queryFirstRow( |
| 1017 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1017 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1018 | 1018 | WHERE title = %i AND personal_folder = %i', |
| 1019 | 1019 | (int) $session->get('user-id'), |
| 1020 | 1020 | '1' |
@@ -1025,15 +1025,15 @@ discard block |
||
| 1025 | 1025 | // Get each Items in PF |
| 1026 | 1026 | $rows = DB::query( |
| 1027 | 1027 | 'SELECT i.pw, i.label, l.id_user |
| 1028 | - FROM ' . prefixTable('items') . ' as i |
|
| 1029 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 1028 | + FROM ' . prefixTable('items').' as i |
|
| 1029 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 1030 | 1030 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 1031 | 1031 | 'at_creation', |
| 1032 | 1032 | '1', |
| 1033 | 1033 | intval($folder->id) |
| 1034 | 1034 | ); |
| 1035 | 1035 | foreach ($rows as $record) { |
| 1036 | - echo $record['label'] . ' - '; |
|
| 1036 | + echo $record['label'].' - '; |
|
| 1037 | 1037 | // Change user |
| 1038 | 1038 | DB::update( |
| 1039 | 1039 | prefixTable('log_items'), |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | // Get info about user to delete |
| 1069 | 1069 | $data_user = DB::queryfirstrow( |
| 1070 | 1070 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1071 | - FROM ' . prefixTable('users') . ' |
|
| 1071 | + FROM ' . prefixTable('users').' |
|
| 1072 | 1072 | WHERE id = %i', |
| 1073 | 1073 | $post_user_id |
| 1074 | 1074 | ); |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | |
| 1106 | 1106 | // Do |
| 1107 | 1107 | $rows = DB::query( |
| 1108 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1108 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1109 | 1109 | WHERE timestamp != %s AND admin != %i', |
| 1110 | 1110 | '', |
| 1111 | 1111 | '1' |
@@ -1114,7 +1114,7 @@ discard block |
||
| 1114 | 1114 | // Get info about user to delete |
| 1115 | 1115 | $data_user = DB::queryfirstrow( |
| 1116 | 1116 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1117 | - FROM ' . prefixTable('users') . ' |
|
| 1117 | + FROM ' . prefixTable('users').' |
|
| 1118 | 1118 | WHERE id = %i', |
| 1119 | 1119 | $record['id'] |
| 1120 | 1120 | ); |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | // Get info about user |
| 1176 | 1176 | $rowUser = DB::queryfirstrow( |
| 1177 | 1177 | 'SELECT * |
| 1178 | - FROM ' . prefixTable('users') . ' |
|
| 1178 | + FROM ' . prefixTable('users').' |
|
| 1179 | 1179 | WHERE id = %i', |
| 1180 | 1180 | $post_id |
| 1181 | 1181 | ); |
@@ -1202,7 +1202,7 @@ discard block |
||
| 1202 | 1202 | // array of roles for actual user |
| 1203 | 1203 | //$my_functions = explode(';', $rowUser['fonction_id']); |
| 1204 | 1204 | |
| 1205 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1205 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1206 | 1206 | foreach ($rows as $record) { |
| 1207 | 1207 | if ( |
| 1208 | 1208 | (int) $session->get('user-admin') === 1 |
@@ -1239,7 +1239,7 @@ discard block |
||
| 1239 | 1239 | $rolesList = array(); |
| 1240 | 1240 | $managedBy = array(); |
| 1241 | 1241 | $selected = ''; |
| 1242 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1242 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1243 | 1243 | foreach ($rows as $reccord) { |
| 1244 | 1244 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1245 | 1245 | } |
@@ -1270,7 +1270,7 @@ discard block |
||
| 1270 | 1270 | array_push( |
| 1271 | 1271 | $managedBy, |
| 1272 | 1272 | array( |
| 1273 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 1273 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 1274 | 1274 | 'id' => $fonction['id'], |
| 1275 | 1275 | 'selected' => $selected, |
| 1276 | 1276 | ) |
@@ -1352,9 +1352,9 @@ discard block |
||
| 1352 | 1352 | |
| 1353 | 1353 | // get USER STATUS |
| 1354 | 1354 | if ($rowUser['disabled'] == 1) { |
| 1355 | - $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>'; |
|
| 1355 | + $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>'; |
|
| 1356 | 1356 | } else { |
| 1357 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 1357 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | 1360 | $arrData['error'] = false; |
@@ -1447,7 +1447,7 @@ discard block |
||
| 1447 | 1447 | |
| 1448 | 1448 | // Get info about user to modify |
| 1449 | 1449 | $data_user = DB::queryfirstrow( |
| 1450 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1450 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1451 | 1451 | WHERE id = %i', |
| 1452 | 1452 | $post_id |
| 1453 | 1453 | ); |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | // count number of admins |
| 1459 | 1459 | $users = DB::query( |
| 1460 | 1460 | 'SELECT id |
| 1461 | - FROM ' . prefixTable('users') . ' |
|
| 1461 | + FROM ' . prefixTable('users').' |
|
| 1462 | 1462 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 1463 | 1463 | $post_id |
| 1464 | 1464 | ); |
@@ -1481,7 +1481,7 @@ discard block |
||
| 1481 | 1481 | // Exclude roles from AD - PR #3635 |
| 1482 | 1482 | $adRoles = DB::query( |
| 1483 | 1483 | 'SELECT roles_from_ad_groups |
| 1484 | - FROM ' . prefixTable('users') . ' |
|
| 1484 | + FROM ' . prefixTable('users').' |
|
| 1485 | 1485 | WHERE id = %i', |
| 1486 | 1486 | $post_id |
| 1487 | 1487 | )[0]['roles_from_ad_groups']; |
@@ -1585,7 +1585,7 @@ discard block |
||
| 1585 | 1585 | ); |
| 1586 | 1586 | // delete personal folder and subfolders |
| 1587 | 1587 | $data = DB::queryfirstrow( |
| 1588 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1588 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1589 | 1589 | WHERE title = %s AND personal_folder = %i', |
| 1590 | 1590 | $post_id, |
| 1591 | 1591 | '1' |
@@ -1598,7 +1598,7 @@ discard block |
||
| 1598 | 1598 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1599 | 1599 | // delete items & logs |
| 1600 | 1600 | $items = DB::query( |
| 1601 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1601 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1602 | 1602 | WHERE id_tree=%i AND perso = %i', |
| 1603 | 1603 | $folder->id, |
| 1604 | 1604 | '1' |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | } else { |
| 1620 | 1620 | // Get old data about user |
| 1621 | 1621 | $oldData = DB::queryfirstrow( |
| 1622 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1622 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1623 | 1623 | WHERE id = %i', |
| 1624 | 1624 | $post_id |
| 1625 | 1625 | ); |
@@ -1656,7 +1656,7 @@ discard block |
||
| 1656 | 1656 | |
| 1657 | 1657 | // update LOG |
| 1658 | 1658 | if ($oldData['email'] !== $post_email) { |
| 1659 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1659 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1660 | 1660 | } |
| 1661 | 1661 | } |
| 1662 | 1662 | echo prepareExchangedData( |
@@ -1714,7 +1714,7 @@ discard block |
||
| 1714 | 1714 | |
| 1715 | 1715 | // Get info about user to delete |
| 1716 | 1716 | $data_user = DB::queryfirstrow( |
| 1717 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1717 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1718 | 1718 | WHERE id = %i', |
| 1719 | 1719 | $post_id |
| 1720 | 1720 | ); |
@@ -1764,7 +1764,7 @@ discard block |
||
| 1764 | 1764 | } |
| 1765 | 1765 | |
| 1766 | 1766 | DB::queryfirstrow( |
| 1767 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1767 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1768 | 1768 | WHERE login = %s |
| 1769 | 1769 | AND deleted_at IS NULL', |
| 1770 | 1770 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1816,7 +1816,7 @@ discard block |
||
| 1816 | 1816 | // get User info |
| 1817 | 1817 | $rowUser = DB::queryFirstRow( |
| 1818 | 1818 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1819 | - FROM ' . prefixTable('users') . ' |
|
| 1819 | + FROM ' . prefixTable('users').' |
|
| 1820 | 1820 | WHERE id = %i', |
| 1821 | 1821 | $post_id |
| 1822 | 1822 | ); |
@@ -1826,7 +1826,7 @@ discard block |
||
| 1826 | 1826 | $html = ''; |
| 1827 | 1827 | |
| 1828 | 1828 | 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) { |
| 1829 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1829 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1830 | 1830 | } |
| 1831 | 1831 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1832 | 1832 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1837,7 +1837,7 @@ discard block |
||
| 1837 | 1837 | // refine folders based upon roles |
| 1838 | 1838 | $rows = DB::query( |
| 1839 | 1839 | 'SELECT folder_id, type |
| 1840 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1840 | + FROM ' . prefixTable('roles_values').' |
|
| 1841 | 1841 | WHERE role_id IN %ls |
| 1842 | 1842 | ORDER BY folder_id ASC', |
| 1843 | 1843 | $arrData['functions'] |
@@ -1860,7 +1860,7 @@ discard block |
||
| 1860 | 1860 | } |
| 1861 | 1861 | |
| 1862 | 1862 | // add allowed folders |
| 1863 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1863 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1864 | 1864 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1865 | 1865 | } |
| 1866 | 1866 | |
@@ -1871,7 +1871,7 @@ discard block |
||
| 1871 | 1871 | // get folder name |
| 1872 | 1872 | $row = DB::queryFirstRow( |
| 1873 | 1873 | 'SELECT title, nlevel, id |
| 1874 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1874 | + FROM ' . prefixTable('nested_tree').' |
|
| 1875 | 1875 | WHERE id = %i', |
| 1876 | 1876 | $fld['id'] |
| 1877 | 1877 | ); |
@@ -1884,38 +1884,38 @@ discard block |
||
| 1884 | 1884 | |
| 1885 | 1885 | // manage right icon |
| 1886 | 1886 | if ($fld['type'] == 'W') { |
| 1887 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1888 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1889 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1887 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1888 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1889 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1890 | 1890 | } elseif ($fld['type'] == 'ND') { |
| 1891 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1892 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1893 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1891 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1892 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1893 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1894 | 1894 | } elseif ($fld['type'] == 'NE') { |
| 1895 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1896 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1897 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1895 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1896 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1897 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1898 | 1898 | } elseif ($fld['type'] == 'NDNE') { |
| 1899 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1900 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1901 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1899 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1900 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1901 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1902 | 1902 | } elseif ($fld['type'] == '') { |
| 1903 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1903 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1904 | 1904 | } else { |
| 1905 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1905 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1906 | 1906 | } |
| 1907 | 1907 | |
| 1908 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1909 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1910 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1911 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1908 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1909 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1910 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1911 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1912 | 1912 | break; |
| 1913 | 1913 | } |
| 1914 | 1914 | } |
| 1915 | 1915 | } |
| 1916 | 1916 | |
| 1917 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1918 | - $html . '</tbody></table>'; |
|
| 1917 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1918 | + $html.'</tbody></table>'; |
|
| 1919 | 1919 | } else { |
| 1920 | 1920 | $html_full = ''; |
| 1921 | 1921 | } |
@@ -1961,7 +1961,7 @@ discard block |
||
| 1961 | 1961 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1962 | 1962 | $rows = DB::query( |
| 1963 | 1963 | 'SELECT * |
| 1964 | - FROM ' . prefixTable('users') . ' |
|
| 1964 | + FROM ' . prefixTable('users').' |
|
| 1965 | 1965 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1966 | 1966 | '0', |
| 1967 | 1967 | array_filter($session->get('user-roles_array')) |
@@ -1969,7 +1969,7 @@ discard block |
||
| 1969 | 1969 | } else { |
| 1970 | 1970 | $rows = DB::query( |
| 1971 | 1971 | 'SELECT * |
| 1972 | - FROM ' . prefixTable('users') . ' |
|
| 1972 | + FROM ' . prefixTable('users').' |
|
| 1973 | 1973 | WHERE admin = %i', |
| 1974 | 1974 | '0' |
| 1975 | 1975 | ); |
@@ -1981,7 +1981,7 @@ discard block |
||
| 1981 | 1981 | $groupIds = []; |
| 1982 | 1982 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1983 | 1983 | $tmp = DB::queryfirstrow( |
| 1984 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1984 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1985 | 1985 | WHERE id = %i', |
| 1986 | 1986 | $group |
| 1987 | 1987 | ); |
@@ -1993,7 +1993,7 @@ discard block |
||
| 1993 | 1993 | |
| 1994 | 1994 | // Get managed_by |
| 1995 | 1995 | $managedBy = DB::queryfirstrow( |
| 1996 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1996 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1997 | 1997 | WHERE id = %i', |
| 1998 | 1998 | $record['isAdministratedByRole'] |
| 1999 | 1999 | ); |
@@ -2003,7 +2003,7 @@ discard block |
||
| 2003 | 2003 | $foldersAllowedIds = []; |
| 2004 | 2004 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 2005 | 2005 | $tmp = DB::queryfirstrow( |
| 2006 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 2006 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 2007 | 2007 | WHERE id = %i', |
| 2008 | 2008 | $role |
| 2009 | 2009 | ); |
@@ -2016,7 +2016,7 @@ discard block |
||
| 2016 | 2016 | $foldersForbiddenIds = []; |
| 2017 | 2017 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 2018 | 2018 | $tmp = DB::queryfirstrow( |
| 2019 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 2019 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 2020 | 2020 | WHERE id = %i', |
| 2021 | 2021 | $role |
| 2022 | 2022 | ); |
@@ -2034,7 +2034,7 @@ discard block |
||
| 2034 | 2034 | 'login' => $record['login'], |
| 2035 | 2035 | 'groups' => implode(', ', $groups), |
| 2036 | 2036 | 'groupIds' => $groupIds, |
| 2037 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2037 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 2038 | 2038 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 2039 | 2039 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 2040 | 2040 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2142,7 +2142,7 @@ discard block |
||
| 2142 | 2142 | |
| 2143 | 2143 | // Get info about user |
| 2144 | 2144 | $data_user = DB::queryfirstrow( |
| 2145 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2145 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2146 | 2146 | WHERE id = %i', |
| 2147 | 2147 | $inputData['source_id'] |
| 2148 | 2148 | ); |
@@ -2356,14 +2356,14 @@ discard block |
||
| 2356 | 2356 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2357 | 2357 | $data_user = DB::queryfirstrow( |
| 2358 | 2358 | 'SELECT fonction_id, public_key |
| 2359 | - FROM ' . prefixTable('users') . ' |
|
| 2359 | + FROM ' . prefixTable('users').' |
|
| 2360 | 2360 | WHERE id = %i', |
| 2361 | 2361 | $post_user_id |
| 2362 | 2362 | ); |
| 2363 | 2363 | |
| 2364 | 2364 | if ($data_user) { |
| 2365 | 2365 | // Ensure array is unique |
| 2366 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2366 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2367 | 2367 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2368 | 2368 | } else { |
| 2369 | 2369 | // User not found |
@@ -2379,14 +2379,14 @@ discard block |
||
| 2379 | 2379 | } |
| 2380 | 2380 | |
| 2381 | 2381 | // Manage specific case of api key |
| 2382 | - if($post_field === 'user_api_key') { |
|
| 2382 | + if ($post_field === 'user_api_key') { |
|
| 2383 | 2383 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 2384 | 2384 | $session->set('user-api_key', $post_new_value); |
| 2385 | 2385 | |
| 2386 | 2386 | // test if user has an api key |
| 2387 | 2387 | $data_user = DB::queryfirstrow( |
| 2388 | 2388 | 'SELECT value |
| 2389 | - FROM ' . prefixTable('api') . ' |
|
| 2389 | + FROM ' . prefixTable('api').' |
|
| 2390 | 2390 | WHERE user_id = %i', |
| 2391 | 2391 | $post_user_id |
| 2392 | 2392 | ); |
@@ -2506,7 +2506,7 @@ discard block |
||
| 2506 | 2506 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2507 | 2507 | $error = $e->getDetailedError(); |
| 2508 | 2508 | if ($error) { |
| 2509 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2509 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2510 | 2510 | } else { |
| 2511 | 2511 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
| 2512 | 2512 | } |
@@ -2538,7 +2538,7 @@ discard block |
||
| 2538 | 2538 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2539 | 2539 | $error = $e->getDetailedError(); |
| 2540 | 2540 | if ($error) { |
| 2541 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2541 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2542 | 2542 | } else { |
| 2543 | 2543 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
| 2544 | 2544 | } |
@@ -2557,7 +2557,7 @@ discard block |
||
| 2557 | 2557 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2558 | 2558 | // Build the list of all groups in AD |
| 2559 | 2559 | if (isset($adUser['memberof']) === true) { |
| 2560 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2560 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2561 | 2561 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2562 | 2562 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2563 | 2563 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2573,7 +2573,7 @@ discard block |
||
| 2573 | 2573 | // Get his ID |
| 2574 | 2574 | $userInfo = DB::queryfirstrow( |
| 2575 | 2575 | 'SELECT id, login, fonction_id, auth_type |
| 2576 | - FROM ' . prefixTable('users') . ' |
|
| 2576 | + FROM ' . prefixTable('users').' |
|
| 2577 | 2577 | WHERE login = %s', |
| 2578 | 2578 | $userLogin |
| 2579 | 2579 | ); |
@@ -2609,7 +2609,7 @@ discard block |
||
| 2609 | 2609 | |
| 2610 | 2610 | // Get all groups in Teampass |
| 2611 | 2611 | $teampassRoles = array(); |
| 2612 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2612 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2613 | 2613 | foreach ($rows as $record) { |
| 2614 | 2614 | array_push( |
| 2615 | 2615 | $teampassRoles, |
@@ -2679,7 +2679,7 @@ discard block |
||
| 2679 | 2679 | // Check if user already exists |
| 2680 | 2680 | $data = DB::query( |
| 2681 | 2681 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2682 | - FROM ' . prefixTable('users') . ' |
|
| 2682 | + FROM ' . prefixTable('users').' |
|
| 2683 | 2683 | WHERE login = %s', |
| 2684 | 2684 | $post_login |
| 2685 | 2685 | ); |
@@ -2860,14 +2860,14 @@ discard block |
||
| 2860 | 2860 | // Send mail to user with new OTP |
| 2861 | 2861 | $userInfo = DB::queryFirstRow( |
| 2862 | 2862 | 'SELECT email |
| 2863 | - FROM ' . prefixTable('users') . ' |
|
| 2863 | + FROM ' . prefixTable('users').' |
|
| 2864 | 2864 | WHERE id = %i', |
| 2865 | 2865 | $post_userId |
| 2866 | 2866 | ); |
| 2867 | 2867 | $emailSettings = new EmailSettings($SETTINGS); |
| 2868 | 2868 | $emailService = new EmailService(); |
| 2869 | 2869 | $emailService->sendMail( |
| 2870 | - 'TEAMPASS - ' . $lang->get('temporary_encryption_code'), |
|
| 2870 | + 'TEAMPASS - '.$lang->get('temporary_encryption_code'), |
|
| 2871 | 2871 | str_replace( |
| 2872 | 2872 | array('#enc_code#'), |
| 2873 | 2873 | 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 | ); |
@@ -3008,7 +3008,7 @@ discard block |
||
| 3008 | 3008 | // Check if user already exists |
| 3009 | 3009 | $userInfo = DB::queryfirstrow( |
| 3010 | 3010 | 'SELECT id, private_key, public_key |
| 3011 | - FROM ' . prefixTable('users') . ' |
|
| 3011 | + FROM ' . prefixTable('users').' |
|
| 3012 | 3012 | WHERE id = %i', |
| 3013 | 3013 | $post_userid |
| 3014 | 3014 | ); |
@@ -3055,7 +3055,7 @@ discard block |
||
| 3055 | 3055 | if (count($session->get('user-personal_folders')) > 0) { |
| 3056 | 3056 | DB::query( |
| 3057 | 3057 | 'SELECT id |
| 3058 | - FROM ' . prefixTable('items') . ' |
|
| 3058 | + FROM ' . prefixTable('items').' |
|
| 3059 | 3059 | WHERE id_tree IN %ls', |
| 3060 | 3060 | $session->get('user-personal_folders') |
| 3061 | 3061 | ); |
@@ -3151,7 +3151,7 @@ discard block |
||
| 3151 | 3151 | // Check if user already exists |
| 3152 | 3152 | DB::query( |
| 3153 | 3153 | 'SELECT id |
| 3154 | - FROM ' . prefixTable('users') . ' |
|
| 3154 | + FROM ' . prefixTable('users').' |
|
| 3155 | 3155 | WHERE id = %i', |
| 3156 | 3156 | $post_id |
| 3157 | 3157 | ); |
@@ -3229,10 +3229,10 @@ discard block |
||
| 3229 | 3229 | 'process_type' => 'create_user_keys', |
| 3230 | 3230 | 'arguments' => json_encode([ |
| 3231 | 3231 | 'new_user_id' => (int) $post_user_id, |
| 3232 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 3233 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 3232 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 3233 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 3234 | 3234 | 'owner_id' => (int) $session->get('user-id'), |
| 3235 | - 'creator_pwd' => cryption($session->get('user-password'), '','encrypt', $SETTINGS)['string'], |
|
| 3235 | + 'creator_pwd' => cryption($session->get('user-password'), '', 'encrypt', $SETTINGS)['string'], |
|
| 3236 | 3236 | 'email_body' => $lang->get('email_body_user_config_5'), |
| 3237 | 3237 | 'send_email' => 1, |
| 3238 | 3238 | ]), |
@@ -3395,7 +3395,7 @@ discard block |
||
| 3395 | 3395 | // get user info |
| 3396 | 3396 | $userInfo = DB::queryFirstRow( |
| 3397 | 3397 | 'SELECT * |
| 3398 | - FROM ' . prefixTable('users') . ' |
|
| 3398 | + FROM ' . prefixTable('users').' |
|
| 3399 | 3399 | WHERE id = %i', |
| 3400 | 3400 | $user_id |
| 3401 | 3401 | ); |
@@ -3488,8 +3488,8 @@ discard block |
||
| 3488 | 3488 | // get user info |
| 3489 | 3489 | $processesProgress = DB::query( |
| 3490 | 3490 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 3491 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3492 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3491 | + FROM ' . prefixTable('users').' AS u |
|
| 3492 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3493 | 3493 | WHERE u.id = %i', |
| 3494 | 3494 | $user_id |
| 3495 | 3495 | ); |
@@ -3497,9 +3497,9 @@ discard block |
||
| 3497 | 3497 | //print_r($processesProgress); |
| 3498 | 3498 | $finished_steps = 0; |
| 3499 | 3499 | $nb_steps = count($processesProgress); |
| 3500 | - foreach($processesProgress as $process) { |
|
| 3500 | + foreach ($processesProgress as $process) { |
|
| 3501 | 3501 | if ((int) $process['is_in_progress'] === -1) { |
| 3502 | - $finished_steps ++; |
|
| 3502 | + $finished_steps++; |
|
| 3503 | 3503 | } |
| 3504 | 3504 | } |
| 3505 | 3505 | |
@@ -3508,7 +3508,7 @@ discard block |
||
| 3508 | 3508 | 'error' => false, |
| 3509 | 3509 | 'message' => '', |
| 3510 | 3510 | 'user_id' => $user_id, |
| 3511 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 3511 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 3512 | 3512 | 'debug' => $finished_steps.",".$nb_steps, |
| 3513 | 3513 | ), |
| 3514 | 3514 | 'encode' |
@@ -3577,7 +3577,7 @@ discard block |
||
| 3577 | 3577 | |
| 3578 | 3578 | // Get info about user |
| 3579 | 3579 | $data_user = DB::queryfirstrow( |
| 3580 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3580 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3581 | 3581 | WHERE id = %i', |
| 3582 | 3582 | $value[1] |
| 3583 | 3583 | ); |
@@ -3611,7 +3611,7 @@ discard block |
||
| 3611 | 3611 | logEvents( |
| 3612 | 3612 | $SETTINGS, |
| 3613 | 3613 | 'user_mngt', |
| 3614 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3614 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3615 | 3615 | (string) $session->get('user-id'), |
| 3616 | 3616 | $session->get('user-login'), |
| 3617 | 3617 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3645,7 +3645,7 @@ discard block |
||
| 3645 | 3645 | |
| 3646 | 3646 | // Get info about user |
| 3647 | 3647 | $data_user = DB::queryfirstrow( |
| 3648 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3648 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3649 | 3649 | WHERE id = %i', |
| 3650 | 3650 | $value[1] |
| 3651 | 3651 | ); |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $arrQueryStringParams = $this->getQueryStringParams(); |
| 40 | 40 | |
| 41 | 41 | if (strtoupper($requestMethod) === 'POST') { |
| 42 | - require API_ROOT_PATH . "/Model/AuthModel.php"; |
|
| 42 | + require API_ROOT_PATH."/Model/AuthModel.php"; |
|
| 43 | 43 | try { |
| 44 | 44 | $authModel = new AuthModel(); |
| 45 | 45 | $arrUser = $authModel->getUserAuth( |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if (array_key_exists("token", $arrUser)) { |
| 51 | 51 | $responseData = json_encode($arrUser); |
| 52 | 52 | } else { |
| 53 | - $strErrorDesc = $arrUser['error'] . " (" . $arrUser['info'] . ")"; |
|
| 53 | + $strErrorDesc = $arrUser['error']." (".$arrUser['info'].")"; |
|
| 54 | 54 | $strErrorHeader = 'HTTP/1.1 401 Unauthorized'; |
| 55 | 55 | } |
| 56 | 56 | } catch (Error $e) { |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('statistics') === false) { |
| 66 | 66 | // Not allowed page |
| 67 | 67 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 68 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 68 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 69 | 69 | exit; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === false) { |
| 67 | 67 | // Not allowed page |
| 68 | 68 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 70 | 70 | exit; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -99,28 +99,28 @@ discard block |
||
| 99 | 99 | $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">'; |
| 100 | 100 | $complexitySelect = ''; |
| 101 | 101 | foreach (TP_PW_COMPLEXITY as $level) { |
| 102 | - $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>'; |
|
| 102 | + $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>'; |
|
| 103 | 103 | } |
| 104 | -$complexityHtml .= $complexitySelect . '</select></div>'; |
|
| 104 | +$complexityHtml .= $complexitySelect.'</select></div>'; |
|
| 105 | 105 | |
| 106 | 106 | /* Get full tree structure */ |
| 107 | 107 | $tst = $tree->getDescendants(); |
| 108 | 108 | // prepare options list |
| 109 | -$droplist = '<option value="na">---' . $lang->get('select') . '---</option>'; |
|
| 109 | +$droplist = '<option value="na">---'.$lang->get('select').'---</option>'; |
|
| 110 | 110 | if ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_create_root_folder') === 1) { |
| 111 | - $droplist .= '<option value="0">' . $lang->get('root') . '</option>'; |
|
| 111 | + $droplist .= '<option value="0">'.$lang->get('root').'</option>'; |
|
| 112 | 112 | } |
| 113 | 113 | foreach ($tst as $t) { |
| 114 | 114 | if ( |
| 115 | 115 | in_array($t->id, $session->get('user-accessible_folders')) === true |
| 116 | 116 | && in_array($t->id, $session->get('user-personal_visible_folders')) === false |
| 117 | 117 | ) { |
| 118 | - $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title); |
|
| 118 | + $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title); |
|
| 119 | 119 | $text = ''; |
| 120 | 120 | foreach ($tree->getPath($t->id, false) as $fld) { |
| 121 | - $text .= empty($text) === true ? ' [' . $fld->title : ' > ' . $fld->title; |
|
| 121 | + $text .= empty($text) === true ? ' ['.$fld->title : ' > '.$fld->title; |
|
| 122 | 122 | } |
| 123 | - $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>'; |
|
| 123 | + $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>'; |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
@@ -199,14 +199,14 @@ discard block |
||
| 199 | 199 | <label><?php echo $lang->get('icon'); ?></label> |
| 200 | 200 | <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon" data-field="icon"> |
| 201 | 201 | <small class='form-text text-muted'> |
| 202 | - <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a> |
|
| 202 | + <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a> |
|
| 203 | 203 | </small> |
| 204 | 204 | </div> |
| 205 | 205 | <div class="form-group"> |
| 206 | 206 | <label><?php echo $lang->get('icon_on_selection'); ?></label> |
| 207 | 207 | <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon-selected" data-field="iconSelected"> |
| 208 | 208 | <small class='form-text text-muted'> |
| 209 | - <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a> |
|
| 209 | + <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a> |
|
| 210 | 210 | </small> |
| 211 | 211 | </div> |
| 212 | 212 | <div class="form-group"> |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | <th scope="col" min-width="200px"><?php echo $lang->get('group'); ?></th> |
| 298 | 298 | <th scope="col" min-width="200px"><?php echo $lang->get('group_parent'); ?></th> |
| 299 | 299 | <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo $lang->get('password_strength'); ?>"></i></th> |
| 300 | - <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration') . ' ' . $lang->get('group_pw_duration_tip'); ?>"></i></th> |
|
| 300 | + <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration').' '.$lang->get('group_pw_duration_tip'); ?>"></i></th> |
|
| 301 | 301 | <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo $lang->get('auth_creation_without_complexity'); ?>"></i></th> |
| 302 | 302 | <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo $lang->get('auth_modification_without_complexity'); ?>"></i></th> |
| 303 | 303 | <th scope="col" width="50px"><i class="fas fa-folder fa-lg infotip" title="<?php echo $lang->get('icon'); ?>"></i></th> |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('mfa') === false) { |
| 66 | 66 | // Not allowed page |
| 67 | 67 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 68 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 68 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 69 | 69 | exit; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | ); |
| 142 | 142 | foreach ($roles as $role) { |
| 143 | 143 | echo ' |
| 144 | - <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>'; |
|
| 144 | + <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>'; |
|
| 145 | 145 | } |
| 146 | 146 | ?> |
| 147 | 147 | </select> |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
| 71 | 71 | // Not allowed page |
| 72 | 72 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 73 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 73 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 74 | 74 | exit; |
| 75 | 75 | } |
| 76 | 76 | ?> |
@@ -302,8 +302,8 @@ discard block |
||
| 302 | 302 | if (store.get('teampassApplication').formUserAction === "add_new_user") { |
| 303 | 303 | var data = { |
| 304 | 304 | 'receipt': $('#form-email').val(), |
| 305 | - 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>', |
|
| 306 | - 'body': '<?php echo $lang->get('email_body_new_user');?>', |
|
| 305 | + 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>', |
|
| 306 | + 'body': '<?php echo $lang->get('email_body_new_user'); ?>', |
|
| 307 | 307 | 'pre_replace' : { |
| 308 | 308 | '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 309 | 309 | '#login#' : store.get('teampassUser').admin_new_user_login, |
@@ -313,8 +313,8 @@ discard block |
||
| 313 | 313 | } else { |
| 314 | 314 | var data = { |
| 315 | 315 | 'receipt': $('#form-email').val(), |
| 316 | - 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>', |
|
| 317 | - 'body': '<?php echo $lang->get('email_body_temporary_encryption_code');?>', |
|
| 316 | + 'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>', |
|
| 317 | + 'body': '<?php echo $lang->get('email_body_temporary_encryption_code'); ?>', |
|
| 318 | 318 | 'pre_replace' : { |
| 319 | 319 | '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 320 | 320 | } |
@@ -567,14 +567,14 @@ discard block |
||
| 567 | 567 | } |
| 568 | 568 | // Inform user |
| 569 | 569 | $("#warningModalBody").html('<b><?php echo $lang->get('encryption_keys'); ?> - ' + |
| 570 | - stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 570 | + stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 571 | 571 | '... <?php echo $lang->get('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>'); |
| 572 | 572 | |
| 573 | 573 | // If expected, show the OPT to the admin |
| 574 | 574 | if (constVisibleOTP === true) { |
| 575 | 575 | toastr.info( |
| 576 | - '<?php echo $lang->get('show_encryption_code_to_admin');?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>' |
|
| 577 | - + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close');?></button>', |
|
| 576 | + '<?php echo $lang->get('show_encryption_code_to_admin'); ?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>' |
|
| 577 | + + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close'); ?></button>', |
|
| 578 | 578 | '<?php echo $lang->get('information'); ?>', |
| 579 | 579 | { |
| 580 | 580 | extendedTimeOut: 0, |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | var data = { |
| 594 | 594 | action: step, |
| 595 | 595 | start: start, |
| 596 | - length: <?php echo NUMBER_ITEMS_IN_BATCH;?>, |
|
| 596 | + length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>, |
|
| 597 | 597 | user_id: userId, |
| 598 | 598 | } |
| 599 | 599 | if (debugJavascript === true) { |
@@ -1401,7 +1401,7 @@ discard block |
||
| 1401 | 1401 | } else { |
| 1402 | 1402 | // Show icon or not |
| 1403 | 1403 | if ($('#user-disabled').prop('checked') === true) { |
| 1404 | - $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked');?>" id="user-disable-'+userID+'"></i>'); |
|
| 1404 | + $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>'); |
|
| 1405 | 1405 | } else { |
| 1406 | 1406 | $('#user-disable-'+userID).remove(); |
| 1407 | 1407 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('uploads') === false) { |
| 63 | 63 | // Not allowed page |
| 64 | 64 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 65 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 65 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 66 | 66 | exit; |
| 67 | 67 | } |
| 68 | 68 | ?> |
