Merge branch 'second_implementation' of gitea.krombel.de:krombel/matrix-register-bot into second_implementation
This commit is contained in:
@@ -76,13 +76,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
|
||||
print("</head><body>");
|
||||
print("<h1>Erfolgreich</h1>");
|
||||
print("<p>Bitte überprüfe deine E-Mails um deine E-Mail-Adresse zu bestätigen.</p>");
|
||||
print("<a href=\"" . "/register.php" . "\">Zur Registrierungsseite</a>");
|
||||
print("<a href=\"" . "/index.php" . "\">Zur Registrierungsseite</a>");
|
||||
} catch (Exception $e) {
|
||||
print("<title>" . $language["REGISTRATION_REQUEST_FAILED"] . "</title>");
|
||||
print("</head><body>");
|
||||
print("<h1>" . $language["REGISTRATION_REQUEST_FAILED"] . "</h1>");
|
||||
print("<p>" . $e->getMessage() . "</p>");
|
||||
print("<a href=\"" . $config["webroot"] . "/register.php" . "\">Zur Registrierungsseite</a>");
|
||||
print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
|
||||
}
|
||||
} else {
|
||||
$_SESSION["token"] = bin2hex(random_bytes(16));
|
||||
@@ -114,7 +114,7 @@ body{
|
||||
<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="register.php" method="post">
|
||||
<form name="regForm" role="form" action="index.php" method="post">
|
||||
<div class="row">
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<div class="form-group">
|
||||
|
||||
@@ -64,13 +64,13 @@ try {
|
||||
print("</head><body>");
|
||||
print("<h1>" . $language["VERIFICATION_SUCEEDED"] . "</h1>");
|
||||
print("<p>" . $language["VERIFICATION_SUCCESS_BODY"] . "</p>");
|
||||
print("<a href=\"" . $config["webroot"] . "/register.php" . "\">Zur Registrierungsseite</a>");
|
||||
print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
|
||||
} catch (Exception $e) {
|
||||
print("<title>" . $language["VERIFICATION_FAILED"] . "</title>");
|
||||
print("</head><body>");
|
||||
print("<h1>" . $language["VERIFICATION_FAILED"] . "</h1>");
|
||||
print("<p>" . $e->getMessage() . "</p>");
|
||||
print("<a href=\"" . $config["webroot"] . "/register.php" . "\">Zur Registrierungsseite</a>");
|
||||
print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
|
||||
}
|
||||
?>
|
||||
</body>
|
||||
|
||||
@@ -59,7 +59,7 @@ try {
|
||||
$mxConn = new MatrixConnection($config["homeserver"], $config["access_token"]);
|
||||
|
||||
// generate a password with 8 characters
|
||||
$password = addUser($first_name, $last_name, $username, $email);
|
||||
$password = $mx_db->addUser($first_name, $last_name, $username, $email);
|
||||
if ($password != NULL) {
|
||||
// send registration_success
|
||||
$res = send_mail_registration_success($config["homeserver"], $first_name . " " . $last_name, $email, $username, $password, $config["howToURL"]);
|
||||
@@ -161,7 +161,7 @@ background: rgba(255, 255, 255, 0.8);
|
||||
print("</head><body>");
|
||||
print("<h1>" . $language["REGISTRATION_FAILED"] . "</h1>");
|
||||
print("<p>" . $e->getMessage() . "</p>");
|
||||
print("<a href=\"" . $config["webroot"] . "/register.php" . "\">Zur Registrierungsseite</a>");
|
||||
print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
|
||||
}
|
||||
?>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user