Merge branch 'dev' of codeberg.org:streams/streams into dev

This commit is contained in:
Mike Macgirvin 2024-07-17 05:28:33 +10:00
commit 2f6c08d24b
2 changed files with 4 additions and 1 deletions

View file

@ -71,7 +71,7 @@ function authenticate_success($user_record, $channel = false, $login_initial = f
// might want to log success here // might want to log success here
} }
if ($_SESSION['2FA_REQUIRED'] && !$_SESSION['2FA_VERIFIED'] if (!empty($_SESSION['2FA_REQUIRED']) && !$_SESSION['2FA_VERIFIED']
&& !in_array(App::$module, ['totp_check', 'dav', 'cdav', 'api', 'addressbook', 'calendar'], true)) { && !in_array(App::$module, ['totp_check', 'dav', 'cdav', 'api', 'addressbook', 'calendar'], true)) {
goaway(z_root() . '/totp_check'); goaway(z_root() . '/totp_check');
} }

View file

@ -20,6 +20,9 @@ class Cron_daily implements DaemonInterface
* *
*/ */
// rotate the symfony/doctrine logs - 1 level for now
rename ('var/log/dev.log', 'var/log/dev.log.1');
// make sure our own site record is up to date // make sure our own site record is up to date
Libzot::import_site(Libzot::site_info()); Libzot::import_site(Libzot::site_info());