From 3eff8746bf7c411a4b13a02367531d83b38dace4 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?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Thu, 25 May 2023 19:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B0=8F=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/article_allowurl_edit.php       | 5 ++---
 src/admin/article_source_edit.php         | 5 ++---
 src/admin/article_string_mix.php          | 3 +--
 src/admin/article_writer_edit.php         | 3 +--
 src/admin/templets/album_add.htm          | 2 +-
 src/admin/templets/album_edit.htm         | 2 +-
 src/admin/templets/archives_add.htm       | 2 +-
 src/admin/templets/archives_edit.htm      | 2 +-
 src/admin/templets/archives_sg_add.htm    | 2 +-
 src/admin/templets/archives_sg_edit.htm   | 2 +-
 src/admin/templets/article_add.htm        | 2 +-
 src/admin/templets/article_edit.htm       | 2 +-
 src/admin/templets/freelist_edit.htm      | 2 +-
 src/admin/templets/friendlink_add.htm     | 2 +-
 src/admin/templets/media_add.htm          | 2 +-
 src/admin/templets/media_edit.htm         | 2 +-
 src/admin/templets/soft_add.htm           | 2 +-
 src/admin/templets/soft_edit.htm          | 2 +-
 src/admin/templets/spec_add.htm           | 2 +-
 src/admin/templets/spec_edit.htm          | 2 +-
 src/admin/templets/sys_admin_user_add.htm | 2 +-
 src/static/web/css/admin.css              | 2 +-
 src/system/libraries/oxwindow.class.php   | 2 +-
 src/theme/apps/post_diyform.htm           | 2 +-
 src/user/templets/edit_baseinfo.htm       | 2 +-
 src/user/templets/reg-new.htm             | 2 +-
 26 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/admin/article_allowurl_edit.php b/src/admin/article_allowurl_edit.php
