From 780c0f96dd52d6a1035a3be0ae8dfc7fec8dbdd5 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 09:13:56 +0200
Subject: [PATCH 001/291] removed contact form
---
content/french/contact.md | 56 +++-----------------------------------
content/german/kontakt.md | 57 +++------------------------------------
2 files changed, 6 insertions(+), 107 deletions(-)
diff --git a/content/french/contact.md b/content/french/contact.md
index 63c7634..4e8289f 100644
--- a/content/french/contact.md
+++ b/content/french/contact.md
@@ -23,60 +23,10 @@ kontaktformular = true
Vous pouvez nous joindre **du lundi au vendredi de 8h00 à 16h00.**
-Veuillez nous envoyer votre demande via le formulaire de contact.
-Nous vous contacterons dans les plus brefs délais.
+Par téléphone au : 079 393 86 83
+
+Ainsi que par courriel à : support "at" verua.ch
{{% /aligncenter %}}
-
-
-
-
{{% /section %}}
diff --git a/content/german/kontakt.md b/content/german/kontakt.md
index 8eed883..4f5ff3a 100644
--- a/content/german/kontakt.md
+++ b/content/german/kontakt.md
@@ -23,60 +23,9 @@ kontaktformular = true
Sie erreichen uns **werktags zwischen 8:00 Uhr und 16:00 Uhr.**
-Bitte schreiben Sie uns Ihr Anliegen per Kontaktformular.
-Wir nehmen zeitnah Kontakt zu Ihnen auf.
+Telefonisch unter: 079 393 86 83
+
+Sowie per E-Mail unter: support "at" verua.ch
{{% /aligncenter %}}
-
-
-
{{% /section %}}
From 191b305599bf0507a9494b256124746cee528f22 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 09:15:51 +0200
Subject: [PATCH 002/291] update
---
.gitea/workflows/build-and-deploy-pipeline.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml
index 7395958..12cc7b2 100644
--- a/.gitea/workflows/build-and-deploy-pipeline.yaml
+++ b/.gitea/workflows/build-and-deploy-pipeline.yaml
@@ -4,6 +4,7 @@ on:
push:
branches:
- main
+ - kontaktformular-deaktiviert
jobs:
buildAndDeploy:
From a417743cd2ae8b4da57838d9d97f5c1ba2a6e79f Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 09:23:34 +0200
Subject: [PATCH 003/291] removed @ from Emails and phone number from contakt
pages
---
content/french/contact.md | 2 --
content/french/sections/footer.md | 2 +-
content/german/kontakt.md | 2 --
content/german/sections/footer.md | 4 ++--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/content/french/contact.md b/content/french/contact.md
index 4e8289f..f84fde1 100644
--- a/content/french/contact.md
+++ b/content/french/contact.md
@@ -23,8 +23,6 @@ kontaktformular = true
Vous pouvez nous joindre **du lundi au vendredi de 8h00 à 16h00.**
-Par téléphone au : 079 393 86 83
-
Ainsi que par courriel à : support "at" verua.ch
{{% /aligncenter %}}
diff --git a/content/french/sections/footer.md b/content/french/sections/footer.md
index 68d110a..a975c16 100644
--- a/content/french/sections/footer.md
+++ b/content/french/sections/footer.md
@@ -21,7 +21,7 @@ CH-8253 Diessenhofen
079 393 86 83
-support@verua.ch
+support"at"verua.ch
diff --git a/content/german/kontakt.md b/content/german/kontakt.md
index 4f5ff3a..cdb3eea 100644
--- a/content/german/kontakt.md
+++ b/content/german/kontakt.md
@@ -23,8 +23,6 @@ kontaktformular = true
Sie erreichen uns **werktags zwischen 8:00 Uhr und 16:00 Uhr.**
-Telefonisch unter: 079 393 86 83
-
Sowie per E-Mail unter: support "at" verua.ch
{{% /aligncenter %}}
diff --git a/content/german/sections/footer.md b/content/german/sections/footer.md
index 7d39497..799afc0 100644
--- a/content/german/sections/footer.md
+++ b/content/german/sections/footer.md
@@ -19,7 +19,7 @@ CH-8253 Diessenhofen
079 393 86 83
-support@verua.ch
+support"at"verua.ch
@@ -42,4 +42,4 @@ support@verua.ch
{{% /columns %}}
-{{% /aligncenter %}}
\ No newline at end of file
+{{% /aligncenter %}}
From 35ee0eeb4ba7ee74cb031e25e609a72bb999bc85 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 10:01:04 +0200
Subject: [PATCH 004/291] removed @ sign from emails
---
content/french/sections/footer.md | 2 +-
content/german/sections/footer.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/content/french/sections/footer.md b/content/french/sections/footer.md
index 68d110a..a975c16 100644
--- a/content/french/sections/footer.md
+++ b/content/french/sections/footer.md
@@ -21,7 +21,7 @@ CH-8253 Diessenhofen
079 393 86 83
-support@verua.ch
+support"at"verua.ch
diff --git a/content/german/sections/footer.md b/content/german/sections/footer.md
index 7d39497..799afc0 100644
--- a/content/german/sections/footer.md
+++ b/content/german/sections/footer.md
@@ -19,7 +19,7 @@ CH-8253 Diessenhofen
079 393 86 83
-support@verua.ch
+support"at"verua.ch
@@ -42,4 +42,4 @@ support@verua.ch
{{% /columns %}}
-{{% /aligncenter %}}
\ No newline at end of file
+{{% /aligncenter %}}
From af62a449e6b4ad4573be3e1a798cce7b41a478d2 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 11:07:05 +0200
Subject: [PATCH 005/291] added filter for curren spam mails
---
assets/js/kontaktformular.js | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/assets/js/kontaktformular.js b/assets/js/kontaktformular.js
index a3f63bf..606b3bc 100644
--- a/assets/js/kontaktformular.js
+++ b/assets/js/kontaktformular.js
@@ -1,5 +1,5 @@
// Configuration and Messages
-const debugEnabled = false
+const debugEnabled = true
const mouseDebugEnabled = false
const zsrCheckEnabled = false
const interactionThreshold = 15 // Time in seconds
@@ -43,6 +43,11 @@ const captcha = document.querySelectorAll('.captcha')
const captchaInput = document.querySelectorAll('.captcha-input')
const captchaVerifyButton = document.querySelectorAll('.captcha-verify')
const botBadge = document.createElement('div')
+
+// Form fields
+const subjectField = document.getElementById('subject')
+const messageField = document.getElementById('description')
+
if (debugEnabled) {
botBadge.className = 'bot-badge'
document.body.appendChild(botBadge)
@@ -102,6 +107,9 @@ function handleMouseMove(event) {
function checkForBotBehavior() {
let timeSpent = (Date.now() - startTime) / 1000
botDetected =
+ subjectField.value === "I promised." ||
+// or if messageField Has string "Hi, this is" in it
+ messageField.value.startsWith("Hi, this is") ||
!userInteracted ||
interactionCount === 0 ||
honeypotInput1.value !== '' ||
@@ -131,7 +139,11 @@ function checkForBotBehavior() {
' honeypotInput2:' +
honeypotInput2.value +
' verifyEmailInput:' +
- verifyEmailInput.value
+ verifyEmailInput.value +
+ ' subjectField:' +
+ subjectField.value +
+ ' messageField:' +
+ messageField.value
)
}
function handleSubmit(e) {
@@ -144,7 +156,6 @@ function handleSubmit(e) {
fakeOut()
return false
}
-
const formData = new FormData(form)
const formDataEncoded = new URLSearchParams(formData).toString()
const formURL = form.action + '.json'
@@ -164,7 +175,7 @@ function handleSubmit(e) {
})
.then((data) => {
submitButton.disabled = true
- submitButton.innerHTML = `
+ submitButton.innerHTML = `
`
setTimeout(() => {
@@ -189,7 +200,7 @@ function handleSubmit(e) {
}
function fakeOut() {
submitButton.disabled = true
- submitButton.innerHTML = `
+ submitButton.innerHTML = `
`
setTimeout(() => {
From 8445bb23ab771dd631b94c8e83c97ea99289c7ef Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 11:09:36 +0200
Subject: [PATCH 006/291] added current branch to build
---
.gitea/workflows/build-and-deploy-pipeline.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitea/workflows/build-and-deploy-pipeline.yaml b/.gitea/workflows/build-and-deploy-pipeline.yaml
index 7395958..d753ffe 100644
--- a/.gitea/workflows/build-and-deploy-pipeline.yaml
+++ b/.gitea/workflows/build-and-deploy-pipeline.yaml
@@ -4,6 +4,7 @@ on:
push:
branches:
- main
+ - kontaktformular-filter-spam
jobs:
buildAndDeploy:
From 7de49d32d34311441789344b823d57f59275d4b7 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 11:22:26 +0200
Subject: [PATCH 007/291] added filtering for bot known bot subject and
textarea
---
assets/js/bestellformular.js | 10 +++++++++-
assets/js/kontaktformular.js | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/assets/js/bestellformular.js b/assets/js/bestellformular.js
index 314539b..b7c81c8 100644
--- a/assets/js/bestellformular.js
+++ b/assets/js/bestellformular.js
@@ -41,6 +41,11 @@ const textInputs = document.querySelectorAll('input[type="text"]')
const captcha = document.querySelectorAll('.captcha')
const captchaInput = document.querySelectorAll('.captcha-input')
const captchaVerifyButton = document.querySelectorAll('.captcha-verify')
+
+// Form fields
+const subjectField = document.getElementById('subject')
+const messageField = document.getElementById('description')
+
const botBadge = document.createElement('div')
if (debugEnabled) {
botBadge.className = 'bot-badge'
@@ -112,6 +117,9 @@ function validateZSRNumber(form) {
function checkForBotBehavior() {
let timeSpent = (Date.now() - startTime) / 1000
botDetected =
+ subjectField.value === "I promised." ||
+// or if messageField Has string "Hi, this is" in it
+ messageField.value.startsWith("Hi, this is") ||
!userInteracted ||
interactionCount === 0 ||
timeSpent < interactionThreshold ||
@@ -176,7 +184,7 @@ function handleSubmit(e) {
})
.then((data) => {
submitButton.disabled = true
- submitButton.innerHTML = `
+ submitButton.innerHTML = `
`
setTimeout(() => {
diff --git a/assets/js/kontaktformular.js b/assets/js/kontaktformular.js
index 606b3bc..449ebe0 100644
--- a/assets/js/kontaktformular.js
+++ b/assets/js/kontaktformular.js
@@ -1,5 +1,5 @@
// Configuration and Messages
-const debugEnabled = true
+const debugEnabled = false
const mouseDebugEnabled = false
const zsrCheckEnabled = false
const interactionThreshold = 15 // Time in seconds
From 304c20e618d87d226fb3b8bc06ad0fd91e6ce737 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 12:13:24 +0200
Subject: [PATCH 008/291] setup method to handle logs of submissions
---
assets/js/kontaktformular.js | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/assets/js/kontaktformular.js b/assets/js/kontaktformular.js
index 449ebe0..a47ef94 100644
--- a/assets/js/kontaktformular.js
+++ b/assets/js/kontaktformular.js
@@ -107,9 +107,9 @@ function handleMouseMove(event) {
function checkForBotBehavior() {
let timeSpent = (Date.now() - startTime) / 1000
botDetected =
- subjectField.value === "I promised." ||
-// or if messageField Has string "Hi, this is" in it
- messageField.value.startsWith("Hi, this is") ||
+ subjectField.value === 'I promised.' ||
+ // or if messageField Has string "Hi, this is" in it
+ messageField.value.startsWith('Hi, this is') ||
!userInteracted ||
interactionCount === 0 ||
honeypotInput1.value !== '' ||
@@ -146,6 +146,26 @@ function checkForBotBehavior() {
messageField.value
)
}
+
+// function logSubmission() {
+// console.log('in logSubmission()')
+// const data = { logData: 'Hi, this is some log data from JavaScript.' }
+// fetch('/php/log.php', {
+// method: 'POST',
+// headers: {
+// 'Content-Type': 'application/json',
+// },
+// body: JSON.stringify(data),
+// })
+// .then((response) => response.json())
+// .then((data) => {
+// console.log('Success:', data)
+// })
+// .catch((error) => {
+// console.error('Error:', error)
+// })
+// }
+//
function handleSubmit(e) {
e.preventDefault()
@@ -160,6 +180,10 @@ function handleSubmit(e) {
const formDataEncoded = new URLSearchParams(formData).toString()
const formURL = form.action + '.json'
+ // logSubmission()
+ // fakeOut()
+ // return false
+
fetch(formURL, {
method: 'POST',
headers: {
From 5c401526bb25f86784ddc3c5ae8e2ece436fb0bf Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 12:17:54 +0200
Subject: [PATCH 009/291] fixed bestellformular
---
assets/js/bestellformular.js | 5 -----
1 file changed, 5 deletions(-)
diff --git a/assets/js/bestellformular.js b/assets/js/bestellformular.js
index b7c81c8..0467bdd 100644
--- a/assets/js/bestellformular.js
+++ b/assets/js/bestellformular.js
@@ -43,8 +43,6 @@ const captchaInput = document.querySelectorAll('.captcha-input')
const captchaVerifyButton = document.querySelectorAll('.captcha-verify')
// Form fields
-const subjectField = document.getElementById('subject')
-const messageField = document.getElementById('description')
const botBadge = document.createElement('div')
if (debugEnabled) {
@@ -117,9 +115,6 @@ function validateZSRNumber(form) {
function checkForBotBehavior() {
let timeSpent = (Date.now() - startTime) / 1000
botDetected =
- subjectField.value === "I promised." ||
-// or if messageField Has string "Hi, this is" in it
- messageField.value.startsWith("Hi, this is") ||
!userInteracted ||
interactionCount === 0 ||
timeSpent < interactionThreshold ||
From 72bdab6785a4439ab513d0358ebd668d35909598 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 12:38:59 +0200
Subject: [PATCH 010/291] added Verua email to order form
---
static/php/ajaxmail.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index 62cbefc..7acf297 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -27,7 +27,7 @@ try {
// Es handelt sich wahrscheinlich um einen Bot
$subject = 'Botverdacht - ' . $subject;
}
-
+
if (empty($name) || !filter_var($email, FILTER_VALIDATE_EMAIL) || empty($message)) {
// Invalid input
throw new Exception('Ungültige Eingabedaten.');
@@ -44,11 +44,9 @@ try {
$mail->Port = 465; // TCP port for the connection
// Recipients
- $mail->setFrom($email, $name); // Sender address
+ $mail->setFrom('support@verua.ch', 'Verua Support'); // Sender address
$mail->addAddress('ah@mediendesign-hnida.de', 'Andreas Hnida'); // Add recipient
- // $mail->addAddress('bettina.rasberger@rabe-web.ch', 'Bettina Rasberger'); // Add another recipient
- // $mail->addAddress('norbert.wagner@verua.ch'); // Add another recipient
- $mail->addReplyTo($email, $name); // Set reply address
+ $mail->addAddress('support@verua.ch', 'Verua Support'); // Add another recipient
$mail->addBCC('ah@mediendesign-hnida.de'); // Add bounce email address as BCC
// Content
From 67a64b1bf8e3a85f1943afa13da0c2061fb38d2c Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Mon, 13 May 2024 13:21:01 +0200
Subject: [PATCH 011/291] fixed Typos from plan.io ticket
---
.../french/commande/infirmier-independant.md | 4 ++--
content/german/bestellung/freiberufliche.md | 4 ++--
content/german/bestellung/organisationen.md | 8 ++++----
.../blog/rueckwirkende-tarife-kanton-fr.md | 4 ++--
content/german/preisliste/freiberufliche.md | 2 +-
content/german/preisliste/organisationen.md | 2 +-
static/php/log.php | 20 +++++++++++++++++++
7 files changed, 32 insertions(+), 12 deletions(-)
create mode 100644 static/php/log.php
diff --git a/content/french/commande/infirmier-independant.md b/content/french/commande/infirmier-independant.md
index 5f7808e..6336e39 100644
--- a/content/french/commande/infirmier-independant.md
+++ b/content/french/commande/infirmier-independant.md
@@ -89,8 +89,8 @@ bestellformular = true
-
-
+
+
diff --git a/content/german/bestellung/freiberufliche.md b/content/german/bestellung/freiberufliche.md
index 796ecdb..ca396cc 100644
--- a/content/german/bestellung/freiberufliche.md
+++ b/content/german/bestellung/freiberufliche.md
@@ -91,8 +91,8 @@ kommentar = 'age und hobbies sind honeypots'
-
-
+
+
diff --git a/content/german/bestellung/organisationen.md b/content/german/bestellung/organisationen.md
index cedeea4..98738c6 100644
--- a/content/german/bestellung/organisationen.md
+++ b/content/german/bestellung/organisationen.md
@@ -109,7 +109,7 @@ Abrechnung und Statistik
**Vorbereitung des System**
-Konfiguration und Inbetriebnahme gesicherte URL (https://ihr-spitex-name.verua.ch) Datenbankerstellung und Anpassung an
+Konfiguration und Inbetriebnahme gesicherte URL (https://ihr-spitex-name.verua.org) Datenbankerstellung und Anpassung an
die Bedürfnisse der Organisation
**Systemeinführung**
@@ -133,7 +133,7 @@ Pflegeplanung (2. Auflage) in VeruA \*\* Verwaltung und Abrechnung erstellt, ged
**Vorbereitung des System**
-Konfiguration und Inbetriebnahme gesicherte URL (https://ihr-spitex-name.verua.ch) Datenbankerstellung und Anpassung an
+Konfiguration und Inbetriebnahme gesicherte URL (https://ihr-spitex-name.verua.org) Datenbankerstellung und Anpassung an
die Bedürfnisse der Organisation
**Systemeinführung**
@@ -150,8 +150,8 @@ Verwaltung und Abrechnung
-
-
+
+
diff --git a/content/german/blog/rueckwirkende-tarife-kanton-fr.md b/content/german/blog/rueckwirkende-tarife-kanton-fr.md
index f71a2fc..909a10a 100644
--- a/content/german/blog/rueckwirkende-tarife-kanton-fr.md
+++ b/content/german/blog/rueckwirkende-tarife-kanton-fr.md
@@ -14,8 +14,8 @@ Mit dem Update auf die **Version 8.11** werden sowohl die **Tarife** als auch da
Bitte passen Sie die Restkosten gemäss **unserer Ableitung** an.
Danach können Sie Ihre Rechnungen für den Kanton Freiburg wie gewohnt erstellen.
-Bis zum **Abrechnungsmonat Juni 2022** dürfen SIe mit den alten Tarifen abrechnen. Wir haben mit Frau Bachmann (zuständig für die Restkosten im Kanton Freiburg) vereinbart, dass sie Ihre Rechnungen prüft und ggf. den **Differenbetrag zu den neuen Tarifen** vergüten wird.
+Bis zum **Abrechnungsmonat Juni 2022** dürfen SIe mit den alten Tarifen abrechnen. Wir haben mit Frau Bachmann (zuständig für die Restkosten im Kanton Freiburg) vereinbart, dass sie Ihre Rechnungen prüft und ggf. den **Differenzbetrag zu den neuen Tarifen** vergüten wird.
Damit die Zahlen in VeruA mit den Zahlunges des Kantons überein stimmen, kann ein Flexibler Tarif eingesetzt werden. Unser Support unterstützt Sie gerne dabei, den Differenzbetrag als Flexiblen Tarif **nachgängig** zuzuordnen.
-Für die Abrechnung **Juli 2022** werden nach erfolgreichem Tarif-Update die neuen Tarife des Kanton Freiburg angewendet und Sie können wie gewohnt abrechnen.
\ No newline at end of file
+Für die Abrechnung **Juli 2022** werden nach erfolgreichem Tarif-Update die neuen Tarife des Kanton Freiburg angewendet und Sie können wie gewohnt abrechnen.
diff --git a/content/german/preisliste/freiberufliche.md b/content/german/preisliste/freiberufliche.md
index c60a2fc..341d900 100644
--- a/content/german/preisliste/freiberufliche.md
+++ b/content/german/preisliste/freiberufliche.md
@@ -71,7 +71,7 @@ Miete für ein Jahr.
### {{% icon size="3xl" color="slate-900" name="shopping-basket" %}} Anschaffungskosten
-| Optional: Zusatzmodul Material | 138.00 CHF |
+| Optional: Zusatzmodul Material | 342.00 CHF |
| ------------------------------ | ---------: |
_Erhöhung Bereitstellungs-Gebühr zum 21.02.2022, erste Preis-Anpassung seit dem 01.06.2014_
diff --git a/content/german/preisliste/organisationen.md b/content/german/preisliste/organisationen.md
index aabd41d..46f25fb 100644
--- a/content/german/preisliste/organisationen.md
+++ b/content/german/preisliste/organisationen.md
@@ -171,7 +171,7 @@ Das Modul ist nach dem Freischalten auf **5 Lizenzen** begrenzt.
Die Lizenzen für das Zusatzmodul DP und TP hängen immer zusammen. Mitarbeiter, die für das Zusatzmodul DP lizensiert sind, sind automatisch auch für das Zusatzmodul TP lizensiert.
Sie können jederzeit Lizenzen in **3er-Schritten** nachbuchen.
-| Lizenzerhöhung Zusatzmodul TP um 3 weitere Lizenzen - monatliche Gebühr | 240.00 CHF |
+| Lizenzerhöhung Zusatzmodul TP um 3 weitere Lizenzen - monatliche Gebühr | 24.00 CHF |
| ----------------------------------------------------------------------- | ---------: |
Sie können jederzeit Lizenzen in **3er-Schritten** nachbuchen.
diff --git a/static/php/log.php b/static/php/log.php
new file mode 100644
index 0000000..012ae4a
--- /dev/null
+++ b/static/php/log.php
@@ -0,0 +1,20 @@
+ "success", "message" => "Data logged successfully"]);
+} else {
+ // Handle incorrect request method
+ http_response_code(405);
+ echo json_encode(["status" => "error", "message" => "Method not allowed"]);
+}
+?>
From 231d000b43912ab59d86a19419dfbe2eb5603830 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 14 May 2024 20:14:29 +0200
Subject: [PATCH 012/291] changed smtp server
---
static/php/ajaxmail.php | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index 7acf297..14407b7 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -20,14 +20,6 @@ try {
$subject = strip_tags(trim(filter_input(INPUT_POST, 'formularart')));
// Construct the message using the function from message.php
$message = constructMessage();
-
- $bot = $_POST['tra'] ;
-
- if ($bot == 'true') {
- // Es handelt sich wahrscheinlich um einen Bot
- $subject = 'Botverdacht - ' . $subject;
- }
-
if (empty($name) || !filter_var($email, FILTER_VALIDATE_EMAIL) || empty($message)) {
// Invalid input
throw new Exception('Ungültige Eingabedaten.');
@@ -36,10 +28,10 @@ try {
// Server settings
//$mail->SMTPDebug = SMTP::DEBUG_SERVER; // Enable this for detailed debugging
$mail->isSMTP(); // Use SMTP
- $mail->Host = 'sslout.de'; // Set SMTP server
+ $mail->Host = 'ophelia.kreativmedia.ch'; // Set SMTP server
$mail->SMTPAuth = true; // Enable SMTP authentication
- $mail->Username = 'ah@mediendesign-hnida.de'; // SMTP username
- $mail->Password = 'jrd9h7RnVjf/'; // SMTP password
+ $mail->Username = 'email'; // SMTP username
+ $mail->Password = 'zki@U/*{A]}3#kS/Lg|)l]t:,XHuV=8l_'; // SMTP password
$mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; // Enable encryption
$mail->Port = 465; // TCP port for the connection
From 3c1486219211a804b78b419e896910efc8d180e9 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 14 May 2024 20:18:51 +0200
Subject: [PATCH 013/291] typo in smtp uname
---
static/php/ajaxmail.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index 14407b7..f558ce5 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -30,7 +30,7 @@ try {
$mail->isSMTP(); // Use SMTP
$mail->Host = 'ophelia.kreativmedia.ch'; // Set SMTP server
$mail->SMTPAuth = true; // Enable SMTP authentication
- $mail->Username = 'email'; // SMTP username
+ $mail->Username = 'support@deindeal.ch'; // SMTP username
$mail->Password = 'zki@U/*{A]}3#kS/Lg|)l]t:,XHuV=8l_'; // SMTP password
$mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; // Enable encryption
$mail->Port = 465; // TCP port for the connection
From 0073ae806ee3734f2a6137cb5c45300374a58903 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 14 May 2024 20:42:46 +0200
Subject: [PATCH 014/291] changed phone number and address in confirmation mail
---
static/php/ajaxmail.php | 4 ++--
static/php/message.php | 32 ++++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index f558ce5..6032030 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -30,8 +30,8 @@ try {
$mail->isSMTP(); // Use SMTP
$mail->Host = 'ophelia.kreativmedia.ch'; // Set SMTP server
$mail->SMTPAuth = true; // Enable SMTP authentication
- $mail->Username = 'support@deindeal.ch'; // SMTP username
- $mail->Password = 'zki@U/*{A]}3#kS/Lg|)l]t:,XHuV=8l_'; // SMTP password
+ $mail->Username = 'support@verua.ch'; // SMTP username
+ $mail->Password = 'zki@U/*{A]}3#kS/Lg|)l]t:,XHuV=8I_'; // SMTP password
$mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; // Enable encryption
$mail->Port = 465; // TCP port for the connection
diff --git a/static/php/message.php b/static/php/message.php
index a02c7cf..65a49bd 100644
--- a/static/php/message.php
+++ b/static/php/message.php
@@ -60,38 +60,38 @@ function constructMessage() {
if (isset($zusatzmodulDienstplan)) {
$message .= "Zusatzmodul Dienstplan: " . "\n" . $zusatzmodulDienstplan . "\n\n";
}
-
+
$zusatzmodulTourenplan = filter_input(INPUT_POST, 'zusatzmodul-tourenplan');
if (isset($zusatzmodulTourenplan)) {
$message .= "Zusatzmodul Tourenplan: " . "\n" . $zusatzmodulTourenplan . "\n\n";
}
-
+
// Form inputs von Erstbestellung
$bestehend = filter_input(INPUT_POST, 'bestehend');
if (isset($bestehend)) {
$message .= "Wünschen Sie einen neuer Server oder den Zugang zu einem bestehenden Team-Server?: " . "\n" . $bestehend . "\n\n";
}
-
+
$servername = filter_input(INPUT_POST, 'servername');
if (isset($servername)) {
$message .= "Bitte geben Sie den Namen des Servers an. Der Zugriff erfolgt immer über die Web-Adresse: https://wunschname.verua.ch: " . "\n" . $servername . "\n\n";
}
-
+
$modulpop2 = filter_input(INPUT_POST, 'modulpop2');
if (isset($modulpop2)) {
$message .= "Wünschen Sie die Erweiterung um das Modul POP2?: " . "\n" . $modulpop2 . "\n\n";
}
-
+
$materialverwaltung = filter_input(INPUT_POST, 'materialverwaltung');
if (isset($materialverwaltung)) {
$message .= "Benötigen Sie das Zusatzmodul Materialverwaltung?: " . "\n" . $materialverwaltung . "\n\n";
}
-
+
$qrcode = filter_input(INPUT_POST, 'qrcode');
if (isset($qrcode)) {
$message .= "Wünschen Sie die Erweiterung um das Modul QR-Code?: " . "\n" . $qrcode . "\n\n";
}
-
+
$wochenbett = filter_input(INPUT_POST, 'wochenbett');
if (isset($wochenbett)) {
$message .= "Benötigen Sie das Programm für Wochenbett-Betreuung?: " . "\n" . $wochenbett . "\n\n";
@@ -101,27 +101,27 @@ function constructMessage() {
if (isset($zusatzmodulPop2)) {
$message .= "Zusatzmodul POP2" . "\n";
}
-
+
$zusatzmodulMaterialverwaltung = filter_input(INPUT_POST, 'zusatzmodul-materialverwaltung');
if (isset($zusatzmodulMaterialverwaltung)) {
$message .= "Zusatzmodul Materialverwaltung" . "\n";
}
-
+
$zusatzmodulQrCode = filter_input(INPUT_POST, 'zusatzmodul-qr-code');
if (isset($zusatzmodulQrCode)) {
$message .= "Zusatzmodul QR-Code" . "\n";
}
-
+
$zusatzmodulPerigon = filter_input(INPUT_POST, 'zusatzmodul-perigon');
if (isset($zusatzmodulPerigon)) {
$message .= "Zusatzmodul Perigon" . "\n";
}
-
+
$anmerkung = filter_input(INPUT_POST, 'anmerkung');
if (!empty($anmerkung)) {
$message .= "\n\n" . "Anmerkung: " . "\n" . $anmerkung . "\n\n";
}
-
+
return $message;
}
@@ -137,9 +137,9 @@ function constructCustomerMessageDE($bestellMessage) {
$message .= "Votre équipe Verua" . "\n\n\n\n";
$message .= "RaBe Websolutions" . "\n";
$message .= "B. Rasberger" . "\n";
- $message .= "Hauptstrasse 1" . "\n";
- $message .= "CH-4417 Ziefen" . "\n\n";
- $message .= "Telefon: +41 61 901 90 90" . "\n";
+ $message .= "Steinerstrass 19" . "\n";
+ $message .= "CH-8253 Diessenhofen" . "\n\n";
+ $message .= "Telefon: 079 393 86 83" . "\n";
$message .= "E-Mail: support@verua.ch" . "\n";
$message .= "Web: www.verua.ch" . "\n\n";
@@ -150,4 +150,4 @@ function constructCustomerMessageDE($bestellMessage) {
$message .= $bestellMessage;
return $message;
-}
\ No newline at end of file
+}
From 632963da3a865774a1b492ac5941cdf89f4def9e Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 14 May 2024 20:43:54 +0200
Subject: [PATCH 015/291] removed ah@... from open recipients list
---
static/php/ajaxmail.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index 6032030..b313032 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -37,7 +37,6 @@ try {
// Recipients
$mail->setFrom('support@verua.ch', 'Verua Support'); // Sender address
- $mail->addAddress('ah@mediendesign-hnida.de', 'Andreas Hnida'); // Add recipient
$mail->addAddress('support@verua.ch', 'Verua Support'); // Add another recipient
$mail->addBCC('ah@mediendesign-hnida.de'); // Add bounce email address as BCC
From 69fd172c634020f27271226783011eb9cd1ded7e Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Wed, 15 May 2024 11:24:39 +0200
Subject: [PATCH 016/291] added total POP2 in 'preisliste/organisationen'
---
content/german/preisliste/organisationen.md | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/content/german/preisliste/organisationen.md b/content/german/preisliste/organisationen.md
index 46f25fb..b3382e2 100644
--- a/content/german/preisliste/organisationen.md
+++ b/content/german/preisliste/organisationen.md
@@ -172,7 +172,7 @@ Die Lizenzen für das Zusatzmodul DP und TP hängen immer zusammen. Mitarbeiter,
Sie können jederzeit Lizenzen in **3er-Schritten** nachbuchen.
| Lizenzerhöhung Zusatzmodul TP um 3 weitere Lizenzen - monatliche Gebühr | 24.00 CHF |
-| ----------------------------------------------------------------------- | ---------: |
+| ----------------------------------------------------------------------- | --------: |
Sie können jederzeit Lizenzen in **3er-Schritten** nachbuchen.
Die Lizenzgebühr entsteht je 3er Paket, das nachgebucht wird.
@@ -213,6 +213,9 @@ muss sowohl der Titel des Buches als auch der Name des Bestellers ersichtlich se
Im Preis erhalten Sie die Lizenzgebühr für **ein Jahr. Dies beinhaltet vollen kostenlosen Support** und
die **Weiterentwicklung** des Zusatzmoduls.
+| **TOTAL ZUSATZMODUL POP2** | **1'800.00 CHF** |
+| -------------------------- | ---------------: |
+
{{% aligncenter %}}
@@ -221,8 +224,8 @@ die **Weiterentwicklung** des Zusatzmoduls.
{{% /aligncenter %}}
-| Optional: Zusatzmodul QR-Code - monatliche Gebühr | 20.00 CHF |
-| ------------------------------------------------- | --------: |
+| Zusatzmodul QR-Code - monatliche Gebühr | 20.00 CHF |
+| --------------------------------------- | --------: |
_Verfügbar ab dem 24.01.2022_
Das Zusatzmodul **QR-Code** erweitert das Standardprogramm **VeruA ** Verwaltung und Abrechnung\*\*.
From e6cc8347356c5aa9c16b2cd2fc5c1c278f21eaf4 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 07:38:14 +0200
Subject: [PATCH 017/291] changed env variable
---
hugo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hugo.toml b/hugo.toml
index 32a2dd7..89d7dad 100755
--- a/hugo.toml
+++ b/hugo.toml
@@ -21,7 +21,7 @@ enableRobotsTXT = true
########################### Deployment #############################
[params]
# set to "development" or "production". This deploys the site to the correct environment and sets the robot.txt to disallow all pages when in development mode.
-environment = "production"
+environment = "development"
# set to true to enable captcha on the form
useCaptcha = true
From 9f3f994351a8e85ba0e986e9b06b2376a7c59912 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 07:42:46 +0200
Subject: [PATCH 018/291] corrected manual
---
readme.md | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/readme.md b/readme.md
index 1c02045..b923b2d 100755
--- a/readme.md
+++ b/readme.md
@@ -45,7 +45,6 @@ git clone https://code.verua.online/rabeweb/verua.ch_src.git
# connect to your gitea instance
cd verua.ch_src
-git remote add origin https://code.verua.online/rabeweb/verua.ch_src.git
git push -u origin main
```
@@ -57,8 +56,8 @@ The content is written in the [markdown](https://www.markdownguide.org/getting-s
```yaml
---
-title: 'VeruA ** Verwaltung und Abrechnung'
-translationKey: 'a-page-about-cats'
+title: "VeruA ** Verwaltung und Abrechnung"
+translationKey: "a-page-about-cats"
---
```
From a20e263296bf40d1d318c6f682ae4d32f9d5c4ea Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 07:43:58 +0200
Subject: [PATCH 019/291] corrected manual
---
readme.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/readme.md b/readme.md
index b923b2d..f59f72f 100755
--- a/readme.md
+++ b/readme.md
@@ -43,8 +43,10 @@ To use the theme, and to update your content, you need to clone the repository,
# Clone the repository
git clone https://code.verua.online/rabeweb/verua.ch_src.git
-# connect to your gitea instance
+# Change into the repository
cd verua.ch_src
+
+# Add your changes
git push -u origin main
```
From 88942a34bdbfd1da08f5e282cd27a3dc5c6af7f7 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 07:46:24 +0200
Subject: [PATCH 020/291] corrected git manual
---
readme.md | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/readme.md b/readme.md
index f59f72f..7e27033 100755
--- a/readme.md
+++ b/readme.md
@@ -47,6 +47,11 @@ git clone https://code.verua.online/rabeweb/verua.ch_src.git
cd verua.ch_src
# Add your changes
+
+# Commit your changes
+git commit -am "Update content"
+
+# Push your changes
git push -u origin main
```
@@ -58,8 +63,8 @@ The content is written in the [markdown](https://www.markdownguide.org/getting-s
```yaml
---
-title: "VeruA ** Verwaltung und Abrechnung"
-translationKey: "a-page-about-cats"
+title: 'VeruA ** Verwaltung und Abrechnung'
+translationKey: 'a-page-about-cats'
---
```
From 00c786689082df14c568e175394920b4053813e9 Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 09:35:28 +0200
Subject: [PATCH 021/291] ...
---
readme.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/readme.md b/readme.md
index 7e27033..3df7d5f 100755
--- a/readme.md
+++ b/readme.md
@@ -63,8 +63,8 @@ The content is written in the [markdown](https://www.markdownguide.org/getting-s
```yaml
---
-title: 'VeruA ** Verwaltung und Abrechnung'
-translationKey: 'a-page-about-cats'
+title: "VeruA ** Verwaltung und Abrechnung"
+translationKey: "a-page-about-cats"
---
```
@@ -72,7 +72,7 @@ For example, the german version of the VeruA.ch website is located in the `conte
[⬆](#table-of-contents)
-### Images
+### I mages
Images are stored in the `static/images` folder. You can use the `![]()` syntax to insert images into your markdown files.
From be700993f58622f8b0e8e739883b4fa16c9b190e Mon Sep 17 00:00:00 2001
From: Andreas Hnida
Date: Tue, 11 Jun 2024 09:49:38 +0200
Subject: [PATCH 022/291] typo corrected
---
readme.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/readme.md b/readme.md
index 3df7d5f..63b0d8f 100755
--- a/readme.md
+++ b/readme.md
@@ -72,7 +72,7 @@ For example, the german version of the VeruA.ch website is located in the `conte
[⬆](#table-of-contents)
-### I mages
+### Images
Images are stored in the `static/images` folder. You can use the `![]()` syntax to insert images into your markdown files.
From 9e38cf02de06c5d607abf625aaaf52be46a2b0b5 Mon Sep 17 00:00:00 2001
From: norb
Date: Wed, 12 Jun 2024 15:35:25 +0200
Subject: [PATCH 023/291] fix typo
---
content/german/bestellung/_index.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/content/german/bestellung/_index.md b/content/german/bestellung/_index.md
index 5e304b3..24e6472 100644
--- a/content/german/bestellung/_index.md
+++ b/content/german/bestellung/_index.md
@@ -5,7 +5,7 @@ title = 'Bestellung'
translationKey = 'bestellung'
+++
-{{% section background-image="/images/startseite/startseite-slide-2.jpg" title="Verua bestellen & neue Wege gehen!" %}}
+{{% section background-image="/images/startseite/startseite-slide-2.jpg" title="VeruA bestellen & neue Wege gehen!" %}}
{{% columns class="" %}}
@@ -68,7 +68,7 @@ Seit dem ersten Quartal 2020 bieten wir Ihnen die **Schnittstelle zum Perigon in
Unsere Preise sind transparent und klar - wir verzichten auf versteckte Kosten und böse Überraschungen!
-Informieren Sie sich in unserer Preisliste, welchen Kosten mit der Applikation VeruA \*\* Verwaltung und Abrechnung auf Sie zukommen.
+Informieren Sie sich in unserer Preisliste, welche Kosten mit der Applikation VeruA \*\* Verwaltung und Abrechnung auf Sie zukommen.
{{% /aligncenter %}}
{{% /section %}}
From dda75109bfbd8ad96d7169a6dc42fec98fcb0eed Mon Sep 17 00:00:00 2001
From: norb
Date: Wed, 12 Jun 2024 15:41:33 +0200
Subject: [PATCH 024/291] deploy typo to production
---
hugo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hugo.toml b/hugo.toml
index 89d7dad..32a2dd7 100755
--- a/hugo.toml
+++ b/hugo.toml
@@ -21,7 +21,7 @@ enableRobotsTXT = true
########################### Deployment #############################
[params]
# set to "development" or "production". This deploys the site to the correct environment and sets the robot.txt to disallow all pages when in development mode.
-environment = "development"
+environment = "production"
# set to true to enable captcha on the form
useCaptcha = true
From 5f593d66c27a6d8677fe71d8cd85217f946b3417 Mon Sep 17 00:00:00 2001
From: Bettina Rasberger
Date: Thu, 13 Jun 2024 16:51:46 +0200
Subject: [PATCH 025/291] deploy to development
---
hugo.toml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hugo.toml b/hugo.toml
index 32a2dd7..a2822c7 100755
--- a/hugo.toml
+++ b/hugo.toml
@@ -21,7 +21,8 @@ enableRobotsTXT = true
########################### Deployment #############################
[params]
# set to "development" or "production". This deploys the site to the correct environment and sets the robot.txt to disallow all pages when in development mode.
-environment = "production"
+# environment = "production"
+environment = "development"
# set to true to enable captcha on the form
useCaptcha = true
From af3532506bdde0fb5a32a5a08e681a0b5f3b459b Mon Sep 17 00:00:00 2001
From: Bettina Rasberger
Date: Thu, 13 Jun 2024 17:06:23 +0200
Subject: [PATCH 026/291] change labels
---
content/german/kontakt.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/content/german/kontakt.md b/content/german/kontakt.md
index 8eed883..c353ef6 100644
--- a/content/german/kontakt.md
+++ b/content/german/kontakt.md
@@ -42,7 +42,7 @@ Wir nehmen zeitnah Kontakt zu Ihnen auf.
-
+
@@ -67,7 +67,7 @@ Wir nehmen zeitnah Kontakt zu Ihnen auf.
-
+
From 3200943ddde41d1a48f4343cffc9835fa7738c44 Mon Sep 17 00:00:00 2001
From: Bettina Rasberger
Date: Thu, 13 Jun 2024 17:14:58 +0200
Subject: [PATCH 027/291] change planio project
---
content/german/kontakt.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/german/kontakt.md b/content/german/kontakt.md
index c353ef6..b305aeb 100644
--- a/content/german/kontakt.md
+++ b/content/german/kontakt.md
@@ -31,7 +31,7 @@ Wir nehmen zeitnah Kontakt zu Ihnen auf.