From a0d227be2ad9632557599e6793272fe426f374b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <xushubieli@qq.com>
Date: Fri, 5 Jul 2024 09:50:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/module_main.php          | 8 +++++---
 src/admin/module_make.php          | 4 +---
 src/admin/templets/module_edit.htm | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/admin/module_main.php b/src/admin/module_main.php
index 22f4f926..715ffb83 100644
--- a/src/admin/module_main.php
+++ b/src/admin/module_main.php
@@ -266,6 +266,11 @@ if ($action == '') {
     $win->AddHidden("hash", $hash);
     $win->AddHidden("action", "delok");
     $msg = "<tr>
+        <td colspan='2'>
+            <div class='alert alert-warning'>删除模块仅删除模块安装后文件，用<a href='module_main.php?hash={$hash}&action=uninstall'>卸载程序</a>来删除</div>
+        </td>
+    </tr>
+    <tr>
         <td width='260'>模块名称</td>
         <td>{$infos['name']}</td>
     </tr>
@@ -288,9 +293,6 @@ if ($action == '') {
     <tr>
         <td>使用协议</td>
         <td><a href='module_main.php?action=showreadme&hash={$hash}' target='_blank' class='btn btn-success btn-sm'>浏览</a></td>
-    </tr>
-    <tr>
-        <td colspan='2'>删除模块仅删除模块安装后文件，用<a href='module_main.php?hash={$hash}&action=uninstall'>卸载程序</a>来删除</td>
     </tr>";
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("ok", "");
diff --git a/src/admin/module_make.php b/src/admin/module_make.php
index 1c96a6e6..5465f674 100644
--- a/src/admin/module_make.php
+++ b/src/admin/module_make.php
@@ -86,9 +86,7 @@ else if ($action == 'make') {
         move_uploaded_file($readme, $mdir."/{$hashcode}-r.html") or die("您没填写说明或上传说明文件");
         $readmef = $dm->GetEncodeFile($mdir."/{$hashcode}-r.html", TRUE);
     } else {
-        $readmetxt = "<p>".$readmetxt;
         $readmetxt = preg_replace("#[\r\n]{1,}#", "<br>\r\n", $readmetxt);
-        $readmetxt .= "</p>";
         $readmef = base64_encode(trim($readmetxt));
     }
     if ($autosetup == 0) {
@@ -188,7 +186,7 @@ else if ($action == 'edit') {
     $devContent = $dhd->GetHtml();
     $devInfo = (array)json_decode($devContent);
     if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) {
-        ShowMsg("您贡献者账号已经过期，请登录www.dedebiz.com重新申请", "-1");
+        ShowMsg("修改模块失败，您贡献者账号已经过期", "-1");
         exit();
     }
     if (strlen($modulname) > 150) {
diff --git a/src/admin/templets/module_edit.htm b/src/admin/templets/module_edit.htm
index 1bf01fdf..f02105c1 100644
--- a/src/admin/templets/module_edit.htm
+++ b/src/admin/templets/module_edit.htm
@@ -53,7 +53,7 @@
 										<td>模块识别码</td>
 										<td>
 											<input type="hidden" name="hash" value="<?php echo $hash;?>">
-											<input type="text" name="hashv" value="<?php echo $hash;?>" class="admin-input-lg" disabled>（不可改）
+											<input type="text" name="hashv" value="<?php echo $hash;?>" class="admin-input-lg" disabled>
 										</td>
 									</tr>
 									<tr>