Merge branch 'master' into multilanguage1

further implementing of multilanguage
2018-04-15 22:16:16 +02:00 · 2018-03-26 23:13:26 +02:00
14 changed files with 95 additions and 208 deletions
--- a/config.sample.php
+++ b/config.sample.php
@@ -14,17 +14,7 @@ $config = [
    // optional: Do you have a place where howTo's are located? If not leave this value out
    "howToURL" => "https://my-url-for-storing-howTos.net",

-    // set the mode of operation. Basically this defines where the data is stored:
-    // - synapse (using the register endpoint - so no further auth config necessary
-    // - local (recommended; using a table in the database to store credentials;
-    //   synapse has to be configured to use that)
-    "operationMode" => "local",
-
-    // This setting is only required for operationMode = synapse
-    "registration_shared_secret" => "SOME_SECRET_KEY_FROM_HOMESERVER_CONFIG",
-
    // When you want to collect the password on registration set this to true
-    // only evaluated when operationMode = local
    "getPasswordOnRegistration" => false,

    // default language: one of [ en-gb | de-de ]
--- a/database.php
+++ b/database.php
@@ -241,7 +241,7 @@ class mxDatabase {
        $res = $this->db->query($sql);

        if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, note, email, username, admin_token FROM registrations "
+            $sql = "SELECT first_name, last_name, note, email, admin_token FROM registrations "
                    . " WHERE verify_token = '" . $verify_token . "'"
                    . " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
            foreach ($this->db->query($sql) as $row) {
--- a/internal/directory_search.php
+++ b/internal/directory_search.php
@@ -46,5 +46,5 @@ try {
    error_log("failed with error: " . $e->getMessage());
    $response["error"] = $e->getMessage();
 }
-print (json_encode($response, JSON_PRETTY_PRINT));
+print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>
--- a/internal/identity_bulk.php
+++ b/internal/identity_bulk.php
@@ -66,5 +66,5 @@ try {
    error_log("ídentity_bulk failed with error: " . $e->getMessage());
    $response["error"] = $e->getMessage();
 }
-print (json_encode($response, JSON_PRETTY_PRINT));
+print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>
--- a/internal/identity_single.php
+++ b/internal/identity_single.php
@@ -61,5 +61,5 @@ try {
        "error" => $e->getMessage()
    ];
 }
-print (json_encode($response, JSON_PRETTY_PRINT));
+print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>
--- a/internal/login.php
+++ b/internal/login.php
@@ -108,5 +108,5 @@ try {
    error_log("Auth failed with error: " . $e->getMessage());
    $response["auth"]["error"] = $e->getMessage();
 }
-print (json_encode($response, JSON_PRETTY_PRINT));
+print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>
--- a/lang/lang.de-de.php
+++ b/lang/lang.de-de.php
@@ -15,19 +15,7 @@
 * limitations under the License.
 */
 $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.",
    "UNKNOWN_USERNAME" => "Nutzername fehlt",
    "UNKNOWN_TOKEN" => "Token ist unbekannt",
@@ -37,32 +25,18 @@ $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 muss das Format <Großbuchstabe><Kleinbuchstaben> haben",
-    "SIRNAME_INVALID_FORMAT" => "Nachname muss das Format <Großbuchstabe><Kleinbuchstaben> haben",
+    "FIRSTNAME_INVALID_FORMAT" => "Vorname hat ungültiges Format",
+    "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",
-    "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",
    "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",
-    "TOPIC_PLEASE_REGISTER" => "Bitte für @homeserver registrieren",
-    "TOPIC_PLEASE_REGISTER_NOTE" => "2-Schritt-Registrierung",
-    "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",
 );
 ?>
--- a/lang/lang.en-gb.php
+++ b/lang/lang.en-gb.php
@@ -14,19 +14,7 @@
 * limitations under the License.
 */
 $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.",
    "UNKNOWN_USERNAME" => "username unknown",
    "UNKNOWN_TOKEN" => "Token is unknown",
@@ -36,31 +24,18 @@ $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",
    "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",
-    "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",
    "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",
-    "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>",
 );
 ?>
