Fix PHP 8 related issues
All checks were successful
gitea/evoadmin-mail/pipeline/head This commit looks good
gitea/evoadmin-mail/pipeline/tag This commit looks good

This commit is contained in:
David Prevot 2024-02-20 11:41:57 +01:00
parent 0257f25e92
commit f9ee642682
2 changed files with 16 additions and 12 deletions

View file

@ -98,11 +98,13 @@ class FormController {
,'mailaccept' => array('filter' => FILTER_DEFAULT, 'flags' => FILTER_FORCE_ARRAY)
), true);
self::$form['mailaccept'] = array_map(function($value) {
if (!empty($value)) {
return $value.'@'.self::$form['domain'];
}
}, self::$form['mailaccept']);
if (!empty(self::$form['mailaccept'])) {
self::$form['mailaccept'] = array_map(function($value) {
if (!empty($value)) {
return $value.'@'.self::$form['domain'];
}
}, self::$form['mailaccept']);
}
if (!empty(self::$form['password'])) { self::filterPassword(); }

View file

@ -60,12 +60,14 @@ class PageController {
if (!empty($_GET['domain']) && in_array($_GET['domain'], $allowed_params)) { self::$params['domain'] = $_GET['domain']; }
if (!empty($_GET['account']) && in_array($_GET['account'], $allowed_params)) { self::$params['account'] = $_GET['account']; }
if (!empty($_GET['alias']) && in_array($_GET['alias'], $allowed_params)) { self::$params['alias'] = $_GET['alias']; }
self::$params = array_merge(filter_input_array(INPUT_GET, array(
'domain' => FILTER_SANITIZE_URL
,'account' => FILTER_SANITIZE_EMAIL
,'alias' => array('filter' => FILTER_SANITIZE_STRING, 'flags' => FILTER_FLAG_STRIP_HIGH)
), true)
, self::$params);
if (!empty($_GET['domain'])) {
self::$params = array_merge(filter_input_array(INPUT_GET, array(
'domain' => FILTER_SANITIZE_URL
,'account' => FILTER_SANITIZE_EMAIL
,'alias' => array('filter' => FILTER_SANITIZE_STRING, 'flags' => FILTER_FLAG_STRIP_HIGH)
), true)
, self::$params);
}
unset($_GET);
//die(var_dump(self::$params));
@ -97,7 +99,7 @@ class PageController {
}
private static function logout() {
session_unset('EVOADMIN_SESS');
session_unset();
session_destroy();
print self::$twig->render('login.html', array(
'page_name' => Config::getName().' - Login'