From bf3a8e2a41d04e92907268f6934dc3c976600b07 Mon Sep 17 00:00:00 2001
From: betty <betty@tuxedo.fritz.box>
Date: Mon, 12 Jan 2026 10:40:41 +0100
Subject: [PATCH 1/3] edit messages from form-data

---
 content/german/bestellung/freiberufliche.md | 23 +++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/content/german/bestellung/freiberufliche.md b/content/german/bestellung/freiberufliche.md
index f3fbfb5..e3bdf2d 100644
--- a/content/german/bestellung/freiberufliche.md
+++ b/content/german/bestellung/freiberufliche.md
@@ -161,59 +161,56 @@ kommentar = 'age und hobbies sind honeypots'
                                 <label for="OW">OW: Obwalden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SG" name="SG" value="SG: St Gallen">
+                                <input type="checkbox" id="SG" name="SG" value="SG - St Gallen">
                                <label for="SG">SG: St Gallen</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="SH" name="SH" value="SH: Schaffhausen">
+                                <input type="checkbox" id="SH" name="SH" value="SH - Schaffhausen">
                                 <label for="SH">SH: Schaffhausen</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SO" name="SO" value="SO: Solothurn">
+                                <input type="checkbox" id="SO" name="SO" value="SO - Solothurn">
                                 <label for="SO">SO: Solothurn</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SZ" name="SZ" value="SZ: Schwyz">
+                                <input type="checkbox" id="SZ" name="SZ" value="SZ -  Schwyz">
                                 <label for="SZ">SZ: Schwyz</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="TG" name="TG" value="TG: Thurgau">
+                                <input type="checkbox" id="TG" name="TG" value="TG - Thurgau">
                                <label for="TG">TG: Thurgau</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="UR" name="UR" value="UR: Uri">
+                                <input type="checkbox" id="UR" name="UR" value="UR - Uri">
                                 <label for="UR">UR: Uri</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="VD" name="VD" value="VD: Waadt">
+                                <input type="checkbox" id="VD" name="VD" value="VD - Waadt">
                                 <label for="VD">VD: Waadt</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="VS" name="VS" value="VS: Wallis">
+                                <input type="checkbox" id="VS" name="VS" value="VS - Wallis">
                                 <label for="VS">VS: Wallis</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="ZG" name="ZG" value="ZG: Zug">
+                                <input type="checkbox" id="ZG" name="ZG" value="ZG - Zug">
                                <label for="ZG">ZG: Zug</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="ZH" name="ZH" value="ZH: Zürich">
+                                <input type="checkbox" id="ZH" name="ZH" value="ZH - Zürich">
                                 <label for="ZH">ZH: Zürich</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                &nbsp;
                             </td>
                             <td>
-                                &nbsp;
                             </td>
                             <td>
-                               &nbsp;
                             </td>
                         </tr>
                     </table>

From a232043d23da7e6b2de78b50a23f47eb92826515 Mon Sep 17 00:00:00 2001
From: betty <betty@tuxedo.fritz.box>
Date: Mon, 12 Jan 2026 11:17:29 +0100
Subject: [PATCH 2/3] edit messages from form-data

---
 content/german/bestellung/freiberufliche.md | 20 +++++++-------
 static/php/message.php                      | 30 ++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/content/german/bestellung/freiberufliche.md b/content/german/bestellung/freiberufliche.md
index e3bdf2d..898bf99 100644
--- a/content/german/bestellung/freiberufliche.md
+++ b/content/german/bestellung/freiberufliche.md
@@ -161,49 +161,49 @@ kommentar = 'age und hobbies sind honeypots'
                                 <label for="OW">OW: Obwalden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SG" name="SG" value="SG - St Gallen">
+                                <input type="checkbox" id="SG" name="SG" value="SG: St Gallen">
                                <label for="SG">SG: St Gallen</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="SH" name="SH" value="SH - Schaffhausen">
+                                <input type="checkbox" id="SH" name="SH" value="SH: Schaffhausen">
                                 <label for="SH">SH: Schaffhausen</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SO" name="SO" value="SO - Solothurn">
