From 9281d2342cae347d645cb2b867fa176f9beea2e9 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 13 Aug 2021 08:28:00 +0800
Subject: [PATCH] * Fix bug #14254.

---
 module/user/control.php    | 1 +
 module/user/lang/de.php    | 9 +++++----
 module/user/lang/en.php    | 9 +++++----
 module/user/lang/fr.php    | 9 +++++----
 module/user/lang/vi.php    | 9 +++++----
 module/user/lang/zh-cn.php | 9 +++++----
 module/user/lang/zh-tw.php | 9 +++++----
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index 180c34a732..a955e34843 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -61,6 +61,7 @@ class user extends control
         $userID = (int)$userID;
         $user   = $this->user->getById($userID, 'id');
         if(empty($user)) die(js::error($this->lang->notFound) . js::locate('back'));
+        if($user->deleted == 1) die(js::error($this->lang->user->noticeHasDeleted) . js::locate('back'));
 
         /* Set thie url to session. */
         $uri = $this->app->getURI(true);
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 699c29bd0d..548a7c5e86 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -232,10 +232,11 @@ $lang->user->contacts->noListYet     = 'Es existiert keine Kontaktliste. Bitte e
 $lang->user->contacts->confirmDelete = 'Möchten Sie diese Liste löschen?';
 $lang->user->contacts->or            = ' oder ';
 
-$lang->user->resetFail       = "Fehlgeschlagen. Bitte prüfen Sie das Konto";
-$lang->user->resetSuccess    = "Zurückgesetzt! Bitte nutzen Sie Ihr neues Passwort, um sich anzumelden.";
-$lang->user->noticeDelete    = 'Do you want to delete "%s" from ZenTao?';
-$lang->user->noticeResetFile = "<h5>Kontaktieren Sie den Administrator um Ihr Passwort zurückzusetzen.</h5>
+$lang->user->resetFail        = "Fehlgeschlagen. Bitte prüfen Sie das Konto";
+$lang->user->resetSuccess     = "Zurückgesetzt! Bitte nutzen Sie Ihr neues Passwort, um sich anzumelden.";
+$lang->user->noticeDelete     = 'Do you want to delete "%s" from ZenTao?';
+$lang->user->noticeHasDeleted = "This user has been deleted. If you want to view it, please go to the Admin-System-Data-Recycle to restore it.";
+$lang->user->noticeResetFile  = "<h5>Kontaktieren Sie den Administrator um Ihr Passwort zurückzusetzen.</h5>
     <h5>Wenn Sie der Administrator sind, meleden Sie sich auf dem Server an und erstellen Sie die Datei <span> '%s' </span>.</h5>
     <p>Hinweis:</p>
     <ol>
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 00fbffdbb3..142f8a787b 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -235,10 +235,11 @@ $lang->user->contacts->noListYet     = 'No contact list exists. Please create on
 $lang->user->contacts->confirmDelete = 'Do you want to delete this list?';
 $lang->user->contacts->or            = ' or ';
 
-$lang->user->resetFail       = "Failed. Please check the account.";
-$lang->user->resetSuccess    = "Reset! Please use your new password to login.";
-$lang->user->noticeDelete    = 'Do you want to delete "%s" from ZenTao?';
-$lang->user->noticeResetFile = "<h5>Contact the Administrator to reset your password.</h5>
+$lang->user->resetFail        = "Failed. Please check the account.";
+$lang->user->resetSuccess     = "Reset! Please use your new password to login.";
+$lang->user->noticeDelete     = 'Do you want to delete "%s" from ZenTao?';
+$lang->user->noticeHasDeleted = "This user has been deleted. If you want to view it, please go to the Admin-System-Data-Recycle to restore it.";
+$lang->user->noticeResetFile  = "<h5>Contact the Administrator to reset your password.</h5>
     <h5>If you are, please login your Zentao host and create a file named <span> '%s' </span>.</h5>
     <p>Note:</p>
     <ol>
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 64bf98aaa9..ccb6cae872 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -232,10 +232,11 @@ $lang->user->contacts->noListYet     = 'Aucune liste de contacts existante. Cré
 $lang->user->contacts->confirmDelete = 'Voulez-vous supprimer cette liste de contacts ?';
 $lang->user->contacts->or            = ' ou ';
 
