webinterface.git

@@ -103,7 +103,7 @@ if ($_SESSION['role'] != ROLE_ANONYMOUS && isset($_REQUEST['record']) && isset($

             $role = find_role($uid, '', true);

             setup_session($role, $uid);

             DEBUG("Set Cookie!");

-            setcookie('CLIENTCERT_AUTOLOGIN', '1', array('expires'=>strtotime("+ 1 year"), 'path'=>'/', 'secure'=>true, 'httponly'=>true, 'samesite'=>'Lax'));

+            setcookie('CLIENTCERT_AUTOLOGIN', '1', ['expires'=>strtotime("+ 1 year"), 'path'=>'/', 'secure'=>true, 'httponly'=>true, 'samesite'=>'Lax']);

             $destination = 'go/index/index';

             if (check_path($ret[0]['startpage'])) {

                 $destination = $ret[0]['startpage'];

@@ -32,7 +32,7 @@ class DB extends PDO

         }

         $username = config('db_user', true);

         $password = config('db_pass', true);

-        parent::__construct($dsn, $username, $password, array(PDO::ATTR_TIMEOUT => "30"));

+        parent::__construct($dsn, $username, $password, [PDO::ATTR_TIMEOUT => "30"]);

     }

@@ -20,7 +20,7 @@ require_once('inc/debug.php');

 class Domain

 {

-    protected $data = array();

+    protected $data = [];

     public function __construct($init = null)

     {

         $this->setup();

@@ -61,7 +61,7 @@ class Domain

     public function loadByID($id)

     {

-        $res = db_query("SELECT * FROM kundendaten.domains WHERE id=?", array($id));

+        $res = db_query("SELECT * FROM kundendaten.domains WHERE id=?", [$id]);

         if ($res->rowCount() < 1) {

             return false;

         }

@@ -73,7 +73,7 @@ class Domain

     {

         $raw = $name;

         $utf8 = idn_to_utf8($raw, 0, INTL_IDNA_VARIANT_UTS46);

-        $res = db_query("SELECT * FROM kundendaten.domains WHERE CONCAT_WS('.', domainname, tld)=? OR CONCAT_WS('.', domainname, tld)=?", array($raw, $utf8));

+        $res = db_query("SELECT * FROM kundendaten.domains WHERE CONCAT_WS('.', domainname, tld)=? OR CONCAT_WS('.', domainname, tld)=?", [$raw, $utf8]);

         if ($res->rowCount() < 1) {

             return false;

         }

@@ -115,7 +115,7 @@ class Domain

     public function setup()

     {

-        $fields = array();

+        $fields = [];

         $res = db_query("DESCRIBE kundendaten.domains");

         while ($f = $res->fetch(PDO::FETCH_OBJ)) {

             $fields[$f->Field] = $f->Default;

@@ -163,8 +163,8 @@ function get_domain_list($customerno = null, $uid = null)

         $query .= " kunde={$customerno}";

     }

     $query .= " ORDER BY domainname,tld";

-    $result = db_query($query, array()); // FIXME Übergebe leeren array um die Warnung zu unterdrücken

-    $domains = array();

+    $result = db_query($query, []); // FIXME Übergebe leeren array um die Warnung zu unterdrücken

+    $domains = [];

     DEBUG('Result set is '.$result->rowCount()." rows.<br />\n");

     if ($result->rowCount() > 0) {

         while ($domain = $result->fetch(PDO::FETCH_OBJ)) {

@@ -184,7 +184,7 @@ function get_jabberable_domains()

     $domains = get_domain_list($customerno);

     DEBUG($domains);

-    $result = array( new Domain() );

+    $result = [ new Domain() ];

     $result[0]->id = 0;

     $result[0]->fqdn = config('masterdomain');

     foreach ($domains as $dom) {

@@ -15,7 +15,7 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 */

 global $config;

-$config = array();

+$config = [];

 // either...

 $config['db_socket'] = '/var/run/mysqld/mysqld-sys.sock';

@@ -28,7 +28,7 @@ $config['db_user'] = 'username';

 $config['db_pass'] = 'password';

-$config['modules'] = array("index", "domains", "imap", "mysql", "jabber", "vhosts", "register", "systemuser", "su");

+$config['modules'] = ["index", "domains", "imap", "mysql", "jabber", "vhosts", "register", "systemuser", "su"];

 $config['enable_debug'] = true;

 $config['logging'] = LOG_ERR;

@@ -43,7 +43,7 @@ DEBUG($go);

 if (strstr($go, "..") or strstr($go, "./") or strstr($go, ":") or (! file_exists("modules/$go.php")) or (! is_file("modules/$go.php"))) {

     die("illegal command");

 }

-list($module, $page) = explode('/', $go, 2);

+[$module, $page] = explode('/', $go, 2);

 $page = str_replace('/', '-', $page);

 if (! in_array($module, config('modules'))) {

     die("inactive module");

@@ -28,7 +28,7 @@ function api_request($method, $input_data)

     curl_setopt($curl, CURLOPT_POST, 1);

     curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);

     curl_setopt($curl, CURLOPT_POSTFIELDS, $json);

-    curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));

+    curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);

     $result = curl_exec($curl);

     if ($result === false) {

         system_failure("API-Anfrage kaputt");

@@ -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')) {

@@ -31,7 +31,7 @@ function input_error($reason)

 {

     global $input_error;

     if (!isset($input_error)) {

-        $input_error = array();

+        $input_error = [];

     }

     array_push($input_error, $reason);

 }

@@ -39,7 +39,7 @@ function input_error($reason)

 function warning($msg)

 {

     if (!isset($_SESSION['warning'])) {

-        $_SESSION['warning'] = array();

+        $_SESSION['warning'] = [];

     }

     array_push($_SESSION['warning'], $msg);

     $backtrace = debug_backtrace();

@@ -49,7 +49,7 @@ function warning($msg)

 function success_msg($msg)

 {

     if (!isset($_SESSION['success_msg'])) {

-        $_SESSION['success_msg'] = array();

+        $_SESSION['success_msg'] = [];

     }

     array_push($_SESSION['success_msg'], $msg);

 }

@@ -116,7 +116,7 @@ function show_messages()

 function require_role($roles)

 {

     if (! is_array($roles)) {

-        $roles = array($roles);

+        $roles = [$roles];

     }

     $allow = false;

     foreach ($roles as $role) {

@@ -29,7 +29,7 @@ if (! defined('__JQUERY_INCLUDED')) {

 function javascript($file = null, $module = null)

 {

     global $go, $prefix;

-    list($mod, $page) = explode('/', $go, 2);

+    [$mod, $page] = explode('/', $go, 2);

     if (! $file) {

         $file = $page.'.js';

     }

@@ -18,7 +18,7 @@ require_once('inc/error.php');

 require_once('vendor/autoload.php');

-function strong_password($password, $user = array())

+function strong_password($password, $user = [])

 {

     $pwcheck = config('pwcheck');

     $result = null;

@@ -18,7 +18,7 @@ function show_page($path = null)

 {

     global $prefix, $go, $title, $headline, $output, $module, $page, $html_header, $footnotes;

-    $styles = array();

+    $styles = [];

     if (file_exists("modules/{$module}/style.css")) {

         $styles[] = "modules/{$module}/style.css";

     }

@@ -33,7 +33,7 @@ function show_page($path = null)

         $theme = 'default';

     }

     $theme_path = "themes/$theme/";

-    $candidates = array();

+    $candidates = [];

     if ($page) {

         $candidates[] = "{$theme_path}page-$module-$page.tpl.php";

     }

@@ -21,10 +21,10 @@ if (! defined("TOP_INCLUDED")) {

     require_once("inc/debug.php");

     global $prefix, $section;

-    $menuitem = array();

-    $weighted_menuitem = array();

+    $menuitem = [];

+    $weighted_menuitem = [];

-    $submenu = array();

+    $submenu = [];

     foreach (config('modules') as $module) {

         $menu = false;

@@ -44,15 +44,15 @@ if (! defined("TOP_INCLUDED")) {

             $weight = $menu[$key]["weight"];

             if (isset($menu[$key]['submenu'])) {

                 if (isset($submenu[$menu[$key]['submenu']][$weight])) {

-                    $submenu[$menu[$key]['submenu']][$weight] = array_merge($submenu[$menu[$key]['submenu']][$weight], array($key => $menu[$key]));

+                    $submenu[$menu[$key]['submenu']][$weight] = array_merge($submenu[$menu[$key]['submenu']][$weight], [$key => $menu[$key]]);

                 } else {

-                    $submenu[$menu[$key]['submenu']][$weight] = array($key => $menu[$key]);

+                    $submenu[$menu[$key]['submenu']][$weight] = [$key => $menu[$key]];

                 }

             } else {

                 if (array_key_exists($weight, $weighted_menuitem)) {

-                    $weighted_menuitem[$weight] = array_merge($weighted_menuitem[$weight], array($key => $menu[$key]));

+                    $weighted_menuitem[$weight] = array_merge($weighted_menuitem[$weight], [$key => $menu[$key]]);

                 } else {

-                    $weighted_menuitem[$weight] = array($key => $menu[$key]);

+                    $weighted_menuitem[$weight] = [$key => $menu[$key]];

                 }

             }

         }

@@ -37,7 +37,7 @@ if (! $data) {

 }

 $users = list_useraccounts();

-$userselect = array();

+$userselect = [];

 foreach ($users as $u) {

     $userselect[$u['uid']] = $u['username'].' / '.$u['name'];

 }

@@ -36,17 +36,17 @@ function get_domain_offer($domainname)

     $cid = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT id FROM kundendaten.domains WHERE domainname=:domainname AND tld=:tld", array("domainname" => $basename, "tld" => $tld));

+    $result = db_query("SELECT id FROM kundendaten.domains WHERE domainname=:domainname AND tld=:tld", ["domainname" => $basename, "tld" => $tld]);

     if ($result->rowCount() != 0) {

         warning('Diese Domain ist in unserem System bereits vorhanden und kann daher nicht noch einmal eingetragen werden.');

         return;

     }

-    $data = array("domainname" => $domainname, "basename" => $basename, "tld" => $tld);

+    $data = ["domainname" => $domainname, "basename" => $basename, "tld" => $tld];

-    $result = db_query("SELECT tld, gebuehr, setup FROM misc.domainpreise_kunde WHERE kunde=:cid AND tld=:tld AND ruecksprache='N'", array(":cid" => $cid, ":tld" => $tld));

+    $result = db_query("SELECT tld, gebuehr, setup FROM misc.domainpreise_kunde WHERE kunde=:cid AND tld=:tld AND ruecksprache='N'", [":cid" => $cid, ":tld" => $tld]);

     if ($result->rowCount() != 1) {

-        $result = db_query("SELECT tld, gebuehr, setup FROM misc.domainpreise WHERE tld=:tld AND ruecksprache='N'", array(":tld" => $tld));

+        $result = db_query("SELECT tld, gebuehr, setup FROM misc.domainpreise WHERE tld=:tld AND ruecksprache='N'", [":tld" => $tld]);

     }

     if ($result->rowCount() != 1) {

         warning('Die Endung »'.$tld.'« steht zur automatischen Eintragung nicht zur Verfügung.');

@@ -89,10 +89,10 @@ function register_domain($domainname, $uid)

         system_failure('Kein User gesetzt');

     }

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

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

                 ":useraccount" => $useraccount,

                 ":basename" => $data['basename'],

-                ":tld" => $data['tld']);

+                ":tld" => $data['tld'], ];

     db_query("INSERT INTO kundendaten.domains (kunde, useraccount, domainname, tld, billing, registrierungsdatum, dns,webserver, mail) VALUES ".

            "(:cid, :useraccount, :basename, :tld, 'regular', NULL, 1, 1, 'auto') ", $args);

     $domid = db_insert_id();

@@ -107,8 +107,8 @@ function register_domain($domainname, $uid)

 function list_useraccounts()

 {

     $customerno = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT uid,username,name FROM system.useraccounts WHERE kunde=?", array($customerno));

-    $ret = array();

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

+    $ret = [];

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

         $ret[] = $item;

     }

@@ -20,7 +20,7 @@ require_once('inc/api.php');

 function api_domain_available($domainname)

 {

-    $args = array("domainNames" => array($domainname));

+    $args = ["domainNames" => [$domainname]];

     $result = api_request('domainStatus', $args);

     $resp = $result["responses"][0];

     return ($resp["status"] == "available");

@@ -18,5 +18,5 @@ $role = $_SESSION['role'];

 if ($role & ROLE_CUSTOMER) {

-    $menu["adddomain_search"] = array("label" => "Domain hinzufügen", "file" => "search", "weight" => 0, "submenu" => "domains_domains");

+    $menu["adddomain_search"] = ["label" => "Domain hinzufügen", "file" => "search", "weight" => 0, "submenu" => "domains_domains"];

 }

@@ -2,5 +2,5 @@

 $role = $_SESSION['role'];

 if ($role & ROLE_SYSADMIN) {

-    $menu["buchhaltung_report"] = array("label" => "Report", "file" => "report", "weight" => -10);

+    $menu["buchhaltung_report"] = ["label" => "Report", "file" => "report", "weight" => -10];

 }

@@ -11,15 +11,15 @@ if (isset($_GET['year'])) {

 }

 $typeresult = db_query("SELECT id, description, investment FROM buchhaltung.types");

-$dataresult = db_query("SELECT id, date, description, invoice_id, direction, type, amount, tax_rate, gross FROM buchhaltung.transactions WHERE date BETWEEN :from and :to ORDER BY date", array(":from" => $year."-01-01", ":to" => $year."-12-31"));

+$dataresult = db_query("SELECT id, date, description, invoice_id, direction, type, amount, tax_rate, gross FROM buchhaltung.transactions WHERE date BETWEEN :from and :to ORDER BY date", [":from" => $year."-01-01", ":to" => $year."-12-31"]);

-$types = array();

-$data_by_type = array();

-$sum_by_type = array();

-$investment_types = array();

+$types = [];

+$data_by_type = [];

+$sum_by_type = [];

+$investment_types = [];

 while ($t = $typeresult->fetch()) {

     $types[$t['id']] = $t['description'];

-    $data_by_type[$t['id']] = array();

+    $data_by_type[$t['id']] = [];

     $sum_by_type[$t['id']] = 0.0;

     if ($t['investment'] == 1) {

         $investment_types[$t['id']] = $t;

@@ -35,9 +35,9 @@ output("Journal für $year (01.01.$year-31.12.$year, gruppiert nach Buchungskont

 DEBUG($types);

 DEBUG($investment_types);

-$net_by_type = array(0 => array(-1 => array(), 0 => array(), 19 => array()));

+$net_by_type = [0 => [-1 => [], 0 => [], 19 => []]];

 $umsatzsteuer = 0.0;

-$ustbetraege = array();

+$ustbetraege = [];

 $vorsteuer = 0.0;

 foreach ($types as $id => $t) {

     if (count($data_by_type[$id]) == 0 || $t=='Privatentnahme') {

@@ -8,10 +8,10 @@ $title = 'Report';

 $year = date("Y")-1;

 $typeresult = db_query("SELECT id, description FROM buchhaltung.types");

-$dataresult = db_query("SELECT id, date, description, invoice_id, direction, type, amount, tax_rate, gross FROM buchhaltung.transactions WHERE date BETWEEN :from and :to ORDER BY date", array(":from" => $year."-01-01", ":to" => $year."-12-31"));

+$dataresult = db_query("SELECT id, date, description, invoice_id, direction, type, amount, tax_rate, gross FROM buchhaltung.transactions WHERE date BETWEEN :from and :to ORDER BY date", [":from" => $year."-01-01", ":to" => $year."-12-31"]);

-$types = array();

-$data = array();

+$types = [];

+$data = [];

 while ($t = $typeresult->fetch()) {

     $types[$t['id']] = $t['description'];

 }

@@ -17,8 +17,8 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('contacts.php');

 if (isset($_GET['q']) || isset($_GET['id'])) {

-    $result = array("status" => "notfound",

-                    "id" => null);

+    $result = ["status" => "notfound",

+                    "id" => null, ];

     $id = null;

     if (isset($_GET['q'])) {

         $id = search_pgp_key($_GET['q']);

@@ -22,7 +22,7 @@ javascript();

 require_once('session/start.php');

-require_role(array(ROLE_CUSTOMER));

+require_role([ROLE_CUSTOMER]);

 $section = 'contacts_list';

 $new = false;

@@ -21,7 +21,7 @@ require_once('inc/api.php');

 function contact_to_apicontact($c)

 {

-    $ac = array();

+    $ac = [];

     $ac['id'] = $c['nic_id'];

     $ac['handle'] = $c['nic_handle'];

     $ac['type'] = 'person';

@@ -65,13 +65,13 @@ function apicontact_to_contact($ac)

 function download_contact($nic_id)

 {

-    $data = array("contactId" => $nic_id);

+    $data = ["contactId" => $nic_id];

     $result = api_request('contactInfo', $data);

     if ($result['status'] != 'success') {

         system_failure("Abfrage nicht erfolgreich!");

     }

     $c = apicontact_to_contact($result['response']);

-    $result = db_query("SELECT id FROM kundendaten.contacts WHERE nic_id=?", array($nic_id));

+    $result = db_query("SELECT id FROM kundendaten.contacts WHERE nic_id=?", [$nic_id]);

     if ($result->rowCount() > 0) {

         $data = $result->fetch();

         $c['id'] = $data['id'];

@@ -87,15 +87,15 @@ function upload_contact($c)

     $ac = contact_to_apicontact($c);

     if ($ac['id'] || $ac['handle']) {

         // Update

-        $data = array("contact" => $ac,

-                "actingAs" => "designatedAgent");

+        $data = ["contact" => $ac,

+                "actingAs" => "designatedAgent", ];

         $result = api_request('contactUpdate', $data);

         if ($result['status'] != 'success') {

             system_failure("Es gab ein Problem beim Hochladen der Adresse zum Domainregistrar. Das sollte nicht sein!");

         }

     } else {

         // create

-        $data = array("contact" => $ac);

+        $data = ["contact" => $ac];

         $result = api_request('contactCreate', $data);

         if ($result['status'] == 'success') {

             $c['nic_handle'] = $result['response']['handle'];

@@ -17,7 +17,7 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('inc/debug.php');

 require_once('inc/icons.php');

 require_once('inc/security.php');

-require_role(array(ROLE_CUSTOMER));

+require_role([ROLE_CUSTOMER]);

 require_once('class/domain.php');

 require_once('contactapi.php');

@@ -25,7 +25,7 @@ require_once('contactapi.php');

 function new_contact()

 {

-    return array("id" => null,

+    return ["id" => null,

         "state" => null,

         "lastchange" => time(),

         "nic_handle" => null,

@@ -43,7 +43,7 @@ function new_contact()

         "email" => null,

         "pgp_id" => null,

         "pgp_key" => null,

-        "customer" => $_SESSION['customerinfo']['customerno']);

+        "customer" => $_SESSION['customerinfo']['customerno'], ];

 }

@@ -53,9 +53,9 @@ function get_contact($id, $customer = null)

     if ($customer != null && have_role(ROLE_SYSADMIN)) {

         $c = $customer;

     }

-    $args = array(

+    $args = [

         "cid" => (int) $c,

-        "id" => (int) $id);

+        "id" => (int) $id, ];

     $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, salutation, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE id=:id AND customer=:cid", $args);

     if ($result->rowCount() == 0) {

         DEBUG("Soll Kontakt #".$id." laden, MySQL lieferte aber keine Daten");

@@ -68,8 +68,8 @@ function get_contact($id, $customer = null)

 function get_contacts()

 {

     $cid = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, salutation, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE (state<>'deleted' OR state IS NULL) AND customer=? ORDER BY COALESCE(company, name)", array($cid));

-    $ret = array();

+    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, salutation, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE (state<>'deleted' OR state IS NULL) AND customer=? ORDER BY COALESCE(company, name)", [$cid]);

+    $ret = [];

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

         $ret[$contact['id']] = $contact;

     }

@@ -81,7 +81,7 @@ function get_contacts()

 function is_domainholder($contactid)

 {

     $contactid = (int) $contactid;

-    $result = db_query("SELECT id FROM kundendaten.domains WHERE owner=? OR admin_c=?", array($contactid, $contactid));

+    $result = db_query("SELECT id FROM kundendaten.domains WHERE owner=? OR admin_c=?", [$contactid, $contactid]);

     if ($result->rowCount() > 0) {

         return true;

     }

@@ -91,7 +91,7 @@ function is_domainholder($contactid)

 function possible_domainholders()

 {

     $allcontacts = get_contacts();

-    $ret = array();

+    $ret = [];

     foreach ($allcontacts as $id => $c) {

         if (possible_domainholder($c)) {

             $ret[$id] = $c;

@@ -111,7 +111,7 @@ function possible_domainholder($c)

 function have_mailaddress($email)

 {

     $cid = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT id FROM kundendaten.contacts WHERE customer=? AND email=?", array($cid, $email));

+    $result = db_query("SELECT id FROM kundendaten.contacts WHERE customer=? AND email=?", [$cid, $email]);

     if ($result->rowCount() > 0) {

         return true;

     }

@@ -134,10 +134,10 @@ function set_kundenkontakt($typ, $id)

     } else {

         $id = (int) $id;

     }

-    $args = array(

+    $args = [

         "kunde" => (int) $_SESSION['customerinfo']['customerno'],

-        "contact" => $id

-        );

+        "contact" => $id,

+        ];

     $field = null;

     if ($typ == 'kunde') {

         $field = 'contact_kunde';

@@ -166,7 +166,7 @@ function sync_legacy_contactdata()

         $vorname = explode(' ', $kunde['name'], 2)[0];

         $nachname = explode(' ', $kunde['name'], 2)[1];

     }

-    $args = array("firma" => $kunde['company'],

+    $args = ["firma" => $kunde['company'],

             "anrede" => $kunde['salutation'],

             "vorname" => $vorname,

             "nachname" => $nachname,

@@ -180,25 +180,25 @@ function sync_legacy_contactdata()

             "email" => $kunde['email'],

             "pgp_id" => $kunde['pgp_id'],

             "pgp_key" => $kunde['pgp_key'],

-            "cid" => $cid);

+            "cid" => $cid, ];

     db_query("UPDATE kundendaten.kunden SET anrede=:anrede, firma=:firma, vorname=:vorname, nachname=:nachname, adresse=:adresse,

             plz=:plz, ort=:ort, land=:land, telefon=:telefon, mobile=:mobile, telefax=:telefax, email=:email, 

             pgp_id=:pgp_id, pgp_key=:pgp_key WHERE id=:cid", $args);

     if ($kundenkontakte['extern']) {

         $extern = get_contact($kundenkontakte['extern'])['email'];

         if ($extern) {

-            db_query("UPDATE kundendaten.kunden SET email_extern=? WHERE id=?", array($extern, $cid));

+            db_query("UPDATE kundendaten.kunden SET email_extern=? WHERE id=?", [$extern, $cid]);

         }

     }

     if ($kundenkontakte['rechnung']) {

         $kunde = get_contact($kundenkontakte['rechnung']);

-        $args = array("firma" => $kunde['company'],

+        $args = ["firma" => $kunde['company'],

                 "name" => $kunde['name'],

                 "adresse" => $kunde['address'],

                 "plz" => $kunde['zip'],

                 "ort" => $kunde['city'],

                 "email" => $kunde['email'],

-                "cid" => $cid);

+                "cid" => $cid, ];

         db_query("UPDATE kundendaten.kunden SET re_firma=:firma, re_name=:name, re_adresse=:adresse,

                 re_plz=:plz, re_ort=:ort, email_rechnung=:email WHERE id=:cid", $args);

     }

@@ -211,21 +211,21 @@ function get_kundenkontakte($customer = null)

     if ($customer and have_role(ROLE_SYSADMIN)) {

         $cid = (int) $customer;

     }

-    $result = db_query("SELECT contact_kunde, contact_extern, contact_rechnung, contact_dataprotection FROM kundendaten.kunden WHERE id=?", array($cid));

+    $result = db_query("SELECT contact_kunde, contact_extern, contact_rechnung, contact_dataprotection FROM kundendaten.kunden WHERE id=?", [$cid]);

     $res = $result->fetch();

-    $ret = array("kunde" => $res['contact_kunde'],

+    $ret = ["kunde" => $res['contact_kunde'],

                  "extern" => $res['contact_extern'],

                  "rechnung" => $res['contact_rechnung'],

-                 "dataprotection" => $res['contact_dataprotection']);

+                 "dataprotection" => $res['contact_dataprotection'], ];

     return $ret;

 }

 function save_emailaddress($id, $email)

 {

     // Speichert eine E-Mail-Adresse direkt, z.B. wenn diese schonmal geprüft wurde

-    $args = array("cid" => (int) $_SESSION['customerinfo']['customerno'],

+    $args = ["cid" => (int) $_SESSION['customerinfo']['customerno'],

         "id" => (int) $id,

-        "email" => $email);

+        "email" => $email, ];

     db_query("UPDATE kundendaten.contacts SET email=:email WHERE id=:id AND customer=:cid", $args);

 }

@@ -263,9 +263,9 @@ function send_emailchange_token($id, $email)

     if (! check_emailaddr($email)) {

         system_falure("Die E-Mail-Adresse scheint nicht gültig zu sein.");

     }

-    $args = array("id" => (int) $id,

+    $args = ["id" => (int) $id,

         "email" => $email,

-        "token" => random_string(20));

+        "token" => random_string(20), ];

     db_query("INSERT INTO kundendaten.mailaddress_token (token, expire, contact, email) VALUES (:token, NOW() + INTERVAL 1 DAY, :id, :email)", $args);

     DEBUG('Token erzeugt: '.print_r($args, true));

@@ -291,7 +291,7 @@ https://schokokeks.org

 function update_pending($contactid)

 {

     $contactid = (int) $contactid;

-    $result = db_query("SELECT email FROM kundendaten.mailaddress_token WHERE contact=?", array($contactid));

+    $result = db_query("SELECT email FROM kundendaten.mailaddress_token WHERE contact=?", [$contactid]);

     if ($result->rowCount() == 0) {

         return null;

     }

@@ -319,7 +319,7 @@ function delete_contact($id)

         $c['state'] = 'deleted';

         upload_contact($c);

     }

-    db_query("UPDATE kundendaten.contacts SET state='deleted' WHERE id=?", array($c['id']));

+    db_query("UPDATE kundendaten.contacts SET state='deleted' WHERE id=?", [$c['id']]);

 }

@@ -329,12 +329,12 @@ function search_pgp_key($search)

         # Keine Ausgabe weil diese Funktion im AJAX-Call verwendet wird

         return null;

     }

-    $output = array();

+    $output = [];

     $command = 'LC_ALL=C /usr/bin/timeout 10 /usr/bin/gpg --batch --with-colons --keyserver hkps://hkps.pool.sks-keyservers.net --search-key '.escapeshellarg($search);

     DEBUG($command);

     exec($command, $output);

     DEBUG($output);

-    $keys = array();

+    $keys = [];

     foreach ($output as $row) {

         if (substr($row, 0, 4) === 'pub:') {

             $parts = explode(':', $row);

@@ -359,7 +359,7 @@ function search_pgp_key($search)

 function fetch_pgp_key($pgp_id)

 {

-    $output = array();

+    $output = [];

     $ret = null;

     $command = '/usr/bin/timeout 10 /usr/bin/gpg --batch --keyserver hkps://hkps.pool.sks-keyservers.net --no-auto-check-trustdb --trust-model=always --recv-key '.escapeshellarg($pgp_id);

     DEBUG($command);

@@ -406,8 +406,8 @@ function test_pgp_key($pgp_id)

 function domainlist_by_contact($c)

 {

     $cid = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT id FROM kundendaten.domains WHERE (owner=? OR admin_c=?) AND kunde=?", array($c['id'], $c['id'], $cid));

-    $ret = array();

+    $result = db_query("SELECT id FROM kundendaten.domains WHERE (owner=? OR admin_c=?) AND kunde=?", [$c['id'], $c['id'], $cid]);

+    $ret = [];

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

         $ret[] = new Domain((int) $domain['id']);

     }

@@ -430,7 +430,7 @@ function contact_as_string($contact)

     if ($new_email) {

         $email = "<strike>$email</strike><br/>".filter_output_html($new_email).footnote('Die E-Mail-Adresse wurde noch nicht bestätigt');

     }

-    $email = implode("<br>\n", array_filter(array($email, filter_output_html($contact['phone']), filter_output_html($contact['fax']), filter_output_html($contact['mobile']))));

+    $email = implode("<br>\n", array_filter([$email, filter_output_html($contact['phone']), filter_output_html($contact['fax']), filter_output_html($contact['mobile'])]));

     $pgp = '';

     if ($contact['pgp_id']) {

         $pgpid = $contact['pgp_id'];

@@ -20,7 +20,7 @@ require_once("contacts.php");

 function verify_mail_token($token)

 {

     db_query("DELETE FROM kundendaten.mailaddress_token WHERE expire<NOW()");

-    $args = array(":token" => $token);

+    $args = [":token" => $token];

     $result = db_query("SELECT contact, email FROM kundendaten.mailaddress_token WHERE token=:token AND expire>NOW()", $args);

     if ($result->rowCount() > 0) {

         $line = $result->fetch();

@@ -41,8 +41,8 @@ function update_mailaddress($daten)

         system_failure('Es ist eine ungültige Adresse hinterlegt. So wird das nichts. Bitte die Änderung von vorne machen.');

     }

-    $args = array(':contact' => $contact,

-                  ':email' => $email);

+    $args = [':contact' => $contact,

+                  ':email' => $email, ];

     db_query("UPDATE kundendaten.contacts SET email=:email WHERE id=:contact", $args);

     sync_legacy_contactdata();

 }

@@ -50,8 +50,8 @@ function update_mailaddress($daten)

 function upload_changed_contact($id)

 {

-    $args = array(

-        "id" => (int) $id);

+    $args = [

+        "id" => (int) $id, ];

     $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE id=:id", $args);

     if ($result->rowCount() == 0) {

         return ;

@@ -60,7 +60,7 @@ function upload_changed_contact($id)

     if (! ($c['nic_id'] || $c['nic_handle'])) {

         return ;

     }

-    $ac = array();

+    $ac = [];

     $ac['id'] = $c['nic_id'];

     $ac['handle'] = $c['nic_handle'];

     $ac['type'] = 'person';

@@ -76,8 +76,8 @@ function upload_changed_contact($id)

     if ($c['state'] == 'deleted') {

         $ac['hidden'] = true;

     }

-    $data = array("contact" => $ac,

-            "actingAs" => "designatedAgent");

+    $data = ["contact" => $ac,

+            "actingAs" => "designatedAgent", ];

     $result = api_request('contactUpdate', $data);

     if ($result['status'] != 'success') {

         warning("Es gab ein Problem beim Hochladen der geänderten Adresse zum Domainregistrar. Das sollte nicht sein!");

@@ -21,7 +21,7 @@ require_once('inc/icons.php');

 require_once('session/start.php');

-require_role(array(ROLE_CUSTOMER));

+require_role([ROLE_CUSTOMER]);

 title("Adressen verwalten");

@@ -32,8 +32,8 @@ $kundenkontakte = get_kundenkontakte();

 output('<p>Sie haben aktuell diese Adressen gespeichert:</p>

 <div class="contact-list">');

-$liste = array_merge(array_filter(array($kundenkontakte['kunde'], $kundenkontakte['rechnung'], $kundenkontakte['extern'])), array_keys($contacts));

-$already_displayed = array();

+$liste = array_merge(array_filter([$kundenkontakte['kunde'], $kundenkontakte['rechnung'], $kundenkontakte['extern']]), array_keys($contacts));

+$already_displayed = [];

 foreach ($liste as $id) {

     if (in_array($id, $already_displayed)) {

         continue;

@@ -44,7 +44,7 @@ foreach ($liste as $id) {

         system_failure('Fehlerhafte Kunden-Zuordnung bei den Kontakten');

     }

     $contact = $contacts[$id];

-    $usage = array();

+    $usage = [];

     if ($id == $kundenkontakte['kunde']) {

         $cssclass .= 'mainaddress';

         $usage[] = 'Stamm-Adresse';