调整修改和发布文档验证标题和提示调整，其他细节调整

src/admin/album_add.php

@@ -49,8 +49,12 @@ if ($dopost != 'save') {
     if (!isset($albums)) $albums = "";
     if (!isset($delzip)) $delzip = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click);
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/album_edit.php

@@ -62,8 +62,12 @@ if ($dopost != 'save') {
     if (!isset($formzip)) $formzip = 0;
     if (!isset($ddisfirst)) $ddisfirst = 0;
     if (!isset($delzip)) $delzip = 0;
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/archives_add.php

@@ -49,8 +49,12 @@ if ($dopost != 'save') {
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click);
-    if ($typeid == 0) {
-        ShowMsg('请指定文档的栏目', '-1');
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/archives_do.php

@@ -486,7 +486,7 @@ else if ($dopost == 'quickEdit') {
             <?php
             $typeOptions = GetOptionList($arcRow['typeid'], $cuserLogin->getUserChannel(), $arcRow['channel']);
             echo "<select name='typeid' class='admin-input-sm'>";
-            if ($arcRow["typeid"] == "0") echo "<option value='0' selected>请选择栏目</option>";
+            if ($arcRow["typeid"] == "0") echo "<option value='0' selected>请选择文档栏目</option>";
             echo $typeOptions;
             echo "</select>";
             ?>

src/admin/archives_edit.php

@@ -48,8 +48,12 @@ if ($dopost != 'save') {
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
     if (!isset($writer)) $writer = '';
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/archives_sg_add.php

@@ -37,8 +37,12 @@ if ($dopost != 'save') {
 } else if ($dopost == 'save') {
     require_once(DEDEINC.'/image.func.php');
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/archives_sg_edit.php

@@ -34,8 +34,12 @@ if ($dopost != 'save') {
 } else if ($dopost == 'save') {
     require_once(DEDEINC.'/image.func.php');
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/article_add.php

@@ -51,8 +51,12 @@ if ($dopost != 'save') {
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click);
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
     if (empty($typeid)) {
-        ShowMsg("请指定文档的栏目", "-1");
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {
@@ -100,10 +104,6 @@ if ($dopost != 'save') {
         ShowMsg("获取主键失败，无法进行后续操作", "-1");
         exit();
     }
-    if (trim($title) == '') {
-        ShowMsg('标题不能为空', '-1');
-        exit();
-    }
     //处理body字段自动摘要、自动提取缩略图等
     $body = AnalyseHtmlBody($body, $description, $litpic, $keywords, 'htmltext');
     //自动分页

src/admin/article_edit.php

@@ -54,8 +54,12 @@ if ($dopost != 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
     if (empty($typeid)) {
-        ShowMsg("请指定文档的栏目", "-1");
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/js/album.js

@@ -28,7 +28,7 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) {
 	picnameObj.value = '';
 	newobj = $Obj('uploadwait');
 	if (!newobj) {
-		newobj = document.createElement("DIV");
+		newobj = document.createElement("div");
 		newobj.id = 'uploadwait';
 		newobj.style.position = 'absolute';
 		newobj.className = 'uploadwait';

src/admin/js/main.js

@@ -32,7 +32,7 @@ function SeePicNew(f, imgdid, frname, hpos, acname) {
 	picnameObj.value = '';
 	newobj = $Obj('uploadwait');
 	if (!newobj) {
-		newobj = document.createElement("DIV");
+		newobj = document.createElement("div");
 		newobj.id = 'uploadwait';
 		newobj.style.position = 'absolute';
 		newobj.className = 'uploadwait';
@@ -82,11 +82,11 @@ function SelectKeywords(f) {
 }
 function OpenMyWin(surl) {
 	var pos = GetWinPos(800,600);
-	window.open(surl, "popUpMyWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left="+pos.left+", top="+pos.top);
+	window.open(surl, "popUpMyWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
 }
 function OpenMyWinCoOne(surl) {
 	var pos = GetWinPos(800,600);
-	window.open(surl, "popUpMyWin2", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left="+pos.left+",top="+pos.top);
+	window.open(surl, "popUpMyWin2", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ",top=" + pos.top);
 }
 function InitPage() {
 	var selsource = $Obj('selsource');
@@ -165,7 +165,7 @@ function ChangeFullDiv(showhide, screenheigt) {
 	var newobj = $Obj('fullpagediv');
 	if (showhide == 'show') {
 		if (!newobj) {
-			newobj = document.createElement("DIV");
+			newobj = document.createElement("div");
 			newobj.id = 'fullpagediv';
 			newobj.style.position = 'absolute';
 			newobj.className = 'fullpagediv';
@@ -201,7 +201,7 @@ function LoadNewDiv(e, surl, oname) {
 	posLeft = posLeft - 100;
 	var newobj = $Obj(oname);
 	if (!newobj) {
-		newobj = document.createElement("DIV");
+		newobj = document.createElement("div");
 		newobj.id = oname;
 		newobj.style.position = 'absolute';
 		newobj.className = oname;
@@ -221,7 +221,7 @@ function LoadNewDiv2(e, surl, oname, dlgcls) {
 	var posTop = 50;
 	var newobj = $Obj(oname);
 	if (!newobj) {
-		newobj = document.createElement("DIV");
+		newobj = document.createElement("div");
 		newobj.id = oname;
 		newobj.style.position = 'absolute';
 		newobj.className = dlgcls;
@@ -262,7 +262,7 @@ function CkRemote() {
 function LoadQuickDiv(e, surl, oname, w, h) {
 	var newobj = $Obj(oname);
 	if (!newobj) {
-		newobj = document.createElement("DIV");
+		newobj = document.createElement("div");
 		newobj.id = oname;
 		newobj.style.position = 'fixed';
 		newobj.className = 'pubdlg';
@@ -407,10 +407,9 @@ function DedeConfirm(content="",title="确认提示") {
 //函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
 	title = "系统提示";
-	size = "";
 	if (typeof content == "undefined") content = "";
 	modalID = guid();
-	var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
+	var footer = `<button type="button" class="btn btn-primary btn-sm" onClick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
 	var noClose = false;
 	if (args.length == 1) {
 		//存在args参数

src/admin/soft_add.php

@@ -46,8 +46,12 @@ if ($dopost != 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/soft_edit.php

@@ -75,8 +75,12 @@ if ($dopost != 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
-    if ($typeid == 0) {
-        ShowMsg("请指定文档的栏目", "-1");
+    if (trim($title) == '') {
+        ShowMsg("请输入文档标题", "-1");
+        exit();
+    }
+    if (empty($typeid)) {
+        ShowMsg("请选择文档栏目", "-1");
         exit();
     }
     if (empty($channelid)) {

src/admin/templets/album_add.htm

@@ -134,7 +134,7 @@
 										<?php
 										$typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
 										echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-										echo "<option value='0'>请选择栏目</option>";
+										echo "<option value='0'>请选择文档栏目</option>";
 										echo $typeOptions;
 										echo "</select>";
 										?>
@@ -368,9 +368,6 @@
 			</table>
 		</form>
 		<script>
-			var swfu = null;
-			var vcc = 0;
-			var albums = [];
 			function checkSubmit() {
 				if (document.form1.title.value == "") {
 					ShowMsg("请输入文档标题");
@@ -383,7 +380,7 @@
 			}
 		</script>
 		<script>
-			$("#iptAlbumImages").change(function(val){
+			$("#iptAlbumImages").change(function(val) {
 				for (let i = 0; i < val.target.files.length; i++) {
 					const f = val.target.files[i];
 					var formData = new FormData();

src/admin/templets/album_edit.htm

@@ -410,9 +410,6 @@
 			</table>
 		</form>
 		<script>
-			var swfu = null;
-			var vcc = 0;
-			var albums = [];
 			function checkSubmit() {
 				if (document.form1.title.value == "") {
 					ShowMsg("请输入文档标题");
@@ -422,7 +419,7 @@
 			}
 		</script>
 		<script>
-			$(".atlasedit").change(function(val){
+			$(".atlasedit").change(function(val) {
 				var formData = new FormData();
 				var fileData = val.target.files[0];
 				formData.append('file', fileData);
@@ -445,7 +442,7 @@
 					}
 				});
 			})
-			$("#iptAlbumImages").change(function(val){
+			$("#iptAlbumImages").change(function(val) {
 				for (let i = 0; i < val.target.files.length; i++) {
 					const f = val.target.files[i];
 					var formData = new FormData();

src/admin/templets/archives_add.htm

@@ -135,7 +135,7 @@
 										<?php
 										$typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
 										echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-										echo "<option value='0'>请选择栏目</option>";
+										echo "<option value='0'>请选择文档栏目</option>";
 										echo $typeOptions;
 										echo "</select>";
 										?>

src/admin/templets/archives_edit.htm

@@ -138,7 +138,7 @@
 									<?php
 									$typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
 									echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-									if ($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目</option>";
+									if ($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/admin/templets/archives_sg_add.htm

@@ -88,7 +88,7 @@
 										<?php
 										$typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
 										echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-										echo "<option value='0'>请选择栏目</option>";
+										echo "<option value='0'>请选择文档栏目</option>";
 										echo $typeOptions;
 										echo "</select>";
 										?>

src/admin/templets/archives_sg_edit.htm

@@ -91,7 +91,7 @@
 									<?php
 									$typeOptions = GetOptionList($addRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
 									echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-									if ($addRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目</option>";
+									if ($addRow["typeid"]=="0") echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/admin/templets/article_add.htm

@@ -128,7 +128,7 @@
 										<?php
 										$typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
 										echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-										echo "<option value='0'>请选择栏目</option>";
+										echo "<option value='0'>请选择文档栏目</option>";
 										echo $typeOptions;
 										echo "</select>";
 										?>
@@ -316,9 +316,7 @@
 				</tr>
 			</table>
 		</form>
-		<div id="__tmpbody" style="display:none"></div>
 		<script>
-			var arctype = 'article';
 			function checkSubmit() {
 				if (document.form1.title.value == "") {
 					ShowMsg("请输入文档标题");

src/admin/templets/article_edit.htm

@@ -134,7 +134,7 @@
 									<?php
 									$typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
 									echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-									if ($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目</option>";
+									if ($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>
@@ -299,10 +299,7 @@
 				</tr>
 			</table>
 		</form>
-		<div id="__tmpbody" style="display:none"></div>
 		<script>
-			var swfu = null;
-			var arctype = 'article';
 			function checkSubmit() {
 				if (document.form1.title.value == "") {
 					ShowMsg("请输入文档标题");

src/admin/templets/soft_add.htm

@@ -128,7 +128,7 @@
 										<?php
 										$typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
 										echo "<select name='typeid' id='typeid' class='admin-input-sm'>";
-										echo "<option value='0'>请选择栏目</option>";
+										echo "<option value='0'>请选择文档栏目</option>";
 										echo $typeOptions;
 										echo "</select>";
 										?>
@@ -476,6 +476,8 @@
 					return false;
 				}
 			}
+		</script>
+		<script>
 			var startNum = 0;
 			function MakeUpload() {
 				var upfield = document.getElementById("uploadfield");

src/admin/templets/soft_edit.htm

@@ -437,6 +437,8 @@
 					return false;
 				}
 			}
+		</script>
+		<script>
 			var startNum = <?php echo $newRowStart?>;
 			function MakeUpload() {
 				var upfield = document.getElementById('uploadfield');

src/admin/templets/spec_add.htm

@@ -296,6 +296,8 @@
 					}
 				}
 			}
+		</script>
+		<script>
 			function SelectArcList(fname) {
 				var pos = GetWinPos(800,600);
 				window.open("content_select_list.php?f=" + fname, "selArcList", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);

src/admin/templets/spec_edit.htm

@@ -361,6 +361,8 @@
 					return false;
 				}
 			}
+		</script>
+		<script>
 			function SelectTemplets(fname) {
 				var pos = GetWinPos(800,600);
 				window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);

src/static/web/css/admin.css

@@ -375,7 +375,7 @@ body.hidemenu .body-right {
 	padding:.5rem;
 	width:120px;
 	background:#fff;
-	border:2px solid #1eb867;
+	border:2px solid #dee2e6;
 	z-index:10005
 }
 .wsselect {
@@ -385,7 +385,7 @@ body.hidemenu .body-right {
 }
 .pubdlg {
 	background:#fff;
-	border:2px solid #1eb867;
+	border:2px solid #dee2e6;
 	z-index:8888
 }
 .pubdlg .title {
@@ -402,7 +402,7 @@ body.hidemenu .body-right {
 	left:0;
 	width:100%;
 	height:100%;
-	background:#cdcdcd;
+	background:#f5f5f5;
 	opacity:.6;
 	z-index:1999
 }
@@ -440,7 +440,7 @@ body.hidemenu .body-right {
 .mysource,.mywriter {
 	width:300px;
 	background:#fff;
-	border:2px solid #1eb867;
+	border:2px solid #dee2e6;
 	z-index:10001
 }
 #uploadfield {
@@ -485,6 +485,9 @@ body.hidemenu .body-right {
 	word-break:break-all;
 	word-wrap:break-word
 }
+.modal-title {
+	font-size:14px
+}
 .maintable {
 	width:98%!important;
 	border:1px solid #dee2e6!important

src/static/web/js/user.js

@@ -1,11 +1,11 @@
 function checkSubmit(t) {
     if (document.addcontent.title.value == "") {
-        ShowMsg(`${t}不能为空`);
+        ShowMsg(`请输入文档标题`);
         document.addcontent.title.focus();
         return false;
     }
     if (document.addcontent.typeid.value == 0) {
-        ShowMsg("请您选择文档所属栏目");
+        ShowMsg("请选择文档栏目");
         return false;
     }
 }

src/system/typelink/typelink.class.php

@@ -156,7 +156,7 @@ class TypeLink
             $typeinfos['sitepath']
         );
     }
-    //获得类别列表：hid是指默认选中栏目，0表示请选择栏目或不限栏目，oper是会员允许管理的栏目，0表示所有栏目，channeltype是指栏目的文档类型，0表示不限栏目
+    //获得类别列表：hid是指默认选中栏目，0表示请选择文档栏目或不限栏目，oper是会员允许管理的栏目，0表示所有栏目，channeltype是指栏目的文档类型，0表示不限栏目
     function GetOptionArray($hid = 0, $oper = 0, $channeltype = 0, $usersg = 0)
     {
         return $this->GetOptionList($hid, $oper, $channeltype, $usersg);

src/user/inc/archives_check.php

@@ -16,8 +16,12 @@ CheckCSRF();
 $flag = '';
 $autokey = $remote = $dellink = $autolitpic = 0;
 $userip = GetIP();
-if ($typeid == 0) {
-    ShowMsg('您还没选择栏目，请选择发布文档栏目', '-1');
+if (trim($title) == '') {
+    ShowMsg("请输入文档标题", "-1");
+    exit();
+}
+if (empty($typeid)) {
+    ShowMsg("请选择文档栏目", "-1");
     exit();
 }
 $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend as cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$typeid' ";

src/user/inc/archives_check_edit.php

@@ -14,8 +14,12 @@ require_once(DEDEINC."/libraries/oxwindow.class.php");
 $flag = '';
 $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;
 $userip = GetIP();
-if ($typeid == 0) {
-    ShowMsg('您还没选择栏目，请选择发布文档栏目', '-1');
+if (trim($title) == '') {
+    ShowMsg("请输入文档标题", "-1");
+    exit();
+}
+if (empty($typeid)) {
+    ShowMsg("请选择文档栏目", "-1");
     exit();
 }
 //校验CSRF
@@ -50,7 +54,7 @@ $mid = $cfg_ml->M_ID;
 $midQuery = "SELECT mid FROM `#@__arctiny` WHERE id='$aid'";
 $midRow = $dsql->GetOne($midQuery);
 if ($midRow['mid'] != $mid) {
-    ShowMsg('您暂无权限在这里进行修改文档', 'javascript:;');
+    ShowMsg("您暂无权限修改文档", "javascript:;");
     exit;
 }
 $isadmin = ($cfg_ml->fields['matt'] == 10 ? true : false);

src/user/inc/inc_pwd_functions.php

@@ -76,17 +76,17 @@ function newmail($mid, $userid, $mailto, $type, $send)
     $randval = random(8);
     $mailtitle = $cfg_webname.":密码修改";
     $mailto = $mailto;
-    $headers = "From: ".$cfg_adminemail."\r\nReply-To: $cfg_adminemail";
-    $mailbody = "尊敬的会员".$userid."，临时登录密码：".$randval."\r\n请三天内修改登录密码：".$cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid;
+    $headers = "From:".$cfg_adminemail."\r\nReply-To:$cfg_adminemail";
+    $mailbody = "尊敬的".$userid."会员，临时登录密码：".$randval."\r\n请在三天内修改登录密码：".$cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid;
     if ($type == 'INSERT') {
         $key = md5($randval);
         $sql = "INSERT INTO `#@__pwd_tmp` (`mid` ,`membername` ,`pwd` ,`mailtime`) VALUES ('$mid', '$userid',  '$key', '$mailtime');";
         if ($db->ExecuteNoneQuery($sql)) {
             if ($send == 'Y') {
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
-                return ShowMsg('修改验证码已经发送到原来的邮箱请查收', 'login.php', '', '5000');
+                return ShowMsg('验证码已经发送到原来的邮箱，请注意查收', 'login.php', '', '5000');
             } else if ($send == 'N') {
-                return ShowMsg('稍后跳转修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
+                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             return ShowMsg('修改失败，请联系管理员', 'login.php');
@@ -99,7 +99,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
                 ShowMsg('修改验证码已经发送到原来的邮箱请查收', 'login.php');
             } elseif ($send === 'N') {
-                return ShowMsg('稍后跳转修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
+                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             ShowMsg('修改失败，请与管理员联系', 'login.php');
@@ -137,8 +137,8 @@ function sn($mid, $userid, $mailto, $send = 'Y')
     $dtime = time();
     $sql = "SELECT * FROM `#@__pwd_tmp` WHERE mid = '$mid'";
     $row = $db->GetOne($sql);
+    //发送新邮件
     if (!is_array($row)) {
-        //发送新邮件
         newmail($mid, $userid, $mailto, 'INSERT', $send);
     }
     //10分钟后可以再次发送新验证码

src/user/templets/album_add.htm

@@ -56,7 +56,7 @@
 									<?php
 									$typeOptions = GetOptionList(0,$channelid);
 									echo "<select name='typeid'  class='form-control'>";
-									echo "<option value='0' selected>请选择栏目</option>";
+									echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/user/templets/album_edit.htm

@@ -128,9 +128,7 @@
 			</div>
 		</main>
 		<?php obtaintheme('foot.htm');?>
-		<script>
-			startNum = <?php echo $j;?>;
-		</script>
+		<script>startNum = <?php echo $j;?>;</script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>
 </html>

src/user/templets/archives_add.htm

@@ -54,7 +54,7 @@
 									<?php
 									$typeOptions = GetOptionList(0,$channelid);
 									echo "<select name='typeid'  class='form-control'>";
-									echo "<option value='0' selected>请选择栏目</option>";
+									echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/user/templets/archives_sg_add.htm

@@ -54,7 +54,7 @@
 									<?php
 									$typeOptions = GetOptionList(0,$channelid);
 									echo "<select name='typeid' class='form-control'>";
-									echo "<option value='0' selected>请选择栏目</option>";
+									echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/user/templets/article_add.htm

@@ -54,7 +54,7 @@
 									<?php
 									$typeOptions = GetOptionList(0,$channelid);
 									echo "<select name='typeid' class='form-control'>";
-									echo "<option value='0' selected>请选择栏目</option>";
+									echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>

src/user/templets/soft_add.htm

@@ -54,7 +54,7 @@
 									<?php
 									$typeOptions = GetOptionList(0,$channelid);
 									echo "<select name='typeid' class='form-control'>";
-									echo "<option value='0' selected>请选择栏目</option>";
+									echo "<option value='0' selected>请选择文档栏目</option>";
 									echo $typeOptions;
 									echo "</select>";
 									?>