调整发布按钮排序，调整文档分页路径错误

src/admin/album_add.php

@@ -226,7 +226,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改图片文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理图片文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改图片文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理图片文档</a>$backurl</td>
     </tr>";
     $msg = "{$msg}".GetUpdateTest();
     $wintitle = "成功发布图片文档";

src/admin/album_edit.php

@@ -268,7 +268,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改图片文档</a><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理图片文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改图片文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理图片文档</a>$backurl</td>
     </tr>";
     $wintitle = "成功修改图片文档";
     $wecome_info = "文档管理 - 修改图片文档";

src/admin/archives_add.php

@@ -172,7 +172,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改自定义文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览自定义文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理自定义文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览自定义文档</a><a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改自定义文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理自定义文档</a>$backurl</td>
     </tr>";
     $msg = "{$msg}".GetUpdateTest();
     $wintitle = "成功发布自定义文档";

src/admin/archives_edit.php

@@ -157,7 +157,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改自定义文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看自定义文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理自定义文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览自定义文档</a><a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改自定义文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理自定义文档</a>$backurl</td>
     </tr>";
     $wintitle = "成功修改自定义文档";
     $wecome_info = "文档管理 - 修改自定义文档";

src/admin/archives_sg_add.php

@@ -127,7 +127,7 @@ if ($dopost != 'save') {
     ClearMyAddon($arcID, $title);
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改分类文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='content_sg_list.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理分类文档</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改分类文档</a><a href='content_sg_list.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理分类文档</a></td>
     </tr>";
     $wintitle = "成功发布分类文档";
     $wecome_info = "文档管理 - 发布分类文档";

src/admin/archives_sg_edit.php

@@ -110,7 +110,7 @@ if ($dopost != 'save') {
     ClearMyAddon($id, $title);
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改分类文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='catalog_do.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理分类文档</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改分类文档</a><a href='catalog_do.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理分类文档</a></td>
     </tr>";
     $wintitle = "成功修改分类文档";
     $wecome_info = "文档管理 - 修改分类文档";

src/admin/article_add.php

@@ -199,7 +199,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a></td>
     </tr>";
     $msg = "{$msg}".GetUpdateTest();
     $wintitle = "成功发布文档";

src/admin/article_edit.php

@@ -171,7 +171,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>$backurl</td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a></td>
     </tr>";
     $wintitle = "成功修改文档";
     $wecome_info = "文档管理 - 修改文档";

src/admin/soft_add.php

@@ -231,7 +231,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改软件文档</a><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理软件文档</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改软件文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理软件文档</a></td>
     </tr>";
     $msg = "{$msg}".GetUpdateTest();
     $wintitle = "成功发布软件文档";

src/admin/soft_edit.php

@@ -213,7 +213,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改软件文档</a><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理软件文档</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改软件文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理软件文档</a></td>
     </tr>";
     $wintitle = "成功修改软件文档";
     $wecome_info = "文档管理 - 修改软件文档";

src/admin/spec_add.php

@@ -177,7 +177,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='spec_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布专题</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改专题</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览专题</a><a href='content_s_list.php' class='btn btn-success btn-sm'>管理专题</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览专题</a><a href='spec_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布专题</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改专题</a><a href='content_s_list.php' class='btn btn-success btn-sm'>管理专题</a></td>
     </tr>";
     $wintitle = "成功发布专题";
     $wecome_info = "专题管理 - 发布专题";

src/admin/spec_edit.php

@@ -190,7 +190,7 @@ if ($dopost != 'save') {
     }
     //返回成功信息
     $msg = "<tr>
-        <td bgcolor='#f5f5f5' align='center'><a href='spec_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布专题</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改专题</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览专题</a><a href='content_s_list.php' class='btn btn-success btn-sm'>管理专题</a></td>
+        <td bgcolor='#f5f5f5' align='center'><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览专题</a><a href='spec_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布专题</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改专题</a><a href='content_s_list.php' class='btn btn-success btn-sm'>管理专题</a></td>
     </tr>";
     $wintitle = "成功修改专题";
     $wecome_info = "专题管理 - 修改专题";

src/admin/templets/stepselect_showajax.htm

@@ -7,7 +7,7 @@ if ($action=='edit') {
 <form action="stepselect_main.php" method="post" <?php echo $sbjs;?>>
 	<input type="hidden" name="action" value="edit_save">
 	<input type="hidden" name="id" value="<?php echo $arr['id'];?>">
-	<div class="pb-3"><label>类别名：<input type="text" name="itemname" value="<?php echo $arr['itemname'];?>" class="admin-input-lg"></label></div>
+	<div class="pb-3"><label>类别名：<input type="text" name="itemname" class="admin-input-lg" value="<?php echo $arr['itemname'];?>"></label></div>
 	<div class="pb-3">
 		<label>缓存名：<input type="text" name="egroup" value="<?php echo $arr['egroup'];?>" class="admin-input-lg"></label>
 		<span>（缓存组名必须用英文或数字）</span>
@@ -22,9 +22,9 @@ if ($action=='edit') {
 ?>
 <form action="stepselect_main.php" method="post">
 	<input type="hidden" name="action" value="addnew_save">
-	<div class="pb-3"><label>类别名：<input type="text" name="itemname" class="admin-input-lg"></label></div>
+	<div class="pb-3"><label>类别名：<input type="text" name="itemname" class="admin-input-lg" required="required"></label></div>
 	<div class="pb-3">
-		<label>缓存名：<input type="text" name="egroup" class="admin-input-lg"></label>
+		<label>缓存名：<input type="text" name="egroup" class="admin-input-lg" required="required"></label>
 		<span>（缓存组名必须用英文或数字）</span>
 	</div>
 	<div class="text-center">
@@ -53,7 +53,7 @@ if ($action=='edit') {
 			<?php echo $options;?>
 		</select>
 	</div>
-	<div class="pb-3"><label>枚举名：<input type="text" name="ename" class="admin-input-lg"></label></div>
+	<div class="pb-3"><label>枚举名：<input type="text" name="ename" class="admin-input-lg" required="required"></label></div>
 	<div class="pb-3">
 		<label>排序值：<input type="text" name="disorder" class="admin-input-lg"></label>
 		<span>（如果不指定，默认以枚举添加先后来排序）</span>

src/system/archive/archives.class.php

@@ -238,7 +238,7 @@ class Archives
             }
             $this->Fields['picname'] = $this->Fields['litpic'];
             //模板里直接使用{dede:field name='image'/}获取缩略图
-            $this->Fields['image'] = (!preg_match('/jpg|gif|png/i', $this->Fields['picname']) ? '' : "<img src='{$this->Fields['picname']}' />");
+            $this->Fields['image'] = (!preg_match('/jpg|gif|png/i', $this->Fields['picname']) ? '' : "<img src='{$this->Fields['picname']}'>");
         }
         //处理投票选项
         if (isset($this->Fields['voteid']) && !empty($this->Fields['voteid'])) {
@@ -352,8 +352,8 @@ class Archives
                     if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."($i)";
                 }
                 if ($i > 1) {
-                    $TRUEfilename = $this->GetTruePath().$fileFirst."_".$i.".".$this->ShortName;
-                    $URLFilename = $fileFirst."_".$i.".".$this->ShortName;
+                    $TRUEfilename = $this->GetTruePath().$fileFirst."-".$i.".".$this->ShortName;
+                    $URLFilename = $fileFirst."-".$i.".".$this->ShortName;
                 } else {
                     $TRUEfilename = $this->GetTruePath().$filename;
                     $URLFilename = $filename;
@@ -412,11 +412,11 @@ class Archives
      */
     function GetField($fname, $ctag)
     {
-        //所有Field数组 OR 普通Field
+        //所有Field数组OR普通Field
         if ($fname == 'array') {
             return $this->Fields;
         }
-        //指定了ID的节点
+        //指定了id的节点
         else if ($ctag->GetAtt('noteid') != '') {
             if (isset($this->Fields[$fname.'_'.$ctag->GetAtt('noteid')])) {
                 return $this->Fields[$fname.'_'.$ctag->GetAtt('noteid')];
@@ -489,7 +489,7 @@ class Archives
             if ($GLOBALS['cfg_jump_once'] == 'N') {
                 $pageHtml = "<html>\r\n<head>\r\n<meta charset=".$GLOBALS['cfg_soft_lang']."\">\r\n<title>".$this->Fields['title']."</title>\r\n";
                 $pageHtml .= "<meta http-equiv=\"refresh\" content=\"3;URL=".$this->Fields['redirecturl']."\">\r\n</head>\r\n<body>\r\n";
-                $pageHtml .= "正在前往文档：".$this->Fields['title']."<br><br>\r\n文档描述：".$this->Fields['description']."\r\n</body>\r\n</html>\r\n";
+                $pageHtml .= "<p>正在前往文档：".$this->Fields['title']."<p>\r\n<p>文档描述：".$this->Fields['description']."</p>\r\n</body>\r\n</html>";
                 echo $pageHtml;
             } else {
                 header("location:{$this->Fields['redirecturl']}");
@@ -750,7 +750,106 @@ class Archives
         return $rs;
     }
     /**
-     *  获得动态页面分页列表
+     *  获得动态文档分页标题
+     *
+     * @access    public
+     * @param     string  $styleName  类型名称
+     * @param     string  $pageNo  页码数
+     * @return    string
+     */
+    function GetPageTitlesDM($styleName, $pageNo)
+    {
+        if ($this->TotalPage == 1) {
+            return "";
+        }
+        if (count($this->SplitTitles) == 0) {
+            return "";
+        }
+        $i = 1;
+        $aid = $this->ArcID;
+        if ($styleName == 'link') {
+            $revalue = "";
+            foreach ($this->SplitTitles as $k => $v) {
+                if ($i == 1) {
+                    $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>$v</a>\r\n";
+                } else {
+                    if ($pageNo == $i) {
+                        $revalue .= " $v \r\n";
+                    } else {
+                        $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>$v</a>\r\n";
+                    }
+                }
+                $i++;
+            }
+        } else {
+            $revalue = "<select id='dedepagetitles' onchange='location.href=this.options[this.selectedIndex].value;'>\r\n";
+            foreach ($this->SplitTitles as $k => $v) {
+                if ($i == 1) {
+                    $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>{$i}、{$v}</option>\r\n";
+                } else {
+                    if ($pageNo == $i) {
+                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i' selected>{$i}、{$v}</option>\r\n";
+                    } else {
+                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>{$i}、{$v}</option>\r\n";
+                    }
+                }
+                $i++;
+            }
+            $revalue .= "</select>\r\n";
+        }
+        return $revalue;
+    }
+    /**
+     *  获得静态文档分页标题
+     *
+     * @access    public
+     * @param     string  $styleName  类型名称
+     * @param     string  $pageNo  页码数
+     * @return    string
+     */
+    function GetPageTitlesST($styleName, $pageNo)
+    {
+        if ($this->TotalPage == 1) {
+            return "";
+        }
+        if (count($this->SplitTitles) == 0) {
+            return "";
+        }
+        $i = 1;
+        if ($styleName == 'link') {
+            $revalue = "";
+            foreach ($this->SplitTitles as $k => $v) {
+                if ($i == 1) {
+                    $revalue .= "<a href='".$this->NameFirst.".".$this->ShortName."'>$v</a>\r\n";
+                } else {
+                    if ($pageNo == $i) {
+                        $revalue .= " $v \r\n";
+                    } else {
+                        $revalue .= "<a href='".$this->NameFirst."-".$i.".".$this->ShortName."'>$v</a>\r\n";
+                    }
+                }
+                $i++;
+            }
+        } else {
+            $revalue = "<select id='dedepagetitles' onchange='location.href=this.options[this.selectedIndex].value;'>\r\n";
+            foreach ($this->SplitTitles as $k => $v) {
+                if ($i == 1) {
+                    $revalue .= "<option value='".$this->NameFirst.".".$this->ShortName."'>{$i}、{$v}</option>\r\n";
+                } else {
+                    if ($pageNo == $i) {
+                        $revalue .= "<option value='".$this->NameFirst."-".$i.".".$this->ShortName."' selected>{$i}、{$v}</option>\r\n";
+                    } else {
+                        $revalue .= "<option value='".$this->NameFirst."-".$i.".".$this->ShortName."'>{$i}、{$v}</option>\r\n";
+                    }
+                }
+                $i++;
+            }
+            $revalue .= "</select>\r\n";
+        }
+        return $revalue;
+    }
+    /**
+     *  获得动态文档分页列表
      *
      * @access    public
      * @param     int   $totalPage  总页数
@@ -768,38 +867,38 @@ class Archives
         $nPage = $nowPage - 1;
         $lPage = $nowPage + 1;
         if ($nowPage == 1) {
-            $PageList .= "<li class='page-item disabled'><a class='page-link' href='javascript:;'>上一页</a></li>";
+            $PageList .= "<li class='page-item disabled'><span class='page-link'>上一页</span></li>";
         } else {
             if ($nPage == 1) {
-                $PageList .= "<li class='page-item'><a class='page-link' href='view.php?aid=$aid'>上一页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid'>上一页</a></li>";
                 if ($cfg_rewrite == 'Y') {
-                    $PageList = preg_replace("#.php\?aid=(\d+)#i", '-\\1-1.html', $PageList);
+                    $PageList = preg_replace("#.php\?aid=(\d+)#i", "-\\1-1.html", $PageList);   
                 }
             } else {
-                $PageList .= "<li class='page-item'><a class='page-link' href='view.php?aid=$aid&pageno=$nPage'>上一页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$nPage'>上一页</a></li>";
                 if ($cfg_rewrite == 'Y') {
                     $PageList = str_replace(".php?aid=", "-", $PageList);
-                    $PageList =  preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList);
+                    $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList);
                 }
             }
         }
         for ($i = 1; $i <= $totalPage; $i++) {
             if ($i == 1) {
                 if ($nowPage != 1) {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='view.php?aid=$aid'>1</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid'>1</a></li>";
                     if ($cfg_rewrite == 'Y') {
-                        $PageList = preg_replace("#.php\?aid=(\d+)#i", '-\\1-1.html', $PageList);
+                        $PageList = preg_replace("#.php\?aid=(\d+)#i", "-\\1-1.html", $PageList);
                     }
                 } else {
-                    $PageList .= "<li class='page-item active'><a class='page-link'>1</a></li>";
+                    $PageList .= "<li class='page-item active'><span class='page-link'>1</span></li>";
                 }
             } else {
                 $n = $i;
                 if ($nowPage != $i) {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='view.php?aid=$aid&pageno=$i'>".$n."</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>{$n}</a></li>";
                     if ($cfg_rewrite == 'Y') {
                         $PageList = str_replace(".php?aid=", "-", $PageList);
-                        $PageList =  preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList);
+                        $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList);
                     }
                 } else {
                     $PageList .= "<li class='page-item active'><span class='page-link'>{$n}</span></li>";
@@ -807,10 +906,10 @@ class Archives
             }
         }
         if ($lPage <= $totalPage) {
-            $PageList .= "<li class='page-item'><a class='page-link' href='view.php?aid=$aid&pageno=$lPage'>下一页</a></li>";
+            $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$lPage'>下一页</a></li>";
             if ($cfg_rewrite == 'Y') {
                 $PageList = str_replace(".php?aid=", "-", $PageList);
-                $PageList =  preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList);
+                $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList);
             }
         } else {
             $PageList .= "<li class='page-item'><span class='page-link'>下一页</span></li>";
@@ -818,7 +917,7 @@ class Archives
         return $PageList;
     }
     /**
-     *  获得静态页面分页列表
+     *  获得静态文档分页列表
      *
      * @access    public
      * @param     int   $totalPage  总页数
@@ -831,7 +930,7 @@ class Archives
         if ($totalPage == 1) {
             return "";
         }
-        $PageList = "<li class='page-item disabled'><span class='page-link'>".$totalPage."页:</span></li>";
+        $PageList = "<li class='page-item disabled'><span class='page-link'>".$totalPage."页</span></li>";
         $nPage = $nowPage - 1;
         $lPage = $nowPage + 1;
         if ($nowPage == 1) {
@@ -840,7 +939,7 @@ class Archives
             if ($nPage == 1) {
                 $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst.".".$this->ShortName."'>上一页</a></li>";
             } else {
-                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."_".$nPage.".".$this->ShortName."'>上一页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$nPage.".".$this->ShortName."'>上一页</a></li>";
             }
         }
         for ($i = 1; $i <= $totalPage; $i++) {
@@ -853,120 +952,21 @@ class Archives
             } else {
                 $n = $i;
                 if ($nowPage != $i) {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."_".$i.".".$this->ShortName."'>".$n."</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$i.".".$this->ShortName."'>{$n}</a></li>";
                 } else {
                     $PageList .= "<li class='page-item active'><span class='page-link'>{$n}</span></li>";
                 }
             }
         }
         if ($lPage <= $totalPage) {
-            $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."_".$lPage.".".$this->ShortName."'>下一页</a></li>";
+            $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$lPage.".".$this->ShortName."'>下一页</a></li>";
         } else {
             $PageList .= "<li class='page-item'><span class='page-link'>下一页</span></li>";
         }
         return $PageList;
     }
     /**
-     *  获得动态页面小标题
-     *
-     * @access    public
-     * @param     string  $styleName  类型名称
-     * @param     string  $pageNo  页码数
-     * @return    string
-     */
-    function GetPageTitlesDM($styleName, $pageNo)
-    {
-        if ($this->TotalPage == 1) {
-            return "";
-        }
-        if (count($this->SplitTitles) == 0) {
-            return "";
-        }
-        $i = 1;
-        $aid = $this->ArcID;
-        if ($styleName == 'link') {
-            $revalue = "";
-            foreach ($this->SplitTitles as $k => $v) {
-                if ($i == 1) {
-                    $revalue .= "<a href='view.php?aid=$aid&pageno=$i'>$v</a>\r\n";
-                } else {
-                    if ($pageNo == $i) {
-                        $revalue .= " $v \r\n";
-                    } else {
-                        $revalue .= "<a href='view.php?aid=$aid&pageno=$i'>$v</a>\r\n";
-                    }
-                }
-                $i++;
-            }
-        } else {
-            $revalue = "<select id='dedepagetitles' onchange='location.href=this.options[this.selectedIndex].value;'>\r\n";
-            foreach ($this->SplitTitles as $k => $v) {
-                if ($i == 1) {
-                    $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>{$i}、{$v}</option>\r\n";
-                } else {
-                    if ($pageNo == $i) {
-                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i' selected>{$i}、{$v}</option>\r\n";
-                    } else {
-                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&pageno=$i'>{$i}、{$v}</option>\r\n";
-                    }
-                }
-                $i++;
-            }
-            $revalue .= "</select>\r\n";
-        }
-        return $revalue;
-    }
-    /**
-     *  获得静态页面小标题
-     *
-     * @access    public
-     * @param     string  $styleName  类型名称
-     * @param     string  $pageNo  页码数
-     * @return    string
-     */
-    function GetPageTitlesST($styleName, $pageNo)
-    {
-        if ($this->TotalPage == 1) {
-            return "";
-        }
-        if (count($this->SplitTitles) == 0) {
-            return "";
-        }
-        $i = 1;
-        if ($styleName == 'link') {
-            $revalue = "";
-            foreach ($this->SplitTitles as $k => $v) {
-                if ($i == 1) {
-                    $revalue .= "<a href='".$this->NameFirst.".".$this->ShortName."'>$v</a>\r\n";
-                } else {
-                    if ($pageNo == $i) {
-                        $revalue .= " $v \r\n";
-                    } else {
-                        $revalue .= "<a href='".$this->NameFirst."_".$i.".".$this->ShortName."'>$v</a>\r\n";
-                    }
-                }
-                $i++;
-            }
-        } else {
-            $revalue = "<select id='dedepagetitles' onchange='location.href=this.options[this.selectedIndex].value;'>\r\n";
-            foreach ($this->SplitTitles as $k => $v) {
-                if ($i == 1) {
-                    $revalue .= "<option value='".$this->NameFirst.".".$this->ShortName."'>{$i}、{$v}</option>\r\n";
-                } else {
-                    if ($pageNo == $i) {
-                        $revalue .= "<option value='".$this->NameFirst."_".$i.".".$this->ShortName."' selected>{$i}、{$v}</option>\r\n";
-                    } else {
-                        $revalue .= "<option value='".$this->NameFirst."_".$i.".".$this->ShortName."'>{$i}、{$v}</option>\r\n";
-                    }
-                }
-                $i++;
-            }
-            $revalue .= "</select>\r\n";
-        }
-        return $revalue;
-    }
-    /**
-     * 高亮问题修正，排除alt title <a></a>直接的字符替换
+     * 高亮问题修正，排除alt、title、<a></a>直接的字符替换
      *
      * @param string $kw
      * @param string $body

src/user/album_add.php

@@ -149,7 +149,7 @@ if (empty($dopost)) {
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='album_edit.php?aid=".$arcID."&channelid=$channelid' class='btn btn-success btn-sm'>修改图片文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理图片文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='album_edit.php?aid=".$arcID."&channelid=$channelid' class='btn btn-success btn-sm'>修改图片文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理图片文档</a>";
     $wintitle = "成功发布图片文档";
     $wecome_info = "图片管理 - 发布图片文档";
     $win = new OxWindow();

src/user/album_edit.php

@@ -126,7 +126,7 @@ if (empty($dopost)) {
     $artUrl = MakeArt($aid, TRUE);
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
     //返回成功信息
-    $msg = "<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改图片文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理图片文档</a> ";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览图片文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布图片文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改图片文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理图片文档</a> ";
     //提交后返回提交页面
     $wintitle = "成功修改图片文档";
     $wecome_info = "图片管理 - 修改图片文档";

src/user/archives_add.php

@@ -122,7 +122,7 @@ if (empty($dopost)) {
     }
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "<a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改自定义文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览自定义文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理自定义文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览自定义文档</a><a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改自定义文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理自定义文档</a>";
     $wintitle = "成功发布自定义文档";
     $wecome_info = "文档管理 - 发布自定义文档";
     $win = new OxWindow();

src/user/archives_edit.php

@@ -90,7 +90,7 @@ if (empty($dopost)) {
     $artUrl = MakeArt($aid, TRUE);
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
     //返回成功信息
-    $msg = "<a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改自定义文档</a><a class='btn btn-success btn-sm' href='$artUrl' target='_blank'>浏览自定义文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理自定义文档</a>";
+    $msg = "<a class='btn btn-success btn-sm' href='$artUrl' target='_blank'>浏览自定义文档</a><a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改自定义文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理自定义文档</a>";
     $wintitle = "成功修改自定义文档";
     $wecome_info = "文档管理 - 修改自定义文档";
     $win = new OxWindow();

src/user/archives_sg_add.php

@@ -152,7 +152,7 @@ if (empty($dopost)) {
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "<a href='archives_sg_add.php?channelid=$channelid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_sg_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改分类文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='content_sg_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理分类文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='archives_sg_add.php?channelid=$channelid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_sg_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改分类文档</a><a href='content_sg_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理分类文档</a>";
     $wintitle = "成功发布分类文档";
     $wecome_info = "文档管理 - 发布分类文档";
     $win = new OxWindow();

src/user/archives_sg_edit.php

@@ -106,7 +106,7 @@ if (empty($dopost)) {
     $artUrl = MakeArt($aid, true);
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
     //返回成功信息
-    $msg = "<a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改分类文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='content_sg_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理分类文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览分类文档</a><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布分类文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改分类文档</a><a href='content_sg_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理分类文档</a>";
     $wintitle = "成功修改分类文档";
     $wecome_info = "文档管理 - 修改分类文档";
     $win = new OxWindow();

src/user/article_add.php

@@ -111,7 +111,7 @@ if (empty($dopost)) {
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID";
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='article_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='article_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理文档</a>";
     $wintitle = "成功发布文档";
     $wecome_info = "文档管理 - 发布文档";
     $win = new OxWindow();

src/user/article_edit.php

@@ -85,7 +85,7 @@ if (empty($dopost)) {
         $artUrl = $cfg_phpurl."/view.php?aid=$aid";
     }
     //返回成功信息
-    $msg = "<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理文档</a>";
     $wintitle = "成功修改文档";
     $wecome_info = "文档管理 - 修改文档";
     $win = new OxWindow();

src/user/soft_add.php

@@ -165,7 +165,7 @@ if (empty($dopost)) {
     }
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "<a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='soft_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改软件文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理软件文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='soft_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改软件文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>管理软件文档</a>";
     $wintitle = "成功发布文档文档";
     $wecome_info = "软件管理 - 发布软件文档";
     $win = new OxWindow();

src/user/soft_edit.php

@@ -163,7 +163,7 @@ if (empty($dopost)) {
         $artUrl = $cfg_phpurl."/view.php?aid=$aid";
     }
     //返回成功信息
-    $msg = "<a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='soft_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改软件文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理软件文档</a>";
+    $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览软件文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布软件文档</a><a href='soft_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改软件文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理软件文档</a>";
     $wintitle = "成功修改软件文档";
     $wecome_info = "软件管理 - 修改软件文档";
     $win = new OxWindow();

src/user/templets/edit_baseinfo.htm

@@ -35,8 +35,8 @@
 								<div class="col-sm-9 input-text"><?php echo $cfg_ml->M_LoginID;?></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptUname" class="col-sm-3 col-form-label">昵称：</label>
-								<div class="col-sm-9"><input type="text" name="uname" class="form-control w-75" id="iptUname" value="<?php echo $row['uname'];?>" placeholder="企业会员为公司名，个人会员为昵称"></div>
+								<label class="col-sm-3 col-form-label">昵称：</label>
+								<div class="col-sm-9"><input type="text" name="uname" id="iptUname" class="form-control w-75" value="<?php echo $row['uname'];?>" placeholder="企业会员为公司名，个人会员为昵称"></div>
 							</div>
 							<div class="form-group row">
 								<label class="col-sm-3 col-form-label">头像：</label>
@@ -47,15 +47,15 @@
 								</div>
 							</div>
 							<div class="form-group row">
-								<label for="iptOldpwd" class="col-sm-3 col-form-label">密码：</label>
+								<label class="col-sm-3 col-form-label">密码：</label>
 								<div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75" placeholder="请输入密码"></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptUserpwd" class="col-sm-3 col-form-label">新密码：</label>
+								<label class="col-sm-3 col-form-label">新密码：</label>
 								<div class="col-sm-9"><input type="password" name="userpwd" id="iptUserpwd"	class="form-control w-75" placeholder="不修改密码请保留此项为空"></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptUserpwdok" class="col-sm-3 col-form-label">确认新密码：</label>
+								<label class="col-sm-3 col-form-label">确认新密码：</label>
 								<div class="col-sm-9"><input type="password" name="userpwdok" id="iptUserpwdok"	class="form-control w-75" placeholder="不修改密码请保留此项为空"></div>
 							</div>
 							<div class="form-group row">
@@ -63,7 +63,7 @@
 								<div class="col-sm-9"><?php echo GetSafequestion($row['safequestion'],'safequestion');?></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptSafeanswer" class="col-sm-3 col-form-label">原问题答案：</label>
+								<label class="col-sm-3 col-form-label">原问题答案：</label>
 								<div class="col-sm-9"><input type="text" name="safeanswer" id="iptSafeanswer" class="form-control"></div>
 							</div>
 							<div class="form-group row">
@@ -71,11 +71,11 @@
 								<div class="col-sm-9"><?php echo GetSafequestion(0,'newsafequestion');?></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptNewsafeanswer" class="col-sm-3 col-form-label">新问题答案：</label>
+								<label class="col-sm-3 col-form-label">新问题答案：</label>
 								<div class="col-sm-9"><input type="text" name="newsafeanswer" id="iptNewsafeanswer" class="form-control"></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptEmail" class="col-sm-3 col-form-label">邮箱：</label>
+								<label class="col-sm-3 col-form-label">邮箱：</label>
 								<div class="col-sm-9">
 									<div id="spEmail">
 										<span class="input-text"><?php echo HideEmail($row['email']);?></span>