From ae83ea1404948ddcd4624beeb413f2a257e0b335 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 26 Mar 2018 23:13:26 +0200
Subject: [PATCH 1/3] further implementing of multilanguage

---
 config.sample.php   |   3 ++
 lang/lang.en-gb.php |  41 +++++++++++++++
 lang/mail.de-de.php | 124 ++++++++++++++++++++++++++++++++++++++++++++
 lang/mail.en-gb.php | 118 +++++++++++++++++++++++++++++++++++++++++
 language.php        |   6 ++-
 mail_templates.php  | 113 ++++------------------------------------
 6 files changed, 300 insertions(+), 105 deletions(-)
 create mode 100644 lang/lang.en-gb.php
 create mode 100644 lang/mail.de-de.php
 create mode 100644 lang/mail.en-gb.php

diff --git a/config.sample.php b/config.sample.php
index 6028e67..8d8f1df 100644
--- a/config.sample.php
+++ b/config.sample.php
@@ -22,5 +22,8 @@ $config = [
 	// credentials for sqlite not used
 	"databaseUser" => "dbUser123",
 	"databasePass" => "secretPassword",
+
+	// default language: one of [ en-gb | de-de ]
+	"defaultLanguage" => "en-gb"
 ]
 ?>
diff --git a/lang/lang.en-gb.php b/lang/lang.en-gb.php
new file mode 100644
index 0000000..e6e2b20
--- /dev/null
+++ b/lang/lang.en-gb.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2018 Matthias Kesler
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+$language = array(
+    "NO_CONFIGURATION" => "No configuration found",
+    "UNKNOWN_SESSION" => "Session token not found of invalid.",
+    "UNKNOWN_USERNAME" => "username unknown",
+    "UNKNOWN_TOKEN" => "Token is unknown",
+    "USERNAME_LENGTH_INVALID" => "Username cpnsists pf more than 20 or less than 3 characters",
+    "USERNAME_NOT_ALNUM" => "Username is not alphanumeric",
+    "USERNAME_PENDING_REGISTRATION" => "This username is locked for registration. Try again later or try again with a different username",
+    "USERNAME_REGISTERED" => "This username is already registered. Please try again with another username",
+    "PASSWORD_NOT_MATCH" => "passwords do not match",
+    "NOTE_LENGTH_EXEEDED" => "Note consists of more than 50 characters",
+    "EMAIL_INVALID_FORMAT" => "no valid email address",
+    "FIRSTNAME_INVALID_FORMAT" => "First name with invalid formatting",
+    "SIRNAME_INVALID_FORMAT" => "Sirname with invalid formatting",
+    "SEND_MAIL_FAIL" => "Email could not be sent",
+    "SEND_MATRIX_FAIL" => "Sending a message to the admins failed",
+    "REGISTRATION_REQUEST_FAILED" => "Registration request failed",
+    "REGISTRATION_FAILED" => "Registration failed",
+    "VERIFICATION_SUCEEDED" => "Verification suceeded",
+    "VERIFICATION_FAILED" => "Verification failed",
+    "VERIFICATION_SUCCESS_BODY" => "Thank you. The admins got informed",
+    "ADMIN_VERIFY_SITE_TITLE" => "Handle registration request",
+    "ADMIN_REGISTER_ACCEPTED_BODY" => "The registration request got accepted. The user got notified per email.",
+    "ADMIN_REGISTER_DECLINED_BODY" => "The registration request got declined. The user got notified per email.",
+);
+?>
diff --git a/lang/mail.de-de.php b/lang/mail.de-de.php
new file mode 100644
index 0000000..1e06948
--- /dev/null
+++ b/lang/mail.de-de.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright 2018 Matthias Kesler
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+function send_mail($receiver, $subject, $body) {
+	include("config.php");
+	$headers = "From: " . $config["register_email"] . "\r\n"
+		. "Content-Type: text/plain;charset=utf-8";
+	return mail($receiver, $subject, $body, $headers);
+}
+
+function send_mail_pending_verification($homeserver, $user, $receiver, $verify_url) {
+	$subject = "Bitte bestätige Registrierung auf $homeserver";
+	$body = "Guten Tag " . $user . ",
+
+Du hast anscheinend versucht dich auf $homeserver zu registrieren.
+Hier gibt es eine zweistufige Registrierung.
+
+Wir möchten dich bitten, dass du kurz bestätigst, dass du die Registrierung durchgeführt hast.
+Gehe dafür auf folgenden Link:
+$verify_url
+
+Erst anschließend werden die Administratoren über deine Registrierungsanfrage informiert.
+
+Hinweis: Du hast ca. 48 Stunden Zeit um die Bestätigung durchzuführen.
+Danach ist eine Re-Registrierung mit deinem gewünschten Nutzernamen für andere wieder möglich.
+
+Vielen Dank für dein Verständnis.
+
+Das Administratoren-Team von " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+
+function send_mail_pending_approval($homeserver, $user, $receiver) {
+	$subject = "Registrierung wartet auf Bestätigung durch Administratoren";
+	$body = "Guten Tag " . $user . ",
+
+Deine Registrierungsanfrage wurde verifiziert und wird nun durch die Administratoren überprüft.
+
+Du bekommst eine weitere E-Mail, sobald deine Registrierung bestätigt oder ablehnt wurde.
+
+Vielen Dank für dein Verständnis.
+
+Das Administratoren-Team von " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+
+function send_mail_registration_allowed_but_failed($homeserver, $user, $receiver) {
+	$subject = "Registrierung auf $homeserver genehmigt";
+	$body = "Guten Tag " . $user . ",
+
+Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
+
+Leider ist beim Registrieren ein Fehler aufgetaucht. Der Registrierungversuch wird bald wiederholt.
+Wir hoffen, das Problem ist bald behoben.
+Wir melden uns, wenn die Registrierung erfolgreich war.
+
+Das Administratoren-Team von " . $homeserver;
+	return send_mail($receiver, $subject, $body);
+
+}
+
+function send_mail_registration_success($homeserver, $user, $receiver, $username, $password, $howToURL) {
+	$subject = "Registrierung auf $homeserver erfolgreich";
+	$body = "Guten Tag " . $user . ",
+
+Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
+
+Zum Anmelden kannst du folgende Zugangsdaten verwenden:
+Nutzername: $username
+Passwort: $password
+
+Hinweis: Das Passwort kannst du aktuell über die App selbst ändern. Auch wenn das Passwort nirgends
+im Klartext gespeichert wird, kann jemand Zugriff auf diese Mail erlangen und so den Zugriff bekommen.
+";
+/*
+Wichtig: Bitte ändere das Passwort direkt nach der Anmeldung.
+Es wird zwar von unserer Seite nicht gespeichert, doch fremde könnten Zugriff auf diese E-Mail
+erhalten und so deinen Account kompromittieren.
+ */
+if (!empty($howToURL)) {
+	$body .= "
+Zu weiteren Hilfestellungen findest du hier eine Auflistung von verschiedenen
+Anleitungen zu verschiedenen Clients:
+$howToURL\n";
+}
+	$body .= "
+Viel Spaß bei der Verwendung von $homeserver.
+Bei Fragen findest du nach der Anmeldung ein paar Räume in denen du sie stellen kannst.
+
+Das Administratoren-Team von " . $homeserver;
+	return send_mail($receiver, $subject, $body);
+
+}
+function send_mail_registration_decline($homeserver, $user, $receiver, $reason) {
+	$subject = "Registrierung auf $homeserver abgelehnt";
+	$body = "Guten Tag " . $user . ",
+
+Deine Registrierungsanfrage wurde durch die Administratoren abgelehnt.\n";
+
+	if (empty($reason)) {
+		$body .= "\nEs wurde kein Grund angegeben\n";
+	} else {
+		$body .= "\nAls Grund wurde folgendes angegeben:\n$reason\n";
+	}
+
+	$body .= "
+Wir hoffen, dass du dies akzeptieren kannst.
+
+Das Administratoren-Team von " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+?>
diff --git a/lang/mail.en-gb.php b/lang/mail.en-gb.php
new file mode 100644
index 0000000..af94c8d
--- /dev/null
+++ b/lang/mail.en-gb.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright 2018 Matthias Kesler
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+function send_mail($receiver, $subject, $body) {
+	include("config.php");
+	$headers = "From: " . $config["register_email"] . "\r\n"
+		. "Content-Type: text/plain;charset=utf-8";
+	return mail($receiver, $subject, $body, $headers);
+}
+
+function send_mail_pending_verification($homeserver, $user, $receiver, $verify_url) {
+	$subject = "Pleast approve your registration request on $homeserver";
+	$body = "Dear " . $user . ",
+
+It seems that you tried to register on $homeserver.
+This homeserver requires a two step registration.
+
+For this we want you to verify that you want to register. For this please click on this link:
+$verify_url
+
+The admins will informed about your registration request once you clicked on this link.
+
+Note: This registration request will be cleaned up in 48 hours.
+Others might take your username afterwards.
+
+Thanks for your patience.
+
+The admin team of " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+
+function send_mail_pending_approval($homeserver, $user, $receiver) {
+	$subject = "Registration is pending verification from an admin";
+	$body = "Dear " . $user . ",
+
+You have verified your registration request. The admins are now checking your request.
+
+You will get an email once they approve or decline your request.
+
+Sincerely,
+
+The admin team of " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+
+function send_mail_registration_allowed_but_failed($homeserver, $user, $receiver) {
+	$subject = "Registration on $homeserver got approved";
+	$body = "Dear " . $user . ",
+
+Your registration request got approved by the admin team.
+
+But there was a problem when triggering the registration request. It will be retried in a few minutes.
+We hope that the issue will be fixed soon.
+You will get another email with initial credentials once the registration got handled completely.
+
+The admin team of " . $homeserver;
+	return send_mail($receiver, $subject, $body);
+
+}
+
+function send_mail_registration_success($homeserver, $user, $receiver, $username, $password, $howToURL) {
+	$subject = "Registration on $homeserver got approved";
+	$body = "Dear " . $user . ",
+
+Your registration request got verified by the admin team.
+
+To log in you can use the following credentials::
+Username: $username
+Password: $password
+
+Important: Please change your password as soon as possible after your first login.
+The password is not stored in clear text on the server but people could get access to this mail
+and compromise your account.
+";
+if (!empty($howToURL)) {
+	$body .= "
+You can find further help here::
+$howToURL\n";
+}
+	$body .= "
+Enjoy your usage of $homeserver.
+You can ask further questions inside of the chat system.
+
+The admin team of " . $homeserver;
+	return send_mail($receiver, $subject, $body);
+
+}
+function send_mail_registration_decline($homeserver, $user, $receiver, $reason) {
+	$subject = "Registration on $homeserver declined.";
+	$body = "Guten Tag " . $user . ",
+
+Your registration request got declined by the admin team.\n";
+
+	if (empty($reason)) {
+		$body .= "\nThey did not provide any reason for this\n";
+	} else {
+		$body .= "\nThey provide following hint for you:\n$reason\n";
+	}
+
+	$body .= "
+We hope that you can understand this reason.
+
+The admin team of " . $homeserver;
+	return send_mail($receiver, $subject, $body );
+}
+?>
diff --git a/language.php b/language.php
index e7ef71c..843d89e 100644
--- a/language.php
+++ b/language.php
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-$lang = "de-de";
+require_once("config.php");
+$lang=$config["defaultLanguage"];
+
 if(isset($_GET['lang'])){
 	$lang = filter_var($_GET['lang'], FILTER_SANITIZE_STRING);
 }
 $lang_file = dirname(__FILE__) . "/lang/lang.".$lang.".php";
 if (!file_exists($lang_file)) {
-	error_log("Translation for " . $lang . " not found. Fallback to 'de-de'");
+	error_log("Translation for '" . $lang . "' not found. Fallback to 'de-de'");
 	$lang = "de-de";
 }
 require_once($lang_file);
diff --git a/mail_templates.php b/mail_templates.php
index 951d94c..1473799 100644
--- a/mail_templates.php
+++ b/mail_templates.php
@@ -13,109 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function send_mail($receiver, $subject, $body) {
-	include("config.php");
-	$headers = "From: " . $config["register_email"] . "\r\n"
-		. "Content-Type: text/plain;charset=utf-8";
-	return mail($receiver, $subject, $body, $headers);
+require_once("config.php");
+$lang=$config["defaultLanguage"];
+if(isset($_GET['lang'])){
+	$lang = filter_var($_GET['lang'], FILTER_SANITIZE_STRING);
 }
-
-function send_mail_pending_verification($homeserver, $user, $receiver, $verify_url) {
-	$subject = "Bitte bestätige Registrierung auf $homeserver";
-	$body = "Guten Tag " . $user . ",
-
-Du hast anscheinend versucht dich auf $homeserver zu registrieren.
-Hier gibt es eine zweistufige Registrierung.
-
-Wir möchten dich bitten, dass du kurz bestätigst, dass du die Registrierung durchgeführt hast.
-Gehe dafür auf folgenden Link:
-$verify_url
-
-Erst anschließend werden die Administratoren über deine Registrierungsanfrage informiert.
-
-Hinweis: Du hast ca. 48 Stunden Zeit um die Bestätigung durchzuführen.
-Danach ist eine Re-Registrierung mit deinem gewünschten Nutzernamen für andere wieder möglich.
-
-Vielen Dank für dein Verständnis.
-
-Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
-}
-
-function send_mail_pending_approval($homeserver, $user, $receiver) {
-	$subject = "Registrierung wartet auf Bestätigung durch Administratoren";
-	$body = "Guten Tag " . $user . ",
-
-Deine Registrierungsanfrage wurde verifiziert und wird nun durch die Administratoren überprüft.
-
-Du bekommst eine weitere E-Mail, sobald deine Registrierung bestätigt oder ablehnt wurde.
-
-Vielen Dank für dein Verständnis.
-
-Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
-}
-
-function send_mail_registration_allowed_but_failed($homeserver, $user, $receiver) {
-	$subject = "Registrierung auf $homeserver genehmigt.";
-	$body = "Guten Tag " . $user . ",
-
-Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
-
-Leider ist beim Registrieren ein Fehler aufgetaucht. Der Registrierungversuch wird bald wiederholt.
-Wir hoffen, das Problem ist bald behoben.
-Wir melden uns, wenn die Registrierung erfolgreich war.
-
-Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body);
-
-}
-
-function send_mail_registration_success($homeserver, $user, $receiver, $username, $password, $howToURL) {
-	$subject = "Registrierung auf $homeserver erfolgreich.";
-	$body = "Guten Tag " . $user . ",
-
-Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
-
-Zum Anmelden kannst du folgende Zugangsdaten verwenden:
-Nutzername: $username
-Passwort: $password
-
-Hinweis: Das Passwort kannst du aktuell über die App selbst ändern. Auch wenn das Passwort nirgends
-im Klartext gespeichert wird, kann jemand Zugriff auf diese Mail erlangen und so den Zugriff bekommen.
-";
-/*
-Wichtig: Bitte ändere das Passwort direkt nach der Anmeldung.
-Es wird zwar von unserer Seite nicht gespeichert, doch fremde könnten Zugriff auf diese E-Mail
-erhalten und so deinen Account kompromittieren.
- */
-if (!empty($howToURL)) {
-	$body .= "
-Zu weiteren Hilfestellungen findest du hier eine Auflistung von verschiedenen
-Anleitungen zu verschiedenen Clients:
-$howToURL\n";
-}
-	$body .= "
-Viel Spaß bei der Verwendung von $homeserver.
-Bei Fragen findest du nach der Anmeldung ein paar Räume in denen du sie stellen kannst.
-
-Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body);
-
-}
-function send_mail_registration_decline($homeserver, $user, $receiver, $reason) {
-	$subject = "Registrierung auf $homeserver abgelehnt.";
-	$body = "Guten Tag " . $user . ",
-
-Deine Registrierungsanfrage wurde durch die Administratoren abgelehnt.\n";
-
-	if (empty($reason)) {
-		$body .= "\nEs wurde kein Grund angegeben\n";
-	} else {
-		$body .= "\nAls Grund wurde folgendes angegeben:\n$reason\n";
-	}
-
-	$body .= "\nDas Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
+$lang_file = dirname(__FILE__) . "/lang/mail.".$lang.".php";
+if (!file_exists($lang_file)) {
+	error_log("Mail templates for '" . $lang . "' not found. Fallback to 'de-de'");
+	$lang = "de-de";
 }
+require_once($lang_file);
+unset($lang_file);
 ?>
-- 
2.39.5


From 3882015836f684deb62b6b7236449e3aaa862267 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Sun, 15 Apr 2018 22:33:09 +0200
Subject: [PATCH 2/3] transform further strings

---
 lang/lang.de-de.php     |  6 ++++++
 lang/lang.en-gb.php     |  6 ++++++
 public/index.php        | 12 ++++++------
 public/verify.php       |  4 ++--
 public/verify_admin.php |  6 +++---
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lang/lang.de-de.php b/lang/lang.de-de.php
index 3dd390b..b3a2735 100644
--- a/lang/lang.de-de.php
+++ b/lang/lang.de-de.php
@@ -15,7 +15,11 @@
  * limitations under the License.
  */
 $language = array(
+    "ACCEPT" => "Akzeptieren",
+    "DECLINE" => "Ablehnen",
+    "SUCCESS" => "Erfolgreich",
     "NO_CONFIGURATION" => "Es konnte keine Konfiguration gefunden werden.",
+    "UNKNOWN_ERROR" => "Unbekannter Fehler",
     "UNKNOWN_SESSION" => "Sitzungstoken nicht vorhanden oder ungültig.",
     "UNKNOWN_USERNAME" => "Nutzername fehlt",
     "UNKNOWN_TOKEN" => "Token ist unbekannt",
@@ -30,6 +34,7 @@ $language = array(
     "SIRNAME_INVALID_FORMAT" => "Nachname hat ungültiges Format",
     "SEND_MAIL_FAIL" => "Senden der E-Mail fehlgeschlagen",
     "SEND_MATRIX_FAIL" => "Senden einer Nachricht an die Administratoren fehlgeschlagen",
+    "TASK_CHECK_YOUR_EMAIL_VERIFY" => "Bitte prüfe deine E-Mails um deine Adresse zu bestätigen",
     "REGISTRATION_REQUEST_FAILED" => "Registrierungsanfrage ist fehlgeschlagen",
     "REGISTRATION_FAILED" => "Registrierung ist fehlgeschlagen",
     "VERIFICATION_SUCEEDED" => "Verifizierung erfolgreich",
@@ -38,5 +43,6 @@ $language = array(
     "ADMIN_VERIFY_SITE_TITLE" => "Registrierungsanfrage bearbeiten",
     "ADMIN_REGISTER_ACCEPTED_BODY" => "Die Registrierungsanfrage wurde akzeptiert. Der Nutzer wurde per Mail informiert.",
     "ADMIN_REGISTER_DECLINED_BODY" => "Die Registrierungsanfrage wurde angelehnt. Der Nutzer wurde per Mail informiert.",
+    "JUMP_TO_HOMEPAGE" => "Zur Startseite",
 );
 ?>
diff --git a/lang/lang.en-gb.php b/lang/lang.en-gb.php
index e6e2b20..04f5b0d 100644
--- a/lang/lang.en-gb.php
+++ b/lang/lang.en-gb.php
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 $language = array(
+    "ACCEPT" => "Accept",
+    "DECLINE" => "Decline",
+    "SUCCESS" => "Success",
     "NO_CONFIGURATION" => "No configuration found",
+    "UNKNOWN_ERROR" => "Unknown Error",
     "UNKNOWN_SESSION" => "Session token not found of invalid.",
     "UNKNOWN_USERNAME" => "username unknown",
     "UNKNOWN_TOKEN" => "Token is unknown",
@@ -29,6 +33,7 @@ $language = array(
     "SIRNAME_INVALID_FORMAT" => "Sirname with invalid formatting",
     "SEND_MAIL_FAIL" => "Email could not be sent",
     "SEND_MATRIX_FAIL" => "Sending a message to the admins failed",
+    "TASK_CHECK_YOUR_EMAIL_VERIFY" => "Please check your emails to verify your email address",
     "REGISTRATION_REQUEST_FAILED" => "Registration request failed",
     "REGISTRATION_FAILED" => "Registration failed",
     "VERIFICATION_SUCEEDED" => "Verification suceeded",
@@ -37,5 +42,6 @@ $language = array(
     "ADMIN_VERIFY_SITE_TITLE" => "Handle registration request",
     "ADMIN_REGISTER_ACCEPTED_BODY" => "The registration request got accepted. The user got notified per email.",
     "ADMIN_REGISTER_DECLINED_BODY" => "The registration request got declined. The user got notified per email.",
+    "JUMP_TO_HOMEPAGE" => "To homepage",
 );
 ?>
diff --git a/public/index.php b/public/index.php
index 269f26e..2eb1889 100644
--- a/public/index.php
+++ b/public/index.php
@@ -74,7 +74,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
         if (!isset($res["verify_token"])) {
             error_log("sth. went wrong. registration did not throw but admin_token not set");
-            throw Exception("Unknown Error");
+            throw Exception("UNKNOWN_ERROR");
         }
         $verify_token = $res["verify_token"];
 
@@ -86,11 +86,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $mx_db->setRegistrationStateVerify(
                 ($success ? RegisterState::PendingEmailVerify : RegisterState::PendingEmailSend), $verify_token);
 
-        print("<title>Erfolgreich</title>");
+        print("<title>" . $language["SUCCESS"] . "</title>");
         print("</head><body>");
-        print("<h1>Erfolgreich</h1>");
-        print("<p>Bitte überprüfe deine E-Mails um deine E-Mail-Adresse zu bestätigen.</p>");
-        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
+        print("<h1>" . $language["SUCCESS"] . "</h1>");
+        print("<p>" . $language["TASK_CHECK_YOUR_EMAIL_VERIFY"] . "</p>");
+        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
     } catch (Exception $e) {
         print("<title>" . $language["REGISTRATION_REQUEST_FAILED"] . "</title>");
         print("</head><body>");
@@ -100,7 +100,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         } else {
             print("<p>" . $e->getMessage() . "</p>");
         }
-        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
+        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
     }
 } else {
     $_SESSION["token"] = bin2hex(random_bytes(16));
diff --git a/public/verify.php b/public/verify.php
index cedb9a7..1da639b 100644
--- a/public/verify.php
+++ b/public/verify.php
@@ -75,7 +75,7 @@ try {
     print("</head><body>");
     print("<h1>" . $language["VERIFICATION_SUCEEDED"] . "</h1>");
     print("<p>" . $language["VERIFICATION_SUCCESS_BODY"] . "</p>");
-    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
+    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
 } catch (Exception $e) {
     print("<title>" . $language["VERIFICATION_FAILED"] . "</title>");
     print("</head><body>");
@@ -85,7 +85,7 @@ try {
     } else {
         print("<p>" . $e->getMessage() . "</p>");
     }
-    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
+    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
 }
 ?>
     </body>
diff --git a/public/verify_admin.php b/public/verify_admin.php
index 99cdb76..15fa147 100644
--- a/public/verify_admin.php
+++ b/public/verify_admin.php
@@ -155,8 +155,8 @@ try {
                                            value="<?php echo $username; ?>" disabled=true>
                                 </div>
                                 <input type="hidden" name="t" id="token" value="<?php echo $token; ?>">
-                                <input type="submit" name="allow" value="Bestätigen" class="btn btn-info btn-block">
-                                <input type="submit" name="deny" value="Ablehnen" class="btn btn-info btn-block">
+                                <input type="submit" name="allow" value="<?php echo $language["ACCEPT"]; ?>" class="btn btn-info btn-block">
+                                <input type="submit" name="deny" value="<?php echo $language["DECLINE"]; ?>" class="btn btn-info btn-block">
 
                             </form>
                         </div>
@@ -177,7 +177,7 @@ try {
         } else {
             print("<p>" . $e->getMessage() . "</p>");
         }
-        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
+        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
     }
     ?>
                     < /body>
-- 
2.39.5


From 2d7dffb426d73943595bfa4365e46d8db0eaf64a Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 16 Apr 2018 14:07:33 +0200
Subject: [PATCH 3/3] finish translation

---
 lang/lang.de-de.php     | 24 +++++++++++++++++++++---
 lang/lang.en-gb.php     | 19 +++++++++++++++++++
 public/index.php        | 37 ++++++++++++++++++-------------------
 public/verify.php       | 18 ++++++++++++------
 public/verify_admin.php |  2 +-
 5 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/lang/lang.de-de.php b/lang/lang.de-de.php
index b3a2735..ded1271 100644
--- a/lang/lang.de-de.php
+++ b/lang/lang.de-de.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +17,14 @@ $language = array(
     "ACCEPT" => "Akzeptieren",
     "DECLINE" => "Ablehnen",
     "SUCCESS" => "Erfolgreich",
+    "FIRST_NAME" => "Vorname",
+    "LAST_NAME" => "Nachname",
+    "USERNAME" => "Nutzername (für den Login)",
+    "PASSWORD" => "Passwort",
+    "PASSWORD_CONFIRM" => "Passwort bestätigen",
+    "EMAIL_ADDRESS" => "E-Mail-Adresse",
+    "REGISTER" => "Registrieren",
+    "NOTE" => "Hinweis",
     "NO_CONFIGURATION" => "Es konnte keine Konfiguration gefunden werden.",
     "UNKNOWN_ERROR" => "Unbekannter Fehler",
     "UNKNOWN_SESSION" => "Sitzungstoken nicht vorhanden oder ungültig.",
@@ -29,14 +36,16 @@ $language = array(
     "USERNAME_REGISTERED" => "Dieser Nutzername wurde bereits registriert. Bitte wähle einen anderen Nutzernamen",
     "PASSWORD_NOT_MATCH" => "Passwörter stimmen nicht überein",
     "NOTE_LENGTH_EXEEDED" => "Notiz ist länger als die erlaubten 50 Zeichen",
+    "PLACEHOLDER_NOTE_ABOUT_YOURSELF" => "Notiz zu dir (max. 50 Zeichen)",
     "EMAIL_INVALID_FORMAT" => "Keine valide E-Mail-Adresse angegeben",
-    "FIRSTNAME_INVALID_FORMAT" => "Vorname hat ungültiges Format",
-    "SIRNAME_INVALID_FORMAT" => "Nachname hat ungültiges Format",
+    "FIRSTNAME_INVALID_FORMAT" => "Vorname muss das Format <Großbuchstabe><Kleinbuchstaben> haben",
+    "SIRNAME_INVALID_FORMAT" => "Nachname muss das Format <Großbuchstabe><Kleinbuchstaben> haben",
     "SEND_MAIL_FAIL" => "Senden der E-Mail fehlgeschlagen",
     "SEND_MATRIX_FAIL" => "Senden einer Nachricht an die Administratoren fehlgeschlagen",
     "TASK_CHECK_YOUR_EMAIL_VERIFY" => "Bitte prüfe deine E-Mails um deine Adresse zu bestätigen",
     "REGISTRATION_REQUEST_FAILED" => "Registrierungsanfrage ist fehlgeschlagen",
     "REGISTRATION_FAILED" => "Registrierung ist fehlgeschlagen",
+    "REGISTRATION_FAILED_FOR" => "Registrierung für @user ist fehlgeschlagen",
     "VERIFICATION_SUCEEDED" => "Verifizierung erfolgreich",
     "VERIFICATION_FAILED" => "Verifizierung fehlgeschlagen",
     "VERIFICATION_SUCCESS_BODY" => "Vielen Dank. Die Administratoren wurden informiert",
@@ -44,5 +53,14 @@ $language = array(
     "ADMIN_REGISTER_ACCEPTED_BODY" => "Die Registrierungsanfrage wurde akzeptiert. Der Nutzer wurde per Mail informiert.",
     "ADMIN_REGISTER_DECLINED_BODY" => "Die Registrierungsanfrage wurde angelehnt. Der Nutzer wurde per Mail informiert.",
     "JUMP_TO_HOMEPAGE" => "Zur Startseite",
+    "TOPIC_PLEASE_REGISTER" => "Bitte für @homeserver registrieren<small>2-Schritt-Registrierung</small>",
+    "NOTE_FOR_REGISTRATION" => "@homeserver ist ein geschlossenes Chat-Netzwerk in dem jeder Nutzer bestätigt werden muss.<br />
+        Du bekommst eine E-Mail wenn jemand deine Mitgliedschaft bestätigt hat. An diese wird auch dein initiales Passwort gesendet.
+        Hinterlasse also bitte einen Hinweis zu dir (den nur die Administratoren sehen werden).<br />
+        Liebe Grüße vom Team von @homeserver",
+    "MSG_USER_WANTS_REGISTER" => "@name möchte sich registrieren und hat folgende Notiz hinterlassen:
+            @note \r\nZum Bearbeiten hier klicken:\r\n @adminUrl",
+    "MSG_USER_WANTS_REGISTER_FORMATTED" => "@name möchte sich registrieren und hat folgende Notiz hinterlassen:<br />
+                @note <br />Zum Bearbeiten <a href=\"@adminUrl\">hier</a> klicken",
 );
 ?>
diff --git a/lang/lang.en-gb.php b/lang/lang.en-gb.php
index 04f5b0d..281d569 100644
--- a/lang/lang.en-gb.php
+++ b/lang/lang.en-gb.php
@@ -17,6 +17,14 @@ $language = array(
     "ACCEPT" => "Accept",
     "DECLINE" => "Decline",
     "SUCCESS" => "Success",
+    "FIRST_NAME" => "First name",
+    "LAST_NAME" => "Last name",
+    "USERNAME" => "username (for login)",
+    "PASSWORD" => "Password",
+    "PASSWORD_CONFIRM" => "Confirm password",
+    "EMAIL_ADDRESS" => "EMail Address",
+    "REGISTER" => "Register",
+    "NOTE" => "Note",
     "NO_CONFIGURATION" => "No configuration found",
     "UNKNOWN_ERROR" => "Unknown Error",
     "UNKNOWN_SESSION" => "Session token not found of invalid.",
@@ -28,6 +36,7 @@ $language = array(
     "USERNAME_REGISTERED" => "This username is already registered. Please try again with another username",
     "PASSWORD_NOT_MATCH" => "passwords do not match",
     "NOTE_LENGTH_EXEEDED" => "Note consists of more than 50 characters",
+    "PLACEHOLDER_NOTE_ABOUT_YOURSELF" => "Note about yourself (max. 50 characters)",
     "EMAIL_INVALID_FORMAT" => "no valid email address",
     "FIRSTNAME_INVALID_FORMAT" => "First name with invalid formatting",
     "SIRNAME_INVALID_FORMAT" => "Sirname with invalid formatting",
@@ -36,6 +45,7 @@ $language = array(
     "TASK_CHECK_YOUR_EMAIL_VERIFY" => "Please check your emails to verify your email address",
     "REGISTRATION_REQUEST_FAILED" => "Registration request failed",
     "REGISTRATION_FAILED" => "Registration failed",
+    "REGISTRATION_FAILED_FOR" => "Registrierung für @user ist fehlgeschlagen",
     "VERIFICATION_SUCEEDED" => "Verification suceeded",
     "VERIFICATION_FAILED" => "Verification failed",
     "VERIFICATION_SUCCESS_BODY" => "Thank you. The admins got informed",
@@ -43,5 +53,14 @@ $language = array(
     "ADMIN_REGISTER_ACCEPTED_BODY" => "The registration request got accepted. The user got notified per email.",
     "ADMIN_REGISTER_DECLINED_BODY" => "The registration request got declined. The user got notified per email.",
     "JUMP_TO_HOMEPAGE" => "To homepage",
+    "TOPIC_PLEASE_REGISTER" => "Please register for @homeserver<small>2-Step-Registration</small>",
+    "NOTE_FOR_REGISTRATION" => "@homeserver is a closed chat network where every user has to be confirmed.<br />
+        You will get an email once sb. approved your registration. An initial password will be send to you afterwards.
+        Please leave a note about yourself (that will only be shown to the admins).<br />
+        Greetings from the team of @homeserver",
+    "MSG_USER_WANTS_REGISTER" => "@name wants to register and left the following note:
+            @note \r\nTo handle that request:\r\n @adminUrl",
+    "MSG_USER_WANTS_REGISTER_FORMATTED" => "@name wants to register and left the following note:<br />
+                @note <br />To handle that request click <a href=\"@adminUrl\">here</a>",
 );
 ?>
diff --git a/public/index.php b/public/index.php
index 2eb1889..12fac63 100644
--- a/public/index.php
+++ b/public/index.php
@@ -129,7 +129,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             <div class="col-xs-12 col-sm-8 col-md-4 col-sm-offset-2 col-md-offset-4">
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h3 class="panel-title">Bitte für <?php echo $config["homeserver"]; ?> registrieren<small>2-Schritt-Registrierung</small></h3>
+                        <h3 class="panel-title"><?php echo strtr($language["TOPIC_PLEASE_REGISTER"], [ "@homeserver" => $config["homeserver"] ]); ?></h3>
                     </div>
                     <div class="panel-body">
                         <form name="regForm" role="form" action="index.php" method="post">
@@ -137,53 +137,52 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                                 <div class="col-xs-6 col-sm-6 col-md-6">
                                     <div class="form-group">
                                         <input type="text" name="first_name" id="first_name" class="form-control input-sm"
-                                               placeholder="Vorname" pattern="[A-Z][a-z]+">
+                                               placeholder="<?php echo $language["FIRST_NAME"]; ?>" pattern="[A-Z][a-z]+">
                                     </div>
                                 </div>
                                 <div class="col-xs-6 col-sm-6 col-md-6">
                                     <div class="form-group">
                                         <input type="text" name="last_name" id="last_name" class="form-control input-sm"
-                                               placeholder="Nachname" pattern="[A-Z][a-z]+">
+                                               placeholder="<?php echo $language["LAST_NAME"]; ?>" pattern="[A-Z][a-z]+">
                                     </div>
                                 </div>
                             </div>
 
                             <div class="form-group">
-                                <input type="email" name="email" id="email" class="form-control input-sm" placeholder="E-Mail-Adresse" required>
+                                <input type="email" name="email" id="email" class="form-control input-sm" placeholder="<?php echo $language["EMAIL_ADDRESS"]; ?>" required>
                             </div>
 
                             <div class="form-group">
-                                <input type="text" name="note" id="note" class="form-control input-sm" placeholder="Notiz zu dir (max. 50 Zeichen)">
+                                <input type="text" name="note" id="note" class="form-control input-sm" placeholder="<?php echo $language["PLACEHOLDER_NOTE_ABOUT_YOURSELF"]; ?>">
                             </div>
 
                             <div class="form-group">
                                 <input type="text" name="username" id="username" class="form-control input-sm"
-                                       placeholder="Nutzername (für den Login)" pattern="[a-z1-9]{3,20}" required>
+                                       placeholder="<?php echo $language["USERNAME"]; ?>" pattern="[a-z1-9]{3,20}" required>
                             </div>
                             <?php if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]) { ?>
                                 <div class="row">
                                     <div class="col-xs-6 col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <input type="password" name="password" id="password" class="form-control input-sm" placeholder="Passwort" required>
+                                            <input type="password" name="password" id="password" class="form-control input-sm" placeholder="<?php echo $language["PASSWORD"]; ?>" required>
                                         </div>
                                     </div>
                                     <div class="col-xs-6 col-sm-6 col-md-6">
                                         <div class="form-group">
-                                            <input type="password" name="password_confirm" id="password_confirm" class="form-control input-sm" placeholder="Passwort bestätigen" required>
+                                            <input type="password" name="password_confirm" id="password_confirm" class="form-control input-sm" placeholder="<?php echo $language["PASSWORD_CONFIRM"]; ?>" required>
                                         </div>
                                     </div>
                                 </div>
                             <?php } ?>
                             <input type="hidden" name="token" id="token" value="<?php echo $_SESSION["token"]; ?>">
-                            <input type="submit" value="Registrieren" class="btn btn-info btn-block">
+                            <input type="submit" value="<?php echo $language["REGISTER"]; ?>" class="btn btn-info btn-block">
 
                         </form>
-                        <p>Hinweis: <br />
-                            <?php echo $config["homeserver"]; ?> ist ein geschlossenes Chat-Netzwerk in dem jeder Nutzer bestätigt werden muss.<br />
-                            Du bekommst eine E-Mail wenn jemand deine Mitgliedschaft bestätigt hat. An diese wird auch dein initiales Passwort gesendet.
-                            Hinterlasse also bitte einen Hinweis zu dir (der nur den entsprechenden Personen gezeigt wird).<br />
-                            Liebe Grüße vom Team von <?php echo $config["homeserver"]; ?>
-                        </p>
+                        <?php if (isset($language["NOTE_FOR_REGISTRATION"])) {
+                            echo "<p>" .  $language["NOTE"] . ": <br />";
+                            echo strtr($language["NOTE_FOR_REGISTRATION"], [ "@homeserver" => $config["homeserver"] ]);
+                            echo "</p>";
+                        } ?>
                     </div>
                 </div>
             </div>
@@ -192,21 +191,21 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     <script type="text/javascript">
         var first_name = document.getElementById("first_name");
         first_name.oninvalid = function (event) {
-            event.target.setCustomValidity("Vorname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
+            event.target.setCustomValidity("<?php echo $language["FIRSTNAME_INVALID_FORMAT"]; ?>");
         }
         first_name.onkeyup = function (event) {
             event.target.setCustomValidity("");
         }
         var last_name = document.getElementById("last_name");
         last_name.oninvalid = function (event) {
-            event.target.setCustomValidity("Nachname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
+            event.target.setCustomValidity("<?php echo $language["SIRNAME_INVALID_FORMAT"]; ?>");
         }
         last_name.onkeyup = function (event) {
             event.target.setCustomValidity("");
         }
         var user_name = document.getElementById("username");
         user_name.oninvalid = function (event) {
-            event.target.setCustomValidity("Nutzername darf zwischen 3 und 20 kleine Buchstaben und Zahlen enthalten");
+            event.target.setCustomValidity("<?php echo $language["USERNAME_LENGTH_INVALID"]; ?>");
         }
         user_name.onkeyup = function (event) {
             event.target.setCustomValidity("");
@@ -216,7 +215,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                     , confirm_password = document.getElementById("password_confirm");
             function validatePassword() {
                 if (password.value != confirm_password.value) {
-                    confirm_password.setCustomValidity("Passwörter stimmen nicht überein");
+                    confirm_password.setCustomValidity("<?php echo $language["PASSWORD_NOT_MATCH"]; ?>");
                 } else {
                     confirm_password.setCustomValidity('');
                 }
diff --git a/public/verify.php b/public/verify.php
index 1da639b..c40f0ad 100644
--- a/public/verify.php
+++ b/public/verify.php
@@ -54,12 +54,18 @@ try {
     $adminUrl = $config["webroot"] . "/verify_admin.php?t=" . $admin_token;
     $mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);
     $mxMsg = new MatrixMessage();
-    $mxMsg->set_body($first_name . ' ' . $last_name . "möchte sich registrieren und hat folgende Notiz hinterlassen:\r\n"
-            . $note . "\r\n"
-            . "Zum Bearbeiten hier klicken:\r\n" . $adminUrl);
-    $mxMsg->set_formatted_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:<br />"
-            . $note . "<br />"
-            . "Zum Bearbeiten <a href=\"" . $adminUrl . "\">hier</a> klicken");
+    $mxMsg->set_body(strtr($language["MSG_USER_WANTS_REGISTER"], [
+                "@name" => $first_name . ' ' . $last_name,
+                "@note" => $note,
+                "@adminUrl" => $adminUrl
+            ]));
+    if (isset($language["MSG_USER_WANTS_REGISTER_FORMATTED"])) {
+        $mxMsg->set_formatted_body(strtr($language["MSG_USER_WANTS_REGISTER_FORMATTED"], [
+                "@name" => $first_name . ' ' . $last_name,
+                "@note" => $note,
+                "@adminUrl" => $adminUrl
+            ]));
+    }
     $mxMsg->set_type("m.text");
     $response = $mxConn->send($config["register_room"], $mxMsg);
 
diff --git a/public/verify_admin.php b/public/verify_admin.php
index 15fa147..0cdb56b 100644
--- a/public/verify_admin.php
+++ b/public/verify_admin.php
@@ -84,7 +84,7 @@ try {
             send_mail_registration_allowed_but_failed($config["homeserver"], $first_name . " " . $last_name, $email);
             $mxMsg = new MatrixMessage();
             $mxMsg->set_type("m.text");
-            $mxMsg->set_body("Fehler beim Registrieren von " . $first_name . " " . $last_name . ".");
+            $mxMsg->set_body(strtr($language["REGISTRATION_FAILED_FOR"], [ "@name" => $first_name . " " . $last_name]));
             $mxConn->send($config["register_room"], $mxMsg);
             throw new Exception("REGISTRATION_FAILED");
         }
-- 
2.39.5