Compare commits

...

3 commits

Author SHA1 Message Date
David Prevot 8b1e791d2f .Jenkinsfile: tfix
All checks were successful
gitea/evoadmin-mail/pipeline/head This commit looks good
2024-04-19 10:57:44 +02:00
David Prevot bd6e653b19 Move export-dir to CI specific hack
Some checks failed
gitea/evoadmin-mail/pipeline/head There was a failure building this commit
2024-04-19 10:32:11 +02:00
David Prevot f9ee642682 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
2024-02-20 11:50:03 +01:00
3 changed files with 17 additions and 13 deletions

View file

@ -7,7 +7,7 @@ pipeline {
} }
steps { steps {
script { script {
sh 'gbp buildpackage' sh 'gbp buildpackage --git-export-dir=build-area'
} }
archiveArtifacts allowEmptyArchive: true, artifacts: 'build-area/*.gz,build-area/*.bz2,build-area/*.xz,build-area/*.deb,build-area/*.dsc,build-area/*.changes,build-area/*.buildinfo,build-area/*.build,build-area/lintian.txt' archiveArtifacts allowEmptyArchive: true, artifacts: 'build-area/*.gz,build-area/*.bz2,build-area/*.xz,build-area/*.deb,build-area/*.dsc,build-area/*.changes,build-area/*.buildinfo,build-area/*.build,build-area/lintian.txt'
} }

View file

@ -98,11 +98,13 @@ class FormController {
,'mailaccept' => array('filter' => FILTER_DEFAULT, 'flags' => FILTER_FORCE_ARRAY) ,'mailaccept' => array('filter' => FILTER_DEFAULT, 'flags' => FILTER_FORCE_ARRAY)
), true); ), true);
if (!empty(self::$form['mailaccept'])) {
self::$form['mailaccept'] = array_map(function($value) { self::$form['mailaccept'] = array_map(function($value) {
if (!empty($value)) { if (!empty($value)) {
return $value.'@'.self::$form['domain']; return $value.'@'.self::$form['domain'];
} }
}, self::$form['mailaccept']); }, self::$form['mailaccept']);
}
if (!empty(self::$form['password'])) { self::filterPassword(); } 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['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['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']; } if (!empty($_GET['alias']) && in_array($_GET['alias'], $allowed_params)) { self::$params['alias'] = $_GET['alias']; }
if (!empty($_GET['domain'])) {
self::$params = array_merge(filter_input_array(INPUT_GET, array( self::$params = array_merge(filter_input_array(INPUT_GET, array(
'domain' => FILTER_SANITIZE_URL 'domain' => FILTER_SANITIZE_URL
,'account' => FILTER_SANITIZE_EMAIL ,'account' => FILTER_SANITIZE_EMAIL
,'alias' => array('filter' => FILTER_SANITIZE_STRING, 'flags' => FILTER_FLAG_STRIP_HIGH) ,'alias' => array('filter' => FILTER_SANITIZE_STRING, 'flags' => FILTER_FLAG_STRIP_HIGH)
), true) ), true)
, self::$params); , self::$params);
}
unset($_GET); unset($_GET);
//die(var_dump(self::$params)); //die(var_dump(self::$params));
@ -97,7 +99,7 @@ class PageController {
} }
private static function logout() { private static function logout() {
session_unset('EVOADMIN_SESS'); session_unset();
session_destroy(); session_destroy();
print self::$twig->render('login.html', array( print self::$twig->render('login.html', array(
'page_name' => Config::getName().' - Login' 'page_name' => Config::getName().' - Login'