update README to contain missing api endpoints; abort execution when no message should be send

- set Register_Accept to 6 internally as it reflects the same state as PendingSendRequest
- cleanups

MatrixConnection.php

@@ -1,170 +1,155 @@
 <?php
+class MatrixConnection
+{
+	private $hs;
+	private $at;
 
-/**
+	function __construct($homeserver, $access_token) {
- * Copyright 2018 Matthias Kesler
+		$this->hs = $homeserver;
- * Licensed under the Apache License, Version 2.0 (the "License");
+		$this->at = $access_token;
- * 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.
- */
-class MatrixConnection {
 
-    private $hs;
+	function send($room_id, $message) {
-    private $at;
+		if (!$this->at) {
+			error_log("No access token defined");
+			return false;
+		}
 
-    function __construct($homeserver, $access_token) {
+		$send_message = NULL;
-        $this->hs = $homeserver;
+		if (!$message) {
-        $this->at = $access_token;
+			error_log("no message to send");
-    }
+			return false;
+		} elseif(is_array($message)) {
+			$send_message = $message;
+		} elseif ($message instanceof MatrixMessage) {
+			$send_message = $message->get_object();
+		} else {
+			error_log("message is of not valid type\n");
+			return false;
+		}
 
-    function send($room_id, $message) {
+		$url="https://".$this->hs."/_matrix/client/r0/rooms/"
-        if (!$this->at) {
+			. urlencode($room_id) ."/send/m.room.message?access_token=".$this->at;
-            error_log("No access token defined");
+		$handle = curl_init($url);
-            return false;
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        }
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($handle, CURLOPT_TIMEOUT, 60);
+		curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($send_message));
+		curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
 
-        $send_message = NULL;
+		$response = $this->exec_curl_request($handle);
-        if (!$message) {
+		return isset($response["event_id"]);
-            error_log("no message to send");
+	}
-            return false;
-        } elseif (is_array($message)) {
-            $send_message = $message;
-        } elseif ($message instanceof MatrixMessage) {
-            $send_message = $message->get_object();
-        } else {
-            error_log("message is of not valid type\n");
-            return false;
-        }
 
-        $url = "https://" . $this->hs . "/_matrix/client/r0/rooms/"
+	function send_msg($room_id, $message) {
-                . urlencode($room_id) . "/send/m.room.message?access_token=" . $this->at;
+		return $this->send($room_id, array(
-        $handle = curl_init($url);
+					"msgtype" => "m.notice",
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+					"body" => $message
-        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
+					)
-        curl_setopt($handle, CURLOPT_TIMEOUT, 60);
+				);
-        curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($send_message));
+	}
-        curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
 
-        $response = $this->exec_curl_request($handle);
+	function hasUser($username) {
-        return isset($response["event_id"]);
+		if (!$username) {
-    }
+			throw new Exception ("no user given to lookup");
+		}
 
-    function send_msg($room_id, $message) {
+		$url = "https://".$this->hs."/_matrix/client/r0/profile/@" . $username . ":" . $this->hs;
-        return $this->send($room_id, array(
+		$handle = curl_init($url);
-                    "msgtype" => "m.notice",
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-                    "body" => $message
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
-                        )
+		curl_setopt($handle, CURLOPT_TIMEOUT, 60);
-        );
+		curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
-    }
 
-    function hasUser($username) {
+		$res = $this->exec_curl_request($handle);
-        if (!$username) {
+		return !(isset($res["errcode"]) && $res["errcode"] == "M_UNKNOWN");
-            throw new Exception("no user given to lookup");
+	}
-        }
 
-        $url = "https://" . $this->hs . "/_matrix/client/r0/profile/@" . $username . ":" . $this->hs;
+	function register($username, $password, $shared_secret) {
-        $handle = curl_init($url);
+		if (!$username) {
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+			error_log("no username provided");
-        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
+		}
-        curl_setopt($handle, CURLOPT_TIMEOUT, 60);
+		if (!$password) {
-        curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
+			error_log("no message to send");
+		}
 
-        $res = $this->exec_curl_request($handle);
+		$mac = hash_hmac('sha1', $username, $shared_secret);
-        return !(isset($res["errcode"]) && $res["errcode"] == "M_UNKNOWN");
-    }
 
-    function register($username, $password, $shared_secret) {
+		$data = array(
-        if (!$username) {
+				"username" => $username,
-            error_log("no username provided");
+				"password" => $password,
-        }
+				"mac" => $mac,
-        if (!$password) {
+			     );
-            error_log("no message to send");
+		$url = "https://".$this->hs."/_matrix/client/v2_alpha/register";
-        }
+		$handle = curl_init($url);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($handle, CURLOPT_TIMEOUT, 60);
+		curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
+		curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($data));
 
-        $mac = hash_hmac('sha1', $username, $shared_secret);
+		return $this->exec_curl_request($handle);
+	}
 
-        $data = array(
+	function exec_curl_request($handle) {
-            "username" => $username,
+		$response = curl_exec($handle);
-            "password" => $password,
-            "mac" => $mac,
-        );
-        $url = "https://" . $this->hs . "/_matrix/client/v2_alpha/register";
-        $handle = curl_init($url);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($handle, CURLOPT_TIMEOUT, 60);
-        curl_setopt($handle, CURLOPT_HTTPHEADER, array("Content-Type: application/json"));
-        curl_setopt($handle, CURLOPT_POSTFIELDS, json_encode($data));
 
-        return $this->exec_curl_request($handle);
+		if ($response === false) {
-    }
+			$errno = curl_errno($handle);
+			$error = curl_error($handle);
+			error_log("Curl returned error $errno: $error\n");
+			curl_close($handle);
+			return false;
+		}
 
-    function exec_curl_request($handle) {
+		$http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
-        $response = curl_exec($handle);
+		curl_close($handle);
-        if ($response === false) {
-            $errno = curl_errno($handle);
-            $error = curl_error($handle);
-            error_log("Curl returned error $errno: $error\n");
-            curl_close($handle);
-            return false;
-        }
-        $http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
-        curl_close($handle);
 
-        if ($http_code >= 500) {
+		if ($http_code >= 500) {
-            // do not want to DDOS server if something goes wrong
+			// do not want to DDOS server if something goes wrong
-            sleep(10);
+			sleep(10);
-            return false;
+			return false;
-        } else if ($http_code != 200) {
+		} else if ($http_code != 200) {
-            $response = json_decode($response, true);
+			$response = json_decode($response, true);
-            error_log("Request has failed with error {$response['error']}\n");
+			error_log("Request has failed with error {$response['error']}\n");
-            if ($http_code == 401) {
+			if ($http_code == 401) {
-                throw new Exception('Invalid access token provided');
+				throw new Exception('Invalid access token provided');
-            }
+			}
-        } else {
+		} else {
-            $response = json_decode($response, true);
+			$response = json_decode($response, true);
-        }
+		}
-        return $response;
-    }
 
+		return $response;
+	}
 }
 
