From f98275d81377d188d5e87330e4139d89a75b5837 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Tue, 29 Nov 2022 21:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/user/pm.php | 49 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/user/pm.php b/src/user/pm.php
index 9c17fba1..837e19ca 100755
--- a/src/user/pm.php
+++ b/src/user/pm.php
@@ -48,11 +48,44 @@ if ($dopost == 'read') {
     );
     echo json_encode($result);
     exit();
-}
-/*-----------------------
-function __man(){  }
-----------------------*/ 
-else {
+} else if($dopost == 'remove'){
+    $ids = preg_replace("#[^0-9,]#", "", $ids);
+    if($folder==='inbox')
+    {
+        $boxsql="SELECT * FROM `#@__member_pms` WHERE id IN($ids) AND folder LIKE 'inbox' AND toid='{$cfg_ml->M_ID}'";
+        $dsql->SetQuery($boxsql);
+        $dsql->Execute();
+        $query='';
+        while($row = $dsql->GetArray())
+        {
+            if($row && $row['isadmin']==1)
+            {
+                $query = "UPDATE `#@__member_pms` SET writetime='0' WHERE id='{$row['id']}' AND folder='inbox' AND toid='{$cfg_ml->M_ID}' AND isadmin='1';";
+                $dsql->ExecuteNoneQuery($query);
+            }
+            else
+            {
+                $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND toid='{$cfg_ml->M_ID}' AND folder LIKE 'inbox'";
+            }
+        }
+    }
+    else if($folder==='outbox')
+    {
+        $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND fromid='{$cfg_ml->M_ID}' AND folder LIKE 'outbox' ";
+    }
+    else
+    {
+        $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND fromid='{$cfg_ml->M_ID}' Or toid='{$cfg_ml->M_ID}' AND folder LIKE 'outbox' Or (folder LIKE 'inbox' AND hasview='0')";
+    }
+    $dsql->ExecuteNoneQuery($query);
+    $result = array(
+        "code" => 200,
+        "data" => "success",
+        "msg" => "",
+    );
+    echo json_encode($result);
+    exit;
+} else {
     if (!isset($folder)) {
         $folder = 'inbox';
     }
@@ -63,13 +96,13 @@ else {
         $tname = "发件箱";
     } elseif ($folder == 'inbox') {
         if ($state === 1) {
-            $wsql = " toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!='' and hasview=1";
+            $wsql = " toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!=0 and hasview=1";
             $tname = "收件箱";
         } else if ($state === -1) {
-            $wsql = "toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!='' and hasview=0";
+            $wsql = "toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!=0 and hasview=0";
             $tname = "收件箱";
         } else {
-            $wsql = " toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!=''";
+            $wsql = " toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!=0";
             $tname = "收件箱";
         }
     } else {