krombel/matrix-register-bot
1
0
Fork 0
Code Issues 4 Pull Requests Releases Activity

Second implementation with matrix_synapse_rest_auth #2

Merged
krombel merged 51 commits from second_implementation into master 2018-03-19 13:57:16 +01:00
Conversation 0 Commits 51 Files Changed 16 +5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 379aa26e6d - Show all commits

8
database.php
View File

@@ -151,12 +151,12 @@ class mxDatabase
*/ */
function addRegistration($first_name, $last_name, $username, $note, $email) { function addRegistration($first_name, $last_name, $username, $note, $email) {
if ($this->userPendingRegistrations($username)) { if ($this->userPendingRegistrations($username)) {
require_once "language.php"; require_once("language.php");
throw new Exception($language["USERNAME_PENDING_REGISTRATION"]); throw new Exception($language["USERNAME_PENDING_REGISTRATION"]." (requested)");
} }
if ($this->userRegistered($username)) { if ($this->userRegistered($username)) {
require_once "language.php"; require_once("language.php");
throw new Exception($language["USERNAME_REGISTERED"]); throw new Exception($language["USERNAME_REGISTERED"] . " (registered)");
} }
$verify_token = bin2hex(random_bytes(16)); $verify_token = bin2hex(random_bytes(16));

2
public/verify_admin.php
View File

@@ -32,7 +32,7 @@ try {
if (isset($_GET["allow"])) { if (isset($_GET["allow"])) {
$action = RegisterState::RegistrationAccepted; $action = RegisterState::RegistrationAccepted;
} }
$decline_reason = "Noch nicht implementiert"; $decline_reason = NULL;
if (isset($_GET["deny"])) { if (isset($_GET["deny"])) {
$action = RegisterState::RegistrationDeclined; $action = RegisterState::RegistrationDeclined;
if (isset($_GET["reason"])) { if (isset($_GET["reason"])) {