-class MatrixMessage {
+class MatrixMessage
+{
+	private $message;
 
-    private $message;
+	function __construct() {
+		$this->message = ["msgtype" => "m.notice"];
+	}
 
-    function __construct() {
+	function set_type($msgtype) {
-        $this->message = ["msgtype" => "m.notice"];
+		$this->message["msgtype"] = $msgtype;
-    }
+	}
 
-    function set_type($msgtype) {
+	function set_format($format) {
-        $this->message["msgtype"] = $msgtype;
+		$this->message["format"] = $format;
-    }
+	}
 
-    function set_format($format) {
+	function set_body($body) {
-        $this->message["format"] = $format;
+		$this->message["body"] = $body;
-    }
+	}
 
-    function set_body($body) {
+	function set_formatted_body($fbody, $format="org.matrix.custom.html") {
-        $this->message["body"] = $body;
+		$this->message["formatted_body"] = $fbody;
-    }
+		$this->message["format"] = $format;
-
+	}
-    function set_formatted_body($fbody, $format = "org.matrix.custom.html") {
-        $this->message["formatted_body"] = $fbody;
-        $this->message["format"] = $format;
-    }
-
-    function get_object() {
-        return $this->message;
-    }
 
+	function get_object() {
+		return $this->message;
+	}
 }
-
 ?>

README.md

@@ -14,34 +14,17 @@ This is done in several steps:
 
 2nd step: Implement the other apis to integrade [mxisd](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md)
 
-This bot takes care for user accounts. So it stores the credentials itself and provides ways to access them via matrix-synapse-rest-auth or mxisd.
 ## How to install
 
 - Copy `config.sample.php` to `config.php` and configure the bot as you can find there
-- Configure your webserver to publish the folder `public`.
+- Configure your webserver to publish the folder `public` and configure.
-  The folder `internal` contains files that can be accessed by mxisd or matrix-synapse-rest-auth or else via a reverse proxy
+  The folder `internal` contains files that can be accessed by mxisd or matrix-synapse-rest-auth
-- To integrate with [matrix-synapse-rest-auth](https://github.com/kamax-io/matrix-synapse-rest-auth):
+- To integrate with matrix-synapse-rest-auth:
   - `/_matrix-internal/identity/v1/check_credentials` should map to `internal/login.php`
-- To integrate with [mxisd](https://github.com/kamax-io/mxisd): Have a look at [the docs](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md) and apply as follows:
+- To integrate with mxisd: Have a look at [the docs](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md) and apply as follows:
-
-
 | Key                            | file which handles that       | Description                                          |
 |--------------------------------|-------------------------------|------------------------------------------------------|
 | rest.endpoints.auth            | internal/login.php            | Validate credentials and get user profile            |
 | rest.endpoints.directory       | internal/directory_search.php | Search for users by arbitrary input                  |
 | rest.endpoints.identity.single | internal/identity_single.php  | Endpoint to query a single 3PID                      |
 | rest.endpoints.identity.bulk   | internal/identity_bulk.php    | Endpoint to query a list of 3PID                     |
-
-
-## Implement usage of additional features:
-### Use the ChangePasswortInterceptor:
-
-You need a reverse proxy which maps `/_matrix/client/r0/account/password` to `internal/intercept_change_password.php`.
-Here is an example for nginx:
-
-```
-        location /_matrix/client/r0/account/password {
-                proxy_pass http://localhost/mxbot/internal/intercept_change_password.php;
-                proxy_set_header X-Forwarded-For $remote_addr;
-        }
-```

config.sample.php

@@ -1,22 +1,26 @@
 <?php
-
 $config = [
-    "homeserver" => "example.com",
+	"homeserver" => "example.com",
-    "access_token" => "To be used for sending the registration notification",
+	"access_token" => "To be used for sending the registration notification",
-    // Which e-mail-adresse shall the bot use to send e-mails?
+
-    "register_email" => 'register_bot@example.com',
+	// Which e-mail-adresse shall the bot use to send e-mails?
-    // Where should the bot post registration requests to?
+	"register_email" => 'register_bot@example.com',
-    "register_room" => '$registerRoomID:example.com',
+	// Where should the bot post registration requests to?
-    // Where is the public part of the bot located? make sure you have a / at the end
+	"register_room" => '$registerRoomID:example.com',
-    "webroot" => "https://myregisterdomain.net/",
+
-    // optional: Do you have a place where howTo's are located? If not leave this value out
+	// Where is the public part of the bot located? make sure you have a / at the end
-    "howToURL" => "https://my-url-for-storing-howTos.net",
+	"webroot" => "https://myregisterdomain.net/",
-    // When you want to collect the password on registration set this to true
+
-    "getPasswordOnRegistration" => false,
+	// optional: Do you have a place where howTo's are located? If not leave this value out
-    // to define where the data should be stored:
+	"howToURL" => "https://my-url-for-storing-howTos.net",
-    "databaseURI" => "sqlite:" . dirname(__FILE__) . "/db_file.sqlite",
+
-    // credentials for sqlite not used
+	// When you want to collect the password on registration set this to true
-    "databaseUser" => "dbUser123",
+	"getPasswordOnRegistration" => false,
-    "databasePass" => "secretPassword",
+
-        ]
+	// to define where the data should be stored:
+	"databaseURI" => "sqlite:" . dirname(__FILE__) . "/db_file.sqlite",
+	// credentials for sqlite not used
+	"databaseUser" => "dbUser123",
+	"databasePass" => "secretPassword",
+]
 ?>

cron.php

@@ -1,104 +1,92 @@
 <?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.
- */
 require_once("config.php");
 require_once("mail_templates.php");
 require_once("database.php");
 
 $sql = "SELECT id, first_name, last_name, username, email, state, note, verify_token, admin_token FROM registrations "
-        . "WHERE state = " . RegisterState::PendingEmailSend
+."WHERE state = ". RegisterState::PendingEmailSend
-        . " OR state = " . RegisterState::PendingAdminSend
+. " OR state = " . RegisterState::PendingAdminSend
-        . " OR state = " . RegisterState::PendingRegistration
+. " OR state = " . RegisterState::PendingRegistration
-        . " OR state = " . RegisterState::PendingSendRegistrationMail
+. " OR state = " . RegisterState::PendingSendRegistrationMail
-        . " OR state = " . RegisterState::RegistrationDeclined
+. " OR state = " . RegisterState::RegistrationDeclined
-        . " OR state = " . RegisterState::AllDone . ";";
+. " OR state = " . RegisterState::AllDone . ";";
 foreach ($mx_db->query($sql) as $row) {
-    $first_name = $row["first_name"];
+	$first_name = $row["first_name"];
-    $last_name = $row["last_name"];
+	$last_name = $row["last_name"];
-    $username = $row["username"];
+	$username = $row["username"];
-    $email = $row["email"];
+	$email = $row["email"];
-    $state = $row["state"];
+	$state = $row["state"];
 
-    try {
+	try {
-        switch ($state) {
+		switch ($state) {
-            case RegisterState::PendingEmailSend:
+			case RegisterState::PendingEmailSend:
-                $verify_url = $config["webroot"] . "/verify.php?t=" . $row["verify_token"];
+				$verify_url = $config["webroot"] . "/verify.php?t=" . $row["verify_token"];
-                $success = send_mail_pending_verification(
+				$success = send_mail_pending_verification(
-                        $config["homeserver"], $row["first_name"] . " " . $row["last_name"], $row["email"], $verify_url);
+						$config["homeserver"],
+						$row["first_name"] . " " . $row["last_name"],
+						$row["email"],
+						$verify_url);
 
-                if ($success) {
+				if ($success) {
-                    $mx_db->setRegistrationStateById(RegisterState::PendingEmailVerify, $row["id"]);
+					$mx_db->setRegistrationStateById(RegisterState::PendingEmailVerify, $row["id"]);
-                } else {
+				} else {
-                    throw new Exception("Could not send mail to " . $row["first_name"] . " " . $row["last_name"] . "(" . $row["id"] . ")");
+					throw new Exception("Could not send mail to ".$row["first_name"]." ".$row["last_name"]."(".$row["id"].")");
-                }
+				}
-                break;
+				break;
-            case RegisterState::PendingAdminSend:
+			case RegisterState::PendingAdminSend:
-                require_once("MatrixConnection.php");
+				require_once("MatrixConnection.php");
-                $adminUrl = $config["webroot"] . "/verify_admin.php?t=" . $row["admin_token"];
+				$adminUrl = $config["webroot"] . "/verify_admin.php?t=" . $row["admin_token"];
-                $mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);
+				$mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);
-                $mxMsg = new MatrixMessage();
+				$mxMsg = new MatrixMessage();
-                $mxMsg->set_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:\r\n"
+				$mxMsg->set_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:\r\n"
-                        . $row["note"] . "\r\n"
+						. $row["note"] . "\r\n"
-                        . "Zum Bearbeiten hier klicken:\r\n" . $adminUrl);
+						. "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 />"
+				$mxMsg->set_formatted_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:<br />"
-                        . $row["note"] . "<br />"
+						. $row["note"] . "<br />"
-                        . "Zum Bearbeiten <a href=\"" . $adminUrl . "\">hier</a> klicken");
+						. "Zum Bearbeiten <a href=\"". $adminUrl . "\">hier</a> klicken");
-                $mxMsg->set_type("m.text");
+				$mxMsg->set_type("m.text");
-                $response = $mxConn->send($config["register_room"], $mxMsg);
+				$response = $mxConn->send($config["register_room"], $mxMsg);
 
-                if ($response) {
+				if ($response) {
-                    $mx_db->setRegistrationStateById(RegisterState::PendingAdminVerify, $row["id"]);
+					$mx_db->setRegistrationStateById(RegisterState::PendingAdminVerify, $row["id"]);
 
-                    send_mail_pending_approval($config["homeserver"], $first_name . " " . $last_name, $email);
+					send_mail_pending_approval($config["homeserver"], $first_name . " " . $last_name, $email);
-                } else {
+				} else {
-                    throw new Exception("Could not send notification for " . $row["first_name"] . " " . $row["last_name"] . "(" . $row["id"] . ") to admins.");
+					throw new Exception("Could not send notification for ".$row["first_name"]." ".$row["last_name"]."(".$row["id"].") to admins.");
-                }
+				}
-                break;
+				break;
-            case RegisterState::PendingRegistration:
+			case RegisterState::PendingRegistration:
-                // Registration got accepted but registration failed
+				// Registration got accepted but registration failed
 
-                $password = $mx_db->addUser($row["first_name"], $row["last_name"], $row["username"], $row["email"]);
+				$password = $mx_db->addUser($row["first_name"], $row["last_name"], $row["username"], $row["email"]);
-                if ($password != NULL) {
+				if ($password != NULL) {
-                    // send registration_success
+					// 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) {
+					if ($res) {
-                        $mx_db->setRegistrationStateById(RegisterState::AllDone, $row["id"]);
+						$mx_db->setRegistrationStateById(RegisterState::AllDone, $row["id"]);
-                    } else {
+					} else {
-                        $mx_db->setRegistrationStateById(RegisterState::PendingSendRegistrationMail, $row["id"]);
+						$mx_db->setRegistrationStateById(RegisterState::PendingSendRegistrationMail, $row["id"]);
-                    }
+					}
-                } else {
+				} else {
-                    send_mail_registration_allowed_but_failed($config["homeserver"], $first_name . " " . $last_name, $email);
+					send_mail_registration_allowed_but_failed($config["homeserver"], $first_name . " " . $last_name, $email);
-                    $mxMsg = new MatrixMessage();
+					$mxMsg = new MatrixMessage();
-                    $mxMsg->set_type("m.text");
+					$mxMsg->set_type("m.text");
-                    $mxMsg->set_body("Fehler beim Registrieren von " . $first_name . " " . $last_name . ".");
+					$mxMsg->set_body("Fehler beim Registrieren von " . $first_name . " " . $last_name . ".");
-                    $mxConn->send($config["register_room"], $mxMsg);
+					$mxConn->send($config["register_room"], $mxMsg);
-                    throw new Exception($language["REGISTRATION_FAILED"]);
+					throw new Exception($language["REGISTRATION_FAILED"]);
-                }
+				}
-                break;
+				break;
-            case RegisterState::PendingSendRegistrationMail:
+			case RegisterState::PendingSendRegistrationMail:
-                print ("Error: Unhandled state: PendingSendRegistrationMail for " . $first_name . " " . $last_name . " (" . $username . ")\n");
+				print ("Error: Unhandled state: PendingSendRegistrationMail for " . $first_name . " " . $last_name . " (" . $username . ")\n");
-                break;
+				break;
-            case RegisterState::RegistrationDeclined:
+			case RegisterState::RegistrationDeclined:
-            case RegisterState::AllDone:
+			case RegisterState::AllDone:
-                // do reqular cleanup
+				// do reqular cleanup
-                break;
+				break;
-        }
+		}
-    } catch (Exception $e) {
+	} catch (Exception $e) {
-        print("Error while handling cron for " . $first_name . " " . $last_name . " (" . $username . ")\n");
+		print("Error while handling cron for " . $first_name . " " . $last_name . " (" . $username . ")\n");
-        print($e->getMessage());
+		print($e->getMessage());
-    }
+	}
 }
 ?>