--- a/lang/mail.de-de.php
+++ b/lang/mail.de-de.php
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 function send_mail($receiver, $subject, $body) {
-	include("../config.php");
+	include("config.php");
 	$headers = "From: " . $config["register_email"] . "\r\n"
 		. "Content-Type: text/plain;charset=utf-8";
 	return mail($receiver, $subject, $body, $headers);
--- a/lang/mail.en-gb.php
+++ b/lang/mail.en-gb.php
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 function send_mail($receiver, $subject, $body) {
-	include("../config.php");
+	include("config.php");
 	$headers = "From: " . $config["register_email"] . "\r\n"
 		. "Content-Type: text/plain;charset=utf-8";
 	return mail($receiver, $subject, $body, $headers);
--- a/mail_templates.php
+++ b/mail_templates.php
@@ -24,7 +24,6 @@ if (!file_exists($lang_file)) {
    error_log("Mail templates for '" . $lang . "' not found. Fallback to 'de-de'");
    $lang = "de-de";
 }
-$lang_file = dirname(__FILE__) . "/lang/mail." . $lang . ".php";
 require_once($lang_file);
 unset($lang_file);
 ?>
--- a/public/index.php
+++ b/public/index.php
@@ -13,12 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-// enforce admin via https
-if (!isset($_SERVER['HTTPS'])) {
-    header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
-    exit();
-}
-
 require_once "../language.php";
 if (!file_exists("../config.php")) {
    print($language["NO_CONFIGURATION"]);
@@ -26,18 +20,12 @@ if (!file_exists("../config.php")) {
 }
 require_once "../config.php";

-// this values will not be used when using the register operation type
-$storeFirstLastName = false;
-if (isset($config["operationMode"]) && $config["operationMode"] === "local") {
-    $storeFirstLastName = true;
+// enforce admin via https
+if (!isset($_SERVER['HTTPS'])) {
+    header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
+    exit();
 }

-// currently the case to store the password on our own is the only supported one
-$storePassword = false;
-if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"] &&
-        isset($config["operationMode"]) && $config["operationMode"] === "synapse") {
-    $storePassword = true;
-}
 session_start();

 if ($_SERVER["REQUEST_METHOD"] == "POST") {
@@ -65,22 +53,17 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
        if (!isset($_POST["email"]) || !filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) {
            throw new Exception("EMAIL_INVALID_FORMAT");
        }
-        if ($storeFirstLastName) {
-            // only require first_name and last_name when we will evaluate them
-            if (!isset($_POST["first_name"]) || !preg_match("/[A-Z][a-z]+/", $_POST["first_name"])) {
+        if (isset($_POST["first_name"]) && !preg_match("/[A-Z][a-z]+/", $_POST["first_name"])) {
            throw new Exception("FIRSTNAME_INVALID_FORMAT");
        }
-            if (!isset($_POST["last_name"]) || !preg_match("/[A-Z][a-z]+/", $_POST["last_name"])) {
+        if (isset($_POST["last_name"]) && !preg_match("/[A-Z][a-z]+/", $_POST["last_name"])) {
            throw new Exception("SIRNAME_INVALID_FORMAT");
        }
+
        $first_name = filter_var($_POST["first_name"], FILTER_SANITIZE_STRING);
        $last_name = filter_var($_POST["last_name"], FILTER_SANITIZE_STRING);
-        } else {
-            $first_name = $last_name = "";
-        }
-
        $username = filter_var($_POST["username"], FILTER_SANITIZE_STRING);
-        if ($storePassword && isset($_POST["password"])) {
+        if (isset($_POST["password"])) {
            $password = filter_var($_POST["password"], FILTER_SANITIZE_STRING);
        }
        $note = filter_var($_POST["note"], FILTER_SANITIZE_STRING);
@@ -91,23 +74,23 @@ 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"];

        $verify_url = $config["webroot"] . "/verify.php?t=" . $verify_token;
        require_once "../mail_templates.php";
        $success = send_mail_pending_verification(
-                $config["homeserver"], $storeFirstLastName ? $first_name . " " . $last_name : $username, $email, $verify_url);
+                $config["homeserver"], $first_name . " " . $last_name, $email, $verify_url);

        $mx_db->setRegistrationStateVerify(
                ($success ? RegisterState::PendingEmailVerify : RegisterState::PendingEmailSend), $verify_token);

-        print("<title>" . $language["SUCCESS"] . "</title>");
+        print("<title>Erfolgreich</title>");
        print("</head><body>");
-        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>");
+        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>");
    } catch (Exception $e) {
        print("<title>" . $language["REGISTRATION_REQUEST_FAILED"] . "</title>");
        print("</head><body>");
@@ -117,12 +100,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
        } else {
            print("<p>" . $e->getMessage() . "</p>");
        }
-        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
+        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
    }
 } else {
    $_SESSION["token"] = bin2hex(random_bytes(16));
    ?>
-    <title><?php echo strtr($language["TOPIC_PLEASE_REGISTER"], [ "@homeserver" => $config["homeserver"] ]); ?></title>
+    <title>Registriere dich für <?php echo $config["homeserver"]; ?></title>
    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css" rel="stylesheet">
    <style>
        body{
@@ -146,97 +129,94 @@ 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"><?php echo strtr($language["TOPIC_PLEASE_REGISTER"], [ "@homeserver" => $config["homeserver"] ])
-                                . "<small>" . $language["TOPIC_PLEASE_REGISTER_NOTE"] . "</small>"; ?></h3>
+                        <h3 class="panel-title">Bitte für <?php echo $config["homeserver"]; ?> registrieren<small>2-Schritt-Registrierung</small></h3>
                    </div>
                    <div class="panel-body">
                        <form name="regForm" role="form" action="index.php" method="post">
-<?php if ($storeFirstLastName) { ?>
                            <div class="row">
                                <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="<?php echo $language["FIRST_NAME"]; ?>" pattern="[A-Z][a-z]+">
+                                               placeholder="Vorname" 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="<?php echo $language["LAST_NAME"]; ?>" pattern="[A-Z][a-z]+">
+                                               placeholder="Nachname" pattern="[A-Z][a-z]+">
                                    </div>
                                </div>
                            </div>
-<?php } ?>
-
-                            <div class="form-group">
-                                <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="<?php echo $language["PLACEHOLDER_NOTE_ABOUT_YOURSELF"]; ?>">
+                                <input type="email" name="email" id="email" class="form-control input-sm" placeholder="E-Mail-Adresse" 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)">
                            </div>

                            <div class="form-group">
                                <input type="text" name="username" id="username" class="form-control input-sm"
-                                       placeholder="<?php echo $language["USERNAME"]; ?>" pattern="[a-z1-9]{3,20}" required>
+                                       placeholder="Nutzername (für den Login)" pattern="[a-z1-9]{3,20}" required>
                            </div>
-<?php if ($storePassword) { ?>
+                            <?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="<?php echo $language["PASSWORD"]; ?>" required>
+                                            <input type="password" name="password" id="password" class="form-control input-sm" placeholder="Passwort" 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="<?php echo $language["PASSWORD_CONFIRM"]; ?>" required>
+                                            <input type="password" name="password_confirm" id="password_confirm" class="form-control input-sm" placeholder="Passwort bestätigen" required>
                                        </div>
                                    </div>
                                </div>
                            <?php } ?>
                            <input type="hidden" name="token" id="token" value="<?php echo $_SESSION["token"]; ?>">
-                            <input type="submit" value="<?php echo $language["REGISTER"]; ?>" class="btn btn-info btn-block">
+                            <input type="submit" value="Registrieren" class="btn btn-info btn-block">

                        </form>
-                        <?php if (isset($language["NOTE_FOR_REGISTRATION"])) {
-                            echo "<p>" .  $language["NOTE"] . ": <br />";
-                            echo strtr($language["NOTE_FOR_REGISTRATION"], [ "@homeserver" => $config["homeserver"] ]);
-                            echo "</p>";
-                        } ?>
+                        <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>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <script type="text/javascript">
-        var user_name = document.getElementById("username");
-        user_name.oninvalid = function (event) {
-            event.target.setCustomValidity("<?php echo $language["USERNAME_LENGTH_INVALID"]; ?>");
-        }
-        user_name.onkeyup = function (event) {
-            event.target.setCustomValidity("");
-        }
-<?php if ($storeFirstLastName) { ?>
        var first_name = document.getElementById("first_name");
        first_name.oninvalid = function (event) {
-                event.target.setCustomValidity("<?php echo $language["FIRSTNAME_INVALID_FORMAT"]; ?>");
+            event.target.setCustomValidity("Vorname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
        }
        first_name.onkeyup = function (event) {
            event.target.setCustomValidity("");
        }
        var last_name = document.getElementById("last_name");
        last_name.oninvalid = function (event) {
-                event.target.setCustomValidity("<?php echo $language["SIRNAME_INVALID_FORMAT"]; ?>");
+            event.target.setCustomValidity("Nachname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
        }
        last_name.onkeyup = function (event) {
            event.target.setCustomValidity("");
        }
-<?php } if ($storePassword) { ?>
+        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");
+        }
+        user_name.onkeyup = function (event) {
+            event.target.setCustomValidity("");
+        }
+<?php if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]) { ?>
            var password = document.getElementById("password")
                    , confirm_password = document.getElementById("password_confirm");
            function validatePassword() {
                if (password.value != confirm_password.value) {
-                    confirm_password.setCustomValidity("<?php echo $language["PASSWORD_NOT_MATCH"]; ?>");
+                    confirm_password.setCustomValidity("Passwörter stimmen nicht überein");
                } else {
                    confirm_password.setCustomValidity('');
                }
@@ -246,4 +226,5 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 <?php } ?>
    </script>
 <?php } ?>
-</body></html>
+    </body>
+</html>
--- a/public/verify.php
+++ b/public/verify.php
@@ -46,7 +46,6 @@ try {
    }
    $first_name = $user["first_name"];
    $last_name = $user["last_name"];
-    $username = $user["username"];
    $note = $user["note"];
    $email = $user["email"];
    $admin_token = $user["admin_token"];
@@ -55,18 +54,12 @@ try {
    $adminUrl = $config["webroot"] . "/verify_admin.php?t=" . $admin_token;
    $mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);
    $mxMsg = new MatrixMessage();
-    $mxMsg->set_body(strtr($language["MSG_USER_WANTS_REGISTER"], [
-                "@name" => (strlen($first_name . $last_name) > 0 ? $first_name . " " . $last_name : $username),
-                "@note" => $note,
-                "@adminUrl" => $adminUrl
-            ]));
-    if (isset($language["MSG_USER_WANTS_REGISTER_FORMATTED"])) {
-        $mxMsg->set_formatted_body(strtr($language["MSG_USER_WANTS_REGISTER_FORMATTED"], [
-                "@name" => (strlen($first_name . $last_name) > 0 ? $first_name . " " . $last_name : $username),
-                "@note" => $note,
-                "@adminUrl" => $adminUrl
-            ]));
-    }
+    $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_type("m.text");
    $response = $mxConn->send($config["register_room"], $mxMsg);

@@ -82,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" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
+    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
 } catch (Exception $e) {
    print("<title>" . $language["VERIFICATION_FAILED"] . "</title>");
    print("</head><body>");
@@ -92,7 +85,7 @@ try {
    } else {
        print("<p>" . $e->getMessage() . "</p>");
    }
-    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
+    print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
 }
 ?>
    </body>
--- a/public/verify_admin.php
+++ b/public/verify_admin.php
@@ -70,30 +70,11 @@ try {
        require_once("../MatrixConnection.php");
        $mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);

-        $password = NULL;
-        switch ($config["operationMode"]) {
-            case "synapse":
-                // register with registration_shared_secret
-                // generate a password with 10 characters
-                $password = bin2hex(openssl_random_pseudo_bytes(5));
-                $res = $mxConn->register($username, $password, $config["registration_shared_secret"]);
-                if (!$res) {
-                    // something went wrong while registering
-                    $password = NULL;
-                }
-                break;
-            case "local":
-                // register by adding a user to the local database
+        // generate a password with 8 characters
        $password = $mx_db->addUser($first_name, $last_name, $username, $email);
-                break;
-            default:
-                throw new Exception("Unknown operationMode");
-        }
        if ($password != NULL) {
            // send registration_success
-            $res = send_mail_registration_success(
-                    $config["homeserver"], $first_name . " " . $last_name, $email, $username, $password, $config["howToURL"]
-                );
+            $res = send_mail_registration_success($config["homeserver"], $first_name . " " . $last_name, $email, $username, $password, $config["howToURL"]);
            if ($res) {
                $mx_db->setRegistrationStateAdmin(RegisterState::AllDone, $token);
            } else {
@@ -103,9 +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(strtr($language["REGISTRATION_FAILED_FOR"], [
-                "@name" => strlen($first_name . $last_name) > 0 ? $first_name . " " . $last_name : $username,
-            ]));
+            $mxMsg->set_body("Fehler beim Registrieren von " . $first_name . " " . $last_name . ".");
            $mxConn->send($config["register_room"], $mxMsg);
            throw new Exception("REGISTRATION_FAILED");
        }
@@ -116,9 +95,7 @@ try {
        print("<p>" . $language["ADMIN_REGISTER_ACCEPTED_BODY"] . "</p>");
    } elseif ($action == RegisterState::RegistrationDeclined) {
        $mx_db->setRegistrationStateAdmin(RegisterState::RegistrationDeclined, $token);
-        send_mail_registration_decline(
-                $config["homeserver"], strlen($first_name . $last_name) > 0 ? $first_name . " " . $last_name : $username, $email, $decline_reason
-        );
+        send_mail_registration_decline($config["homeserver"], $first_name . " " . $last_name, $email, $decline_reason);
        print("<title>" . $language["ADMIN_VERIFY_SITE_TITLE"] . "</title>");
        print("</head><body>");
        print("<h1>" . $language["ADMIN_VERIFY_SITE_TITLE"] . "</h1>");
@@ -154,9 +131,6 @@ try {
                        </div>
                        <div class="panel-body">
                            <form name="appForm" role="form" action="verify_admin.php" method="GET">
-<?php if (isset($config["operationMode"]) && $config["operationMode"] === "local") {
-    // this values will not be used when using the register operation type 
-    ?>
                                <div class="row">
                                    <div class="col-xs-6 col-sm-6 col-md-6">
                                        <div class="form-group">
@@ -171,7 +145,7 @@ try {
                                        </div>
                                    </div>
                                </div>
-<?php } ?>
+
                                <div class="form-group">
                                    <input type="text" id="note" class="form-control input-sm" value="<?php echo $note; ?>" disabled=true>
                                </div>
@@ -181,8 +155,9 @@ 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="<?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">
+                                <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">
+
                            </form>
                        </div>
                    </div>
@@ -202,7 +177,7 @@ try {
        } else {
            print("<p>" . $e->getMessage() . "</p>");
        }
-        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">" . $language["JUMP_TO_HOMEPAGE"] . "</a>");
+        print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
    }
    ?>
                    < /body>
Author	SHA1	Message	Date
Krombel	efdf3be08f	Merge branch 'master' into multilanguage1	2018-04-15 22:16:16 +02:00
Krombel	ae83ea1404	further implementing of multilanguage	2018-03-26 23:13:26 +02:00