+                                <input type="checkbox" id="SO" name="SO" value="SO: Solothurn">
                                 <label for="SO">SO: Solothurn</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="SZ" name="SZ" value="SZ -  Schwyz">
+                                <input type="checkbox" id="SZ" name="SZ" value="SZ: Schwyz">
                                 <label for="SZ">SZ: Schwyz</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="TG" name="TG" value="TG - Thurgau">
+                                <input type="checkbox" id="TG" name="TG" value="TG: Thurgau">
                                <label for="TG">TG: Thurgau</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="UR" name="UR" value="UR - Uri">
+                                <input type="checkbox" id="UR" name="UR" value="UR: Uri">
                                 <label for="UR">UR: Uri</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="VD" name="VD" value="VD - Waadt">
+                                <input type="checkbox" id="VD" name="VD" value="VD: Waadt">
                                 <label for="VD">VD: Waadt</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="VS" name="VS" value="VS - Wallis">
+                                <input type="checkbox" id="VS" name="VS" value="VS: Wallis">
                                 <label for="VS">VS: Wallis</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
-                                <input type="checkbox" id="ZG" name="ZG" value="ZG - Zug">
+                                <input type="checkbox" id="ZG" name="ZG" value="ZG: Zug">
                                <label for="ZG">ZG: Zug</label>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <input type="checkbox" id="ZH" name="ZH" value="ZH - Zürich">
+                                <input type="checkbox" id="ZH" name="ZH" value="ZH: Zürich">
                                 <label for="ZH">ZH: Zürich</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             </td>
                             <td>
