Updated 2 files (automated)

2 files changed, 4 insertions, 51 deletions

diff --git a/login/index.php b/login/index.php
index 6ffd160..b557a50 100644
--- a/login/index.php
+++ b/login/index.php
@@ -19,18 +19,6 @@ $users = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT']
 $app = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email.json")), true);
 
 if (isset($_POST["p"]) && $_POST["p"] === "1") {
-    $recaptcha = new \ReCaptcha\ReCaptcha(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/recaptcha-secret")));
-
-    if (!isset($_POST["g-recaptcha-response"])) {
-        $error = "lang_login_captcha";
-    } else {
-        $resp = $recaptcha->setExpectedHostname(($_SERVER["HTTP_HOST"] === "192.168.1.121:81" ? "delta-staging" : "delta") . ".equestria.dev")
-            ->verify($_POST["g-recaptcha-response"], $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR']);
-        if (!$resp->isSuccess()) {
-            $error = "lang_login_captcha";
-        }
-    }
-
     if (!in_array($_POST["email"], array_keys($users))) {
         $error = "lang_login_notfound";
     }
@@ -56,18 +44,6 @@ if (isset($_POST["p"]) && $_POST["p"] === "1") {
         file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/codes.json", pf_utf8_encode(json_encode($list)));
     }
 } elseif (isset($_POST["p"]) && $_POST["p"] === "2") {
-    $recaptcha = new \ReCaptcha\ReCaptcha(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/recaptcha-secret")));
-
-    if (!isset($_POST["g-recaptcha-response"])) {
-        $error = "lang_login_captcha";
-    } else {
-        $resp = $recaptcha->setExpectedHostname(($_SERVER["HTTP_HOST"] === "192.168.1.121:81" ? "delta-staging" : "delta") . ".equestria.dev")
-            ->verify($_POST["g-recaptcha-response"], $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR']);
-        if (!$resp->isSuccess()) {
-            $error = "lang_login_captcha";
-        }
-    }
-
     $list = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/codes.json")), true);
 
     if (in_array($_POST['code'], array_keys($list)) && $list[$_POST['code']]["email"] === $_POST["email"]) {
@@ -117,23 +93,9 @@ if (!isset($_GET["method"])) {
 }
 
 if ($step === 0 && $_GET["method"] === "hub") {
-    $recaptcha = new \ReCaptcha\ReCaptcha(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/recaptcha-secret")));
-
-    if (!isset($_POST["g-recaptcha-response"])) {
-        $error = "lang_login_captcha";
-    } else {
-        $resp = $recaptcha->setExpectedHostname(($_SERVER["HTTP_HOST"] === "192.168.1.121:81" ? "delta-staging" : "delta") . ".equestria.dev")
-            ->verify($_POST["g-recaptcha-response"], $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR']);
-        if (!$resp->isSuccess()) {
-            $error = "lang_login_captcha";
-        } else {
-            setcookie("DeltaReturnPage", $_GET["return"], 0, "/");
-            header("Location: https://account.equestria.dev/hub/api/rest/oauth2/auth?client_id=" . $app["oauth2_id"] . "&response_type=code&redirect_uri=https://" . ($_SERVER["HTTP_HOST"] === "192.168.1.121:81" ? "delta-staging" : "delta") . ".equestria.dev/login/oauth&scope=Hub&request_credentials=default&access_type=offline");
-            die();
-        }
-    }
-
-    unset($_GET["method"]);
+    setcookie("DeltaReturnPage", $_GET["return"], 0, "/");
+    header("Location: https://account.equestria.dev/hub/api/rest/oauth2/auth?client_id=" . $app["oauth2_id"] . "&response_type=code&redirect_uri=https://" . ($_SERVER["HTTP_HOST"] === "192.168.1.121:81" ? "delta-staging" : "delta") . ".equestria.dev/login/oauth&scope=Hub&request_credentials=default&access_type=offline");
+    die();
 } else if ($step === 0 && $_GET["method"] === "apply") {
     header("Location: /register");
     die();
@@ -143,12 +105,6 @@ $title = "lang_login_title"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes
 
 ?>
 
-<script src="https://www.google.com/recaptcha/api.js"></script>
-
-<style>
-    .grecaptcha-badge { visibility: hidden; }
-</style>
-
 <div class="container"> <?php global $palette; ?>
     <div style="background-color: #<?= $palette[0] ?>; position: fixed; inset: 0; display: flex; align-items: center; justify-content: center;">
         <div style="background-color: #<?= $palette[2] ?>; padding: 20px; border-radius: 20px; text-align: center; width: 70vw; max-height: 80vh; overflow: auto; max-width: 500px;">
@@ -183,9 +139,6 @@ $title = "lang_login_title"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes
                 <a style="display: block; margin-top: 5px;" href="/login/?method=apply&return=<?= rawurlencode($_GET["return"]) ?>"><?= l("lang_login_auth_apply") ?></a>
             </div>
         <?php endif; ?>
-
-        <hr>
-        <small><?= str_replace("%4", '</a>', str_replace("%3", '<a href="https://policies.google.com/terms" target="_blank">', str_replace("%2", '</a>', str_replace("%1", '<a href="https://policies.google.com/privacy" target="_blank">', l("lang_register_recaptcha"))))) ?></small>
         <?php elseif ($step === 1): ?>
             <img src="/icons/code.svg?o" style="width: 48px; margin-bottom: 10px;">
             <p><b><?= l("lang_login_code3") ?></b></p>
diff --git a/version b/version
index 33b2292..3e27405 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-5.2.20
\ No newline at end of file
+5.2.21
\ No newline at end of file