@@ -33,7 +33,7 @@ function config($key, $localonly = false)

     }

     if ($key == 'modules' && isset($_SESSION['restrict_modules'])) {

-        $modules = array();

+        $modules = [];

         foreach ($config['modules'] as $mod) {

             if (in_array($mod, $_SESSION['restrict_modules'])) {

                 $modules[] = $mod;

@@ -84,7 +84,7 @@ function have_role($role)

 function get_server_by_id($id)

 {

     $id = (int) $id;

-    $result = db_query("SELECT hostname FROM system.servers WHERE id=?", array($id));

+    $result = db_query("SELECT hostname FROM system.servers WHERE id=?", [$id]);

     $ret = $result->fetch();

     return $ret['hostname'];

 }

@@ -102,7 +102,7 @@ function redirect($target)

         if (strpos($target, '?') === false) {

             print 'REDIRECT: '.internal_link($target, $target);

         } else {

-            list($file, $qs) = explode('?', $target, 2);

+            [$file, $qs] = explode('?', $target, 2);

             print 'REDIRECT: '.internal_link($file, $target, $qs);

         }

     }

@@ -113,7 +113,7 @@ function redirect($target)

 function my_server_id()

 {

     $uid = (int) $_SESSION['userinfo']['uid'];

-    $result = db_query("SELECT server FROM system.useraccounts WHERE uid=?", array($uid));

+    $result = db_query("SELECT server FROM system.useraccounts WHERE uid=?", [$uid]);

     $r = $result->fetch();

     DEBUG($r);

     return $r['server'];

@@ -123,8 +123,8 @@ function my_server_id()

 function additional_servers()

 {

     $uid = (int) $_SESSION['userinfo']['uid'];

-    $result = db_query("SELECT server FROM system.user_server WHERE uid=?", array($uid));

-    $servers = array();

+    $result = db_query("SELECT server FROM system.user_server WHERE uid=?", [$uid]);

+    $servers = [];

     while ($s = $result->fetch()) {

         $servers[] = $s['server'];

     }

@@ -136,7 +136,7 @@ function additional_servers()

 function server_names()

 {

     $result = db_query("SELECT id, hostname FROM system.servers");

-    $servers = array();

+    $servers = [];

     while ($s = $result->fetch()) {

         $servers[$s['id']] = $s['hostname'];

     }

@@ -180,11 +180,11 @@ function logger($severity, $scriptname, $scope, $message)

         }

     }

-    $args = array(":user" => $user,

+    $args = [":user" => $user,

                 ":remote" => $_SERVER['REMOTE_ADDR'],

                 ":scriptname" => $scriptname,

                 ":scope" => $scope,

-                ":message" => $message);

+                ":message" => $message, ];

     db_query("INSERT INTO misc.scriptlog (remote, user,scriptname,scope,message) VALUES (:remote, :user, :scriptname, :scope, :message)", $args);

 }

@@ -195,7 +195,7 @@ function count_failed_logins()

         DEBUG("logging is disabled, no brute force check possible");

         return;

     }

-    $result = db_query("SELECT count(*) AS num FROM misc.scriptlog WHERE user IS NULL AND scriptname='session/start' AND scope='login' AND message LIKE 'wrong user data%' AND remote=:remote AND `timestamp` > NOW() - INTERVAL 10 MINUTE", array(":remote" => $_SERVER['REMOTE_ADDR']));

+    $result = db_query("SELECT count(*) AS num FROM misc.scriptlog WHERE user IS NULL AND scriptname='session/start' AND scope='login' AND message LIKE 'wrong user data%' AND remote=:remote AND `timestamp` > NOW() - INTERVAL 10 MINUTE", [":remote" => $_SERVER['REMOTE_ADDR']]);

     $data = $result->fetch();

     DEBUG('seen '.$data['num'].' failed logins from this address within 10 minutes');

     return $data['num'];

@@ -229,7 +229,7 @@ function footnote($explaination)

 {

     global $footnotes;

     if (!isset($footnotes) || !is_array($footnotes)) {

-        $footnotes = array();

+        $footnotes = [];

     }

     $fnid = array_search($explaination, $footnotes);

     DEBUG($footnotes);

@@ -334,7 +334,7 @@ function use_module($modname)

 {

     global $prefix, $needed_modules;

     if (! isset($needed_modules)) {

-        $needed_modules = array();

+        $needed_modules = [];

     }

     if (in_array($modname, $needed_modules)) {

         return;

@@ -359,7 +359,7 @@ function encode_querystring($querystring)

         $querystring = 'debug&'.$querystring;

     }

     $query = explode('&', $querystring);

-    $new_query = array();

+    $new_query = [];

     foreach ($query as $item) {

         if ($item != '') {

             $split = explode('=', $item, 2);

@@ -433,22 +433,22 @@ function html_select($name, $options, $default='', $free='')

 function html_datepicker($nameprefix, $timestamp)

 {

-    $valid_days = array( 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

+    $valid_days = [ 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

                        6 =>  6,  7 =>  7,  8 =>  8,  9 =>  9, 10 => 10,

                       11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15,

                       16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20,

                       21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25,

                       26 => 26, 27 => 27, 28 => 28, 29 => 29, 30 => 30,

-                      31 => 31);

-    $valid_months = array( 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

+                      31 => 31, ];

+    $valid_months = [ 1 =>  1,  2 =>  2,  3 =>  3,  4 =>  4,  5 =>  5,

                          6 =>  6,  7 =>  7,  8 =>  8,  9 =>  9, 10 => 10,

-                        11 => 11, 12 => 12);

+                        11 => 11, 12 => 12, ];

     $current_year = (int) date('Y');

-    $valid_years = array($current_year => $current_year,

+    $valid_years = [$current_year => $current_year,

                        $current_year+1 => $current_year+1,

                        $current_year+2 => $current_year+2,

                        $current_year+3 => $current_year+3,

-                       $current_year+4 => $current_year+4);

+                       $current_year+4 => $current_year+4, ];

     $selected_day = date('d', $timestamp);

     $selected_month = date('m', $timestamp);

@@ -463,7 +463,7 @@ function html_datepicker($nameprefix, $timestamp)

 function get_modules_info()

 {

     $modules = config('modules');

-    $modconfig = array();

+    $modconfig = [];

     foreach ($modules as $name) {

         $modconfig[$name] = null;

         if (file_exists('modules/'.$name.'/module.info')) {

@@ -479,7 +479,7 @@ function send_mail($address, $subject, $body)

     if (strstr($subject, "\n") !== false) {

         die("Zeilenumbruch im subject!");

     }

-    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\nX-schokokeks-org-message: webinterface";

+    $header = "From: ".config('company_name')." Web Administration <".config('adminmail').">\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\nX-schokokeks-org-message: webinterface";

     $subject = mb_encode_mimeheader($subject, "utf-8", "Q");

     $body = quoted_printable_encode($body);

     mail($address, $subject, $body, $header);

@@ -479,8 +479,8 @@ function send_mail($address, $subject, $body)

     if (strstr($subject, "\n") !== false) {

         die("Zeilenumbruch im subject!");

     }

-    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable";

-    $subject = "=?UTF-8?Q?".quoted_printable_encode($subject)."?=";

+    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\nX-schokokeks-org-message: webinterface";

+    $subject = mb_encode_mimeheader($subject, "utf-8", "Q");

     $body = quoted_printable_encode($body);

     mail($address, $subject, $body, $header);

 }

@@ -479,7 +479,9 @@ function send_mail($address, $subject, $body)

     if (strstr($subject, "\n") !== false) {

         die("Zeilenumbruch im subject!");

     }

-    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: 8bit";

+    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable";

+    $subject = "=?UTF-8?Q?".quoted_printable_encode($subject)."?=";

+    $body = quoted_printable_encode($body);

     mail($address, $subject, $body, $header);

 }

@@ -473,6 +473,16 @@ function get_modules_info()

     return $modconfig;

 }

+

+function send_mail($address, $subject, $body)

+{

+    if (strstr($subject, "\n") !== false) {

+        die("Zeilenumbruch im subject!");

+    }

+    $header = "From: ".config('company_name')." Web Administration <noreply@".config('masterdomain').">\r\nReply-To: ".config('adminmail')."\r\nCc: ".config('adminmail')."\r\nContent-Type: text/plain; charset=\"utf-8\"\r\nContent-Transfer-Encoding: 8bit";

+    mail($address, $subject, $body, $header);

+}

+

 function handle_exception($e)

 {

     if (config('enable_debug')) {

@@ -422,8 +422,8 @@ function html_select($name, $options, $default='', $free='')

         if ($default == $key) {

             $selected = ' selected="selected" ';

         }

-        $key = filter_input_general($key);

-        $value = filter_input_general($value);

+        $key = filter_output_html($key);

+        $value = filter_output_html($value);

         $ret .= "  <option value=\"{$key}\"{$selected}>{$value}</option>\n";

     }

     $ret .= '</select>';

@@ -191,6 +191,10 @@ function logger($severity, $scriptname, $scope, $message)

 function count_failed_logins()

 {

+    if (config('logging') < LOG_WARNING) {

+        DEBUG("logging is disabled, no brute force check possible");

+        return;

+    }

     $result = db_query("SELECT count(*) AS num FROM misc.scriptlog WHERE user IS NULL AND scriptname='session/start' AND scope='login' AND message LIKE 'wrong user data%' AND remote=:remote AND `timestamp` > NOW() - INTERVAL 10 MINUTE", array(":remote" => $_SERVER['REMOTE_ADDR']));

     $data = $result->fetch();

     DEBUG('seen '.$data['num'].' failed logins from this address within 10 minutes');

@@ -472,8 +472,10 @@ function get_modules_info()

 function handle_exception($e)

 {

     if (config('enable_debug')) {

-        print_r($e->getMessage());

-        print_r(serialize($_POST));

+        print_r($e->getMessage()."<br>");

+        debug_print_backtrace();

+        echo("<br>");

+        print_r(serialize($_POST)."<br>");

         print_r(serialize($_SERVER));

     } else {

         $msg = "Exception caught:\n".$e->getMessage()."\n".serialize($_POST)."\n".serialize($_SERVER);

@@ -189,7 +189,8 @@ function logger($severity, $scriptname, $scope, $message)

     db_query("INSERT INTO misc.scriptlog (remote, user,scriptname,scope,message) VALUES (:remote, :user, :scriptname, :scope, :message)", $args);

 }

-function count_failed_logins() {

+function count_failed_logins()

+{

     $result = db_query("SELECT count(*) AS num FROM misc.scriptlog WHERE user IS NULL AND scriptname='session/start' AND scope='login' AND message LIKE 'wrong user data%' AND remote=:remote AND `timestamp` > NOW() - INTERVAL 10 MINUTE", array(":remote" => $_SERVER['REMOTE_ADDR']));

     $data = $result->fetch();

     DEBUG('seen '.$data['num'].' failed logins from this address within 10 minutes');

@@ -470,6 +470,12 @@ function get_modules_info()

 function handle_exception($e)

 {

-    $msg = "Exception caught:\n".$e->getMessage()."\n".serialize($_POST)."\n".serialize($_SERVER);

-    mail(config("adminmail"), "Exception on configinterface", $msg);

+    if (config('enable_debug')) {

+        print_r($e->getMessage());

+        print_r(serialize($_POST));

+        print_r(serialize($_SERVER));

+    } else {

+        $msg = "Exception caught:\n".$e->getMessage()."\n".serialize($_POST)."\n".serialize($_SERVER);

+        mail(config("adminmail"), "Exception on configinterface", $msg);

+    }

 }

@@ -189,6 +189,13 @@ function logger($severity, $scriptname, $scope, $message)

     db_query("INSERT INTO misc.scriptlog (remote, user,scriptname,scope,message) VALUES (:remote, :user, :scriptname, :scope, :message)", $args);

 }

+function count_failed_logins() {

+    $result = db_query("SELECT count(*) AS num FROM misc.scriptlog WHERE user IS NULL AND scriptname='session/start' AND scope='login' AND message LIKE 'wrong user data%' AND remote=:remote AND `timestamp` > NOW() - INTERVAL 10 MINUTE", array(":remote" => $_SERVER['REMOTE_ADDR']));

+    $data = $result->fetch();

+    DEBUG('seen '.$data['num'].' failed logins from this address within 10 minutes');

+    return $data['num'];

+}

+

 function html_header($arg)

 {

     global $html_header;

@@ -460,3 +460,9 @@ function get_modules_info()

     }

     return $modconfig;

 }

+

+function handle_exception($e)

+{

+    $msg = "Exception caught:\n".$e->getMessage()."\n".serialize($_POST)."\n".serialize($_SERVER);

+    mail(config("adminmail"), "Exception on configinterface", $msg);

+}

@@ -292,7 +292,7 @@ function generate_form_token($form_id)

 function check_form_token($form_id, $formtoken = null)

 {

-    if ($formtoken == null) {

+    if ($formtoken == null && isset($_REQUEST['formtoken'])) {

         $formtoken = $_REQUEST['formtoken'];

     }

     $sessid = session_id();

@@ -260,7 +260,8 @@ function are_you_sure($query_string, $question)

 function user_is_sure()

 {

     if (isset($_POST['really'])) {

-        if ($_POST['random_token'] == $_SESSION['are_you_sure_token']) {

+        if (array_key_exists('random_token', $_POST) &&

+            ($_POST['random_token'] == $_SESSION['are_you_sure_token'])) {

             return true;

         } else {

             system_failure("Possible Cross-site-request-forgery detected!");

@@ -300,6 +300,9 @@ function check_form_token($form_id, $formtoken = null)

         system_failure("Internal error! (Session not running)");

     }

+    if (! isset($_SESSION['session_token'])) {

+        $_SESSION['session_token'] = random_string(10);

+    }

     $correct_formtoken = hash('sha256', $sessid.$form_id.$_SESSION['session_token']);

     if (! ($formtoken == $correct_formtoken)) {

@@ -45,14 +45,14 @@ function config($key, $localonly = false)

     if (array_key_exists($key, $config)) {

         return $config[$key];

     }

-  

+

     if ($localonly) {

         return null;

     }

     /* read configuration from database */

     $result = db_query("SELECT `key`, value FROM misc.config");

-  

+

     while ($object = $result->fetch()) {

         if (!array_key_exists($object['key'], $config)) {

             $config[$object['key']]=$object['value'];

@@ -433,7 +433,7 @@ function html_datepicker($nameprefix, $timestamp)

                        $current_year+2 => $current_year+2,

                        $current_year+3 => $current_year+3,

                        $current_year+4 => $current_year+4);

-              

+

     $selected_day = date('d', $timestamp);

     $selected_month = date('m', $timestamp);

     $selected_year = date('Y', $timestamp);

@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely

 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

 http://creativecommons.org/publicdomain/zero/1.0/

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

@@ -19,57 +19,59 @@ require_once('inc/debug.php');

 function config($key, $localonly = false)

 {

-  global $config;

-

-  if ($key == "modules") {

-    // Stelle sicher, dass das "index"-Modul immer aktiv ist!

-    if (! in_array("index", $config['modules'])) {

-      $config['modules'][] = "index";

-    }

-    // Stelle sicher, dass das "about"-Modul immer aktiv ist!

-    if (! in_array("about", $config['modules'])) {

-      $config['modules'][] = "about";

+    global $config;

+

+    if ($key == "modules") {

+        // Stelle sicher, dass das "index"-Modul immer aktiv ist!

+        if (! in_array("index", $config['modules'])) {

+            $config['modules'][] = "index";

+        }

+        // Stelle sicher, dass das "about"-Modul immer aktiv ist!

+        if (! in_array("about", $config['modules'])) {

+            $config['modules'][] = "about";

+        }

     }

-  }

-  if ($key == 'modules' && isset($_SESSION['restrict_modules']))

-  {

-    $modules = array();

-    foreach ($config['modules'] as $mod)

-    {

-      if (in_array($mod, $_SESSION['restrict_modules']))

-        $modules[] = $mod;

+    if ($key == 'modules' && isset($_SESSION['restrict_modules'])) {

+        $modules = array();

+        foreach ($config['modules'] as $mod) {

+            if (in_array($mod, $_SESSION['restrict_modules'])) {

+                $modules[] = $mod;

+            }

+        }

+        return $modules;

     }

-    return $modules;

-  }

-  if (array_key_exists($key, $config))

-    return $config[$key];

+    if (array_key_exists($key, $config)) {

+        return $config[$key];

+    }

-  if ($localonly) {

-    return NULL;

-  }  

+    if ($localonly) {

+        return null;

+    }

-  /* read configuration from database */

-  $result = db_query( "SELECT `key`, value FROM misc.config" );

+    /* read configuration from database */

+    $result = db_query("SELECT `key`, value FROM misc.config");

-  while( $object = $result->fetch() ) {

-    if (!array_key_exists($object['key'], $config)) {

-	    $config[$object['key']]=$object['value'];

-    }

-  }

-  // Sonst wird das Passwort des webadmin-Users mit ausgegeben

-  $debug_config = $config;

-  unset($debug_config['db_pass']);

-  DEBUG($debug_config);

-  if (array_key_exists($key, $config))

-    return $config[$key];

-  else

-    logger(LOG_ERR, "inc/base", "config", "Request to read nonexistant config option »{$key}«.");

-    return NULL;

+    while ($object = $result->fetch()) {

+        if (!array_key_exists($object['key'], $config)) {

+            $config[$object['key']]=$object['value'];

+        }

+    }

+    // Sonst wird das Passwort des webadmin-Users mit ausgegeben

+    $debug_config = $config;

+    unset($debug_config['db_pass']);

+    DEBUG($debug_config);

+    if (array_key_exists($key, $config)) {

+        return $config[$key];

+    } else {

+        logger(LOG_ERR, "inc/base", "config", "Request to read nonexistant config option »{$key}«.");

+    }

+    return null;

 }

-function have_role($role) {

+function have_role($role)

+{

     $have = $_SESSION['role'] & $role;

     if ($have) {

         DEBUG("Current user has role ".$role);

@@ -79,76 +81,81 @@ function have_role($role) {

     return $have;

 }

-function get_server_by_id($id) {

-  $id = (int) $id;

-  $result = db_query("SELECT hostname FROM system.servers WHERE id=?", array($id));

-  $ret = $result->fetch();

-  return $ret['hostname'];

+function get_server_by_id($id)

+{

+    $id = (int) $id;

+    $result = db_query("SELECT hostname FROM system.servers WHERE id=?", array($id));

+    $ret = $result->fetch();

+    return $ret['hostname'];

 }

 function redirect($target)

 {

-  global $debugmode;

-  if ($target == '') {

-      $target = $_SERVER['REQUEST_URI'];

-  }

-  if (! $debugmode) {

-    header("Location: {$target}");

-  } else {

-      if (strpos($target, '?') === false) {

-        print 'REDIRECT: '.internal_link($target, $target);

-      } else {

-          list($file, $qs) = explode('?', $target, 2);

-          print 'REDIRECT: '.internal_link($file, $target, $qs);

-      }

-  }

-  die();

+    global $debugmode;

+    if ($target == '') {

+        $target = $_SERVER['REQUEST_URI'];

+    }

+    if (! $debugmode) {

+        header("Location: {$target}");

+    } else {

+        if (strpos($target, '?') === false) {

+            print 'REDIRECT: '.internal_link($target, $target);

+        } else {

+            list($file, $qs) = explode('?', $target, 2);

+            print 'REDIRECT: '.internal_link($file, $target, $qs);

+        }

+    }

+    die();

 }

 function my_server_id()

 {

-  $uid = (int) $_SESSION['userinfo']['uid'];

-  $result = db_query("SELECT server FROM system.useraccounts WHERE uid=?", array($uid));

-  $r = $result->fetch();

-  DEBUG($r);

-  return $r['server'];

+    $uid = (int) $_SESSION['userinfo']['uid'];

+    $result = db_query("SELECT server FROM system.useraccounts WHERE uid=?", array($uid));

+    $r = $result->fetch();

+    DEBUG($r);

+    return $r['server'];

 }

 function additional_servers()

 {

-  $uid = (int) $_SESSION['userinfo']['uid'];

-  $result = db_query("SELECT server FROM system.user_server WHERE uid=?", array($uid));

-  $servers = array();

-  while ($s = $result->fetch())

-    $servers[] = $s['server'];

-  DEBUG($servers);

-  return $servers;

+    $uid = (int) $_SESSION['userinfo']['uid'];

+    $result = db_query("SELECT server FROM system.user_server WHERE uid=?", array($uid));

+    $servers = array();

+    while ($s = $result->fetch()) {

+        $servers[] = $s['server'];

+    }

+    DEBUG($servers);

+    return $servers;

 }

 function server_names()

 {

-  $result = db_query("SELECT id, hostname FROM system.servers");

-  $servers = array();

-  while ($s = $result->fetch())

-    $servers[$s['id']] = $s['hostname'];

-  DEBUG($servers);

-  return $servers;

+    $result = db_query("SELECT id, hostname FROM system.servers");

+    $servers = array();

+    while ($s = $result->fetch()) {

+        $servers[$s['id']] = $s['hostname'];

+    }

+    DEBUG($servers);

+    return $servers;

 }

 function maybe_null($value)

 {

-  if (! $value)

-    return NULL;

+    if (! $value) {

+        return null;

+    }

-  if (strlen( (string) $value ) > 0)

-    return (string) $value;

-  else

-    return NULL;

+    if (strlen((string) $value) > 0) {

+        return (string) $value;

+    } else {

+        return null;

+    }

 }

@@ -158,51 +165,52 @@ function maybe_null($value)

 function logger($severity, $scriptname, $scope, $message)

 {

-  if (config('logging') < $severity) {

-    DEBUG("NOT LOGGING $scriptname:$scope:$message");

-    return;

-  }

-

-  DEBUG("LOGGING $scriptname:$scope:$message");

-  $user = NULL;

-  if (array_key_exists("role", $_SESSION)) {

-    if ($_SESSION['role'] & ROLE_SYSTEMUSER)

-      $user = $_SESSION['userinfo']['username'];

-    elseif ($_SESSION['role'] & ROLE_CUSTOMER)

-      $user = $_SESSION['customerinfo']['customerno'];

-  }

-

-  $args = array(":user" => $user,

+    if (config('logging') < $severity) {

+        DEBUG("NOT LOGGING $scriptname:$scope:$message");

+        return;

+    }

+

+    DEBUG("LOGGING $scriptname:$scope:$message");

+    $user = null;

+    if (array_key_exists("role", $_SESSION)) {

+        if ($_SESSION['role'] & ROLE_SYSTEMUSER) {

+            $user = $_SESSION['userinfo']['username'];

+        } elseif ($_SESSION['role'] & ROLE_CUSTOMER) {

+            $user = $_SESSION['customerinfo']['customerno'];

+        }

+    }

+

+    $args = array(":user" => $user,

                 ":remote" => $_SERVER['REMOTE_ADDR'],

                 ":scriptname" => $scriptname,

                 ":scope" => $scope,

                 ":message" => $message);

-  db_query("INSERT INTO misc.scriptlog (remote, user,scriptname,scope,message) VALUES (:remote, :user, :scriptname, :scope, :message)", $args);

+    db_query("INSERT INTO misc.scriptlog (remote, user,scriptname,scope,message) VALUES (:remote, :user, :scriptname, :scope, :message)", $args);

 }

 function html_header($arg)

 {

-  global $html_header;

-  $html_header .= $arg;

+    global $html_header;

+    $html_header .= $arg;

 }

 function title($arg)

 {

-  global $title;

-  $title = $arg;

+    global $title;

+    $title = $arg;

 }

 function headline($arg)

 {

-  global $headline;

-  $headline = $arg;

+    global $headline;

+    $headline = $arg;

 }

 function output($arg)

 {

-  global $output;

-  $output .= $arg;

+    global $output;

+    $output .= $arg;

 }

 function footnote($explaination)

@@ -213,7 +221,7 @@ function footnote($explaination)

     }

     $fnid = array_search($explaination, $footnotes);

     DEBUG($footnotes);

-    if ($fnid === FALSE) {

+    if ($fnid === false) {

         DEBUG("Footnote »{$explaination}« is not in footnotes!");

         $footnotes[] = $explaination;

     }

@@ -221,20 +229,20 @@ function footnote($explaination)

     return str_repeat('*', ($fnid+1));

 }

-function random_string($len) 

+function random_string($len)

 {

-  $s = str_replace('+', '.', base64_encode(random_bytes(ceil($len*3/4))));

-  return substr($s, 0, $len);

+    $s = str_replace('+', '.', base64_encode(random_bytes(ceil($len*3/4))));

+    return substr($s, 0, $len);

 }

 function are_you_sure($query_string, $question)

 {

-  $query_string = encode_querystring($query_string);

-  $token = random_string(20);

-  $_SESSION['are_you_sure_token'] = $token;

-  title('Sicherheitsabfrage');

-  output("

+    $query_string = encode_querystring($query_string);

+    $token = random_string(20);

+    $_SESSION['are_you_sure_token'] = $token;

+    title('Sicherheitsabfrage');

+    output("

     <form action=\"{$query_string}\" method=\"post\">

     <div class=\"confirmation\">

       <div class=\"question\">{$question}</div>

@@ -245,68 +253,68 @@ function are_you_sure($query_string, $question)

         <input type=\"submit\" name=\"not_really\" value=\"Nein\" />

       </p>

     </div>");

-  output("</form>\n");

+    output("</form>\n");

 }

 function user_is_sure()

 {

-  if (isset($_POST['really']))

-  {

-    if ($_POST['random_token'] == $_SESSION['are_you_sure_token'])

-      return true;

-    else

-      system_failure("Possible Cross-site-request-forgery detected!");

-  }

-  elseif (isset($_POST['not_really']))

-    return false;

-  else

-    return NULL;

+    if (isset($_POST['really'])) {

+        if ($_POST['random_token'] == $_SESSION['are_you_sure_token']) {

+            return true;

+        } else {

+            system_failure("Possible Cross-site-request-forgery detected!");

+        }

+    } elseif (isset($_POST['not_really'])) {

+        return false;

+    } else {

+        return null;

+    }

 }

 function generate_form_token($form_id)

 {

-  require_once("inc/debug.php");

-  $sessid = session_id();

-  if ($sessid == "") 

-  {

-    DEBUG("Uh? Session not running? Wtf?");

-    system_failure("Internal error!");

-  }

-  if (! isset($_SESSION['session_token'])) {

-    $_SESSION['session_token'] = random_string(10);

-  }

-  return hash('sha256', $sessid.$form_id.$_SESSION['session_token']);

+    require_once("inc/debug.php");

+    $sessid = session_id();

+    if ($sessid == "") {

+        DEBUG("Uh? Session not running? Wtf?");

+        system_failure("Internal error!");

+    }

+    if (! isset($_SESSION['session_token'])) {

+        $_SESSION['session_token'] = random_string(10);

+    }

+    return hash('sha256', $sessid.$form_id.$_SESSION['session_token']);

 }

-function check_form_token($form_id, $formtoken = NULL)

+function check_form_token($form_id, $formtoken = null)

 {

-  if ($formtoken == NULL)

-    $formtoken = $_REQUEST['formtoken'];

-  $sessid = session_id();

-  if ($sessid == "") 

-  {

-    DEBUG("Uh? Session not running? Wtf?");

-    system_failure("Internal error! (Session not running)");

-  }

-

-  $correct_formtoken = hash('sha256', $sessid.$form_id.$_SESSION['session_token']);

-

-  if (! ($formtoken == $correct_formtoken))

-    system_failure("Possible cross-site-request-forgery!");

+    if ($formtoken == null) {

+        $formtoken = $_REQUEST['formtoken'];

+    }

+    $sessid = session_id();

+    if ($sessid == "") {

+        DEBUG("Uh? Session not running? Wtf?");

+        system_failure("Internal error! (Session not running)");

+    }

+

+    $correct_formtoken = hash('sha256', $sessid.$form_id.$_SESSION['session_token']);

+

+    if (! ($formtoken == $correct_formtoken)) {

+        system_failure("Possible cross-site-request-forgery!");

+    }

 }

 function have_module($modname)

 {

-  return in_array($modname, config('modules'));

+    return in_array($modname, config('modules'));

 }

-function use_module($modname) 

+function use_module($modname)

 {

     global $prefix, $needed_modules;

     if (! isset($needed_modules)) {

@@ -320,35 +328,37 @@ function use_module($modname)

         system_failure("Soll nicht verfügbares Modul laden!");

     }

     /* setup module include path */

-    ini_set('include_path',ini_get('include_path').':./modules/'.$modname.'/include:');

+    ini_set('include_path', ini_get('include_path').':./modules/'.$modname.'/include:');

     $style = 'modules/'.$modname.'/style.css';

     if (file_exists($style)) {

         html_header('<link rel="stylesheet" href="'.$prefix.$style.'" type="text/css" />'."\n");

     }

-

 }

 function encode_querystring($querystring)

 {

-  global $debugmode;

-  if ($debugmode)

-    $querystring = 'debug&'.$querystring;

-  $query = explode('&', $querystring);

-  $new_query = array();

-  foreach ($query AS $item)

-    if ($item != '')

-    {

-      $split = explode('=', $item, 2);

-      if (count($split) == 1)

-        $new_query[] = $split[0];

-      else

-        $new_query[] = $split[0].'='.urlencode($split[1]);

-    }

-  $querystring = implode('&', $new_query);

-  if ($querystring)

-    $querystring = '?'.$querystring;

-  return $querystring;

+    global $debugmode;

+    if ($debugmode) {

+        $querystring = 'debug&'.$querystring;

+    }

+    $query = explode('&', $querystring);

+    $new_query = array();

+    foreach ($query as $item) {

+        if ($item != '') {

+            $split = explode('=', $item, 2);

+            if (count($split) == 1) {

+                $new_query[] = $split[0];

+            } else {

+                $new_query[] = $split[0].'='.urlencode($split[1]);

+            }

+        }

+    }

+    $querystring = implode('&', $new_query);

+    if ($querystring) {

+        $querystring = '?'.$querystring;

+    }

+    return $querystring;

 }

@@ -360,94 +370,89 @@ function beta_notice()

 function addnew($file, $label, $querystring = '', $attribs = '')

 {