nilsteampassnet /
TeamPass
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /* do checks */ |
| 39 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 39 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 40 | 40 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) { |
| 41 | 41 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 42 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 42 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 43 | 43 | exit(); |
| 44 | 44 | } |
| 45 | 45 | ?> |
@@ -674,8 +674,8 @@ discard block |
||
| 674 | 674 | // Prepare data |
| 675 | 675 | var data = { |
| 676 | 676 | 'receipt': $('#form-email').val(), |
| 677 | - 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code');?>', |
|
| 678 | - 'body': '<?php echo langHdl('email_body_temporary_encryption_code');?>', |
|
| 677 | + 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code'); ?>', |
|
| 678 | + 'body': '<?php echo langHdl('email_body_temporary_encryption_code'); ?>', |
|
| 679 | 679 | 'pre_replace' : { |
| 680 | 680 | '#enc_code#' : userTemporaryCode, |
| 681 | 681 | } |
@@ -1038,7 +1038,7 @@ discard block |
||
| 1038 | 1038 | } else { |
| 1039 | 1039 | // Show icon or not |
| 1040 | 1040 | if ($('#user-disabled').prop('checked') === true) { |
| 1041 | - $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked');?>" id="user-disable-'+userID+'"></i>'); |
|
| 1041 | + $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>'); |
|
| 1042 | 1042 | } else { |
| 1043 | 1043 | $('#user-disable-'+userID).remove(); |
| 1044 | 1044 | } |
@@ -43,12 +43,12 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // Load AntiXSS |
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 47 | 47 | $antiXss = new voku\helper\AntiXSS(); |
| 48 | 48 | |
| 49 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 50 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 51 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 49 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 50 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 51 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 52 | 52 | |
| 53 | 53 | // init |
| 54 | 54 | $ldap_suffix = ''; |
@@ -57,12 +57,12 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | // If Debug then clean the files |
| 59 | 59 | if (DEBUGLDAP === true) { |
| 60 | - define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt'); |
|
| 60 | + define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt'); |
|
| 61 | 61 | $fp = fopen(DEBUGLDAPFILE, 'w'); |
| 62 | 62 | fclose($fp); |
| 63 | 63 | } |
| 64 | 64 | if (DEBUGDUO === true) { |
| 65 | - define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt'); |
|
| 65 | + define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt'); |
|
| 66 | 66 | $fp = fopen(DEBUGDUOFILE, 'w'); |
| 67 | 67 | fclose($fp); |
| 68 | 68 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 80 | 80 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 81 | 81 | } |
| 82 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 82 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 83 | 83 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 84 | 84 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 85 | 85 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | // Get DUO keys |
| 100 | 100 | $duoData = DB::query( |
| 101 | 101 | 'SELECT intitule, valeur |
| 102 | - FROM ' . prefixTable('misc') . ' |
|
| 102 | + FROM ' . prefixTable('misc').' |
|
| 103 | 103 | WHERE type = %s', |
| 104 | 104 | 'duoSecurity' |
| 105 | 105 | ); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | // load library |
| 111 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 111 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 112 | 112 | $sig_request = Duo::signRequest( |
| 113 | 113 | $_GLOBALS['IKEY'], |
| 114 | 114 | $_GLOBALS['SKEY'], |
@@ -120,17 +120,17 @@ discard block |
||
| 120 | 120 | debugIdentify( |
| 121 | 121 | DEBUGDUO, |
| 122 | 122 | DEBUGDUOFILE, |
| 123 | - "\n\n-----\n\n" . |
|
| 124 | - 'sig request : ' . $post_login . "\n" . |
|
| 125 | - 'resp : ' . $sig_request . "\n" |
|
| 123 | + "\n\n-----\n\n". |
|
| 124 | + 'sig request : '.$post_login."\n". |
|
| 125 | + 'resp : '.$sig_request."\n" |
|
| 126 | 126 | ); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | // load csrfprotector |
| 130 | - $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 130 | + $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 131 | 131 | |
| 132 | 132 | // return result |
| 133 | - echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]'; |
|
| 133 | + echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]'; |
|
| 134 | 134 | // --- |
| 135 | 135 | // --- |
| 136 | 136 | } elseif ($post_type === 'identify_duo_user_check') { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | //-------- |
| 141 | 141 | |
| 142 | 142 | // load library |
| 143 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 143 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 144 | 144 | $authenticated_username = Duo::verifyResponse( |
| 145 | 145 | $SETTINGS['duo_ikey'], |
| 146 | 146 | $SETTINGS['duo_skey'], |
@@ -152,9 +152,9 @@ discard block |
||
| 152 | 152 | debugIdentify( |
| 153 | 153 | DEBUGDUO, |
| 154 | 154 | DEBUGDUOFILE, |
| 155 | - "\n\n-----\n\n" . |
|
| 156 | - 'sig response : ' . $post_sig_response . "\n" . |
|
| 157 | - 'resp : ' . $authenticated_username . "\n" |
|
| 155 | + "\n\n-----\n\n". |
|
| 156 | + 'sig response : '.$post_sig_response."\n". |
|
| 157 | + 'resp : '.$authenticated_username."\n" |
|
| 158 | 158 | ); |
| 159 | 159 | } |
| 160 | 160 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | // is user in Teampass? |
| 166 | 166 | $userInfo = DB::queryfirstrow( |
| 167 | 167 | 'SELECT id |
| 168 | - FROM ' . prefixTable('users') . ' |
|
| 168 | + FROM ' . prefixTable('users').' |
|
| 169 | 169 | WHERE login = %s', |
| 170 | 170 | $post_login |
| 171 | 171 | ); |
@@ -176,9 +176,9 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - echo '[{"authenticated_username" : "' . $authenticated_username . '"}]'; |
|
| 179 | + echo '[{"authenticated_username" : "'.$authenticated_username.'"}]'; |
|
| 180 | 180 | } else { |
| 181 | - echo '[{"authenticated_username" : "' . $authenticated_username . '"}]'; |
|
| 181 | + echo '[{"authenticated_username" : "'.$authenticated_username.'"}]'; |
|
| 182 | 182 | } |
| 183 | 183 | // --- |
| 184 | 184 | // --- |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | |
| 191 | 191 | // Load superGlobals |
| 192 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 192 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 193 | 193 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 194 | 194 | |
| 195 | 195 | // Prepare GET variables |
@@ -282,19 +282,19 @@ discard block |
||
| 282 | 282 | } else { |
| 283 | 283 | throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
| 284 | 284 | } |
| 285 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 285 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 286 | 286 | |
| 287 | 287 | header('Content-type: text/html; charset=utf-8'); |
| 288 | 288 | error_reporting(E_ERROR); |
| 289 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 290 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 289 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 290 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 291 | 291 | |
| 292 | 292 | // Load AntiXSS |
| 293 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 293 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 294 | 294 | $antiXss = new voku\helper\AntiXSS(); |
| 295 | 295 | |
| 296 | 296 | // Load superGlobals |
| 297 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 297 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 298 | 298 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 299 | 299 | |
| 300 | 300 | // Prepare GET variables |
@@ -308,11 +308,11 @@ discard block |
||
| 308 | 308 | debugIdentify( |
| 309 | 309 | DEBUGDUO, |
| 310 | 310 | DEBUGDUOFILE, |
| 311 | - "Content of data sent '" . filter_var($sentData, FILTER_SANITIZE_STRING) . "'\n" |
|
| 311 | + "Content of data sent '".filter_var($sentData, FILTER_SANITIZE_STRING)."'\n" |
|
| 312 | 312 | ); |
| 313 | 313 | |
| 314 | 314 | // connect to the server |
| 315 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 315 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 316 | 316 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 317 | 317 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 318 | 318 | } |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | DB::$encoding = DB_ENCODING; |
| 325 | 325 | |
| 326 | 326 | // User's language loading |
| 327 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php'; |
|
| 327 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php'; |
|
| 328 | 328 | //echo $dataReceived." -->".empty($sessionKey)."<-- ".$sessionKey." ** " ; |
| 329 | 329 | // decrypt and retreive data in JSON format |
| 330 | 330 | if (empty($sessionKey) === true) { |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | // Check if user exists |
| 412 | 412 | $userInfo = DB::queryFirstRow( |
| 413 | 413 | 'SELECT * |
| 414 | - FROM ' . prefixTable('users') . ' |
|
| 414 | + FROM ' . prefixTable('users').' |
|
| 415 | 415 | WHERE login=%s', |
| 416 | 416 | $username |
| 417 | 417 | ); |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | //$arrAttempts = array(); |
| 635 | 635 | $rows = DB::query( |
| 636 | 636 | 'SELECT date |
| 637 | - FROM ' . prefixTable('log_system') . " |
|
| 637 | + FROM ' . prefixTable('log_system')." |
|
| 638 | 638 | WHERE field_1 = %s |
| 639 | 639 | AND type = 'failed_auth' |
| 640 | 640 | AND label = 'user_password_not_correct' |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | foreach ($rows as $record) { |
| 651 | 651 | array_push( |
| 652 | 652 | $arrAttempts, |
| 653 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) |
|
| 653 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']) |
|
| 654 | 654 | ); |
| 655 | 655 | } |
| 656 | 656 | } |
@@ -790,7 +790,7 @@ discard block |
||
| 790 | 790 | foreach ($superGlobal->get('user_roles', 'SESSION') as $role) { |
| 791 | 791 | $resRoles = DB::queryFirstRow( |
| 792 | 792 | 'SELECT title, complexity |
| 793 | - FROM ' . prefixTable('roles_title') . ' |
|
| 793 | + FROM ' . prefixTable('roles_title').' |
|
| 794 | 794 | WHERE id=%i', |
| 795 | 795 | $role |
| 796 | 796 | ); |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | |
| 812 | 812 | // build complete array of roles |
| 813 | 813 | $superGlobal->put('arr_roles_full', array(), 'SESSION'); |
| 814 | - $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 814 | + $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 815 | 815 | foreach ($rows as $record) { |
| 816 | 816 | $superGlobal->put( |
| 817 | 817 | $record['id'], |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | if (!empty($item)) { |
| 907 | 907 | $dataLastItems = DB::queryFirstRow( |
| 908 | 908 | 'SELECT id,label,id_tree |
| 909 | - FROM ' . prefixTable('items') . ' |
|
| 909 | + FROM ' . prefixTable('items').' |
|
| 910 | 910 | WHERE id=%i', |
| 911 | 911 | $item |
| 912 | 912 | ); |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | array( |
| 916 | 916 | 'id' => $item, |
| 917 | 917 | 'label' => $dataLastItems['label'], |
| 918 | - 'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item, |
|
| 918 | + 'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item, |
|
| 919 | 919 | ), |
| 920 | 920 | 'SESSION', |
| 921 | 921 | 'latest_items_tab' |
@@ -932,12 +932,12 @@ discard block |
||
| 932 | 932 | ) { |
| 933 | 933 | // get all Admin users |
| 934 | 934 | $receivers = ''; |
| 935 | - $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1); |
|
| 935 | + $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1); |
|
| 936 | 936 | foreach ($rows as $record) { |
| 937 | 937 | if (empty($receivers)) { |
| 938 | 938 | $receivers = $record['email']; |
| 939 | 939 | } else { |
| 940 | - $receivers = ',' . $record['email']; |
|
| 940 | + $receivers = ','.$record['email']; |
|
| 941 | 941 | } |
| 942 | 942 | } |
| 943 | 943 | // Add email to table |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | '#tp_time#', |
| 954 | 954 | ), |
| 955 | 955 | array( |
| 956 | - ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')', |
|
| 956 | + ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')', |
|
| 957 | 957 | date($SETTINGS['date_format'], $superGlobal->get('last_connection', 'SESSION')), |
| 958 | 958 | date($SETTINGS['time_format'], $superGlobal->get('last_connection', 'SESSION')), |
| 959 | 959 | ), |
@@ -1102,8 +1102,8 @@ discard block |
||
| 1102 | 1102 | debugIdentify( |
| 1103 | 1103 | DEBUGDUO, |
| 1104 | 1104 | DEBUGDUOFILE, |
| 1105 | - "\n\n----\n" . |
|
| 1106 | - 'Identified : ' . filter_var($return, FILTER_SANITIZE_STRING) . "\n\n" |
|
| 1105 | + "\n\n----\n". |
|
| 1106 | + 'Identified : '.filter_var($return, FILTER_SANITIZE_STRING)."\n\n" |
|
| 1107 | 1107 | ); |
| 1108 | 1108 | |
| 1109 | 1109 | echo prepareExchangedData( |
@@ -1169,44 +1169,44 @@ discard block |
||
| 1169 | 1169 | ]; |
| 1170 | 1170 | |
| 1171 | 1171 | // Load expected libraries |
| 1172 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/illuminate/Contracts/Auth/Authenticatable.php'; |
|
| 1173 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php'; |
|
| 1174 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 1175 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 1176 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 1177 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php'; |
|
| 1178 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php'; |
|
| 1179 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php'; |
|
| 1180 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php'; |
|
| 1181 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 1182 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 1183 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 1184 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 1185 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 1186 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 1187 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 1188 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 1189 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 1190 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 1191 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 1192 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 1193 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 1194 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 1195 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 1196 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 1197 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 1198 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 1199 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 1200 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 1201 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 1202 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 1203 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 1204 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 1205 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 1206 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 1207 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 1208 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 1209 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 1172 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/illuminate/Contracts/Auth/Authenticatable.php'; |
|
| 1173 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php'; |
|
| 1174 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 1175 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 1176 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 1177 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php'; |
|
| 1178 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php'; |
|
| 1179 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php'; |
|
| 1180 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php'; |
|
| 1181 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 1182 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 1183 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 1184 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 1185 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 1186 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 1187 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 1188 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 1189 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 1190 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 1191 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 1192 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 1193 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 1194 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 1195 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 1196 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 1197 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 1198 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 1199 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 1200 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 1201 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 1202 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 1203 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 1204 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 1205 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 1206 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 1207 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 1208 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 1209 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 1210 | 1210 | |
| 1211 | 1211 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 1212 | 1212 | $ad->register(); |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | |
| 1222 | 1222 | return array( |
| 1223 | 1223 | 'error' => true, |
| 1224 | - 'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage()." ".$config['username'], |
|
| 1224 | + 'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage()." ".$config['username'], |
|
| 1225 | 1225 | |
| 1226 | 1226 | ); |
| 1227 | 1227 | } |
@@ -1249,7 +1249,7 @@ discard block |
||
| 1249 | 1249 | } |
| 1250 | 1250 | |
| 1251 | 1251 | // load passwordLib library |
| 1252 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1252 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1253 | 1253 | $pwdlib->register(); |
| 1254 | 1254 | $pwdlib = new PasswordLib\PasswordLib(); |
| 1255 | 1255 | $hashedPassword = $pwdlib->createPasswordHash($passwordClear); |
@@ -1265,7 +1265,7 @@ discard block |
||
| 1265 | 1265 | 'id = %i', |
| 1266 | 1266 | $userInfo['id'] |
| 1267 | 1267 | ); |
| 1268 | - } else if ($userInfo['special']=== 'user_added_from_ldap') { |
|
| 1268 | + } else if ($userInfo['special'] === 'user_added_from_ldap') { |
|
| 1269 | 1269 | // Case where user has been added from LDAP and never being connected to TP |
| 1270 | 1270 | // We need to create his keys |
| 1271 | 1271 | /*$userKeys = generateUserKeys($passwordClear); |
@@ -1318,7 +1318,7 @@ discard block |
||
| 1318 | 1318 | function yubicoMFACheck($dataReceived, $userInfo, $SETTINGS) |
| 1319 | 1319 | { |
| 1320 | 1320 | // Load superGlobals |
| 1321 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1321 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1322 | 1322 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1323 | 1323 | $sessionAdmin = $superGlobal->get('user_admin', 'SESSION'); |
| 1324 | 1324 | $sessionUrl = $superGlobal->get('initial_url', 'SESSION'); |
@@ -1361,7 +1361,7 @@ discard block |
||
| 1361 | 1361 | } |
| 1362 | 1362 | |
| 1363 | 1363 | // Now check yubico validity |
| 1364 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 1364 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 1365 | 1365 | $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key); |
| 1366 | 1366 | $auth = $yubi->verify($yubico_key); //, null, null, null, 60 |
| 1367 | 1367 | |
@@ -1416,7 +1416,7 @@ discard block |
||
| 1416 | 1416 | 'gestionnaire' => '0', |
| 1417 | 1417 | 'can_manage_all_users' => '0', |
| 1418 | 1418 | 'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0', |
| 1419 | - 'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'), |
|
| 1419 | + 'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'), |
|
| 1420 | 1420 | 'groupes_interdits' => '', |
| 1421 | 1421 | 'groupes_visibles' => '', |
| 1422 | 1422 | 'last_pw_change' => time(), |
@@ -1442,7 +1442,7 @@ discard block |
||
| 1442 | 1442 | ); |
| 1443 | 1443 | |
| 1444 | 1444 | // Rebuild tree |
| 1445 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1445 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1446 | 1446 | $tree->register(); |
| 1447 | 1447 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1448 | 1448 | $tree->rebuild(); |
@@ -1473,7 +1473,7 @@ discard block |
||
| 1473 | 1473 | && empty($dataReceived['GACode']) === false |
| 1474 | 1474 | ) { |
| 1475 | 1475 | // Load superGlobals |
| 1476 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1476 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1477 | 1477 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1478 | 1478 | $sessionAdmin = $superGlobal->get('user_admin', 'SESSION'); |
| 1479 | 1479 | $sessionUrl = $superGlobal->get('initial_url', 'SESSION'); |
@@ -1483,7 +1483,7 @@ discard block |
||
| 1483 | 1483 | $proceedIdentification = false; |
| 1484 | 1484 | |
| 1485 | 1485 | // load library |
| 1486 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 1486 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 1487 | 1487 | |
| 1488 | 1488 | // create new instance |
| 1489 | 1489 | $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']); |
@@ -1509,7 +1509,7 @@ discard block |
||
| 1509 | 1509 | |
| 1510 | 1510 | // generate new QR |
| 1511 | 1511 | $new_2fa_qr = $tfa->getQRCodeImageAsDataUri( |
| 1512 | - 'Teampass - ' . $username, |
|
| 1512 | + 'Teampass - '.$username, |
|
| 1513 | 1513 | $userInfo['ga'] |
| 1514 | 1514 | ); |
| 1515 | 1515 | |
@@ -1524,7 +1524,7 @@ discard block |
||
| 1524 | 1524 | ); |
| 1525 | 1525 | |
| 1526 | 1526 | $firstTime = array( |
| 1527 | - 'value' => '<img src="' . $new_2fa_qr . '">', |
|
| 1527 | + 'value' => '<img src="'.$new_2fa_qr.'">', |
|
| 1528 | 1528 | 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '', |
| 1529 | 1529 | 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '', |
| 1530 | 1530 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
@@ -1577,8 +1577,8 @@ discard block |
||
| 1577 | 1577 | $userPasswordVerified = false; |
| 1578 | 1578 | |
| 1579 | 1579 | // load passwordLib library |
| 1580 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1581 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1580 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1581 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1582 | 1582 | $pwdlib->register(); |
| 1583 | 1583 | $pwdlib = new PasswordLib\PasswordLib(); |
| 1584 | 1584 | |
@@ -35,12 +35,12 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // Do checks |
| 38 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 39 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 38 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 39 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 40 | 40 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) { |
| 41 | 41 | // Not allowed page |
| 42 | 42 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 43 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 43 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 44 | 44 | exit(); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -53,14 +53,14 @@ discard block |
||
| 53 | 53 | date_default_timezone_set('UTC'); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 57 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 57 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 58 | 58 | header('Content-type: text/html; charset=utf-8'); |
| 59 | 59 | header('Cache-Control: no-cache, must-revalidate'); |
| 60 | 60 | require_once 'main.functions.php'; |
| 61 | 61 | |
| 62 | 62 | //Connect to DB |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 64 | 64 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 65 | 65 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 66 | 66 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $arrFolders = array(); |
| 116 | 116 | $rows = DB::query( |
| 117 | 117 | 'SELECT valeur, intitule |
| 118 | - FROM ' . prefixTable('misc') . ' |
|
| 118 | + FROM ' . prefixTable('misc').' |
|
| 119 | 119 | WHERE type = %s', |
| 120 | 120 | 'folder_deleted' |
| 121 | 121 | ); |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | 'SELECT u.login as login, u.name as name, u.lastname as lastname, |
| 137 | 137 | i.id as id, i.label as label, |
| 138 | 138 | i.id_tree as id_tree, l.date as date, n.title as folder_title |
| 139 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 140 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 141 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 142 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id) |
|
| 139 | + FROM ' . prefixTable('log_items').' as l |
|
| 140 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 141 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 142 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id) |
|
| 143 | 143 | WHERE i.inactif = %i |
| 144 | 144 | AND l.action = %s', |
| 145 | 145 | 1, |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | 'label' => $record['label'], |
| 162 | 162 | 'date' => date($SETTINGS['date_format'], $record['date']), |
| 163 | 163 | 'login' => $record['login'], |
| 164 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 164 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 165 | 165 | 'folder_label' => $record['folder_title'], |
| 166 | 166 | 'folder_deleted' => $thisFolder, |
| 167 | 167 | ) |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | foreach ($post_folders as $folderId) { |
| 217 | 217 | $data = DB::queryfirstrow( |
| 218 | 218 | 'SELECT valeur |
| 219 | - FROM ' . prefixTable('misc') . " |
|
| 219 | + FROM ' . prefixTable('misc')." |
|
| 220 | 220 | WHERE type = 'folder_deleted' |
| 221 | 221 | AND intitule = %s", |
| 222 | - 'f' . $folderId |
|
| 222 | + 'f'.$folderId |
|
| 223 | 223 | ); |
| 224 | 224 | if ((int) $data['valeur'] !== 0) { |
| 225 | 225 | $folderData = explode(', ', $data['valeur']); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | prefixTable('misc'), |
| 246 | 246 | 'type = %s AND intitule = %s', |
| 247 | 247 | 'folder_deleted', |
| 248 | - 'f' . $folderId |
|
| 248 | + 'f'.$folderId |
|
| 249 | 249 | ); |
| 250 | 250 | |
| 251 | 251 | // Restore all items in this folder |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | // Get list of all items in thos folder |
| 262 | 262 | $items = DB::query( |
| 263 | 263 | 'SELECT id |
| 264 | - FROM ' . prefixTable('items') . ' |
|
| 264 | + FROM ' . prefixTable('items').' |
|
| 265 | 265 | WHERE id_tree = %i', |
| 266 | 266 | $folderId |
| 267 | 267 | ); |
@@ -346,10 +346,10 @@ discard block |
||
| 346 | 346 | foreach ($post_folders as $folderId) { |
| 347 | 347 | $data = DB::queryfirstrow( |
| 348 | 348 | 'SELECT valeur |
| 349 | - FROM ' . prefixTable('misc') . " |
|
| 349 | + FROM ' . prefixTable('misc')." |
|
| 350 | 350 | WHERE type = 'folder_deleted' |
| 351 | 351 | AND intitule = %s", |
| 352 | - 'f' . $folderId |
|
| 352 | + 'f'.$folderId |
|
| 353 | 353 | ); |
| 354 | 354 | if ((int) $data['valeur'] !== 0) { |
| 355 | 355 | $folderData = explode(', ', $data['valeur']); |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | prefixTable('misc'), |
| 382 | 382 | 'type = %s AND intitule = %s', |
| 383 | 383 | 'folder_deleted', |
| 384 | - 'f' . $folderData[0] |
|
| 384 | + 'f'.$folderData[0] |
|
| 385 | 385 | ); |
| 386 | 386 | |
| 387 | 387 | // Delete all items in this folder |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // Get list of all items in thos folder |
| 396 | 396 | $items = DB::query( |
| 397 | 397 | 'SELECT id |
| 398 | - FROM ' . prefixTable('items') . ' |
|
| 398 | + FROM ' . prefixTable('items').' |
|
| 399 | 399 | WHERE id_tree = %i', |
| 400 | 400 | $folderData[0] |
| 401 | 401 | ); |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | ) { |
| 490 | 490 | if ($post_log_type === 'items') { |
| 491 | 491 | DB::query( |
| 492 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' . |
|
| 492 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '. |
|
| 493 | 493 | 'AND date BETWEEN %i AND %i', |
| 494 | 494 | 'at_shown', |
| 495 | 495 | $post_date_from, |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | } elseif ($post_log_type === 'connections') { |
| 508 | 508 | db::debugmode(true); |
| 509 | 509 | DB::query( |
| 510 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 510 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 511 | 511 | 'AND date BETWEEN %i AND %i', |
| 512 | 512 | 'user_connection', |
| 513 | 513 | $post_date_from, |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | ); |
| 525 | 525 | } elseif ($post_log_type === 'errors') { |
| 526 | 526 | DB::query( |
| 527 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 527 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 528 | 528 | 'AND date BETWEEN %i AND %i', |
| 529 | 529 | 'error', |
| 530 | 530 | $post_date_from, |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | ); |
| 542 | 542 | } elseif ($post_log_type === 'copy') { |
| 543 | 543 | DB::query( |
| 544 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' . |
|
| 544 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '. |
|
| 545 | 545 | 'AND date BETWEEN %i AND %i', |
| 546 | 546 | 'at_copy', |
| 547 | 547 | $post_date_from, |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | ); |
| 559 | 559 | } elseif ($post_log_type === 'admin') { |
| 560 | 560 | DB::query( |
| 561 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 561 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 562 | 562 | 'AND date BETWEEN %i AND %i', |
| 563 | 563 | 'admin_action', |
| 564 | 564 | $post_date_from, |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | ); |
| 576 | 576 | } elseif ($post_log_type === 'failed') { |
| 577 | 577 | DB::query( |
| 578 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 578 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 579 | 579 | 'AND date BETWEEN %i AND %i', |
| 580 | 580 | 'failed_auth', |
| 581 | 581 | $post_date_from, |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /* do checks */ |
| 48 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 49 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 48 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 49 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 50 | 50 | $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING); |
| 51 | 51 | if ( |
| 52 | 52 | checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | || $isprofileupdate === false |
| 58 | 58 | ) { |
| 59 | 59 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 60 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 60 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 61 | 61 | exit(); |
| 62 | 62 | } else { |
| 63 | 63 | // Do special check to allow user to change attributes of his profile |
@@ -66,20 +66,20 @@ discard block |
||
| 66 | 66 | || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false |
| 67 | 67 | ) { |
| 68 | 68 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 70 | 70 | exit(); |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 75 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 76 | 76 | header('Content-type: text/html; charset=utf-8'); |
| 77 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 78 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 79 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 77 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 78 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 79 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 80 | 80 | |
| 81 | 81 | // Connect to mysql server |
| 82 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 82 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 83 | 83 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 84 | 84 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 85 | 85 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | // Prepare variables |
| 137 | 137 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING); |
| 138 | 138 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
| 139 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 139 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 140 | 140 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING); |
| 141 | 141 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING); |
| 142 | 142 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | // Check if user already exists |
| 166 | 166 | $data = DB::query( |
| 167 | 167 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 168 | - FROM ' . prefixTable('users') . ' |
|
| 168 | + FROM ' . prefixTable('users').' |
|
| 169 | 169 | WHERE login = %s', |
| 170 | 170 | $login |
| 171 | 171 | ); |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | |
| 388 | 388 | // Get info about user to delete |
| 389 | 389 | $data_user = DB::queryfirstrow( |
| 390 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 390 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 391 | 391 | WHERE id = %i', |
| 392 | 392 | $post_id |
| 393 | 393 | ); |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | ); |
| 407 | 407 | // delete personal folder and subfolders |
| 408 | 408 | $data = DB::queryfirstrow( |
| 409 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 409 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 410 | 410 | WHERE title = %s AND personal_folder = %i', |
| 411 | 411 | $post_id, |
| 412 | 412 | '1' |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 420 | 420 | // delete items & logs |
| 421 | 421 | $items = DB::query( |
| 422 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 422 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 423 | 423 | WHERE id_tree=%i AND perso = %i', |
| 424 | 424 | $folder->id, |
| 425 | 425 | '1' |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | |
| 477 | 477 | // Get info about user to delete |
| 478 | 478 | $data_user = DB::queryfirstrow( |
| 479 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 479 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 480 | 480 | WHERE id = %i', |
| 481 | 481 | $post_id |
| 482 | 482 | ); |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | |
| 519 | 519 | // Get info about user to delete |
| 520 | 520 | $data_user = DB::queryfirstrow( |
| 521 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 521 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 522 | 522 | WHERE id = %i', |
| 523 | 523 | $post_id |
| 524 | 524 | ); |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | // Get info about user to delete |
| 562 | 562 | $data_user = DB::queryfirstrow( |
| 563 | 563 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 564 | - FROM ' . prefixTable('users') . ' |
|
| 564 | + FROM ' . prefixTable('users').' |
|
| 565 | 565 | WHERE id = %i', |
| 566 | 566 | $post_id |
| 567 | 567 | ); |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | // Get info about user to delete |
| 607 | 607 | $data_user = DB::queryfirstrow( |
| 608 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 608 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 609 | 609 | WHERE id = %i', |
| 610 | 610 | $post_id |
| 611 | 611 | ); |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | // Get info about user to delete |
| 649 | 649 | $data_user = DB::queryfirstrow( |
| 650 | 650 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 651 | - FROM ' . prefixTable('users') . ' |
|
| 651 | + FROM ' . prefixTable('users').' |
|
| 652 | 652 | WHERE id = %i', |
| 653 | 653 | $post_id |
| 654 | 654 | ); |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | // Get info about user to delete |
| 692 | 692 | $data_user = DB::queryfirstrow( |
| 693 | 693 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 694 | - FROM ' . prefixTable('users') . ' |
|
| 694 | + FROM ' . prefixTable('users').' |
|
| 695 | 695 | WHERE id = %i', |
| 696 | 696 | $post_id |
| 697 | 697 | ); |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | // Get info about user to delete |
| 732 | 732 | $data_user = DB::queryfirstrow( |
| 733 | 733 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 734 | - FROM ' . prefixTable('users') . ' |
|
| 734 | + FROM ' . prefixTable('users').' |
|
| 735 | 735 | WHERE id = %i', |
| 736 | 736 | $post_id |
| 737 | 737 | ); |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | $return = array(); |
| 771 | 771 | // Check if folder exists |
| 772 | 772 | $data = DB::query( |
| 773 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 773 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 774 | 774 | WHERE title = %s AND parent_id = %i', |
| 775 | 775 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING), |
| 776 | 776 | '0' |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | } |
| 784 | 784 | // Check if role exists |
| 785 | 785 | $data = DB::query( |
| 786 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 786 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 787 | 787 | WHERE title = %s', |
| 788 | 788 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING) |
| 789 | 789 | ); |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | case 'user_log_items': |
| 804 | 804 | $nb_pages = 1; |
| 805 | 805 | $logs = $sql_filter = ''; |
| 806 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . ' : </td>'; |
|
| 806 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').' : </td>'; |
|
| 807 | 807 | |
| 808 | 808 | // Prepare POST variables |
| 809 | 809 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -815,14 +815,14 @@ discard block |
||
| 815 | 815 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)) |
| 816 | 816 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all' |
| 817 | 817 | ) { |
| 818 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'"; |
|
| 818 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'"; |
|
| 819 | 819 | } |
| 820 | 820 | // get number of pages |
| 821 | 821 | DB::query( |
| 822 | 822 | 'SELECT * |
| 823 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 824 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 825 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 823 | + FROM ' . prefixTable('log_items').' as l |
|
| 824 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 825 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 826 | 826 | WHERE l.id_user = %i ' . $sql_filter, |
| 827 | 827 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 828 | 828 | ); |
@@ -840,19 +840,19 @@ discard block |
||
| 840 | 840 | // launch query |
| 841 | 841 | $rows = DB::query( |
| 842 | 842 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 843 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 844 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 845 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 846 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 843 | + FROM ' . prefixTable('log_items').' as l |
|
| 844 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 845 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 846 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 847 | 847 | ORDER BY date DESC |
| 848 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 848 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 849 | 849 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 850 | 850 | ); |
| 851 | 851 | } else { |
| 852 | 852 | // get number of pages |
| 853 | 853 | DB::query( |
| 854 | 854 | 'SELECT * |
| 855 | - FROM ' . prefixTable('log_system') . ' |
|
| 855 | + FROM ' . prefixTable('log_system').' |
|
| 856 | 856 | WHERE type = %s AND field_1=%i', |
| 857 | 857 | 'user_mngt', |
| 858 | 858 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | // launch query |
| 872 | 872 | $rows = DB::query( |
| 873 | 873 | 'SELECT * |
| 874 | - FROM ' . prefixTable('log_system') . ' |
|
| 874 | + FROM ' . prefixTable('log_system').' |
|
| 875 | 875 | WHERE type = %s AND field_1 = %i |
| 876 | 876 | ORDER BY date DESC |
| 877 | 877 | LIMIT %i, %i', |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | if (isset($counter) && $counter != 0) { |
| 886 | 886 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 887 | 887 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 888 | - $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>'; |
|
| 888 | + $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>'; |
|
| 889 | 889 | } |
| 890 | 890 | } |
| 891 | 891 | $pages .= '</tr></table>'; |
@@ -894,13 +894,13 @@ discard block |
||
| 894 | 894 | if ($post_scope === 'user_mngt') { |
| 895 | 895 | $user = DB::queryfirstrow( |
| 896 | 896 | 'SELECT login |
| 897 | - from ' . prefixTable('users') . ' |
|
| 897 | + from ' . prefixTable('users').' |
|
| 898 | 898 | WHERE id=%i', |
| 899 | 899 | $record['qui'] |
| 900 | 900 | ); |
| 901 | 901 | $user_1 = DB::queryfirstrow( |
| 902 | 902 | 'SELECT login |
| 903 | - from ' . prefixTable('users') . ' |
|
| 903 | + from ' . prefixTable('users').' |
|
| 904 | 904 | WHERE id=%i', |
| 905 | 905 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 906 | 906 | ); |
@@ -910,7 +910,7 @@ discard block |
||
| 910 | 910 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 911 | 911 | $label = langHdl('log_user_initial_pwd_changed'); |
| 912 | 912 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 913 | - $label = langHdl('log_user_email_changed') . $tmp[1]; |
|
| 913 | + $label = langHdl('log_user_email_changed').$tmp[1]; |
|
| 914 | 914 | } elseif ($tmp[0] == 'at_user_added') { |
| 915 | 915 | $label = langHdl('log_user_created'); |
| 916 | 916 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -921,14 +921,14 @@ discard block |
||
| 921 | 921 | $label = langHdl('log_user_pwd_changed'); |
| 922 | 922 | } |
| 923 | 923 | // prepare log |
| 924 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>'; |
|
| 924 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>'; |
|
| 925 | 925 | } else { |
| 926 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>'; |
|
| 926 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>'; |
|
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | 929 | } |
| 930 | 930 | |
| 931 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 931 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 932 | 932 | break; |
| 933 | 933 | |
| 934 | 934 | /* |
@@ -953,14 +953,14 @@ discard block |
||
| 953 | 953 | } else { |
| 954 | 954 | // Get folder id for Admin |
| 955 | 955 | $admin_folder = DB::queryFirstRow( |
| 956 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 956 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 957 | 957 | WHERE title = %i AND personal_folder = %i', |
| 958 | 958 | intval($_SESSION['user_id']), |
| 959 | 959 | '1' |
| 960 | 960 | ); |
| 961 | 961 | // Get folder id for User |
| 962 | 962 | $user_folder = DB::queryFirstRow( |
| 963 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 963 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 964 | 964 | WHERE title=%i AND personal_folder = %i', |
| 965 | 965 | intval($user_id), |
| 966 | 966 | '1' |
@@ -970,15 +970,15 @@ discard block |
||
| 970 | 970 | // Get each Items in PF |
| 971 | 971 | $rows = DB::query( |
| 972 | 972 | 'SELECT i.pw, i.label, l.id_user |
| 973 | - FROM ' . prefixTable('items') . ' as i |
|
| 974 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 973 | + FROM ' . prefixTable('items').' as i |
|
| 974 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 975 | 975 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 976 | 976 | 'at_creation', |
| 977 | 977 | '1', |
| 978 | 978 | intval($folder->id) |
| 979 | 979 | ); |
| 980 | 980 | foreach ($rows as $record) { |
| 981 | - echo $record['label'] . ' - '; |
|
| 981 | + echo $record['label'].' - '; |
|
| 982 | 982 | // Change user |
| 983 | 983 | DB::update( |
| 984 | 984 | prefixTable('log_items'), |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | // Get info about user to delete |
| 1014 | 1014 | $data_user = DB::queryfirstrow( |
| 1015 | 1015 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1016 | - FROM ' . prefixTable('users') . ' |
|
| 1016 | + FROM ' . prefixTable('users').' |
|
| 1017 | 1017 | WHERE id = %i', |
| 1018 | 1018 | $post_user_id |
| 1019 | 1019 | ); |
@@ -1050,7 +1050,7 @@ discard block |
||
| 1050 | 1050 | |
| 1051 | 1051 | // Do |
| 1052 | 1052 | $rows = DB::query( |
| 1053 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1053 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1054 | 1054 | WHERE timestamp != %s AND admin != %i', |
| 1055 | 1055 | '', |
| 1056 | 1056 | '1' |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | // Get info about user to delete |
| 1060 | 1060 | $data_user = DB::queryfirstrow( |
| 1061 | 1061 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1062 | - FROM ' . prefixTable('users') . ' |
|
| 1062 | + FROM ' . prefixTable('users').' |
|
| 1063 | 1063 | WHERE id = %i', |
| 1064 | 1064 | $record['id'] |
| 1065 | 1065 | ); |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | // Get info about user |
| 1114 | 1114 | $rowUser = DB::queryfirstrow( |
| 1115 | 1115 | 'SELECT * |
| 1116 | - FROM ' . prefixTable('users') . ' |
|
| 1116 | + FROM ' . prefixTable('users').' |
|
| 1117 | 1117 | WHERE id = %i', |
| 1118 | 1118 | $post_id |
| 1119 | 1119 | ); |
@@ -1131,7 +1131,7 @@ discard block |
||
| 1131 | 1131 | $arrFldAllowed = array(); |
| 1132 | 1132 | |
| 1133 | 1133 | //Build tree |
| 1134 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1134 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1135 | 1135 | $tree->register(); |
| 1136 | 1136 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1137 | 1137 | |
@@ -1142,7 +1142,7 @@ discard block |
||
| 1142 | 1142 | // array of roles for actual user |
| 1143 | 1143 | $my_functions = explode(';', $_SESSION['fonction_id']); |
| 1144 | 1144 | |
| 1145 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1145 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1146 | 1146 | foreach ($rows as $record) { |
| 1147 | 1147 | if ( |
| 1148 | 1148 | (int) $_SESSION['is_admin'] === 1 |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | $rolesList = array(); |
| 1179 | 1179 | $managedBy = array(); |
| 1180 | 1180 | $selected = ''; |
| 1181 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1181 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1182 | 1182 | foreach ($rows as $reccord) { |
| 1183 | 1183 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1184 | 1184 | } |
@@ -1209,7 +1209,7 @@ discard block |
||
| 1209 | 1209 | array_push( |
| 1210 | 1210 | $managedBy, |
| 1211 | 1211 | array( |
| 1212 | - 'title' => langHdl('managers_of') . ' ' . $fonction['title'], |
|
| 1212 | + 'title' => langHdl('managers_of').' '.$fonction['title'], |
|
| 1213 | 1213 | 'id' => $fonction['id'], |
| 1214 | 1214 | 'selected' => $selected, |
| 1215 | 1215 | ) |
@@ -1291,9 +1291,9 @@ discard block |
||
| 1291 | 1291 | |
| 1292 | 1292 | // get USER STATUS |
| 1293 | 1293 | if ($rowUser['disabled'] == 1) { |
| 1294 | - $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>'; |
|
| 1294 | + $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>'; |
|
| 1295 | 1295 | } else { |
| 1296 | - $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . langHdl('user_info_lock_question'); |
|
| 1296 | + $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.langHdl('user_info_lock_question'); |
|
| 1297 | 1297 | } |
| 1298 | 1298 | |
| 1299 | 1299 | $arrData['error'] = false; |
@@ -1428,19 +1428,19 @@ discard block |
||
| 1428 | 1428 | |
| 1429 | 1429 | // Empty user |
| 1430 | 1430 | if (empty($post_login) === true) { |
| 1431 | - echo '[ { "error" : "' . langHdl('error_empty_data') . '" } ]'; |
|
| 1431 | + echo '[ { "error" : "'.langHdl('error_empty_data').'" } ]'; |
|
| 1432 | 1432 | break; |
| 1433 | 1433 | } |
| 1434 | 1434 | |
| 1435 | 1435 | // User has email? |
| 1436 | 1436 | if (empty($post_email) === true) { |
| 1437 | - echo '[ { "error" : "' . langHdl('error_no_email') . '" } ]'; |
|
| 1437 | + echo '[ { "error" : "'.langHdl('error_no_email').'" } ]'; |
|
| 1438 | 1438 | break; |
| 1439 | 1439 | } |
| 1440 | 1440 | |
| 1441 | 1441 | // Get info about user to delete |
| 1442 | 1442 | $data_user = DB::queryfirstrow( |
| 1443 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1443 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1444 | 1444 | WHERE id = %i', |
| 1445 | 1445 | $post_id |
| 1446 | 1446 | ); |
@@ -1461,7 +1461,7 @@ discard block |
||
| 1461 | 1461 | ); |
| 1462 | 1462 | // delete personal folder and subfolders |
| 1463 | 1463 | $data = DB::queryfirstrow( |
| 1464 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1464 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1465 | 1465 | WHERE title = %s AND personal_folder = %i', |
| 1466 | 1466 | $post_id, |
| 1467 | 1467 | '1' |
@@ -1474,7 +1474,7 @@ discard block |
||
| 1474 | 1474 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1475 | 1475 | // delete items & logs |
| 1476 | 1476 | $items = DB::query( |
| 1477 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1477 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1478 | 1478 | WHERE id_tree=%i AND perso = %i', |
| 1479 | 1479 | $folder->id, |
| 1480 | 1480 | '1' |
@@ -1495,7 +1495,7 @@ discard block |
||
| 1495 | 1495 | } else { |
| 1496 | 1496 | // Get old data about user |
| 1497 | 1497 | $oldData = DB::queryfirstrow( |
| 1498 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1498 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1499 | 1499 | WHERE id = %i', |
| 1500 | 1500 | $post_id |
| 1501 | 1501 | ); |
@@ -1525,7 +1525,7 @@ discard block |
||
| 1525 | 1525 | |
| 1526 | 1526 | // update LOG |
| 1527 | 1527 | if ($oldData['email'] !== $post_email) { |
| 1528 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], intval($_SESSION['user_id']), $_SESSION['login'], $post_id); |
|
| 1528 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], intval($_SESSION['user_id']), $_SESSION['login'], $post_id); |
|
| 1529 | 1529 | } |
| 1530 | 1530 | } |
| 1531 | 1531 | echo prepareExchangedData( |
@@ -1580,7 +1580,7 @@ discard block |
||
| 1580 | 1580 | |
| 1581 | 1581 | // Get info about user to delete |
| 1582 | 1582 | $data_user = DB::queryfirstrow( |
| 1583 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1583 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1584 | 1584 | WHERE id = %i', |
| 1585 | 1585 | $post_id |
| 1586 | 1586 | ); |
@@ -1630,7 +1630,7 @@ discard block |
||
| 1630 | 1630 | } |
| 1631 | 1631 | |
| 1632 | 1632 | DB::queryfirstrow( |
| 1633 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1633 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1634 | 1634 | WHERE login = %s', |
| 1635 | 1635 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING) |
| 1636 | 1636 | ); |
@@ -1679,14 +1679,14 @@ discard block |
||
| 1679 | 1679 | $arrData = array(); |
| 1680 | 1680 | |
| 1681 | 1681 | //Build tree |
| 1682 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1682 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1683 | 1683 | $tree->register(); |
| 1684 | 1684 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1685 | 1685 | |
| 1686 | 1686 | // get User info |
| 1687 | 1687 | $rowUser = DB::queryFirstRow( |
| 1688 | 1688 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb |
| 1689 | - FROM ' . prefixTable('users') . ' |
|
| 1689 | + FROM ' . prefixTable('users').' |
|
| 1690 | 1690 | WHERE id = %i', |
| 1691 | 1691 | $post_id |
| 1692 | 1692 | ); |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | // refine folders based upon roles |
| 1706 | 1706 | $rows = DB::query( |
| 1707 | 1707 | 'SELECT folder_id, type |
| 1708 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1708 | + FROM ' . prefixTable('roles_values').' |
|
| 1709 | 1709 | WHERE role_id IN %ls |
| 1710 | 1710 | ORDER BY folder_id ASC', |
| 1711 | 1711 | $arrData['functions'] |
@@ -1734,7 +1734,7 @@ discard block |
||
| 1734 | 1734 | // get folder name |
| 1735 | 1735 | $row = DB::queryFirstRow( |
| 1736 | 1736 | 'SELECT title, nlevel, id |
| 1737 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1737 | + FROM ' . prefixTable('nested_tree').' |
|
| 1738 | 1738 | WHERE id = %i', |
| 1739 | 1739 | $fld['id'] |
| 1740 | 1740 | ); |
@@ -1747,37 +1747,37 @@ discard block |
||
| 1747 | 1747 | |
| 1748 | 1748 | // manage right icon |
| 1749 | 1749 | if ($fld['type'] == 'W') { |
| 1750 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1751 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1752 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1750 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1751 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1752 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1753 | 1753 | } elseif ($fld['type'] == 'ND') { |
| 1754 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1755 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1756 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1754 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1755 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1756 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1757 | 1757 | } elseif ($fld['type'] == 'NE') { |
| 1758 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1759 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1760 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1758 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1759 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1760 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1761 | 1761 | } elseif ($fld['type'] == 'NDNE') { |
| 1762 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1763 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1764 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1762 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1763 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1764 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1765 | 1765 | } else { |
| 1766 | 1766 | $color = '#FEBC11'; |
| 1767 | 1767 | $allowed = 'R'; |
| 1768 | 1768 | $title = langHdl('read'); |
| 1769 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>'; |
|
| 1769 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>'; |
|
| 1770 | 1770 | } |
| 1771 | 1771 | |
| 1772 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1773 | - ' <small>[' . $row['id'] . ']</small></td><td>' . $label . '</td></tr>'; |
|
| 1772 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1773 | + ' <small>['.$row['id'].']</small></td><td>'.$label.'</td></tr>'; |
|
| 1774 | 1774 | break; |
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
| 1778 | 1778 | |
| 1779 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1780 | - $html . '</tbody></table>'; |
|
| 1779 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1780 | + $html.'</tbody></table>'; |
|
| 1781 | 1781 | } else { |
| 1782 | 1782 | $html_full = ''; |
| 1783 | 1783 | } |
@@ -1823,7 +1823,7 @@ discard block |
||
| 1823 | 1823 | if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) { |
| 1824 | 1824 | $rows = DB::query( |
| 1825 | 1825 | 'SELECT * |
| 1826 | - FROM ' . prefixTable('users') . ' |
|
| 1826 | + FROM ' . prefixTable('users').' |
|
| 1827 | 1827 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1828 | 1828 | '0', |
| 1829 | 1829 | array_filter($_SESSION['user_roles']) |
@@ -1831,7 +1831,7 @@ discard block |
||
| 1831 | 1831 | } else { |
| 1832 | 1832 | $rows = DB::query( |
| 1833 | 1833 | 'SELECT * |
| 1834 | - FROM ' . prefixTable('users') . ' |
|
| 1834 | + FROM ' . prefixTable('users').' |
|
| 1835 | 1835 | WHERE admin = %i', |
| 1836 | 1836 | '0' |
| 1837 | 1837 | ); |
@@ -1843,7 +1843,7 @@ discard block |
||
| 1843 | 1843 | $groupIds = []; |
| 1844 | 1844 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1845 | 1845 | $tmp = DB::queryfirstrow( |
| 1846 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1846 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1847 | 1847 | WHERE id = %i', |
| 1848 | 1848 | $group |
| 1849 | 1849 | ); |
@@ -1855,7 +1855,7 @@ discard block |
||
| 1855 | 1855 | |
| 1856 | 1856 | // Get managed_by |
| 1857 | 1857 | $managedBy = DB::queryfirstrow( |
| 1858 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1858 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1859 | 1859 | WHERE id = %i', |
| 1860 | 1860 | $record['isAdministratedByRole'] |
| 1861 | 1861 | ); |
@@ -1865,7 +1865,7 @@ discard block |
||
| 1865 | 1865 | $foldersAllowedIds = []; |
| 1866 | 1866 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1867 | 1867 | $tmp = DB::queryfirstrow( |
| 1868 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1868 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1869 | 1869 | WHERE id = %i', |
| 1870 | 1870 | $role |
| 1871 | 1871 | ); |
@@ -1878,7 +1878,7 @@ discard block |
||
| 1878 | 1878 | $foldersForbiddenIds = []; |
| 1879 | 1879 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1880 | 1880 | $tmp = DB::queryfirstrow( |
| 1881 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1881 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1882 | 1882 | WHERE id = %i', |
| 1883 | 1883 | $role |
| 1884 | 1884 | ); |
@@ -1896,7 +1896,7 @@ discard block |
||
| 1896 | 1896 | 'login' => $record['login'], |
| 1897 | 1897 | 'groups' => implode(', ', $groups), |
| 1898 | 1898 | 'groupIds' => $groupIds, |
| 1899 | - 'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'], |
|
| 1899 | + 'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'], |
|
| 1900 | 1900 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1901 | 1901 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1902 | 1902 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1974,7 +1974,7 @@ discard block |
||
| 1974 | 1974 | |
| 1975 | 1975 | // Get info about user |
| 1976 | 1976 | $data_user = DB::queryfirstrow( |
| 1977 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1977 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1978 | 1978 | WHERE id = %i', |
| 1979 | 1979 | $post_source_id |
| 1980 | 1980 | ); |
@@ -2134,14 +2134,14 @@ discard block |
||
| 2134 | 2134 | if (empty($post_context) === false && $post_context = 'add_one_role_to_user') { |
| 2135 | 2135 | $data_user = DB::queryfirstrow( |
| 2136 | 2136 | 'SELECT fonction_id |
| 2137 | - FROM ' . prefixTable('users') . ' |
|
| 2137 | + FROM ' . prefixTable('users').' |
|
| 2138 | 2138 | WHERE id = %i', |
| 2139 | 2139 | $post_user_id |
| 2140 | 2140 | ); |
| 2141 | 2141 | |
| 2142 | 2142 | if ($data_user) { |
| 2143 | 2143 | // Ensure array is unique |
| 2144 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2144 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2145 | 2145 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2146 | 2146 | } else { |
| 2147 | 2147 | // User not found |
@@ -2196,7 +2196,7 @@ discard block |
||
| 2196 | 2196 | if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') { |
| 2197 | 2197 | $record = DB::queryFirstRow( |
| 2198 | 2198 | 'SELECT user_ip_lastdate |
| 2199 | - FROM ' . prefixTable('users') . ' |
|
| 2199 | + FROM ' . prefixTable('users').' |
|
| 2200 | 2200 | WHERE id = %i', |
| 2201 | 2201 | $_SESSION['user_id'] |
| 2202 | 2202 | ); |
@@ -2288,38 +2288,38 @@ discard block |
||
| 2288 | 2288 | ]; |
| 2289 | 2289 | |
| 2290 | 2290 | // Load expected libraries |
| 2291 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2292 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2293 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2294 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2295 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2296 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2297 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2298 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2299 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2300 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2301 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2302 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2303 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2304 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2305 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2306 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2307 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2308 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2309 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2310 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2311 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2312 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2313 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2314 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2315 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2316 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2317 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 2318 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2319 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 2320 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2321 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2322 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2291 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2292 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2293 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2294 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2295 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2296 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2297 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2298 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2299 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2300 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2301 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2302 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2303 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2304 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2305 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2306 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2307 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2308 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2309 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2310 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2311 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2312 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2313 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2314 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2315 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2316 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2317 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 2318 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2319 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 2320 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2321 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2322 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2323 | 2323 | |
| 2324 | 2324 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 2325 | 2325 | $ad->register(); |
@@ -2335,7 +2335,7 @@ discard block |
||
| 2335 | 2335 | echo prepareExchangedData( |
| 2336 | 2336 | array( |
| 2337 | 2337 | 'error' => true, |
| 2338 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2338 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2339 | 2339 | ), |
| 2340 | 2340 | 'encode' |
| 2341 | 2341 | ); |
@@ -2355,11 +2355,11 @@ discard block |
||
| 2355 | 2355 | ['objectclass', '=', 'inetorgperson'], |
| 2356 | 2356 | ])->get(); |
| 2357 | 2357 | |
| 2358 | - foreach($users as $i => $adUser) { |
|
| 2358 | + foreach ($users as $i => $adUser) { |
|
| 2359 | 2359 | //print_r($user); |
| 2360 | 2360 | |
| 2361 | 2361 | // Build the list of all groups in AD |
| 2362 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2362 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2363 | 2363 | if (empty($adUserGroup) === false) { |
| 2364 | 2364 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2365 | 2365 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2374,7 +2374,7 @@ discard block |
||
| 2374 | 2374 | // Get his ID |
| 2375 | 2375 | $user = DB::queryfirstrow( |
| 2376 | 2376 | 'SELECT id, fonction_id, auth_type |
| 2377 | - FROM ' . prefixTable('users') . ' |
|
| 2377 | + FROM ' . prefixTable('users').' |
|
| 2378 | 2378 | WHERE login = %s', |
| 2379 | 2379 | $userLogin |
| 2380 | 2380 | ); |
@@ -2409,7 +2409,7 @@ discard block |
||
| 2409 | 2409 | } |
| 2410 | 2410 | |
| 2411 | 2411 | // Get all groups in Teampass |
| 2412 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2412 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2413 | 2413 | foreach ($rows as $record) { |
| 2414 | 2414 | array_push( |
| 2415 | 2415 | $teampassRoles, |
@@ -2475,7 +2475,7 @@ discard block |
||
| 2475 | 2475 | // Check if user already exists |
| 2476 | 2476 | $data = DB::query( |
| 2477 | 2477 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2478 | - FROM ' . prefixTable('users') . ' |
|
| 2478 | + FROM ' . prefixTable('users').' |
|
| 2479 | 2479 | WHERE login = %s', |
| 2480 | 2480 | $post_login |
| 2481 | 2481 | ); |
@@ -2579,7 +2579,7 @@ discard block |
||
| 2579 | 2579 | ); |
| 2580 | 2580 | |
| 2581 | 2581 | // Rebuild tree |
| 2582 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 2582 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 2583 | 2583 | $tree->register(); |
| 2584 | 2584 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 2585 | 2585 | $tree->rebuild(); |
@@ -2647,7 +2647,7 @@ discard block |
||
| 2647 | 2647 | // Check if user already exists |
| 2648 | 2648 | $data = DB::query( |
| 2649 | 2649 | 'SELECT id |
| 2650 | - FROM ' . prefixTable('users') . ' |
|
| 2650 | + FROM ' . prefixTable('users').' |
|
| 2651 | 2651 | WHERE id = %i', |
| 2652 | 2652 | $post_id |
| 2653 | 2653 | ); |
@@ -2723,7 +2723,7 @@ discard block |
||
| 2723 | 2723 | // Check if user already exists |
| 2724 | 2724 | $userInfo = DB::queryfirstrow( |
| 2725 | 2725 | 'SELECT id, private_key, public_key |
| 2726 | - FROM ' . prefixTable('users') . ' |
|
| 2726 | + FROM ' . prefixTable('users').' |
|
| 2727 | 2727 | WHERE id = %i', |
| 2728 | 2728 | $post_userid |
| 2729 | 2729 | ); |
@@ -2758,7 +2758,7 @@ discard block |
||
| 2758 | 2758 | if (count($_SESSION['personal_folders']) > 0) { |
| 2759 | 2759 | DB::query( |
| 2760 | 2760 | 'SELECT id |
| 2761 | - FROM ' . prefixTable('items') . ' |
|
| 2761 | + FROM ' . prefixTable('items').' |
|
| 2762 | 2762 | WHERE id_tree IN %ls', |
| 2763 | 2763 | $_SESSION['personal_folders'] |
| 2764 | 2764 | ); |
@@ -2836,7 +2836,7 @@ discard block |
||
| 2836 | 2836 | // Check if user already exists |
| 2837 | 2837 | $data = DB::query( |
| 2838 | 2838 | 'SELECT id |
| 2839 | - FROM ' . prefixTable('users') . ' |
|
| 2839 | + FROM ' . prefixTable('users').' |
|
| 2840 | 2840 | WHERE id = %i', |
| 2841 | 2841 | $post_id |
| 2842 | 2842 | ); |
@@ -2890,7 +2890,7 @@ discard block |
||
| 2890 | 2890 | |
| 2891 | 2891 | // Get info about user |
| 2892 | 2892 | $data_user = DB::queryfirstrow( |
| 2893 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2893 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2894 | 2894 | WHERE id = %i', |
| 2895 | 2895 | $value[1] |
| 2896 | 2896 | ); |
@@ -2923,7 +2923,7 @@ discard block |
||
| 2923 | 2923 | logEvents( |
| 2924 | 2924 | $SETTINGS, |
| 2925 | 2925 | 'user_mngt', |
| 2926 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 2926 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 2927 | 2927 | $_SESSION['user_id'], |
| 2928 | 2928 | $_SESSION['login'], |
| 2929 | 2929 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING) |
@@ -2955,7 +2955,7 @@ discard block |
||
| 2955 | 2955 | |
| 2956 | 2956 | // Get info about user |
| 2957 | 2957 | $data_user = DB::queryfirstrow( |
| 2958 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2958 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2959 | 2959 | WHERE id = %i', |
| 2960 | 2960 | $value[1] |
| 2961 | 2961 | ); |
