merge current enhancements from main branch to v2.2 (#1261)

This commit is contained in:
Michael Kaufmann
2024-07-21 10:41:24 +02:00
committed by GitHub
parent b3dc7f9187
commit b888e920f4
21 changed files with 201 additions and 55 deletions

View File

@@ -171,8 +171,9 @@ final class MasterCron extends CliCommand
FroxlorLogger::getInstanceOf()->setCronLog(0);
}
// clean up possible old login-links
// clean up possible old login-links and 2fa tokens
Database::query("DELETE FROM `" . TABLE_PANEL_LOGINLINKS . "` WHERE `valid_until` < UNIX_TIMESTAMP()");
Database::query("DELETE FROM `" . TABLE_PANEL_2FA_TOKENS . "` WHERE `valid_until` < UNIX_TIMESTAMP()");
return $result;
}