diff --git a/static/php/message.php b/static/php/message.php
index ca70307..70db7dd 100644
--- a/static/php/message.php
+++ b/static/php/message.php
@@ -132,21 +132,21 @@ function constructMessage()
 
 	// form inputs cantons - only FPP
 	$arrAllCantons = [ "AG", "AI", "AR", "BE", "BL", "BS", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SO", "SZ", "TG", "UR", "VD", "VS", "ZG", "ZH" ];
-	if ( ! isset($organisation) && $lang == "DE" )
-	{
-		$message .= "<hr/><p><b>";
-		$message .= "Kantone, in denen Sie eine Bewilligung (beantragt) haben";
-		$message .= "</b><br/>";
-		foreach ( $arrAllCantons as $abbreviation )
-		{
-			if ( isset(filter_input(INPUT_POST, $abbreviation)) )
-			{
-				$message .= filter_input(INPUT_POST, $abbreviation) . "<br/>";
-			}
-		}
-		
-		$message .= "</p>";
-	}
+//	if ( ! isset($organisation) && $lang == "DE" )
+//	{
+//		$message .= "<hr/><p><b>";
+//		$message .= "Kantone, in denen Sie eine Bewilligung (beantragt) haben";
+//		$message .= "</b><br/>";
+//		foreach ( $arrAllCantons as $abbreviation )
+//		{
+//			if ( isset(filter_input(INPUT_POST, $abbreviation)) )
+//			{
+//				$message .= filter_input(INPUT_POST, $abbreviation) . "<br/>";
+//			}
+//		}
+//		
+//		$message .= "</p>";
+//	}
 	
 	$modulpop2 = filter_input(INPUT_POST, 'modulpop2');
 	if (isset($modulpop2))

From 4f4bd56766c8416f41390ac1f5819ced65de361b Mon Sep 17 00:00:00 2001
From: betty <betty@tuxedo.fritz.box>
Date: Mon, 12 Jan 2026 11:24:33 +0100
Subject: [PATCH 3/3] edit messages from form-data

---
 content/german/bestellung/freiberufliche.md | 39 +++++++++++----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/content/german/bestellung/freiberufliche.md b/content/german/bestellung/freiberufliche.md
index 898bf99..0156c03 100644
--- a/content/german/bestellung/freiberufliche.md
+++ b/content/german/bestellung/freiberufliche.md
@@ -96,15 +96,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="AG" name="AG" value="AG: Aargau">
-                                <label for="AG">AG: Aargau</label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="AG">AG: Aargau</label> 
                             </td>
                             <td>
                                     <input type="checkbox" id="AI" name="AI" value="AI: Appenzell Innerrhoden">
-                                    <label for="AI">AI: Appenzell Innerrhoden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <label for="AI">AI: Appenzell Innerrhoden</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="AR" name="AR" value="AR: Appenzell Ausserrhoden">
-                                <label for="AR">AR: Appenzell Ausserrhoden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="AR">AR: Appenzell Ausserrhoden</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="BE" name="BE" value="BE: Bern">
@@ -114,15 +114,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="BL" name="BL" value="BL: Basel-Landschaft">
-                                <label for="BL">BL: Basel-Landschaft</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="BL">BL: Basel-Landschaft</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="BS" name="BS" value="BS: Basel-Stadt">
-                                <label for="BS">BS: Basel-Stadt</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="BS">BS: Basel-Stadt</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="FR" name="FR" value="FR: Freiburg">
-                                <label for="FR">FR: Freiburg</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="FR">FR: Freiburg</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="GE" name="GE" value="GE: Genf">
@@ -132,15 +132,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="GL" name="GL" value="GL: Glarus">
-                                <label for="GL">GL: Glarus</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="GL">GL: Glarus</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="GR" name="GR" value="GR: Graubünden">
-                                <label for="GR">GR: Graubünden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="GR">GR: Graubünden</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="JU" name="JU" value="JU: Jura">
-                                <label for="JU">JU: Jura</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="JU">JU: Jura</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="LU" name="LU" value="LU: Luzern">
@@ -150,15 +150,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="NE" name="NE" value="NE: Neuenburg">
-                                <label for="NE">NE: Neuenburg</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="NE">NE: Neuenburg</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="NW" name="NW" value="NW: Nidwalden">
-                                <label for="NW">NW: Nidwalden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="NW">NW: Nidwalden</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="OW" name="OW" value="OW: Obwalden">
-                                <label for="OW">OW: Obwalden</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="OW">OW: Obwalden</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="SG" name="SG" value="SG: St Gallen">
@@ -168,15 +168,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="SH" name="SH" value="SH: Schaffhausen">
-                                <label for="SH">SH: Schaffhausen</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="SH">SH: Schaffhausen</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="SO" name="SO" value="SO: Solothurn">
-                                <label for="SO">SO: Solothurn</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="SO">SO: Solothurn</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="SZ" name="SZ" value="SZ: Schwyz">
-                                <label for="SZ">SZ: Schwyz</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="SZ">SZ: Schwyz</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="TG" name="TG" value="TG: Thurgau">
@@ -186,15 +186,15 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="UR" name="UR" value="UR: Uri">
-                                <label for="UR">UR: Uri</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="UR">UR: Uri</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="VD" name="VD" value="VD: Waadt">
-                                <label for="VD">VD: Waadt</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="VD">VD: Waadt</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="VS" name="VS" value="VS: Wallis">
-                                <label for="VS">VS: Wallis</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="VS">VS: Wallis</label>
                             </td>
                             <td>
                                 <input type="checkbox" id="ZG" name="ZG" value="ZG: Zug">
@@ -204,7 +204,7 @@ kommentar = 'age und hobbies sind honeypots'
                         <tr>
                             <td>
                                 <input type="checkbox" id="ZH" name="ZH" value="ZH: Zürich">
-                                <label for="ZH">ZH: Zürich</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <label for="ZH">ZH: Zürich</label>
                             </td>
                             <td>
                             </td>
@@ -214,6 +214,7 @@ kommentar = 'age und hobbies sind honeypots'
                             </td>
                         </tr>
                     </table>
+        </div>
         <div>
             <label for="modulpop2">Wünschen Sie die Erweiterung um das Modul POP2?</label>
             <select id="modulpop2" name="modulpop2" required >