database.php

@@ -1,78 +1,65 @@
 <?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.
- */
 require_once("config.php");
 if (!isset($config["databaseURI"])) {
-    throw new Exception("malformed configuration: databaseURI not defined");
+	throw new Exception ("malformed configuration: databaseURI not defined");
 }
 
-abstract class RegisterState {
+abstract class RegisterState
+{
+	// Sending an E-Mail failed in the first attempt. Will retry later
+	const PendingEmailSend = 0;
+	// User got a mail. We wait for it to verfiy
+	const PendingEmailVerify = 1;
+	// Sending a message to the register room failed on first attempt
+	const PendingAdminSend = 5;
+	// No admin has verified the registration yet
+	const PendingAdminVerify = 6;
+	// Registration failed on first attempt. Will retry
+	const PendingRegistration = 7;
 
-    // Sending an E-Mail failed in the first attempt. Will retry later
+	// in this case we have to reset the password of the user (or should we store it for this case?)
-    const PendingEmailSend = 0;
+	const PendingSendRegistrationMail = 8;
-    // User got a mail. We wait for it to verfiy
-    const PendingEmailVerify = 1;
-    // Sending a message to the register room failed on first attempt
-    const PendingAdminSend = 5;
-    // No admin has verified the registration yet
-    const PendingAdminVerify = 6;
-    // Registration failed on first attempt. Will retry
-    const PendingRegistration = 7;
-    // in this case we have to reset the password of the user (or should we store it for this case?)
-    const PendingSendRegistrationMail = 8;
-    // State to allow persisting in the database although an admin declined it.
-    // Will be removed regularly
-    const RegistrationAccepted = 7;
-    const RegistrationDeclined = 13;
-    // User got successfully registered. Will be cleaned up later
-    const AllDone = 100;
 
+	// State to allow persisting in the database although an admin declined it.
+	// Will be removed regularly
+	const RegistrationAccepted = 7;
+	const RegistrationDeclined = 13;
+
+	// User got successfully registered. Will be cleaned up later
+	const AllDone = 100;
 }
 
-class mxDatabase {
+class mxDatabase
+{
+	private $db = NULL;
 
-    private $db = NULL;
+	/**
-
+	 * Creates mxDatabase object
-    /**
+	 * @param config object which has following members:
-     * Creates mxDatabase object
+	 *     databaseURI: path to the sqlite file where the credentials should be stored
-     * @param config object which has following members:
+	 *     or a param which can be used to connect to a database with PDO
-     *     databaseURI: path to the sqlite file where the credentials should be stored
+	 * 	   databaseUser and databasePass when authentication is required
-     *     or a param which can be used to connect to a database with PDO
+	 *     register_email which email does the register bot have (here used for providing lookup)
-     * 	   databaseUser and databasePass when authentication is required
+	 */
-     *     register_email which email does the register bot have (here used for providing lookup)
+	function __construct($config) {
-     */
+		if (empty($config)) {
-    function __construct($config) {
+			throw new Exception("config is empty");
-        if (empty($config)) {
+		}
-            throw new Exception("config is empty");
+		if (!isset($config["databaseURI"])) {
-        }
+			throw new Exception("'databaseURI' not defined");
-        if (!isset($config["databaseURI"])) {
+		}
-            throw new Exception("'databaseURI' not defined");
+		$db_input = $config["databaseURI"];
-        }
+		$user = '';
-        $db_input = $config["databaseURI"];
+		$password = '';
-        $user = '';
+		if (isset($config["databaseUser"]) && isset($config["databasePass"])) {
-        $password = '';
+			// only use it when both are defined
-        if (isset($config["databaseUser"]) && isset($config["databasePass"])) {
+			$user = $config["databaseUser"];
-            // only use it when both are defined
+			$password = $config["databasePass"];
-            $user = $config["databaseUser"];
+		}
-            $password = $config["databasePass"];
+		// create database file when not existent yet
-        }
+		$this->db = new PDO($db_input, $user, $password);
-        // create database file when not existent yet
+		$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        $this->db = new PDO($db_input, $user, $password);
+		$this->db->exec("CREATE TABLE IF NOT EXISTS registrations(
-        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        $this->db->exec("CREATE TABLE IF NOT EXISTS registrations(
 			id SERIAL PRIMARY KEY,
 			state INT DEFAULT 0,
 			first_name TEXT,
@@ -85,7 +72,7 @@ class mxDatabase {
 			admin_token TEXT,
 			request_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 			)");
-        $this->db->exec("CREATE TABLE IF NOT EXISTS logins (
+		$this->db->exec("CREATE TABLE IF NOT EXISTS logins (
 			id SERIAL PRIMARY KEY,
 			active INT DEFAULT 1,
 			first_name TEXT,
@@ -96,273 +83,257 @@ class mxDatabase {
 			create_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
 			last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 			)");
-        // make sure the bot is allowed to login
+		// make sure the bot is allowed to login
-        if (!$this->userRegistered("register_bot")) {
+		if (!$this->userRegistered("register_bot")) {
-            $password = $this->addUser("Register", "Bot", "register_bot", $config["register_email"]);
+			$password = $this->addUser("Register", "Bot", "register_bot", $config["register_email"]);
-            $config["register_password"] = $password;
+			$config["register_password"] = $password;
-            $myfile = fopen(dirname(__FILE__) . "/config.json", "w");
+			$myfile = fopen(dirname(__FILE__) . "/config.json", "w");
-            fwrite($myfile, json_encode($config, JSON_PRETTY_PRINT));
+			fwrite($myfile, json_encode($config, JSON_PRETTY_PRINT));
-            fclose($myfile);
+			fclose($myfile);
-        }
+		}
 
-        // set writeable when not set already
+		// set writeable when not set already
-        if (strpos($db_input, "sqlite") === 0) {
+		if (strpos($db_input, "sqlite") === 0) {
-            $sqlite_file = substr($db_input, strlen("sqlite:"));
+			$sqlite_file = substr($db_input, strlen("sqlite:"));
-            if (!is_writable($sqlite_file)) {
+			if (!is_writable($sqlite_file)) {
-                chmod($sqlite_file, 0660);
+				chmod($sqlite_file, 0660);
-            }
+			}
-            unset($sqlite_file);
+			unset($sqlite_file);
-        }
+		}
-    }
+	}
 
-    /**
+	/**
-     * WARNING: This allows accessing the database directly.
+	 * WARNING: This allows accessing the database directly.
-     * This was only be added for convenience. You are advised to not use this function extensively
+	 * This was only be added for convenience. You are advised to not use this function extensively
-     *
+	 *
-     * @param sql String wich will be passed directly to the database
+	 * @param sql String wich will be passed directly to the database
-     * @return Response of PDO::query()
+	 * @return Response of PDO::query()
-     */
+	 */
-    function query($sql) {
+	function query($sql) {
-        return $this->db->query($sql);
+		return $this->db->query($sql);
-    }
+	}
 
-    function setRegistrationStateVerify($state, $token) {
+	function setRegistrationStateVerify($state, $token) {
-        $sql = "UPDATE registrations SET state = " . $state
+		$sql = "UPDATE registrations SET state = " . $state
-                . " WHERE verify_token = '" . $token . "';";
+			. " WHERE verify_token = '" . $token . "';";
 
-        return $this->db->exec($sql);
+		return $this->db->exec($sql);
-    }
+	}
 
-    function setRegistrationStateById($state, $id) {
+	function setRegistrationStateById($state, $id) {
-        $sql = "UPDATE registrations SET state = " . $state
+		$sql = "UPDATE registrations SET state = " . $state
-                . " WHERE id = '" . $id . "';";
+			. " WHERE id = '" . $id . "';";
 
-        return $this->db->exec($sql);
+		return $this->db->exec($sql);
-    }
+	}
 
-    function setRegistrationStateAdmin($state, $token) {
+	function setRegistrationStateAdmin($state, $token) {
-        $sql = "UPDATE registrations SET state = " . $state
+		$sql = "UPDATE registrations SET state = " . $state
-                . " WHERE admin_token = '" . $token . "';";
+			. " WHERE admin_token = '" . $token . "';";
 
-        return $this->db->exec($sql);
+		return $this->db->exec($sql);
-    }
+	}
 
-    function setRegistrationState($state, $token) {
+	function setRegistrationState($state, $token) {
-        $sql = "UPDATE registrations SET state = " . $state
+		$sql = "UPDATE registrations SET state = " . $state
-                . " WHERE verify_token = '" . $token . "' OR admin_token = '" . $token . "';";
+			. " WHERE verify_token = '" . $token . "' OR admin_token = '" . $token . "';";
 
-        return $this->db->exec($sql);
+		return $this->db->exec($sql);
-    }
+	}
 
-    function userPendingRegistrations($username) {
+	function userPendingRegistrations($username) {
-        $sql = "SELECT COUNT(*) FROM registrations WHERE username = '" . $username . "' AND NOT state = "
+		$sql = "SELECT COUNT(*) FROM registrations WHERE username = '" . $username . "' AND NOT state = "
-                . RegisterState::RegistrationDeclined . " LIMIT 1;";
+		       . RegisterState::RegistrationDeclined . " LIMIT 1;";
-        $res = $this->db->query($sql);
+		$res = $this->db->query($sql);
-        if ($res->fetchColumn() > 0) {
+		if ($res->fetchColumn() > 0) {
-            return true;
+			return true;
-        }
+		}
-        return false;
+		return false;
-    }
+	}
+	function userRegistered($username) {
+		$sql = "SELECT COUNT(*) FROM logins WHERE localpart = '" . $username . "' LIMIT 1;";
+		$res = $this->db->query($sql);
+		if ($res->fetchColumn() > 0) {
+			return true;
+		}
+		return false;
+	}
 
-    function userRegistered($username) {
+	/**
-        $sql = "SELECT COUNT(*) FROM logins WHERE localpart = '" . $username . "' LIMIT 1;";
+	 * Adds user to the database. Next steps should be sending a verify-mail to the user
-        $res = $this->db->query($sql);
+	 * @param first_name First name of the user
-        if ($res->fetchColumn() > 0) {
+	 * @param last_name Sirname of the user
-            return true;
+	 * @param username the future localpart of that user
-        }
+	 * @param note Note the user typed in to give a hint
-        return false;
+	 * @param email E-Mail-Adress which will be stored into the database.
-    }
+	 * 			This will be send to the server on first login
+	 *
+	 * @return ["verify_token"]
+	 */
+	function addRegistration($first_name, $last_name, $username, $note, $email) {
+		if ($this->userPendingRegistrations($username)) {
+			require_once("language.php");
+			throw new Exception($language["USERNAME_PENDING_REGISTRATION"]." (requested)");
+		}
+		if ($this->userRegistered($username)) {
+			require_once("language.php");
+			throw new Exception($language["USERNAME_REGISTERED"] . " (registered)");
+		}
 
-    /**
+		$verify_token = bin2hex(random_bytes(16));
-     * Adds user to the database. Next steps should be sending a verify-mail to the user
+		$admin_token = bin2hex(random_bytes(16));
-     * @param first_name First name of the user
-     * @param last_name Sirname of the user
-     * @param username the future localpart of that user
-     * @param note Note the user typed in to give a hint
-     * @param email E-Mail-Adress which will be stored into the database.
-     * 			This will be send to the server on first login
-     *
-     * @return ["verify_token"]
-     */
-    function addRegistration($first_name, $last_name, $username, $note, $email) {
-        if ($this->userPendingRegistrations($username)) {
-            throw new Exception("USERNAME_PENDING_REGISTRATION");
-        }
-        if ($this->userRegistered($username)) {
-            throw new Exception("USERNAME_REGISTERED");
-        }
 
-        $verify_token = bin2hex(random_bytes(16));
+		$this->db->exec("INSERT INTO registrations
-        $admin_token = bin2hex(random_bytes(16));
-
-        $this->db->exec("INSERT INTO registrations
 			(first_name, last_name, username, note, email, verify_token, admin_token)
-			VALUES ('" . $first_name . "','" . $last_name . "','" . $username . "','" . $note . "','"
+			VALUES ('" . $first_name."','" . $last_name . "','" . $username . "','"	. $note . "','"
-                . $email . "','" . $verify_token . "','" . $admin_token . "')");
+			. $email."','"	.$verify_token."','"	.$admin_token."')");
 
-        return [
+		return [
-            "verify_token" => $verify_token,
+			"verify_token"=> $verify_token,
-        ];
+		];
-    }
+	}
 
-    /**
+	/**
-     * Gets the user for the verify_admin page.
+	 * Gets the user for the verify_admin page.
-     *
+	 *
-     * @return ArrayOfUser|NULL Array with "first_name, last_name, username, note and email"
+	 * @return ArrayOfUser|NULL Array with "first_name, last_name, username, note and email"
-     * 		as members
+	 * 		as members
-     */
+	 */
-    function getUserForApproval($admin_token) {
+	function getUserForApproval($admin_token) {
-        $sql = "SELECT COUNT(*) FROM registrations WHERE admin_token = '" . $admin_token . "'"
+		$sql = "SELECT COUNT(*) FROM registrations WHERE admin_token = '" . $admin_token . "'"
-                . " AND state = " . RegisterState::PendingAdminVerify . " LIMIT 1;";
+			. " AND state = " . RegisterState::PendingAdminVerify . " LIMIT 1;";
-        $res = $this->db->query($sql);
+		$res = $this->db->query($sql);
+		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
-        if ($res->fetchColumn() > 0) {
+		if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, username, note, email FROM registrations"
+			$sql = "SELECT first_name, last_name, username, note, email FROM registrations"
-                    . " WHERE admin_token = '" . $admin_token . "'"
+				. " WHERE admin_token = '" . $admin_token . "'"
-                    . " AND state = " . RegisterState::PendingAdminVerify
+				. " AND state = " . RegisterState::PendingAdminVerify
-                    . " LIMIT 1;";
+				. " LIMIT 1;";
-            foreach ($this->db->query($sql) as $row) {
+			foreach ($this->db->query($sql) as $row) {
-                // will only be executed once
+				// will only be executed once
-                return $row;
+				return $row;
-            }
+			}
-        }
+		}
-        return NULL;
+		return NULL;
-    }
+	}
 
-    /**
+	/**
-     * Gets the user when it opens the page to verify its mail
+	 * Gets the user when it opens the page to verify its mail
-     *
+	 *
-     * @return ArrayOfUser|NULL Array with "first_name, last_name, note, email and admin_token"
+	 * @return ArrayOfUser|NULL Array with "first_name, last_name, note, email and admin_token"
-     * 		as members
+	 * 		as members
-     */
+	 */
-    function getUserForVerify($verify_token) {
+	function getUserForVerify($verify_token) {
-        $sql = "SELECT COUNT(*) FROM registrations WHERE verify_token = '" . $verify_token . "'"
+		$sql = "SELECT COUNT(*) FROM registrations WHERE verify_token = '" . $verify_token . "'"
-                . " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
+			. " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
-        $res = $this->db->query($sql);
+		$res = $this->db->query($sql);
+		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
-        if ($res->fetchColumn() > 0) {
+		if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, note, email, admin_token FROM registrations "
+			$sql = "SELECT first_name, last_name, note, email, admin_token FROM registrations "
-                    . " WHERE verify_token = '" . $verify_token . "'"
+				. " WHERE verify_token = '" . $verify_token . "'"
-                    . " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
+				. " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
-            foreach ($this->db->query($sql) as $row) {
+			foreach ($this->db->query($sql) as $row) {
-                // will only be executed once
+				// will only be executed once
-                return $row;
+				return $row;
-            }
+			}
-        }
+		}
-        return NULL;
+		return NULL;
-    }
+	}
 
-    function getUserForLogin($localpart, $password) {
+	function getUserForLogin($localpart, $password) {
-        $sql = "SELECT COUNT(*) FROM logins WHERE localpart = '" . $localpart
+		$sql = "SELECT COUNT(*) FROM logins WHERE localpart = '" . $localpart
-                . "' AND active = 1 LIMIT 1;";
+			. "' AND active = 1 LIMIT 1;";
-        $res = $this->db->query($sql);
+		$res = $this->db->query($sql);
 
-        if ($res->fetchColumn() > 0) {
+		if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, email, password_hash FROM logins "
+			$sql = "SELECT first_name, last_name, email, password_hash FROM logins "
-                    . " WHERE localpart = '" . $localpart . "' AND active = 1 LIMIT 1;";
+				. " WHERE localpart = '" . $localpart . "' AND active = 1 LIMIT 1;";
-            foreach ($this->db->query($sql) as $row) {
+			foreach ($this->db->query($sql) as $row) {
-                if (password_verify($password, $row["password_hash"])) {
+				if (password_verify($password, $row["password_hash"])) {
-                    return $row;
+					return $row;
-                }
+				}
-            }
+			}
-        }
+		}
-        return NULL;
+		return NULL;
-    }
+	}
 
-    /**
+	/**
-     * adds User to be able to login afterwards.
+	 * adds User to be able to login afterwards.
-     * @param first_name First name of the user
+	 * @param first_name First name of the user
-     * @param last_name Sirname of the user
+	 * @param last_name Sirname of the user
-     * @param username the future localpart of that user
+	 * @param username the future localpart of that user
-     * @param email E-Mail-Adress which will be stored into the database.
+	 * @param email E-Mail-Adress which will be stored into the database.
-     * 			This will be send to the server on first login
+	 * 			This will be send to the server on first login
-     *
+	 *
-     * @return password|NULL with member password as this method generates a
+	 * @return password|NULL with member password as this method generates a
-     * 			password and saves that into the database
+	 * 			password and saves that into the database
-     * 			NULL when failed
+	 * 			NULL when failed
-     *
+	 *
-     */
+	 */
-    function addUser($first_name, $last_name, $username, $email) {
+	function addUser($first_name, $last_name, $username, $email) {
-        // check if user already exists and abort in that case
+		// check if user already exists and abort in that case
-        if ($this->userRegistered($username)) {
+		if ($this->userRegistered($username)) {
-            return NULL;
+			return NULL;
-        }
+		}
 
-        // generate a password with 10 characters
+		// generate a password with 10 characters
-        $password = bin2hex(openssl_random_pseudo_bytes(5));
+		$password = bin2hex(openssl_random_pseudo_bytes(5));
-        $password_hash = password_hash($password, PASSWORD_BCRYPT, ["cost" => 12]);
+		$password_hash = password_hash($password, PASSWORD_BCRYPT, ["cost"=>12]);
 
-        $sql = "INSERT INTO logins (first_name, last_name, localpart, password_hash, email) VALUES "
+		$sql = "INSERT INTO logins (first_name, last_name, localpart, password_hash, email) VALUES "
-                . "('" . $first_name . "','" . $last_name . "','" . $username . "','"
+			. "('" . $first_name."','" . $last_name . "','" . $username . "','"
-                . $password_hash . "','" . $email . "');";
+			. $password_hash . "','" . $email . "');";
 
-        if ($this->db->exec($sql)) {
+		if ($this->db->exec($sql)) {
-            return $password;
+			return $password;
-        }
+		}
-        return NULL;
+		return NULL;
-    }
+	}
 
-    function updatePassword($localpart, $old_password, $new_password) {
+	function searchUserByName($search_term) {
-        $user = $this->getUserForLogin($localpart, $old_password);
+		$term = filter_var($search_term, FILTER_SANITIZE_STRING);
-        if ($user == NULL) {
+		$result = array();
-            throw new Exception("user with that credentials not found");
+		$sql = "SELECT COUNT(*) FROM logins WHERE"
-        }
+			. " localpart LIKE '" . $term . "%' AND active = 1;";
+		$res = $this->db->query($sql);
 
-        // The credentials were fine. So now set the new password
+		if ($res->fetchColumn() > 0) {
-        $password_hash = password_hash($new_password, PASSWORD_BCRYPT, ["cost" => 12]);
+			$sql = "SELECT first_name, last_name, localpart FROM logins WHERE"
+				. " localpart LIKE '" . $term . "%' AND active = 1;";
+			foreach ($this->db->query($sql) as $row) {
+				array_push($result, [
+					"display_name" => $row["first_name"] . " " . $row["last_name"],
+					"user_id" => $row["localpart"],
+				]);
+			}
+		}
+		return $result;
+	}
 
-        $sql = "UPDATE logins SET password_hash = '" . $password_hash . "'"
+	function searchUserByEmail($search_term) {
-                . "WHERE localpart = '" . $localpart . "'";
+		$term = filter_var($search_term, FILTER_SANITIZE_STRING);
-
+		$result = array();
-        if ($this->db->exec($sql)) {
+		$sql = "SELECT COUNT(*) FROM logins WHERE"
-            return true;
+			. " email = '" . $term . "' AND active = 1;";
-        }
+		$res = $this->db->query($sql);
-        return false;
-    }
-
-    function searchUserByName($search_term) {
-        $term = filter_var($search_term, FILTER_SANITIZE_STRING);
-        $result = array();
-        $sql = "SELECT COUNT(*) FROM logins WHERE"
-                . " localpart LIKE '" . $term . "%' AND active = 1;";
-        $res = $this->db->query($sql);
-
-        if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, localpart FROM logins WHERE"
-                    . " localpart LIKE '" . $term . "%' AND active = 1;";
-            foreach ($this->db->query($sql) as $row) {
-                array_push($result, [
-                    "display_name" => $row["first_name"] . " " . $row["last_name"],
-                    "user_id" => $row["localpart"],
-                ]);
-            }
-        }
-        return $result;
-    }
-
-    function searchUserByEmail($search_term) {
-        $term = filter_var($search_term, FILTER_SANITIZE_STRING);
-        $result = array();
-        $sql = "SELECT COUNT(*) FROM logins WHERE"
-                . " email = '" . $term . "' AND active = 1;";
-        $res = $this->db->query($sql);
-
-        if ($res->fetchColumn() > 0) {
-            $sql = "SELECT first_name, last_name, localpart FROM logins WHERE"
-                    . " email = '" . $term . "' AND active = 1;";
-            foreach ($this->db->query($sql) as $row) {
-                array_push($result, [
-                    "display_name" => $row["first_name"] . " " . $row["last_name"],
-                    "user_id" => $row["localpart"],
-                ]);
-            }
-        }
-        return $result;
-    }
 
+		if ($res->fetchColumn() > 0) {
+			$sql = "SELECT first_name, last_name, localpart FROM logins WHERE"
+				. " email = '" . $term . "' AND active = 1;";
+			foreach ($this->db->query($sql) as $row) {
+				array_push($result, [
+					"display_name" => $row["first_name"] . " " . $row["last_name"],
+					"user_id" => $row["localpart"],
+				]);
+			}
+		}
+		return $result;
+	}
 }
 
 if (!isset($mx_db)) {
-    $mx_db = new mxDatabase($config);
+		$mx_db = new mxDatabase($config);
 }
 ?>

helpers.php

@@ -1,33 +0,0 @@
-<?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 stripLocalpart($mxid) {
-    $localpart = NULL;
-    if (!empty($mxid)) {
-        // A mxid would start with an @ so we start at the 2. position
-        $sepPos = strpos($mxid, ':', 1);
-        if ($sepPos === false) {
-            // : not found. Assume mxid is localpart
-            // TODO: further checks
-            $localpart = $mxid;
-        } else {
-            $localpart = substr($mxid, 1, strpos($mxid, ':') - 1);
-        }
-    }
-    return $localpart;
-}
-
-?>

internal/directory_search.php

@@ -1,21 +1,6 @@
 <?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.
- */
 require_once("../database.php");
-$response = [
+$response=[
     "limited" => false,
     "result" => [],
 ];
@@ -24,7 +9,7 @@ try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
     if (empty($input)) {
-        throw new Exception('no valid json as input present');
+	    throw new Exception('no valid json as input present');
     }
     if (!isset($input["by"])) {
         throw new Exception('"by" is not defined');
@@ -40,8 +25,9 @@ try {
             $response["result"] = $mx_db->searchUserByEmail($input["search_term"]);
             break;
         default:
-            throw new Exception('unknown type for "by" param');
+            throw new Exception("unknown type for \"by\" param");
     }
+    
 } catch (Exception $e) {
     error_log("failed with error: " . $e->getMessage());
     $response["error"] = $e->getMessage();

internal/identity_bulk.php

@@ -1,19 +1,4 @@
 <?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.
- */
 require_once("../database.php");
 $response = [
     "lookup" => []
@@ -22,7 +7,7 @@ try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
     if (!isset($input)) {
-        throw new Exception('request body is no valid json');
+	throw new Exception('request body is no valid json');
     }
 
     if (!isset($input["lookup"])) {
@@ -38,28 +23,26 @@ try {
         if (!isset($lookup["address"])) {
             throw new Exception('"lookup.address" is not defined');
         }
-        $res2 = NULL;
+        $res2 = array();
         switch ($lookup["medium"]) {
             case "email":
                 $res2 = $mx_db->searchUserByEmail($lookup["address"]);
                 if (!empty($res2)) {
                     array_push($response["lookup"], [
-                        "medium" => $lookup["medium"],
+                            "medium" => $lookup["medium"],
-                        "address" => $lookup["address"],
+                            "address" => $lookup["address"],
-                        "id" => [
+                            "id" => [
-                            "type" => "localpart",
+                                "type" => "localpart",
-                            "value" => $res2[0]["user_id"],
+                                "value" => $res2[0]["user_id"],
-                        ]
                             ]
+                        ]
                     );
                 }
-                break;
+		break;
             case "msisdn":
-                // This is reserved for number lookups
-                throw new Exception("unimplemented lookup medium");
                 break;
             default:
-                throw new Exception("unknown lookup medium");
+                throw new Exception("unknown type for \"by\" param");
         }
     }
 } catch (Exception $e) {

internal/identity_single.php

@@ -1,26 +1,11 @@
 <?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.
- */
 require_once("../database.php");
 $response = new stdClass;
 try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
     if (empty($input)) {
-        throw new Exception('no valid json as input present');
+	    throw new Exception('no valid json as input present');
     }
     if (!isset($input["lookup"])) {
         throw new Exception('"lookup" is not defined');
@@ -31,7 +16,7 @@ try {
     if (!isset($input["lookup"]["address"])) {
         throw new Exception('"lookup.address" is not defined');
     }
-    $res2 = NULL;
+    $res2 = array();
     switch ($input["lookup"]["medium"]) {
         case "email":
             $res2 = $mx_db->searchUserByEmail($input["lookup"]["address"]);
@@ -47,19 +32,15 @@ try {
                     ]
                 ];
             }
-            break;
+            
-        case "msisdn":
+
-            // This is reserved for number lookups
-            throw new Exception("unimplemented lookup medium");
             break;
         default:
-            throw new Exception("unknown lookup medium");
+            throw new Exception("unknown type for \"by\" param");
     }
 } catch (Exception $e) {
-    error_log("ídentity_single failed with error: " . $e->getMessage());
+    error_log("ídentity_bulk failed with error: " . $e->getMessage());
-    $response = [
+    $response["error"] = $e->getMessage();
-        "error" => $e->getMessage()
-    ];
 }
 print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>

internal/intercept_change_password.php

@@ -1,69 +0,0 @@
-<?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.
- */
-// URL for this: /_matrix/client/r0/account/password?access_token=$ACCESS_TOKEN
-
-header('Access-Control-Allow-Origin: *');
-header('Access-Control-Allow-Methods: POST, OPTIONS');
-header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization');
-if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
-    print ("{}");
-    // return with success
-    exit();
-}
-$response = new stdClass;
-try {
-    $inputJSON = file_get_contents('php://input');
-    $input = json_decode($inputJSON, TRUE);
-    if (empty($input)) {
-        throw new Exception('no valid json as input present');
-    }
-    if (!isset($input["auth"])) {
-        throw new Exception('"auth" is not defined');
-    }
-    if (!isset($input["auth"]["user"]) || !isset($input["auth"]["password"])) {
-        throw new Exception('"auth.user" or "auth.password" is not defined');
-    }
-    if (!isset($input["auth"]["type"]) || $input["auth"]["type"] !== "m.login.password") {
-        throw new Exception('no or unknown auth.type');
-    }
-    if (!isset($input["new_password"])) {
-        throw new Exception('"new_password" is not defined');
-    }
-
-    require_once("../helpers.php");
-    $localpart = stripLocalpart($input["auth"]["user"]);
-
-    if (empty($localpart)) {
-        throw new Exception("localpart cannot be identified");
-    }
-
-    require_once("../database.php");
-    if (!$mx_db->updatePassword(
-                    $localpart, $input["auth"]["password"], $input["new_password"]
-            )) {
-        throw new Exception("invalid credentials or another error while updating");
-    }
-} catch (Exception $e) {
-    header("HTTP/1.0 500 Internal Error");
-    error_log("failed with error: " . $e->getMessage());
-    $response = [
-        "errorcode" => "M_UNKNOWN",
-        "error" => $e->getMessage(),
-    ];
-}
-print (json_encode($response, JSON_PRETTY_PRINT));
-?>

internal/login.php

@@ -1,19 +1,4 @@
 <?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.
- */
 $response = [
     "auth" => [
         "success" => false,
@@ -21,21 +6,18 @@ $response = [
 ];
 
 require_once("../database.php");
-
 abstract class LoginRequester {
-
     const UNDEFINED = 0;
     const MXISD = 1;
     const RestAuth = 2;
-
 }
-
 $loginRequester = LoginRequester::UNDEFINED;
 
 try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
-    $mxid = $localpart = NULL;
+    $mxid = NULL;
+    $localpart = NULL;
     if (isset($input["user"])) {
         if (isset($input["user"]["localpart"])) {
             $localpart = $input["user"]["localpart"];
@@ -49,27 +31,32 @@ try {
             $mxid = $input["user"]["mxid"];
             $loginRequester = LoginRequester::MXISD;
         }
-    } else {
-        throw new Exception('"user" not in request body');
     }
 
     // prefer the localpart attribute of mxisd. But in case of matrix-synapse-rest-auth
     // we have to parse it on our own
-    if (empty($localpart)) {
+    if (empty($localpart) && !empty($mxid)) {
-        require_once("../helpers.php");
+        // A mxid would start with an @ so we start at the 2. position
-        $localpart = stripLocalpart($mxid);
+        $sepPos = strpos($mxid,':', 1);
+        if ($sepPos === false) {
+            // : not found. Assume mxid is localpart
+            // TODO: further checks
+            $localpart = $mxid;
+        } else {
+            $localpart = substr($mxid, 1, strpos($mxid,':') - 1 );
+        }
     }
     
     if (empty($localpart)) {
-        throw new Exception("localpart cannot be identified");
+        throw new Exception ("localpart cannot be identified");
     }
     
     $password = NULL;
-    if (isset($input["user"]["password"])) {
+    if (isset($input["user"]) && isset($input["user"]["password"])) {
         $password = $input["user"]["password"];
     }
     if (empty($password)) {
-        throw new Exception("password is not present");
+        throw new Exception ("password is not present");
     }
 
     $user = $mx_db->getUserForLogin($localpart, $password);
@@ -101,7 +88,6 @@ try {
             // only return that it was successful.
             // we do not know how the data shall be transmitted so we do nothing with it
             $response["auth"]["success"] = false;
-            $response["auth"]["error"] = "unidentified requester";
             break;
     }    
 } catch (Exception $e) {

lang/lang.de-de.php

@@ -1,19 +1,4 @@
 <?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" => "Es konnte keine Konfiguration gefunden werden.",
     "UNKNOWN_SESSION" => "Sitzungstoken nicht vorhanden oder ungültig.",

language.php

@@ -1,27 +1,12 @@
 <?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.
- */
 $lang = "de-de";
-if (isset($_GET['lang'])) {
+if(isset($_GET['lang'])){
-    $lang = filter_var($_GET['lang'], FILTER_SANITIZE_STRING);
+	$lang = filter_var($_GET['lang'], FILTER_SANITIZE_STRING);
 }
-$lang_file = dirname(__FILE__) . "/lang/lang." . $lang . ".php";
+$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";
+	$lang = "de-de";
 }
 require_once($lang_file);
 unset($lang_file);

mail_templates.php

@@ -1,29 +1,15 @@
 <?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");
+	include("config.php");
-    $headers = "From: " . $config["register_email"] . "\r\n"
+	$headers = "From: " . $config["register_email"] . "\r\n"
-            . "Content-Type: text/plain;charset=utf-8";
+		. "Content-Type: text/plain;charset=utf-8";
-    return mail($receiver, $subject, $body, $headers);
+	return mail($receiver, $subject, $body, $headers);
 }
 
 function send_mail_pending_verification($homeserver, $user, $receiver, $verify_url) {
-    $subject = "Bitte bestätige Registrierung auf $homeserver";
+	$subject = "Bitte bestätige Registrierung auf $homeserver";
-    $body = "Guten Tag " . $user . ",
+	$body = "Guten Tag " . $user . ",
 
 Du hast anscheinend versucht dich auf $homeserver zu registrieren.
 Hier gibt es eine zweistufige Registrierung.
@@ -40,12 +26,12 @@ Danach ist eine Re-Registrierung mit deinem gewünschten Nutzernamen für andere
 Vielen Dank für dein Verständnis.
 
 Das Administratoren-Team von " . $homeserver;
-    return send_mail($receiver, $subject, $body);
+	return send_mail($receiver, $subject, $body );
 }
 
 function send_mail_pending_approval($homeserver, $user, $receiver) {
-    $subject = "Registrierung wartet auf Bestätigung durch Administratoren";
+	$subject = "Registrierung wartet auf Bestätigung durch Administratoren";
-    $body = "Guten Tag " . $user . ",
+	$body = "Guten Tag " . $user . ",
 
 Deine Registrierungsanfrage wurde verifiziert und wird nun durch die Administratoren überprüft.
 
@@ -54,12 +40,12 @@ Du bekommst eine weitere E-Mail, sobald deine Registrierung bestätigt oder able
 Vielen Dank für dein Verständnis.
 
 Das Administratoren-Team von " . $homeserver;
-    return send_mail($receiver, $subject, $body);
+	return send_mail($receiver, $subject, $body );
 }
 
 function send_mail_registration_allowed_but_failed($homeserver, $user, $receiver) {
-    $subject = "Registrierung auf $homeserver genehmigt.";
+	$subject = "Registrierung auf $homeserver genehmigt.";
-    $body = "Guten Tag " . $user . ",
+	$body = "Guten Tag " . $user . ",
 
 Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
 
@@ -68,12 +54,13 @@ 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);
+	return send_mail($receiver, $subject, $body);
+
 }
 
 function send_mail_registration_success($homeserver, $user, $receiver, $username, $password, $howToURL) {
-    $subject = "Registrierung auf $homeserver erfolgreich.";
+	$subject = "Registrierung auf $homeserver erfolgreich.";
-    $body = "Guten Tag " . $user . ",
+	$body = "Guten Tag " . $user . ",
 
 Deine Registrierungsanfrage wurde durch die Administratoren bestätigt.
 
@@ -81,42 +68,41 @@ 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
+Hinweis: Aktuell ist es nicht möglich, das Passwort selbst zu ändern. Sobald die Funktionalität zur
-im Klartext gespeichert wird, kann jemand Zugriff auf diese Mail erlangen und so den Zugriff bekommen.
+Verfügung steht, gibt es aber einen Hinweis.
 ";
-    /*
+/*
-      Wichtig: Bitte ändere das Passwort direkt nach der Anmeldung.
+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
+Es wird zwar von unserer Seite nicht gespeichert, doch fremde könnten Zugriff auf diese E-Mail
-      erhalten und so deinen Account kompromittieren.
+erhalten und so deinen Account kompromittieren.
-     */
+ */
-    if (!empty($howToURL)) {
+if (!empty($howToURL)) {
-        $body .= "
+	$body .= "
 Zu weiteren Hilfestellungen findest du hier eine Auflistung von verschiedenen
 Anleitungen zu verschiedenen Clients:
 $howToURL\n";
-    }
+}
-    $body .= "
+	$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);
+	return send_mail($receiver, $subject, $body);
-}
 
+}
 function send_mail_registration_decline($homeserver, $user, $receiver, $reason) {
-    $subject = "Registrierung auf $homeserver abgelehnt.";
+	$subject = "Registrierung auf $homeserver abgelehnt.";
-    $body = "Guten Tag " . $user . ",
+	$body = "Guten Tag " . $user . ",
 
 Deine Registrierungsanfrage wurde durch die Administratoren abgelehnt.\n";
 
-    if (empty($reason)) {
+	if (empty($reason)) {
-        $body .= "\nEs wurde kein Grund angegeben\n";
+		$body .= "\nEs wurde kein Grund angegeben\n";
-    } else {
+	} else {
-        $body .= "\nAls Grund wurde folgendes angegeben:\n$reason\n";
+		$body .= "\nAls Grund wurde folgendes angegeben:\n$reason\n";
-    }
+	}
 
-    $body .= "\nDas Administratoren-Team von " . $homeserver;
+	$body .= "\nDas Administratoren-Team von " . $homeserver;
-    return send_mail($receiver, $subject, $body);
+	return send_mail($receiver, $subject, $body );
 }
-
 ?>

public/index.php

@@ -1,18 +1,6 @@
-<html><head><?php
+<html>
-/**
+	<head>
- * Copyright 2018 Matthias Kesler
+<?php
- * 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.
- */
 require_once "../language.php";
 if (!file_exists("../config.php")) {
 	print($language["NO_CONFIGURATION"]);
@@ -32,32 +20,32 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 	try {
 		if (!isset($_SESSION["token"]) || !isset($_POST["token"]) || $_SESSION["token"] != $_POST["token"]) {
 			// token not present or invalid
-			throw new Exception("UNKNOWN_SESSION");
+			throw new Exception($language["UNKNOWN_SESSION"]);
 		}
 		if (!isset($_POST["username"])) {
-			throw new Exception("UNKNOWN_USERNAME");
+			throw new Exception($language["UNKNOWN_USERNAME"]);
 		}
 		if (strlen($_POST["username"] > 20 || strlen($_POST["username"]) < 3)) {
-			throw new Exception("USERNAME_LENGTH_INVALID");
+			throw new Exception($language["USERNAME_LENGTH_INVALID"]);
 		}
 		if (ctype_alnum($_POST['username']) != true) {
-			throw new Exception("USERNAME_NOT_ALNUM");
+			throw new Exception($language["USERNAME_NOT_ALNUM"]);
 		}
 		if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"] &&
 			$_POST["password"] != $_POST["password_confirm"]) {
-			throw new Exception("PASSWORD_NOT_MATCH");
+			throw new Exception($language["PASSWORD_NOT_MATCH"]);
 		}
 		if (isset($_POST["note"]) && strlen($_POST["note"]) > 50) {
-			throw new Exception("NOTE_LENGTH_EXEEDED");
+			throw new Exception($language["NOTE_LENGTH_EXEEDED"]);
 		}
 		if (!isset($_POST["email"]) || !filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) {
-			throw new Exception("EMAIL_INVALID_FORMAT");
+			throw new Exception($language["EMAIL_INVALID_FORMAT"]);
 		}
 		if (isset($_POST["first_name"]) && ! preg_match("/[A-Z][a-z]+/", $_POST["first_name"])) {
-			throw new Exception("FIRSTNAME_INVALID_FORMAT");
+			throw new Exception($language["FIRSTNAME_INVALID_FORMAT"]);
 		}
 		if (isset($_POST["last_name"]) && ! preg_match("/[A-Z][a-z]+/", $_POST["last_name"])) {
-			throw new Exception("SIRNAME_INVALID_FORMAT");
+			throw new Exception($language["SIRNAME_INVALID_FORMAT"]);
 		}
 
 		$first_name = filter_var($_POST["first_name"], FILTER_SANITIZE_STRING);
@@ -99,11 +87,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 		print("<title>" . $language["REGISTRATION_REQUEST_FAILED"] . "</title>");
 		print("</head><body>");
 		print("<h1>" . $language["REGISTRATION_REQUEST_FAILED"] . "</h1>");
-		if (isset($language[$e->getMessage()])) {
+		print("<p>" . $e->getMessage() . "</p>");
-			print("<p>" . $language[$e->getMessage()] . "</p>");
-		} else {
-			print("<p>" . $e->getMessage() . "</p>");
-		}
 		print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
 	}
 } else {

public/verify.php

@@ -1,18 +1,6 @@
-<html><head><?php
+<html>
-/**
+	<head>
- * Copyright 2018 Matthias Kesler
+<?php
- * 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.
- */
 require_once "../language.php";
 if (!file_exists("../config.php")) {
 	print($language["NO_CONFIGURATION"]);
@@ -34,7 +22,7 @@ try {
 		throw new Exception("Method not allowed");
 	}
 	if (!isset($_GET["t"])) {
-		throw new Exception("UNKNOWN_TOKEN");
+		throw new Exception($language["UNKNOWN_TOKEN"]);
 	}
 	$token = filter_var($_GET["t"], FILTER_SANITIZE_STRING);
 
@@ -42,7 +30,7 @@ try {
 
 	$user = $mx_db->getUserForVerify($token);
 	if ($user == NULL) {
-		throw new Exception("UNKNOWN_TOKEN");
+		throw new Exception($language["UNKNOWN_TOKEN"]);
 	}
 	$first_name = $user["first_name"];
 	$last_name = $user["last_name"];
@@ -81,11 +69,7 @@ try {
 	print("<title>" . $language["VERIFICATION_FAILED"] . "</title>");
 	print("</head><body>");
 	print("<h1>" . $language["VERIFICATION_FAILED"] . "</h1>");
-	if (isset($language[$e->getMessage()])) {
+	print("<p>" . $e->getMessage() . "</p>");
-		print("<p>" . $language[$e->getMessage()] . "</p>");
-	} else {
-		print("<p>" . $e->getMessage() . "</p>");
-	}
 	print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
 }
 ?>

public/verify_admin.php

@@ -1,18 +1,6 @@
-<html><head><?php
+<html>
-/**
+<head>
- * Copyright 2018 Matthias Kesler
+<?php
- * 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.
- */
 require_once "../language.php";
 if (!file_exists("../config.php")) {
 	print($language["NO_CONFIGURATION"]);
@@ -34,7 +22,7 @@ try {
 		throw new Exception("Method not allowed");
 	}
 	if (!isset($_GET["t"])) {
-		throw new Exception("UNKNOWN_TOKEN");
+		throw new Exception($language["UNKNOWN_TOKEN"]);
 	}
 	$token = filter_var($_GET["t"], FILTER_SANITIZE_STRING);
 
@@ -54,7 +42,7 @@ try {
 
 	$user = $mx_db->getUserForApproval($token);
 	if ($user == NULL) {
-		throw new Exception("UNKNOWN_TOKEN");
+		throw new Exception($language["UNKNOWN_TOKEN"]);
 	}
 
 	$first_name = $user["first_name"];
@@ -86,7 +74,7 @@ try {
 			$mxMsg->set_type("m.text");
 			$mxMsg->set_body("Fehler beim Registrieren von " . $first_name . " " . $last_name . ".");
 			$mxConn->send($config["register_room"], $mxMsg);
-			throw new Exception("REGISTRATION_FAILED");
+			throw new Exception($language["REGISTRATION_FAILED"]);
 		}
 
 		print("<title>" . $language["ADMIN_VERIFY_SITE_TITLE"] . "</title>");
@@ -172,11 +160,7 @@ background: rgba(255, 255, 255, 0.8);
 	print("<title>" . $language["REGISTRATION_FAILED"] . "</title>");
 	print("</head><body>");
 	print("<h1>" . $language["REGISTRATION_FAILED"] . "</h1>");
-	if (isset($language[$e->getMessage()])) {
+	print("<p>" . $e->getMessage() . "</p>");
-		print("<p>" . $language[$e->getMessage()] . "</p>");
-	} else {
-		print("<p>" . $e->getMessage() . "</p>");
-	}
 	print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
 }
 ?>