From da2f86036af05f16ed8d029899be606ba63abc10 Mon Sep 17 00:00:00 2001
From: Torsten Stauder <stauder@ts-cs.de>
Date: Tue, 24 Mar 2020 23:13:11 +0100
Subject: [PATCH] regexp-fix: wrong escaping due to *char-transform

---
 html/website.html | 2 +-
 processHtml.py    | 3 +++
 src/websiteMgmt.h | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/html/website.html b/html/website.html
index a84b90d..a128eed 100644
--- a/html/website.html
+++ b/html/website.html
@@ -131,7 +131,7 @@
             </div>
             <div class="form-group my-2 col-md-6">
                 <label for="mqttServer">MQTT-Server (IP-Adresse)</label>
-                <input type="text" class="form-control" id="mqttServer" pattern="^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$" minlength="7" maxlength="15" placeholder="z.B. 192.168.2.89" name="mqttServer" value="%MQTT_SERVER%">
+                <input type="text" class="form-control" id="mqttServer" pattern="^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$" minlength="7" maxlength="15" placeholder="z.B. 192.168.2.89" name="mqttServer" value="%MQTT_SERVER%">
                 <div class="invalid-feedback">
                   Bitte eine gültige IPv4-Adresse eingeben, z.B. 192.168.2.89.
                 </div>
diff --git a/processHtml.py b/processHtml.py
index a4a533c..9267213 100644
--- a/processHtml.py
+++ b/processHtml.py
@@ -6,6 +6,9 @@ content2 = ''
 with open('html/website.html', 'r') as r:
     data = r.read().replace('\n', '\\\n')
     data = data.replace('\"', '\\"')
+    data = data.replace('\\d', '\\\d')
+    data = data.replace('\\.', '\\\.')
+    data = data.replace('\\^', '\\\\^')
     content += data
 
 with open('src/websiteMgmt.h', 'w') as w:
diff --git a/src/websiteMgmt.h b/src/websiteMgmt.h
index 279a915..a2a557b 100644
--- a/src/websiteMgmt.h
+++ b/src/websiteMgmt.h
@@ -72,7 +72,7 @@ static const char mgtWebsite[] PROGMEM = "<!DOCTYPE html>\
                 <label for=\"rfidIdMusic\">RFID-Chip-Nummer (12-stellig)</label>\
                 <input type=\"text\" class=\"form-control\" id=\"rfidIdMusic\" maxlength=\"12\" pattern=\"[0-9]{12}\" placeholder=\"%RFID_TAG_ID%\" name=\"rfidIdMusic\" required>\
                 <label for=\"fileOrUrl\">Datei, Verzeichnis oder URL (^ und # als Zeichen nicht erlaubt)</label>\
-                <input type=\"text\" class=\"form-control\" id=\"fileOrUrl\" maxlength=\"255\" placeholder=\"z.B. /mp3/Hoerspiele/Yakari/Yakari_und_seine_Freunde.mp3\" pattern=\"^[^\^#]+$\" name=\"fileOrUrl\" required>\
+                <input type=\"text\" class=\"form-control\" id=\"fileOrUrl\" maxlength=\"255\" placeholder=\"z.B. /mp3/Hoerspiele/Yakari/Yakari_und_seine_Freunde.mp3\" pattern=\"^[^\\^#]+$\" name=\"fileOrUrl\" required>\
                 <label for=\"playMode\">Abspielmodus</label>\
                 <select class=\"form-control\" id=\"playMode\" name=\"playMode\">\
                     <option value=\"1\">Einzelner Titel</option>\
@@ -131,7 +131,7 @@ static const char mgtWebsite[] PROGMEM = "<!DOCTYPE html>\
             </div>\
             <div class=\"form-group my-2 col-md-6\">\
                 <label for=\"mqttServer\">MQTT-Server (IP-Adresse)</label>\
-                <input type=\"text\" class=\"form-control\" id=\"mqttServer\" pattern=\"^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$\" minlength=\"7\" maxlength=\"15\" placeholder=\"z.B. 192.168.2.89\" name=\"mqttServer\" value=\"%MQTT_SERVER%\">\
+                <input type=\"text\" class=\"form-control\" id=\"mqttServer\" pattern=\"^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$\" minlength=\"7\" maxlength=\"15\" placeholder=\"z.B. 192.168.2.89\" name=\"mqttServer\" value=\"%MQTT_SERVER%\">\
                 <div class=\"invalid-feedback\">\
                   Bitte eine gültige IPv4-Adresse eingeben, z.B. 192.168.2.89.\
                 </div>\
