From 9ebd495dbece65e84c9f3847cce3aba3f4b4b57f Mon Sep 17 00:00:00 2001
From: n1rwana <93197434+n1rwana@users.noreply.github.com>
Date: Sat, 3 Sep 2022 20:44:58 +0300
Subject: [PATCH 1/3] Admins can view deleted users pages

---
 Web/Presenters/UserPresenter.php       | 36 +++++++++++++++-----------
 Web/Presenters/templates/User/View.xml |  3 +++
 openvk-example.yml                     |  1 +
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index 6871b90e2..31905c2d7 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -28,23 +28,29 @@ function __construct(Users $users)
     function renderView(int $id): void
     {
         $user = $this->users->get($id);
-        if(!$user || $user->isDeleted()) {
-            if($user->isDeactivated()) {
-                $this->template->_template = "User/deactivated.xml";
-                
-                $this->template->user = $user;
+        $canViewDeleted = $this->user->identity->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL) === OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["adminsCanViewDeletedUsers"];
+
+        if ($user === NULL) {
+            $this->template->_template = "User/deleted.xml";
+        } else {
+            if ($user->isDeleted() AND !$canViewDeleted) {
+                if ($user->isDeactivated()) {
+                    $this->template->_template = "User/deactivated.xml";
+
+                    $this->template->user = $user;
+                } else {
+                    $this->template->_template = "User/deleted.xml";
+                }
             } else {
-                $this->template->_template = "User/deleted.xml";
+                $this->template->albums = (new Albums)->getUserAlbums($user);
+                $this->template->albumsCount = (new Albums)->getUserAlbumsCount($user);
+                $this->template->videos = (new Videos)->getByUser($user, 1, 2);
+                $this->template->videosCount = (new Videos)->getUserVideosCount($user);
+                $this->template->notes = (new Notes)->getUserNotes($user, 1, 4);
+                $this->template->notesCount = (new Notes)->getUserNotesCount($user);
+
+                $this->template->user = $user;
             }
-        } else {
-            $this->template->albums      = (new Albums)->getUserAlbums($user);
-            $this->template->albumsCount = (new Albums)->getUserAlbumsCount($user);
-            $this->template->videos      = (new Videos)->getByUser($user, 1, 2);
-            $this->template->videosCount = (new Videos)->getUserVideosCount($user);
-            $this->template->notes       = (new Notes)->getUserNotes($user, 1, 4);
-            $this->template->notesCount  = (new Notes)->getUserNotesCount($user);
-            
-            $this->template->user = $user;
         }
     }
     
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index a2b8cb0d8..1dfcd1ae0 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -355,6 +355,9 @@
     <div class="right_big_block">
         <div class="page_info">
             <div n:if="!is_null($alert = $user->getAlert())" class="user-alert">{strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}</div>
+            <div n:if="$thisUser->getChandlerUser()->can('access')->model('admin')->whichBelongsTo(NULL) AND $user->isDeactivated()" class="user-alert">
+                Вы просматриваете страницу удалённого пользователя.
+            </div>
             {var $thatIsThisUser = isset($thisUser) && $user->getId() == $thisUser->getId()}
             <div n:if="$thatIsThisUser" class="page_status_popup" id="status_editor" style="display: none;">
                 <form name="status_popup_form" onsubmit="changeStatus(); return false;">
diff --git a/openvk-example.yml b/openvk-example.yml
index 32f03edd9..c0441cf51 100644
--- a/openvk-example.yml
+++ b/openvk-example.yml
@@ -33,6 +33,7 @@ openvk:
                 maxViolations: 50
                 maxViolationsAge: 120
                 autoban: true
+            adminsCanViewDeletedUsers: false
         registration:
             enable: true
             reason: "" # reason for disabling registration

From 32eaee3777b5680421c1be1b3f7cfeb6423be08a Mon Sep 17 00:00:00 2001
From: n1rwana <93197434+n1rwana@users.noreply.github.com>
Date: Sun, 4 Sep 2022 14:01:12 +0300
Subject: [PATCH 2/3] Fixes

---
 Web/Presenters/AdminPresenter.php      | 24 ++++++++++++
 Web/Presenters/UserPresenter.php       | 36 +++++++++--------
 Web/Presenters/templates/User/View.xml | 54 ++++++++++++++++++++++++--
 Web/routes.yml                         |  4 ++
 4 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/Web/Presenters/AdminPresenter.php b/Web/Presenters/AdminPresenter.php
index 4a484a4dc..a45c8a067 100644
--- a/Web/Presenters/AdminPresenter.php
+++ b/Web/Presenters/AdminPresenter.php
@@ -372,4 +372,28 @@ function renderQuickWarn(int $id): void
         $user->adminNotify("⚠️ " . $this->queryParam("message"));
         exit(json_encode([ "message" => $this->queryParam("message") ]));
     }
