From b1ce106e4cd23f5064ac4f4fd73adeefa3c5c462 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Fri, 5 Aug 2022 20:00:52 +0000 Subject: [PATCH] Profile deactivation function (#626) --- Web/Models/Entities/Post.php | 5 ++ Web/Models/Entities/User.php | 39 ++++++++++++-- Web/Presenters/AboutPresenter.php | 1 + Web/Presenters/AuthPresenter.php | 14 ++++- Web/Presenters/OpenVKPresenter.php | 50 +++++++---------- Web/Presenters/SupportPresenter.php | 1 + Web/Presenters/UserPresenter.php | 41 ++++++++++++-- Web/Presenters/templates/@deactivated.xml | 34 ++++++++++++ Web/Presenters/templates/@layout.xml | 54 ++++++++++--------- Web/Presenters/templates/User/Settings.xml | 9 +++- Web/Presenters/templates/User/deactivated.xml | 30 +++++++++++ .../components/post/microblogpost.xml | 6 +++ .../templates/components/post/oldpost.xml | 7 ++- Web/routes.yml | 4 ++ Web/static/js/openvk.cls.js | 52 ++++++++++++++++++ install/sqls/00028-deactivation.sql | 1 + locales/en.strings | 26 +++++++++ locales/ru.strings | 26 +++++++++ 18 files changed, 334 insertions(+), 66 deletions(-) create mode 100644 Web/Presenters/templates/@deactivated.xml create mode 100644 Web/Presenters/templates/User/deactivated.xml create mode 100644 install/sqls/00028-deactivation.sql diff --git a/Web/Models/Entities/Post.php b/Web/Models/Entities/Post.php index 695dde87..4afb4baa 100644 --- a/Web/Models/Entities/Post.php +++ b/Web/Models/Entities/Post.php @@ -84,6 +84,11 @@ class Post extends Postable { return ($this->getRecord()->flags & 0b01000000) > 0; } + + function isDeactivationMessage(): bool + { + return ($this->getRecord()->flags & 0b00100000) > 0; + } function isExplicit(): bool { diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 2e0d0ce5..f7ace42b 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -147,7 +147,7 @@ class User extends RowModel function getFirstName(bool $pristine = false): string { - $name = $this->getRecord()->deleted ? "DELETED" : mb_convert_case($this->getRecord()->first_name, MB_CASE_TITLE); + $name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->first_name, MB_CASE_TITLE)); if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine) return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE); else @@ -156,7 +156,7 @@ class User extends RowModel function getLastName(bool $pristine = false): string { - $name = $this->getRecord()->deleted ? "DELETED" : mb_convert_case($this->getRecord()->last_name, MB_CASE_TITLE); + $name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->last_name, MB_CASE_TITLE)); if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine) return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE); else @@ -165,12 +165,12 @@ class User extends RowModel function getPseudo(): ?string { - return $this->getRecord()->deleted ? "DELETED" : $this->getRecord()->pseudo; + return ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : $this->getRecord()->pseudo); } function getFullName(): string { - if($this->getRecord()->deleted) + if($this->isDeleted() && !$this->isDeactivated()) return "DELETED"; $pseudo = $this->getPseudo(); @@ -195,7 +195,7 @@ class User extends RowModel function getCanonicalName(): string { - if($this->getRecord()->deleted) + if($this->isDeleted() && !$this->isDeactivated()) return "DELETED"; else return $this->getFirstName() . " " . $this->getLastName(); @@ -785,6 +785,27 @@ class User extends RowModel $this->save(); } + function deactivate(?string $reason): void + { + $this->setDeleted(1); + $this->setDeact_Date(time() + (MONTH * 7)); + $this->setDeact_Reason($reason); + $this->save(); + } + + function reactivate(): void + { + $this->setDeleted(0); + $this->setDeact_Date(0); + $this->setDeact_Reason(""); + $this->save(); + } + + function getDeactivationDate(): DateTime + { + return new DateTime($this->getRecord()->deact_date); + } + function verifyNumber(string $code): bool { $ver = $this->getPendingPhoneVerification(); @@ -956,6 +977,14 @@ class User extends RowModel return FALSE; } + function isDeactivated(): bool + { + if ($this->getDeactivationDate()->timestamp() > time()) + return TRUE; + else + return FALSE; + } + /** * 0 - Default status * 1 - Incognito online status diff --git a/Web/Presenters/AboutPresenter.php b/Web/Presenters/AboutPresenter.php index 3caa007d..6b21ca1a 100644 --- a/Web/Presenters/AboutPresenter.php +++ b/Web/Presenters/AboutPresenter.php @@ -9,6 +9,7 @@ final class AboutPresenter extends OpenVKPresenter { protected $banTolerant = true; protected $activationTolerant = true; + protected $deactivationTolerant = true; function renderIndex(): void { diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php index ad0db0c7..b3a8e8c2 100644 --- a/Web/Presenters/AuthPresenter.php +++ b/Web/Presenters/AuthPresenter.php @@ -20,6 +20,7 @@ final class AuthPresenter extends OpenVKPresenter { protected $banTolerant = true; protected $activationTolerant = true; + protected $deactivationTolerant = true; private $authenticator; private $db; @@ -151,7 +152,7 @@ final class AuthPresenter extends OpenVKPresenter $this->flashFail("err", tr("login_failed"), tr("invalid_username_or_password")); $ovkUser = new User($user->related("profiles.user")->fetch()); - if($ovkUser->isDeleted()) + if($ovkUser->isDeleted() && !$ovkUser->isDeactivated()) $this->flashFail("err", tr("login_failed"), tr("invalid_username_or_password")); $secret = $user->related("profiles.user")->fetch()["2fa_secret"]; @@ -321,4 +322,15 @@ final class AuthPresenter extends OpenVKPresenter $this->redirect("/"); } } + + function renderReactivatePage(): void + { + $this->assertUserLoggedIn(); + $this->willExecuteWriteAction(); + + $this->user->identity->reactivate(); + + $this->redirect("/", 2); + exit; + } } diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index 5c7f95c3..38f301f8 100755 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -14,6 +14,7 @@ abstract class OpenVKPresenter extends SimplePresenter { protected $banTolerant = false; protected $activationTolerant = false; + protected $deactivationTolerant = false; protected $errorTemplate = "@error"; protected $user = NULL; @@ -214,39 +215,28 @@ abstract class OpenVKPresenter extends SimplePresenter $this->template->thisUser = $this->user->identity; $this->template->userTainted = $user->isTainted(); - if($this->user->identity->isDeleted()) { - /* - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠶⠶⣶⠶⠶⠶⠶⠶⠶⠶⠶⠶⢶⠶⠶⠶⠤⠤⠤⠤⣄⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⣠⡾⠋⠀⠀⠊⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠀⠀⠀⠀⠤⢤⣤⣄⠉⠉⠛⠛⠷⣦⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⣰⠟⠀⠀⠀⠀⠀⠐⠋⢑⣤⣶⣶⣤⡢⡀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣄⡂⠀⠀⠶⢄⠙⢷⣤⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⣸⡿⠚⠉⡀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⡄⠀⠀⠀⢢⠀⠀⡀⣰⣿⣿⣿⣿⣦⡀⠀⠀⠡⡀⢹⡆⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⢀⣴⠏⠀⣀⣀⣀⡤⢤⣄⣠⣿⣿⣿⣿⣻⣿⣿⣷⠀⢋⣾⠈⠙⣶⠒⢿⣿⣿⣿⣿⡿⠟⠃⠀⡀⠡⠼⣧⡀⠀⠀⠀⠀⠀⠀ - ⠀⠀⢀⣴⣿⢃⡴⢊⢽⣶⣤⣀⠀⠊⠉⠉⡛⢿⣿⣿⣿⠿⠋⢀⡀⠁⠀⠀⢸⣁⣀⣉⣉⣉⡉⠀⠩⡡⠀⣩⣦⠀⠈⠻⣦⡀⠀⠀⠀⠀ - ⠀⢠⡟⢡⠇⡞⢀⠆⠀⢻⣿⣿⣷⣄⠀⢀⠈⠂⠈⢁⡤⠚⡟⠉⠀⣀⣀⠀⠈⠳⣍⠓⢆⢀⡠⢀⣨⣴⣿⣿⡏⢀⡆⠀⢸⡇⠀⠀⠀⠀ - ⠀⣾⠁⢸⠀⠀⢸⠀⠀⠀⠹⣿⣿⣿⣿⣶⣬⣦⣤⡈⠀⠀⠇⠀⠛⠉⣩⣤⣤⣤⣿⣤⣤⣴⣾⣿⣿⣿⣿⣿⣧⠞⠀⠀⢸⡇⠀⠀⠀⠀ - ⠀⢹⣆⠸⠀⠀⢸⠀⠀⠀⠀⠘⢿⣿⣿⣿⣿⣿⣿⣟⣛⠛⠛⣛⡛⠛⠛⣛⣋⡉⠉⣡⠶⢾⣿⣿⣿⣿⣿⣿⡇⠀⠀⢀⣾⠃⠀⠀⠀⠀ - ⠀⠀⠻⣆⡀⠀⠈⢂⠀⠀⠀⠠⡈⢻⣿⣿⣿⣿⡟⠁⠈⢧⡼⠉⠙⣆⡞⠁⠈⢹⣴⠃⠀⢸⣿⣿⣿⣿⣿⣿⠃⠀⡆⣾⠃⠀⠀⠀⠀⠀ - ⠀⠀⠀⠈⢻⣇⠀⠀⠀⠀⠀⠀⢡⠀⠹⣿⣿⣿⣷⡀⠀⣸⡇⠀⠀⣿⠁⠀⠀⠘⣿⠀⠀⠘⣿⣿⣿⣿⣿⣿⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠹⣇⠀⠠⠀⠀⠀⠀⠡⠐⢬⡻⣿⣿⣿⣿⣿⣷⣶⣶⣿⣦⣤⣤⣤⣿⣦⣶⣿⣿⣿⣿⣿⣿⣿⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠹⣧⡀⠡⡀⠀⠀⠀⠑⠄⠙⢎⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⢿⡇⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠈⠳⣤⡐⡄⠀⠀⠀⠈⠂⠀⠱⣌⠻⣿⣿⣿⣿⣿⣿⣿⠿⣿⠟⢻⡏⢻⣿⣿⣿⣿⣿⣿⣿⠀⢸⡇⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⢮⣦⡀⠂⠀⢀⠀⠀⠈⠳⣈⠻⣿⣿⣿⡇⠘⡄⢸⠀⠀⣇⠀⣻⣿⣿⣿⣿⣿⡏⠀⠸⡇⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⢶⣤⣄⡑⠄⠀⠀⠈⠑⠢⠙⠻⢷⣶⣵⣞⣑⣒⣋⣉⣁⣻⣿⠿⠟⠱⠃⡸⠀⣧⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠻⣷⣄⡀⠐⠢⣄⣀⡀⠀⠉⠉⠉⠉⠛⠙⠭⠭⠄⠒⠈⠀⠐⠁⢀⣿⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠷⢦⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣒⡠⠄⣠⡾⠃⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠷⠶⣦⣤⣭⣤⣬⣭⣭⣴⠶⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀ - */ - Authenticator::i()->logout(); - Session::i()->set("_su", NULL); - $this->flashFail("err", tr("error"), tr("profile_not_found")); - $this->redirect("/", static::REDIRECT_TEMPORARY); + if($this->user->identity->isDeleted() && !$this->deactivationTolerant) { + if($this->user->identity->isDeactivated()) { + header("HTTP/1.1 403 Forbidden"); + $this->getTemplatingEngine()->render(__DIR__ . "/templates/@deactivated.xml", [ + "thisUser" => $this->user->identity, + "csrfToken" => $GLOBALS["csrfToken"], + "isTimezoned" => Session::i()->get("_timezoneOffset"), + ]); + } else { + Authenticator::i()->logout(); + Session::i()->set("_su", NULL); + $this->flashFail("err", tr("error"), tr("profile_not_found")); + $this->redirect("/", static::REDIRECT_TEMPORARY); + } + exit; } if($this->user->identity->isBanned() && !$this->banTolerant) { header("HTTP/1.1 403 Forbidden"); $this->getTemplatingEngine()->render(__DIR__ . "/templates/@banned.xml", [ - "thisUser" => $this->user->identity, - "csrfToken" => $GLOBALS["csrfToken"], + "thisUser" => $this->user->identity, + "csrfToken" => $GLOBALS["csrfToken"], "isTimezoned" => Session::i()->get("_timezoneOffset"), ]); exit; @@ -256,8 +246,8 @@ abstract class OpenVKPresenter extends SimplePresenter if(!$this->user->identity->isActivated() && !$this->activationTolerant) { header("HTTP/1.1 403 Forbidden"); $this->getTemplatingEngine()->render(__DIR__ . "/templates/@email.xml", [ - "thisUser" => $this->user->identity, - "csrfToken" => $GLOBALS["csrfToken"], + "thisUser" => $this->user->identity, + "csrfToken" => $GLOBALS["csrfToken"], "isTimezoned" => Session::i()->get("_timezoneOffset"), ]); exit; diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index 92859bb6..b9af87ac 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -12,6 +12,7 @@ use Parsedown; final class SupportPresenter extends OpenVKPresenter { protected $banTolerant = true; + protected $deactivationTolerant = true; private $tickets; private $comments; diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index 667274ab..3ef4b9da 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -3,6 +3,7 @@ namespace openvk\Web\Presenters; use openvk\Web\Util\Sms; use openvk\Web\Themes\Themepacks; use openvk\Web\Models\Entities\Photo; +use openvk\Web\Models\Entities\Post; use openvk\Web\Models\Repositories\Users; use openvk\Web\Models\Repositories\Clubs; use openvk\Web\Models\Repositories\Albums; @@ -22,6 +23,8 @@ use Nette\Database\UniqueConstraintViolationException; final class UserPresenter extends OpenVKPresenter { private $users; + + public $deactivationTolerant = false; function __construct(Users $users) { @@ -34,7 +37,13 @@ final class UserPresenter extends OpenVKPresenter { $user = $this->users->get($id); if(!$user || $user->isDeleted()) { - $this->template->_template = "User/deleted.xml"; + if($user->isDeactivated()) { + $this->template->_template = "User/deactivated.xml"; + + $this->template->user = $user; + } else { + $this->template->_template = "User/deleted.xml"; + } } else { $this->template->albums = (new Albums)->getUserAlbums($user); $this->template->albumsCount = (new Albums)->getUserAlbumsCount($user); @@ -272,8 +281,7 @@ final class UserPresenter extends OpenVKPresenter $user->toggleSubscription($this->user->identity); - header("HTTP/1.1 302 Found"); - header("Location: /id" . $user->getId()); + $this->redirect("/id" . $user->getId()); exit; } @@ -474,6 +482,33 @@ final class UserPresenter extends OpenVKPresenter $this->template->themes = Themepacks::i()->getThemeList(); } + function renderDeactivate(): void + { + $this->assertUserLoggedIn(); + $this->willExecuteWriteAction(); + + $flags = 0; + $reason = $this->postParam("deactivate_reason"); + $share = $this->postParam("deactivate_share"); + + if($share) { + $flags |= 0b00100000; + + $post = new Post; + $post->setOwner($this->user->id); + $post->setWall($this->user->id); + $post->setCreated(time()); + $post->setContent($reason); + $post->setFlags($flags); + $post->save(); + } + + $this->user->identity->deactivate($reason); + + $this->redirect("/"); + exit; + } + function renderTwoFactorAuthSettings(): void { $this->assertUserLoggedIn(); diff --git a/Web/Presenters/templates/@deactivated.xml b/Web/Presenters/templates/@deactivated.xml new file mode 100644 index 00000000..1780abf1 --- /dev/null +++ b/Web/Presenters/templates/@deactivated.xml @@ -0,0 +1,34 @@ +{extends "@layout.xml"} +{block title}{$thisUser->getCanonicalName()}{/block} + +{block header} + {$thisUser->getCanonicalName()} +{/block} + +{block content} +
+ {tr("profile_deactivated_msg", $thisUser->getDeactivationDate()->format("%e %B %G" . tr("time_at_sp") . "%R"))|noescape} +
+ +
+
+ {$thisUser->getCanonicalName()} +
+
+ +
+
+
+
+

{$thisUser->getFullName()}

+
{_profile_deactivated_status}
+
+
+
+ {_profile_deactivated_info|noescape} +
+
+
+{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 07c9380a..52a7e355 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -102,29 +102,35 @@ {if $instance_name != OPENVK_DEFAULT_INSTANCE_NAME}{$instance_name}{/if}
{ifset $thisUser} -
- {_header_home} -
-
- {_header_groups} -
-
- {_header_search} -
-
- {_header_invite} -
-
- {_header_help} ({$ticketAnsweredCount}) -
-
- {_header_log_out} -
-
-
- -
-
+ {if $thisUser->isDeactivated()} +
+ {_header_log_out} +
+ {else} +
+ {_header_home} +
+
+ {_header_groups} +
+
+ {_header_search} +
+
+ {_header_invite} +
+
+ {_header_help} ({$ticketAnsweredCount}) +
+
+ {_header_log_out} +
+
+
+ +
+
+ {/if} {else}
{_header_login} @@ -142,7 +148,7 @@
{ifset $thisUser} - {if !$thisUser->isBanned() XOR !$thisUser->isActivated()} + {if !$thisUser->isBanned() XOR !$thisUser->isActivated() XOR $thisUser->isDeactivated()} {_edit_button} {_my_page} {_my_friends} diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml index 78a752d6..a029580f 100644 --- a/Web/Presenters/templates/User/Settings.xml +++ b/Web/Presenters/templates/User/Settings.xml @@ -220,9 +220,14 @@ - + +
+
+ {_you_can_also} {_delete_your_page}. +
+ {elseif $isPrivacy} - +
diff --git a/Web/Presenters/templates/User/deactivated.xml b/Web/Presenters/templates/User/deactivated.xml new file mode 100644 index 00000000..e8f02ef7 --- /dev/null +++ b/Web/Presenters/templates/User/deactivated.xml @@ -0,0 +1,30 @@ +{extends "../@layout.xml"} +{block title}{$user->getCanonicalName()}{/block} + +{block header} + {$user->getCanonicalName()} +{/block} + +{block content} +
+
+ {$user->getCanonicalName()} +
+
+ +
+
+
+
+

{$user->getFullName()}

+
{_profile_deactivated_status}
+
+
+
+ {_profile_deactivated_info|noescape} +
+
+
+{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index 37dfb5da..d8a3e594 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -1,6 +1,11 @@ {var $author = $post->getOwner()} {var $comments = $post->getLastComments(3)} {var $commentsCount = $post->getCommentsCount()} +{if $post->isDeactivationMessage() && $post->getText()} + {var $deac = "post_deact"} +{else} + {var $deac = "post_deact_silent"} +{/if} {var $commentTextAreaId = $post === NULL ? rand(1,300) : $post->getId()} @@ -17,6 +22,7 @@
{$author->getCanonicalName()} + {$post->isDeactivationMessage() ? ($author->isFemale() ? tr($deac . "_f") : tr($deac . "_m"))} {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()} {var $wallId = $post->getTargetWall()} {var $wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)} diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml index b4eec2d2..dbfd0ff0 100644 --- a/Web/Presenters/templates/components/post/oldpost.xml +++ b/Web/Presenters/templates/components/post/oldpost.xml @@ -1,4 +1,9 @@ {var $author = $post->getOwner()} +{if $post->isDeactivationMessage() && $post->getText()} + {var $deac = "post_deact"} +{else} + {var $deac = "post_deact_silent"} +{/if}
@@ -13,7 +18,7 @@
{$author->getCanonicalName()} - {$post->isPostedOnBehalfOfGroup() ? tr("post_writes_g") : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))} + {$post->isDeactivationMessage() ? ($author->isFemale() ? tr($deac . "_f") : tr($deac . "_m")) : ($post->isPostedOnBehalfOfGroup() ? tr("post_writes_g") : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m")))} {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()} {var $wallId = $post->getTargetWall()} {var $wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)} diff --git a/Web/routes.yml b/Web/routes.yml index cf5aed85..3698817a 100644 --- a/Web/routes.yml +++ b/Web/routes.yml @@ -75,6 +75,10 @@ routes: handler: "User->resetThemepack" - url: "/settings/change_email" handler: "User->emailChangeFinish" + - url: "/settings/deactivate" + handler: "User->deactivate" + - url: "/settings/reactivate" + handler: "Auth->reactivatePage" - url: "/coins_transfer" handler: "User->coinsTransfer" - url: "/increase_social_credits" diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index cb66a1d7..56eac47d 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -306,6 +306,58 @@ function ovk_proc_strtr(string, length = 0) { return newString + (string !== newString ? "…" : ""); } +function showProfileDeactivateDialog(hash) { + MessageBox(tr("profile_deactivate"), ` +
+ ${tr("profile_deactivate_header")} +
+ +

${tr("profile_deactivate_reason_header")}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ + + +
+ `, [tr("profile_deactivate_button"), tr("cancel")], [ + () => { + $("#profile_deactivate_dialog").submit(); + }, + Function.noop + ]); + + $('[id^="deactivate_r_"]').on("click", function () { + $('#deactivate_reason').val($(this).data("text")); + }); +} + function showIncreaseRatingDialog(coinsCount, userUrl, hash) { MessageBox(tr("increase_rating"), `
diff --git a/install/sqls/00028-deactivation.sql b/install/sqls/00028-deactivation.sql new file mode 100644 index 00000000..57eb5e83 --- /dev/null +++ b/install/sqls/00028-deactivation.sql @@ -0,0 +1 @@ +ALTER TABLE `profiles` ADD `deact_date` bigint(20) unsigned NOT NULL DEFAULT '0' AFTER `deleted`, ADD `deact_reason` text NULL AFTER `deact_date`; diff --git a/locales/en.strings b/locales/en.strings index d1b35a2e..30643f84 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -149,6 +149,10 @@ "post_writes_m" = "wrote"; "post_writes_f" = "wrote"; "post_writes_g" = "published"; +"post_deact_m" = "deleted his profile saying:"; +"post_deact_f" = "deleted her profile saying:"; +"post_deact_silent_m" = "silently deleted his profile."; +"post_deact_silent_f" = "silently deleted her profile."; "wall" = "Wall"; "post" = "Post"; "write" = "Write"; @@ -487,6 +491,28 @@ "email_change_confirm_message" = "Please confirm your new email address for the change to take effect. We have sent instructions to it."; +"profile_deactivate" = "Delete account"; +"profile_deactivate_button" = "Delete account"; +"profile_deactivate_header" = "We are sorry that you want to delete your page. Therefore, you can specify the reason for deletion and your message about it. We read your feedback and try to make the site better!"; +"profile_deactivate_reason_header" = "Please select a reason why you are leaving"; +"profile_deactivate_reason_1" = "I have another profile and don't need this one"; +"profile_deactivate_reason_1_text" = "I created a new page and now I want to wipe my past."; +"profile_deactivate_reason_2" = "Website takes away too much of my time"; +"profile_deactivate_reason_2_text" = "Even though this site is nice and beautiful, it takes away my time that I need for work and life."; +"profile_deactivate_reason_3" = "Website harbors too much inappropriate content"; +"profile_deactivate_reason_3_text" = "I have found enough porn and pirated content to last me a lifetime, I'm leaving now."; +"profile_deactivate_reason_4" = "I am worried about the safety of my data"; +"profile_deactivate_reason_4_text" = "I'm being watched and I'm scared to be here. I'm sorry, I have to leave."; +"profile_deactivate_reason_5" = "No one comments on my posts"; +"profile_deactivate_reason_5_text" = "No one watches me here and it's sad. You will regret that I left."; +"profile_deactivate_reason_6" = "Other reason"; + +"profile_deactivated_msg" = "Your account has been deleted.

If you would like to start using the site again, you can restore your account until $1."; +"profile_deactivated_status" = "Account deleted"; +"profile_deactivated_info" = "The account has been deleted.
The information is not available."; + +"share_with_friends" = "Share with friends"; + /* Two-factor authentication */ "two_factor_authentication" = "Two-factor authentication"; diff --git a/locales/ru.strings b/locales/ru.strings index 0ffa0b78..a654e0dd 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -155,6 +155,10 @@ "post_writes_m" = "написал"; "post_writes_f" = "написала"; "post_writes_g" = "опубликовали"; +"post_deact_m" = "удалил страницу со словами:"; +"post_deact_f" = "удалила страницу со словами:"; +"post_deact_silent_m" = "молча удалил свою страницу."; +"post_deact_silent_f" = "молча удалила свою страницу."; "wall" = "Стена"; "post" = "Запись"; "write" = "Написать"; @@ -523,6 +527,28 @@ "email_change_confirm_message" = "Чтобы изменение вступило в силу, подтвердите ваш новый адрес электронной почты. Мы отправили инструкции на него."; +"profile_deactivate" = "Удаление страницы"; +"profile_deactivate_button" = "Удалить страницу"; +"profile_deactivate_header" = "Мы сожалеем, что Вы хотите удалить свою страницу. Поэтому, Вы можете указать причину удаления и Ваше сообщение по этому поводу. Мы читаем Ваши отзывы и пытаемся сделать сайт лучше!"; +"profile_deactivate_reason_header" = "Пожалуйста, укажите причину удаления Вашей страницы"; +"profile_deactivate_reason_1" = "У меня есть другая страница на сайте"; +"profile_deactivate_reason_1_text" = "Я создал новую страницу и теперь хочу подтереть своё прошлое."; +"profile_deactivate_reason_2" = "Сайт отнимает у меня слишком много времени"; +"profile_deactivate_reason_2_text" = "Пусть этот сайт хорош и прекрасен, но он отнимает у меня время, которое мне нужно для работы и жизни."; +"profile_deactivate_reason_3" = "Сайт содержит слишком много неприемлемых материалов"; +"profile_deactivate_reason_3_text" = "Я нашёл достаточно порнографии и пиратского контента - хватит на всю жизнь. Теперь я ухожу."; +"profile_deactivate_reason_4" = "Меня беспокоит безопасность моих данных"; +"profile_deactivate_reason_4_text" = "За мной следят и мне страшно здесь находится. Извините, я вынужден уйти."; +"profile_deactivate_reason_5" = "Мою страницу не комментируют"; +"profile_deactivate_reason_5_text" = "Меня никто не смотрит здесь и это грустно. Вы пожалеете о том, что я ушёл."; +"profile_deactivate_reason_6" = "Другая причина"; + +"profile_deactivated_msg" = "Ваша страница удалена.

Если Вы захотите снова начать пользоваться сайтом, Вы можете восстановить свою страницу до $1."; +"profile_deactivated_status" = "Страница удалена"; +"profile_deactivated_info" = "Страница пользователя удалена.
Информация недоступна."; + +"share_with_friends" = "Рассказать друзьям"; + /* Two-factor authentication */ "two_factor_authentication" = "Двухфакторная аутентификация";