From b9c952f0b9b3034e951cac681c658fc5f75af077 Mon Sep 17 00:00:00 2001 From: bettina Date: Fri, 28 Jun 2024 11:05:20 +0200 Subject: [PATCH] Edit forms and mails --- static/php/ajaxmail.php | 11 +- static/php/message.php | 264 ++++++++++++++++++++++++++++++++-------- 2 files changed, 221 insertions(+), 54 deletions(-) diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php index 190a9a0..5985a32 100644 --- a/static/php/ajaxmail.php +++ b/static/php/ajaxmail.php @@ -46,8 +46,9 @@ try { $mail->CharSet = 'UTF-8'; $encodedSubject = mb_encode_mimeheader($subject, "UTF-8", "Q"); $mail->Subject = $encodedSubject; - $mail->Body = nl2br(htmlspecialchars($message)); - $mail->AltBody = htmlspecialchars($message); +// $mail->Body = nl2br(htmlspecialchars($message)); + $mail->Body = $message; + $mail->AltBody = $message; // Send email if ($mail->send()) { @@ -67,8 +68,10 @@ try { $mail->addBCC('rabe@verua.swiss'); // Add bounce email address as BCC $mail->addAddress($customerEmail); $mail->Subject = $encodedSubject; - $mail->Body = nl2br(htmlspecialchars($customerMessage)); - $mail->AltBody = htmlspecialchars($customerMessage); +// $mail->Body = nl2br(htmlspecialchars($customerMessage)); + $mail->Body = $customerMessage; +// $mail->AltBody = htmlspecialchars($customerMessage); + $mail->AltBody = $customerMessage; $mail->send(); } diff --git a/static/php/message.php b/static/php/message.php index 0084ffe..4054294 100644 --- a/static/php/message.php +++ b/static/php/message.php @@ -7,84 +7,71 @@ function constructMessage() { $lang = ( isset($_POST['sprache']) && $_POST['sprache'] == "FR" ? "FR" : "DE" ); -// $message = ($lang == "FR" ? "Demande par formulaire: " : "Anfrage über Formular: "); - $message = "\n" . filter_input(INPUT_POST, 'formularart') . "\n\n\n\n"; - - $message .= ($lang == "FR" ? "

Vos coordonnées

" + $message = ($lang == "FR" ? "

Vos coordonnées

" : "

Sie haben folgende Angaben bei Ihrer Bestellung VeruA App gemacht:

"); + $organisation = filter_input(INPUT_POST, 'organisation'); + if (isset($organisation)) { - $message .= "Organisation: " . "\n" . $organisation . "\n\n"; + $message .= "

"; + $message .= ( $lang == "FR" ? "Vos données d'organisation" : "Ihre Organisations-Daten"); + $message .= "

"; + $message .= "

" . $organisation . "
"; } else { + $message = ($lang == "FR" ? "

Vos coordonnées

" : "

Ihre Angaben

"); if ( isset( $_POST['gender'] ) ) { - $message .= ( $lang == "FR" ? "Titre: " : "Anrede: " ); - $message .= "\n" . filter_input(INPUT_POST, 'gender') . "\n\n"; - } - if (isset($_POST['vorname'])) - { - $message .= ( $lang == "FR" ? "Prénom: " : "Vorname: "); - $message .= "\n" . filter_input(INPUT_POST, 'vorname') . "\n\n"; - } - if (isset($_POST['name'])) - { - $message .= ( $lang == "FR" ? "Nom: " : "Nachname: "); - $message .= "\n" . filter_input(INPUT_POST, 'name') . "\n\n"; + $message .= "

" . filter_input(INPUT_POST, 'gender') . " " . filter_input(INPUT_POST, 'vorname') . " " . filter_input(INPUT_POST, 'vorname') . "
"; } } if (isset($_POST['strasse'])) { - $message .= ( $lang == "FR" ? "Rue: " : "Strasse: "); - $message .= "\n" . filter_input(INPUT_POST, 'strasse') . "\n\n"; + $message .= filter_input(INPUT_POST, 'strasse') . "
"; } if (isset($_POST['plz_ort'])) { - $message .= ( $lang == "FR" ? "NPA localité: " : "PLZ Ort: "); - $message .= "\n" . filter_input(INPUT_POST, 'plz_ort') . "\n\n"; + $message .= filter_input(INPUT_POST, 'plz_ort') . "
"; } if (isset($_POST['telefon'])) { $message .= ( $lang == "FR" ? "Téléphone: " : "Telefon: "); - $message .= "\n" . filter_input(INPUT_POST, 'telefon') . "\n\n"; + $message .= filter_input(INPUT_POST, 'telefon') . "
"; } if (isset($_POST['email'])) { $message .= ( $lang == "FR" ? "E-mail : " : "E-Mail: "); - $message .= "\n" . filter_input(INPUT_POST, 'email') . "\n\n\n"; + $message .= filter_input(INPUT_POST, 'email') . "
"; } if (isset($_POST['zsr_nummer'])) { $message .= ( $lang == "FR" ? "Nr. RCC : " : "ZSR Nummer: "); - $message .= "\n" . filter_input(INPUT_POST, 'zsr_nummer') . "\n\n"; + $message .= filter_input(INPUT_POST, 'zsr_nummer') . "
"; + } + if (isset($_POST['ean_nummer'])) + { + $message .= ( $lang == "FR" ? "Nr. EAN/GLN : " : "EAN / GLN-Nr : "); + $message .= filter_input(INPUT_POST, 'ean_nummer') . "
"; } if (isset($organisation)) { if (isset($_POST['gender'])) { - $message .= ( $lang == "FR" ? "Titre: " : "Anrede: "); - $message .= "\n" . filter_input(INPUT_POST, 'gender') . "\n\n"; - } - if (isset($_POST['vorname'])) - { - $message .= ( $lang == "FR" ? "Prénom: " : "Vorname: "); - $message .= "\n" . filter_input(INPUT_POST, 'vorname') . "\n\n"; - } - if (isset($_POST['name'])) - { - $message .= ( $lang == "FR" ? "Nom: " : "Nachname: "); - $message .= "\n" . filter_input(INPUT_POST, 'name') . "\n\n"; + $message .= "

"; + $message .= ( $lang == "FR" ? "Personne de contact pour la commande" : "Kontaktperson für die Bestellung"); + $message .= "

"; + $message .= "

" . filter_input(INPUT_POST, 'gender') . " " . filter_input(INPUT_POST, 'vorname') . " " . filter_input(INPUT_POST, 'vorname') . "
"; } if (isset($_POST['ansprechpartner_telefon'])) { - $message .= ( $lang == "FR" ? "Personne à contacter Téléphone: " : "Ansprechpartner Telefon: "); - $message .= "\n" . filter_input(INPUT_POST, 'ansprechpartner_telefon') . "\n\n"; + $message .= ( $lang == "FR" ? "Téléphone: " : "Telefon: "); + $message .= filter_input(INPUT_POST, 'ansprechpartner_telefon') . "
"; } if (isset($_POST['ansprechpartner_email'])) { - $message .= ( $lang == "FR" ? "Personne à contacter email: " : "Ansprechpartner E-Mail: "); - $message .= "\n" . filter_input(INPUT_POST, 'ansprechpartner_email') . "\n\n"; + $message .= ( $lang == "FR" ? "E-mail: " : "E-Mail: "); + $message .= filter_input(INPUT_POST, 'ansprechpartner_email') . "
"; } } @@ -99,7 +86,9 @@ function constructMessage() $organisationPaket = filter_input(INPUT_POST, 'organisation-paket'); if (isset($organisationPaket)) { - $message .= "Organisation Paket: " . "\n" . $organisationPaket . "\n\n"; + $message .= "

"; + $message .= ( $lang = "FR" ? "Le package que vous avez choisi" : "Ihr gewähltes Paket" ); + $message .= "

" . $organisationPaket . "

"; } // Form inputs von Organisation Zusatzmodule $zusatzmodulDienstplan = filter_input(INPUT_POST, 'zusatzmodul-dienstplan'); @@ -118,22 +107,26 @@ function constructMessage() $bestehend = filter_input(INPUT_POST, 'bestehend'); if (isset($bestehend)) { - $message .= ( $lang == "FR" ? "Souhaitez-vous un nouveau serveur ou l'accès à un serveur d'équipe existant: " : "Wünschen Sie einen neuer Server oder den Zugang zu einem bestehenden Team-Server?: "); - $message .= "\n" . $bestehend . "\n\n"; + $message .= "

"; + $message .= ( $lang == "FR" ? "Sélectionnée la version d'application" + : "Gewählte Applikations-Version"); + $message .= "
" . $bestehend . "
"; } $servername = filter_input(INPUT_POST, 'servername'); if (isset($servername)) { - $message .= ( $lang == "FR" ? "Veuillez entrer un nom pour le serveur: " : "Bitte geben Sie den Namen des gesicherter Webbereichs an: "); - $message .= "\n" . $servername . "\n\n"; + $message .= ( ! isset($bestehend) "

" : "
" ); + $message .= ( $lang == "FR" ? "Nom pour le serveur " : "Name des Webbereichs / der Instanz"); + $message .= "
" . $servername . "
"; + $message .= ( ! isset($bestehend) "

" : "" ); } $modulpop2 = filter_input(INPUT_POST, 'modulpop2'); if (isset($modulpop2)) { -// $message .= ( $lang == "FR" ? "Titre: " : "Anrede: "); - $message .= "Wünschen Sie die Erweiterung um das Modul POP2?: " . "\n" . $modulpop2 . "\n\n"; + $message .= "
"; + $message .= "

Optionales Modul POP2
" . $modulpop2 . "

"; } $materialverwaltung = filter_input(INPUT_POST, 'materialverwaltung'); @@ -188,14 +181,185 @@ function constructMessage() $anmerkung = filter_input(INPUT_POST, 'anmerkung'); if (!empty($anmerkung)) { - $message .= "\n\n"; - $message .= ( $lang == "FR" ? "Remarque : " : "Anmerkung: "); - $message .= "\n" . $anmerkung . "\n\n"; + $message .= "

"; + $message .= ( $lang == "FR" ? "Remarque : " : "Bemerkung: "); + $message .= "
" . $anmerkung . "

"; } return $message; } +//Construct message for support-team +// +//function constructMessageHelpDesk() +//{ +// $lang = ( isset($_POST['sprache']) && $_POST['sprache'] == "FR" ? "FR" : "DE" ); +// +// $messageHD = "\n###" . filter_input(INPUT_POST, 'formularart') . "\n\n\n\n"; +// +// $organisation = filter_input(INPUT_POST, 'organisation'); +// +// if (isset($organisation)) +// { +// $messageHD .= $organisation . "\n\n"; +// } else +// { +// if ( isset( $_POST['gender'] ) ) +// { +// $messageHD .= filter_input(INPUT_POST, 'gender') . " " . filter_input(INPUT_POST, 'vorname') . " " . filter_input(INPUT_POST, 'vorname') . "\n"; +// } +// } +// if (isset($_POST['strasse'])) +// { +// $messageHD .= filter_input(INPUT_POST, 'strasse') . "\n"; +// } +// if (isset($_POST['plz_ort'])) +// { +// $messageHD .= filter_input(INPUT_POST, 'plz_ort') . "\n"; +// } +// if (isset($_POST['telefon'])) +// { +// $messageHD .= ( $lang == "FR" ? "Téléphone: " : "Telefon: "); +// $messageHD .= filter_input(INPUT_POST, 'telefon') . "\n"; +// } +// if (isset($_POST['email'])) +// { +// $messageHD .= ( $lang == "FR" ? "E-mail : " : "E-Mail: "); +// $messageHD .= filter_input(INPUT_POST, 'email') . "\n"; +// } +// if (isset($_POST['zsr_nummer'])) +// { +// $messageHD .= ( $lang == "FR" ? "Nr. RCC : " : "ZSR Nummer: "); +// $messageHD .= filter_input(INPUT_POST, 'zsr_nummer') . "\n\n"; +// } +// if (isset($organisation)) +// { +// if (isset($_POST['gender'])) +// { +// $messageHD .= filter_input(INPUT_POST, 'gender') . " " . filter_input(INPUT_POST, 'vorname') . " " . filter_input(INPUT_POST, 'vorname') . "\n"; +// } +// if (isset($_POST['ansprechpartner_telefon'])) +// { +// $messageHD .= ( $lang == "FR" ? "Personne à contacter Téléphone: " : "Ansprechpartner Telefon: "); +// $messageHD .= filter_input(INPUT_POST, 'ansprechpartner_telefon') . "\n"; +// } +// if (isset($_POST['ansprechpartner_email'])) +// { +// $messageHD .= ( $lang == "FR" ? "Personne à contacter email: " : "Ansprechpartner E-Mail: "); +// $messageHD .= filter_input(INPUT_POST, 'ansprechpartner_email') . "\n\n"; +// } +// } +// +// // Form inputs von Schulungstermin +// $schulungstermin = filter_input(INPUT_POST, 'schulungstermin'); +// if (isset($schulungstermin)) +// { +// $messageHD .= "Schulungstermin: " . "\n" . $schulungstermin . "\n\n"; +// } +// +// // Form inputs von Organisation +// $organisationPaket = filter_input(INPUT_POST, 'organisation-paket'); +// if (isset($organisationPaket)) +// { +// $messageHD .= "Organisation Paket: " . "\n" . $organisationPaket . "\n\n"; +// } +// // Form inputs von Organisation Zusatzmodule +// $zusatzmodulDienstplan = filter_input(INPUT_POST, 'zusatzmodul-dienstplan'); +// if (isset($zusatzmodulDienstplan)) +// { +// $messageHD .= "Zusatzmodul Dienstplan: " . "\n" . $zusatzmodulDienstplan . "\n\n"; +// } +// +// $zusatzmodulTourenplan = filter_input(INPUT_POST, 'zusatzmodul-tourenplan'); +// if (isset($zusatzmodulTourenplan)) +// { +// $messageHD .= "Zusatzmodul Tourenplan: " . "\n" . $zusatzmodulTourenplan . "\n\n"; +// } +// +// // Form inputs von Erstbestellung +// $bestehend = filter_input(INPUT_POST, 'bestehend'); +// if (isset($bestehend)) +// { +// $messageHD .= "***\n"; +// $messageHD .= ( $lang == "FR" ? "Sélectionnée la version d'application: " : "Gewählte Applikations-Version: "); +// $messageHD .= "\n" . $bestehend . "\n\n"; +// +// $servername = filter_input(INPUT_POST, 'servername'); +// +// $messageHD .= ( $lang == "FR" ? "Nom du serveur / de l'instance: " : "Name des Servers / der Instanz: "); +// $messageHD .= "\n" . $servername . "\n\n"; +// } +// +// $modulpop2 = filter_input(INPUT_POST, 'modulpop2'); +// if (isset($modulpop2)) +// { +// $messageHD .= "***\n"; +// $messageHD .= "**Zusatzmodul POP2**: " . $modulpop2 . "\n\n"; +// } +// +// $materialverwaltung = filter_input(INPUT_POST, 'materialverwaltung'); +// if (isset($materialverwaltung)) +// { +// $messageHD .= "***\n"; +// $messageHD .= ( $lang == "FR" ? "**Module en option pour le matériel**: " : "**Zusatzmodul Materialverwaltung**: "); +// $messageHD .= "\n" . $materialverwaltung . "\n\n"; +// } +// +// $qrcode = filter_input(INPUT_POST, 'qrcode'); +// if (isset($qrcode)) +// { +// $messageHD .= "***\n"; +// $messageHD .= ( $lang == "FR" ? "**Module en option QR-Code**: " : "**Zusatzmodul QR-Code**: "); +// $messageHD .= "\n" . $qrcode . "\n\n"; +// } +// +// $wochenbett = filter_input(INPUT_POST, 'wochenbett'); +// if (isset($wochenbett)) +// { +// $messageHD .= "***\n"; +// $messageHD .= ( $lang == "FR" ? "**Avez-vous besoin de la version post-partum?** " : "**Benötigen Sie die Wochenbett-Version?** "); +// $messageHD .= "\n" . $wochenbett . "\n\n"; +// } +// // Form inputs von Zusatzmodule Freiberufliche +// $zusatzmodulPop2 = filter_input(INPUT_POST, 'zusatzmodul-pop2'); +// if (isset($zusatzmodulPop2)) +// { +// $messageHD .= "Zusatzmodul POP2: Jährliche Lizenzkosten 42.00 CHF; Bereitstellung, einmalig 438.00.00 CHF" . "\n"; +// } +// +// $zusatzmodulMaterialverwaltung = filter_input(INPUT_POST, 'zusatzmodul-materialverwaltung'); +// if (isset($zusatzmodulMaterialverwaltung)) +// { +// $messageHD .= ( $lang == "FR" ? "Module supplémentaire gestion du matériel our 138.00 CHF par an, frais unique de mise en service 342.00 CHF" +// : "Zusatzmodul Materialverwaltung: Jährliche Lizenzkosten 138.00 CHF; Bereitstellung, einmalig 342.00 CHF"); +// $messageHD .= "\n"; +// } +// +// $zusatzmodulQrCode = filter_input(INPUT_POST, 'zusatzmodul-qr-code'); +// if (isset($zusatzmodulQrCode)) +// { +// $messageHD .= ( $lang == "FR" ? "Module supplémentaire code QR pour 36.00 CHF par an, frais unique de mise en service 50.00 CHF" +// : "Zusatzmodul QR-Code: Jährliche Lizenzkosten 36.00 CHF; Bereitstellung, einmalig pro Instanz 50.00 CHF"); +// $messageHD .= "\n"; +// } +// +// $zusatzmodulPerigon = filter_input(INPUT_POST, 'zusatzmodul-perigon'); +// if (isset($zusatzmodulPerigon)) +// { +// $messageHD .= "Zusatzmodul Perigon, Bereitstellung, einmalig 50.00 CHF" . "\n"; +// } +// +// $anmerkung = filter_input(INPUT_POST, 'anmerkung'); +// if (!empty($anmerkung)) +// { +// $messageHD .= "\n\n"; +// $messageHD .= ( $lang == "FR" ? "**Votre remarque**: " : "**Ihre Bemerkung**: "); +// $messageHD .= "\n" . $anmerkung . "\n\n"; +// } +// +// return $messageHD; +//} + function constructCustomerMessage($bestellMessage, $langForm) { if ( $langForm == "FR" )