From 73ece668beeff94776c7bd1672eab2664d987725 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Sat, 21 May 2022 11:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/inc/inc_archives_functions.php | 38 ++----------------------
 src/admin/sys_admin_user_edit.php        |  3 +-
 src/user/templets/pm-main.htm            |  2 +-
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php
index d1fdc4bb..47760f9d 100644
--- a/src/admin/inc/inc_archives_functions.php
+++ b/src/admin/inc/inc_archives_functions.php
@@ -219,40 +219,6 @@ function GetRemoteImage($url, $uid = 0)
     $htd->Close();
     return ($ok ? $revalues : '');
 }
-/**
- *  获取远程flash
- *
- * @access    public
- * @param     string  $url  地址
- * @param     int  $uid  用户id
- * @return    string
- */
-function GetRemoteFlash($url, $uid = 0)
-{
-    global $cfg_addon_savetype, $cfg_media_dir, $cfg_basedir;
-    $cfg_uploaddir = $cfg_media_dir;
-    $revalues = '';
-    $sparr = 'application/x-shockwave-flash';
-    $htd = new DedeHttpDown();
-    $htd->OpenUrl($url);
-    if ($htd->GetHead("content-type") != $sparr) {
-        return '';
-    } else {
-        $imgUrl = $cfg_uploaddir.'/'.MyDate($cfg_addon_savetype, time());
-        $imgPath = $cfg_basedir.$imgUrl;
-        CreateDir($imgUrl);
-        $itype = '.swf';
-        $milliSecond = $uid.'_'.MyDate('mdHis', time());
-        $rndFileName = $imgPath.'/'.$milliSecond.$itype;
-        $fileurl = $imgUrl.'/'.$milliSecond.$itype;
-        $ok = $htd->SaveToBin($rndFileName);
-        if ($ok) {
-            $revalues = $fileurl;
-        }
-    }
-    $htd->Close();
-    return $revalues;
-}
 /**
  *  检测频道ID
  *
@@ -726,9 +692,9 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
             $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '$handurl' ");
             $fullUrl = preg_replace("#\.([a-z]*)$#i", "", $handurl);
         } else {
-            $savepath = $cfg_image_dir.'/'.strftime("%Y-%m", $ntime);
+            $savepath = $cfg_image_dir.'/'.date("%Y-%m", $ntime);
             CreateDir($savepath);
-            $fullUrl = $savepath.'/'.strftime("%d", $ntime).dd2char(strftime("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999));
+            $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999));
         }
         if (strtolower($_FILES[$upname]['type']) == "image/gif") {
             $fullUrl = $fullUrl.".gif";
diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php
index 4bcd4964..cdb0a8d9 100644
--- a/src/admin/sys_admin_user_edit.php
+++ b/src/admin/sys_admin_user_edit.php
@@ -99,9 +99,8 @@ $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=
 $dsql->Execute('op');
 while ($nrow = $dsql->GetObject('op')) {
     $typeOptions .= "<option value='{$nrow->id}' class='btype'".(in_array($nrow->id, $typeids) ? ' selected' : '').">{$nrow->typename}</option>\r\n";
-    $dsql->SetQuery("SELECT id,typename FROM #@__arctype WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)");
+    $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)");
     $dsql->Execute('s');
-
     while ($nrow = $dsql->GetObject('s')) {
         $typeOptions .= "<option value='{$nrow->id}' class='stype'".(in_array($nrow->id, $typeids) ? ' selected' : '').">—{$nrow->typename}</option>\r\n";
     }
diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm
index cdb96dcd..33628be8 100755
--- a/src/user/templets/pm-main.htm
+++ b/src/user/templets/pm-main.htm
@@ -19,7 +19,7 @@
 					if (result.code === 200) {
 						ShowMsg(`标题：<p>${result.data.subject}</p>
 							时间：<p>${result.data.sendtime}</p>
-							内容<p>${result.data.subject}</p>`, {
+							内容<p>${result.data.message}</p>`, {
 							title: "查看短消息",
 						});
 						$(`.pm-read-status[for='${id}']`).html("已阅读");