webinterface.git

@@ -40,9 +40,9 @@ if (!isset($_SERVER['SSL_CLIENT_CERT']) && isset($_SERVER['REDIRECT_SSL_CLIENT_C

 if ($_SESSION['role'] != ROLE_ANONYMOUS && isset($_REQUEST['record']) && isset($_REQUEST['backto']) && check_path($_REQUEST['backto'])) {

     DEBUG('recording client-cert');

-    if (isset($_SERVER[$redirect . 'SSL_CLIENT_CERT']) && isset($_SERVER[$redirect . 'SSL_CLIENT_S_DN']) &&

-      isset($_SERVER[$redirect . 'SSL_CLIENT_I_DN']) && isset($_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL']) &&

-      isset($_SERVER[$redirect . 'SSL_CLIENT_V_START']) && isset($_SERVER[$redirect . 'SSL_CLIENT_V_END'])

+    if (isset($_SERVER[$redirect . 'SSL_CLIENT_CERT']) && isset($_SERVER[$redirect . 'SSL_CLIENT_S_DN'])

+      && isset($_SERVER[$redirect . 'SSL_CLIENT_I_DN']) && isset($_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL'])

+      && isset($_SERVER[$redirect . 'SSL_CLIENT_V_START']) && isset($_SERVER[$redirect . 'SSL_CLIENT_V_END'])

     ) {

         $_SESSION['clientcert_cert'] = $_SERVER[$redirect . 'SSL_CLIENT_CERT'];

         $_SESSION['clientcert_dn'] = $_SERVER[$redirect . 'SSL_CLIENT_S_DN'];

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

     # User hat sich grade eingeloggt

     header('Location: ../' . ltrim($destination, '/'));

 } else {

-    if (isset($_SERVER[$redirect . 'SSL_CLIENT_CERT']) &&

-      isset($_SERVER[$redirect . 'SSL_CLIENT_S_DN']) && $_SERVER[$redirect . 'SSL_CLIENT_S_DN'] != '' &&

-      isset($_SERVER[$redirect . 'SSL_CLIENT_I_DN']) && $_SERVER[$redirect . 'SSL_CLIENT_I_DN'] != '' &&

-      isset($_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL']) && $_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL'] != '') {

+    if (isset($_SERVER[$redirect . 'SSL_CLIENT_CERT'])

+      && isset($_SERVER[$redirect . 'SSL_CLIENT_S_DN']) && $_SERVER[$redirect . 'SSL_CLIENT_S_DN'] != ''

+      && isset($_SERVER[$redirect . 'SSL_CLIENT_I_DN']) && $_SERVER[$redirect . 'SSL_CLIENT_I_DN'] != ''

+      && isset($_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL']) && $_SERVER[$redirect . 'SSL_CLIENT_M_SERIAL'] != '') {

         $ret = get_logins_by_cert($_SERVER[$redirect . 'SSL_CLIENT_CERT']);

         if ($ret === null) {

             login_screen('Ihr Browser hat ein Client-Zertifikat gesendet, dieses ist aber noch nicht für den Zugang hinterlegt. Melden Sie sich bitte per Benutzername und Passwort an.');

@@ -52,9 +52,9 @@ class DB extends PDO

             $response->execute($params);

             return $response;

         } else {

-            if (strtoupper(substr($stmt, 0, 6)) == "INSERT" ||

-          strtoupper(substr($stmt, 0, 7)) == "REPLACE" ||

-          strpos(strtoupper($stmt), "WHERE") > 0) { // Das steht nie am Anfang

+            if (strtoupper(substr($stmt, 0, 6)) == "INSERT"

+          || strtoupper(substr($stmt, 0, 7)) == "REPLACE"

+          || strpos(strtoupper($stmt), "WHERE") > 0) { // Das steht nie am Anfang

                 $backtrace = debug_backtrace();

                 $wherepart = substr(strtoupper($stmt), strpos(strtoupper($stmt), "WHERE"));

                 if ((strpos($wherepart, '"') > 0 || strpos($wherepart, "'") > 0) && config("enable_debug")) {

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

 function user_is_sure()

 {

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

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

-            ($_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!");

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

         ":useraccount" => $useraccount,

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

         ":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);

+    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();

     /*if ($data['setup']) {

       $args = array(":cid" => $cid, ":setup" => $data['setup'], ":text" => 'Einmalige Setup-Gebühren für Domain "'.$data['domainname'].'"');

@@ -77,8 +77,8 @@ function create_dyndns_account($handle, $password_http, $sshkey)

     }

     db_query(

-        "INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES " .

-           "(:uid, :handle, :pwhash, :sshkey)",

+        "INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES "

+           . "(:uid, :handle, :pwhash, :sshkey)",

         [":uid" => $uid, ":handle" => $handle, ":pwhash" => $pwhash, ":sshkey" => $sshkey]

     );

     $dyndns_id = db_insert_id();

@@ -185,9 +185,9 @@ if ($is_current_customer && config('http.net-apikey') && $dom->provider == 'teri

     if (!update_possible($dom->id)) {

         warning("Diese Domain verwendet eine unübliche Endung. Daher kann der Inhaber nicht auf diesem Weg verändert werden. Bitte kontaktieren Sie den Support.");

     } else {

-        if ($_SESSION['domains_detail_admin_c'] == $dom->admin_c &&

-                $_SESSION['domains_detail_owner'] != $dom->owner &&

-                (!isset($_SESSION['domains_detail_detach']) || $_SESSION['domains_detail_detach'] == 0)) {

+        if ($_SESSION['domains_detail_admin_c'] == $dom->admin_c

+                && $_SESSION['domains_detail_owner'] != $dom->owner

+                && (!isset($_SESSION['domains_detail_detach']) || $_SESSION['domains_detail_detach'] == 0)) {

             // Wenn der Owner geändert wurde, der Admin aber nicht und das detach-Flag

             // nicht gesetzt ist, dann wird der Admin gleich dem Owner gesetzt

             $_SESSION['domains_detail_admin_c'] = $_SESSION['domains_detail_owner'];

@@ -19,14 +19,14 @@ require_once("domainapi.php");

 require_role(ROLE_CUSTOMER);

 check_form_token('domains_domainreg');

-if (!(isset($_SESSION['domains_domainreg_owner']) && $_SESSION['domains_domainreg_owner']) ||

-    !(isset($_SESSION['domains_domainreg_admin_c']) && $_SESSION['domains_domainreg_admin_c']) ||

-    !(isset($_SESSION['domains_domainreg_domainname']) && $_SESSION['domains_domainreg_domainname'])) {

+if (!(isset($_SESSION['domains_domainreg_owner']) && $_SESSION['domains_domainreg_owner'])

+    || !(isset($_SESSION['domains_domainreg_admin_c']) && $_SESSION['domains_domainreg_admin_c'])

+    || !(isset($_SESSION['domains_domainreg_domainname']) && $_SESSION['domains_domainreg_domainname'])) {

     system_failure("Fehler im Programmablauf!");

 }

-if (!(isset($_REQUEST['domain']) && $_REQUEST['domain']) ||

-    $_REQUEST['domain'] != $_SESSION['domains_domainreg_domainname']) {

+if (!(isset($_REQUEST['domain']) && $_REQUEST['domain'])

+    || $_REQUEST['domain'] != $_SESSION['domains_domainreg_domainname']) {

     system_failure("Fehler im Programmablauf!");

 }

 // Validierung der Domain entfällt hier, weil wir nur bestehende Domain aus der Datenbank laden. Bei ungültiger Eingabe wird kein Treffer gefunden.

@@ -127,9 +127,9 @@ $startdate = $ar['valid_from'];

 if (!$startdate || $startdate <= date('Y-m-d')) {

     $startdate = date('Y-m-d', time() + 1 * 24 * 60 * 60);

 }

-$form .= "<p><input type=\"radio\" name=\"ar_valid_from\" value=\"now\" id=\"ar_valid_from_now\"{$valid_from_now_checked}> <label for=\"ar_valid_from_now\">Ab sofort</label><br>" .

-  "<input type=\"radio\" name=\"ar_valid_from\" value=\"date\" id=\"ar_valid_from_date\"{$valid_from_future_checked}> <label for=\"ar_valid_from_date\">Erst ab dem </label>" .

-  "<input type=\"date\" value=\"$startdate\" id=\"ar_startdate\" name=\"ar_startdate\" min=\"" . date('Y-m-d') . "\" max=\"" . date('Y-m-d', time() + 60 * 24 * 60 * 60) . "\"></p>";

+$form .= "<p><input type=\"radio\" name=\"ar_valid_from\" value=\"now\" id=\"ar_valid_from_now\"{$valid_from_now_checked}> <label for=\"ar_valid_from_now\">Ab sofort</label><br>"

+  . "<input type=\"radio\" name=\"ar_valid_from\" value=\"date\" id=\"ar_valid_from_date\"{$valid_from_future_checked}> <label for=\"ar_valid_from_date\">Erst ab dem </label>"

+  . "<input type=\"date\" value=\"$startdate\" id=\"ar_startdate\" name=\"ar_startdate\" min=\"" . date('Y-m-d') . "\" max=\"" . date('Y-m-d', time() + 60 * 24 * 60 * 60) . "\"></p>";

 $enddate = $ar['valid_until'];

 if (!$enddate) {

@@ -142,8 +142,8 @@ if ($ar['valid_from'] > date('Y-m-d')) {

     $max_end = $max_end->format('Y-m-d');

 }

 $form .= "<h4>Deaktivierung</h4>";

-$form .= "<p><label for=\"ar_enddate\">Keine Antworten mehr versenden ab dem </label>" .

-  "<input type=\"date\" value=\"$enddate\" id=\"ar_enddate\" name=\"ar_enddate\" min=\"" . date('Y-m-d') . "\" max=\"" . $max_end . "\"><br>";

+$form .= "<p><label for=\"ar_enddate\">Keine Antworten mehr versenden ab dem </label>"

+  . "<input type=\"date\" value=\"$enddate\" id=\"ar_enddate\" name=\"ar_enddate\" min=\"" . date('Y-m-d') . "\" max=\"" . $max_end . "\"><br>";

 if (!$accountlogin && ($id != 0)) {

     $form .= "<small>(Automatische Antworten sind nur befristet erlaubt. Wenn Sie diese Adresse dauerhaft stilllegen möchten, können Sie dies am Ende dieser Seite tun.)</small></p>";

 }

@@ -151,21 +151,21 @@ if (!$accountlogin && ($id != 0)) {

 $subject = filter_output_html($ar['subject']);

 $ar_subject_default_checked = ($subject == null) ? ' checked="checked"' : '';

 $ar_subject_custom_checked = ($subject) ? ' checked="checked"' : '';

-$form .= "<h4>Betreffzeile der automatischen Antwort</h4>" .

-  "<p><input type=\"radio\" name=\"ar_subject\" value=\"default\" id=\"ar_subject_default\"{$ar_subject_default_checked}> " .

-  "<label for=\"ar_subject_default\">Automatisch (Re: <em>&lt;Betreff der Originalnachricht&gt;</em>)</label><br>" .

-  "<input type=\"radio\" name=\"ar_subject\" value=\"custom\" id=\"ar_subject_custom\"{$ar_subject_custom_checked}> " .

-  "<label for=\"ar_subject_custom\">Anderer Betreff:</label> <input type=\"text\" name=\"ar_subject_value\" id=\"ar_subject_value\" value=\"{$subject}\"></p>";

+$form .= "<h4>Betreffzeile der automatischen Antwort</h4>"

+  . "<p><input type=\"radio\" name=\"ar_subject\" value=\"default\" id=\"ar_subject_default\"{$ar_subject_default_checked}> "

+  . "<label for=\"ar_subject_default\">Automatisch (Re: <em>&lt;Betreff der Originalnachricht&gt;</em>)</label><br>"

+  . "<input type=\"radio\" name=\"ar_subject\" value=\"custom\" id=\"ar_subject_custom\"{$ar_subject_custom_checked}> "

+  . "<label for=\"ar_subject_custom\">Anderer Betreff:</label> <input type=\"text\" name=\"ar_subject_value\" id=\"ar_subject_value\" value=\"{$subject}\"></p>";

 $message = filter_output_html($ar['message']);

-$form .= "<h4>Inhalt der automatischen Antwort</h4>" .

-  "<p><textarea cols=\"80\" rows=\"10\" name=\"ar_message\" id=\"ar_message\">{$message}</textarea></p>";

+$form .= "<h4>Inhalt der automatischen Antwort</h4>"

+  . "<p><textarea cols=\"80\" rows=\"10\" name=\"ar_message\" id=\"ar_message\">{$message}</textarea></p>";

 $quote = $ar['quote'];

 if (!$quote) {

     $quote = 'none';

 }

-$form .= "<p><label for=\"ar_quote\">Originalnachricht des Absenders </label>" .

-  html_select('ar_quote', ["none" => 'nicht in Antwort einschließen',

+$form .= "<p><label for=\"ar_quote\">Originalnachricht des Absenders </label>"

+  . html_select('ar_quote', ["none" => 'nicht in Antwort einschließen',

       "teaser" => 'anreißen (erste 10 Zeilen)',

       "inline" => 'zitieren (max. 50 Zeilen)', ], $quote) . "</p>";

 //"attach" => 'vollständig als Anhang beifügen'), $quote)."</p>";

@@ -174,10 +174,10 @@ $form .= "<p><label for=\"ar_quote\">Originalnachricht des Absenders </label>" .

 $ar_from_default_checked = ($ar['fromname'] == null) ? ' checked="checked"' : '';

 $ar_from_custom_checked = ($ar['fromname'] != null) ? ' checked="checked"' : '';

 $fromname = filter_output_html($ar['fromname']);

-$form .= "<h4>Absender der automatischen Antwort</h4>" .

-  "<p><input type=\"radio\" name=\"ar_from\" value=\"default\" id=\"ar_from_default\"{$ar_from_default_checked}> <label for=\"ar_from_default\">Nur E-Mail-Adresse</label><br>" .

-  "<input type=\"radio\" name=\"ar_from\" value=\"custom\" id=\"ar_from_custom\"{$ar_from_custom_checked}> <label for=\"ar_from_custom\">Mit Name: </label> " .

-  "<input type=\"text\" name=\"ar_fromname\" id=\"ar_fromname\" value=\"{$fromname}\"></p>";

+$form .= "<h4>Absender der automatischen Antwort</h4>"

+  . "<p><input type=\"radio\" name=\"ar_from\" value=\"default\" id=\"ar_from_default\"{$ar_from_default_checked}> <label for=\"ar_from_default\">Nur E-Mail-Adresse</label><br>"

+  . "<input type=\"radio\" name=\"ar_from\" value=\"custom\" id=\"ar_from_custom\"{$ar_from_custom_checked}> <label for=\"ar_from_custom\">Mit Name: </label> "

+  . "<input type=\"text\" name=\"ar_fromname\" id=\"ar_fromname\" value=\"{$fromname}\"></p>";

@@ -36,8 +36,8 @@ if (!function_exists("user_has_dotcourier_domain")) {

             return false;

         }

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

-        $result = db_query("select 1 from mail.custom_mappings as c left join mail.v_domains as d on (d.id=c.domain) where d.user=:uid or c.uid=:uid UNION " .

-            "SELECT 1 FROM mail.v_domains AS d WHERE d.user=:uid AND d.mail != 'none' AND d.id != ALL(SELECT domain FROM mail.virtual_mail_domains)", [":uid" => $uid]);

+        $result = db_query("select 1 from mail.custom_mappings as c left join mail.v_domains as d on (d.id=c.domain) where d.user=:uid or c.uid=:uid UNION "

+            . "SELECT 1 FROM mail.v_domains AS d WHERE d.user=:uid AND d.mail != 'none' AND d.id != ALL(SELECT domain FROM mail.virtual_mail_domains)", [":uid" => $uid]);

         $ret = ($result->rowCount() > 0);

         if ($ret) {

             DEBUG("User {$uid} has dotcourier-domains");

@@ -368,8 +368,8 @@ function save_vmail_account($account)

             input_error("Die Absenderadresse sieht ungültig aus. Es wird Ihre E-Mail-Adresse benutzt!");

             $ar['fromaddr'] = null;

         }

-        $query = "REPLACE INTO mail.vmail_autoresponder (account, valid_from, valid_until, fromname, fromaddr, subject, message, quote) " .

-             "VALUES (:id, :valid_from, :valid_until, :fromname, :fromaddr, :subject, :message, :quote)";

+        $query = "REPLACE INTO mail.vmail_autoresponder (account, valid_from, valid_until, fromname, fromaddr, subject, message, quote) "

+             . "VALUES (:id, :valid_from, :valid_until, :fromname, :fromaddr, :subject, :message, :quote)";

         $args = [":id" => $id,

             ":valid_from" => $ar['valid_from'],

             ":valid_until" => $ar['valid_until'],

@@ -41,8 +41,8 @@ title("E-Mail-Adresse stilllegen");

 output('<p>Mit dieser Funktion können Sie eine E-Mail-Adresse stilllegen (so werden keine Nachrichten für diese Adresse angenommen) und dabei dem Absender einen eigenen, hier festgelegten Fehlertext zukommen lassen. Diese Methode hat nicht die Probleme, die ein klassische Autoresponder verursacht, da keine Antwort-E-Mails versendet werden. Der Absender erhält von seinem Mail-Server eine Fehlermeldung mit dem entsprechenden Text.</p>

 <p><strong>Wichtig:</strong> Dieses Verfahren funktioniert nur, wenn die E-Mails wirklich nicht angenommen werden (Annahme wird verweigert), somit sind keine Weiterleitung und keine Speicherung möglich. Sie können aber natürlich im Text auf eine andere E-Mail-Adresse hinweisen.</p>');

-$form = "<h4>Text der Fehlermeldung</h4>" .

-  "<p><textarea cols=\"80\" rows=\"10\" name=\"smtpreply\" id=\"smtpreply\">" . filter_output_html($account['smtpreply']) . "</textarea></p>";

+$form = "<h4>Text der Fehlermeldung</h4>"

+  . "<p><textarea cols=\"80\" rows=\"10\" name=\"smtpreply\" id=\"smtpreply\">" . filter_output_html($account['smtpreply']) . "</textarea></p>";

 $form .= '<p><input id="submit" type="submit" value="Speichern">&#160;&#160;&#160;&#160;';

 if ($suspended) {

@@ -99,9 +99,9 @@ Subdomains können grundsätzlich nur durch Administratoren eingerichtet und ver

                 $accounts_on_domain = $sorted_by_domains[$dom['id']];

                 foreach ($accounts_on_domain as $this_account) {

-                    if ($filter &&

-                    (strpos($dom['domainname'], $filter) === false &&

-                     strpos($this_account['local'], $filter) === false)) {

+                    if ($filter

+                    && (strpos($dom['domainname'], $filter) === false

+                     && strpos($this_account['local'], $filter) === false)) {

                         continue;

                     }

                     $acc = get_account_details($this_account['id']);

@@ -49,8 +49,8 @@ function delete_from_whitelist($id)

 function valid_entry($local, $domain)

 {

     if ($domain == 'schokokeks.org') {

-        if (($local != $_SESSION['userinfo']['username']) &&

-            (strpos($local, $_SESSION['userinfo']['username'] . '-') !== 0)) {

+        if (($local != $_SESSION['userinfo']['username'])

+            && (strpos($local, $_SESSION['userinfo']['username'] . '-') !== 0)) {

             system_failure('Diese E-Mail-Adresse gehört Ihnen nicht!');

         }

         return true;

@@ -79,6 +79,6 @@ function new_whitelist_entry($local, $domain, $minutes)

         $args[':minutes'] = $minutes;

         $expire = "NOW() + INTERVAL :minutes MINUTE";

     }

-    db_query("INSERT INTO mail.greylisting_manual_whitelist (local,domain,date,expire,uid) VALUES " .

-             "(:local, :domain, NOW(), {$expire}, :uid)", $args);

+    db_query("INSERT INTO mail.greylisting_manual_whitelist (local,domain,date,expire,uid) VALUES "

+             . "(:local, :domain, NOW(), {$expire}, :uid)", $args);

 }

@@ -64,8 +64,8 @@ if (isset($_REQUEST['token'])) {

 if ($show == 'password') {

     $username = get_username_for_uid($uid);

     title("Neues Passwort setzen");

-    output('<p>Bitte legen Sie jetzt Ihr neues Passwort fest.</p>' .

-  html_form('initialize_useraccount', '', '', '<p style="display: none"><input type="hidden" name="uid" value="' . $uid . '">

+    output('<p>Bitte legen Sie jetzt Ihr neues Passwort fest.</p>'

+  . html_form('initialize_useraccount', '', '', '<p style="display: none"><input type="hidden" name="uid" value="' . $uid . '">

   <input type="hidden" name="token" value="' . $token . '"><input type="hidden" name="agb" value="1"></p>

   <p><span class="login_label">Ihr Benutzername:</span> <strong>' . $username . '</strong></p>

   <p><span class="login_label">Neues Passwort:</span> <input type="password" name="password" size="30" autocomplete="new-password"></p>

@@ -74,8 +74,8 @@ if ($show == 'password') {

   '));

 } elseif ($show == 'agb') {

     title("Bestätigung unserer AGB");

-    output('<p>Die Nutzung unseres Angebots ist an unsere <a href="https://schokokeks.org/agb">Allgemeinen Geschäftsbedingungen</a> gebunden. Bitte lesen Sie diese Bedingungen und bestätigen Sie Ihr Einverständnis. Sollten Sie diese Bedingungen nicht akzeptieren, setzen Sie sich bitte mit uns in Verbindung.</p>' .

-  html_form('initialize_useraccount_agb', '', '', '<p style="display: none"><input type="hidden" name="uid" value="' . $uid . '">

+    output('<p>Die Nutzung unseres Angebots ist an unsere <a href="https://schokokeks.org/agb">Allgemeinen Geschäftsbedingungen</a> gebunden. Bitte lesen Sie diese Bedingungen und bestätigen Sie Ihr Einverständnis. Sollten Sie diese Bedingungen nicht akzeptieren, setzen Sie sich bitte mit uns in Verbindung.</p>'

+  . html_form('initialize_useraccount_agb', '', '', '<p style="display: none"><input type="hidden" name="uid" value="' . $uid . '">

   <input type="hidden" name="token" value="' . $token . '"></p>

   <p><span class="login_label">&#160;</span><input type="checkbox" name="agb" value="1"> Ja, ich akzeptiere die AGB.<p>

   <p><span class="login_label">&#160;</span> <input type="submit" value="Weiter"></p>

@@ -329,12 +329,12 @@ function save_more_storage($items, $storage)

         }

         $data['kunde'] = $cid;

         $data['notizen'] = 'Bestellt via Webinterface';

-        if (!isset($data['anzahl']) ||

-        !isset($data['beschreibung']) ||

-        !isset($data['datum']) ||

-        !array_key_exists('kuendigungsdatum', $data) ||

-        !isset($data['betrag']) ||

-        !isset($data['monate'])) {

+        if (!isset($data['anzahl'])

+        || !isset($data['beschreibung'])

+        || !isset($data['datum'])

+        || !array_key_exists('kuendigungsdatum', $data)

+        || !isset($data['betrag'])

+        || !isset($data['monate'])) {

             DEBUG($data);

             input_error("Ungültige Daten");

             return;

@@ -345,8 +345,8 @@ function save_more_storage($items, $storage)

             $param[':' . $k] = $v;

         }

-        $queries[] = ["INSERT INTO kundendaten.leistungen (kunde,periodisch,beschreibung,datum,kuendigungsdatum,betrag,brutto,monate,anzahl,notizen) VALUES " .

-                   "(:kunde,1,:beschreibung,:datum,:kuendigungsdatum,:betrag,:brutto,:monate,:anzahl,:notizen)", $param, ];

+        $queries[] = ["INSERT INTO kundendaten.leistungen (kunde,periodisch,beschreibung,datum,kuendigungsdatum,betrag,brutto,monate,anzahl,notizen) VALUES "

+                   . "(:kunde,1,:beschreibung,:datum,:kuendigungsdatum,:betrag,:brutto,:monate,:anzahl,:notizen)", $param, ];

     }

     if (count($queries) < 2) {

@@ -26,8 +26,8 @@ title('Zusätzlichen Speicherplatz buchen');

 check_form_token('more_storage');

 $valid = false;

-if (isset($_POST['more_storage_handle']) && isset($_SESSION['more_storage_handle']) &&

-  $_POST['more_storage_handle'] == $_SESSION['more_storage_handle']) {

+if (isset($_POST['more_storage_handle']) && isset($_SESSION['more_storage_handle'])

+  && $_POST['more_storage_handle'] == $_SESSION['more_storage_handle']) {

     $valid = true;

 }

 if (!$valid) {

@@ -26,9 +26,9 @@ global $debugmode;

 if ($_GET['action'] == 'new') {

     check_form_token('jabber_new_account');

-    if (filter_input_username($_POST['local']) == '' ||

-      $_POST['domain'] == '' ||

-      $_POST['password'] == '') {

+    if (filter_input_username($_POST['local']) == ''

+      || $_POST['domain'] == ''

+      || $_POST['password'] == '') {

         input_error('Sie müssen alle Felder ausfüllen!');

     } else {

         create_jabber_account($_POST['local'], $_POST['domain'], stripslashes($_POST['password']));

@@ -39,10 +39,10 @@ if ($_GET['action'] == 'new') {

 } elseif ($_GET['action'] == 'chpass') {

     check_form_token('jabber_chpass');

     get_jabberaccount_details($_POST['accountid']);

-    if ($_POST['newpass'] == '' ||

-      $_POST['newpass2'] == '' ||

-      $_POST['newpass'] != $_POST['newpass2'] ||

-      $_POST['accountid'] == '') {

+    if ($_POST['newpass'] == ''

+      || $_POST['newpass2'] == ''

+      || $_POST['newpass'] != $_POST['newpass2']

+      || $_POST['accountid'] == '') {

         input_error('Bitte zweimal ein neues Passwort eingeben!');

     } else {

         change_jabber_password($_POST['accountid'], stripslashes($_POST['newpass']));

@@ -22,8 +22,8 @@ function save_passkey($data, $handle = null)

         ":handle" => $handle,

         ":uid" => $_SESSION['userinfo']['uid'],

     ];

-    db_query("INSERT INTO system.systemuser_passkey (uid, handle, rpId, credentialId, credentialPublicKey) VALUES " .

-            "(:uid, :handle, :rpId, :credentialId, :credentialPublicKey)", $args);

+    db_query("INSERT INTO system.systemuser_passkey (uid, handle, rpId, credentialId, credentialPublicKey) VALUES "

+            . "(:uid, :handle, :rpId, :credentialId, :credentialPublicKey)", $args);

 }

 function get_passkey($id)

@@ -55,14 +55,14 @@ function find_customers($string)

 {

     $args = [":string" => '%' . chop($string) . '%', ":number" => $string];

     $return = [];

-    $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE " .

-                     "firma LIKE :string OR firma2 LIKE :string OR " .

-                     "nachname LIKE :string OR vorname LIKE :string OR " .

-                     "adresse LIKE :string OR adresse2 LIKE :string OR " .

-                     "ort LIKE :string OR pgp_id LIKE :string OR " .

-                     "notizen LIKE :string OR email_rechnung LIKE :string OR " .

-                     "email LIKE :string OR email_extern LIKE :string OR u.name LIKE :string OR " .

-                     "u.username LIKE :string OR k.id=:number OR u.uid=:number", $args);

+    $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE "

+                     . "firma LIKE :string OR firma2 LIKE :string OR "

+                     . "nachname LIKE :string OR vorname LIKE :string OR "

+                     . "adresse LIKE :string OR adresse2 LIKE :string OR "

+                     . "ort LIKE :string OR pgp_id LIKE :string OR "

+                     . "notizen LIKE :string OR email_rechnung LIKE :string OR "

+                     . "email LIKE :string OR email_extern LIKE :string OR u.name LIKE :string OR "

+                     . "u.username LIKE :string OR k.id=:number OR u.uid=:number", $args);

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

         $return[] = $entry['id'];

     }

@@ -84,8 +84,8 @@ function find_users_for_customer($id)

 {

     $id = (int) $id;

     $return = [];

-    $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE " .

-                     "kunde=?", [$id]);

+    $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE "

+                     . "kunde=?", [$id]);

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

         $return[] = $entry;

     }

@@ -41,8 +41,8 @@ if ($_GET['action'] == 'new') {

     //if (! strong_password($_POST['newpass']))

     //  input_error('Das Passwort ist zu einfach');

     //else

-    if ($_POST['newpass1'] == '' ||

-      $_POST['newpass1'] != $_POST['newpass2']) {

+    if ($_POST['newpass1'] == ''

+      || $_POST['newpass1'] != $_POST['newpass2']) {

         input_error('Bitte zweimal ein neues Passwort eingeben!');

         $error = true;

     } else {

@@ -475,8 +475,8 @@ function save_vhost($vhost)

         $autoipv6 = $vhost['autoipv6'];

     }

-    if (!($vhost['ssl'] == 'forward' || $vhost['ssl'] == 'http' ||

-        $vhost['ssl'] == 'https')) {

+    if (!($vhost['ssl'] == 'forward' || $vhost['ssl'] == 'http'

+        || $vhost['ssl'] == 'https')) {

         $vhost['ssl'] = null;

     }

@@ -503,8 +503,8 @@ function save_vhost($vhost)

         $args[":user"] = $_SESSION['userinfo']['uid'];

         unset($args[":id"]);

         logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Creating vhost ' . $vhost['hostname'] . '.' . $vhost['domain'] . '');

-        $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options) VALUES " .

-                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options)", $args, true);

+        $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options) VALUES "

+                       . "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options)", $args, true);

         $id = db_insert_id();

     }

     $oldvhost = get_vhost_details($id);