.Jenkinsfile

@@ -7,7 +7,7 @@ pipeline {
             }
             steps {
                 script {
-                    sh 'gbp buildpackage --git-export-dir=build-area'
+                    sh 'gbp buildpackage'
                 }
                 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'
             }

htdocs/lib/FormController.php

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

htdocs/lib/PageController.php

@@ -60,14 +60,12 @@ 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']; }
-        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);
-        }
+        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));
@@ -99,7 +97,7 @@ class PageController {
     }
 
     private static function logout() {
-        session_unset();
+        session_unset('EVOADMIN_SESS');
         session_destroy();
         print self::$twig->render('login.html', array(
             'page_name' => Config::getName().' - Login'