index 30197ef8..657fdaab 100644
--- a/src/admin/article_allowurl_edit.php
+++ b/src/admin/article_allowurl_edit.php
@@ -21,7 +21,7 @@ if ($dopost == 'save') {
     flock($fp, 3);
     fwrite($fp, $allurls);
     fclose($fp);
-    echo "<script>alert('Save OK!');</script>";
+    echo "<script>alert('已保存');</script>";
 }
 //读出
 if (empty($allurls) && filesize($m_file) > 0) {
@@ -29,8 +29,7 @@ if (empty($allurls) && filesize($m_file) > 0) {
     $allurls = fread($fp, filesize($m_file));
     fclose($fp);
 }
-$wintitle = "";
-$wecome_info = "允许的超链接";
+$wecome_info = "允许站内链接";
 $win = new OxWindow();
 $win->Init('article_allowurl_edit.php', 'js/blank.js', 'POST');
 $win->AddHidden('dopost', 'save');
diff --git a/src/admin/article_source_edit.php b/src/admin/article_source_edit.php
index ce4c79a6..14b2fb40 100644
--- a/src/admin/article_source_edit.php
+++ b/src/admin/article_source_edit.php
@@ -21,7 +21,7 @@ if ($dopost == 'save') {
     flock($fp, 3);
     fwrite($fp, $allsource);
     fclose($fp);
-    echo "<script>alert('Save OK!');</script>";
+    echo "<script>alert('已保存');</script>";
 }
 //读出
 if (empty($allsource) && filesize($m_file) > 0) {
@@ -29,12 +29,11 @@ if (empty($allsource) && filesize($m_file) > 0) {
     $allsource = fread($fp, filesize($m_file));
     fclose($fp);
 }
-$wintitle = "文档来源管理";
 $wecome_info = "文档来源管理";
 $win = new OxWindow();
 $win->Init('article_source_edit.php', 'js/blank.js', 'POST');
 $win->AddHidden('dopost', 'save');
-$win->AddTitle("每行保存一个来源");
+$win->AddTitle("一行填写一个地址");
 $win->AddMsgItem("<tr><td><textarea name='allsource' id='allsource' class='admin-textarea-xl'>$allsource</textarea></td></tr>");
 $winform = $win->GetWindow('ok');
 $win->Display();
diff --git a/src/admin/article_string_mix.php b/src/admin/article_string_mix.php
index d612e2aa..a7abcfba 100644
--- a/src/admin/article_string_mix.php
+++ b/src/admin/article_string_mix.php
@@ -22,7 +22,7 @@ if ($dopost == "save") {
     flock($fp, 3);
     fwrite($fp, $allsource);
     fclose($fp);
-    echo "<script>alert('Save OK!');</script>";
+    echo "<script>alert('已保存');</script>";
 }
 //读出
 if (empty($allsource) && filesize($m_file) > 0) {
@@ -31,7 +31,6 @@ if (empty($allsource) && filesize($m_file) > 0) {
     fclose($fp);
 }
 make_hash();
-$wintitle = "防采集工具";
 $wecome_info = "防采集工具";
 $win = new OxWindow();
 $win->Init('article_string_mix.php', 'js/blank.js', 'POST');
diff --git a/src/admin/article_writer_edit.php b/src/admin/article_writer_edit.php
index bf4d11bd..fbc2e3e0 100644
--- a/src/admin/article_writer_edit.php
+++ b/src/admin/article_writer_edit.php
@@ -21,7 +21,7 @@ if ($dopost == "save") {
     flock($fp, 3);
     fwrite($fp, $allwriter);
     fclose($fp);
-    echo "<script>alert('保存成功');</script>";
+    echo "<script>alert('已保存');</script>";
 }
 //读出
 if (empty($allwriter) && filesize($m_file) > 0) {
@@ -29,7 +29,6 @@ if (empty($allwriter) && filesize($m_file) > 0) {
     $allwriter = fread($fp, filesize($m_file));
     fclose($fp);
 }
-$wintitle = "文档作者管理";
 $wecome_info = "文档作者管理";
 $win = new OxWindow();
 $win->Init('article_writer_edit.php', 'js/blank.js', 'POST');
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index 4be23bc7..525cc684 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -22,7 +22,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="album_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmitAlb();">
+		<form name="form1" action="album_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmitAlb();">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="cid" value="<?php echo $cid;?>">
 			<input type="hidden" name="imagebody" value="">
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index ff454ca8..39609738 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -22,7 +22,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="album_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmitAlb();">
+		<form name="form1" action="album_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmitAlb();">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="id" value="<?php echo $aid?>">
 			<input type="hidden" name="imagebody" value="">
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index c1267816..47582316 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="archives_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
+		<form name="form1" action="archives_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit()">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="cid" value="<?php echo $cid?>">
 			<input type="hidden" name="dopost" value="save">
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index 9bd13b32..0ec8237c 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="archives_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="archives_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="id" value="<?php echo $aid?>">
 			<input type="hidden" name="dopost" value="save">
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index a44b802e..339d96f9 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="archives_sg_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
+		<form name="form1" action="archives_sg_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit()">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="cid" value="<?php echo $cid?>">
 			<input type="hidden" name="dopost" value="save">
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index 167551f1..3ba8f0ce 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="archives_sg_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="archives_sg_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="channelid" value="<?php echo $channelid;?>">
 			<input type="hidden" name="id" value="<?php echo $aid;?>">
 			<input type="hidden" name="sortrank" value="<?php echo $addRow['senddate'];?>">
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 9b7444ed..a531a880 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -20,7 +20,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="article_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
+		<form name="form1" action="article_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit()">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="dopost" value="save">
 			<table width="98%" align="center" id="needset" class="admin-border my-3">
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index 5cdeeaee..3393d2ee 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -20,7 +20,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="article_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="id" value="<?php echo $aid?>">
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm
index 5e6da224..e23fd164 100644
--- a/src/admin/templets/freelist_edit.htm
+++ b/src/admin/templets/freelist_edit.htm
@@ -18,7 +18,7 @@
 		<script src="js/main.js"></script>
 	</head>
 	<body>
-		<form action="freelist_edit.php" method="post" name="form1" onSubmit="return CheckSubmit();">
+		<form name="form1" action="freelist_edit.php" method="post" onSubmit="return CheckSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="aid" value="<?php echo $row['aid']?>">
 			<table align="center" class="table maintable my-3">
diff --git a/src/admin/templets/friendlink_add.htm b/src/admin/templets/friendlink_add.htm
index 870232d2..408d5ed1 100644
--- a/src/admin/templets/friendlink_add.htm
+++ b/src/admin/templets/friendlink_add.htm
@@ -12,7 +12,7 @@
 		<script src="js/main.js"></script>
 	</head>
 	<body>
-		<form action="friendlink_add.php" method="post" enctype="multipart/form-data" name="form1" onSubmit="return CheckSubmit();">
+		<form name="form1" action="friendlink_add.php" method="post" enctype="multipart/form-data" onSubmit="return CheckSubmit();">
 			<input type="hidden" name="dopost" value="add">
 			<table align="center" class="table maintable my-3">
 				<tr>
diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm
index 56eaf268..01159f2b 100644
--- a/src/admin/templets/media_add.htm
+++ b/src/admin/templets/media_add.htm
@@ -12,7 +12,7 @@
 		<script src="js/main.js"></script>
 	</head>
 	<body>
-		<form enctype="multipart/form-data" name="form1" action="media_add.php" method="POST" onSubmit="return CheckSubmit();">
+		<form name="form1" action="media_add.php" method="post" enctype="multipart/form-data" onSubmit="return CheckSubmit();">
 			<input type="hidden" name="dopost" value="upload">
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<table align="center" class="table maintable my-3">
diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm
index c97b3a88..be1c2eb7 100644
--- a/src/admin/templets/media_edit.htm
+++ b/src/admin/templets/media_edit.htm
@@ -12,7 +12,7 @@
 		<script src="js/main.js"></script>
 	</head>
 	<body>
-		<form enctype="multipart/form-data" name="form1" action="media_edit.php" method="POST" onSubmit="return CheckSubmit();">
+		<form name="form1" action="media_edit.php" method="post" enctype="multipart/form-data" onSubmit="return CheckSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<input type="hidden" name="aid" value="<?php echo $aid?>">
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index 314af919..fd38f199 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="soft_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="soft_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="cid" value="<?php echo $cid;?>">
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index 11a0ad72..8e470dd3 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="soft_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="soft_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="id" value="<?php echo $aid?>">
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index 7fcaeffb..523462ed 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="spec_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="spec_add.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="dopost" value="save">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="arcrank" value="0">
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index 0fd6d976..ea9e3b87 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -19,7 +19,7 @@
 		<script src="../static/web/js/cropper.min.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="spec_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+		<form name="form1" action="spec_edit.php" method="post" enctype="multipart/form-data" onSubmit="return checkSubmit();">
 			<input type="hidden" name="id" value="<?php echo $arcRow['id']?>">
 			<input type="hidden" name="channelid" value="<?php echo $channelid?>">
 			<input type="hidden" name="arcrank" value="<?php echo $arcRow['arcrank']?>">
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index de12f56f..3d7f266b 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -12,7 +12,7 @@
 		<script src="js/main.js"></script>
 	</head>
 	<body>
-		<form name="form1" action="sys_admin_user_add.php" onSubmit="return checkSubmit();" method="post">
+		<form name="form1" action="sys_admin_user_add.php" method="post" onSubmit="return checkSubmit();">
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<input type="hidden" name="dopost" value="add">
 			<table align="center" class="table maintable my-3">
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 2a09e645..7c8a7650 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -63,7 +63,7 @@ table tr:last-child td:last-child {
 	border-bottom-right-radius:.5rem;
 	border-bottom:0
 }
-label {
+form,label {
 	margin-bottom:0
 }
 input {
diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php
index 1ad83087..37994ff1 100755
--- a/src/system/libraries/oxwindow.class.php
+++ b/src/system/libraries/oxwindow.class.php
@@ -39,7 +39,7 @@ class OxWindow
         }
         $this->myWin .= "</script>";
         $this->formName = $formname;
-        $this->myWin .= "<form name='$formname' method='$formmethod' onSubmit='return CheckSubmit();' action='$formaction'>";
+        $this->myWin .= "<form name='$formname' action='$formaction' method='$formmethod' onSubmit='return CheckSubmit();'>";
     }
     /**
      *  添加隐藏域
diff --git a/src/theme/apps/post_diyform.htm b/src/theme/apps/post_diyform.htm
index 8bf1cd81..fb3a9eed 100644
--- a/src/theme/apps/post_diyform.htm
+++ b/src/theme/apps/post_diyform.htm
@@ -26,7 +26,7 @@
 						</ul>
 						<span class="navbar-text"><a href="/apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">返回列表</a></span>
 					</nav>
-					<form name="addcontent" action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data" method="post">
+					<form name="addcontent" action="<?php echo $cfg_cmspath;?>/apps/diy.php" method="post" enctype="multipart/form-data">
 						<input type="hidden" name="action" value="post">
 						<input type="hidden" name="diyid" value="<?php echo $diyid;?>">
 						<input type="hidden" name="do" value="2">
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index 56046631..2bf659a5 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -21,7 +21,7 @@
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
-						<form action="edit_baseinfo.php" method="post" enctype="multipart/form-data" name="form2" onsubmit="return checkSubmit();">
+						<form name="form2" action="edit_baseinfo.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">
 							<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 							<input type="hidden" name="dopost" value="save">
 							<input type="hidden" id="newface" name="newface" value="">
diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm
index bcf895cb..64a56449 100755
--- a/src/user/templets/reg-new.htm
+++ b/src/user/templets/reg-new.htm
@@ -18,7 +18,7 @@
 					<div class="login-from d-inline-block">
 						<div class="login-box shadow-sm rounded text-left">
 							<h2 class="text-center mb-3">会员注册</h2>
-							<form method="post" action="reg_new.php" id="regUser" name="form2" onsubmit="return CheckSubmit();">
+							<form name="form2" action="reg_new.php" method="post" id="regUser" onsubmit="return CheckSubmit();">
 								<input type="hidden" name="dopost" value="regbase">
 								<input type="hidden" name="step" value="1">
 								<input type="hidden" name="mtype" value="个人">