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 | |
@@ -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, |
@@ -2178,7 +2178,7 @@ discard block |
||
| 2178 | 2178 | |
| 2179 | 2179 | // Get info about user |
| 2180 | 2180 | $data_user = DB::queryfirstrow( |
| 2181 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2181 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2182 | 2182 | WHERE id = %i', |
| 2183 | 2183 | $inputData['source_id'] |
| 2184 | 2184 | ); |
@@ -2380,14 +2380,14 @@ discard block |
||
| 2380 | 2380 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2381 | 2381 | $data_user = DB::queryfirstrow( |
| 2382 | 2382 | 'SELECT fonction_id, public_key |
| 2383 | - FROM ' . prefixTable('users') . ' |
|
| 2383 | + FROM ' . prefixTable('users').' |
|
| 2384 | 2384 | WHERE id = %i', |
| 2385 | 2385 | $post_user_id |
| 2386 | 2386 | ); |
| 2387 | 2387 | |
| 2388 | 2388 | if ($data_user) { |
| 2389 | 2389 | // Ensure array is unique |
| 2390 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2390 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2391 | 2391 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2392 | 2392 | } else { |
| 2393 | 2393 | // User not found |
@@ -2403,14 +2403,14 @@ discard block |
||
| 2403 | 2403 | } |
| 2404 | 2404 | |
| 2405 | 2405 | // Manage specific case of api key |
| 2406 | - if($post_field === 'user_api_key') { |
|
| 2406 | + if ($post_field === 'user_api_key') { |
|
| 2407 | 2407 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 2408 | 2408 | $session->set('user-api_key', $post_new_value); |
| 2409 | 2409 | |
| 2410 | 2410 | // test if user has an api key |
| 2411 | 2411 | $data_user = DB::queryfirstrow( |
| 2412 | 2412 | 'SELECT value |
| 2413 | - FROM ' . prefixTable('api') . ' |
|
| 2413 | + FROM ' . prefixTable('api').' |
|
| 2414 | 2414 | WHERE user_id = %i', |
| 2415 | 2415 | $post_user_id |
| 2416 | 2416 | ); |
@@ -2530,7 +2530,7 @@ discard block |
||
| 2530 | 2530 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2531 | 2531 | $error = $e->getDetailedError(); |
| 2532 | 2532 | if ($error) { |
| 2533 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2533 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2534 | 2534 | } else { |
| 2535 | 2535 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
| 2536 | 2536 | } |
@@ -2562,7 +2562,7 @@ discard block |
||
| 2562 | 2562 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2563 | 2563 | $error = $e->getDetailedError(); |
| 2564 | 2564 | if ($error) { |
| 2565 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2565 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2566 | 2566 | } else { |
| 2567 | 2567 | error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage()); |
| 2568 | 2568 | } |
@@ -2581,7 +2581,7 @@ discard block |
||
| 2581 | 2581 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2582 | 2582 | // Build the list of all groups in AD |
| 2583 | 2583 | if (isset($adUser['memberof']) === true) { |
| 2584 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2584 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2585 | 2585 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2586 | 2586 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2587 | 2587 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2597,7 +2597,7 @@ discard block |
||
| 2597 | 2597 | // Get his ID |
| 2598 | 2598 | $userInfo = DB::queryfirstrow( |
| 2599 | 2599 | 'SELECT id, login, fonction_id, auth_type |
| 2600 | - FROM ' . prefixTable('users') . ' |
|
| 2600 | + FROM ' . prefixTable('users').' |
|
| 2601 | 2601 | WHERE login = %s', |
| 2602 | 2602 | $userLogin |
| 2603 | 2603 | ); |
@@ -2633,7 +2633,7 @@ discard block |
||
| 2633 | 2633 | |
| 2634 | 2634 | // Get all groups in Teampass |
| 2635 | 2635 | $teampassRoles = array(); |
| 2636 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2636 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2637 | 2637 | foreach ($rows as $record) { |
| 2638 | 2638 | array_push( |
| 2639 | 2639 | $teampassRoles, |
@@ -2697,7 +2697,7 @@ discard block |
||
| 2697 | 2697 | // Check if user already exists |
| 2698 | 2698 | $data = DB::query( |
| 2699 | 2699 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2700 | - FROM ' . prefixTable('users') . ' |
|
| 2700 | + FROM ' . prefixTable('users').' |
|
| 2701 | 2701 | WHERE login = %s', |
| 2702 | 2702 | $post_login |
| 2703 | 2703 | ); |
@@ -2872,14 +2872,14 @@ discard block |
||
| 2872 | 2872 | // Send mail to user with new OTP |
| 2873 | 2873 | $userInfo = DB::queryFirstRow( |
| 2874 | 2874 | 'SELECT email |
| 2875 | - FROM ' . prefixTable('users') . ' |
|
| 2875 | + FROM ' . prefixTable('users').' |
|
| 2876 | 2876 | WHERE id = %i', |
| 2877 | 2877 | $post_userId |
| 2878 | 2878 | ); |
| 2879 | 2879 | $emailSettings = new EmailSettings($SETTINGS); |
| 2880 | 2880 | $emailService = new EmailService(); |
| 2881 | 2881 | $emailService->sendMail( |
| 2882 | - 'TEAMPASS - ' . $lang->get('temporary_encryption_code'), |
|
| 2882 | + 'TEAMPASS - '.$lang->get('temporary_encryption_code'), |
|
| 2883 | 2883 | str_replace( |
| 2884 | 2884 | array('#enc_code#'), |
| 2885 | 2885 | array($post_otp), |
@@ -2934,7 +2934,7 @@ discard block |
||
| 2934 | 2934 | // Check if user already exists |
| 2935 | 2935 | DB::query( |
| 2936 | 2936 | 'SELECT id |
| 2937 | - FROM ' . prefixTable('users') . ' |
|
| 2937 | + FROM ' . prefixTable('users').' |
|
| 2938 | 2938 | WHERE id = %i', |
| 2939 | 2939 | $post_id |
| 2940 | 2940 | ); |
@@ -3007,7 +3007,7 @@ discard block |
||
| 3007 | 3007 | // Check if user already exists |
| 3008 | 3008 | $userInfo = DB::queryfirstrow( |
| 3009 | 3009 | 'SELECT id, private_key, public_key |
| 3010 | - FROM ' . prefixTable('users') . ' |
|
| 3010 | + FROM ' . prefixTable('users').' |
|
| 3011 | 3011 | WHERE id = %i', |
| 3012 | 3012 | $post_userid |
| 3013 | 3013 | ); |
@@ -3054,7 +3054,7 @@ discard block |
||
| 3054 | 3054 | if (count($session->get('user-personal_folders')) > 0) { |
| 3055 | 3055 | DB::query( |
| 3056 | 3056 | 'SELECT id |
| 3057 | - FROM ' . prefixTable('items') . ' |
|
| 3057 | + FROM ' . prefixTable('items').' |
|
| 3058 | 3058 | WHERE id_tree IN %ls', |
| 3059 | 3059 | $session->get('user-personal_folders') |
| 3060 | 3060 | ); |
@@ -3144,7 +3144,7 @@ discard block |
||
| 3144 | 3144 | // Check if user already exists |
| 3145 | 3145 | DB::query( |
| 3146 | 3146 | 'SELECT id |
| 3147 | - FROM ' . prefixTable('users') . ' |
|
| 3147 | + FROM ' . prefixTable('users').' |
|
| 3148 | 3148 | WHERE id = %i', |
| 3149 | 3149 | $post_id |
| 3150 | 3150 | ); |
@@ -3216,10 +3216,10 @@ discard block |
||
| 3216 | 3216 | 'process_type' => 'create_user_keys', |
| 3217 | 3217 | 'arguments' => json_encode([ |
| 3218 | 3218 | 'new_user_id' => (int) $post_user_id, |
| 3219 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 3220 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 3219 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 3220 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 3221 | 3221 | 'owner_id' => (int) $session->get('user-id'), |
| 3222 | - 'creator_pwd' => cryption($session->get('user-password'), '','encrypt', $SETTINGS)['string'], |
|
| 3222 | + 'creator_pwd' => cryption($session->get('user-password'), '', 'encrypt', $SETTINGS)['string'], |
|
| 3223 | 3223 | 'email_body' => $lang->get('email_body_user_config_5'), |
| 3224 | 3224 | 'send_email' => 1, |
| 3225 | 3225 | ]), |
@@ -3376,7 +3376,7 @@ discard block |
||
| 3376 | 3376 | // get user info |
| 3377 | 3377 | $userInfo = DB::queryFirstRow( |
| 3378 | 3378 | 'SELECT * |
| 3379 | - FROM ' . prefixTable('users') . ' |
|
| 3379 | + FROM ' . prefixTable('users').' |
|
| 3380 | 3380 | WHERE id = %i', |
| 3381 | 3381 | $user_id |
| 3382 | 3382 | ); |
@@ -3463,8 +3463,8 @@ discard block |
||
| 3463 | 3463 | // get user info |
| 3464 | 3464 | $processesProgress = DB::query( |
| 3465 | 3465 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 3466 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3467 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3466 | + FROM ' . prefixTable('users').' AS u |
|
| 3467 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 3468 | 3468 | WHERE u.id = %i', |
| 3469 | 3469 | $user_id |
| 3470 | 3470 | ); |
@@ -3472,9 +3472,9 @@ discard block |
||
| 3472 | 3472 | //print_r($processesProgress); |
| 3473 | 3473 | $finished_steps = 0; |
| 3474 | 3474 | $nb_steps = count($processesProgress); |
| 3475 | - foreach($processesProgress as $process) { |
|
| 3475 | + foreach ($processesProgress as $process) { |
|
| 3476 | 3476 | if ((int) $process['is_in_progress'] === -1) { |
| 3477 | - $finished_steps ++; |
|
| 3477 | + $finished_steps++; |
|
| 3478 | 3478 | } |
| 3479 | 3479 | } |
| 3480 | 3480 | |
@@ -3483,7 +3483,7 @@ discard block |
||
| 3483 | 3483 | 'error' => false, |
| 3484 | 3484 | 'message' => '', |
| 3485 | 3485 | 'user_id' => $user_id, |
| 3486 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 3486 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 3487 | 3487 | 'debug' => $finished_steps.",".$nb_steps, |
| 3488 | 3488 | ), |
| 3489 | 3489 | 'encode' |
@@ -3547,7 +3547,7 @@ discard block |
||
| 3547 | 3547 | |
| 3548 | 3548 | // Get info about user |
| 3549 | 3549 | $data_user = DB::queryfirstrow( |
| 3550 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3550 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3551 | 3551 | WHERE id = %i', |
| 3552 | 3552 | $value[1] |
| 3553 | 3553 | ); |
@@ -3581,7 +3581,7 @@ discard block |
||
| 3581 | 3581 | logEvents( |
| 3582 | 3582 | $SETTINGS, |
| 3583 | 3583 | 'user_mngt', |
| 3584 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3584 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3585 | 3585 | (string) $session->get('user-id'), |
| 3586 | 3586 | $session->get('user-login'), |
| 3587 | 3587 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3615,7 +3615,7 @@ discard block |
||
| 3615 | 3615 | |
| 3616 | 3616 | // Get info about user |
| 3617 | 3617 | $data_user = DB::queryfirstrow( |
| 3618 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3618 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3619 | 3619 | WHERE id = %i', |
| 3620 | 3620 | $value[1] |
| 3621 | 3621 | ); |
@@ -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 | ?> |