+
+    function renderQuickDeactivate(int $id): void
+    {
+        $this->assertNoCSRF();
+
+        $user = $this->users->get($id);
+        if(!$user)
+            exit(json_encode([ "error" => "User does not exist" ]));
+
+        $user->deactivate($this->queryParam("reason") ?? NULL);
+        exit(json_encode([ "success" => true ]));
+    }
+
+    function renderQuickRestore(int $id): void
+    {
+        $this->assertNoCSRF();
+
+        $user = $this->users->get($id);
+        if(!$user)
+            exit(json_encode([ "error" => "User does not exist" ]));
+
+        $user->reactivate();
+        exit(json_encode([ "success" => true ]));
+    }
 }
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index 31905c2d7..a27cdbb7f 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -28,30 +28,34 @@ function __construct(Users $users)
     function renderView(int $id): void
     {
         $user = $this->users->get($id);
-        $canViewDeleted = $this->user->identity->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL) === OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["adminsCanViewDeletedUsers"];
+        $canViewDeleted = $this->user->identity->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL) && OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["adminsCanViewDeletedUsers"];
 
         if ($user === NULL) {
             $this->template->_template = "User/deleted.xml";
-        } else {
-            if ($user->isDeleted() AND !$canViewDeleted) {
-                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);
-                $this->template->videos = (new Videos)->getByUser($user, 1, 2);
-                $this->template->videosCount = (new Videos)->getUserVideosCount($user);
-                $this->template->notes = (new Notes)->getUserNotes($user, 1, 4);
-                $this->template->notesCount = (new Notes)->getUserNotesCount($user);
+            return;
+        }
 
+        if ($user->isDeleted() AND !$canViewDeleted) {
+            if ($user->isDeactivated()) {
+                $this->template->_template = "User/deactivated.xml";
                 $this->template->user = $user;
+
+                return;
             }
+
+            $this->template->_template = "User/deleted.xml";
+
+            return;
         }
+
+        $this->template->albums = (new Albums)->getUserAlbums($user);
+        $this->template->albumsCount = (new Albums)->getUserAlbumsCount($user);
+        $this->template->videos = (new Videos)->getByUser($user, 1, 2);
+        $this->template->videosCount = (new Videos)->getUserVideosCount($user);
+        $this->template->notes = (new Notes)->getUserNotes($user, 1, 4);
+        $this->template->notesCount = (new Notes)->getUserNotesCount($user);
+        $this->template->user = $user;
     }
     
     function renderFriends(int $id): void
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index 1dfcd1ae0..9823ba2b1 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -35,7 +35,10 @@
          src="/assets/packages/static/openvk/img/checkmark.png"
          />
     <span n:if="isset($thisUser) && $user->getId() == $thisUser->getId()"><b>({_this_is_you})</b></span>
-    
+    <b n:if="$thisUser->getChandlerUser()->can('access')->model('admin')->whichBelongsTo(NULL) AND $user->isDeactivated()" style="color: red;">
+        [DELETED]
+    </b>
+
     <!-- DEBUG: ONLINE REPORT: static {$user->getOnline()->timestamp()}s adjusted {$user->getOnline()->timestamp() + 2505600}s real {time()}s -->
     <div n:if="$user->getOnline()->timestamp() + 2505600 > time()" style="float:right;">
         {if $user->isOnline()}
@@ -92,6 +95,12 @@
                     <a href="javascript:warnUser()" class="profile_link">
                         {_warn_user_action}
                     </a>
+                    <a n:if="!$user->isDeactivated()" href="javascript:deleteUser()" class="profile_link">
+                        Удалить
+                    </a>
+                    <a n:if="$user->isDeactivated()" href="javascript:restoreDeleted()" class="profile_link">
+                        Восстановить
+                    </a>
                 {/if}
 
                 {if $thisUser->getChandlerUser()->can('write')->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)}
@@ -355,9 +364,6 @@
     <div class="right_big_block">
         <div class="page_info">
             <div n:if="!is_null($alert = $user->getAlert())" class="user-alert">{strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}</div>
-            <div n:if="$thisUser->getChandlerUser()->can('access')->model('admin')->whichBelongsTo(NULL) AND $user->isDeactivated()" class="user-alert">
-                Вы просматриваете страницу удалённого пользователя.
-            </div>
             {var $thatIsThisUser = isset($thisUser) && $user->getId() == $thisUser->getId()}
             <div n:if="$thatIsThisUser" class="page_status_popup" id="status_editor" style="display: none;">
                 <form name="status_popup_form" onsubmit="changeStatus(); return false;">
