nilsteampassnet /
TeamPass
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | ]); |
| 75 | 75 | echo " ✅ Database connection successful\n\n"; |
| 76 | 76 | } catch (PDOException $e) { |
| 77 | - echo " ❌ Database connection failed: " . $e->getMessage() . "\n"; |
|
| 77 | + echo " ❌ Database connection failed: ".$e->getMessage()."\n"; |
|
| 78 | 78 | exit(1); |
| 79 | 79 | } |
| 80 | 80 | |
@@ -85,15 +85,15 @@ discard block |
||
| 85 | 85 | $pdo->exec("USE `{$dbName}`"); |
| 86 | 86 | echo " ✅ Database created/selected\n\n"; |
| 87 | 87 | } catch (PDOException $e) { |
| 88 | - echo " ❌ Database creation failed: " . $e->getMessage() . "\n"; |
|
| 88 | + echo " ❌ Database creation failed: ".$e->getMessage()."\n"; |
|
| 89 | 89 | exit(1); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | // Step 3: Create settings.php file |
| 93 | 93 | echo "[3/6] Creating settings.php configuration file...\n"; |
| 94 | 94 | try { |
| 95 | - $settingsTemplate = BASE_PATH . '/includes/config/settings.sample.php'; |
|
| 96 | - $settingsPath = BASE_PATH . '/includes/config/settings.php'; |
|
| 95 | + $settingsTemplate = BASE_PATH.'/includes/config/settings.sample.php'; |
|
| 96 | + $settingsPath = BASE_PATH.'/includes/config/settings.php'; |
|
| 97 | 97 | |
| 98 | 98 | if (!file_exists($settingsTemplate)) { |
| 99 | 99 | throw new Exception("Template file not found: {$settingsTemplate}"); |
@@ -130,17 +130,17 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | echo " ✅ Settings file created\n\n"; |
| 132 | 132 | } catch (Exception $e) { |
| 133 | - echo " ❌ Settings creation failed: " . $e->getMessage() . "\n"; |
|
| 133 | + echo " ❌ Settings creation failed: ".$e->getMessage()."\n"; |
|
| 134 | 134 | exit(1); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | // Step 4: Import database schema |
| 138 | 138 | echo "[4/6] Importing database schema...\n"; |
| 139 | 139 | try { |
| 140 | - $installDir = BASE_PATH . '/install'; |
|
| 140 | + $installDir = BASE_PATH.'/install'; |
|
| 141 | 141 | $schemaFiles = [ |
| 142 | - $installDir . '/database/tables.sql', |
|
| 143 | - $installDir . '/database/initial-data.sql', |
|
| 142 | + $installDir.'/database/tables.sql', |
|
| 143 | + $installDir.'/database/initial-data.sql', |
|
| 144 | 144 | ]; |
| 145 | 145 | |
| 146 | 146 | foreach ($schemaFiles as $schemaFile) { |
@@ -159,33 +159,33 @@ discard block |
||
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - echo " ✅ Imported: " . basename($schemaFile) . "\n"; |
|
| 162 | + echo " ✅ Imported: ".basename($schemaFile)."\n"; |
|
| 163 | 163 | } else { |
| 164 | - echo " ⚠️ Schema file not found: " . basename($schemaFile) . " (continuing...)\n"; |
|
| 164 | + echo " ⚠️ Schema file not found: ".basename($schemaFile)." (continuing...)\n"; |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | echo " ✅ Database schema imported\n\n"; |
| 169 | 169 | } catch (PDOException $e) { |
| 170 | 170 | echo " ⚠️ Note: This is a simplified installer. Full schema import should be done via web installer.\n"; |
| 171 | - echo " Error details: " . $e->getMessage() . "\n\n"; |
|
| 171 | + echo " Error details: ".$e->getMessage()."\n\n"; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // Step 5: Create saltkey |
| 175 | 175 | echo "[5/6] Generating encryption saltkey...\n"; |
| 176 | 176 | try { |
| 177 | - $skDir = BASE_PATH . '/sk'; |
|
| 177 | + $skDir = BASE_PATH.'/sk'; |
|
| 178 | 178 | if (!is_dir($skDir)) { |
| 179 | 179 | mkdir($skDir, 0700, true); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | $saltkey = bin2hex(random_bytes(32)); |
| 183 | - file_put_contents($skDir . '/sk.txt', $saltkey); |
|
| 184 | - chmod($skDir . '/sk.txt', 0400); |
|
| 183 | + file_put_contents($skDir.'/sk.txt', $saltkey); |
|
| 184 | + chmod($skDir.'/sk.txt', 0400); |
|
| 185 | 185 | |
| 186 | 186 | echo " ✅ Saltkey generated\n\n"; |
| 187 | 187 | } catch (Exception $e) { |
| 188 | - echo " ❌ Saltkey generation failed: " . $e->getMessage() . "\n"; |
|
| 188 | + echo " ❌ Saltkey generation failed: ".$e->getMessage()."\n"; |
|
| 189 | 189 | exit(1); |
| 190 | 190 | } |
| 191 | 191 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $sessionPwdAttempts = $session->get('pwd_attempts'); |
| 148 | 148 | $sessionUrl = $session->get('user-initial_url'); |
| 149 | 149 | $server = []; |
| 150 | - $server['PHP_AUTH_USER'] = $request->getUser(); |
|
| 150 | + $server['PHP_AUTH_USER'] = $request->getUser(); |
|
| 151 | 151 | $server['PHP_AUTH_PW'] = $request->getPassword(); |
| 152 | 152 | |
| 153 | 153 | // decrypt and retreive data in JSON format |
@@ -167,18 +167,18 @@ discard block |
||
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | // Check if Duo auth is in progress and pass the pw and login back to the standard login process |
| 170 | - if( |
|
| 170 | + if ( |
|
| 171 | 171 | isKeyExistingAndEqual('duo', 1, $SETTINGS) === true |
| 172 | 172 | && $dataReceived['user_2fa_selection'] === 'duo' |
| 173 | 173 | && $session->get('user-duo_status') === 'IN_PROGRESS' |
| 174 | 174 | && !empty($dataReceived['duo_state']) |
| 175 | - ){ |
|
| 175 | + ) { |
|
| 176 | 176 | $key = hash('sha256', $dataReceived['duo_state']); |
| 177 | 177 | $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16); |
| 178 | 178 | $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv); |
| 179 | 179 | // Clear the data from the Duo process to continue clean with the standard login process |
| 180 | - $session->set('user-duo_data',''); |
|
| 181 | - if($duo_data_dec === false) { |
|
| 180 | + $session->set('user-duo_data', ''); |
|
| 181 | + if ($duo_data_dec === false) { |
|
| 182 | 182 | // Add failed authentication log |
| 183 | 183 | addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer()); |
| 184 | 184 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $dataReceived['login'] = $duo_data['duo_login']; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) { |
|
| 199 | + if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) { |
|
| 200 | 200 | echo json_encode([ |
| 201 | 201 | 'data' => prepareExchangedData( |
| 202 | 202 | [ |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | && (int) $sessionAdmin !== 1 |
| 485 | 485 | ) { |
| 486 | 486 | // get all Admin users |
| 487 | - $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1); |
|
| 487 | + $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1); |
|
| 488 | 488 | if (DB::count() > 0) { |
| 489 | 489 | // Add email to table |
| 490 | 490 | prepareSendingEmail( |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | '#tp_time#', |
| 497 | 497 | ], |
| 498 | 498 | [ |
| 499 | - ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')', |
|
| 499 | + ' '.$session->get('user-login').' (IP: '.getClientIpServer().')', |
|
| 500 | 500 | date($SETTINGS['date_format'], (int) time()), |
| 501 | 501 | date($SETTINGS['time_format'], (int) time()), |
| 502 | 502 | ], |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | 0, |
| 535 | 535 | $return, |
| 536 | 536 | $userInfo, |
| 537 | - false, // not success |
|
| 537 | + false, // not success |
|
| 538 | 538 | 'user_is_locked', |
| 539 | 539 | $lang->get('account_is_locked') |
| 540 | 540 | ), |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | $sessionPwdAttempts, |
| 551 | 551 | $return, |
| 552 | 552 | $userInfo, |
| 553 | - false, // not success |
|
| 553 | + false, // not success |
|
| 554 | 554 | true, |
| 555 | 555 | $lang->get('error_not_allowed_to_authenticate') |
| 556 | 556 | ), |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | // Get cache tree info |
| 833 | 833 | $cacheTreeData = DB::queryFirstRow( |
| 834 | 834 | 'SELECT visible_folders |
| 835 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 835 | + FROM ' . prefixTable('cache_tree').' |
|
| 836 | 836 | WHERE user_id=%i', |
| 837 | 837 | (int) $session->get('user-id') |
| 838 | 838 | ); |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | && (int) $userInfo['admin'] !== 1 |
| 864 | 864 | ) { |
| 865 | 865 | // get all Admin users |
| 866 | - $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1); |
|
| 866 | + $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1); |
|
| 867 | 867 | if (DB::count() > 0) { |
| 868 | 868 | // Add email to table |
| 869 | 869 | prepareSendingEmail( |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | '#tp_time#', |
| 876 | 876 | ], |
| 877 | 877 | [ |
| 878 | - ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')', |
|
| 878 | + ' '.$session->get('user-login').' (IP: '.getClientIpServer().')', |
|
| 879 | 879 | date($SETTINGS['date_format'], (int) time()), |
| 880 | 880 | date($SETTINGS['time_format'], (int) time()), |
| 881 | 881 | ], |
@@ -982,7 +982,7 @@ discard block |
||
| 982 | 982 | if (is_null($userInfo['roles_from_ad_groups']) === false) { |
| 983 | 983 | $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true |
| 984 | 984 | ? $userInfo['roles_from_ad_groups'] |
| 985 | - : $userInfo['fonction_id'] . ';' . $userInfo['roles_from_ad_groups']; |
|
| 985 | + : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups']; |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | // Store roles in session |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | // Get roles from database |
| 1000 | 1000 | $rolesList = DB::query( |
| 1001 | 1001 | 'SELECT id, title, complexity |
| 1002 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1002 | + FROM ' . prefixTable('roles_title').' |
|
| 1003 | 1003 | WHERE id IN %li', |
| 1004 | 1004 | $session->get('user-roles_array') |
| 1005 | 1005 | ); |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | { |
| 1089 | 1089 | $rows = DB::query( |
| 1090 | 1090 | 'SELECT date |
| 1091 | - FROM ' . prefixTable('log_system') . " |
|
| 1091 | + FROM ' . prefixTable('log_system')." |
|
| 1092 | 1092 | WHERE field_1 = %s |
| 1093 | 1093 | AND type = 'failed_auth' |
| 1094 | 1094 | AND label = 'password_is_not_correct' |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | foreach ($rows as $record) { |
| 1103 | 1103 | array_push( |
| 1104 | 1104 | $arrAttempts, |
| 1105 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) |
|
| 1105 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']) |
|
| 1106 | 1106 | ); |
| 1107 | 1107 | } |
| 1108 | 1108 | } |
@@ -1137,7 +1137,7 @@ discard block |
||
| 1137 | 1137 | $ldapConnection |
| 1138 | 1138 | ) : bool |
| 1139 | 1139 | { |
| 1140 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1140 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1141 | 1141 | |
| 1142 | 1142 | if ((int) $userInfoDisabled === 1) { |
| 1143 | 1143 | return false; |
@@ -1225,7 +1225,7 @@ discard block |
||
| 1225 | 1225 | // If user has seed but no backup, create it on first successful login |
| 1226 | 1226 | if (!empty($userInfo['user_derivation_seed']) && empty($userInfo['private_key_backup'])) { |
| 1227 | 1227 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1228 | - error_log('TEAMPASS Transparent Recovery - Creating backup for user ' . ($userInfo['login'] ?? 'unknown')); |
|
| 1228 | + error_log('TEAMPASS Transparent Recovery - Creating backup for user '.($userInfo['login'] ?? 'unknown')); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | |
| 1231 | 1231 | $derivedKey = deriveBackupKey($userInfo['user_derivation_seed'], $userInfo['public_key'], $SETTINGS); |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | } catch (Exception $e) { |
| 1396 | 1396 | return [ |
| 1397 | 1397 | 'error' => true, |
| 1398 | - 'message' => "Error: " . $e->getMessage(), |
|
| 1398 | + 'message' => "Error: ".$e->getMessage(), |
|
| 1399 | 1399 | ]; |
| 1400 | 1400 | } |
| 1401 | 1401 | } |
@@ -1426,7 +1426,7 @@ discard block |
||
| 1426 | 1426 | 'type' => 'OpenLDAP' |
| 1427 | 1427 | ]; |
| 1428 | 1428 | default: |
| 1429 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 1429 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 1430 | 1430 | } |
| 1431 | 1431 | } |
| 1432 | 1432 | |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | ); |
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | - throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']); |
|
| 1566 | + throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']); |
|
| 1567 | 1567 | } |
| 1568 | 1568 | |
| 1569 | 1569 | /** |
@@ -1580,12 +1580,12 @@ discard block |
||
| 1580 | 1580 | if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
| 1581 | 1581 | // Get user groups from AD |
| 1582 | 1582 | $user_ad_groups = []; |
| 1583 | - foreach($groups as $group) { |
|
| 1583 | + foreach ($groups as $group) { |
|
| 1584 | 1584 | //print_r($group); |
| 1585 | 1585 | // get relation role id for AD group |
| 1586 | 1586 | $role = DB::queryFirstRow( |
| 1587 | 1587 | 'SELECT lgr.role_id |
| 1588 | - FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr |
|
| 1588 | + FROM ' . prefixTable('ldap_groups_roles').' AS lgr |
|
| 1589 | 1589 | WHERE lgr.ldap_group_id = %s', |
| 1590 | 1590 | $group |
| 1591 | 1591 | ); |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | $passwordManager = new PasswordManager(); |
| 1649 | 1649 | |
| 1650 | 1650 | // Migrate password if needed |
| 1651 | - $result = $passwordManager->migratePassword( |
|
| 1651 | + $result = $passwordManager->migratePassword( |
|
| 1652 | 1652 | $userInfo['pw'], |
| 1653 | 1653 | $passwordClear, |
| 1654 | 1654 | (int) $userInfo['id'] |
@@ -1722,7 +1722,7 @@ discard block |
||
| 1722 | 1722 | // Check if exists in DB |
| 1723 | 1723 | $groupData = DB::queryFirstRow( |
| 1724 | 1724 | 'SELECT id |
| 1725 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1725 | + FROM ' . prefixTable('roles_title').' |
|
| 1726 | 1726 | WHERE title = %s', |
| 1727 | 1727 | $group["displayName"] |
| 1728 | 1728 | ); |
@@ -1871,7 +1871,7 @@ discard block |
||
| 1871 | 1871 | |
| 1872 | 1872 | // generate new QR |
| 1873 | 1873 | $new_2fa_qr = $tfa->getQRCodeImageAsDataUri( |
| 1874 | - 'Teampass - ' . $username, |
|
| 1874 | + 'Teampass - '.$username, |
|
| 1875 | 1875 | $userInfo['ga'] |
| 1876 | 1876 | ); |
| 1877 | 1877 | // clear temporary code from DB |
@@ -1884,7 +1884,7 @@ discard block |
||
| 1884 | 1884 | $userInfo['id'] |
| 1885 | 1885 | ); |
| 1886 | 1886 | $firstTime = [ |
| 1887 | - 'value' => '<img src="' . $new_2fa_qr . '">', |
|
| 1887 | + 'value' => '<img src="'.$new_2fa_qr.'">', |
|
| 1888 | 1888 | 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '', |
| 1889 | 1889 | 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '', |
| 1890 | 1890 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
@@ -2040,7 +2040,7 @@ discard block |
||
| 2040 | 2040 | }*/ |
| 2041 | 2041 | return [ |
| 2042 | 2042 | 'error' => true, |
| 2043 | - 'message' => $duo_error . $lang->get('duo_error_check_config'), |
|
| 2043 | + 'message' => $duo_error.$lang->get('duo_error_check_config'), |
|
| 2044 | 2044 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2045 | 2045 | 'debug_message' => $e->getMessage(), |
| 2046 | 2046 | 'proceedIdentification' => false, |
@@ -2056,7 +2056,7 @@ discard block |
||
| 2056 | 2056 | } catch (DuoException $e) { |
| 2057 | 2057 | return [ |
| 2058 | 2058 | 'error' => true, |
| 2059 | - 'message' => $duo_error . $lang->get('duo_error_url'), |
|
| 2059 | + 'message' => $duo_error.$lang->get('duo_error_url'), |
|
| 2060 | 2060 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2061 | 2061 | 'debug_message' => $e->getMessage(), |
| 2062 | 2062 | 'proceedIdentification' => false, |
@@ -2064,7 +2064,7 @@ discard block |
||
| 2064 | 2064 | } |
| 2065 | 2065 | |
| 2066 | 2066 | // Somethimes Duo return success but fail to return a URL, double check if the URL has been created |
| 2067 | - if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) { |
|
| 2067 | + if (!empty($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) { |
|
| 2068 | 2068 | // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt |
| 2069 | 2069 | $key = hash('sha256', $duo_state); |
| 2070 | 2070 | $iv = substr(hash('sha256', $duo_state), 0, 16); |
@@ -2092,7 +2092,7 @@ discard block |
||
| 2092 | 2092 | } else { |
| 2093 | 2093 | return [ |
| 2094 | 2094 | 'error' => true, |
| 2095 | - 'message' => $duo_error . $lang->get('duo_error_url'), |
|
| 2095 | + 'message' => $duo_error.$lang->get('duo_error_url'), |
|
| 2096 | 2096 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
| 2097 | 2097 | 'proceedIdentification' => false, |
| 2098 | 2098 | ]; |
@@ -2113,8 +2113,8 @@ discard block |
||
| 2113 | 2113 | // return the response (which should be the user name) |
| 2114 | 2114 | if ($decoded_token['preferred_username'] === $username) { |
| 2115 | 2115 | $session->set('user-duo_status', 'COMPLET'); |
| 2116 | - $session->set('user-duo_state',''); |
|
| 2117 | - $session->set('user-duo_data',''); |
|
| 2116 | + $session->set('user-duo_state', ''); |
|
| 2117 | + $session->set('user-duo_data', ''); |
|
| 2118 | 2118 | $session->set('user-login', $username); |
| 2119 | 2119 | |
| 2120 | 2120 | return [ |
@@ -2125,9 +2125,9 @@ discard block |
||
| 2125 | 2125 | ]; |
| 2126 | 2126 | } else { |
| 2127 | 2127 | // Something wrong, username from the original Duo request is different than the one received now |
| 2128 | - $session->set('user-duo_status',''); |
|
| 2129 | - $session->set('user-duo_state',''); |
|
| 2130 | - $session->set('user-duo_data',''); |
|
| 2128 | + $session->set('user-duo_status', ''); |
|
| 2129 | + $session->set('user-duo_state', ''); |
|
| 2130 | + $session->set('user-duo_data', ''); |
|
| 2131 | 2131 | |
| 2132 | 2132 | return [ |
| 2133 | 2133 | 'error' => true, |
@@ -2138,9 +2138,9 @@ discard block |
||
| 2138 | 2138 | } |
| 2139 | 2139 | } |
| 2140 | 2140 | // If we are here something wrong |
| 2141 | - $session->set('user-duo_status',''); |
|
| 2142 | - $session->set('user-duo_state',''); |
|
| 2143 | - $session->set('user-duo_data',''); |
|
| 2141 | + $session->set('user-duo_status', ''); |
|
| 2142 | + $session->set('user-duo_state', ''); |
|
| 2143 | + $session->set('user-duo_data', ''); |
|
| 2144 | 2144 | return [ |
| 2145 | 2145 | 'error' => true, |
| 2146 | 2146 | 'message' => $lang->get('duo_login_mismatch'), |
@@ -2259,7 +2259,7 @@ discard block |
||
| 2259 | 2259 | // Check for existing lock |
| 2260 | 2260 | $unlock_at = DB::queryFirstField( |
| 2261 | 2261 | 'SELECT MAX(unlock_at) |
| 2262 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 2262 | + FROM ' . prefixTable('auth_failures').' |
|
| 2263 | 2263 | WHERE unlock_at > %s |
| 2264 | 2264 | AND ((source = %s AND value = %s) OR (source = %s AND value = %s))', |
| 2265 | 2265 | date('Y-m-d H:i:s', time()), |
@@ -2281,8 +2281,8 @@ discard block |
||
| 2281 | 2281 | // Get user info from DB |
| 2282 | 2282 | $data = DB::queryFirstRow( |
| 2283 | 2283 | 'SELECT u.*, a.value AS api_key |
| 2284 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2285 | - LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id) |
|
| 2284 | + FROM ' . prefixTable('users').' AS u |
|
| 2285 | + LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id) |
|
| 2286 | 2286 | WHERE login = %s AND deleted_at IS NULL', |
| 2287 | 2287 | $login |
| 2288 | 2288 | ); |
@@ -2301,9 +2301,9 @@ discard block |
||
| 2301 | 2301 | // Check if similar login deleted exists |
| 2302 | 2302 | DB::queryFirstRow( |
| 2303 | 2303 | 'SELECT id, login |
| 2304 | - FROM ' . prefixTable('users') . ' |
|
| 2304 | + FROM ' . prefixTable('users').' |
|
| 2305 | 2305 | WHERE login LIKE %s AND deleted_at IS NOT NULL', |
| 2306 | - $login . '_deleted_%' |
|
| 2306 | + $login.'_deleted_%' |
|
| 2307 | 2307 | ); |
| 2308 | 2308 | |
| 2309 | 2309 | if (DB::count() > 0) { |
@@ -2413,7 +2413,7 @@ discard block |
||
| 2413 | 2413 | 'array' => [ |
| 2414 | 2414 | 'value' => 'bruteforce_wait', |
| 2415 | 2415 | 'error' => true, |
| 2416 | - 'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(), |
|
| 2416 | + 'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(), |
|
| 2417 | 2417 | ] |
| 2418 | 2418 | ]; |
| 2419 | 2419 | } |
@@ -2518,7 +2518,7 @@ discard block |
||
| 2518 | 2518 | // Clean previous failed attempts |
| 2519 | 2519 | $failedTasks = DB::query( |
| 2520 | 2520 | 'SELECT increment_id |
| 2521 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 2521 | + FROM ' . prefixTable('background_tasks').' |
|
| 2522 | 2522 | WHERE process_type = %s |
| 2523 | 2523 | AND JSON_EXTRACT(arguments, "$.new_user_id") = %i |
| 2524 | 2524 | AND status = %s', |
@@ -2635,7 +2635,7 @@ discard block |
||
| 2635 | 2635 | $userKeys['public_key'] |
| 2636 | 2636 | ); |
| 2637 | 2637 | }*/ |
| 2638 | - error_log('Switch user ' . $username . ' auth_type to oauth2'); |
|
| 2638 | + error_log('Switch user '.$username.' auth_type to oauth2'); |
|
| 2639 | 2639 | // Update user in database: |
| 2640 | 2640 | DB::update( |
| 2641 | 2641 | prefixTable('users'), |
@@ -2859,12 +2859,12 @@ discard block |
||
| 2859 | 2859 | { |
| 2860 | 2860 | // Find the latest "create_user_keys" task for the given user_id |
| 2861 | 2861 | $latestTask = DB::queryFirstRow( |
| 2862 | - 'SELECT arguments, status FROM ' . prefixTable('background_tasks') . ' |
|
| 2862 | + 'SELECT arguments, status FROM '.prefixTable('background_tasks').' |
|
| 2863 | 2863 | WHERE process_type = %s |
| 2864 | 2864 | AND arguments LIKE %s |
| 2865 | 2865 | ORDER BY increment_id DESC |
| 2866 | 2866 | LIMIT 1', |
| 2867 | - 'create_user_keys', '%"new_user_id":' . $userId . '%' |
|
| 2867 | + 'create_user_keys', '%"new_user_id":'.$userId.'%' |
|
| 2868 | 2868 | ); |
| 2869 | 2869 | |
| 2870 | 2870 | // If a failed task is found, return an error message |
@@ -3076,15 +3076,15 @@ discard block |
||
| 3076 | 3076 | |
| 3077 | 3077 | if ($ret['error'] !== false) { |
| 3078 | 3078 | logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username)); |
| 3079 | - $session->set('user-duo_status',''); |
|
| 3080 | - $session->set('user-duo_state',''); |
|
| 3081 | - $session->set('user-duo_data',''); |
|
| 3079 | + $session->set('user-duo_status', ''); |
|
| 3080 | + $session->set('user-duo_state', ''); |
|
| 3081 | + $session->set('user-duo_data', ''); |
|
| 3082 | 3082 | return [ |
| 3083 | 3083 | 'error' => true, |
| 3084 | 3084 | 'mfaData' => $ret, |
| 3085 | 3085 | 'mfaQRCodeInfos' => false, |
| 3086 | 3086 | ]; |
| 3087 | - } else if ($ret['duo_url_ready'] === true){ |
|
| 3087 | + } else if ($ret['duo_url_ready'] === true) { |
|
| 3088 | 3088 | return [ |
| 3089 | 3089 | 'error' => false, |
| 3090 | 3090 | 'mfaData' => $ret, |
@@ -3148,7 +3148,7 @@ discard block |
||
| 3148 | 3148 | // Count failed attempts from this source |
| 3149 | 3149 | $count = DB::queryFirstField( |
| 3150 | 3150 | 'SELECT COUNT(*) |
| 3151 | - FROM ' . prefixTable('auth_failures') . ' |
|
| 3151 | + FROM ' . prefixTable('auth_failures').' |
|
| 3152 | 3152 | WHERE source = %s AND value = %s', |
| 3153 | 3153 | $source, |
| 3154 | 3154 | $value |
@@ -2904,8 +2904,8 @@ discard block |
||
| 2904 | 2904 | // LIVE ACTIVITY ENDPOINT |
| 2905 | 2905 | // ======================================== |
| 2906 | 2906 | |
| 2907 | -case 'get_live_activity': |
|
| 2908 | - /** |
|
| 2907 | + case 'get_live_activity': |
|
| 2908 | + /** |
|
| 2909 | 2909 | * Get recent activity (last 5 minutes, max 10 entries) |
| 2910 | 2910 | * |
| 2911 | 2911 | * @return array [{ |
@@ -2919,25 +2919,25 @@ discard block |
||
| 2919 | 2919 | * }] |
| 2920 | 2920 | */ |
| 2921 | 2921 | |
| 2922 | - $timestamp5min = time() - 300; // 5 minutes ago |
|
| 2922 | + $timestamp5min = time() - 300; // 5 minutes ago |
|
| 2923 | 2923 | |
| 2924 | - $activities = DB::query( |
|
| 2925 | - 'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label |
|
| 2924 | + $activities = DB::query( |
|
| 2925 | + 'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label |
|
| 2926 | 2926 | FROM ' . prefixTable('log_items') . ' AS l |
| 2927 | 2927 | LEFT JOIN ' . prefixTable('users') . ' AS u ON l.id_user = u.id |
| 2928 | 2928 | LEFT JOIN ' . prefixTable('items') . ' AS i ON l.id_item = i.id |
| 2929 | 2929 | WHERE l.date > %i |
| 2930 | 2930 | ORDER BY l.date DESC |
| 2931 | 2931 | LIMIT 10', |
| 2932 | - $timestamp5min |
|
| 2933 | - ); |
|
| 2932 | + $timestamp5min |
|
| 2933 | + ); |
|
| 2934 | 2934 | |
| 2935 | - $activityList = array(); |
|
| 2935 | + $activityList = array(); |
|
| 2936 | 2936 | |
| 2937 | - foreach ($activities as $activity) { |
|
| 2938 | - // Translate action to readable text |
|
| 2939 | - $actionText = ''; |
|
| 2940 | - switch ($activity['action']) { |
|
| 2937 | + foreach ($activities as $activity) { |
|
| 2938 | + // Translate action to readable text |
|
| 2939 | + $actionText = ''; |
|
| 2940 | + switch ($activity['action']) { |
|
| 2941 | 2941 | case 'at_shown': |
| 2942 | 2942 | $actionText = $lang->get('action_accessed'); |
| 2943 | 2943 | break; |
@@ -2961,7 +2961,7 @@ discard block |
||
| 2961 | 2961 | break; |
| 2962 | 2962 | default: |
| 2963 | 2963 | $actionText = $activity['action']; |
| 2964 | - } |
|
| 2964 | + } |
|
| 2965 | 2965 | |
| 2966 | 2966 | $activityList[] = array( |
| 2967 | 2967 | 'timestamp' => (int) $activity['date'], |
@@ -2987,8 +2987,8 @@ discard block |
||
| 2987 | 2987 | // SYSTEM STATUS ENDPOINT |
| 2988 | 2988 | // ======================================== |
| 2989 | 2989 | |
| 2990 | -case 'get_system_status': |
|
| 2991 | - /** |
|
| 2990 | + case 'get_system_status': |
|
| 2991 | + /** |
|
| 2992 | 2992 | * Get system status (CPU, RAM, disk, tasks queue) |
| 2993 | 2993 | * |
| 2994 | 2994 | * @return array { |
@@ -2997,49 +2997,49 @@ discard block |
||
| 2997 | 2997 | * } |
| 2998 | 2998 | */ |
| 2999 | 2999 | |
| 3000 | - // Tasks queue count |
|
| 3001 | - $tasksQueue = DB::queryFirstField( |
|
| 3002 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' |
|
| 3000 | + // Tasks queue count |
|
| 3001 | + $tasksQueue = DB::queryFirstField( |
|
| 3002 | + 'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' |
|
| 3003 | 3003 | WHERE finished_at IS NULL OR finished_at = 0' |
| 3004 | - ); |
|
| 3004 | + ); |
|
| 3005 | 3005 | |
| 3006 | - // Last cron execution |
|
| 3007 | - $lastCronLog = DB::queryFirstRow( |
|
| 3008 | - 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3006 | + // Last cron execution |
|
| 3007 | + $lastCronLog = DB::queryFirstRow( |
|
| 3008 | + 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3009 | 3009 | ORDER BY created_at DESC |
| 3010 | 3010 | LIMIT 1' |
| 3011 | - ); |
|
| 3011 | + ); |
|
| 3012 | 3012 | |
| 3013 | - $lastCronText = $lang->get('never'); |
|
| 3014 | - if ($lastCronLog && isset($lastCronLog['created_at'])) { |
|
| 3015 | - $timeDiff = time() - (int) $lastCronLog['created_at']; |
|
| 3016 | - if ($timeDiff < 60) { |
|
| 3017 | - $lastCronText = $timeDiff . 's ' . $lang->get('ago'); |
|
| 3018 | - } elseif ($timeDiff < 3600) { |
|
| 3019 | - $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago'); |
|
| 3020 | - } elseif ($timeDiff < 86400) { |
|
| 3021 | - $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago'); |
|
| 3022 | - } else { |
|
| 3023 | - $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago'); |
|
| 3013 | + $lastCronText = $lang->get('never'); |
|
| 3014 | + if ($lastCronLog && isset($lastCronLog['created_at'])) { |
|
| 3015 | + $timeDiff = time() - (int) $lastCronLog['created_at']; |
|
| 3016 | + if ($timeDiff < 60) { |
|
| 3017 | + $lastCronText = $timeDiff . 's ' . $lang->get('ago'); |
|
| 3018 | + } elseif ($timeDiff < 3600) { |
|
| 3019 | + $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago'); |
|
| 3020 | + } elseif ($timeDiff < 86400) { |
|
| 3021 | + $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago'); |
|
| 3022 | + } else { |
|
| 3023 | + $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago'); |
|
| 3024 | + } |
|
| 3024 | 3025 | } |
| 3025 | - } |
|
| 3026 | 3026 | |
| 3027 | - echo prepareExchangedData( |
|
| 3028 | - array( |
|
| 3029 | - 'error' => false, |
|
| 3030 | - 'tasks_queue' => (int) $tasksQueue, |
|
| 3031 | - 'last_cron' => $lastCronText, |
|
| 3032 | - ), |
|
| 3033 | - 'encode' |
|
| 3034 | - ); |
|
| 3035 | - break; |
|
| 3027 | + echo prepareExchangedData( |
|
| 3028 | + array( |
|
| 3029 | + 'error' => false, |
|
| 3030 | + 'tasks_queue' => (int) $tasksQueue, |
|
| 3031 | + 'last_cron' => $lastCronText, |
|
| 3032 | + ), |
|
| 3033 | + 'encode' |
|
| 3034 | + ); |
|
| 3035 | + break; |
|
| 3036 | 3036 | |
| 3037 | -// ======================================== |
|
| 3038 | -// SYSTEM HEALTH ENDPOINT |
|
| 3039 | -// ======================================== |
|
| 3037 | + // ======================================== |
|
| 3038 | + // SYSTEM HEALTH ENDPOINT |
|
| 3039 | + // ======================================== |
|
| 3040 | 3040 | |
| 3041 | -case 'get_system_health': |
|
| 3042 | - /** |
|
| 3041 | + case 'get_system_health': |
|
| 3042 | + /** |
|
| 3043 | 3043 | * Get system health checks |
| 3044 | 3044 | * |
| 3045 | 3045 | * @return array { |
@@ -3051,97 +3051,97 @@ discard block |
||
| 3051 | 3051 | * } |
| 3052 | 3052 | */ |
| 3053 | 3053 | |
| 3054 | - // Encryption check |
|
| 3055 | - $encryptionStatus = 'success'; |
|
| 3056 | - $encryptionText = $lang->get('health_status_ok'); |
|
| 3054 | + // Encryption check |
|
| 3055 | + $encryptionStatus = 'success'; |
|
| 3056 | + $encryptionText = $lang->get('health_status_ok'); |
|
| 3057 | 3057 | |
| 3058 | - // Check if secure file exists |
|
| 3059 | - if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) { |
|
| 3060 | - $encryptionStatus = 'danger'; |
|
| 3061 | - $encryptionText = $lang->get('health_secure_file_missing'); |
|
| 3062 | - } |
|
| 3058 | + // Check if secure file exists |
|
| 3059 | + if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) { |
|
| 3060 | + $encryptionStatus = 'danger'; |
|
| 3061 | + $encryptionText = $lang->get('health_secure_file_missing'); |
|
| 3062 | + } |
|
| 3063 | 3063 | |
| 3064 | - // Active sessions count |
|
| 3065 | - $sessionsCount = DB::queryFirstField( |
|
| 3066 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 3064 | + // Active sessions count |
|
| 3065 | + $sessionsCount = DB::queryFirstField( |
|
| 3066 | + 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 3067 | 3067 | WHERE session_end > %i', |
| 3068 | - time() |
|
| 3069 | - ); |
|
| 3068 | + time() |
|
| 3069 | + ); |
|
| 3070 | 3070 | |
| 3071 | - // Is cron installed |
|
| 3072 | - DB::query( |
|
| 3073 | - 'SELECT valeur |
|
| 3071 | + // Is cron installed |
|
| 3072 | + DB::query( |
|
| 3073 | + 'SELECT valeur |
|
| 3074 | 3074 | FROM ' . prefixTable('misc') . ' |
| 3075 | 3075 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 3076 | - 'admin', |
|
| 3077 | - 'last_cron_exec', |
|
| 3078 | - time() - 600 // max 10 minutes |
|
| 3079 | - ); |
|
| 3076 | + 'admin', |
|
| 3077 | + 'last_cron_exec', |
|
| 3078 | + time() - 600 // max 10 minutes |
|
| 3079 | + ); |
|
| 3080 | 3080 | |
| 3081 | - if (DB::count() === 0) { |
|
| 3082 | - $cronStatus = 'danger'; |
|
| 3083 | - $cronText = $lang->get('error'); |
|
| 3084 | - } else { |
|
| 3085 | - // Cron check (last execution should be < 2 minutes ago) |
|
| 3086 | - $lastCron = DB::queryFirstField( |
|
| 3087 | - 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3081 | + if (DB::count() === 0) { |
|
| 3082 | + $cronStatus = 'danger'; |
|
| 3083 | + $cronText = $lang->get('error'); |
|
| 3084 | + } else { |
|
| 3085 | + // Cron check (last execution should be < 2 minutes ago) |
|
| 3086 | + $lastCron = DB::queryFirstField( |
|
| 3087 | + 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3088 | 3088 | ORDER BY created_at DESC |
| 3089 | 3089 | LIMIT 1' |
| 3090 | - ); |
|
| 3090 | + ); |
|
| 3091 | 3091 | |
| 3092 | - $cronStatus = 'success'; |
|
| 3093 | - $cronText = $lang->get('health_status_ok'); |
|
| 3092 | + $cronStatus = 'success'; |
|
| 3093 | + $cronText = $lang->get('health_status_ok'); |
|
| 3094 | 3094 | |
| 3095 | - if (!$lastCron || (time() - (int) $lastCron) > 120) { |
|
| 3096 | - $cronStatus = 'warning'; |
|
| 3097 | - $cronText = $lang->get('health_cron_delayed'); |
|
| 3095 | + if (!$lastCron || (time() - (int) $lastCron) > 120) { |
|
| 3096 | + $cronStatus = 'warning'; |
|
| 3097 | + $cronText = $lang->get('health_cron_delayed'); |
|
| 3098 | + } |
|
| 3098 | 3099 | } |
| 3099 | - } |
|
| 3100 | 3100 | |
| 3101 | - // Unknown files count |
|
| 3102 | - $unknownFilesData = DB::queryFirstField( |
|
| 3103 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3101 | + // Unknown files count |
|
| 3102 | + $unknownFilesData = DB::queryFirstField( |
|
| 3103 | + 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3104 | 3104 | WHERE type = %s AND intitule = %s', |
| 3105 | - 'admin', |
|
| 3106 | - 'unknown_files' |
|
| 3107 | - ); |
|
| 3105 | + 'admin', |
|
| 3106 | + 'unknown_files' |
|
| 3107 | + ); |
|
| 3108 | 3108 | |
| 3109 | - $unknownFilesCount = 0; |
|
| 3110 | - if ($unknownFilesData) { |
|
| 3111 | - $unknownFiles = json_decode($unknownFilesData, true); |
|
| 3112 | - if (is_array($unknownFiles)) { |
|
| 3113 | - $unknownFilesCount = count($unknownFiles); |
|
| 3109 | + $unknownFilesCount = 0; |
|
| 3110 | + if ($unknownFilesData) { |
|
| 3111 | + $unknownFiles = json_decode($unknownFilesData, true); |
|
| 3112 | + if (is_array($unknownFiles)) { |
|
| 3113 | + $unknownFilesCount = count($unknownFiles); |
|
| 3114 | + } |
|
| 3114 | 3115 | } |
| 3115 | - } |
|
| 3116 | 3116 | |
| 3117 | - echo prepareExchangedData( |
|
| 3118 | - array( |
|
| 3119 | - 'error' => false, |
|
| 3120 | - 'encryption' => array( |
|
| 3121 | - 'status' => $encryptionStatus, |
|
| 3122 | - 'text' => $encryptionText, |
|
| 3123 | - ), |
|
| 3124 | - 'sessions' => array( |
|
| 3125 | - 'count' => (int) $sessionsCount, |
|
| 3126 | - ), |
|
| 3127 | - 'cron' => array( |
|
| 3128 | - 'status' => $cronStatus, |
|
| 3129 | - 'text' => $cronText, |
|
| 3130 | - ), |
|
| 3131 | - 'unknown_files' => array( |
|
| 3132 | - 'count' => $unknownFilesCount, |
|
| 3117 | + echo prepareExchangedData( |
|
| 3118 | + array( |
|
| 3119 | + 'error' => false, |
|
| 3120 | + 'encryption' => array( |
|
| 3121 | + 'status' => $encryptionStatus, |
|
| 3122 | + 'text' => $encryptionText, |
|
| 3123 | + ), |
|
| 3124 | + 'sessions' => array( |
|
| 3125 | + 'count' => (int) $sessionsCount, |
|
| 3126 | + ), |
|
| 3127 | + 'cron' => array( |
|
| 3128 | + 'status' => $cronStatus, |
|
| 3129 | + 'text' => $cronText, |
|
| 3130 | + ), |
|
| 3131 | + 'unknown_files' => array( |
|
| 3132 | + 'count' => $unknownFilesCount, |
|
| 3133 | + ), |
|
| 3133 | 3134 | ), |
| 3134 | - ), |
|
| 3135 | - 'encode' |
|
| 3136 | - ); |
|
| 3137 | - break; |
|
| 3135 | + 'encode' |
|
| 3136 | + ); |
|
| 3137 | + break; |
|
| 3138 | 3138 | |
| 3139 | -// ======================================== |
|
| 3140 | -// QUICK ACTIONS - CLEAN OLD LOGS |
|
| 3141 | -// ======================================== |
|
| 3139 | + // ======================================== |
|
| 3140 | + // QUICK ACTIONS - CLEAN OLD LOGS |
|
| 3141 | + // ======================================== |
|
| 3142 | 3142 | |
| 3143 | -case 'clean_old_logs': |
|
| 3144 | - /** |
|
| 3143 | + case 'clean_old_logs': |
|
| 3144 | + /** |
|
| 3145 | 3145 | * Clean logs older than 90 days |
| 3146 | 3146 | * |
| 3147 | 3147 | * @return array { |
@@ -3151,54 +3151,54 @@ discard block |
||
| 3151 | 3151 | * } |
| 3152 | 3152 | */ |
| 3153 | 3153 | |
| 3154 | - $threshold = time() - (90 * 86400); // 90 days ago |
|
| 3154 | + $threshold = time() - (90 * 86400); // 90 days ago |
|
| 3155 | 3155 | |
| 3156 | - // Delete old log_items entries |
|
| 3157 | - DB::delete( |
|
| 3158 | - prefixTable('log_items'), |
|
| 3159 | - 'date < %i', |
|
| 3160 | - $threshold |
|
| 3161 | - ); |
|
| 3156 | + // Delete old log_items entries |
|
| 3157 | + DB::delete( |
|
| 3158 | + prefixTable('log_items'), |
|
| 3159 | + 'date < %i', |
|
| 3160 | + $threshold |
|
| 3161 | + ); |
|
| 3162 | 3162 | |
| 3163 | - $deletedItems = DB::affectedRows(); |
|
| 3163 | + $deletedItems = DB::affectedRows(); |
|
| 3164 | 3164 | |
| 3165 | - // Delete old log_system entries |
|
| 3166 | - DB::delete( |
|
| 3167 | - prefixTable('log_system'), |
|
| 3168 | - 'date < %i', |
|
| 3169 | - $threshold |
|
| 3170 | - ); |
|
| 3165 | + // Delete old log_system entries |
|
| 3166 | + DB::delete( |
|
| 3167 | + prefixTable('log_system'), |
|
| 3168 | + 'date < %i', |
|
| 3169 | + $threshold |
|
| 3170 | + ); |
|
| 3171 | 3171 | |
| 3172 | - $deletedSystem = DB::affectedRows(); |
|
| 3172 | + $deletedSystem = DB::affectedRows(); |
|
| 3173 | 3173 | |
| 3174 | - $totalDeleted = $deletedItems + $deletedSystem; |
|
| 3174 | + $totalDeleted = $deletedItems + $deletedSystem; |
|
| 3175 | 3175 | |
| 3176 | - // Log the action |
|
| 3177 | - logEvents( |
|
| 3178 | - $SETTINGS, |
|
| 3179 | - 'admin_action', |
|
| 3180 | - 'clean_old_logs', |
|
| 3181 | - (string) $session->get('user-id'), |
|
| 3182 | - $session->get('user-login'), |
|
| 3183 | - 'Cleaned ' . $totalDeleted . ' old log entries' |
|
| 3184 | - ); |
|
| 3176 | + // Log the action |
|
| 3177 | + logEvents( |
|
| 3178 | + $SETTINGS, |
|
| 3179 | + 'admin_action', |
|
| 3180 | + 'clean_old_logs', |
|
| 3181 | + (string) $session->get('user-id'), |
|
| 3182 | + $session->get('user-login'), |
|
| 3183 | + 'Cleaned ' . $totalDeleted . ' old log entries' |
|
| 3184 | + ); |
|
| 3185 | 3185 | |
| 3186 | - echo prepareExchangedData( |
|
| 3187 | - array( |
|
| 3188 | - 'error' => false, |
|
| 3189 | - 'message' => $lang->get('admin_logs_cleaned_success'), |
|
| 3190 | - 'deleted_count' => $totalDeleted, |
|
| 3191 | - ), |
|
| 3192 | - 'encode' |
|
| 3193 | - ); |
|
| 3194 | - break; |
|
| 3186 | + echo prepareExchangedData( |
|
| 3187 | + array( |
|
| 3188 | + 'error' => false, |
|
| 3189 | + 'message' => $lang->get('admin_logs_cleaned_success'), |
|
| 3190 | + 'deleted_count' => $totalDeleted, |
|
| 3191 | + ), |
|
| 3192 | + 'encode' |
|
| 3193 | + ); |
|
| 3194 | + break; |
|
| 3195 | 3195 | |
| 3196 | -// ======================================== |
|
| 3197 | -// QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY) |
|
| 3198 | -// ======================================== |
|
| 3196 | + // ======================================== |
|
| 3197 | + // QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY) |
|
| 3198 | + // ======================================== |
|
| 3199 | 3199 | |
| 3200 | -case 'test_encryption': |
|
| 3201 | - /** |
|
| 3200 | + case 'test_encryption': |
|
| 3201 | + /** |
|
| 3202 | 3202 | * Test encryption system integrity |
| 3203 | 3203 | * |
| 3204 | 3204 | * @return array { |
@@ -3207,117 +3207,117 @@ discard block |
||
| 3207 | 3207 | * } |
| 3208 | 3208 | */ |
| 3209 | 3209 | |
| 3210 | - try { |
|
| 3211 | - // Test string |
|
| 3212 | - $testString = 'TeamPass Encryption Test ' . time(); |
|
| 3210 | + try { |
|
| 3211 | + // Test string |
|
| 3212 | + $testString = 'TeamPass Encryption Test ' . time(); |
|
| 3213 | 3213 | |
| 3214 | - // Get encryption key |
|
| 3215 | - $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']); |
|
| 3214 | + // Get encryption key |
|
| 3215 | + $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']); |
|
| 3216 | 3216 | |
| 3217 | - if ($key === false) { |
|
| 3218 | - throw new Exception($lang->get('admin_encryption_key_not_found')); |
|
| 3219 | - } |
|
| 3217 | + if ($key === false) { |
|
| 3218 | + throw new Exception($lang->get('admin_encryption_key_not_found')); |
|
| 3219 | + } |
|
| 3220 | 3220 | |
| 3221 | - // Use Defuse encryption (TeamPass's current encryption method) |
|
| 3222 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php'; |
|
| 3223 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php'; |
|
| 3224 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 3225 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php'; |
|
| 3226 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php'; |
|
| 3221 | + // Use Defuse encryption (TeamPass's current encryption method) |
|
| 3222 | + require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php'; |
|
| 3223 | + require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php'; |
|
| 3224 | + require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 3225 | + require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php'; |
|
| 3226 | + require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php'; |
|
| 3227 | 3227 | |
| 3228 | - $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key); |
|
| 3228 | + $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key); |
|
| 3229 | 3229 | |
| 3230 | - // Encrypt test string |
|
| 3231 | - $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey); |
|
| 3230 | + // Encrypt test string |
|
| 3231 | + $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey); |
|
| 3232 | 3232 | |
| 3233 | - // Decrypt test string |
|
| 3234 | - $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey); |
|
| 3233 | + // Decrypt test string |
|
| 3234 | + $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey); |
|
| 3235 | 3235 | |
| 3236 | - // Verify |
|
| 3237 | - if ($decrypted !== $testString) { |
|
| 3238 | - throw new Exception($lang->get('admin_encryption_test_failed')); |
|
| 3239 | - } |
|
| 3236 | + // Verify |
|
| 3237 | + if ($decrypted !== $testString) { |
|
| 3238 | + throw new Exception($lang->get('admin_encryption_test_failed')); |
|
| 3239 | + } |
|
| 3240 | 3240 | |
| 3241 | - // Log the test |
|
| 3242 | - logEvents( |
|
| 3243 | - $SETTINGS, |
|
| 3244 | - 'admin_action', |
|
| 3245 | - 'test_encryption', |
|
| 3246 | - (string) $session->get('user-id'), |
|
| 3247 | - $session->get('user-login'), |
|
| 3248 | - 'Encryption test successful' |
|
| 3249 | - ); |
|
| 3241 | + // Log the test |
|
| 3242 | + logEvents( |
|
| 3243 | + $SETTINGS, |
|
| 3244 | + 'admin_action', |
|
| 3245 | + 'test_encryption', |
|
| 3246 | + (string) $session->get('user-id'), |
|
| 3247 | + $session->get('user-login'), |
|
| 3248 | + 'Encryption test successful' |
|
| 3249 | + ); |
|
| 3250 | 3250 | |
| 3251 | - echo prepareExchangedData( |
|
| 3252 | - array( |
|
| 3253 | - 'error' => false, |
|
| 3254 | - 'message' => $lang->get('admin_encryption_test_success'), |
|
| 3255 | - ), |
|
| 3256 | - 'encode' |
|
| 3257 | - ); |
|
| 3251 | + echo prepareExchangedData( |
|
| 3252 | + array( |
|
| 3253 | + 'error' => false, |
|
| 3254 | + 'message' => $lang->get('admin_encryption_test_success'), |
|
| 3255 | + ), |
|
| 3256 | + 'encode' |
|
| 3257 | + ); |
|
| 3258 | 3258 | |
| 3259 | - } catch (Exception $e) { |
|
| 3260 | - echo prepareExchangedData( |
|
| 3261 | - array( |
|
| 3262 | - 'error' => true, |
|
| 3263 | - 'message' => $e->getMessage(), |
|
| 3264 | - ), |
|
| 3265 | - 'encode' |
|
| 3266 | - ); |
|
| 3267 | - } |
|
| 3268 | - break; |
|
| 3259 | + } catch (Exception $e) { |
|
| 3260 | + echo prepareExchangedData( |
|
| 3261 | + array( |
|
| 3262 | + 'error' => true, |
|
| 3263 | + 'message' => $e->getMessage(), |
|
| 3264 | + ), |
|
| 3265 | + 'encode' |
|
| 3266 | + ); |
|
| 3267 | + } |
|
| 3268 | + break; |
|
| 3269 | 3269 | |
| 3270 | -// ======================================== |
|
| 3271 | -// QUICK ACTIONS - EXPORT STATISTICS |
|
| 3272 | -// ======================================== |
|
| 3270 | + // ======================================== |
|
| 3271 | + // QUICK ACTIONS - EXPORT STATISTICS |
|
| 3272 | + // ======================================== |
|
| 3273 | 3273 | |
| 3274 | -case 'export_statistics': |
|
| 3275 | - /** |
|
| 3274 | + case 'export_statistics': |
|
| 3275 | + /** |
|
| 3276 | 3276 | * Export statistics as CSV file |
| 3277 | 3277 | * |
| 3278 | 3278 | * @return void (file download) |
| 3279 | 3279 | */ |
| 3280 | 3280 | |
| 3281 | - // Set headers for CSV download |
|
| 3282 | - header('Content-Type: text/csv; charset=utf-8'); |
|
| 3283 | - header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"'); |
|
| 3281 | + // Set headers for CSV download |
|
| 3282 | + header('Content-Type: text/csv; charset=utf-8'); |
|
| 3283 | + header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"'); |
|
| 3284 | 3284 | |
| 3285 | - // Create output stream |
|
| 3286 | - $output = fopen('php://output', 'w'); |
|
| 3285 | + // Create output stream |
|
| 3286 | + $output = fopen('php://output', 'w'); |
|
| 3287 | 3287 | |
| 3288 | - // Write CSV headers |
|
| 3289 | - fputcsv($output, array( |
|
| 3290 | - $lang->get('admin_export_metric'), |
|
| 3291 | - $lang->get('admin_export_value'), |
|
| 3292 | - )); |
|
| 3288 | + // Write CSV headers |
|
| 3289 | + fputcsv($output, array( |
|
| 3290 | + $lang->get('admin_export_metric'), |
|
| 3291 | + $lang->get('admin_export_value'), |
|
| 3292 | + )); |
|
| 3293 | 3293 | |
| 3294 | - // Gather statistics |
|
| 3295 | - $stats = array( |
|
| 3296 | - $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'), |
|
| 3297 | - $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'), |
|
| 3298 | - $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')), |
|
| 3299 | - $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)), |
|
| 3300 | - ); |
|
| 3294 | + // Gather statistics |
|
| 3295 | + $stats = array( |
|
| 3296 | + $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'), |
|
| 3297 | + $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'), |
|
| 3298 | + $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')), |
|
| 3299 | + $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)), |
|
| 3300 | + ); |
|
| 3301 | 3301 | |
| 3302 | - // Write statistics |
|
| 3303 | - foreach ($stats as $metric => $value) { |
|
| 3304 | - fputcsv($output, array($metric, $value)); |
|
| 3305 | - } |
|
| 3302 | + // Write statistics |
|
| 3303 | + foreach ($stats as $metric => $value) { |
|
| 3304 | + fputcsv($output, array($metric, $value)); |
|
| 3305 | + } |
|
| 3306 | 3306 | |
| 3307 | - fclose($output); |
|
| 3307 | + fclose($output); |
|
| 3308 | 3308 | |
| 3309 | - // Log the export |
|
| 3310 | - logEvents( |
|
| 3311 | - $SETTINGS, |
|
| 3312 | - 'admin_action', |
|
| 3313 | - 'export_statistics', |
|
| 3314 | - (string) $session->get('user-id'), |
|
| 3315 | - $session->get('user-login'), |
|
| 3316 | - 'Statistics exported' |
|
| 3317 | - ); |
|
| 3309 | + // Log the export |
|
| 3310 | + logEvents( |
|
| 3311 | + $SETTINGS, |
|
| 3312 | + 'admin_action', |
|
| 3313 | + 'export_statistics', |
|
| 3314 | + (string) $session->get('user-id'), |
|
| 3315 | + $session->get('user-login'), |
|
| 3316 | + 'Statistics exported' |
|
| 3317 | + ); |
|
| 3318 | 3318 | |
| 3319 | - exit; |
|
| 3320 | - break; |
|
| 3319 | + exit; |
|
| 3320 | + break; |
|
| 3321 | 3321 | |
| 3322 | 3322 | } |
| 3323 | 3323 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 73 | 73 | // Not allowed page |
| 74 | 74 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 75 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 75 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 76 | 76 | exit; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | break; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 136 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 137 | 137 | $return = ''; |
| 138 | 138 | |
| 139 | 139 | //Get all tables |
| 140 | 140 | $tables = array(); |
| 141 | 141 | $result = DB::query('SHOW TABLES'); |
| 142 | 142 | foreach ($result as $row) { |
| 143 | - $tables[] = $row['Tables_in_' . DB_NAME]; |
|
| 143 | + $tables[] = $row['Tables_in_'.DB_NAME]; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | //cycle through |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) { |
| 149 | 149 | $table = (is_string($table) ? $table : strval($table)); |
| 150 | 150 | // Do query |
| 151 | - $result = DB::query('SELECT * FROM ' . $table); |
|
| 151 | + $result = DB::query('SELECT * FROM '.$table); |
|
| 152 | 152 | DB::query( |
| 153 | 153 | 'SELECT * |
| 154 | 154 | FROM INFORMATION_SCHEMA.COLUMNS |
@@ -160,20 +160,20 @@ discard block |
||
| 160 | 160 | $numFields = DB::count(); |
| 161 | 161 | |
| 162 | 162 | // prepare a drop table |
| 163 | - $return .= 'DROP TABLE ' . $table . ';'; |
|
| 164 | - $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table); |
|
| 165 | - $return .= "\n\n" . strval($row2['Create Table']) . ";\n\n"; |
|
| 163 | + $return .= 'DROP TABLE '.$table.';'; |
|
| 164 | + $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table); |
|
| 165 | + $return .= "\n\n".strval($row2['Create Table']).";\n\n"; |
|
| 166 | 166 | |
| 167 | 167 | //prepare all fields and datas |
| 168 | 168 | for ($i = 0; $i < $numFields; ++$i) { |
| 169 | 169 | if (is_object($result)) { |
| 170 | 170 | while ($row = $result->fetch_row()) { |
| 171 | - $return .= 'INSERT INTO ' . $table . ' VALUES('; |
|
| 171 | + $return .= 'INSERT INTO '.$table.' VALUES('; |
|
| 172 | 172 | for ($j = 0; $j < $numFields; ++$j) { |
| 173 | 173 | $row[$j] = addslashes($row[$j]); |
| 174 | 174 | $row[$j] = preg_replace("/\n/", '\\n', $row[$j]); |
| 175 | 175 | if (isset($row[$j])) { |
| 176 | - $return .= '"' . $row[$j] . '"'; |
|
| 176 | + $return .= '"'.$row[$j].'"'; |
|
| 177 | 177 | } else { |
| 178 | 178 | $return .= 'NULL'; |
| 179 | 179 | } |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | $token = GenerateCryptKey(20, false, true, true, false, true); |
| 195 | 195 | |
| 196 | 196 | //save file |
| 197 | - $filename = time() . '-' . $token . '.sql'; |
|
| 198 | - $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+'); |
|
| 197 | + $filename = time().'-'.$token.'.sql'; |
|
| 198 | + $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+'); |
|
| 199 | 199 | if ($handle !== false) { |
| 200 | 200 | //write file |
| 201 | 201 | fwrite($handle, $return); |
@@ -207,16 +207,16 @@ discard block |
||
| 207 | 207 | // Encrypt the file |
| 208 | 208 | prepareFileWithDefuse( |
| 209 | 209 | 'encrypt', |
| 210 | - $SETTINGS['path_to_files_folder'] . '/' . $filename, |
|
| 211 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 210 | + $SETTINGS['path_to_files_folder'].'/'.$filename, |
|
| 211 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 212 | 212 | $post_option |
| 213 | 213 | ); |
| 214 | 214 | |
| 215 | 215 | // Do clean |
| 216 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $filename); |
|
| 216 | + unlink($SETTINGS['path_to_files_folder'].'/'.$filename); |
|
| 217 | 217 | rename( |
| 218 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 219 | - $SETTINGS['path_to_files_folder'] . '/' . $filename |
|
| 218 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 219 | + $SETTINGS['path_to_files_folder'].'/'.$filename |
|
| 220 | 220 | ); |
| 221 | 221 | } |
| 222 | 222 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | //update LOG |
| 227 | 227 | logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login')); |
| 228 | 228 | |
| 229 | - echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]'; |
|
| 229 | + echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]'; |
|
| 230 | 230 | } |
| 231 | 231 | break; |
| 232 | 232 | |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | ); |
| 256 | 256 | break; |
| 257 | 257 | } |
| 258 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 258 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 259 | 259 | |
| 260 | 260 | $dataPost = explode('&', $post_option); |
| 261 | 261 | $file = htmlspecialchars($dataPost[0]); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Get filename from database |
| 265 | 265 | $data = DB::queryFirstRow( |
| 266 | 266 | 'SELECT valeur |
| 267 | - FROM ' . prefixTable('misc') . ' |
|
| 267 | + FROM ' . prefixTable('misc').' |
|
| 268 | 268 | WHERE increment_id = %i', |
| 269 | 269 | $file |
| 270 | 270 | ); |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | // Decrypt the file |
| 284 | 284 | $ret = prepareFileWithDefuse( |
| 285 | 285 | 'decrypt', |
| 286 | - $SETTINGS['path_to_files_folder'] . '/' . $file, |
|
| 287 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file, |
|
| 286 | + $SETTINGS['path_to_files_folder'].'/'.$file, |
|
| 287 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file, |
|
| 288 | 288 | $key |
| 289 | 289 | ); |
| 290 | 290 | |
@@ -295,10 +295,10 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | // Do clean |
| 298 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS); |
|
| 299 | - $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file; |
|
| 298 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS); |
|
| 299 | + $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file; |
|
| 300 | 300 | } else { |
| 301 | - $file = $SETTINGS['path_to_files_folder'] . '/' . $file; |
|
| 301 | + $file = $SETTINGS['path_to_files_folder'].'/'.$file; |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | //read sql file |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | fclose($handle); |
| 316 | 316 | |
| 317 | 317 | //delete file |
| 318 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $file); |
|
| 318 | + unlink($SETTINGS['path_to_files_folder'].'/'.$file); |
|
| 319 | 319 | |
| 320 | 320 | //Show done |
| 321 | 321 | echo '[{"result":"db_restore" , "message":""}]'; |
@@ -354,8 +354,8 @@ discard block |
||
| 354 | 354 | $tablename = (is_string($tablename) ? $tablename : strval($tablename)); |
| 355 | 355 | if (substr_count($tablename, DB_PREFIX) > 0) { |
| 356 | 356 | // launch optimization quieries |
| 357 | - DB::query('ANALYZE TABLE `' . $tablename . '`'); |
|
| 358 | - DB::query('OPTIMIZE TABLE `' . $tablename . '`'); |
|
| 357 | + DB::query('ANALYZE TABLE `'.$tablename.'`'); |
|
| 358 | + DB::query('OPTIMIZE TABLE `'.$tablename.'`'); |
|
| 359 | 359 | } |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -363,12 +363,12 @@ discard block |
||
| 363 | 363 | //Clean up LOG_ITEMS table |
| 364 | 364 | $rows = DB::query( |
| 365 | 365 | 'SELECT id |
| 366 | - FROM ' . prefixTable('items') . ' |
|
| 366 | + FROM ' . prefixTable('items').' |
|
| 367 | 367 | ORDER BY id ASC' |
| 368 | 368 | ); |
| 369 | 369 | foreach ($rows as $item) { |
| 370 | 370 | DB::query( |
| 371 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s', |
|
| 371 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s', |
|
| 372 | 372 | $item['id'], |
| 373 | 373 | 'at_creation' |
| 374 | 374 | ); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | if ($counter === 0) { |
| 377 | 377 | //Create new at_creation entry |
| 378 | 378 | $rowTmp = DB::queryFirstRow( |
| 379 | - 'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC', |
|
| 379 | + 'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC', |
|
| 380 | 380 | $item['id'] |
| 381 | 381 | ); |
| 382 | 382 | DB::insert( |
@@ -406,8 +406,8 @@ discard block |
||
| 406 | 406 | echo prepareExchangedData( |
| 407 | 407 | array( |
| 408 | 408 | 'error' => false, |
| 409 | - 'message' => $lang->get('last_execution') . ' ' . |
|
| 410 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 409 | + 'message' => $lang->get('last_execution').' '. |
|
| 410 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 411 | 411 | '<i class="fas fa-check text-success ml-2"></i>', |
| 412 | 412 | ), |
| 413 | 413 | 'encode' |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | break; |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 446 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 447 | 447 | updateCacheTable('reload', NULL); |
| 448 | 448 | |
| 449 | 449 | // Log |
@@ -459,8 +459,8 @@ discard block |
||
| 459 | 459 | echo prepareExchangedData( |
| 460 | 460 | [ |
| 461 | 461 | 'error' => false, |
| 462 | - 'message' => $lang->get('last_execution') . ' ' . |
|
| 463 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 462 | + 'message' => $lang->get('last_execution').' '. |
|
| 463 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 464 | 464 | '<i class="fas fa-check text-success mr-2"></i>', |
| 465 | 465 | ], |
| 466 | 466 | 'encode' |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE)); |
| 503 | 503 | |
| 504 | 504 | // generate new saltkey |
| 505 | - $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time(); |
|
| 505 | + $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time(); |
|
| 506 | 506 | copy( |
| 507 | 507 | SECUREPATH.'/'.SECUREFILE, |
| 508 | 508 | $old_sk_filename |
@@ -531,13 +531,13 @@ discard block |
||
| 531 | 531 | logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-login')); |
| 532 | 532 | |
| 533 | 533 | // get number of items to change |
| 534 | - DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0); |
|
| 534 | + DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0); |
|
| 535 | 535 | $nb_of_items = DB::count(); |
| 536 | 536 | |
| 537 | 537 | // create backup table |
| 538 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 538 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 539 | 539 | DB::query( |
| 540 | - 'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` ( |
|
| 540 | + 'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` ( |
|
| 541 | 541 | `id` int(12) NOT null AUTO_INCREMENT, |
| 542 | 542 | `current_table` varchar(100) NOT NULL, |
| 543 | 543 | `current_field` varchar(500) NOT NULL, |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | ); |
| 566 | 566 | |
| 567 | 567 | // delete previous backup files |
| 568 | - $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names |
|
| 568 | + $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names |
|
| 569 | 569 | foreach ($files as $file) { // iterate files |
| 570 | 570 | if (is_file($file)) { |
| 571 | 571 | $file_parts = pathinfo($file); |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | echo prepareExchangedData( |
| 653 | 653 | array( |
| 654 | 654 | 'error' => true, |
| 655 | - 'message' => 'Input `' . $objects[0] . '` is not allowed', |
|
| 655 | + 'message' => 'Input `'.$objects[0].'` is not allowed', |
|
| 656 | 656 | 'nbOfItems' => '', |
| 657 | 657 | 'nextAction' => '', |
| 658 | 658 | ), |
@@ -665,9 +665,9 @@ discard block |
||
| 665 | 665 | //change all encrypted data in Items (passwords) |
| 666 | 666 | $rows = DB::query( |
| 667 | 667 | 'SELECT id, pw, pw_iv |
| 668 | - FROM ' . prefixTable('items') . ' |
|
| 668 | + FROM ' . prefixTable('items').' |
|
| 669 | 669 | WHERE perso = %s |
| 670 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 670 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 671 | 671 | '0' |
| 672 | 672 | ); |
| 673 | 673 | foreach ($rows as $record) { |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | 'current_field' => 'pw', |
| 680 | 680 | 'value_id' => $record['id'], |
| 681 | 681 | 'value' => $record['pw'], |
| 682 | - 'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';", |
|
| 682 | + 'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';", |
|
| 683 | 683 | 'value2' => 'none', |
| 684 | 684 | 'result' => 'none', |
| 685 | 685 | ) |
@@ -728,9 +728,9 @@ discard block |
||
| 728 | 728 | //change all encrypted data in Logs (passwords) |
| 729 | 729 | $rows = DB::query( |
| 730 | 730 | 'SELECT raison, increment_id |
| 731 | - FROM ' . prefixTable('log_items') . " |
|
| 731 | + FROM ' . prefixTable('log_items')." |
|
| 732 | 732 | WHERE action = %s AND raison LIKE 'at_pw :%' |
| 733 | - LIMIT " . $post_start . ', ' . $post_length, |
|
| 733 | + LIMIT " . $post_start.', '.$post_length, |
|
| 734 | 734 | 'at_modification' |
| 735 | 735 | ); |
| 736 | 736 | foreach ($rows as $record) { |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | 'current_field' => 'raison', |
| 743 | 743 | 'value_id' => $record['increment_id'], |
| 744 | 744 | 'value' => $record['raison'], |
| 745 | - 'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';", |
|
| 745 | + 'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';", |
|
| 746 | 746 | 'value2' => 'none', |
| 747 | 747 | 'result' => 'none', |
| 748 | 748 | ) |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | DB::update( |
| 771 | 771 | prefixTable('log_items'), |
| 772 | 772 | array( |
| 773 | - 'raison' => 'at_pw :' . $encrypt['string'], |
|
| 773 | + 'raison' => 'at_pw :'.$encrypt['string'], |
|
| 774 | 774 | 'encryption_type' => 'defuse', |
| 775 | 775 | ), |
| 776 | 776 | 'increment_id = %i', |
@@ -795,8 +795,8 @@ discard block |
||
| 795 | 795 | //change all encrypted data in CATEGORIES (passwords) |
| 796 | 796 | $rows = DB::query( |
| 797 | 797 | 'SELECT id, data |
| 798 | - FROM ' . prefixTable('categories_items') . ' |
|
| 799 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 798 | + FROM ' . prefixTable('categories_items').' |
|
| 799 | + LIMIT ' . $post_start.', '.$post_length |
|
| 800 | 800 | ); |
| 801 | 801 | foreach ($rows as $record) { |
| 802 | 802 | // backup data |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | 'current_field' => 'data', |
| 808 | 808 | 'value_id' => $record['id'], |
| 809 | 809 | 'value' => $record['data'], |
| 810 | - 'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';", |
|
| 810 | + 'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';", |
|
| 811 | 811 | 'value2' => 'none', |
| 812 | 812 | 'result' => 'none', |
| 813 | 813 | ) |
@@ -855,9 +855,9 @@ discard block |
||
| 855 | 855 | // Change all encrypted data in FILES (passwords) |
| 856 | 856 | $rows = DB::query( |
| 857 | 857 | 'SELECT id, file, status |
| 858 | - FROM ' . prefixTable('files') . " |
|
| 858 | + FROM ' . prefixTable('files')." |
|
| 859 | 859 | WHERE status = 'encrypted' |
| 860 | - LIMIT " . $post_start . ', ' . $post_length |
|
| 860 | + LIMIT " . $post_start.', '.$post_length |
|
| 861 | 861 | ); |
| 862 | 862 | foreach ($rows as $record) { |
| 863 | 863 | // backup data |
@@ -875,20 +875,20 @@ discard block |
||
| 875 | 875 | ); |
| 876 | 876 | $newID = DB::insertId(); |
| 877 | 877 | |
| 878 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
| 878 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
| 879 | 879 | // make a copy of file |
| 880 | 880 | if (!copy( |
| 881 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 882 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy' |
|
| 881 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 882 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy' |
|
| 883 | 883 | )) { |
| 884 | 884 | $error = 'Copy not possible'; |
| 885 | 885 | exit; |
| 886 | 886 | } else { |
| 887 | 887 | // prepare a bck of file (that will not be deleted) |
| 888 | - $backup_filename = $record['file'] . '.bck-change-sk.' . time(); |
|
| 888 | + $backup_filename = $record['file'].'.bck-change-sk.'.time(); |
|
| 889 | 889 | copy( |
| 890 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 891 | - $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename |
|
| 890 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 891 | + $SETTINGS['path_to_upload_folder'].'/'.$backup_filename |
|
| 892 | 892 | ); |
| 893 | 893 | } |
| 894 | 894 | |
@@ -896,22 +896,22 @@ discard block |
||
| 896 | 896 | // STEP1 - Do decryption |
| 897 | 897 | prepareFileWithDefuse( |
| 898 | 898 | 'decrypt', |
| 899 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'], |
|
| 900 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted' |
|
| 899 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'], |
|
| 900 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted' |
|
| 901 | 901 | ); |
| 902 | 902 | |
| 903 | 903 | // Do cleanup of files |
| 904 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']); |
|
| 904 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']); |
|
| 905 | 905 | |
| 906 | 906 | // STEP2 - Do encryption |
| 907 | 907 | prepareFileWithDefuse( |
| 908 | 908 | 'encryp', |
| 909 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted', |
|
| 910 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] |
|
| 909 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted', |
|
| 910 | + $SETTINGS['path_to_upload_folder'].'/'.$record['file'] |
|
| 911 | 911 | ); |
| 912 | 912 | |
| 913 | 913 | // Do cleanup of files |
| 914 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted'); |
|
| 914 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted'); |
|
| 915 | 915 | |
| 916 | 916 | // Update backup table |
| 917 | 917 | DB::update( |
@@ -937,13 +937,13 @@ discard block |
||
| 937 | 937 | // do some things for new object |
| 938 | 938 | if (isset($objects[0])) { |
| 939 | 939 | if ($objects[0] === 'logs') { |
| 940 | - DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 940 | + DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 941 | 941 | } elseif ($objects[0] === 'files') { |
| 942 | - DB::query('SELECT id FROM ' . prefixTable('files')); |
|
| 942 | + DB::query('SELECT id FROM '.prefixTable('files')); |
|
| 943 | 943 | } elseif ($objects[0] === 'categories') { |
| 944 | - DB::query('SELECT id FROM ' . prefixTable('categories_items')); |
|
| 944 | + DB::query('SELECT id FROM '.prefixTable('categories_items')); |
|
| 945 | 945 | } elseif ($objects[0] === 'custfields') { |
| 946 | - DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 946 | + DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification'); |
|
| 947 | 947 | } |
| 948 | 948 | $nb_of_items = DB::count(); |
| 949 | 949 | } else { |
@@ -1063,12 +1063,12 @@ discard block |
||
| 1063 | 1063 | ); |
| 1064 | 1064 | } elseif ($record['current_table'] === 'files') { |
| 1065 | 1065 | // restore backup file |
| 1066 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) { |
|
| 1067 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']); |
|
| 1068 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
| 1066 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) { |
|
| 1067 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']); |
|
| 1068 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
| 1069 | 1069 | rename( |
| 1070 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'], |
|
| 1071 | - $SETTINGS['path_to_upload_folder'] . '/' . $record['value'] |
|
| 1070 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value2'], |
|
| 1071 | + $SETTINGS['path_to_upload_folder'].'/'.$record['value'] |
|
| 1072 | 1072 | ); |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | } |
| 1088 | 1088 | |
| 1089 | 1089 | // drop table |
| 1090 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 1090 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 1091 | 1091 | |
| 1092 | 1092 | // Send back |
| 1093 | 1093 | echo prepareExchangedData( |
@@ -1130,17 +1130,17 @@ discard block |
||
| 1130 | 1130 | // delete files |
| 1131 | 1131 | $rows = DB::query( |
| 1132 | 1132 | 'SELECT value, value2 |
| 1133 | - FROM ' . prefixTable('sk_reencrypt_backup') . " |
|
| 1133 | + FROM ' . prefixTable('sk_reencrypt_backup')." |
|
| 1134 | 1134 | WHERE current_table = 'files'" |
| 1135 | 1135 | ); |
| 1136 | 1136 | foreach ($rows as $record) { |
| 1137 | - if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) { |
|
| 1138 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']); |
|
| 1137 | + if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) { |
|
| 1138 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']); |
|
| 1139 | 1139 | } |
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | 1142 | // drop table |
| 1143 | - DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup')); |
|
| 1143 | + DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup')); |
|
| 1144 | 1144 | |
| 1145 | 1145 | echo '[{"status":"done"}]'; |
| 1146 | 1146 | break; |
@@ -1171,7 +1171,7 @@ discard block |
||
| 1171 | 1171 | 'encode' |
| 1172 | 1172 | ); |
| 1173 | 1173 | } else { |
| 1174 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1174 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1175 | 1175 | |
| 1176 | 1176 | //send email |
| 1177 | 1177 | $emailSettings = new EmailSettings($SETTINGS); |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | break; |
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1212 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1213 | 1213 | $emailSettings = new EmailSettings($SETTINGS); |
| 1214 | 1214 | $emailService = new EmailService(); |
| 1215 | 1215 | |
| 1216 | 1216 | $rows = DB::query( |
| 1217 | 1217 | 'SELECT * |
| 1218 | - FROM ' . prefixTable('emails') . ' |
|
| 1218 | + FROM ' . prefixTable('emails').' |
|
| 1219 | 1219 | WHERE status = %s OR status = %s', |
| 1220 | 1220 | 'not_sent', |
| 1221 | 1221 | '' |
@@ -1301,13 +1301,13 @@ discard block |
||
| 1301 | 1301 | break; |
| 1302 | 1302 | } |
| 1303 | 1303 | |
| 1304 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1304 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1305 | 1305 | |
| 1306 | 1306 | // Instatiate email settings and service |
| 1307 | 1307 | $emailSettings = new EmailSettings($SETTINGS); |
| 1308 | 1308 | $emailService = new EmailService(); |
| 1309 | 1309 | |
| 1310 | - $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
| 1310 | + $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', ''); |
|
| 1311 | 1311 | foreach ($rows as $record) { |
| 1312 | 1312 | //send email |
| 1313 | 1313 | $email = $emailService->sendMail( |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | break; |
| 1377 | 1377 | } |
| 1378 | 1378 | |
| 1379 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1379 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1380 | 1380 | |
| 1381 | 1381 | // init |
| 1382 | 1382 | $filesList = array(); |
@@ -1389,7 +1389,7 @@ discard block |
||
| 1389 | 1389 | FROM ' . prefixTable('files') |
| 1390 | 1390 | ); |
| 1391 | 1391 | foreach ($rows as $record) { |
| 1392 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) { |
|
| 1392 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) { |
|
| 1393 | 1393 | $addFile = false; |
| 1394 | 1394 | if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted') |
| 1395 | 1395 | || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear') |
@@ -1454,8 +1454,8 @@ discard block |
||
| 1454 | 1454 | $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 1455 | 1455 | $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT); |
| 1456 | 1456 | |
| 1457 | - include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 1458 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1457 | + include $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 1458 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1459 | 1459 | |
| 1460 | 1460 | $cpt = 0; |
| 1461 | 1461 | $continu = true; |
@@ -1468,33 +1468,33 @@ discard block |
||
| 1468 | 1468 | // Get file name |
| 1469 | 1469 | $file_info = DB::queryFirstRow( |
| 1470 | 1470 | 'SELECT file |
| 1471 | - FROM ' . prefixTable('files') . ' |
|
| 1471 | + FROM ' . prefixTable('files').' |
|
| 1472 | 1472 | WHERE id = %i', |
| 1473 | 1473 | $file |
| 1474 | 1474 | ); |
| 1475 | 1475 | |
| 1476 | 1476 | // skip file is Coherancey not respected |
| 1477 | - if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) { |
|
| 1477 | + if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) { |
|
| 1478 | 1478 | // Case where we want to decrypt |
| 1479 | 1479 | if ($post_option === 'decrypt') { |
| 1480 | 1480 | prepareFileWithDefuse( |
| 1481 | 1481 | 'decrypt', |
| 1482 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
| 1483 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1482 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
| 1483 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1484 | 1484 | ); |
| 1485 | 1485 | // Case where we want to encrypt |
| 1486 | 1486 | } elseif ($post_option === 'encrypt') { |
| 1487 | 1487 | prepareFileWithDefuse( |
| 1488 | 1488 | 'encrypt', |
| 1489 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], |
|
| 1490 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1489 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], |
|
| 1490 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1491 | 1491 | ); |
| 1492 | 1492 | } |
| 1493 | 1493 | // Do file cleanup |
| 1494 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS); |
|
| 1494 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS); |
|
| 1495 | 1495 | rename( |
| 1496 | - $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'], |
|
| 1497 | - $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'] |
|
| 1496 | + $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'], |
|
| 1497 | + $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'] |
|
| 1498 | 1498 | ); |
| 1499 | 1499 | |
| 1500 | 1500 | // store in DB |
@@ -1529,8 +1529,8 @@ discard block |
||
| 1529 | 1529 | $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted' |
| 1530 | 1530 | ); |
| 1531 | 1531 | |
| 1532 | - $message = $lang->get('last_execution') . ' ' . |
|
| 1533 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) . |
|
| 1532 | + $message = $lang->get('last_execution').' '. |
|
| 1533 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()). |
|
| 1534 | 1534 | '<i class="fas fa-check text-success ml-2 mr-3"></i>'; |
| 1535 | 1535 | } |
| 1536 | 1536 | |
@@ -1620,7 +1620,7 @@ discard block |
||
| 1620 | 1620 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT); |
| 1621 | 1621 | |
| 1622 | 1622 | DB::query( |
| 1623 | - 'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i', |
|
| 1623 | + 'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i', |
|
| 1624 | 1624 | $post_id |
| 1625 | 1625 | ); |
| 1626 | 1626 | } |
@@ -1715,7 +1715,7 @@ discard block |
||
| 1715 | 1715 | // Delete existing key |
| 1716 | 1716 | } elseif (null !== $post_action && $post_action === 'delete') { |
| 1717 | 1717 | $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 1718 | - DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id); |
|
| 1718 | + DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id); |
|
| 1719 | 1719 | } |
| 1720 | 1720 | |
| 1721 | 1721 | echo prepareExchangedData( |
@@ -1730,7 +1730,7 @@ discard block |
||
| 1730 | 1730 | |
| 1731 | 1731 | case 'save_api_status': |
| 1732 | 1732 | // Do query |
| 1733 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
| 1733 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api'); |
|
| 1734 | 1734 | $counter = DB::count(); |
| 1735 | 1735 | if ($counter === 0) { |
| 1736 | 1736 | DB::insert( |
@@ -1759,7 +1759,7 @@ discard block |
||
| 1759 | 1759 | |
| 1760 | 1760 | case 'run_duo_config_check': |
| 1761 | 1761 | //Libraries call |
| 1762 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 1762 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 1763 | 1763 | // Check KEY |
| 1764 | 1764 | if ($post_key !== $session->get('key')) { |
| 1765 | 1765 | echo prepareExchangedData( |
@@ -1865,7 +1865,7 @@ discard block |
||
| 1865 | 1865 | } else { |
| 1866 | 1866 | $tmp = 1; |
| 1867 | 1867 | } |
| 1868 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
| 1868 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication'); |
|
| 1869 | 1869 | $counter = DB::count(); |
| 1870 | 1870 | if ($counter === 0) { |
| 1871 | 1871 | DB::insert( |
@@ -1893,7 +1893,7 @@ discard block |
||
| 1893 | 1893 | |
| 1894 | 1894 | // ga_website_name |
| 1895 | 1895 | if (is_null($dataReceived['ga_website_name']) === false) { |
| 1896 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
| 1896 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name'); |
|
| 1897 | 1897 | $counter = DB::count(); |
| 1898 | 1898 | if ($counter === 0) { |
| 1899 | 1899 | DB::insert( |
@@ -1923,7 +1923,7 @@ discard block |
||
| 1923 | 1923 | } |
| 1924 | 1924 | |
| 1925 | 1925 | // send data |
| 1926 | - echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]'; |
|
| 1926 | + echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]'; |
|
| 1927 | 1927 | break; |
| 1928 | 1928 | |
| 1929 | 1929 | case 'save_agses_options': |
@@ -1946,7 +1946,7 @@ discard block |
||
| 1946 | 1946 | |
| 1947 | 1947 | // agses_hosted_url |
| 1948 | 1948 | if (!is_null($dataReceived['agses_hosted_url'])) { |
| 1949 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
| 1949 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url'); |
|
| 1950 | 1950 | $counter = DB::count(); |
| 1951 | 1951 | if ($counter === 0) { |
| 1952 | 1952 | DB::insert( |
@@ -1977,7 +1977,7 @@ discard block |
||
| 1977 | 1977 | |
| 1978 | 1978 | // agses_hosted_id |
| 1979 | 1979 | if (!is_null($dataReceived['agses_hosted_id'])) { |
| 1980 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
| 1980 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id'); |
|
| 1981 | 1981 | $counter = DB::count(); |
| 1982 | 1982 | if ($counter === 0) { |
| 1983 | 1983 | DB::insert( |
@@ -2008,7 +2008,7 @@ discard block |
||
| 2008 | 2008 | |
| 2009 | 2009 | // agses_hosted_apikey |
| 2010 | 2010 | if (!is_null($dataReceived['agses_hosted_apikey'])) { |
| 2011 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
| 2011 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey'); |
|
| 2012 | 2012 | $counter = DB::count(); |
| 2013 | 2013 | if ($counter === 0) { |
| 2014 | 2014 | DB::insert( |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | } |
| 2039 | 2039 | |
| 2040 | 2040 | // send data |
| 2041 | - echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]'; |
|
| 2041 | + echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]'; |
|
| 2042 | 2042 | break; |
| 2043 | 2043 | |
| 2044 | 2044 | case 'save_option_change': |
@@ -2079,7 +2079,7 @@ discard block |
||
| 2079 | 2079 | |
| 2080 | 2080 | // Check if setting is already in DB. If NO then insert, if YES then update. |
| 2081 | 2081 | $data = DB::query( |
| 2082 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 2082 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 2083 | 2083 | WHERE type = %s AND intitule = %s', |
| 2084 | 2084 | 'admin', |
| 2085 | 2085 | $post_field |
@@ -2102,7 +2102,7 @@ discard block |
||
| 2102 | 2102 | array( |
| 2103 | 2103 | 'valeur' => time(), |
| 2104 | 2104 | 'type' => 'admin', |
| 2105 | - 'intitule' => $post_field . '_time', |
|
| 2105 | + 'intitule' => $post_field.'_time', |
|
| 2106 | 2106 | 'updated_at' => time(), |
| 2107 | 2107 | ) |
| 2108 | 2108 | ); |
@@ -2124,10 +2124,10 @@ discard block |
||
| 2124 | 2124 | if ($post_field === 'send_stats') { |
| 2125 | 2125 | // Check if previous time exists, if not them insert this value in DB |
| 2126 | 2126 | DB::query( |
| 2127 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 2127 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 2128 | 2128 | WHERE type = %s AND intitule = %s', |
| 2129 | 2129 | 'admin', |
| 2130 | - $post_field . '_time' |
|
| 2130 | + $post_field.'_time' |
|
| 2131 | 2131 | ); |
| 2132 | 2132 | $counter = DB::count(); |
| 2133 | 2133 | if ($counter === 0) { |
@@ -2136,7 +2136,7 @@ discard block |
||
| 2136 | 2136 | array( |
| 2137 | 2137 | 'valeur' => 0, |
| 2138 | 2138 | 'type' => 'admin', |
| 2139 | - 'intitule' => $post_field . '_time', |
|
| 2139 | + 'intitule' => $post_field.'_time', |
|
| 2140 | 2140 | 'created_at' => time(), |
| 2141 | 2141 | ) |
| 2142 | 2142 | ); |
@@ -2158,13 +2158,13 @@ discard block |
||
| 2158 | 2158 | // special Cases |
| 2159 | 2159 | if ($post_field === 'cpassman_url') { |
| 2160 | 2160 | // update also jsUrl for CSFP protection |
| 2161 | - $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js'; |
|
| 2161 | + $jsUrl = $post_value.'/includes/libraries/csrfp/js/csrfprotector.js'; |
|
| 2162 | 2162 | $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php'; |
| 2163 | 2163 | $data = file_get_contents($csrfp_file); |
| 2164 | 2164 | $posJsUrl = strpos($data, '"jsUrl" => "'); |
| 2165 | 2165 | $posEndLine = strpos($data, '",', $posJsUrl); |
| 2166 | 2166 | $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2)); |
| 2167 | - $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '",', $data); |
|
| 2167 | + $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data); |
|
| 2168 | 2168 | file_put_contents($csrfp_file, $newdata); |
| 2169 | 2169 | } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) { |
| 2170 | 2170 | DB::update( |
@@ -2183,7 +2183,7 @@ discard block |
||
| 2183 | 2183 | echo prepareExchangedData( |
| 2184 | 2184 | array( |
| 2185 | 2185 | 'error' => false, |
| 2186 | - 'misc' => $counter . ' ; ' . $SETTINGS[$post_field], |
|
| 2186 | + 'misc' => $counter.' ; '.$SETTINGS[$post_field], |
|
| 2187 | 2187 | 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '', |
| 2188 | 2188 | ), |
| 2189 | 2189 | 'encode' |
@@ -2226,7 +2226,7 @@ discard block |
||
| 2226 | 2226 | |
| 2227 | 2227 | // send statistics |
| 2228 | 2228 | if (null !== $post_status) { |
| 2229 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
| 2229 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats'); |
|
| 2230 | 2230 | $counter = DB::count(); |
| 2231 | 2231 | if ($counter === 0) { |
| 2232 | 2232 | DB::insert( |
@@ -2257,7 +2257,7 @@ discard block |
||
| 2257 | 2257 | |
| 2258 | 2258 | // send statistics items |
| 2259 | 2259 | if (null !== $post_list) { |
| 2260 | - DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
| 2260 | + DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items'); |
|
| 2261 | 2261 | $counter = DB::count(); |
| 2262 | 2262 | if ($counter === 0) { |
| 2263 | 2263 | DB::insert( |
@@ -2303,7 +2303,7 @@ discard block |
||
| 2303 | 2303 | break; |
| 2304 | 2304 | } |
| 2305 | 2305 | |
| 2306 | - if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) { |
|
| 2306 | + if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) { |
|
| 2307 | 2307 | if (DB::count() === 1) { |
| 2308 | 2308 | echo 1; |
| 2309 | 2309 | } else { |
@@ -2364,7 +2364,7 @@ discard block |
||
| 2364 | 2364 | |
| 2365 | 2365 | $rows = DB::query( |
| 2366 | 2366 | 'SELECT id, title |
| 2367 | - FROM ' . prefixTable('roles_title') . ' |
|
| 2367 | + FROM ' . prefixTable('roles_title').' |
|
| 2368 | 2368 | ORDER BY title ASC' |
| 2369 | 2369 | ); |
| 2370 | 2370 | foreach ($rows as $record) { |
@@ -2496,7 +2496,7 @@ discard block |
||
| 2496 | 2496 | |
| 2497 | 2497 | $ignoredFiles = DB::queryFirstField( |
| 2498 | 2498 | 'SELECT valeur |
| 2499 | - FROM ' . prefixTable('misc') . ' |
|
| 2499 | + FROM ' . prefixTable('misc').' |
|
| 2500 | 2500 | WHERE type = %s AND intitule = %s', |
| 2501 | 2501 | 'admin', |
| 2502 | 2502 | 'ignored_unknown_files' |
@@ -2539,7 +2539,7 @@ discard block |
||
| 2539 | 2539 | // Get ignored unknown files |
| 2540 | 2540 | $existingData = DB::queryFirstRow( |
| 2541 | 2541 | 'SELECT valeur |
| 2542 | - FROM ' . prefixTable('misc') . ' |
|
| 2542 | + FROM ' . prefixTable('misc').' |
|
| 2543 | 2543 | WHERE type = %s AND intitule = %s', |
| 2544 | 2544 | 'admin', |
| 2545 | 2545 | 'ignored_unknown_files' |
@@ -2596,7 +2596,7 @@ discard block |
||
| 2596 | 2596 | // Get the list of files to delete |
| 2597 | 2597 | $filesToDelete = DB::queryFirstField( |
| 2598 | 2598 | 'SELECT valeur |
| 2599 | - FROM ' . prefixTable('misc') . ' |
|
| 2599 | + FROM ' . prefixTable('misc').' |
|
| 2600 | 2600 | WHERE type = %s AND intitule = %s', |
| 2601 | 2601 | 'admin', |
| 2602 | 2602 | 'unknown_files' |
@@ -2642,7 +2642,7 @@ discard block |
||
| 2642 | 2642 | // Get some TP USER info |
| 2643 | 2643 | $userInfo = DB::queryFirstRow( |
| 2644 | 2644 | 'SELECT id, public_key, private_key, pw |
| 2645 | - FROM ' . prefixTable('users') . ' |
|
| 2645 | + FROM ' . prefixTable('users').' |
|
| 2646 | 2646 | WHERE id = %i', |
| 2647 | 2647 | TP_USER_ID, |
| 2648 | 2648 | ); |
@@ -2688,8 +2688,8 @@ discard block |
||
| 2688 | 2688 | |
| 2689 | 2689 | $users = DB::query( |
| 2690 | 2690 | 'SELECT u.id, u.public_key, a.increment_id |
| 2691 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2692 | - LEFT JOIN ' . prefixTable('api') . ' AS a |
|
| 2691 | + FROM ' . prefixTable('users').' AS u |
|
| 2692 | + LEFT JOIN ' . prefixTable('api').' AS a |
|
| 2693 | 2693 | ON a.user_id = u.id AND a.type = %s |
| 2694 | 2694 | WHERE u.disabled = %i AND u.deleted_at IS NULL AND u.public_key IS NOT NULL AND u.admin = %i |
| 2695 | 2695 | ORDER BY u.login ASC', |
@@ -2793,40 +2793,40 @@ discard block |
||
| 2793 | 2793 | |
| 2794 | 2794 | // Users statistics |
| 2795 | 2795 | $usersActive = DB::queryFirstField( |
| 2796 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 2796 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 2797 | 2797 | WHERE disabled = %i AND deleted_at IS NULL', |
| 2798 | 2798 | 0 |
| 2799 | 2799 | ); |
| 2800 | 2800 | |
| 2801 | 2801 | $usersOnline = DB::queryFirstField( |
| 2802 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 2802 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 2803 | 2803 | WHERE session_end > %i AND disabled = %i', |
| 2804 | 2804 | time(), |
| 2805 | 2805 | 0 |
| 2806 | 2806 | ); |
| 2807 | 2807 | |
| 2808 | 2808 | $usersBlocked = DB::queryFirstField( |
| 2809 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 2809 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 2810 | 2810 | WHERE disabled = %i AND deleted_at IS NULL', |
| 2811 | 2811 | 1 |
| 2812 | 2812 | ); |
| 2813 | 2813 | |
| 2814 | 2814 | // Items statistics |
| 2815 | 2815 | $itemsTotal = DB::queryFirstField( |
| 2816 | - 'SELECT COUNT(*) FROM ' . prefixTable('items') . ' |
|
| 2816 | + 'SELECT COUNT(*) FROM '.prefixTable('items').' |
|
| 2817 | 2817 | WHERE inactif = %i AND deleted_at IS NULL', |
| 2818 | 2818 | 0 |
| 2819 | 2819 | ); |
| 2820 | 2820 | |
| 2821 | 2821 | $itemsShared = DB::queryFirstField( |
| 2822 | - 'SELECT COUNT(*) FROM ' . prefixTable('items') . ' |
|
| 2822 | + 'SELECT COUNT(*) FROM '.prefixTable('items').' |
|
| 2823 | 2823 | WHERE inactif = %i AND perso = %i AND deleted_at IS NULL', |
| 2824 | 2824 | 0, |
| 2825 | 2825 | 0 |
| 2826 | 2826 | ); |
| 2827 | 2827 | |
| 2828 | 2828 | $itemsPersonal = DB::queryFirstField( |
| 2829 | - 'SELECT COUNT(*) FROM ' . prefixTable('items') . ' |
|
| 2829 | + 'SELECT COUNT(*) FROM '.prefixTable('items').' |
|
| 2830 | 2830 | WHERE inactif = %i AND perso = %i AND deleted_at IS NULL', |
| 2831 | 2831 | 0, |
| 2832 | 2832 | 1 |
@@ -2834,17 +2834,17 @@ discard block |
||
| 2834 | 2834 | |
| 2835 | 2835 | // Folders statistics |
| 2836 | 2836 | $foldersTotal = DB::queryFirstField( |
| 2837 | - 'SELECT COUNT(*) FROM ' . prefixTable('nested_tree') |
|
| 2837 | + 'SELECT COUNT(*) FROM '.prefixTable('nested_tree') |
|
| 2838 | 2838 | ); |
| 2839 | 2839 | |
| 2840 | 2840 | $foldersPublic = DB::queryFirstField( |
| 2841 | - 'SELECT COUNT(*) FROM ' . prefixTable('nested_tree') . ' |
|
| 2841 | + 'SELECT COUNT(*) FROM '.prefixTable('nested_tree').' |
|
| 2842 | 2842 | WHERE personal_folder = %i', |
| 2843 | 2843 | 0 |
| 2844 | 2844 | ); |
| 2845 | 2845 | |
| 2846 | 2846 | $foldersPersonal = DB::queryFirstField( |
| 2847 | - 'SELECT COUNT(*) FROM ' . prefixTable('nested_tree') . ' |
|
| 2847 | + 'SELECT COUNT(*) FROM '.prefixTable('nested_tree').' |
|
| 2848 | 2848 | WHERE personal_folder = %i', |
| 2849 | 2849 | 1 |
| 2850 | 2850 | ); |
@@ -2853,20 +2853,20 @@ discard block |
||
| 2853 | 2853 | $timestamp24h = time() - 86400; |
| 2854 | 2854 | |
| 2855 | 2855 | $logsActions = DB::queryFirstField( |
| 2856 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' |
|
| 2856 | + 'SELECT COUNT(*) FROM '.prefixTable('log_items').' |
|
| 2857 | 2857 | WHERE date > %i', |
| 2858 | 2858 | $timestamp24h |
| 2859 | 2859 | ); |
| 2860 | 2860 | |
| 2861 | 2861 | $logsAccesses = DB::queryFirstField( |
| 2862 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' |
|
| 2862 | + 'SELECT COUNT(*) FROM '.prefixTable('log_items').' |
|
| 2863 | 2863 | WHERE date > %i AND action = %s', |
| 2864 | 2864 | $timestamp24h, |
| 2865 | 2865 | 'at_shown' |
| 2866 | 2866 | ); |
| 2867 | 2867 | |
| 2868 | 2868 | $logsErrors = DB::queryFirstField( |
| 2869 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 2869 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 2870 | 2870 | WHERE date > %i AND type = %s', |
| 2871 | 2871 | $timestamp24h, |
| 2872 | 2872 | 'error' |
@@ -2923,9 +2923,9 @@ discard block |
||
| 2923 | 2923 | |
| 2924 | 2924 | $activities = DB::query( |
| 2925 | 2925 | 'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label |
| 2926 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 2927 | - LEFT JOIN ' . prefixTable('users') . ' AS u ON l.id_user = u.id |
|
| 2928 | - LEFT JOIN ' . prefixTable('items') . ' AS i ON l.id_item = i.id |
|
| 2926 | + FROM ' . prefixTable('log_items').' AS l |
|
| 2927 | + LEFT JOIN ' . prefixTable('users').' AS u ON l.id_user = u.id |
|
| 2928 | + LEFT JOIN ' . prefixTable('items').' AS i ON l.id_item = i.id |
|
| 2929 | 2929 | WHERE l.date > %i |
| 2930 | 2930 | ORDER BY l.date DESC |
| 2931 | 2931 | LIMIT 10', |
@@ -2999,13 +2999,13 @@ discard block |
||
| 2999 | 2999 | |
| 3000 | 3000 | // Tasks queue count |
| 3001 | 3001 | $tasksQueue = DB::queryFirstField( |
| 3002 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' |
|
| 3002 | + 'SELECT COUNT(*) FROM '.prefixTable('background_tasks').' |
|
| 3003 | 3003 | WHERE finished_at IS NULL OR finished_at = 0' |
| 3004 | 3004 | ); |
| 3005 | 3005 | |
| 3006 | 3006 | // Last cron execution |
| 3007 | 3007 | $lastCronLog = DB::queryFirstRow( |
| 3008 | - 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3008 | + 'SELECT created_at FROM '.prefixTable('background_tasks_logs').' |
|
| 3009 | 3009 | ORDER BY created_at DESC |
| 3010 | 3010 | LIMIT 1' |
| 3011 | 3011 | ); |
@@ -3014,13 +3014,13 @@ discard block |
||
| 3014 | 3014 | if ($lastCronLog && isset($lastCronLog['created_at'])) { |
| 3015 | 3015 | $timeDiff = time() - (int) $lastCronLog['created_at']; |
| 3016 | 3016 | if ($timeDiff < 60) { |
| 3017 | - $lastCronText = $timeDiff . 's ' . $lang->get('ago'); |
|
| 3017 | + $lastCronText = $timeDiff.'s '.$lang->get('ago'); |
|
| 3018 | 3018 | } elseif ($timeDiff < 3600) { |
| 3019 | - $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago'); |
|
| 3019 | + $lastCronText = floor($timeDiff / 60).'m '.$lang->get('ago'); |
|
| 3020 | 3020 | } elseif ($timeDiff < 86400) { |
| 3021 | - $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago'); |
|
| 3021 | + $lastCronText = floor($timeDiff / 3600).'h '.$lang->get('ago'); |
|
| 3022 | 3022 | } else { |
| 3023 | - $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago'); |
|
| 3023 | + $lastCronText = floor($timeDiff / 86400).'d '.$lang->get('ago'); |
|
| 3024 | 3024 | } |
| 3025 | 3025 | } |
| 3026 | 3026 | |
@@ -3056,14 +3056,14 @@ discard block |
||
| 3056 | 3056 | $encryptionText = $lang->get('health_status_ok'); |
| 3057 | 3057 | |
| 3058 | 3058 | // Check if secure file exists |
| 3059 | - if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) { |
|
| 3059 | + if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'].DIRECTORY_SEPARATOR.$SETTINGS['securefile'])) { |
|
| 3060 | 3060 | $encryptionStatus = 'danger'; |
| 3061 | 3061 | $encryptionText = $lang->get('health_secure_file_missing'); |
| 3062 | 3062 | } |
| 3063 | 3063 | |
| 3064 | 3064 | // Active sessions count |
| 3065 | 3065 | $sessionsCount = DB::queryFirstField( |
| 3066 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 3066 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 3067 | 3067 | WHERE session_end > %i', |
| 3068 | 3068 | time() |
| 3069 | 3069 | ); |
@@ -3071,7 +3071,7 @@ discard block |
||
| 3071 | 3071 | // Is cron installed |
| 3072 | 3072 | DB::query( |
| 3073 | 3073 | 'SELECT valeur |
| 3074 | - FROM ' . prefixTable('misc') . ' |
|
| 3074 | + FROM ' . prefixTable('misc').' |
|
| 3075 | 3075 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 3076 | 3076 | 'admin', |
| 3077 | 3077 | 'last_cron_exec', |
@@ -3084,7 +3084,7 @@ discard block |
||
| 3084 | 3084 | } else { |
| 3085 | 3085 | // Cron check (last execution should be < 2 minutes ago) |
| 3086 | 3086 | $lastCron = DB::queryFirstField( |
| 3087 | - 'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' |
|
| 3087 | + 'SELECT created_at FROM '.prefixTable('background_tasks_logs').' |
|
| 3088 | 3088 | ORDER BY created_at DESC |
| 3089 | 3089 | LIMIT 1' |
| 3090 | 3090 | ); |
@@ -3100,7 +3100,7 @@ discard block |
||
| 3100 | 3100 | |
| 3101 | 3101 | // Unknown files count |
| 3102 | 3102 | $unknownFilesData = DB::queryFirstField( |
| 3103 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3103 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3104 | 3104 | WHERE type = %s AND intitule = %s', |
| 3105 | 3105 | 'admin', |
| 3106 | 3106 | 'unknown_files' |
@@ -3180,7 +3180,7 @@ discard block |
||
| 3180 | 3180 | 'clean_old_logs', |
| 3181 | 3181 | (string) $session->get('user-id'), |
| 3182 | 3182 | $session->get('user-login'), |
| 3183 | - 'Cleaned ' . $totalDeleted . ' old log entries' |
|
| 3183 | + 'Cleaned '.$totalDeleted.' old log entries' |
|
| 3184 | 3184 | ); |
| 3185 | 3185 | |
| 3186 | 3186 | echo prepareExchangedData( |
@@ -3209,21 +3209,21 @@ discard block |
||
| 3209 | 3209 | |
| 3210 | 3210 | try { |
| 3211 | 3211 | // Test string |
| 3212 | - $testString = 'TeamPass Encryption Test ' . time(); |
|
| 3212 | + $testString = 'TeamPass Encryption Test '.time(); |
|
| 3213 | 3213 | |
| 3214 | 3214 | // Get encryption key |
| 3215 | - $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']); |
|
| 3215 | + $key = file_get_contents($SETTINGS['securepath'].DIRECTORY_SEPARATOR.$SETTINGS['securefile']); |
|
| 3216 | 3216 | |
| 3217 | 3217 | if ($key === false) { |
| 3218 | 3218 | throw new Exception($lang->get('admin_encryption_key_not_found')); |
| 3219 | 3219 | } |
| 3220 | 3220 | |
| 3221 | 3221 | // Use Defuse encryption (TeamPass's current encryption method) |
| 3222 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php'; |
|
| 3223 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php'; |
|
| 3224 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 3225 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php'; |
|
| 3226 | - require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php'; |
|
| 3222 | + require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php'; |
|
| 3223 | + require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/BadFormatException.php'; |
|
| 3224 | + require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php'; |
|
| 3225 | + require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Crypto.php'; |
|
| 3226 | + require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Key.php'; |
|
| 3227 | 3227 | |
| 3228 | 3228 | $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key); |
| 3229 | 3229 | |
@@ -3280,7 +3280,7 @@ discard block |
||
| 3280 | 3280 | |
| 3281 | 3281 | // Set headers for CSV download |
| 3282 | 3282 | header('Content-Type: text/csv; charset=utf-8'); |
| 3283 | - header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"'); |
|
| 3283 | + header('Content-Disposition: attachment; filename="teampass_statistics_'.date('Y-m-d_H-i-s').'.csv"'); |
|
| 3284 | 3284 | |
| 3285 | 3285 | // Create output stream |
| 3286 | 3286 | $output = fopen('php://output', 'w'); |
@@ -3293,10 +3293,10 @@ discard block |
||
| 3293 | 3293 | |
| 3294 | 3294 | // Gather statistics |
| 3295 | 3295 | $stats = array( |
| 3296 | - $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'), |
|
| 3297 | - $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'), |
|
| 3298 | - $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')), |
|
| 3299 | - $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)), |
|
| 3296 | + $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('users').' WHERE disabled = 0'), |
|
| 3297 | + $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('items').' WHERE inactif = 0'), |
|
| 3298 | + $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('nested_tree')), |
|
| 3299 | + $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('log_items').' WHERE date > '.(time() - 86400)), |
|
| 3300 | 3300 | ); |
| 3301 | 3301 | |
| 3302 | 3302 | // Write statistics |
@@ -3336,9 +3336,9 @@ discard block |
||
| 3336 | 3336 | COUNT(*) as total_users, |
| 3337 | 3337 | SUM(CASE WHEN personal_items_migrated = 1 THEN 1 ELSE 0 END) as migrated_users, |
| 3338 | 3338 | SUM(CASE WHEN personal_items_migrated = 0 THEN 1 ELSE 0 END) as pending_users |
| 3339 | - FROM " . prefixTable('users') . " |
|
| 3339 | + FROM " . prefixTable('users')." |
|
| 3340 | 3340 | WHERE disabled = 0 AND deleted_at IS NULL AND id NOT IN %li", |
| 3341 | - [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 3341 | + [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 3342 | 3342 | ); |
| 3343 | 3343 | |
| 3344 | 3344 | $progressPercent = ($stats[0]['migrated_users'] / $stats[0]['total_users']) * 100; |
@@ -3350,7 +3350,7 @@ discard block |
||
| 3350 | 3350 | WHERE personal_items_migrated = 0 |
| 3351 | 3351 | AND disabled = 0 AND deleted_at IS NULL AND id NOT IN %li |
| 3352 | 3352 | ORDER BY last_connexion DESC", |
| 3353 | - [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 3353 | + [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 3354 | 3354 | ); |
| 3355 | 3355 | |
| 3356 | 3356 | // Get users ready |
@@ -3360,7 +3360,7 @@ discard block |
||
| 3360 | 3360 | WHERE personal_items_migrated = 1 |
| 3361 | 3361 | AND disabled = 0 AND deleted_at IS NULL AND id NOT IN %li |
| 3362 | 3362 | ORDER BY last_connexion DESC", |
| 3363 | - [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 3363 | + [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 3364 | 3364 | ); |
| 3365 | 3365 | |
| 3366 | 3366 | return [ |
@@ -3384,7 +3384,7 @@ discard block |
||
| 3384 | 3384 | { |
| 3385 | 3385 | // Count auto-recoveries in last 24h |
| 3386 | 3386 | $autoRecoveriesLast24h = DB::queryFirstField( |
| 3387 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 3387 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 3388 | 3388 | WHERE label = %s |
| 3389 | 3389 | AND date > %i', |
| 3390 | 3390 | 'auto_reencryption_success', |
@@ -3393,21 +3393,21 @@ discard block |
||
| 3393 | 3393 | |
| 3394 | 3394 | // Count failed recoveries (all time) |
| 3395 | 3395 | $failedRecoveries = DB::queryFirstField( |
| 3396 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 3396 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 3397 | 3397 | WHERE label = %s', |
| 3398 | 3398 | 'auto_reencryption_failed' |
| 3399 | 3399 | ); |
| 3400 | 3400 | |
| 3401 | 3401 | // Count critical failures (all time) |
| 3402 | 3402 | $criticalFailures = DB::queryFirstField( |
| 3403 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 3403 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 3404 | 3404 | WHERE label = %s', |
| 3405 | 3405 | 'auto_reencryption_critical_failure' |
| 3406 | 3406 | ); |
| 3407 | 3407 | |
| 3408 | 3408 | // Count users with transparent recovery enabled (have seed and backup) |
| 3409 | 3409 | $usersMigrated = DB::queryFirstField( |
| 3410 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 3410 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 3411 | 3411 | WHERE user_derivation_seed IS NOT NULL |
| 3412 | 3412 | AND private_key_backup IS NOT NULL |
| 3413 | 3413 | AND disabled = 0' |
@@ -3415,7 +3415,7 @@ discard block |
||
| 3415 | 3415 | |
| 3416 | 3416 | // Count total active users |
| 3417 | 3417 | $totalUsers = DB::queryFirstField( |
| 3418 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 3418 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 3419 | 3419 | WHERE disabled = 0 |
| 3420 | 3420 | AND private_key IS NOT NULL |
| 3421 | 3421 | AND private_key != "none"' |
@@ -3424,8 +3424,8 @@ discard block |
||
| 3424 | 3424 | // Get recent recovery events (last 10) |
| 3425 | 3425 | $recentEvents = DB::query( |
| 3426 | 3426 | 'SELECT l.date, l.label, l.qui, u.login |
| 3427 | - FROM ' . prefixTable('log_system') . ' AS l |
|
| 3428 | - INNER JOIN ' . prefixTable('users') . ' AS u ON u.id = l.qui |
|
| 3427 | + FROM ' . prefixTable('log_system').' AS l |
|
| 3428 | + INNER JOIN ' . prefixTable('users').' AS u ON u.id = l.qui |
|
| 3429 | 3429 | WHERE l.label IN %ls |
| 3430 | 3430 | ORDER BY l.date DESC |
| 3431 | 3431 | LIMIT 10', |
@@ -3437,7 +3437,7 @@ discard block |
||
| 3437 | 3437 | |
| 3438 | 3438 | // Calculate failure rate (last 30 days) |
| 3439 | 3439 | $totalAttempts30d = DB::queryFirstField( |
| 3440 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 3440 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 3441 | 3441 | WHERE label IN %ls |
| 3442 | 3442 | AND date > %i', |
| 3443 | 3443 | ['auto_reencryption_success', 'auto_reencryption_failed'], |
@@ -3445,7 +3445,7 @@ discard block |
||
| 3445 | 3445 | ); |
| 3446 | 3446 | |
| 3447 | 3447 | $failures30d = DB::queryFirstField( |
| 3448 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 3448 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 3449 | 3449 | WHERE label = %s |
| 3450 | 3450 | AND date > %i', |
| 3451 | 3451 | 'auto_reencryption_failed', |
@@ -3482,7 +3482,7 @@ discard block |
||
| 3482 | 3482 | $lang = new Language($session->get('user-language') ?? 'english'); |
| 3483 | 3483 | |
| 3484 | 3484 | $results = []; |
| 3485 | - $fullPath = __DIR__ . '/../'; |
|
| 3485 | + $fullPath = __DIR__.'/../'; |
|
| 3486 | 3486 | |
| 3487 | 3487 | foreach ($files as $file) { |
| 3488 | 3488 | // Normalize path separators for cross-platform compatibility |
@@ -3531,7 +3531,7 @@ discard block |
||
| 3531 | 3531 | } |
| 3532 | 3532 | |
| 3533 | 3533 | // Try to delete the file |
| 3534 | - $deleteResult = '';//@unlink($normalizedPath); |
|
| 3534 | + $deleteResult = ''; //@unlink($normalizedPath); |
|
| 3535 | 3535 | |
| 3536 | 3536 | if ($deleteResult) { |
| 3537 | 3537 | $results[$normalizedPath] = [ |
@@ -3561,7 +3561,7 @@ discard block |
||
| 3561 | 3561 | */ |
| 3562 | 3562 | function filesIntegrityCheck($baseDir): array |
| 3563 | 3563 | { |
| 3564 | - $referenceFile = __DIR__ . '/../files_reference.txt'; |
|
| 3564 | + $referenceFile = __DIR__.'/../files_reference.txt'; |
|
| 3565 | 3565 | |
| 3566 | 3566 | $unknownFiles = findUnknownFiles($baseDir, $referenceFile); |
| 3567 | 3567 | |
@@ -3599,7 +3599,7 @@ discard block |
||
| 3599 | 3599 | $dir, |
| 3600 | 3600 | FilesystemIterator::SKIP_DOTS |
| 3601 | 3601 | ), |
| 3602 | - function ($current, $key, $iterator) { |
|
| 3602 | + function($current, $key, $iterator) { |
|
| 3603 | 3603 | // Ignore hidden files and folders |
| 3604 | 3604 | if ($current->getFilename()[0] === '.') { |
| 3605 | 3605 | return false; |
@@ -3613,7 +3613,7 @@ discard block |
||
| 3613 | 3613 | foreach ($iterator as $file) { |
| 3614 | 3614 | try { |
| 3615 | 3615 | if ($file->isFile()) { |
| 3616 | - $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname()); |
|
| 3616 | + $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname()); |
|
| 3617 | 3617 | $relativePath = str_replace('\\', '/', $relativePath); // Normalisation Windows/Linux |
| 3618 | 3618 | |
| 3619 | 3619 | // Split relatif path into parts |
@@ -3679,7 +3679,7 @@ discard block |
||
| 3679 | 3679 | // Get ignored files |
| 3680 | 3680 | $ignoredFiles = DB::queryFirstField( |
| 3681 | 3681 | 'SELECT valeur |
| 3682 | - FROM ' . prefixTable('misc') . ' |
|
| 3682 | + FROM ' . prefixTable('misc').' |
|
| 3683 | 3683 | WHERE type = %s AND intitule = %s', |
| 3684 | 3684 | 'admin', |
| 3685 | 3685 | 'ignored_unknown_files' |
@@ -3698,7 +3698,7 @@ discard block |
||
| 3698 | 3698 | function tablesIntegrityCheck(): array |
| 3699 | 3699 | { |
| 3700 | 3700 | // Get integrity tables file |
| 3701 | - $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json'; |
|
| 3701 | + $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json'; |
|
| 3702 | 3702 | if (file_exists($integrityTablesFile) === false) { |
| 3703 | 3703 | return [ |
| 3704 | 3704 | 'error' => true, |
@@ -3716,7 +3716,7 @@ discard block |
||
| 3716 | 3716 | // Get all tables |
| 3717 | 3717 | $tables = []; |
| 3718 | 3718 | foreach (DB::queryFirstColumn("SHOW TABLES") as $table) { |
| 3719 | - $tables[] = str_replace(DB_PREFIX, "", $table);; |
|
| 3719 | + $tables[] = str_replace(DB_PREFIX, "", $table); ; |
|
| 3720 | 3720 | } |
| 3721 | 3721 | // Prepare the integrity check |
| 3722 | 3722 | $tablesInError = []; |
@@ -3782,7 +3782,7 @@ discard block |
||
| 3782 | 3782 | |
| 3783 | 3783 | // Compare hashes |
| 3784 | 3784 | $expectedHash = $referenceData[$file]; |
| 3785 | - $actualHash = md5_file($baseDir . '/' . $file); |
|
| 3785 | + $actualHash = md5_file($baseDir.'/'.$file); |
|
| 3786 | 3786 | |
| 3787 | 3787 | if ($expectedHash !== $actualHash) { |
| 3788 | 3788 | $issues[] = "$file (expected: <i>$expectedHash</i>, actual: <i>$actualHash</i>)"; |
@@ -3835,7 +3835,7 @@ discard block |
||
| 3835 | 3835 | foreach ($iterator as $file) { |
| 3836 | 3836 | if ($file->isFile()) { |
| 3837 | 3837 | // Build relative path |
| 3838 | - $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname()); |
|
| 3838 | + $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname()); |
|
| 3839 | 3839 | $relativePath = str_replace('\\', '/', $relativePath); // Normalize for Windows |
| 3840 | 3840 | // Calculate hash |
| 3841 | 3841 | $files[$relativePath] = md5_file($file->getPathname()); |
@@ -3865,8 +3865,8 @@ discard block |
||
| 3865 | 3865 | // Loop on items |
| 3866 | 3866 | $item = DB::queryFirstRow( |
| 3867 | 3867 | 'SELECT i.id, i.pw, s.share_key, s.increment_id |
| 3868 | - FROM ' . prefixTable('items') . ' i |
|
| 3869 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id |
|
| 3868 | + FROM ' . prefixTable('items').' i |
|
| 3869 | + INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id |
|
| 3870 | 3870 | WHERE i.perso = %i |
| 3871 | 3871 | AND s.user_id = %i |
| 3872 | 3872 | ORDER BY RAND() |
@@ -3895,7 +3895,7 @@ discard block |
||
| 3895 | 3895 | // Get all items in database |
| 3896 | 3896 | $rows = DB::queryFirstRow( |
| 3897 | 3897 | 'SELECT count(*) as counter |
| 3898 | - FROM ' . prefixTable('sharekeys_items') . ' s |
|
| 3898 | + FROM ' . prefixTable('sharekeys_items').' s |
|
| 3899 | 3899 | WHERE s.user_id = %i', |
| 3900 | 3900 | TP_USER_ID |
| 3901 | 3901 | ); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | csrfProtector::init(); |
| 73 | 73 | |
| 74 | 74 | // Load functions |
| 75 | -require_once __DIR__. '/includes/config/include.php'; |
|
| 75 | +require_once __DIR__.'/includes/config/include.php'; |
|
| 76 | 76 | require_once __DIR__.'/sources/main.functions.php'; |
| 77 | 77 | |
| 78 | 78 | // init |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $SETTINGS = $antiXss->xss_clean($SETTINGS); |
| 107 | 107 | |
| 108 | 108 | // Load Core library |
| 109 | -require_once $SETTINGS['cpassman_dir'] . '/sources/core.php'; |
|
| 109 | +require_once $SETTINGS['cpassman_dir'].'/sources/core.php'; |
|
| 110 | 110 | // Prepare POST variables |
| 111 | 111 | $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 112 | 112 | $session_user_language = $session->get('user-language'); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | if ($hasSuperPrivilege > 0) { |
| 161 | 161 | if (defined('MYSQL_LOG') && MYSQL_LOG === true) { |
| 162 | 162 | DB::query("SET GLOBAL general_log = 'ON'"); |
| 163 | - DB::query("SET GLOBAL general_log_file = " . (defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'")); |
|
| 163 | + DB::query("SET GLOBAL general_log_file = ".(defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'")); |
|
| 164 | 164 | } else { |
| 165 | 165 | DB::query("SET GLOBAL general_log = 'OFF'"); |
| 166 | 166 | } |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | //get default language |
| 172 | 172 | $dataLanguage = DB::queryFirstRow( |
| 173 | 173 | 'SELECT m.valeur AS valeur, l.flag AS flag |
| 174 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 175 | - INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name) |
|
| 174 | + FROM ' . prefixTable('misc').' AS m |
|
| 175 | + INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name) |
|
| 176 | 176 | WHERE m.type=%s_type AND m.intitule=%s_intitule', |
| 177 | 177 | [ |
| 178 | 178 | 'type' => 'admin', |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $session_user_language = $SETTINGS['default_language']; |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | -$lang = new Language($session_user_language, __DIR__. '/includes/language/'); |
|
| 206 | +$lang = new Language($session_user_language, __DIR__.'/includes/language/'); |
|
| 207 | 207 | |
| 208 | 208 | if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') { |
| 209 | 209 | $SETTINGS['cpassman_dir'] = __DIR__; |
@@ -277,29 +277,29 @@ discard block |
||
| 277 | 277 | </script> |
| 278 | 278 | |
| 279 | 279 | <!-- IonIcons --> |
| 280 | - <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 280 | + <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 281 | 281 | <!-- Theme style --> |
| 282 | - <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 283 | - <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 284 | - <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 285 | - <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 282 | + <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 283 | + <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 284 | + <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 285 | + <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 286 | 286 | <!-- Theme style --> |
| 287 | - <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 287 | + <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 288 | 288 | <!-- Google Font: Source Sans Pro --> |
| 289 | - <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 289 | + <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 290 | 290 | <!-- Altertify --> |
| 291 | - <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 292 | - <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 291 | + <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 292 | + <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 293 | 293 | <!-- Toastr --> |
| 294 | - <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 294 | + <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 295 | 295 | <!-- favicon --> |
| 296 | - <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/> |
|
| 296 | + <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/> |
|
| 297 | 297 | <!-- manifest (PWA) --> |
| 298 | - <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 298 | + <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 299 | 299 | <!-- Custom style --> |
| 300 | 300 | <?php |
| 301 | - if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?> |
|
| 302 | - <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 301 | + if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?> |
|
| 302 | + <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 303 | 303 | <?php |
| 304 | 304 | } ?> |
| 305 | 305 | </head> |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | <div class="dropdown show"> |
| 347 | 347 | <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown"> |
| 348 | 348 | <?php |
| 349 | - echo $session_name . ' ' . $session_lastname; ?> |
|
| 349 | + echo $session_name.' '.$session_lastname; ?> |
|
| 350 | 350 | </a> |
| 351 | 351 | |
| 352 | 352 | <div class="dropdown-menu dropdown-menu-right"> |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | </a> |
| 371 | 371 | <?php |
| 372 | 372 | } ?> |
| 373 | - <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys"> |
|
| 373 | + <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys"> |
|
| 374 | 374 | <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?> |
| 375 | 375 | </a> |
| 376 | 376 | |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | <!-- Main Sidebar Container --> |
| 405 | 405 | <aside class="main-sidebar sidebar-dark-primary elevation-4"> |
| 406 | 406 | <!-- Brand Logo --> |
| 407 | - <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 407 | + <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 408 | 408 | <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image"> |
| 409 | 409 | <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span> |
| 410 | 410 | </a> |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '"> |
| 423 | 423 | <i class="nav-icon fa-solid fa-key"></i> |
| 424 | 424 | <p> |
| 425 | - ' . $lang->get('pw') . ' |
|
| 425 | + ' . $lang->get('pw').' |
|
| 426 | 426 | </p> |
| 427 | 427 | </a> |
| 428 | 428 | </li>'; |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '"> |
| 436 | 436 | <i class="nav-icon fa-solid fa-file-import"></i> |
| 437 | 437 | <p> |
| 438 | - ' . $lang->get('import') . ' |
|
| 438 | + ' . $lang->get('import').' |
|
| 439 | 439 | </p> |
| 440 | 440 | </a> |
| 441 | 441 | </li>'; |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '"> |
| 457 | 457 | <i class="nav-icon fa-solid fa-file-export"></i> |
| 458 | 458 | <p> |
| 459 | - ' . $lang->get('export') . ' |
|
| 459 | + ' . $lang->get('export').' |
|
| 460 | 460 | </p> |
| 461 | 461 | </a> |
| 462 | 462 | </li>'; |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '"> |
| 484 | 484 | <i class="nav-icon fa-solid fa-search"></i> |
| 485 | 485 | <p> |
| 486 | - ' . $lang->get('find') . ' |
|
| 486 | + ' . $lang->get('find').' |
|
| 487 | 487 | </p> |
| 488 | 488 | </a> |
| 489 | 489 | </li>'; |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '"> |
| 500 | 500 | <i class="nav-icon fa-solid fa-star"></i> |
| 501 | 501 | <p> |
| 502 | - ' . $lang->get('favorites') . ' |
|
| 502 | + ' . $lang->get('favorites').' |
|
| 503 | 503 | </p> |
| 504 | 504 | </a> |
| 505 | 505 | </li>'; |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '"> |
| 530 | 530 | <i class="nav-icon fa-solid fa-lightbulb"></i> |
| 531 | 531 | <p> |
| 532 | - ' . $lang->get('suggestion_menu') . ' |
|
| 532 | + ' . $lang->get('suggestion_menu').' |
|
| 533 | 533 | </p> |
| 534 | 534 | </a> |
| 535 | 535 | </li>'; |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '"> |
| 543 | 543 | <i class="nav-icon fa-solid fa-info"></i> |
| 544 | 544 | <p> |
| 545 | - ' . $lang->get('admin_main') . ' |
|
| 545 | + ' . $lang->get('admin_main').' |
|
| 546 | 546 | </p> |
| 547 | 547 | </a> |
| 548 | 548 | </li> |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | <a href="#" class="nav-link"> |
| 551 | 551 | <i class="nav-icon fa-solid fa-wrench"></i> |
| 552 | 552 | <p> |
| 553 | - ' . $lang->get('admin_settings') . ' |
|
| 553 | + ' . $lang->get('admin_settings').' |
|
| 554 | 554 | <i class="fa-solid fa-angle-left right"></i> |
| 555 | 555 | </p> |
| 556 | 556 | </a> |
@@ -558,63 +558,63 @@ discard block |
||
| 558 | 558 | <li class="nav-item"> |
| 559 | 559 | <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '"> |
| 560 | 560 | <i class="fa-solid fa-check-double nav-icon"></i> |
| 561 | - <p>' . $lang->get('options') . '</p> |
|
| 561 | + <p>' . $lang->get('options').'</p> |
|
| 562 | 562 | </a> |
| 563 | 563 | </li> |
| 564 | 564 | <li class="nav-item"> |
| 565 | 565 | <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '"> |
| 566 | 566 | <i class="fa-solid fa-qrcode nav-icon"></i> |
| 567 | - <p>' . $lang->get('mfa_short') . '</p> |
|
| 567 | + <p>' . $lang->get('mfa_short').'</p> |
|
| 568 | 568 | </a> |
| 569 | 569 | </li> |
| 570 | 570 | <li class="nav-item"> |
| 571 | 571 | <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '"> |
| 572 | 572 | <i class="fa-solid fa-cubes nav-icon"></i> |
| 573 | - <p>' . $lang->get('api') . '</p> |
|
| 573 | + <p>' . $lang->get('api').'</p> |
|
| 574 | 574 | </a> |
| 575 | 575 | </li> |
| 576 | 576 | <li class="nav-item"> |
| 577 | 577 | <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '"> |
| 578 | 578 | <i class="fa-solid fa-database nav-icon"></i> |
| 579 | - <p>' . $lang->get('backups') . '</p> |
|
| 579 | + <p>' . $lang->get('backups').'</p> |
|
| 580 | 580 | </a> |
| 581 | 581 | </li> |
| 582 | 582 | <li class="nav-item"> |
| 583 | 583 | <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '"> |
| 584 | 584 | <i class="fa-solid fa-envelope nav-icon"></i> |
| 585 | - <p>' . $lang->get('emails') . '</p> |
|
| 585 | + <p>' . $lang->get('emails').'</p> |
|
| 586 | 586 | </a> |
| 587 | 587 | </li> |
| 588 | 588 | <li class="nav-item"> |
| 589 | 589 | <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '"> |
| 590 | 590 | <i class="fa-solid fa-keyboard nav-icon"></i> |
| 591 | - <p>' . $lang->get('fields') . '</p> |
|
| 591 | + <p>' . $lang->get('fields').'</p> |
|
| 592 | 592 | </a> |
| 593 | 593 | </li> |
| 594 | 594 | <li class="nav-item"> |
| 595 | 595 | <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '"> |
| 596 | 596 | <i class="fa-solid fa-id-card nav-icon"></i> |
| 597 | - <p>' . $lang->get('ldap') . '</p> |
|
| 597 | + <p>' . $lang->get('ldap').'</p> |
|
| 598 | 598 | </a> |
| 599 | 599 | </li> |
| 600 | 600 | |
| 601 | 601 | <li class="nav-item"> |
| 602 | 602 | <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '"> |
| 603 | 603 | <i class="fa-solid fa-plug nav-icon"></i> |
| 604 | - <p>' . $lang->get('oauth') . '</p> |
|
| 604 | + <p>' . $lang->get('oauth').'</p> |
|
| 605 | 605 | </a> |
| 606 | 606 | </li> |
| 607 | 607 | |
| 608 | 608 | <li class="nav-item"> |
| 609 | 609 | <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '"> |
| 610 | 610 | <i class="fa-solid fa-file-upload nav-icon"></i> |
| 611 | - <p>' . $lang->get('uploads') . '</p> |
|
| 611 | + <p>' . $lang->get('uploads').'</p> |
|
| 612 | 612 | </a> |
| 613 | 613 | </li> |
| 614 | 614 | <li class="nav-item"> |
| 615 | 615 | <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '"> |
| 616 | 616 | <i class="fa-solid fa-chart-bar nav-icon"></i> |
| 617 | - <p>' . $lang->get('statistics') . '</p> |
|
| 617 | + <p>' . $lang->get('statistics').'</p> |
|
| 618 | 618 | </a> |
| 619 | 619 | </li> |
| 620 | 620 | </ul> |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | <li class="nav-item"> |
| 626 | 626 | <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '"> |
| 627 | 627 | <i class="fa-solid fa-tasks nav-icon"></i> |
| 628 | - <p>' . $lang->get('tasks') . '</p> |
|
| 628 | + <p>' . $lang->get('tasks').'</p> |
|
| 629 | 629 | </a> |
| 630 | 630 | </li>'; |
| 631 | 631 | } |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '"> |
| 637 | 637 | <i class="nav-icon fa-solid fa-person-drowning"></i> |
| 638 | 638 | <p> |
| 639 | - ' . $lang->get('tools') . ' |
|
| 639 | + ' . $lang->get('tools').' |
|
| 640 | 640 | </p> |
| 641 | 641 | </a> |
| 642 | 642 | </li>'; |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '"> |
| 647 | 647 | <i class="nav-icon fa-solid fa-file-import"></i> |
| 648 | 648 | <p> |
| 649 | - ' . $lang->get('import') . ' |
|
| 649 | + ' . $lang->get('import').' |
|
| 650 | 650 | </p> |
| 651 | 651 | </a> |
| 652 | 652 | </li>'; |
@@ -662,7 +662,7 @@ discard block |
||
| 662 | 662 | <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '"> |
| 663 | 663 | <i class="nav-icon fa-solid fa-folder-open"></i> |
| 664 | 664 | <p> |
| 665 | - ' . $lang->get('folders') . ' |
|
| 665 | + ' . $lang->get('folders').' |
|
| 666 | 666 | </p> |
| 667 | 667 | </a> |
| 668 | 668 | </li> |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '"> |
| 671 | 671 | <i class="nav-icon fa-solid fa-graduation-cap"></i> |
| 672 | 672 | <p> |
| 673 | - ' . $lang->get('roles') . ' |
|
| 673 | + ' . $lang->get('roles').' |
|
| 674 | 674 | </p> |
| 675 | 675 | </a> |
| 676 | 676 | </li> |
@@ -678,38 +678,38 @@ discard block |
||
| 678 | 678 | <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '"> |
| 679 | 679 | <i class="nav-icon fa-solid fa-users"></i> |
| 680 | 680 | <p> |
| 681 | - ' . $lang->get('users') . ' |
|
| 681 | + ' . $lang->get('users').' |
|
| 682 | 682 | </p> |
| 683 | 683 | </a> |
| 684 | 684 | </li> |
| 685 | 685 | <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '"> |
| 686 | 686 | <a href="#" class="nav-link"> |
| 687 | 687 | <i class="nav-icon fa-solid fa-cubes"></i> |
| 688 | - <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p> |
|
| 688 | + <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p> |
|
| 689 | 689 | </a> |
| 690 | 690 | <ul class="nav nav-treeview"> |
| 691 | 691 | <li class="nav-item"> |
| 692 | 692 | <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '"> |
| 693 | 693 | <i class="far fa-calendar-alt nav-icon"></i> |
| 694 | - <p>' . $lang->get('renewal') . '</p> |
|
| 694 | + <p>' . $lang->get('renewal').'</p> |
|
| 695 | 695 | </a> |
| 696 | 696 | </li> |
| 697 | 697 | <li class="nav-item"> |
| 698 | 698 | <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '"> |
| 699 | 699 | <i class="fa-solid fa-trash-alt nav-icon"></i> |
| 700 | - <p>' . $lang->get('deletion') . '</p> |
|
| 700 | + <p>' . $lang->get('deletion').'</p> |
|
| 701 | 701 | </a> |
| 702 | 702 | </li> |
| 703 | 703 | <li class="nav-item"> |
| 704 | 704 | <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '"> |
| 705 | 705 | <i class="fa-solid fa-history nav-icon"></i> |
| 706 | - <p>' . $lang->get('logs') . '</p> |
|
| 706 | + <p>' . $lang->get('logs').'</p> |
|
| 707 | 707 | </a> |
| 708 | 708 | </li> |
| 709 | 709 | <li class="nav-item"> |
| 710 | 710 | <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '"> |
| 711 | 711 | <i class="fa-solid fa-database nav-icon"></i> |
| 712 | - <p>' . $lang->get('database') . '</p> |
|
| 712 | + <p>' . $lang->get('database').'</p> |
|
| 713 | 713 | </a> |
| 714 | 714 | </li> |
| 715 | 715 | </ul> |
@@ -720,10 +720,10 @@ discard block |
||
| 720 | 720 | <!-- /.sidebar-menu --> |
| 721 | 721 | <div class="menu-footer"> |
| 722 | 722 | <div class="" id="sidebar-footer"> |
| 723 | - <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' . |
|
| 724 | - date($date_format, (int) $server['request_time']) . ' - ' . |
|
| 723 | + <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '. |
|
| 724 | + date($date_format, (int) $server['request_time']).' - '. |
|
| 725 | 725 | date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i> |
| 726 | - <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i> |
|
| 726 | + <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i> |
|
| 727 | 727 | <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a> |
| 728 | 728 | <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a> |
| 729 | 729 | <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?> |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | </div> |
| 881 | 881 | <div class="mt-3"> |
| 882 | 882 | <label> |
| 883 | - <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span> |
|
| 883 | + <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span> |
|
| 884 | 884 | <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer"> |
| 885 | 885 | </label> |
| 886 | 886 | </div> |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | |
| 1013 | 1013 | <div class="alert alert-danger mt-3" role="alert"> |
| 1014 | 1014 | <label> |
| 1015 | - <span class="mr-2 pointer fw-normal"><?php echo $lang->get('ignore_this_password_is_lost');?></span> |
|
| 1015 | + <span class="mr-2 pointer fw-normal"><?php echo $lang->get('ignore_this_password_is_lost'); ?></span> |
|
| 1016 | 1016 | <input type="checkbox" id="depiapc-ignore-password" class="pointer flat-blue"> |
| 1017 | 1017 | </label> |
| 1018 | 1018 | </div> |
@@ -1036,34 +1036,34 @@ discard block |
||
| 1036 | 1036 | if ($get['page'] === 'items') { |
| 1037 | 1037 | // SHow page with Items |
| 1038 | 1038 | if ((int) $session_user_admin !== 1) { |
| 1039 | - include $SETTINGS['cpassman_dir'] . '/pages/items.php'; |
|
| 1039 | + include $SETTINGS['cpassman_dir'].'/pages/items.php'; |
|
| 1040 | 1040 | } elseif ((int) $session_user_admin === 1) { |
| 1041 | - include $SETTINGS['cpassman_dir'] . '/pages/admin.php'; |
|
| 1041 | + include $SETTINGS['cpassman_dir'].'/pages/admin.php'; |
|
| 1042 | 1042 | } else { |
| 1043 | 1043 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1044 | 1044 | //not allowed page |
| 1045 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1045 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | } elseif (in_array($get['page'], array_keys($mngPages)) === true) { |
| 1048 | 1048 | // Define if user is allowed to see management pages |
| 1049 | 1049 | if ($session_user_admin === 1) { |
| 1050 | 1050 | // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow |
| 1051 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]); |
|
| 1051 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]); |
|
| 1052 | 1052 | } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) { |
| 1053 | 1053 | if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings' |
| 1054 | 1054 | ) { |
| 1055 | 1055 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1056 | 1056 | //not allowed page |
| 1057 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1057 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1058 | 1058 | } |
| 1059 | 1059 | } else { |
| 1060 | 1060 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1061 | 1061 | //not allowed page |
| 1062 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1062 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1063 | 1063 | } |
| 1064 | - } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) { |
|
| 1064 | + } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) { |
|
| 1065 | 1065 | // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below |
| 1066 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php'); |
|
| 1066 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php'); |
|
| 1067 | 1067 | } else { |
| 1068 | 1068 | $session->set('system-array_roles', ERR_NOT_EXIST); |
| 1069 | 1069 | //page doesn't exist |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | <footer class="main-footer"> |
| 1093 | 1093 | <!-- To the right --> |
| 1094 | 1094 | <div class="float-right d-none d-sm-inline"> |
| 1095 | - <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?> |
|
| 1095 | + <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?> |
|
| 1096 | 1096 | </div> |
| 1097 | 1097 | <!-- Default to the left --> |
| 1098 | 1098 | <strong>Copyright © <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved. |
@@ -1106,7 +1106,7 @@ discard block |
||
| 1106 | 1106 | echo ' |
| 1107 | 1107 | <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />'; |
| 1108 | 1108 | // display an item in the context of OTV link |
| 1109 | -} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1109 | +} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1110 | 1110 | && empty($get['otv']) === false |
| 1111 | 1111 | ) { |
| 1112 | 1112 | // case where one-shot viewer |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | FILTER_SANITIZE_URL |
| 1126 | 1126 | ) |
| 1127 | 1127 | ); |
| 1128 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1128 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) || |
| 1131 | 1131 | empty($session->get('user-id')) === true |
@@ -1150,7 +1150,7 @@ discard block |
||
| 1150 | 1150 | } |
| 1151 | 1151 | |
| 1152 | 1152 | // LOGIN form |
| 1153 | - include $SETTINGS['cpassman_dir'] . '/includes/core/login.php'; |
|
| 1153 | + include $SETTINGS['cpassman_dir'].'/includes/core/login.php'; |
|
| 1154 | 1154 | |
| 1155 | 1155 | } else { |
| 1156 | 1156 | // Clear session |
@@ -1183,154 +1183,154 @@ discard block |
||
| 1183 | 1183 | <!-- REQUIRED SCRIPTS --> |
| 1184 | 1184 | |
| 1185 | 1185 | <!-- Font Awesome Icons --> |
| 1186 | - <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1187 | - <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1188 | - <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1189 | - <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1190 | - <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1186 | + <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1187 | + <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1188 | + <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1189 | + <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1190 | + <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1191 | 1191 | <!-- jQuery --> |
| 1192 | - <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1193 | - <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1192 | + <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1193 | + <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1194 | 1194 | <!-- jQuery UI --> |
| 1195 | - <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1196 | - <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1195 | + <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1196 | + <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1197 | 1197 | <!-- Popper --> |
| 1198 | - <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1198 | + <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1199 | 1199 | <!-- Bootstrap --> |
| 1200 | - <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1200 | + <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1201 | 1201 | <!-- AdminLTE --> |
| 1202 | - <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1202 | + <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1203 | 1203 | <!-- Altertify --> |
| 1204 | 1204 | <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>--> |
| 1205 | 1205 | <!-- Toastr --> |
| 1206 | - <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1206 | + <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1207 | 1207 | <!-- STORE.JS --> |
| 1208 | - <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1208 | + <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1209 | 1209 | <!-- cryptojs-aesphp --> |
| 1210 | - <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1211 | - <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1210 | + <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1211 | + <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1212 | 1212 | <!-- pace --> |
| 1213 | - <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1213 | + <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1214 | 1214 | <!-- select2 --> |
| 1215 | - <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1215 | + <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1216 | 1216 | <!-- simplePassMeter --> |
| 1217 | - <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1218 | - <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1217 | + <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1218 | + <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1219 | 1219 | <!-- platform --> |
| 1220 | - <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1220 | + <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1221 | 1221 | <!-- radiobuttons --> |
| 1222 | - <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1223 | - <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1222 | + <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1223 | + <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1224 | 1224 | <!-- ICHECK --> |
| 1225 | 1225 | <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">--> |
| 1226 | - <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1227 | - <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1226 | + <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1227 | + <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1228 | 1228 | <!-- bootstrap-add-clear --> |
| 1229 | - <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1229 | + <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1230 | 1230 | <!-- DOMPurify --> |
| 1231 | - <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1231 | + <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1232 | 1232 | |
| 1233 | 1233 | <?php |
| 1234 | 1234 | $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS); |
| 1235 | 1235 | if ($menuAdmin === true) { |
| 1236 | 1236 | ?> |
| 1237 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1238 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1239 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1237 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1238 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1239 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1240 | 1240 | <!-- InputMask --> |
| 1241 | - <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1241 | + <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1242 | 1242 | <!-- Sortable --> |
| 1243 | 1243 | <!--<script src="./plugins/sortable/jquery.sortable.js"></script>--> |
| 1244 | 1244 | <!-- PLUPLOAD --> |
| 1245 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1245 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1246 | 1246 | <!-- DataTables --> |
| 1247 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1248 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1249 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1250 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1251 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1252 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1253 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1254 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1255 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1256 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1257 | - <link rel="stylesheet" href="includes/css/admin-dashboard.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1247 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1248 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1249 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1250 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1251 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1252 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1253 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1254 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1255 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1256 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1257 | + <link rel="stylesheet" href="includes/css/admin-dashboard.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1258 | 1258 | <?php |
| 1259 | 1259 | } elseif (isset($get['page']) === true) { |
| 1260 | 1260 | if (in_array($get['page'], ['items', 'import']) === true) { |
| 1261 | 1261 | ?> |
| 1262 | - <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1263 | - <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1264 | - <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1262 | + <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1263 | + <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1264 | + <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1265 | 1265 | <!-- countdownTimer --> |
| 1266 | - <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1266 | + <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1267 | 1267 | <!-- SUMMERNOTE --> |
| 1268 | - <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1269 | - <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1268 | + <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1269 | + <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1270 | 1270 | <!-- date-picker --> |
| 1271 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1272 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1271 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1272 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1273 | 1273 | <!-- time-picker --> |
| 1274 | - <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1275 | - <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1274 | + <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1275 | + <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1276 | 1276 | <!-- PLUPLOAD --> |
| 1277 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1277 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1278 | 1278 | <!-- VALIDATE --> |
| 1279 | - <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1279 | + <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1280 | 1280 | <!-- PWSTRENGHT --> |
| 1281 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1282 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1281 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1282 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1283 | 1283 | <!-- TOGGLE --> |
| 1284 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1285 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1286 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1284 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1285 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1286 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1287 | 1287 | <?php |
| 1288 | 1288 | } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) { |
| 1289 | 1289 | ?> |
| 1290 | 1290 | <!-- DataTables --> |
| 1291 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1292 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1293 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1294 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1295 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1296 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1297 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1298 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1299 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1300 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1291 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1292 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1293 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1294 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1295 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1296 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1297 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1298 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1299 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1300 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1301 | 1301 | <!-- dater picker --> |
| 1302 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1303 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1302 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1303 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1304 | 1304 | <!-- daterange picker --> |
| 1305 | - <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1306 | - <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1307 | - <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1305 | + <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1306 | + <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1307 | + <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1308 | 1308 | <!-- SlimScroll --> |
| 1309 | - <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1309 | + <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1310 | 1310 | <!-- FastClick --> |
| 1311 | - <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1311 | + <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1312 | 1312 | <?php |
| 1313 | 1313 | } elseif ($get['page'] === 'profile') { |
| 1314 | 1314 | ?> |
| 1315 | 1315 | <!-- FILESAVER --> |
| 1316 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1316 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1317 | 1317 | <!-- PLUPLOAD --> |
| 1318 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1318 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1319 | 1319 | <?php |
| 1320 | 1320 | } elseif ($get['page'] === 'export') { |
| 1321 | 1321 | ?> |
| 1322 | 1322 | <!-- FILESAVER --> |
| 1323 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1323 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1324 | 1324 | <!-- PWSTRENGHT --> |
| 1325 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1326 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1325 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1326 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1327 | 1327 | <?php |
| 1328 | 1328 | } |
| 1329 | 1329 | } |
| 1330 | 1330 | ?> |
| 1331 | 1331 | <!-- functions --> |
| 1332 | - <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1333 | - <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1332 | + <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1333 | + <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1334 | 1334 | <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" /> |
| 1335 | 1335 | |
| 1336 | 1336 | </body> |
@@ -1372,7 +1372,7 @@ discard block |
||
| 1372 | 1372 | }; |
| 1373 | 1373 | </script> |
| 1374 | 1374 | |
| 1375 | -<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1375 | +<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1376 | 1376 | |
| 1377 | 1377 | <script> |
| 1378 | 1378 | $(document).ready(function() { |
@@ -1431,65 +1431,65 @@ discard block |
||
| 1431 | 1431 | |
| 1432 | 1432 | // Load links, css and javascripts |
| 1433 | 1433 | if (isset($SETTINGS['cpassman_dir']) === true) { |
| 1434 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php'; |
|
| 1434 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php'; |
|
| 1435 | 1435 | if ($menuAdmin === true) { |
| 1436 | - include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php'; |
|
| 1436 | + include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php'; |
|
| 1437 | 1437 | if ($get['page'] === '2fa') { |
| 1438 | - include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php'; |
|
| 1438 | + include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php'; |
|
| 1439 | 1439 | } elseif ($get['page'] === 'api') { |
| 1440 | - include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php'; |
|
| 1440 | + include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php'; |
|
| 1441 | 1441 | } elseif ($get['page'] === 'backups') { |
| 1442 | - include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php'; |
|
| 1442 | + include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php'; |
|
| 1443 | 1443 | } elseif ($get['page'] === 'emails') { |
| 1444 | - include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php'; |
|
| 1444 | + include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php'; |
|
| 1445 | 1445 | } elseif ($get['page'] === 'ldap') { |
| 1446 | - include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php'; |
|
| 1446 | + include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php'; |
|
| 1447 | 1447 | } elseif ($get['page'] === 'uploads') { |
| 1448 | - include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php'; |
|
| 1448 | + include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php'; |
|
| 1449 | 1449 | } elseif ($get['page'] === 'fields') { |
| 1450 | - include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php'; |
|
| 1450 | + include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php'; |
|
| 1451 | 1451 | } elseif ($get['page'] === 'options') { |
| 1452 | - include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php'; |
|
| 1452 | + include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php'; |
|
| 1453 | 1453 | } elseif ($get['page'] === 'statistics') { |
| 1454 | - include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php'; |
|
| 1454 | + include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php'; |
|
| 1455 | 1455 | } elseif ($get['page'] === 'tasks') { |
| 1456 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php'; |
|
| 1456 | + include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php'; |
|
| 1457 | 1457 | } elseif ($get['page'] === 'oauth') { |
| 1458 | - include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php'; |
|
| 1458 | + include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php'; |
|
| 1459 | 1459 | } elseif ($get['page'] === 'tools') { |
| 1460 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php'; |
|
| 1460 | + include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php'; |
|
| 1461 | 1461 | } |
| 1462 | 1462 | } elseif (isset($get['page']) === true && $get['page'] !== '') { |
| 1463 | 1463 | if ($get['page'] === 'items') { |
| 1464 | - include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php'; |
|
| 1464 | + include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php'; |
|
| 1465 | 1465 | } elseif ($get['page'] === 'import') { |
| 1466 | - include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php'; |
|
| 1466 | + include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php'; |
|
| 1467 | 1467 | } elseif ($get['page'] === 'export') { |
| 1468 | - include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php'; |
|
| 1468 | + include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php'; |
|
| 1469 | 1469 | } elseif ($get['page'] === 'offline') { |
| 1470 | - include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php'; |
|
| 1470 | + include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php'; |
|
| 1471 | 1471 | } elseif ($get['page'] === 'search') { |
| 1472 | - include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php'; |
|
| 1472 | + include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php'; |
|
| 1473 | 1473 | } elseif ($get['page'] === 'profile') { |
| 1474 | - include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php'; |
|
| 1474 | + include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php'; |
|
| 1475 | 1475 | } elseif ($get['page'] === 'favourites') { |
| 1476 | - include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php'; |
|
| 1476 | + include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php'; |
|
| 1477 | 1477 | } elseif ($get['page'] === 'folders') { |
| 1478 | - include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php'; |
|
| 1478 | + include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php'; |
|
| 1479 | 1479 | } elseif ($get['page'] === 'users') { |
| 1480 | - include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php'; |
|
| 1480 | + include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php'; |
|
| 1481 | 1481 | } elseif ($get['page'] === 'roles') { |
| 1482 | - include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php'; |
|
| 1482 | + include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php'; |
|
| 1483 | 1483 | } elseif ($get['page'] === 'utilities.deletion') { |
| 1484 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php'; |
|
| 1484 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php'; |
|
| 1485 | 1485 | } elseif ($get['page'] === 'utilities.logs') { |
| 1486 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php'; |
|
| 1486 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php'; |
|
| 1487 | 1487 | } elseif ($get['page'] === 'utilities.database') { |
| 1488 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php'; |
|
| 1488 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php'; |
|
| 1489 | 1489 | } elseif ($get['page'] === 'utilities.renewal') { |
| 1490 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php'; |
|
| 1490 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php'; |
|
| 1491 | 1491 | } |
| 1492 | 1492 | } else { |
| 1493 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php'; |
|
| 1493 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php'; |
|
| 1494 | 1494 | } |
| 1495 | 1495 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | echo "=== Teampass License Compliance Checker ===\n\n"; |
| 33 | 33 | |
| 34 | 34 | // Open report file for streaming write |
| 35 | - $this->reportFile = fopen(__DIR__ . '/LICENSE_COMPLIANCE_REPORT.md', 'w'); |
|
| 35 | + $this->reportFile = fopen(__DIR__.'/LICENSE_COMPLIANCE_REPORT.md', 'w'); |
|
| 36 | 36 | |
| 37 | 37 | $this->writeHeader(); |
| 38 | 38 | $this->processPhpDependencies(); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | private function writeHeader(): void |
| 62 | 62 | { |
| 63 | 63 | $header = "# Teampass License Compliance Report\n\n"; |
| 64 | - $header .= "**Generated:** " . date('Y-m-d H:i:s') . "\n"; |
|
| 64 | + $header .= "**Generated:** ".date('Y-m-d H:i:s')."\n"; |
|
| 65 | 65 | $header .= "**Project License:** GNU General Public License v3.0\n\n"; |
| 66 | 66 | |
| 67 | 67 | fwrite($this->reportFile, $header); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | private function processPhpDependencies(): void |
| 76 | 76 | { |
| 77 | - $lockFile = __DIR__ . '/../composer.lock'; |
|
| 77 | + $lockFile = __DIR__.'/../composer.lock'; |
|
| 78 | 78 | |
| 79 | 79 | if (!file_exists($lockFile)) { |
| 80 | 80 | $this->errorCount++; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | private function processJsDependencies(): void |
| 141 | 141 | { |
| 142 | - $jsFile = __DIR__ . '/javascript-dependencies.json'; |
|
| 142 | + $jsFile = __DIR__.'/javascript-dependencies.json'; |
|
| 143 | 143 | |
| 144 | 144 | fwrite($this->reportFile, "## JavaScript/CSS Dependencies\n\n"); |
| 145 | 145 | |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | private function writeFooter(): void |
| 234 | 234 | { |
| 235 | 235 | $footer = "## Summary\n\n"; |
| 236 | - $footer .= "- **Total Dependencies:** " . ($this->phpCount + $this->jsCount) . "\n"; |
|
| 236 | + $footer .= "- **Total Dependencies:** ".($this->phpCount + $this->jsCount)."\n"; |
|
| 237 | 237 | $footer .= "- **PHP Dependencies:** {$this->phpCount}\n"; |
| 238 | 238 | $footer .= "- **JavaScript Dependencies:** {$this->jsCount}\n"; |
| 239 | 239 | $footer .= "- **Errors:** {$this->errorCount}\n"; |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | $footer .= "```\n\n"; |
| 263 | 263 | |
| 264 | 264 | $footer .= "---\n\n"; |
| 265 | - $footer .= "*Auto-generated report - Last updated: " . date('Y-m-d H:i:s') . "*\n"; |
|
| 265 | + $footer .= "*Auto-generated report - Last updated: ".date('Y-m-d H:i:s')."*\n"; |
|
| 266 | 266 | |
| 267 | 267 | fwrite($this->reportFile, $footer); |
| 268 | 268 | } |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | ]; |
| 297 | 297 | |
| 298 | 298 | file_put_contents( |
| 299 | - __DIR__ . '/javascript-dependencies.json', |
|
| 299 | + __DIR__.'/javascript-dependencies.json', |
|
| 300 | 300 | json_encode($template, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
| 301 | 301 | ); |
| 302 | 302 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 70 | 70 | // Not allowed page |
| 71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 73 | 73 | exit; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | // error |
| 156 | 156 | toastr.remove(); |
| 157 | 157 | toastr.error( |
| 158 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 158 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 159 | 159 | '', { |
| 160 | 160 | closeButton: true, |
| 161 | 161 | positionClass: 'toast-bottom-right' |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | // error |
| 278 | 278 | toastr.remove(); |
| 279 | 279 | toastr.error( |
| 280 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 280 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 281 | 281 | '', { |
| 282 | 282 | closeButton: true, |
| 283 | 283 | positionClass: 'toast-bottom-right' |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | // error |
| 973 | 973 | toastr.remove(); |
| 974 | 974 | toastr.error( |
| 975 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 975 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 976 | 976 | '', { |
| 977 | 977 | closeButton: true, |
| 978 | 978 | positionClass: 'toast-bottom-right' |
@@ -1033,7 +1033,7 @@ discard block |
||
| 1033 | 1033 | // error |
| 1034 | 1034 | toastr.remove(); |
| 1035 | 1035 | toastr.error( |
| 1036 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 1036 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 1037 | 1037 | '', { |
| 1038 | 1038 | closeButton: true, |
| 1039 | 1039 | positionClass: 'toast-bottom-right' |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | // error |
| 1093 | 1093 | toastr.remove(); |
| 1094 | 1094 | toastr.error( |
| 1095 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 1095 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 1096 | 1096 | '', { |
| 1097 | 1097 | closeButton: true, |
| 1098 | 1098 | positionClass: 'toast-bottom-right' |
@@ -1191,7 +1191,7 @@ discard block |
||
| 1191 | 1191 | // error |
| 1192 | 1192 | toastr.remove(); |
| 1193 | 1193 | toastr.error( |
| 1194 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 1194 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 1195 | 1195 | '', { |
| 1196 | 1196 | closeButton: true, |
| 1197 | 1197 | positionClass: 'toast-bottom-right' |
@@ -1220,7 +1220,7 @@ discard block |
||
| 1220 | 1220 | |
| 1221 | 1221 | //const className = result.success ? 'success' : 'error'; |
| 1222 | 1222 | const icon = result.success ? '<i class="fa-solid fa-check text-success mr-1"></i>' : '<i class="fa-solid fa-xmark text-danger mr-1"></i>'; |
| 1223 | - const message = result.success ? '<?php echo $lang->get('server_returned_data');?>' : 'Error: ' + result.error; |
|
| 1223 | + const message = result.success ? '<?php echo $lang->get('server_returned_data'); ?>' : 'Error: ' + result.error; |
|
| 1224 | 1224 | |
| 1225 | 1225 | output += '<li>' + icon + '<b>' + file + '</b><br/>' + message + '</li>'; |
| 1226 | 1226 | }); |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | // error |
| 1263 | 1263 | toastr.remove(); |
| 1264 | 1264 | toastr.error( |
| 1265 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 1265 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 1266 | 1266 | '', { |
| 1267 | 1267 | closeButton: true, |
| 1268 | 1268 | positionClass: 'toast-bottom-right' |
@@ -1471,7 +1471,7 @@ discard block |
||
| 1471 | 1471 | // error |
| 1472 | 1472 | toastr.remove(); |
| 1473 | 1473 | toastr.error( |
| 1474 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 1474 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 1475 | 1475 | '', { |
| 1476 | 1476 | closeButton: true, |
| 1477 | 1477 | positionClass: 'toast-bottom-right' |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 70 | 70 | // Not allowed page |
| 71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 73 | 73 | exit; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | |
| 318 | 318 | // Has the transparent recovery migration been done? |
| 319 | 319 | DB::query( |
| 320 | - "SELECT id FROM " . prefixTable('users') . " |
|
| 320 | + "SELECT id FROM ".prefixTable('users')." |
|
| 321 | 321 | WHERE (user_derivation_seed IS NULL |
| 322 | 322 | OR private_key_backup IS NULL) |
| 323 | 323 | AND disabled = 0" |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | COUNT(*) as total_users, |
| 342 | 342 | SUM(CASE WHEN personal_items_migrated = 1 THEN 1 ELSE 0 END) as migrated_users, |
| 343 | 343 | SUM(CASE WHEN personal_items_migrated = 0 THEN 1 ELSE 0 END) as pending_users |
| 344 | - FROM " . prefixTable('users') . " |
|
| 344 | + FROM " . prefixTable('users')." |
|
| 345 | 345 | WHERE disabled = 0 AND deleted_at IS NULL" |
| 346 | 346 | ); |
| 347 | 347 | $progressPercent = ($stats[0]['migrated_users'] / $stats[0]['total_users']) * 100; |
@@ -377,11 +377,11 @@ discard block |
||
| 377 | 377 | ?> |
| 378 | 378 | <li class="list-group-item d-flex justify-content-between align-items-center"> |
| 379 | 379 | <span><i class="fa-solid fa-hand text-warning"></i> |
| 380 | - Password Encryption Migration Required <span class="badge badge-warning"><?php echo DB::count();?> remaing users</span> |
|
| 380 | + Password Encryption Migration Required <span class="badge badge-warning"><?php echo DB::count(); ?> remaing users</span> |
|
| 381 | 381 | </span> |
| 382 | 382 | <span> |
| 383 | - <i class="fa-solid fa-info-circle text-primary open-info" data-info="<?php echo DB::count();?> user accounts still use the legacy encryption library and must be migrated before upgrading to version 3.2.0.<br> |
|
| 384 | - To migrate: Users must either log in once or have their password updated via the Users management page.<p class='mt-2'>List of remaining users: <?php echo $logins_list;?></p>" data-size="lg" data-title="Importante notice"></i> |
|
| 383 | + <i class="fa-solid fa-info-circle text-primary open-info" data-info="<?php echo DB::count(); ?> user accounts still use the legacy encryption library and must be migrated before upgrading to version 3.2.0.<br> |
|
| 384 | + To migrate: Users must either log in once or have their password updated via the Users management page.<p class='mt-2'>List of remaining users: <?php echo $logins_list; ?></p>" data-size="lg" data-title="Importante notice"></i> |
|
| 385 | 385 | </span> |
| 386 | 386 | </li> |
| 387 | 387 | <?php |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | // Get last cron execution timestamp |
| 469 | 469 | DB::query( |
| 470 | 470 | 'SELECT valeur |
| 471 | - FROM ' . prefixTable('misc') . ' |
|
| 471 | + FROM ' . prefixTable('misc').' |
|
| 472 | 472 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 473 | 473 | 'admin', |
| 474 | 474 | 'last_cron_exec', |
@@ -524,17 +524,17 @@ discard block |
||
| 524 | 524 | FROM information_schema.TABLES |
| 525 | 525 | WHERE table_schema = DATABASE()" |
| 526 | 526 | ); |
| 527 | -$dbSizeFormatted = $dbSize . ' MB'; |
|
| 527 | +$dbSizeFormatted = $dbSize.' MB'; |
|
| 528 | 528 | |
| 529 | 529 | // Get other PHP info |
| 530 | 530 | $phpVersion = phpversion(); |
| 531 | 531 | $memoryLimit = ini_get('memory_limit'); |
| 532 | -$memoryUsage = round(memory_get_usage() / 1024, 2) . ' KB'; |
|
| 533 | -$maxExecutionTime = ini_get('max_execution_time') . 's'; |
|
| 532 | +$memoryUsage = round(memory_get_usage() / 1024, 2).' KB'; |
|
| 533 | +$maxExecutionTime = ini_get('max_execution_time').'s'; |
|
| 534 | 534 | $maxUploadSize = ini_get('upload_max_filesize'); |
| 535 | 535 | |
| 536 | 536 | // Get OS info |
| 537 | -$osInfo = php_uname('s') . ' ' . php_uname('r'); |
|
| 537 | +$osInfo = php_uname('s').' '.php_uname('r'); |
|
| 538 | 538 | |
| 539 | 539 | // Get timezone |
| 540 | 540 | $timezone = date_default_timezone_get(); |
@@ -490,8 +490,7 @@ |
||
| 490 | 490 | </div> |
| 491 | 491 | <?php |
| 492 | 492 | } |
| 493 | -} |
|
| 494 | -catch (Exception $e) { |
|
| 493 | +} catch (Exception $e) { |
|
| 495 | 494 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 496 | 495 | error_log('TEAMPASS Error - admin page - '.$e->getMessage()); |
| 497 | 496 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
| 70 | 70 | // Not allowed page |
| 71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 73 | 73 | exit; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -92,24 +92,24 @@ discard block |
||
| 92 | 92 | // If administrator then all roles are shown |
| 93 | 93 | // else only the Roles the users is associated to. |
| 94 | 94 | if ((int) $session->get('user-admin') === 1) { |
| 95 | - $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>'; |
|
| 95 | + $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>'; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $rows = DB::query( |
| 99 | 99 | 'SELECT id, title, creator_id |
| 100 | - FROM ' . prefixTable('roles_title') . ' |
|
| 100 | + FROM ' . prefixTable('roles_title').' |
|
| 101 | 101 | ORDER BY title ASC' |
| 102 | 102 | ); |
| 103 | 103 | foreach ($rows as $record) { |
| 104 | 104 | if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) { |
| 105 | - $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>'; |
|
| 105 | + $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>'; |
|
| 106 | 106 | } |
| 107 | 107 | if ( |
| 108 | 108 | (int) $session->get('user-admin') === 1 |
| 109 | 109 | || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) |
| 110 | 110 | && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id')) |
| 111 | 111 | ) { |
| 112 | - $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>'; |
|
| 112 | + $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>'; |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | for ($y = 1; $y < $t->nlevel; ++$y) { |
| 125 | 125 | $ident .= ' '; |
| 126 | 126 | } |
| 127 | - $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>'; |
|
| 127 | + $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>'; |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
@@ -163,13 +163,13 @@ discard block |
||
| 163 | 163 | </button><?php |
| 164 | 164 | echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ? |
| 165 | 165 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync"> |
| 166 | - <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . ' |
|
| 166 | + <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').' |
|
| 167 | 167 | </button>' : ''; |
| 168 | 168 | ?> |
| 169 | 169 | </button><?php |
| 170 | 170 | echo isset($SETTINGS['oauth2_enabled']) === true && (int) $SETTINGS['oauth2_enabled'] === 1 && (int) $session->get('user-admin') === 1 ? |
| 171 | 171 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="oauth2-sync"> |
| 172 | - <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization') . ' |
|
| 172 | + <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization').' |
|
| 173 | 173 | </button>' : ''; |
| 174 | 174 | ?> |
| 175 | 175 | <button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="deleted-users"> |
@@ -178,8 +178,8 @@ discard block |
||
| 178 | 178 | </div> |
| 179 | 179 | |
| 180 | 180 | <!-- /.card-header --> |
| 181 | - <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : '';?>" id="users-list" data-content="refresh"> |
|
| 182 | - <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label> |
|
| 181 | + <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : ''; ?>" id="users-list" data-content="refresh"> |
|
| 182 | + <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label> |
|
| 183 | 183 | <table id="table-users" class="table table-striped nowrap table-responsive-sm"> |
| 184 | 184 | <thead> |
| 185 | 185 | <tr> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | <?php |
| 244 | 244 | foreach (TP_PW_COMPLEXITY as $entry) { |
| 245 | 245 | echo ' |
| 246 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
| 246 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
| 247 | 247 | } |
| 248 | 248 | ?> |
| 249 | 249 | </select> |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | <?php |
| 321 | 321 | foreach (TP_PW_COMPLEXITY as $entry) { |
| 322 | 322 | echo ' |
| 323 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
| 323 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
| 324 | 324 | } |
| 325 | 325 | ?> |
| 326 | 326 | </select> |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | </div> |
| 359 | 359 | |
| 360 | 360 | <!-- USER FORM --> |
| 361 | - <div class="row <?php echo $showNewUser ? '' : 'hidden';?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit"> |
|
| 361 | + <div class="row <?php echo $showNewUser ? '' : 'hidden'; ?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit"> |
|
| 362 | 362 | <div class="col-12"> |
| 363 | 363 | <div class="card card-primary"> |
| 364 | 364 | <div class="card-header"> |
@@ -28,8 +28,8 @@ |
||
| 28 | 28 | * @see https://www.teampass.net |
| 29 | 29 | */ |
| 30 | 30 | |
| 31 | - // TO REMOVE |
|
| 32 | - // - selected_items_to_be_imported |
|
| 31 | + // TO REMOVE |
|
| 32 | + // - selected_items_to_be_imported |
|
| 33 | 33 | |
| 34 | 34 | return array( |
| 35 | 35 | 'copied' => 'Copied', |