-$lang->user->resetFail       = "ECHEC. Vérifiez votre compte.";
-$lang->user->resetSuccess    = "Reset ! Utilisez votre nouveau mot de passe pour vous connecter.";
-$lang->user->noticeDelete    = 'Do you want to delete "%s" from ZenTao?';
-$lang->user->noticeResetFile = "<h5>Contactez l'administrateur pour réinitialiser votre mot de passe.</h5>
+$lang->user->resetFail        = "ECHEC. Vérifiez votre compte.";
+$lang->user->resetSuccess     = "Reset ! Utilisez votre nouveau mot de passe pour vous connecter.";
+$lang->user->noticeDelete     = 'Do you want to delete "%s" from ZenTao?';
+$lang->user->noticeHasDeleted = "This user has been deleted. If you want to view it, please go to the Admin-System-Data-Recycle to restore it.";
+$lang->user->noticeResetFile  = "<h5>Contactez l'administrateur pour réinitialiser votre mot de passe.</h5>
     <h5>Si vous êtres l'administrateur, connectez-vous au serveur Zentao et créez un fichier vide nommé <span> '%s' </span>.</h5>
     <p>Note :</p>
     <ol>
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index e364d861d0..140b8826fe 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -232,10 +232,11 @@ $lang->user->contacts->noListYet     = 'Không có danh sách liên hệ tồn t
 $lang->user->contacts->confirmDelete = 'Bạn có muốn xóa danh sách này?';
 $lang->user->contacts->or            = ' or ';
 
-$lang->user->resetFail       = "Thất bại. Vui lòng kiểm tra tài khoản.";
-$lang->user->resetSuccess    = "Reset! Vui lòng sử dụng mật khẩu mới của bạn để đăng nhập.";
-$lang->user->noticeDelete    = 'Do you want to delete "%s" from ZenTao?';
-$lang->user->noticeResetFile = "<h5>Liên hệ quản trị viên để thiết lập lại mật khẩu của bạn.</h5>
+$lang->user->resetFail        = "Thất bại. Vui lòng kiểm tra tài khoản.";
+$lang->user->resetSuccess     = "Reset! Vui lòng sử dụng mật khẩu mới của bạn để đăng nhập.";
+$lang->user->noticeDelete     = 'Do you want to delete "%s" from ZenTao?';
+$lang->user->noticeHasDeleted = "This user has been deleted. If you want to view it, please go to the Admin-System-Data-Recycle to restore it.";
+$lang->user->noticeResetFile  = "<h5>Liên hệ quản trị viên để thiết lập lại mật khẩu của bạn.</h5>
  <h5>Nếu là bạn, vui lòng đăng nhập host ZenTao của bạn và tạo một tập tin tên  <span> '%s' </span>.</h5>
  <p>Chú ý:</p>
  <ol>
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 1eede8cea7..80c40eb083 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -235,10 +235,11 @@ $lang->user->contacts->noListYet     = '还没有创建任何列表，请先创
 $lang->user->contacts->confirmDelete = '您确定要删除这个列表吗？';
 $lang->user->contacts->or            = ' 或者 ';
 
-$lang->user->resetFail       = "重置密码失败，检查用户名是否存在！";
-$lang->user->resetSuccess    = "重置密码成功，请用新密码登录。";
-$lang->user->noticeDelete    = "你确认要把“%s”从系统中删除吗？";
-$lang->user->noticeResetFile = "<h5>普通用户请联系管理员重置密码</h5>
+$lang->user->resetFail        = "重置密码失败，检查用户名是否存在！";
+$lang->user->resetSuccess     = "重置密码成功，请用新密码登录。";
+$lang->user->noticeDelete     = "你确认要把“%s”从系统中删除吗？";
+$lang->user->noticeHasDeleted = "该人员已经删除，如需查看，请到回收站还原后再查看。";
+$lang->user->noticeResetFile  = "<h5>普通用户请联系管理员重置密码</h5>
     <h5>管理员请登录禅道所在的服务器，创建<span> '%s' </span>文件。</h5>
     <p>注意：</p>
     <ol>
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 256a92f898..635ebea3fc 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -235,10 +235,11 @@ $lang->user->contacts->noListYet     = '還沒有創建任何列表，請先創
 $lang->user->contacts->confirmDelete = '您確定要刪除這個列表嗎？';
 $lang->user->contacts->or            = ' 或者 ';
 
-$lang->user->resetFail       = "重置密碼失敗，檢查用戶名是否存在！";
-$lang->user->resetSuccess    = "重置密碼成功，請用新密碼登錄。";
-$lang->user->noticeDelete    = "你確認要把“%s”從系統中刪除嗎？";
-$lang->user->noticeResetFile = "<h5>普通用戶請聯繫管理員重置密碼</h5>
+$lang->user->resetFail        = "重置密碼失敗，檢查用戶名是否存在！";
+$lang->user->resetSuccess     = "重置密碼成功，請用新密碼登錄。";
+$lang->user->noticeDelete     = "你確認要把“%s”從系統中刪除嗎？";
+$lang->user->noticeHasDeleted = "該人員已經刪除，如需查看，請到回收站還原後再查看。";
+$lang->user->noticeResetFile  = "<h5>普通用戶請聯繫管理員重置密碼</h5>
     <h5>管理員請登錄禪道所在的伺服器，創建<span> '%s' </span>檔案。</h5>
     <p>注意：</p>
     <ol>