From 9ba232d25463cf9193df65932c95a73229f9e642 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 13 Sep 2021 19:00:54 +0300 Subject: [PATCH] Register: Adding implementation of registration disablement Also temporarily removed AudiosPresenter --- Web/Presenters/AuthPresenter.php | 3 + Web/Presenters/templates/@layout.xml | 4 +- Web/Presenters/templates/About/Index.xml | 2 +- Web/Presenters/templates/Auth/Register.xml | 158 +++++++++++---------- Web/di.yml | 1 - openvk-example.yml | 3 + 6 files changed, 94 insertions(+), 77 deletions(-) diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php index 9699568b7..903331515 100644 --- a/Web/Presenters/AuthPresenter.php +++ b/Web/Presenters/AuthPresenter.php @@ -79,6 +79,9 @@ function renderRegister(): void if($_SERVER["REQUEST_METHOD"] === "POST") { $this->assertCaptchaCheckPassed(); + + if(!OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable'] && !$referer) + $this->flashFail("err", "Подозрительная попытка регистрации", "Регистрация отключена системным администратором."); if(!$this->ipValid()) $this->flashFail("err", "Подозрительная попытка регистрации", "Вы пытались зарегистрироваться из подозрительного места."); diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 052ef0a92..f7cab0369 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -111,7 +111,7 @@
вход
-
+
регистрация
@@ -190,7 +190,7 @@ - {_registration}

+ {_registration}

Забыли пароль? {/ifset} diff --git a/Web/Presenters/templates/About/Index.xml b/Web/Presenters/templates/About/Index.xml index 64e0cd19d..fc258bb8c 100644 --- a/Web/Presenters/templates/About/Index.xml +++ b/Web/Presenters/templates/About/Index.xml @@ -21,6 +21,6 @@
{_"log_in"} - {_"registration"}
+ {_"registration"}
{/block} diff --git a/Web/Presenters/templates/Auth/Register.xml b/Web/Presenters/templates/Auth/Register.xml index 988998b4c..9ea387d7b 100644 --- a/Web/Presenters/templates/Auth/Register.xml +++ b/Web/Presenters/templates/Auth/Register.xml @@ -18,77 +18,89 @@ {/block} {block content} -

- {$referer->getFullName()} приглашает вас в OpenVK! -

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {_"name"}: - - -
- {_"surname"}: - - -
- {_"gender"}: - - {var femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]} - -
- {_"email"}: - - -
- {_"password"}: - - -
- CAPTCHA: - - {captcha_template()|noescape} -
- - - - - {_"log_in"} -
-
+ {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable'] || $referer} +

+ {$referer->getFullName()} приглашает вас в OpenVK! +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {_"name"}: + + +
+ {_"surname"}: + + +
+ {_"gender"}: + + {var femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]} + +
+ {_"email"}: + + +
+ {_"password"}: + + +
+ CAPTCHA: + + {captcha_template()|noescape} +
+ + + + + {_"log_in"} +
+
+ {else} +
+ Регистрация закрыта. +

+ Регистрация отключена системным администратором. При возможности попросите приглашение у вашего знакомого, если он зарегистрирован на этом сайте. + {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} +

{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} + {/if} +

+
+ {/if} {/block} diff --git a/Web/di.yml b/Web/di.yml index 19bdc5275..a91d4f2a1 100644 --- a/Web/di.yml +++ b/Web/di.yml @@ -2,7 +2,6 @@ services: - openvk\Web\Presenters\AwayPresenter - openvk\Web\Presenters\AboutPresenter - openvk\Web\Presenters\AuthPresenter - - openvk\Web\Presenters\AudiosPresenter - openvk\Web\Presenters\UserPresenter - openvk\Web\Presenters\WallPresenter - openvk\Web\Presenters\CommentPresenter diff --git a/openvk-example.yml b/openvk-example.yml index 9698e405c..6abeb9227 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -23,6 +23,9 @@ openvk: maxViolations: 50 maxViolationsAge: 120 autoban: true + registration: + enable: true + reason: "" # reason for disabling registration support: supportName: "Moderator" adminAccount: 1 # Change this ok