@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | // Sanitize |
| 52 | 52 | // IMPORTANT: Password should NOT be escaped/sanitized - treat as opaque binary data |
| 53 | 53 | // Only trim whitespace which is safe and expected (fix 3.1.5.10) |
| 54 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
| 54 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
| 55 | 55 | $inputData = dataSanitizer( |
| 56 | 56 | [ |
| 57 | 57 | 'login' => isset($login) === true ? $login : '', |
@@ -76,8 +76,8 @@ discard block |
||
| 76 | 76 | // Check if user exists |
| 77 | 77 | $userInfo = DB::queryfirstrow( |
| 78 | 78 | "SELECT u.id, u.pw, u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.fonction_id, u.can_create_root_folder, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key, a.allowed_folders as user_api_allowed_folders, a.enabled, a.allowed_to_create, a.allowed_to_read, a.allowed_to_update, a.allowed_to_delete |
| 79 | - FROM " . prefixTable('users') . " AS u |
|
| 80 | - INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id=u.id) |
|
| 79 | + FROM " . prefixTable('users')." AS u |
|
| 80 | + INNER JOIN " . prefixTable('api')." AS a ON (a.user_id=u.id) |
|
| 81 | 81 | WHERE login = %s", |
| 82 | 82 | $inputData['login'] |
| 83 | 83 | ); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | // Encrypt the decrypted private key with the session key |
| 122 | 122 | // This allows us to store it securely in the database without exposing it |
| 123 | - require_once API_ROOT_PATH . '/inc/encryption_utils.php'; |
|
| 123 | + require_once API_ROOT_PATH.'/inc/encryption_utils.php'; |
|
| 124 | 124 | $encryptedPrivateKey = encrypt_with_session_key($privateKeyClear, $sessionKey); |
| 125 | 125 | |
| 126 | 126 | if ($encryptedPrivateKey === false) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | if (count($userFunctionId) > 0) { |
| 288 | 288 | $rows = DB::query( |
| 289 | 289 | 'SELECT * |
| 290 | - FROM ' . prefixTable('roles_values') . ' |
|
| 290 | + FROM ' . prefixTable('roles_values').' |
|
| 291 | 291 | WHERE role_id IN %li AND type IN ("W", "ND", "NE", "NDNE", "R")', |
| 292 | 292 | $userFunctionId |
| 293 | 293 | ); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $inc = 0; |
| 314 | 314 | $rows = DB::query( |
| 315 | 315 | 'SELECT id, id_tree |
| 316 | - FROM ' . prefixTable('items') . ' |
|
| 316 | + FROM ' . prefixTable('items').' |
|
| 317 | 317 | WHERE restricted_to LIKE %s'. |
| 318 | 318 | (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''), |
| 319 | 319 | $userInfo['id'], |
@@ -328,8 +328,8 @@ discard block |
||
| 328 | 328 | // Check for the users roles if some specific rights exist on items |
| 329 | 329 | $rows = DB::query( |
| 330 | 330 | 'SELECT i.id_tree, r.item_id |
| 331 | - FROM ' . prefixTable('items') . ' AS i |
|
| 332 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (r.item_id=i.id) |
|
| 331 | + FROM ' . prefixTable('items').' AS i |
|
| 332 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (r.item_id=i.id) |
|
| 333 | 333 | WHERE '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != "" |
| 334 | 334 | ORDER BY i.id_tree ASC', |
| 335 | 335 | count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0') |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | // Add all personal folders |
| 346 | 346 | $rows = DB::queryFirstRow( |
| 347 | 347 | 'SELECT id |
| 348 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 348 | + FROM ' . prefixTable('nested_tree').' |
|
| 349 | 349 | WHERE title = %i AND personal_folder = 1'. |
| 350 | 350 | (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''), |
| 351 | 351 | $userInfo['id'], |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $sessionPwdAttempts = $session->get('pwd_attempts'); |
| 147 | 147 | $sessionUrl = $session->get('user-initial_url'); |
| 148 | 148 | $server = []; |
| 149 | - $server['PHP_AUTH_USER'] = $request->getUser(); |
|
| 149 | + $server['PHP_AUTH_USER'] = $request->getUser(); |
|
| 150 | 150 | $server['PHP_AUTH_PW'] = $request->getPassword(); |
| 151 | 151 | |
| 152 | 152 | // decrypt and retreive data in JSON format |
@@ -166,18 +166,18 @@ discard block |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // Check if Duo auth is in progress and pass the pw and login back to the standard login process |
| 169 | - if( |
|
| 169 | + if ( |
|
| 170 | 170 | isKeyExistingAndEqual('duo', 1, $SETTINGS) === true |
| 171 | 171 | && $dataReceived['user_2fa_selection'] === 'duo' |
| 172 | 172 | && $session->get('user-duo_status') === 'IN_PROGRESS' |
| 173 | 173 | && !empty($dataReceived['duo_state']) |
| 174 | - ){ |
|
| 174 | + ) { |
|
| 175 | 175 | $key = hash('sha256', $dataReceived['duo_state']); |
| 176 | 176 | $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16); |
| 177 | 177 | $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv); |
| 178 | 178 | // Clear the data from the Duo process to continue clean with the standard login process |
| 179 | - $session->set('user-duo_data',''); |
|
| 180 | - if($duo_data_dec === false) { |
|
| 179 | + $session->set('user-duo_data', ''); |
|
| 180 | + if ($duo_data_dec === false) { |
|
| 181 | 181 | // Add failed authentication log |
| 182 | 182 | addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer()); |
| 183 | 183 | |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $dataReceived['login'] = $duo_data['duo_login']; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) { |
|
| 198 | + if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) { |
|
| 199 | 199 | echo json_encode([ |
| 200 | 200 | 'data' => prepareExchangedData( |
| 201 | 201 | [ |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | 0, |
| 506 | 506 | (string) $return, |
| 507 | 507 | (array) $userInfo ?? [], |
| 508 | - false, // not success |
|
| 508 | + false, // not success |
|
| 509 | 509 | 'user_is_locked', |
| 510 | 510 | $lang->get('account_is_locked') |
| 511 | 511 | ), |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | (int) $sessionPwdAttempts, |
| 522 | 522 | (string) $return, |
| 523 | 523 | (array) $userInfo ?? [], |
| 524 | - false, // not success |
|
| 524 | + false, // not success |
|
| 525 | 525 | true, |
| 526 | 526 | $lang->get('error_not_allowed_to_authenticate') |
| 527 | 527 | ), |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | // Get cache tree info |
| 804 | 804 | $cacheTreeData = DB::queryFirstRow( |
| 805 | 805 | 'SELECT visible_folders |
| 806 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 806 | + FROM ' . prefixTable('cache_tree').' |
|
| 807 | 807 | WHERE user_id=%i', |
| 808 | 808 | (int) $session->get('user-id') |
| 809 | 809 | ); |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | && (int) $userInfo['admin'] !== 1 |
| 835 | 835 | ) { |
| 836 | 836 | // get all Admin users |
| 837 | - $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1); |
|
| 837 | + $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1); |
|
| 838 | 838 | if (DB::count() > 0) { |
| 839 | 839 | // Add email to table |
| 840 | 840 | prepareSendingEmail( |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | '#tp_time#', |
| 847 | 847 | ], |
| 848 | 848 | [ |
| 849 | - ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')', |
|
| 849 | + ' '.$session->get('user-login').' (IP: '.getClientIpServer().')', |
|
| 850 | 850 | date($SETTINGS['date_format'], (int) time()), |
| 851 | 851 | date($SETTINGS['time_format'], (int) time()), |
| 852 | 852 | ], |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | if (is_null($userInfo['roles_from_ad_groups']) === false) { |
| 954 | 954 | $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true |
| 955 | 955 | ? $userInfo['roles_from_ad_groups'] |
| 956 | - : $userInfo['fonction_id'] . ';' . $userInfo['roles_from_ad_groups']; |
|
| 956 | + : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups']; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | // Store roles in session |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | // Get roles from database |
| 971 | 971 | $rolesList = DB::query( |
| 972 | 972 | 'SELECT id, title, complexity |
| 973 | - FROM ' . prefixTable('roles_title') . ' |
|
| 973 | + FROM ' . prefixTable('roles_title').' |
|
| 974 | 974 | WHERE id IN %li', |
| 975 | 975 | $session->get('user-roles_array') |
| 976 | 976 | ); |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | { |
| 1060 | 1060 | $rows = DB::query( |
| 1061 | 1061 | 'SELECT date |
| 1062 | - FROM ' . prefixTable('log_system') . " |
|
| 1062 | + FROM ' . prefixTable('log_system')." |
|
| 1063 | 1063 | WHERE field_1 = %s |
| 1064 | 1064 | AND type = 'failed_auth' |
| 1065 | 1065 | AND label = 'password_is_not_correct' |
@@ -1073,7 +1073,7 @@ discard block |
||
| 1073 | 1073 | foreach ($rows as $record) { |
| 1074 | 1074 | array_push( |
| 1075 | 1075 | $arrAttempts, |
| 1076 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) |
|
| 1076 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']) |
|
| 1077 | 1077 | ); |
| 1078 | 1078 | } |
| 1079 | 1079 | } |
@@ -1108,7 +1108,7 @@ discard block |
||
| 1108 | 1108 | $ldapConnection |
| 1109 | 1109 | ) : bool |
| 1110 | 1110 | { |
| 1111 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1111 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1112 | 1112 | |
| 1113 | 1113 | if ((int) $userInfoDisabled === 1) { |
| 1114 | 1114 | return false; |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | // If user has seed but no backup, create it on first successful login |
| 1197 | 1197 | if (!empty($userInfo['user_derivation_seed']) && empty($userInfo['private_key_backup'])) { |
| 1198 | 1198 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1199 | - error_log('TEAMPASS Transparent Recovery - Creating backup for user ' . ($userInfo['login'] ?? 'unknown')); |
|
| 1199 | + error_log('TEAMPASS Transparent Recovery - Creating backup for user '.($userInfo['login'] ?? 'unknown')); |
|
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | 1202 | $derivedKey = deriveBackupKey($userInfo['user_derivation_seed'], $userInfo['public_key'], $SETTINGS); |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | } catch (Exception $e) { |
| 1367 | 1367 | return [ |
| 1368 | 1368 | 'error' => true, |
| 1369 | - 'message' => "Error: " . $e->getMessage(), |
|
| 1369 | + 'message' => "Error: ".$e->getMessage(), |
|
| 1370 | 1370 | ]; |
| 1371 | 1371 | } |
| 1372 | 1372 | } |
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | 'type' => 'OpenLDAP' |
| 1398 | 1398 | ]; |
| 1399 | 1399 | default: |
| 1400 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 1400 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 1401 | 1401 | } |
| 1402 | 1402 | } |
| 1403 | 1403 | |
@@ -1534,7 +1534,7 @@ discard block |
||
| 1534 | 1534 | ); |
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | - throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']); |
|
| 1537 | + throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']); |
|
| 1538 | 1538 | } |
| 1539 | 1539 | |
| 1540 | 1540 | /** |
@@ -1551,12 +1551,12 @@ discard block |
||
| 1551 | 1551 | if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
| 1552 | 1552 | // Get user groups from AD |
| 1553 | 1553 | $user_ad_groups = []; |
| 1554 | - foreach($groups as $group) { |
|
| 1554 | + foreach ($groups as $group) { |
|
| 1555 | 1555 | //print_r($group); |
| 1556 | 1556 | // get relation role id for AD group |
| 1557 | 1557 | $role = DB::queryFirstRow( |
| 1558 | 1558 | 'SELECT lgr.role_id |
| 1559 | - FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr |
|
| 1559 | + FROM ' . prefixTable('ldap_groups_roles').' AS lgr |
|
| 1560 | 1560 | WHERE lgr.ldap_group_id = %s', |
| 1561 | 1561 | $group |
| 1562 | 1562 | ); |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | $passwordManager = new PasswordManager(); |
| 1620 | 1620 | |
| 1621 | 1621 | // Migrate password if needed |
| 1622 | - $result = $passwordManager->migratePassword( |
|
| 1622 | + $result = $passwordManager->migratePassword( |
|
| 1623 | 1623 | $userInfo['pw'], |
| 1624 | 1624 | $passwordClear, |
| 1625 | 1625 | (int) $userInfo['id'] |
@@ -1697,7 +1697,7 @@ discard block |
||
| 1697 | 1697 | // Check if exists in DB |
| 1698 | 1698 | $groupData = DB::queryFirstRow( |
| 1699 | 1699 | 'SELECT id |
| 1700 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1700 | + FROM ' . prefixTable('roles_title').' |
|
| 1701 | 1701 | WHERE title = %s', |
| 1702 | 1702 | $group["displayName"] |
| 1703 | 1703 | ); |
@@ -1846,7 +1846,7 @@ discard block |
||
| 1846 | 1846 | |
| 1847 | 1847 | // generate new QR |
| 1848 | 1848 | $new_2fa_qr = $tfa->getQRCodeImageAsDataUri( |
| 1849 | - 'Teampass - ' . $username, |
|
| 1849 | + 'Teampass - '.$username, |
|
| 1850 | 1850 | $userInfo['ga'] |
| 1851 | 1851 | ); |
| 1852 | 1852 | // clear temporary code from DB |
@@ -1859,7 +1859,7 @@ discard block |
||
| 1859 | 1859 | $userInfo['id'] |
| 1860 | 1860 | ); |
| 1861 | 1861 | $firstTime = [ |
| 1862 | - 'value' => '<img src="' . $new_2fa_qr . '">', |
|
| 1862 | + 'value' => '<img src="'.$new_2fa_qr.'">', |
|
| 1863 | 1863 | 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '', |
| 1864 | 1864 | 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '', |
| 1865 | 1865 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
@@ -2015,7 +2015,7 @@ discard block |
||
| 2015 | 2015 | }*/ |
| 2016 | 2016 | return [ |
| 2017 | 2017 | 'error' => true, |
| 2018 | - 'message' => $duo_error . $lang->get('duo_error_check_config'), |
|
| 2018 | + 'message' => $duo_error.$lang->get('duo_error_check_config'), |
|
| 2019 | 2019 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2020 | 2020 | 'debug_message' => $e->getMessage(), |
| 2021 | 2021 | 'proceedIdentification' => false, |
@@ -2031,7 +2031,7 @@ discard block |
||
| 2031 | 2031 | } catch (DuoException $e) { |
| 2032 | 2032 | return [ |
| 2033 | 2033 | 'error' => true, |
| 2034 | - 'message' => $duo_error . $lang->get('duo_error_url'), |
|
| 2034 | + 'message' => $duo_error.$lang->get('duo_error_url'), |
|
| 2035 | 2035 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2036 | 2036 | 'debug_message' => $e->getMessage(), |
| 2037 | 2037 | 'proceedIdentification' => false, |
@@ -2039,7 +2039,7 @@ discard block |
||
| 2039 | 2039 | } |
| 2040 | 2040 | |
| 2041 | 2041 | // Somethimes Duo return success but fail to return a URL, double check if the URL has been created |
| 2042 | - if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) { |
|
| 2042 | + if (!empty($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) { |
|
| 2043 | 2043 | // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt |
| 2044 | 2044 | $key = hash('sha256', $duo_state); |
| 2045 | 2045 | $iv = substr(hash('sha256', $duo_state), 0, 16); |
@@ -2067,7 +2067,7 @@ discard block |
||
| 2067 | 2067 | } else { |
| 2068 | 2068 | return [ |
| 2069 | 2069 | 'error' => true, |
| 2070 | - 'message' => $duo_error . $lang->get('duo_error_url'), |
|
| 2070 | + 'message' => $duo_error.$lang->get('duo_error_url'), |
|
| 2071 | 2071 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2072 | 2072 | 'proceedIdentification' => false, |
| 2073 | 2073 | ]; |
@@ -2088,8 +2088,8 @@ discard block |
||
| 2088 | 2088 | // return the response (which should be the user name) |
| 2089 | 2089 | if ($decoded_token['preferred_username'] === $username) { |
| 2090 | 2090 | $session->set('user-duo_status', 'COMPLET'); |
| 2091 | - $session->set('user-duo_state',''); |
|
| 2092 | - $session->set('user-duo_data',''); |
|
| 2091 | + $session->set('user-duo_state', ''); |
|
| 2092 | + $session->set('user-duo_data', ''); |
|
| 2093 | 2093 | $session->set('user-login', $username); |
| 2094 | 2094 | |
| 2095 | 2095 | return [ |
@@ -2100,9 +2100,9 @@ discard block |
||
| 2100 | 2100 | ]; |
| 2101 | 2101 | } else { |
| 2102 | 2102 | // Something wrong, username from the original Duo request is different than the one received now |
| 2103 | - $session->set('user-duo_status',''); |
|
| 2104 | - $session->set('user-duo_state',''); |
|
| 2105 | - $session->set('user-duo_data',''); |
|
| 2103 | + $session->set('user-duo_status', ''); |
|
| 2104 | + $session->set('user-duo_state', ''); |
|
| 2105 | + $session->set('user-duo_data', ''); |
|
| 2106 | 2106 | |
| 2107 | 2107 | return [ |
| 2108 | 2108 | 'error' => true, |
@@ -2113,9 +2113,9 @@ discard block |
||
| 2113 | 2113 | } |
| 2114 | 2114 | } |
| 2115 | 2115 | // If we are here something wrong |
| 2116 | - $session->set('user-duo_status',''); |
|
| 2117 | - $session->set('user-duo_state',''); |
|
| 2118 | - $session->set('user-duo_data',''); |
|
| 2116 | + $session->set('user-duo_status', ''); |
|
| 2117 | + $session->set('user-duo_state', ''); |
|
| 2118 | + $session->set('user-duo_data', ''); |
|
| 2119 | 2119 | return [ |
| 2120 | 2120 | 'error' => true, |
| 2121 | 2121 | 'message' => $lang->get('duo_login_mismatch'), |
@@ -2198,7 +2198,7 @@ discard block |
||
| 2198 | 2198 | |
| 2199 | 2199 | return [ |
| 2200 | 2200 | 'authenticated' => true, |
| 2201 | - 'migrated' => true, // User was just migrated |
|
| 2201 | + 'migrated' => true, // User was just migrated |
|
| 2202 | 2202 | 'password_updated' => true // Password hash was updated |
| 2203 | 2203 | ]; |
| 2204 | 2204 | } |
@@ -2288,7 +2288,7 @@ discard block |
||
| 2288 | 2288 | // Check for existing lock |
| 2289 | 2289 | $unlock_at = DB::queryFirstField( |
| 2290 | 2290 | 'SELECT MAX(unlock_at) |
| 2291 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 2291 | + FROM ' . prefixTable('auth_failures').' |
|
| 2292 | 2292 | WHERE unlock_at > %s |
| 2293 | 2293 | AND ((source = %s AND value = %s) OR (source = %s AND value = %s))', |
| 2294 | 2294 | date('Y-m-d H:i:s', time()), |
@@ -2310,8 +2310,8 @@ discard block |
||
| 2310 | 2310 | // Get user info from DB |
| 2311 | 2311 | $data = DB::queryFirstRow( |
| 2312 | 2312 | 'SELECT u.*, a.value AS api_key |
| 2313 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2314 | - LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id) |
|
| 2313 | + FROM ' . prefixTable('users').' AS u |
|
| 2314 | + LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id) |
|
| 2315 | 2315 | WHERE login = %s AND deleted_at IS NULL', |
| 2316 | 2316 | $login |
| 2317 | 2317 | ); |
@@ -2330,9 +2330,9 @@ discard block |
||
| 2330 | 2330 | // Check if similar login deleted exists |
| 2331 | 2331 | DB::queryFirstRow( |
| 2332 | 2332 | 'SELECT id, login |
| 2333 | - FROM ' . prefixTable('users') . ' |
|
| 2333 | + FROM ' . prefixTable('users').' |
|
| 2334 | 2334 | WHERE login LIKE %s AND deleted_at IS NOT NULL', |
| 2335 | - $login . '_deleted_%' |
|
| 2335 | + $login.'_deleted_%' |
|
| 2336 | 2336 | ); |
| 2337 | 2337 | |
| 2338 | 2338 | if (DB::count() > 0) { |
@@ -2442,7 +2442,7 @@ discard block |
||
| 2442 | 2442 | 'array' => [ |
| 2443 | 2443 | 'value' => 'bruteforce_wait', |
| 2444 | 2444 | 'error' => true, |
| 2445 | - 'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(), |
|
| 2445 | + 'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(), |
|
| 2446 | 2446 | ] |
| 2447 | 2447 | ]; |
| 2448 | 2448 | } |
@@ -2547,7 +2547,7 @@ discard block |
||
| 2547 | 2547 | // Clean previous failed attempts |
| 2548 | 2548 | $failedTasks = DB::query( |
| 2549 | 2549 | 'SELECT increment_id |
| 2550 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 2550 | + FROM ' . prefixTable('background_tasks').' |
|
| 2551 | 2551 | WHERE process_type = %s |
| 2552 | 2552 | AND JSON_EXTRACT(arguments, "$.new_user_id") = %i |
| 2553 | 2553 | AND status = %s', |
@@ -2664,7 +2664,7 @@ discard block |
||
| 2664 | 2664 | $userKeys['public_key'] |
| 2665 | 2665 | ); |
| 2666 | 2666 | }*/ |
| 2667 | - error_log('Switch user ' . $username . ' auth_type to oauth2'); |
|
| 2667 | + error_log('Switch user '.$username.' auth_type to oauth2'); |
|
| 2668 | 2668 | // Update user in database: |
| 2669 | 2669 | DB::update( |
| 2670 | 2670 | prefixTable('users'), |
@@ -2888,12 +2888,12 @@ discard block |
||
| 2888 | 2888 | { |
| 2889 | 2889 | // Find the latest "create_user_keys" task for the given user_id |
| 2890 | 2890 | $latestTask = DB::queryFirstRow( |
| 2891 | - 'SELECT arguments, status FROM ' . prefixTable('background_tasks') . ' |
|
| 2891 | + 'SELECT arguments, status FROM '.prefixTable('background_tasks').' |
|
| 2892 | 2892 | WHERE process_type = %s |
| 2893 | 2893 | AND arguments LIKE %s |
| 2894 | 2894 | ORDER BY increment_id DESC |
| 2895 | 2895 | LIMIT 1', |
| 2896 | - 'create_user_keys', '%"new_user_id":' . $userId . '%' |
|
| 2896 | + 'create_user_keys', '%"new_user_id":'.$userId.'%' |
|
| 2897 | 2897 | ); |
| 2898 | 2898 | |
| 2899 | 2899 | // If a failed task is found, return an error message |
@@ -3105,15 +3105,15 @@ discard block |
||
| 3105 | 3105 | |
| 3106 | 3106 | if ($ret['error'] !== false) { |
| 3107 | 3107 | logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username)); |
| 3108 | - $session->set('user-duo_status',''); |
|
| 3109 | - $session->set('user-duo_state',''); |
|
| 3110 | - $session->set('user-duo_data',''); |
|
| 3108 | + $session->set('user-duo_status', ''); |
|
| 3109 | + $session->set('user-duo_state', ''); |
|
| 3110 | + $session->set('user-duo_data', ''); |
|
| 3111 | 3111 | return [ |
| 3112 | 3112 | 'error' => true, |
| 3113 | 3113 | 'mfaData' => $ret, |
| 3114 | 3114 | 'mfaQRCodeInfos' => false, |
| 3115 | 3115 | ]; |
| 3116 | - } else if ($ret['duo_url_ready'] === true){ |
|
| 3116 | + } else if ($ret['duo_url_ready'] === true) { |
|
| 3117 | 3117 | return [ |
| 3118 | 3118 | 'error' => false, |
| 3119 | 3119 | 'mfaData' => $ret, |
@@ -3177,7 +3177,7 @@ discard block |
||
| 3177 | 3177 | // Count failed attempts from this source |
| 3178 | 3178 | $count = DB::queryFirstField( |
| 3179 | 3179 | 'SELECT COUNT(*) |
| 3180 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 3180 | + FROM ' . prefixTable('auth_failures').' |
|
| 3181 | 3181 | WHERE source = %s AND value = %s', |
| 3182 | 3182 | $source, |
| 3183 | 3183 | $value |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | ) { |
| 79 | 79 | // Not allowed page |
| 80 | 80 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 81 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 81 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 82 | 82 | exit; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $antiXss = new AntiXSS(); |
| 101 | 101 | |
| 102 | 102 | // User's language loading |
| 103 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php'; |
|
| 103 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php'; |
|
| 104 | 104 | |
| 105 | 105 | // Prepare POST variables |
| 106 | 106 | $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT); |
@@ -152,9 +152,9 @@ discard block |
||
| 152 | 152 | 'SELECT i.id as id, i.id_tree as id_tree, i.restricted_to as restricted_to, i.perso as perso, |
| 153 | 153 | i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url, |
| 154 | 154 | i.email as email,l.date as date, i.pw_iv as pw_iv,n.renewal_period as renewal_period |
| 155 | - FROM ' . prefixTable('items') . ' as i |
|
| 156 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 157 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 155 | + FROM ' . prefixTable('items').' as i |
|
| 156 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 157 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 158 | 158 | WHERE i.inactif = %i |
| 159 | 159 | AND i.id_tree= %i |
| 160 | 160 | AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s)) |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | // Run query |
| 178 | 178 | $dataItem = DB::queryFirstRow( |
| 179 | 179 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 180 | - FROM ' . prefixTable('items') . ' AS i |
|
| 181 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 180 | + FROM ' . prefixTable('items').' AS i |
|
| 181 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 182 | 182 | WHERE user_id = %i AND i.id = %i', |
| 183 | 183 | $session->get('user-id'), |
| 184 | 184 | $record['id'] |
@@ -202,8 +202,8 @@ discard block |
||
| 202 | 202 | $arr_kbs = []; |
| 203 | 203 | $rows_kb = DB::query( |
| 204 | 204 | 'SELECT b.label, b.id |
| 205 | - FROM ' . prefixTable('kb_items') . ' AS a |
|
| 206 | - INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id) |
|
| 205 | + FROM ' . prefixTable('kb_items').' AS a |
|
| 206 | + INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id) |
|
| 207 | 207 | WHERE a.item_id = %i', |
| 208 | 208 | $record['id'] |
| 209 | 209 | ); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | $arr_tags = []; |
| 216 | 216 | $rows_tag = DB::query( |
| 217 | 217 | 'SELECT tag |
| 218 | - FROM ' . prefixTable('tags') . ' |
|
| 218 | + FROM ' . prefixTable('tags').' |
|
| 219 | 219 | WHERE item_id = %i', |
| 220 | 220 | $record['id'] |
| 221 | 221 | ); |
@@ -227,18 +227,18 @@ discard block |
||
| 227 | 227 | $arr_trees = []; |
| 228 | 228 | $rows_child_tree = DB::query( |
| 229 | 229 | 'SELECT t.id, t.title |
| 230 | - FROM ' . prefixTable('nested_tree') . ' AS t |
|
| 231 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (t.id = i.id_tree) |
|
| 230 | + FROM ' . prefixTable('nested_tree').' AS t |
|
| 231 | + INNER JOIN ' . prefixTable('items').' AS i ON (t.id = i.id_tree) |
|
| 232 | 232 | WHERE i.id = %i', |
| 233 | 233 | $record['id'] |
| 234 | 234 | ); |
| 235 | 235 | foreach ($rows_child_tree as $rec_child_tree) { |
| 236 | 236 | $stack = array(); |
| 237 | 237 | $parent = $rec_child_tree['id']; |
| 238 | - while($parent != 0){ |
|
| 238 | + while ($parent != 0) { |
|
| 239 | 239 | $rows_parent_tree = DB::query( |
| 240 | 240 | 'SELECT parent_id, title |
| 241 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 241 | + FROM ' . prefixTable('nested_tree').' |
|
| 242 | 242 | WHERE id = %i', |
| 243 | 243 | $parent |
| 244 | 244 | ); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | // Prepare variables |
| 326 | 326 | $post_export_tag = filter_var($dataReceived['export_tag'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 327 | 327 | if (empty($post_export_tag) === false) { |
| 328 | - DB::query('DELETE FROM ' . prefixTable('export') . ' WHERE export_tag = %s', $post_export_tag); |
|
| 328 | + DB::query('DELETE FROM '.prefixTable('export').' WHERE export_tag = %s', $post_export_tag); |
|
| 329 | 329 | } |
| 330 | 330 | break; |
| 331 | 331 | |
@@ -375,9 +375,9 @@ discard block |
||
| 375 | 375 | l.date as date, i.pw_iv as pw_iv, |
| 376 | 376 | n.renewal_period as renewal_period, |
| 377 | 377 | i.id_tree as tree_id |
| 378 | - FROM ' . prefixTable('items') . ' as i |
|
| 379 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 380 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 378 | + FROM ' . prefixTable('items').' as i |
|
| 379 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 380 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 381 | 381 | WHERE i.inactif = %i |
| 382 | 382 | AND i.id_tree= %i |
| 383 | 383 | AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s)) |
@@ -403,8 +403,8 @@ discard block |
||
| 403 | 403 | // Run query |
| 404 | 404 | $dataItem = DB::queryFirstRow( |
| 405 | 405 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 406 | - FROM ' . prefixTable('items') . ' AS i |
|
| 407 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 406 | + FROM ' . prefixTable('items').' AS i |
|
| 407 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 408 | 408 | WHERE user_id = %i AND i.id = %i', |
| 409 | 409 | $session->get('user-id'), |
| 410 | 410 | $record['id'] |
@@ -428,8 +428,8 @@ discard block |
||
| 428 | 428 | $arr_kbs = ''; |
| 429 | 429 | $rows_kb = DB::query( |
| 430 | 430 | 'SELECT b.label, b.id |
| 431 | - FROM ' . prefixTable('kb_items') . ' AS a |
|
| 432 | - INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id) |
|
| 431 | + FROM ' . prefixTable('kb_items').' AS a |
|
| 432 | + INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id) |
|
| 433 | 433 | WHERE a.item_id = %i', |
| 434 | 434 | $record['id'] |
| 435 | 435 | ); |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | if (empty($arr_kbs)) { |
| 438 | 438 | $arr_kbs = $rec_kb['label']; |
| 439 | 439 | } else { |
| 440 | - $arr_kbs .= ' | ' . $rec_kb['label']; |
|
| 440 | + $arr_kbs .= ' | '.$rec_kb['label']; |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | $arr_tags = ''; |
| 446 | 446 | $rows_tag = DB::query( |
| 447 | 447 | 'SELECT tag |
| 448 | - FROM ' . prefixTable('tags') . ' |
|
| 448 | + FROM ' . prefixTable('tags').' |
|
| 449 | 449 | WHERE item_id = %i', |
| 450 | 450 | $record['id'] |
| 451 | 451 | ); |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | if (empty($arr_tags)) { |
| 454 | 454 | $arr_tags = $rec_tag['tag']; |
| 455 | 455 | } else { |
| 456 | - $arr_tags .= ' ' . $rec_tag['tag']; |
|
| 456 | + $arr_tags .= ' '.$rec_tag['tag']; |
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | // query |
| 532 | 532 | $rows = DB::query( |
| 533 | 533 | 'SELECT * |
| 534 | - FROM ' . prefixTable('export') . ' |
|
| 534 | + FROM ' . prefixTable('export').' |
|
| 535 | 535 | WHERE export_tag = %s', |
| 536 | 536 | $dataReceived['export_tag'] |
| 537 | 537 | ); |
@@ -543,7 +543,7 @@ discard block |
||
| 543 | 543 | $prev_path = ''; |
| 544 | 544 | |
| 545 | 545 | //Prepare the PDF file |
| 546 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/tecnickcom/tcpdf/tcpdf.php'; |
|
| 546 | + require_once $SETTINGS['cpassman_dir'].'/vendor/tecnickcom/tcpdf/tcpdf.php'; |
|
| 547 | 547 | |
| 548 | 548 | $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); |
| 549 | 549 | $pdf->SetProtection(array('print'), $dataReceived['pdf_password'], null); |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | |
| 556 | 556 | // set default header data |
| 557 | 557 | $pdf->SetHeaderData( |
| 558 | - $SETTINGS['cpassman_dir'] . '/includes/images/teampass-logo2-home.png', |
|
| 558 | + $SETTINGS['cpassman_dir'].'/includes/images/teampass-logo2-home.png', |
|
| 559 | 559 | PDF_HEADER_LOGO_WIDTH, |
| 560 | 560 | 'Teampass export', |
| 561 | 561 | $session->get('user-lastname')." ".$session->get('user-name').' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], (int) time()) |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | logEvents($SETTINGS, 'pdf_export', '', (string) $session->get('user-id'), $session->get('user-login')); |
| 666 | 666 | |
| 667 | 667 | //clean table |
| 668 | - DB::query('TRUNCATE TABLE ' . prefixTable('export')); |
|
| 668 | + DB::query('TRUNCATE TABLE '.prefixTable('export')); |
|
| 669 | 669 | |
| 670 | 670 | // Clean any content of the output buffer |
| 671 | 671 | ob_end_clean(); |
@@ -704,13 +704,13 @@ discard block |
||
| 704 | 704 | // step 1: |
| 705 | 705 | // - prepare export file |
| 706 | 706 | // - get full list of objects id to export |
| 707 | - include $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 707 | + include $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 708 | 708 | $idsList = array(); |
| 709 | 709 | |
| 710 | 710 | // query |
| 711 | 711 | $rows = DB::query( |
| 712 | 712 | 'SELECT * |
| 713 | - FROM ' . prefixTable('export') . ' |
|
| 713 | + FROM ' . prefixTable('export').' |
|
| 714 | 714 | WHERE export_tag = %s', |
| 715 | 715 | $inputData['export_tag'] |
| 716 | 716 | ); |
@@ -747,13 +747,13 @@ discard block |
||
| 747 | 747 | } |
| 748 | 748 | // prepare export file |
| 749 | 749 | //save the file |
| 750 | - $outstream = fopen($SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], 'w'); |
|
| 750 | + $outstream = fopen($SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], 'w'); |
|
| 751 | 751 | if ($outstream === false) { |
| 752 | 752 | echo (string) prepareExchangedData( |
| 753 | 753 | [ |
| 754 | 754 | 'error' => true, |
| 755 | 755 | 'message' => $lang->get('error_while_creating_file'), |
| 756 | - 'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'], |
|
| 756 | + 'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'], |
|
| 757 | 757 | ], |
| 758 | 758 | 'encode' |
| 759 | 759 | ); |
@@ -779,12 +779,12 @@ discard block |
||
| 779 | 779 | </style> |
| 780 | 780 | </head> |
| 781 | 781 | <body> |
| 782 | - <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']) . '" /> |
|
| 782 | + <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']).'" /> |
|
| 783 | 783 | <div id="header"> |
| 784 | - ' . TP_TOOL_NAME . ' - Off Line mode |
|
| 784 | + ' . TP_TOOL_NAME.' - Off Line mode |
|
| 785 | 785 | </div> |
| 786 | 786 | <div style="margin:10px; font-size:9px;"> |
| 787 | - <i>This page was generated by <b>' . $session->get('user-name') . ' ' . $session->get('user-lastname') . '</b>, the ' . date('Y/m/d H:i:s') . '.</i> |
|
| 787 | + <i>This page was generated by <b>' . $session->get('user-name').' '.$session->get('user-lastname').'</b>, the '.date('Y/m/d H:i:s').'.</i> |
|
| 788 | 788 | <span id="info_page" style="margin-left:20px; font-weight:bold; font-size: 14px; color:red;"></span> |
| 789 | 789 | </div> |
| 790 | 790 | <div id="information"></div> |
@@ -795,11 +795,11 @@ discard block |
||
| 795 | 795 | <div> |
| 796 | 796 | <table id="itemsTable"> |
| 797 | 797 | <thead><tr> |
| 798 | - <th style="width:15%;">' . $lang->get('label') . '</th> |
|
| 799 | - <th style="width:10%;">' . $lang->get('pw') . '</th> |
|
| 800 | - <th style="width:30%;">' . $lang->get('description') . '</th> |
|
| 801 | - <th style="width:5%;">' . $lang->get('user_login') . '</th> |
|
| 802 | - <th style="width:20%;">' . $lang->get('url') . '</th> |
|
| 798 | + <th style="width:15%;">' . $lang->get('label').'</th> |
|
| 799 | + <th style="width:10%;">' . $lang->get('pw').'</th> |
|
| 800 | + <th style="width:30%;">' . $lang->get('description').'</th> |
|
| 801 | + <th style="width:5%;">' . $lang->get('user_login').'</th> |
|
| 802 | + <th style="width:20%;">' . $lang->get('url').'</th> |
|
| 803 | 803 | </tr></thead> |
| 804 | 804 | <tbody id="itemsTable_tbody">' |
| 805 | 805 | ); |
@@ -813,8 +813,8 @@ discard block |
||
| 813 | 813 | 'loop' => true, |
| 814 | 814 | 'ids_list' => json_encode($idsList), |
| 815 | 815 | 'ids_count' => count($idsList), |
| 816 | - 'file_path' => $SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], |
|
| 817 | - 'file_link' => $SETTINGS['url_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], |
|
| 816 | + 'file_path' => $SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], |
|
| 817 | + 'file_link' => $SETTINGS['url_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], |
|
| 818 | 818 | 'export_tag' => $inputData['export_tag'], |
| 819 | 819 | ], |
| 820 | 820 | 'encode' |
@@ -854,12 +854,12 @@ discard block |
||
| 854 | 854 | $full_listing = array(); |
| 855 | 855 | $items_id_list = array(); |
| 856 | 856 | $outstream = ''; |
| 857 | - include $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 857 | + include $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 858 | 858 | |
| 859 | 859 | // query |
| 860 | 860 | $rows = DB::query( |
| 861 | 861 | 'SELECT * |
| 862 | - FROM ' . prefixTable('export') . ' |
|
| 862 | + FROM ' . prefixTable('export').' |
|
| 863 | 863 | WHERE export_tag = %s AND item_id IN %ls', |
| 864 | 864 | $inputData['export_tag'], |
| 865 | 865 | $inputData['idsList'] |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | [ |
| 874 | 874 | 'error' => true, |
| 875 | 875 | 'message' => $lang->get('error_while_creating_file'), |
| 876 | - 'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'], |
|
| 876 | + 'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'], |
|
| 877 | 877 | ], |
| 878 | 878 | 'encode' |
| 879 | 879 | ); |
@@ -906,13 +906,13 @@ discard block |
||
| 906 | 906 | if (empty($arboHtml)) { |
| 907 | 907 | $arboHtml = $arboHtml_tmp; |
| 908 | 908 | } else { |
| 909 | - $arboHtml .= ' » ' . $arboHtml_tmp; |
|
| 909 | + $arboHtml .= ' » '.$arboHtml_tmp; |
|
| 910 | 910 | } |
| 911 | 911 | } |
| 912 | 912 | fputs( |
| 913 | 913 | $outstream, |
| 914 | 914 | ' |
| 915 | - <tr class="path"><td colspan="5">' . $arboHtml . '</td></tr>' |
|
| 915 | + <tr class="path"><td colspan="5">' . $arboHtml.'</td></tr>' |
|
| 916 | 916 | ); |
| 917 | 917 | $idTree = $record['folder_id']; |
| 918 | 918 | |
@@ -920,12 +920,12 @@ discard block |
||
| 920 | 920 | fputs( |
| 921 | 921 | $outstream, |
| 922 | 922 | ' |
| 923 | - <tr class="' . $lineType . '"> |
|
| 924 | - <td>' . addslashes($record['label']) . '</td> |
|
| 925 | - <td align="center"><span class="span_pw" id="span_' . $record['item_id'] . '"><a href="#" onclick="decryptme(' . $record['item_id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $record['item_id'] . '" value="' . $encPw . '" /></td> |
|
| 926 | - <td>' . (empty($record['description']) === true ? ' ' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))) . '</td> |
|
| 927 | - <td align="center">' . (empty($record['login']) === true ? ' ' : addslashes($record['login'])) . '</td> |
|
| 928 | - <td align="center">' . (empty($record['url']) === true ? ' ' : addslashes($record['url'])) . '</td> |
|
| 923 | + <tr class="' . $lineType.'"> |
|
| 924 | + <td>' . addslashes($record['label']).'</td> |
|
| 925 | + <td align="center"><span class="span_pw" id="span_' . $record['item_id'].'"><a href="#" onclick="decryptme('.$record['item_id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$record['item_id'].'" value="'.$encPw.'" /></td> |
|
| 926 | + <td>' . (empty($record['description']) === true ? ' ' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))).'</td> |
|
| 927 | + <td align="center">' . (empty($record['login']) === true ? ' ' : addslashes($record['login'])).'</td> |
|
| 928 | + <td align="center">' . (empty($record['url']) === true ? ' ' : addslashes($record['url'])).'</td> |
|
| 929 | 929 | </tr>' |
| 930 | 930 | ); |
| 931 | 931 | } |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | $inputData['password'] = (string) $dataReceived['password']; |
| 976 | 976 | |
| 977 | 977 | // Load includes |
| 978 | - include $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 978 | + include $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 979 | 979 | |
| 980 | 980 | // read the content of the temporary file |
| 981 | 981 | $handle = fopen($inputData['filename'].'.txt', 'r'); |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | [ |
| 985 | 985 | 'error' => true, |
| 986 | 986 | 'message' => $lang->get('error_while_creating_file'), |
| 987 | - 'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'], |
|
| 987 | + 'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'], |
|
| 988 | 988 | ], |
| 989 | 989 | 'encode' |
| 990 | 990 | ); |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | [ |
| 997 | 997 | 'error' => true, |
| 998 | 998 | 'message' => $lang->get('error_while_creating_file'), |
| 999 | - 'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'], |
|
| 999 | + 'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'], |
|
| 1000 | 1000 | ], |
| 1001 | 1001 | 'encode' |
| 1002 | 1002 | ); |
@@ -1012,9 +1012,9 @@ discard block |
||
| 1012 | 1012 | $chunks = explode('|#|#|', chunk_split($contents, 10000, '|#|#|')); |
| 1013 | 1013 | foreach ($chunks as $chunk) { |
| 1014 | 1014 | if (empty($encrypted_text) === true) { |
| 1015 | - $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] ); |
|
| 1015 | + $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']); |
|
| 1016 | 1016 | } else { |
| 1017 | - $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] ); |
|
| 1017 | + $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']); |
|
| 1018 | 1018 | } |
| 1019 | 1019 | } |
| 1020 | 1020 | |
@@ -1025,7 +1025,7 @@ discard block |
||
| 1025 | 1025 | [ |
| 1026 | 1026 | 'error' => true, |
| 1027 | 1027 | 'message' => $lang->get('error_while_creating_file'), |
| 1028 | - 'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'], |
|
| 1028 | + 'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'], |
|
| 1029 | 1029 | ], |
| 1030 | 1030 | 'encode' |
| 1031 | 1031 | ); |
@@ -1038,9 +1038,9 @@ discard block |
||
| 1038 | 1038 | </table></div> |
| 1039 | 1039 | <input type="button" value="Hide all" onclick="hideAll()" /> |
| 1040 | 1040 | <div id="footer" style="text-align:center;"> |
| 1041 | - <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME . ' ' . TP_VERSION . ' ' . TP_COPYRIGHT . '</a> |
|
| 1041 | + <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME.' '.TP_VERSION.' '.TP_COPYRIGHT.'</a> |
|
| 1042 | 1042 | </div> |
| 1043 | - <div id="enc_html" style="display:none;">' . $encrypted_text . '</div> |
|
| 1043 | + <div id="enc_html" style="display:none;">' . $encrypted_text.'</div> |
|
| 1044 | 1044 | </body> |
| 1045 | 1045 | </html> |
| 1046 | 1046 | <script type="text/javascript"> |
@@ -1143,12 +1143,12 @@ discard block |
||
| 1143 | 1143 | fclose($outstream); |
| 1144 | 1144 | |
| 1145 | 1145 | //clean table |
| 1146 | - DB::query('TRUNCATE TABLE ' . prefixTable('export')); |
|
| 1146 | + DB::query('TRUNCATE TABLE '.prefixTable('export')); |
|
| 1147 | 1147 | |
| 1148 | 1148 | echo (string) prepareExchangedData( |
| 1149 | 1149 | [ |
| 1150 | 1150 | 'error' => false, |
| 1151 | - 'filelink' => $inputData['file_link'] , |
|
| 1151 | + 'filelink' => $inputData['file_link'], |
|
| 1152 | 1152 | ], |
| 1153 | 1153 | 'encode' |
| 1154 | 1154 | ); |