@@ -585,6 +591,46 @@
                     Function.noop
                 ]);
             }
+
+            function deleteUser() {
+                uDeleteMsgTxt = "Вы собираетесь удалить (деактивировать) страницу пользователя " + {$user->getCanonicalName()} + ".";
+                uDeleteMsgTxt += "<br/><br/><b>Причина удаления: <input type='text' id='uDeleteMsgInput' placeholder='придумайте что-нибудь крутое'/>";
+
+                MessageBox("Удалить пользователя", uDeleteMsgTxt, ["Подтвердить", "Отмена"], [
+                    (function () {
+                        res = document.querySelector("#uDeleteMsgInput").value;
+                        xhr = new XMLHttpRequest();
+                        xhr.open("GET", "/admin/deactivate/" + {$user->getId()} + "?reason=" + res + "&hash=" + {rawurlencode($csrfToken)}, true);
+                        xhr.onload = (function () {
+                            if(xhr.responseText.indexOf("success") === -1)
+                                MessageBox("Ошибка", "Не удалось удалить пользователя...", ["OK"], [Function.noop]);
+                            else
+                                MessageBox("Операция успешна", "Пользователь удалён", ["OK"], [Function.noop]);
+                        });
+                        xhr.send(null);
+                    }),
+                    Function.noop
+                ]);
+            }
+
+            function restoreDeleted() {
+                uRestoreMsgTxt = "Вы собираетесь восстановить страницу удалённого пользователя " + {$user->getCanonicalName()} + ".";
+
+                MessageBox("Восстановить страницу", uRestoreMsgTxt, ["Подтвердить", "Отмена"], [
+                    (function() {
+                        xhr = new XMLHttpRequest();
+                        xhr.open("GET", "/admin/restore/" + {$user->getId()} + "?hash=" + {rawurlencode($csrfToken)}, true);
+                        xhr.onload = (function() {
+                            if(xhr.responseText.indexOf("success") === -1)
+                                MessageBox("Ошибка", "Не удалось восстановить пользователя...", ["OK"], [Function.noop]);
+                            else
+                                MessageBox("Операция успешна", "Пользователь восстановлен", ["OK"], [Function.noop]);
+                        });
+                        xhr.send(null);
+                    }),
+                    Function.noop
+                ]);
+            }
         </script>
 
         <script n:if="isset($thisUser) && $thisUser->getChandlerUser()->can('write')->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)">
diff --git a/Web/routes.yml b/Web/routes.yml
index 2b3466100..ca5d7f708 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -295,6 +295,10 @@ routes:
       handler: "Admin->quickUnban"
     - url: "/admin/warn/{num}"
       handler: "Admin->quickWarn"
+    - url: "/admin/deactivate/{num}"
+      handler: "Admin->quickDeactivate"
+    - url: "/admin/restore/{num}"
+      handler: "Admin->quickRestore"
     - url: "/admin/support/ban/{num}"
       handler: "Support->quickBanInSupport"
     - url: "/admin/support/unban/{num}"

From 1ec769c305a5ac393444433a537f9f63ad9e05f0 Mon Sep 17 00:00:00 2001
From: n1rwana <93197434+n1rwana@users.noreply.github.com>
Date: Mon, 5 Sep 2022 20:33:04 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/Presenters/templates/User/View.xml | 4 ++--
 locales/en.strings                     | 1 +
 locales/ru.strings                     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index 9823ba2b1..1f9cf44b6 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -96,10 +96,10 @@
                         {_warn_user_action}
                     </a>
                     <a n:if="!$user->isDeactivated()" href="javascript:deleteUser()" class="profile_link">
-                        Удалить
+                        {_delete}
                     </a>
                     <a n:if="$user->isDeactivated()" href="javascript:restoreDeleted()" class="profile_link">
-                        Восстановить
+                        {_restore}
                     </a>
                 {/if}
 
diff --git a/locales/en.strings b/locales/en.strings
index a08253922..4bd1c4db7 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -159,6 +159,7 @@
 "write" = "Write";
 "publish" = "Publish";
 "delete" = "Delete";
+"restore" = "Restore";
 "comments" = "Comments";
 "share" = "Share";
 "pin" = "Pin";
diff --git a/locales/ru.strings b/locales/ru.strings
index 0e7b78068..3ae335d38 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -165,6 +165,7 @@
 "write" = "Написать";
 "publish" = "Опубликовать";
 "delete" = "Удалить";
+"restore" = "Восстановить";
 "comments" = "Комментарии";
 "share" = "Поделиться";
 "pin" = "Закрепить";