src/a/.dede

@@ -1 +0,0 @@
-dedecms

src/dede/archives_do.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 文档处理
  *
@@ -15,13 +14,11 @@ require_once(DEDEADMIN . '/inc/inc_archives_functions.php');
 require_once(DEDEINC.'/typelink.class.php');
 require_once(DEDEINC.'/arc.archives.class.php');
 $ENV_GOBACK_URL = (empty($_COOKIE['ENV_GOBACK_URL']) ? 'content_list.php' : $_COOKIE['ENV_GOBACK_URL']);
-
 if (empty($dopost)) {
-    ShowMsg('对不起，你没指定运行参数！', '-1');
+    ShowMsg('对不起，你没指定运行参数', '-1');
     exit();
 }
 $aid = isset($aid) ? preg_replace("#[^0-9]#", '', $aid) : '';
-
 /*--------------------------
 //编辑文档
 function editArchives(){ }
@@ -41,9 +38,9 @@ if ($dopost == 'editArchives') {
 /*--------------------------
 //浏览文档
 function viewArchives(){ }
----------------------------*/ else if ($dopost == "viewArchives") {
+---------------------------*/
+else if ($dopost == "viewArchives") {
     $aid = preg_replace("#[^0-9]#", '', $aid);
-
     //获取主表信息
     $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,
         tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl
@@ -61,7 +58,7 @@ function viewArchives(){ }
         PutCookie('DedeUserID', $arcRow['mid'], 1800);
         PutCookie('DedeLoginTime', time(), 1800);
         if ($arcRow['ismake'] == -1 || $arcRow['corank'] != 0 || $arcRow['arcrank'] != 0 || ($arcRow['typeid'] == 0 && $arcRow['channel'] != -1) || $arcRow['money'] > 0) {
-            echo "<script language='javascript'>location.href='{$cfg_phpurl}/view.php?aid={$aid}';</script>";
+            echo "<script>location.href='{$cfg_phpurl}/view.php?aid={$aid}';</script>";
             exit();
         }
     } else {
@@ -113,42 +110,43 @@ function viewArchives(){ }
     if (!file_exists($truefile)) {
         MakeArt($aid, TRUE);
     }
-    echo "<script language='javascript'>location.href='$arcurl" . "?" . time() . "';</script>";
+    echo "<script>location.href='$arcurl"."?".time()."';</script>";
     exit();
 }
 /*--------------------------
 //异步上传缩略图
 function uploadLitpic(){ }
----------------------------*/ else if ($dopost == "uploadLitpic") {
+---------------------------*/
+else if ($dopost == "uploadLitpic") {
     $upfile = AdminUpload('litpic', 'imagelit', 0, false);
     if ($upfile == '-1') {
-        $msg = "<script language='javascript'>
+        $msg = "<script>
                 parent.document.getElementById('uploadwait').style.display = 'none';
-                alert('你没指定要上传的文件或文件大小超过限制！');
+                alert('你没指定要上传的文件或文件大小超过限制');
             </script>";
     } else if ($upfile == '-2') {
-        $msg = "<script language='javascript'>
+        $msg = "<script>
                 parent.document.getElementById('uploadwait').style.display = 'none';
-                alert('上传文件失败，请检查原因！');
+                alert('上传文件失败，请检查原因');
             </script>";
     } else if ($upfile == '0') {
-        $msg = "<script language='javascript'>
+        $msg = "<script>
                 parent.document.getElementById('uploadwait').style.display = 'none';
-                alert('文件类型不正确！');
+                alert('文件类型不正确');
             </script>";
     } else {
         if (!empty($cfg_uplitpic_cut) && $cfg_uplitpic_cut == 'N') {
-            $msg = "<script language='javascript'>
+            $msg = "<script>
                     parent.document.getElementById('uploadwait').style.display = 'none';
                     parent.document.getElementById('picname').value = '{$upfile}';
                     if(parent.document.getElementById('divpicview'))
                     {
                         parent.document.getElementById('divpicview').style.width = '150px';
-                        parent.document.getElementById('divpicview').innerHTML = \"<img src='{$upfile}?n' width='150' />\";
+                        parent.document.getElementById('divpicview').innerHTML = \"<img src='{$upfile}?n' width='150'>\";
                     }
                 </script>";
         } else {
-            $msg = "<script language='javascript'>
+            $msg = "<script>
                     parent.document.getElementById('uploadwait').style.display = 'none';
                     window.open('imagecut.php?f=picname&isupload=yes&file={$upfile}', 'popUpImagesWin', 'scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=150, top=50');
                 </script>";
@@ -160,13 +158,14 @@ function uploadLitpic(){ }
 /*--------------------------
 //推荐文档
 function commendArchives(){ }
----------------------------*/ else if ($dopost == "commendArchives") {
+---------------------------*/
+else if ($dopost == "commendArchives") {
     CheckPurview('a_Commend,sys_ArcBatch');
     if (!empty($aid) && empty($qstr)) {
         $qstr = $aid;
     }
     if ($qstr == '') {
-        ShowMsg("参数无效！", $ENV_GOBACK_URL);
+        ShowMsg("参数无效", $ENV_GOBACK_URL);
         exit();
     }
     $arcids = preg_replace("#[^0-9,]#", '', preg_replace("#`#", ',', $qstr));
@@ -190,19 +189,18 @@ function commendArchives(){ }
             $dsql->ExecuteNoneQuery(" UPDATE `{$maintable}` SET `flag`='$flag' WHERE aid='{$aid}' ");
         }
     }
-    ShowMsg("成功把所选的文档设为推荐！", $ENV_GOBACK_URL);
+    ShowMsg("成功把所选的文档设为推荐", $ENV_GOBACK_URL);
     exit();
 }
-
 /*--------------------------
 //生成HTML
 function makeArchives();
----------------------------*/ else if ($dopost == "makeArchives") {
+---------------------------*/
+else if ($dopost == "makeArchives") {
     CheckPurview('sys_MakeHtml,sys_ArcBatch');
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
-
     if ($qstr == '') {
-        ShowMsg('参数无效！', $ENV_GOBACK_URL);
+        ShowMsg('参数无效', $ENV_GOBACK_URL);
         exit();
     }
     require_once(DEDEADMIN.'/inc/inc_archives_functions.php');
@@ -212,18 +210,19 @@ function makeArchives();
         $i++;
         $pageurl = MakeArt($aid, false);
     }
-    ShowMsg("成功更新指定 $i 个文件...", $ENV_GOBACK_URL);
+    ShowMsg("成功更新指定 $i 个文件", $ENV_GOBACK_URL);
     exit();
 }
 /*--------------------------
 //审核文档
 function checkArchives() {   }
----------------------------*/ else if ($dopost == "checkArchives") {
+---------------------------*/
+else if ($dopost == "checkArchives") {
     CheckPurview('a_Check,a_AccCheck,sys_ArcBatch');
     require_once(DEDEADMIN."/inc/inc_archives_functions.php");
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
     if ($qstr == '') {
-        ShowMsg("参数无效！", $ENV_GOBACK_URL);
+        ShowMsg("参数无效", $ENV_GOBACK_URL);
         exit();
     }
     $arcids = preg_replace("#[^0-9,]#", '', preg_replace("#`#", ',', $qstr));
@@ -245,13 +244,14 @@ function checkArchives() {   }
         $dsql->ExecuteNoneQuery("UPDATE `#@__taglist` SET arcrank='0' WHERE aid='$aid' ");
         $pageurl = MakeArt($aid, false);
     }
-    ShowMsg("成功审核指定的文档！", $ENV_GOBACK_URL);
+    ShowMsg("成功审核指定的文档", $ENV_GOBACK_URL);
     exit();
 }
 /*--------------------------
 //删除文档
 function delArchives(){ }
----------------------------*/ else if ($dopost == "delArchives") {
+---------------------------*/
+else if ($dopost == "delArchives") {
     CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
     require_once(DEDEINC."/oxwindow.class.php");
     if (empty($fmdo)) $fmdo = '';
@@ -261,12 +261,11 @@ function delArchives(){ }
             $qstr = $aid;
         }
         if ($qstr == '') {
-            ShowMsg("参数无效！", $ENV_GOBACK_URL);
+            ShowMsg("参数无效", $ENV_GOBACK_URL);
             exit();
         }
         $qstrs = explode("`", $qstr);
         $okaids = array();
-
         foreach ($qstrs as $aid) {
             if (!isset($okaids[$aid])) {
                 DelArc($aid);
@@ -274,7 +273,7 @@ function delArchives(){ }
                 $okaids[$aid] = 1;
             }
         }
-        ShowMsg("成功删除指定的文档！", $ENV_GOBACK_URL);
+        ShowMsg("成功删除指定的文档", $ENV_GOBACK_URL);
         exit();
     } else {
         $wintitle = "文档管理-删除文档";
@@ -292,51 +291,49 @@ function delArchives(){ }
 }
 /*-----------------------------
 function moveArchives(){ }
-------------------------------*/ else if ($dopost == 'moveArchives') {
+------------------------------*/
+else if ($dopost == 'moveArchives') {
     CheckPurview('sys_ArcBatch');
     if (empty($totype)) {
         require_once(DEDEINC.'/typelink.class.php');
         if (!empty($aid) && empty($qstr)) $qstr = $aid;
-
         AjaxHead();
         $channelid = empty($channelid) ? 0 : $channelid;
         $tl = new TypeLink($aid);
         $typeOptions = $tl->GetOptionArray(0, $admin_catalogs, $channelid);
-        $typeOptions = "<select name='totype' style='width:90%'>
-        <option value='0'>请选择移动到的位置...</option>\r\n
+        $typeOptions = "<select name='totype' style='width:320px'>
+        <option value='0'>请选择移动到的位置</option>
         $typeOptions
         </select>";
-
         //输出AJAX可移动窗体
         $divname = 'moveArchives';
-        echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">\r\n";
-        echo "    <div class='titLeft'>移动文档</div>\r\n";
-        echo "    <div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' alt='关闭' title='关闭' /></div>\r\n";
-        echo "</div>\r\n";
-        echo "<form name='quickeditform' action='archives_do.php' method='post'>\r\n";
-        echo "<input type='hidden' name='dopost' value='{$dopost}' />\r\n";
-        echo "<input type='hidden' name='qstr' value='{$qstr}' />\r\n";
-        echo "<table width='100%' style='margin-top:6px;z-index:9000;'>\r\n";
+        echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">";
+        echo "    <div class='titLeft'>移动文档</div>";
+        echo "    <div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' title='关闭'></div>";
+        echo "</div>";
+        echo "<form name='quickeditform' action='archives_do.php' method='post'>";
+        echo "<input type='hidden' name='dopost' value='{$dopost}'>";
+        echo "<input type='hidden' name='qstr' value='{$qstr}'>";
+        echo "<table width='100%' style='display:inline-block;z-index:9000'>";
         ?>
-        <tr height='28'>
+        <tr height='26'>
             <td width="80" class='bline'>&nbsp;目标栏目：</td>
             <td class='bline'>
                 <?php echo $typeOptions; ?>
             </td>
         </tr>
-        <tr height='32'>
+        <tr height='26'>
             <td width="80" class='bline'>&nbsp;文档ID：</td>
             <td class='bline'>
-                <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:310px;overflow:hidden;' />
-                <br />
+                <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'><br>
                 移动到的目标栏目必须和选定的文档频道类型一致，否则程序会自动勿略不符合的文档。
             </td>
         </tr>
-        <tr height='32'>
-            <td colspan='2' align='center' style='padding-top:12px'>
-                <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0" style="cursor:pointer" />
+        <tr height='36'>
+            <td colspan='2' align='center' style='padding-top:10px'>
+                <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" style="cursor:pointer">
                 &nbsp;&nbsp;
-                <img src="images/button_back.gif" width="60" height="22" border="0" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' style="cursor:pointer" />
+                <img src="images/button_back.gif" width="60" height="22" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' style="cursor:pointer">
             </td>
             </td>
         </tr>
@@ -349,11 +346,11 @@ function moveArchives(){ }
         $typeInfos = $dsql->GetOne("SELECT tp.channeltype,tp.ispart,tp.channeltype,ch.maintable,ch.addtable,ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$totype' ");
         $idtype = "id";
         if (!is_array($typeInfos)) {
-            ShowMsg('参数错误！', '-1');
+            ShowMsg('参数错误', '-1');
             exit();
         }
         if ($typeInfos['ispart'] != 0) {
-            ShowMsg('文档保存的栏目必须为最终列表栏目！', '-1');
+            ShowMsg('文档保存的栏目必须为最终列表栏目', '-1');
             exit();
         }
         if (empty($typeInfos['addtable'])) {
@@ -384,21 +381,22 @@ function moveArchives(){ }
             $arc = new Archives($aid);
             $arc->MakeHtml();
         }
-        ShowMsg("成功移动 $j 个文档！", $ENV_GOBACK_URL);
+        ShowMsg("成功移动 $j 个文档", $ENV_GOBACK_URL);
         exit();
     }
 }
 /*-----------------------------
 //还原文档
 function RbReturnArchives(){ }
-------------------------------*/ else if ($dopost == 'return') {
+------------------------------*/
+else if ($dopost == 'return') {
     CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
     require_once(DEDEINC."/oxwindow.class.php");
 
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
 
     if ($qstr == '') {
-        ShowMsg("参数无效！", "recycling.php");
+        ShowMsg("参数无效", "recycling.php");
         exit();
     }
     $qstrs = explode("`", $qstr);
@@ -406,13 +404,14 @@ function RbReturnArchives(){ }
         $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET arcrank='-1',ismake='0' WHERE id='$aid'");
         $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-1' WHERE id = '$aid'; ");
     }
-    ShowMsg("成功还原指定的文档！", "recycling.php");
+    ShowMsg("成功还原指定的文档", "recycling.php");
     exit();
 }
 /*-----------------------------
 //清空文档
 function RbClearArchives(){ }
-------------------------------*/ else if ($dopost == 'clear') {
+------------------------------*/
+else if ($dopost == 'clear') {
     CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
     require_once(DEDEINC."/oxwindow.class.php");
     if (empty($fmdo)) $fmdo = '';
@@ -421,7 +420,7 @@ function RbClearArchives(){ }
     if ($fmdo == 'yes') {
         if (!empty($aid) && empty($qstr)) $qstr = $aid;
         if ($qstr == '') {
-            ShowMsg("参数无效！", "recycling.php");
+            ShowMsg("参数无效", "recycling.php");
             exit();
         }
         $qstrs = explode(",", $qstr);
@@ -434,7 +433,7 @@ function RbClearArchives(){ }
                 $okaids[$qstr] = 1;
             }
         }
-        ShowMsg("成功删除指定的文档！", "recycling.php");
+        ShowMsg("成功删除指定的文档", "recycling.php");
         exit();
     } else {
         $dsql->SetQuery("SELECT id FROM `#@__archives` WHERE `arcrank` = '-2'");
@@ -446,7 +445,7 @@ function RbClearArchives(){ }
         }
         $num = $dsql->GetTotalRow();
         if (empty($num)) {
-            ShowMsg("对不起，未发现相关文档！", "recycling.php");
+            ShowMsg("对不起，未发现相关文档", "recycling.php");
             exit();
         }
         $wintitle = "文档管理-清空所有文档";
@@ -458,7 +457,7 @@ function RbClearArchives(){ }
         $win->AddHidden("qstr", $qstr);
         $win->AddHidden("aid", $aid);
         $win->AddHidden("recycle", $recycle);
-        $win->AddTitle("本次操作将清空回收站<font color='#FF0000'>所有共 $num 篇文档</font><br>你确实要永久删除“ $qstr ”这些文档？");
+        $win->AddTitle("本次操作将清空回收站所有共 $num 篇文档<br>你确实要永久删除“ $qstr ”这些文档？");
         $winform = $win->GetWindow("ok");
         $win->Display();
     }
@@ -466,21 +465,20 @@ function RbClearArchives(){ }
 /*-----------------------------
 //清除文档
 function RbDelArchives(){ }
-------------------------------*/ else if ($dopost == 'del') {
+------------------------------*/
+else if ($dopost == 'del') {
     CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
     require_once(DEDEINC."/oxwindow.class.php");
     if (empty($fmdo)) $fmdo = '';
     $recycle = empty($recycle) ? "" : $recycle;
-
     if ($fmdo == 'yes') {
         if (!empty($aid) && empty($qstr)) $qstr = $aid;
         if ($qstr == '') {
-            ShowMsg("参数无效！", "recycling.php");
+            ShowMsg("参数无效", "recycling.php");
             exit();
         }
         $qstrs = explode("`", $qstr);
         $okaids = array();
-
         foreach ($qstrs as $aid) {
             if (!isset($okaids[$aid])) {
                 DelArc($aid, "OK", "", $recycle);
@@ -488,7 +486,7 @@ function RbDelArchives(){ }
                 $okaids[$aid] = 1;
             }
         }
-        ShowMsg("成功删除指定的文档！", "recycling.php");
+        ShowMsg("成功删除指定的文档", "recycling.php");
         exit();
     } else {
         $wintitle = "文档管理-删除文档";
@@ -508,7 +506,8 @@ function RbDelArchives(){ }
 /*-----------------------------
 //快速编辑
 function quickEdit(){ }
-------------------------------*/ else if ($dopost == 'quickEdit') {
+------------------------------*/
+else if ($dopost == 'quickEdit') {
     require_once(DEDEADMIN."/inc/inc_catalog_options.php");
     AjaxHead();
     $query = "SELECT ch.typename as channelname,ch.addtable,ar.membername as rankname,arc.*
@@ -517,83 +516,82 @@ function quickEdit(){ }
     LEFT JOIN `#@__arcrank` ar ON ar.rank=arc.arcrank WHERE arc.id='$aid' ";
     $arcRow = $dsql->GetOne($query);
     $divname = 'quickEdit';
-    echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">\r\n";
-    echo "    <div class='titLeft'>快速属性编辑</div>\r\n";
-    echo "    <div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' alt='关闭' title='关闭' /></div>\r\n";
-    echo "</div>\r\n";
-    echo "<form name='quickeditform' action='archives_do.php?dopost=quickEditSave&aid={$aid}' method='post'>\r\n";
-    echo "<input type='hidden' name='addtable' value='{$arcRow['addtable']}' />\r\n";
-    echo "<input type='hidden' name='oldtypeid' value='{$arcRow['typeid']}' />\r\n";
-    echo "<table width='100%' style='margin-top:6px;z-index:9000;'>\r\n";
+    echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">";
+    echo "<div class='titLeft'>快速属性编辑</div>";
+    echo "<div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' title='关闭'></div>";
+    echo "</div>";
+    echo "<form name='quickeditform' action='archives_do.php?dopost=quickEditSave&aid={$aid}' method='post'>";
+    echo "<input type='hidden' name='addtable' value='{$arcRow['addtable']}'>";
+    echo "<input type='hidden' name='oldtypeid' value='{$arcRow['typeid']}'>";
+    echo "<table width='100%' style='display:inline-block;z-index:9000'>";
     ?>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;所属栏目：</td>
         <td class='bline'>
             <?php
             $typeOptions = GetOptionList($arcRow['typeid'], $cuserLogin->getUserChannel(), $arcRow['channel']);
-            echo "<select name='typeid' style='width:70%'>\r\n";
-            if ($arcRow["typeid"] == "0") echo "<option value='0' selected>请选择栏目...</option>\r\n";
+            echo "<select name='typeid' style='width:320px'>";
+            if ($arcRow["typeid"] == "0") echo "<option value='0' selected>请选择栏目</option>";
             echo $typeOptions;
             echo "</select>";
             ?>
         </td>
     </tr>
-    <tr height='28'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;属性：</td>
         <td class='bline'>
-            <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>' />
+            <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             $dsql->Execute();
             while ($trow = $dsql->GetObject()) {
                 if ($trow->att == 'j' || $trow->att == 'p') continue;
                 if (preg_match("#".$trow->att."#", $arcRow['flag']))
-                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' checked='checked' /> {$trow->attname}.{$trow->att}</label> ";
+                echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' checked='checked'>&nbsp;{$trow->attname}{$trow->att}[{$trow->att}]</label>&nbsp;";
                 else
-                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' /> {$trow->attname}.{$trow->att}</label> ";
+                echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
             }
             ?>
         </td>
     </tr>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;标题：</td>
         <td class='bline'>
-            <input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:90%" />
+            <input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:320px">
         </td>
     </tr>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;简略标题：</td>
         <td class='bline'>
-            <input name="shorttitle" type="text" id="shorttitle" value="<?php echo $arcRow['shorttitle']; ?>" style="width:60%" />
+            <input name="shorttitle" type="text" id="shorttitle" value="<?php echo $arcRow['shorttitle']; ?>" style="width:320px">
         </td>
     </tr>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;阅读权限：</td>
         <td class='bline'>
-            <select name="arcrank" id="arcrank" style="width:120px">
+            <select name="arcrank" id="arcrank" style="width:100px">
                 <option value='<?php echo $arcRow["arcrank"] ?>'>
                 <?php echo $arcRow["rankname"] ?> </option>
                 <?php
                 $urank = $cuserLogin->getUserRank();
-
                 $dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE adminrank<='$urank'");
                 $dsql->Execute();
                 while ($row = $dsql->GetObject()) {
-                    echo "     <option value='" . $row->rank . "'>" . $row->membername . "</option>\r\n";
+                    echo "<option value='".$row->rank."'>".$row->membername."</option>";
                 }
                 ?>
             </select>
-            需要金币：<input name="money" type="text" id="money" value="<?php echo $arcRow["money"]; ?>" style="width:80px" />
+            需要金币：<input name="money" type="text" id="money" value="<?php echo $arcRow["money"]; ?>" style="width:100px">
         </td>
     </tr>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;关键字：</td>
         <td class='bline'>
-            <input name="keywords" type="text" id="keywords" value="<?php echo $arcRow['keywords']; ?>" style="width:70%" />
+            <input name="keywords" type="text" id="keywords" value="<?php echo $arcRow['keywords']; ?>" style="width:320px">
         </td>
     </tr>
-    <tr height='32'>
-        <td colspan='2' align='center' style='padding-top:12px' class='py-3'>
+    <tr height='36'>
+        <td colspan='2' align='center' class='py-3' style='padding-top:10px'>
             <button type="submit" class="btn btn-success">保存</button>
             &nbsp;&nbsp;
             <button type="button" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class="btn btn-success">关闭</button>
@@ -608,12 +606,13 @@ function quickEdit(){ }
 /*-----------------------------
 //保存快速编辑的内容
 function quickEditSave(){ }
-------------------------------*/ else if ($dopost == 'quickEditSave') {
+------------------------------*/
+else if ($dopost == 'quickEditSave') {
     require_once(DEDEADMIN.'/inc/inc_archives_functions.php');
     //权限检测
     if (!TestPurview('a_Edit')) {
         if (TestPurview('a_AccEdit')) {
-            CheckCatalog($typeid, "对不起，你没有操作栏目 {$typeid} 的文档权限！");
+            CheckCatalog($typeid, "对不起，你没有操作栏目 {$typeid} 的文档权限");
         } else {
             CheckArcAdmin($aid, $cuserLogin->getUserID());
         }
@@ -622,22 +621,13 @@ function quickEditSave(){ }
     $shorttitle = cn_substrR($shorttitle, 36);
     $keywords = trim(cn_substrR($keywords, 60));
     if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1;
-
     $adminid = $cuserLogin->getUserID();
-
     //属性处理
     $flag = isset($flags) ? join(',', $flags) : '';
     if (!empty($flag)) {
         if (preg_match("#p#", $oldflag)) $flag .= ',p';
         if (preg_match("#j#", $oldflag)) $flag .= ',j';
     }
-    /*
-    else
-    {
-        $flag = $oldflag;
-    }
-	*/
-
     $query = "UPDATE `#@__archives` SET
     typeid = '$typeid',
     flag = '$flag',
@@ -661,28 +651,25 @@ function quickEditSave(){ }
     }
     //更新HTML
     $artUrl = MakeArt($aid, TRUE, TRUE);
-
     $backurl = !empty($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : '-1';
-    ShowMsg('成功更新一篇文档的基本信息！', $backurl);
+    ShowMsg('成功更新一篇文档的基本信息', $backurl);
     exit();
 }
 /*--------------------------
 分析并自动获取文档关键词
 function makekw(){ }
---------------------------*/ else if ($dopost == "makekw") {
+--------------------------*/
+else if ($dopost == "makekw") {
     CheckPurview('a_Commend,sys_ArcBatch');
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
-
     if ($qstr == '') {
-        ShowMsg("参数无效！", $ENV_GOBACK_URL);
+        ShowMsg("参数无效", $ENV_GOBACK_URL);
         exit();
     }
-
     $arcids = preg_replace("#[^0-9,]#", '', preg_replace("#`#", ',', $qstr));
     $query = "SELECT arc.*, addt.* From `#@__archives` arc LEFT JOIN `#@__addonarticle` addt ON addt.aid=arc.id  WHERE arc.id in($arcids) AND arc.channel=1 ";
     $dsql->SetQuery($query);
     $dsql->Execute();
-
     if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
         $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
         $client->appid = $cfg_bizcore_appid;
@@ -700,7 +687,7 @@ function makekw(){ }
             $description = str_replace('　', ' ', trim($description));
             $description = str_replace('［', ' ', $description);
             $description = str_replace('］', ' ', $description);
-            $description = preg_replace("#[ \r\n\t]{1,}#is", ' ', $description);
+            $description = preg_replace("#[ \t]{1,}#is", ' ', $description);
             $description = str_replace('关键字', '', $description);
             $description = str_replace('关键词', '', $description);
             $description = addslashes($description);
@@ -713,7 +700,6 @@ function makekw(){ }
         while ($row = $dsql->GetArray()) {
             //跳过已经有关键字的内容
             if (trim($row['keywords']) != '') continue;
-
             $aid = $row['id'];
             $keywords = '';
             $title = $row['title'];
@@ -725,7 +711,6 @@ function makekw(){ }
             $sp->SetSource(Html2Text($body), $cfg_soft_lang, $cfg_soft_lang);
             $sp->StartAnalysis();
             $allindexs = preg_replace("/#p#|#e#/", '', $sp->GetFinallyIndex());
-
             if (is_array($allindexs) && is_array($titleindexs)) {
                 foreach ($titleindexs as $k => $v) {
                     if (strlen($keywords.$k) >= 60) {
@@ -744,11 +729,10 @@ function makekw(){ }
                     }
                 }
             }
-
             $description = str_replace('　', ' ', trim($description));
             $description = str_replace('［', ' ', $description);
             $description = str_replace('］', ' ', $description);
-            $description = preg_replace("#[ \r\n\t]{1,}#is", ' ', $description);
+            $description = preg_replace("#[ \t]{1,}#is", ' ', $description);
             $description = str_replace('关键字', '', $description);
             $description = str_replace('关键词', '', $description);
             $description = addslashes($description);
@@ -756,24 +740,22 @@ function makekw(){ }
         }
         $sp = null;
     }
-
-
-    ShowMsg("成功分析指定文档的关键词！", $ENV_GOBACK_URL);
+    ShowMsg("成功分析指定文档的关键词", $ENV_GOBACK_URL);
     exit();
 }
 /*--------------------------
 //批量增加属性
 function attsAdd(){ }
----------------------------*/ else if ($dopost == 'attsAdd') {
+---------------------------*/
+else if ($dopost == 'attsAdd') {
     CheckPurview('a_Commend,sys_ArcBatch');
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
-
     if ($qstr == '') {
-        ShowMsg("参数无效！", $ENV_GOBACK_URL);
+        ShowMsg("参数无效", $ENV_GOBACK_URL);
         exit();
     }
     if (empty($flagname)) {
-        ShowMsg("必须指定要添加的属性！", $ENV_GOBACK_URL);
+        ShowMsg("必须指定要添加的属性", $ENV_GOBACK_URL);
         exit();
     }
     $arcids = preg_replace("#[^0-9,]#", '', preg_replace("#`#", ',', $qstr));
@@ -797,7 +779,7 @@ function attsAdd(){ }
             $dsql->ExecuteNoneQuery(" UPDATE `{$maintable}` SET `flag`='$flag' WHERE aid='{$aid}' ");
         }
     }
-    ShowMsg("成功对选中文档增加指定的属性！", $ENV_GOBACK_URL);
+    ShowMsg("成功对选中文档增加指定的属性", $ENV_GOBACK_URL);
     exit();
 }
 /*--------------------------
@@ -807,11 +789,11 @@ function attsDel(){ }
     CheckPurview('a_Commend,sys_ArcBatch');
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
     if ($qstr == '') {
-        ShowMsg("参数无效！", $ENV_GOBACK_URL);
+        ShowMsg("参数无效", $ENV_GOBACK_URL);
         exit();
     }
     if (empty($flagname)) {
-        ShowMsg("必须指定要删除的属性！", $ENV_GOBACK_URL);
+        ShowMsg("必须指定要删除的属性", $ENV_GOBACK_URL);
         exit();
     }
     $arcids = preg_replace("#[^0-9,]#", '', preg_replace("#`#", ',', $qstr));
@@ -845,53 +827,53 @@ function attsDel(){ }
         $flag = trim(join(',', $okflags));
         $dsql->ExecuteNoneQuery(" UPDATE `{$maintable}` SET `flag`='$flag' WHERE {$idname}='{$aid}' ");
     }
-    ShowMsg("成功对选中文档删除指定的属性！", $ENV_GOBACK_URL);
+    ShowMsg("成功对选中文档删除指定的属性", $ENV_GOBACK_URL);
     exit();
 }
 /*--------------------------
 //获得批量属性处理的AJAX窗体
 function attsDlg(){ }
----------------------------*/ else if ($dopost == 'attsDlg') {
+---------------------------*/
+else if ($dopost == 'attsDlg') {
     if (!empty($aid) && empty($qstr)) $qstr = $aid;
-
     $dojobname = ($dojob == 'attsDel' ? '批量删除属性' : '批量增加属性');
     AjaxHead();
     //输出AJAX可移动窗体
     $divname = 'attsDlg';
-    echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">\r\n";
-    echo "    <div class='titLeft'>{$dojobname}</div>\r\n";
-    echo "    <div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' alt='关闭' title='关闭' /></div>\r\n";
-    echo "</div>\r\n";
-    echo "<form name='quickeditform' action='archives_do.php' method='post'>\r\n";
-    echo "<input type='hidden' name='dopost' value='{$dojob}' />\r\n";
-    echo "<input type='hidden' name='qstr' value='{$qstr}' />\r\n";
-    echo "<table width='100%' style='margin-top:6px;z-index:9000;'>\r\n";
+    echo "<div class='title' onmousemove=\"DropMoveHand('{$divname}', 225);\" onmousedown=\"DropStartHand();\" onmouseup=\"DropStopHand();\">";
+    echo "<div class='titLeft'>{$dojobname}</div>";
+    echo "<div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' title='关闭'></div>";
+    echo "</div>";
+    echo "<form name='quickeditform' action='archives_do.php' method='post'>";
+    echo "<input type='hidden' name='dopost' value='{$dojob}'>";
+    echo "<input type='hidden' name='qstr' value='{$qstr}'>";
+    echo "<table width='100%' style='display:inline-block;z-index:9000'>";
 ?>
-    <tr height='28'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;属 性：</td>
         <td class='bline'>
-            <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>' />
+            <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             $dsql->Execute();
             while ($trow = $dsql->GetObject()) {
                 if ($trow->att == 'j' || $trow->att == 'p') continue;
-                echo "<label><input class='np' type='radio' name='flagname' id='flags{$trow->att}' value='{$trow->att}' /> {$trow->attname}.{$trow->att}</label>";
+                echo "<label><input class='np' type='radio' name='flagname' id='flags{$trow->att}' value='{$trow->att}'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
             }
             ?>
         </td>
     </tr>
-    <tr height='32'>
+    <tr height='26'>
         <td width="80" class='bline'>&nbsp;文档ID：</td>
         <td class='bline'>
-            <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:310px;overflow:hidden;' />
+            <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'>
         </td>
     </tr>
-    <tr height='32'>
-        <td colspan='2' align='center' style='padding-top:12px'>
-            <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0" style="cursor:pointer" />
+    <tr height='36'>
+        <td colspan='2' align='center' style='padding-top:10px'>
+            <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" style="cursor:pointer">
             &nbsp;&nbsp;
-            <img src="images/button_back.gif" width="60" height="22" border="0" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' style="cursor:pointer" />
+            <img src="images/button_back.gif" width="60" height="22" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' style="cursor:pointer">
         </td>
         </td>
     </tr>
@@ -902,15 +884,16 @@ function attsDlg(){ }
 }
 /*------------------------
 function getCatMap() {  }
--------------------------*/ else if ($dopost == 'getCatMap') {
+-------------------------*/
+else if ($dopost == 'getCatMap') {
     require_once(DEDEINC.'/typeunit.class.selector.php');
     AjaxHead();
     //输出AJAX可移动窗体
     $divname = 'getCatMap';
-    echo "<div class='title' style='cursor:default;'>\r\n";
-    echo "    <div class='titLeft'>栏目快速选择器</div>\r\n";
-    echo "    <div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' alt='关闭' title='关闭' /></div>\r\n";
-    echo "</div>\r\n";
+    echo "<div class='title' style='cursor:default'>";
+    echo "<div class='titLeft'>栏目快速选择器</div>";
+    echo "<div class='titRight'><img src='images/ico-close.gif' style='cursor:pointer;' onclick='HideObj(\"{$divname}\");ChangeFullDiv(\"hide\");' title='关闭'></div>";
+    echo "</div>";
     $tus = new TypeUnitSelector();
     ?>
     <form name='quicksel' action='javascript:;' method='get'>
@@ -918,9 +901,9 @@ function getCatMap() {  }
             <?php $tus->ListAllType($channelid); ?>
         </div>
         <div align='center' class='quickselfoot'>
-            <img src="images/button_ok.gif" onclick="getSelCat('<?php echo $targetid; ?>');" width="60" height="22" class="np" border="0" style="cursor:pointer" />
+            <img src="images/button_ok.gif" onclick="getSelCat('<?php echo $targetid; ?>');" width="60" height="22" class="np" style="cursor:pointer">
             &nbsp;&nbsp;
-            <img src="images/button_back.gif" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' width="60" height="22" border="0" style="cursor:pointer" />
+            <img src="images/button_back.gif" onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' width="60" height="22" style="cursor:pointer">
         </div>
     </form>
 <?php

src/dede/css/albumupload.css

@@ -1,162 +1 @@
-div.flash
-{
-	width:375px;
-	-moz-border-radius-topleft:5px;
-	-webkit-border-top-left-radius:5px;
-	-moz-border-radius-topright:5px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-moz-border-radius-bottomright:5px;
-	-webkit-border-bottom-right-radius:5px;
-	border-color:#D9E4FF;
-	margin:10px 5px;
-}
-
-#btnSubmit
-{
-	margin:0 0 0 155px;
-}
-
-.progressWrapper
-{
-	width:357px;
-	overflow:hidden;
-}
-
-.progressContainer
-{
-	border:solid 1px #E8E8E8;
-	background-color:#F7F7F7;
-	overflow:hidden;
-	margin:5px;
-	padding:4px;
-}
-
-.message
-{
-	border:solid 1px #FD9;
-	background-color:#FFC;
-	overflow:hidden;
-	margin:1em 0;
-	padding:10px 20px;
-}
-
-.red
-{
-	border:solid 1px #B50000;
-	background-color:#FFEBEB;
-}
-
-.green
-{
-	border:solid 1px #DDF0DD;
-	background-color:#EBFFEB;
-}
-
-.blue
-{
-	border:solid 1px #CEE2F2;
-	background-color:#F0F5FF;
-}
-
-.progressName
-{
-	font-size:8pt;
-	font-weight:700;
-	color:#555;
-	width:323px;
-	height:14px;
-	text-align:left;
-	white-space:nowrap;
-	overflow:hidden;
-}
-
-.progressBarInProgress,.progressBarComplete,.progressBarError
-{
-	font-size:0;
-	width:0;
-	height:2px;
-	background-color:blue;
-	margin-top:2px;
-}
-
-.progressBarComplete
-{
-	width:100%;
-	background-color:green;
-	visibility:hidden;
-}
-
-.progressBarError
-{
-	width:100%;
-	background-color:red;
-	visibility:hidden;
-}
-
-.progressBarStatus
-{
-	margin-top:2px;
-	width:337px;
-	font-size:7pt;
-	font-family:Arial;
-	text-align:left;
-	white-space:nowrap;
-}
-
-a.progressCancel
-{
-	font-size:0;
-	display:block;
-	height:14px;
-	width:14px;
-	background-image:url(../images/cancelbutton.gif);
-	background-repeat:no-repeat;
-	background-position:-14px 0;
-	float:right;
-}
-
-a.progressCancel:hover
-{
-	background-position:0 0;
-}
-
-.swfupload
-{
-	vertical-align:top;
-}
-
-.albCt
-{
-	float:left;
-	width:244px;
-	height:150px;
-	margin-right:10px;
-	margin-bottom:10px;
-	border:1px dashed #AAD381;
-	background:#FAFFEE;
-	text-align:center;
-	padding:3px;
-}
-
-.albEdit
-{
-	height:180px;
-}
-
-.picinfo
-{
-	height:30px;
-	line-height:30px;
-	margin:10px 0;
-}
-
-.thumbnails img,.thumbnailsEdit img
-{
-	margin:5px;
-}
-
-.albCt img {
-	height: 100px!important;
-}
+div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 155px}.progressWrapper{width:357px;overflow:hidden}.progressContainer{padding:4px;margin:5px;background-color:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background-color:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background-color:#FFEBEB;border:solid 1px #B50000}.green{background-color:#EBFFEB;border:solid 1px #DDF0DD}.blue{background-color:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:14px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background-color:blue}.progressBarComplete{width:100%;background-color:green;visibility:hidden}.progressBarError{width:100%;background-color:red;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;text-align:left;white-space:nowrap}a.progressCancel{font-size:0;display:block;height:14px;width:14px;background-image:url(../images/cancelbutton.gif);background-repeat:no-repeat;background-position:-14px 0;float:right}a.progressCancel:hover{background-position:0 0}.swfupload{vertical-align:top}.albCt{float:left;width:240px;height:180px;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:180px}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{height:100px!important}

src/dede/diy_list.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 自定义表单列表
  *
@@ -12,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('c_New');
 $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
-$action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete')) ? $action : '';
+$action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete','excel')) ? $action : '';
 if (empty($diyid)) {
     showMsg("非法操作!", 'javascript:;');
     exit();
@@ -171,6 +170,35 @@ if ($action == 'post') {
             showmsg('文件不存在', '-1');
         }
     }
+} 
+elseif($action == 'excel') {
+    ob_end_clean();//清除缓冲区,避免乱码
+    header("Content-type:application/vnd.ms-excel");
+    header("Content-Disposition:attachment;filename={$diy->name}_".date("Y-m-d").".xls");
+    print(chr(0xEF).chr(0xBB).chr(0xBF));//清除bom
+    $fieldlist = $diy->getFieldList();
+    echo "<table><tr>";
+    foreach($fieldlist as $field=>$fielddata)
+    {
+        echo "<th>{$fielddata[0]}</th>";
+    }
+    echo "<th>状态</th>";
+    echo "</tr>";
+    $sql = "SELECT * FROM {$diy->table} ORDER BY id DESC";
+    $dsql->SetQuery($sql);
+    $dsql->Execute('t');
+    while($arr = $dsql->GetArray('t'))
+    {
+        echo "<tr>";
+        foreach($fieldlist as $key => $field)
+        {
+            echo "<td>".$arr[$key]."</td>";
+        }
+    $status = $arr['ifcheck'] == 1 ? '已审核' : '未审核';
+    echo "<td>".$status."</td>";
+    echo "</tr>";
+    }
+    echo "</table>";
 } else {
     showmsg('未定义操作', "-1");
 }

src/dede/inc/inc_archives_functions.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 文档操作相关函数
  *
@@ -18,7 +17,6 @@ $backurl = preg_match("#content_#", $backurl) ? "<a href='$backurl' class='btn b
 if (!isset($_NOT_ARCHIVES)) {
     require_once(DEDEINC.'/customfields.func.php');
 }
-
 /**
  * 获得HTML里的外部资源，针对图集
  *
@@ -58,10 +56,8 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd)
         }
         $itype =  substr($value, -4, 4);
         if (!preg_match("#\.(gif|jpg|png)#", $itype)) $itype = ".jpg";
-
         $rndFileName = $imgPath.'/'.$milliSecond.'-'.$key.$itype;
         $iurl = $imgUrl.'/'.$milliSecond.'-'.$key.$itype;
-
         //下载并保存文件
         $rs = DownImageKeep($value, $rfurl, $rndFileName, '', 0, 30);
         if ($rs) {
@@ -92,7 +88,6 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd)
     }
     return $rsimg;
 }
-
 /**
  * 获得文章body里的外部资源
  *
@@ -108,7 +103,6 @@ function GetCurContent($body)
     $basehost = "http://".$_SERVER["HTTP_HOST"];
     $img_array = array();
     preg_match_all("/src=[\"|'|\s]([^\"|^\'|^\s]*?)/isU", $body, $img_array);
-
     $img_array = array_unique($img_array[1]);
     $imgUrl = $cfg_uploaddir.'/'.MyDate("ymd", time());
     $imgPath = $cfg_basedir.$imgUrl;
@@ -144,7 +138,6 @@ function GetCurContent($body)
         $value = trim($value);
         $rndFileName = $imgPath.'/'.$milliSecondN.'-'.$key.$itype;
         $fileurl = $imgUrl.'/'.$milliSecondN.'-'.$key.$itype;
-
         $rs = $htd->SaveToBin($rndFileName);
         if ($rs) {
             $info = '';
@@ -166,7 +159,6 @@ function GetCurContent($body)
     $htd->Close();
     return $body;
 }
-
 /**
  * 获取一个远程图片
  *
@@ -215,7 +207,6 @@ function GetRemoteImage($url, $uid = 0)
     $htd->Close();
     return ($ok ? $revalues : '');
 }
-
 /**
  *  获取远程flash
  *
@@ -250,7 +241,6 @@ function GetRemoteFlash($url, $uid = 0)
     $htd->Close();
     return $revalues;
 }
-
 /**
  *  检测频道ID
  *
@@ -263,12 +253,10 @@ function CheckChannel($typeid, $channelid)
 {
     global $dsql;
     if ($typeid == 0) return TRUE;
-
     $row = $dsql->GetOne("SELECT ispart,channeltype FROM `#@__arctype` WHERE id='$typeid' ");
     if ($row['ispart'] != 0 || $row['channeltype'] != $channelid) return FALSE;
     else return TRUE;
 }
-
 /**
  *  检测档案权限
  *
@@ -284,7 +272,6 @@ function CheckArcAdmin($aid, $adminid)
     if ($row['mid'] != $adminid) return FALSE;
     else return TRUE;
 }
-
 /**
  *  文档自动分页
  *
@@ -336,7 +323,6 @@ function SpLongBody($mybody, $spsize, $sptag)
     }
     return addslashes($mybody);
 }
-
 /**
  *  创建指定ID的文档
  *
@@ -355,7 +341,6 @@ function MakeArt($aid, $mkindex = FALSE, $ismakesign = FALSE, $isremote = 0)
     $reurl = $arc->MakeHtml($isremote);
     return $reurl;
 }
-
 /**
  *  取第一个图片为缩略图
  *
@@ -375,7 +360,6 @@ function GetDDImgFromBody(&$body)
     }
     return $litpic;
 }
-
 /**
  *  获得缩略图
  *
@@ -389,8 +373,7 @@ function GetDDImage($litpic, $picname, $isremote)
 {
     global $cuserLogin, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir, $ddcfg_image_dir, $cfg_addon_savetype;
     $ntime = time();
-    if (($litpic != 'none' || $litpic != 'ddfirst') &&
-        !empty($_FILES[$litpic]['tmp_name']) && is_uploaded_file($_FILES[$litpic]['tmp_name'])
+    if (($litpic != 'none' || $litpic != 'ddfirst') && !empty($_FILES[$litpic]['tmp_name']) && is_uploaded_file($_FILES[$litpic]['tmp_name'])
     ) {
         //如果用户自行上传缩略图
         $istype = 0;
@@ -401,7 +384,6 @@ function GetDDImage($litpic, $picname, $isremote)
             exit();
         }
         $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
-
         CreateDir($savepath);
         $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
         if (strtolower($_FILES[$litpic]['type']) == "image/gif") {
@@ -411,21 +393,16 @@ function GetDDImage($litpic, $picname, $isremote)
         } else {
             $fullUrl = $fullUrl.".jpg";
         }
-
         @move_uploaded_file($_FILES[$litpic]['tmp_name'], $cfg_basedir.$fullUrl);
         $litpic = $fullUrl;
-
         if ($GLOBALS['cfg_ddimg_full'] == 'Y') @ImageResizeNew($cfg_basedir.$fullUrl, $cfg_ddimg_width, $cfg_ddimg_height);
         else @ImageResize($cfg_basedir.$fullUrl, $cfg_ddimg_width, $cfg_ddimg_height);
-
         $img = $cfg_basedir.$litpic;
     } else {
-
         $picname = trim($picname);
         if ($isremote == 1 && preg_match("#^http:\/\/#i", $picname)) {
             $litpic = $picname;
             $ddinfos = GetRemoteImage($litpic, $cuserLogin->getUserID());
-
             if (!is_array($ddinfos)) {
                 $litpic = '';
             } else {
@@ -451,7 +428,6 @@ function GetDDImage($litpic, $picname, $isremote)
     if ($litpic == 'litpic' || $litpic == 'ddfirst') $litpic = '';
     return $litpic;
 }
-
 /**
  *  获得一个附加表单
  *
@@ -463,7 +439,6 @@ function GetFormItemA($ctag)
 {
     return GetFormItem($ctag, 'admin');
 }
-
 /**
  *  处理不同类型的数据
  *
@@ -479,7 +454,6 @@ function GetFieldValueA($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '')
 {
     return GetFieldValue($dvalue, $dtype, $aid, $job, $addvar, 'admin');
 }
-
 /**
  *  获得带值的表单(编辑时用)
  *
@@ -492,7 +466,6 @@ function GetFormItemValueA($ctag, $fvalue)
 {
     return GetFormItemValue($ctag, $fvalue, 'admin');
 }
-
 /**
  *  载入自定义表单(用于发布)
  *
@@ -510,8 +483,7 @@ function PrintAutoFieldsAdd($fieldset, $loadtype = 'all')
     if (is_array($dtp->CTags)) {
         foreach ($dtp->CTags as $tid => $ctag) {
             if (
-                $loadtype != 'autofield'
-                || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)
+                $loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)
             ) {
                 $dede_addonfields .= ($dede_addonfields == "" ? $ctag->GetName().",".$ctag->GetAtt('type') : ";".$ctag->GetName().",".$ctag->GetAtt('type'));
                 echo  GetFormItemA($ctag);
@@ -520,7 +492,6 @@ function PrintAutoFieldsAdd($fieldset, $loadtype = 'all')
     }
     echo "<input type='hidden' name='dede_addonfields' value=\"".$dede_addonfields."\">\r\n";
 }
-
 /**
  *  载入自定义表单(用于编辑)
  *
@@ -539,8 +510,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all')
     if (is_array($dtp->CTags)) {
         foreach ($dtp->CTags as $tid => $ctag) {
             if (
-                $loadtype != 'autofield'
-                || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)
+                $loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)
             ) {
                 $dede_addonfields .= ($dede_addonfields == '' ? $ctag->GetName().",".$ctag->GetAtt('type') : ";".$ctag->GetName().",".$ctag->GetAtt('type'));
                 echo GetFormItemValueA($ctag, $fieldValues[$ctag->GetName()]);
@@ -549,8 +519,6 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all')
     }
     echo "<input type='hidden' name='dede_addonfields' value=\"".$dede_addonfields."\">\r\n";
 }
-
-
 /**
  * 处理HTML文本
  * 删除非站外链接、自动摘要、自动获取缩略图
@@ -569,12 +537,10 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = ''
     global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
     $autolitpic = (empty($autolitpic) ? '' : $autolitpic);
     $body = stripslashes($body);
-
     //远程图片本地化
     if ($remote == 1) {
         $body = GetCurContent($body);
     }
-
     //删除非站内链接
     if ($dellink == 1) {
         $allow_urls = array($_SERVER['HTTP_HOST']);
@@ -584,21 +550,18 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = ''
         }
         $body = Replace_Links($body, $allow_urls);
     }
-
     //自动摘要
     if ($description == '' && $cfg_auot_description > 0) {
         $description = cn_substr(html2text($body), $cfg_auot_description);
         $description = trim(preg_replace('/#p#|#e#/', '', $description));
         $description = addslashes($description);
     }
-
     //自动获取缩略图
     if ($autolitpic == 1 && $litpic == '') {
         $litpic = GetDDImgFromBody($body);
     }
-
     //自动获取关键字
-    if ($autokey == 1 && $keywords == '') {
+    if ($autokey == 2 && $keywords == '') {
         $subject = $title;
         $message = $body;
         // 采用DedeBIZ Core分词组件分词
@@ -620,7 +583,6 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = ''
             $sp->SetSource(Html2Text($message), $cfg_soft_lang, $cfg_soft_lang);
             $sp->StartAnalysis();
             $allindexs = preg_replace("/#p#|#e#/", '', $sp->GetFinallyIndex());
-
             if (is_array($allindexs) && is_array($titleindexs)) {
                 foreach ($titleindexs as $k => $v) {
                     if (strlen($keywords.$k) >= 60) {
@@ -646,7 +608,6 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = ''
     $body = addslashes($body);
     return $body;
 }
-
 /**
  *  删除非站内链接
  *
@@ -681,7 +642,6 @@ function Replace_Links(&$body, $allow_urls = array())
     $arr = $rparr = $tgarr = '';
     return $body;
 }
-
 /**
  *  图集里大图的小图
  *
@@ -696,10 +656,8 @@ function GetImageMapDD($filename, $maxwidth)
     $ddn = substr($filename, -3);
     $ddpicok = preg_replace("#\.".$ddn."$#", "-lp.".$ddn, $filename);
     $toFile = $GLOBALS['cfg_basedir'].$ddpicok;
-
     if ($cfg_ddimg_full == 'Y') ImageResizeNew($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile);
     else ImageResize($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile);
-
     //保存图片附件信息
     $fsize = filesize($toFile);
     $ddpicoks = explode('/', $ddpicok);
@@ -709,11 +667,8 @@ function GetImageMapDD($filename, $maxwidth)
     $dsql->ExecuteNoneQuery($inquery);
     $fid = $dsql->GetLastID();
     AddMyAddon($fid, $ddpicok);
-
     return $ddpicok;
 }
-
-
 /**
  *  上传一个未经处理的图片
  *
@@ -734,7 +689,6 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
     $filename = '';
     $isrm_up = FALSE;
     $handurl = trim($handurl);
-
     //如果用户自行上传了图片
     if (!empty($_FILES[$upname]['tmp_name']) && is_uploaded_file($_FILES[$upname]['tmp_name'])) {
         $istype = 0;
@@ -762,22 +716,18 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
         } else {
             $fullUrl = $fullUrl.".jpg";
         }
-
         //保存
         @move_uploaded_file($_FILES[$upname]['tmp_name'], $cfg_basedir.$fullUrl);
         $filename = $fullUrl;
-
         //水印
         @WaterImg($cfg_basedir.$fullUrl, 'up');
         $isrm_up = TRUE;
     }
-
     //远程或选择本地图片
     else {
         if ($handurl == '') {
             return '';
         }
-
         //远程图片并要求本地化
         if ($isremote == 1 && preg_match("#^http[s]?:\/\/#i", $handurl)) {
             $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID());
@@ -787,7 +737,6 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
                 $filename = $ddinfos[0];
             }
             $isrm_up = TRUE;
-
             //本地图片或远程不要求本地化
         } else {
             $filename = $handurl;
@@ -797,17 +746,14 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
     if (is_file($imgfile) && $isrm_up && $filename != '') {
         $info = "";
         $imginfos = GetImageSize($imgfile, $info);
-
         //把新上传的图片信息保存到媒体文档管理档案中
         $inquery = "
         INSERT INTO `#@__uploads`(title,url,mediatype,width,height,playtime,filesize,uptime,mid)
-        VALUES ('$title','$filename','1','" . $imginfos[0] . "','" . $imginfos[1] . "','0','" . filesize($imgfile) . "','" . time() . "','" . $cuserLogin->getUserID() . "');
-    ";
+        VALUES ('$title','$filename','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".time()."','".$cuserLogin->getUserID()."');";
         $dsql->ExecuteNoneQuery($inquery);
     }
     return $filename;
 }
-
 /**
  *  获取更新测试信息
  *

src/dede/inc/inc_list_functions.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 列表对应函数
  *
@@ -12,7 +11,6 @@
 if (!isset($registerGlobals)) {
     require_once(dirname(__FILE__)."/../../include/common.inc.php");
 }
-
 // 获取栏目名称
 function GetTypename($tid)
 {
@@ -32,14 +30,12 @@ function GetTypename($tid)
     }
     return '';
 }
-
 //获得是否推荐的表述
 $arcatts = array();
 $dsql->Execute('n', 'SELECT * FROM `#@__arcatt` ');
 while ($arr = $dsql->GetArray('n')) {
     $arcatts[$arr['att']] = $arr['attname'];
 }
-
 function IsCommendArchives($iscommend)
 {
     global $arcatts;
@@ -50,19 +46,13 @@ function IsCommendArchives($iscommend)
     }
     $sn = trim($sn);
     if ($sn == '') return '';
-    else return "[<font color='red'>$sn</font>]";
+    else return "<span style='color:#dc3545'>[$sn]</span>";
 }
-
 //获得推荐的标题
 function GetCommendTitle($title, $iscommend)
 {
-    /*if(preg_match('#c#i',$iscommend))
-    {
-        $title = "$title<font color='red'>(推荐)</font>";
-    }*/
     return $title;
 }
-
 //更换颜色
 $GLOBALS['RndTrunID'] = 1;
 function GetColor($color1, $color2)
@@ -74,7 +64,6 @@ function GetColor($color1, $color2)
         return $color2;
     }
 }
-
 //检查图片是否存在
 function CheckPic($picname)
 {
@@ -84,7 +73,6 @@ function CheckPic($picname)
         return "images/dfpic.gif";
     }
 }
-
 //判断内容是否生成HTML
 function IsHtmlArchives($ismake)
 {
@@ -93,10 +81,9 @@ function IsHtmlArchives($ismake)
     } else if ($ismake == -1) {
         return "仅动态";
     } else {
-        return "<font color='red'>未生成</font>";
+        return "<span style='color:#dc3545'>未生成</span>";
     }
 }
-
 //获得内容的限定级别名称
 function GetRankName($arcrank)
 {
@@ -114,12 +101,11 @@ function GetRankName($arcrank)
         return "不限";
     }
 }
-
 //判断内容是否为图片文章
 function IsPicArchives($picname)
 {
     if ($picname != '') {
-        return '<font color=\'red\'>(图)</font>';
+        return "<span style='color:#dc3545'>[图]</span>";
     } else {
         return '';
     }

src/dede/inc/inc_menu.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 后台管理菜单项
  *
@@ -10,10 +9,8 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/../config.php");
-
 //载入可发布频道
 $addset = '';
-
 //检测可用的内容模型
 if ($cfg_admin_channel = 'array' && count($admin_catalogs) > 0) {
     $admin_catalog = join(',', $admin_catalogs);
@@ -32,7 +29,6 @@ $dsql->Execute('mm');
 while ($row = $dsql->GetObject('mm')) {
     $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />\r\n";
 }
-//////////////////////////
 $helpUrl = DEDEBIZURL."/help";
 $gitUrl = DEDEBIZURL."/git";
 $dedebizUrl = DEDEBIZURL;
@@ -44,8 +40,7 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
     <m:item name='自定义表单' link='diy_main.php' rank='c_List' target='main' />
-</m:top>
-";
+</m:top>";
   $adminMenu2 = "<m:top item='7_' name='模板管理' display='none' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main'/>
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main'/>
@@ -53,7 +48,6 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main'/>
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main'/>
 </m:top>
-
 <m:top item='10_' name='系统设置' display='none' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
     <m:item name='系统基本参数' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统用户管理' link='sys_admin_user.php' rank='sys_User' target='main' />
@@ -64,12 +58,11 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='软件频道设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
     <m:item name='防采集串混淆' link='article_string_mix.php' rank='sys_StringMix' target='main' />
     <m:item name='随机模板设置' link='article_template_rand.php' rank='sys_StringMix' target='main' />
-  <m:item name='数据库备份/还原' link='sys_data.php' rank='sys_Data' target='main' />
+    <m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />
     <m:item name='SQL命令行工具' link='sys_sql_query.php' rank='sys_Data' target='main' />
-  <m:item name='病毒扫描[S]' link='sys_safetest.php' rank='sys_verify' target='main' />
-  <m:item name='系统错误修复[S]' link='sys_repair.php' rank='sys_verify' target='main' />
+    <m:item name='病毒文件扫描' link='sys_safetest.php' rank='sys_verify' target='main' />
+    <m:item name='系统错误修复' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>
-
 <m:top item='10_6_' name='支付工具' display='none' rank='sys_Data'>
     <m:item name='点卡产品分类' link='cards_type.php' rank='sys_Data' target='main' />
     <m:item name='点卡产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
@@ -78,75 +71,59 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='商店订单记录' link='shops_operations.php' rank='sys_Data' target='main' />
     <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
     <m:item name='配货方式设置' link='shops_delivery.php' rank='sys_Data' target='main' />
-</m:top>
-    ";
+</m:top>";
 }
-$menusMain = "
------------------------------------------------
-
-<m:top item='1_' name='常用操作' display='block'>
+$menusMain = "<m:top item='1_' name='常用操作' display='block'>
     <m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
     <m:item name='所有档案列表' link='content_list.php' rank='a_List,a_AccList' target='main' />
     <m:item name='等审核的档案' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
     <m:item name='我发布的文档' link='content_list.php?mid=".$cuserLogin->getUserID()."' rank='a_List,a_AccList,a_MyList' target='main' />
     <m:item name='评论管理' link='feedback_main.php' rank='sys_Feedback' target='main' />
-  <m:item name='内容回收站' link='recycling.php' ischannel='1' addalt='清空回收站' addico='images/gtk-del.png' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
+    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空回收站' addico='images/gtk-del.png' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
 </m:top>
-
 <m:top item='1_' name='内容管理' display='block'>
     $addset
     <m:item name='专题管理' ischannel='1' link='content_s_list.php' linkadd='spec_add.php' channelid='-1' rank='spec_New' target='main' />
 </m:top>
-
 <m:top item='1_' name='附件管理' display='none' rank='sys_Upload,sys_MyUpload,plus_文件管理器'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
     <m:item name='附件数据管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
     <m:item name='文件式管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
-
 $adminMenu1
-
 <m:top item='1_3_3' name='批量维护' display='block'>
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='搜索关键词维护' link='search_keywords_main.php' rank='sys_Keyword' target='main' />
     <m:item name='文档关键词维护' link='article_keywords_main.php' rank='sys_Keyword' target='main' />
     <m:item name='重复文档检测' link='article_test_same.php' rank='sys_ArcBatch' target='main' />
-  <m:item name='自动摘要|分页' link='article_description_main.php' rank='sys_Keyword' target='main' />
+    <m:item name='自动摘要分页' link='article_description_main.php' rank='sys_Keyword' target='main' />
     <m:item name='Tag标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='数据库内容替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-
 <m:top item='5_' name='自动任务' notshowall='1'  display='block' rank='sys_MakeHtml'>
     <m:item name='一键更新网站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-
-<m:top item='5_' name='HTML更新' notshowall='1' display='none' rank='sys_MakeHtml'>
-  <m:item name='更新主页HTML' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新栏目HTML' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新文档HTML' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
+<m:top item='5_' name='更新网站' notshowall='1' display='none' rank='sys_MakeHtml'>
+    <m:item name='更新主页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新网站地图' link='makehtml_map_guide.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新RSS文件' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='获取JS文件' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新专题HTML' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新Tag HTML' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='获取脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
 </m:top>
-
 <m:top item='6_' name='会员管理' display='none' rank='member_List,member_Type'>
     <m:item name='注册会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
 </m:top>
-
 $adminMenu2
-
 <m:top item='1_10_7_' name='系统帮助' display='none'>
     <m:item name='参考文档' link='$cfg_biz_helpUrl' rank='' target='_blank' />
     <m:item name='代码托管' link='$cfg_biz_gitUrl' rank='' target='_blank' />
     <m:item name='商业支持' link='$cfg_biz_dedebizUrl' rank='' target='_blank' />
-</m:top>
-
------------------------------------------------
-";
+</m:top>";

src/dede/inc/inc_menu_map.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 菜单地图
  *
@@ -10,12 +9,9 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/../config.php");
-
 $maparray = array(1 => '文档相关', 2 => '系统设置', 3 => '必须辅助功能', 4 => '网站更新操作', 5 => '会员相关', 6 => '基本模块插件');
-
 //载入可发布频道
 $addset = '';
-
 //检测可用的内容模型
 if ($cfg_admin_channel = 'array' && count($admin_catalogs) > 0) {
     $admin_catalog = join(',', $admin_catalogs);
@@ -34,24 +30,18 @@ $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />\r\n";
 }
-//////////////////////////
-$menusMain = "
------------------------------------------------
-
-<m:top mapitem='1' item='1_' name='常用操作' display='block'>
+$menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
     <m:item name='所有档案列表' link='content_list.php' rank='a_List,a_AccList' target='main' />
     <m:item name='等审核的档案' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
     <m:item name='我发布的文档' link='content_list.php?mid=".$cuserLogin->getUserID()."' rank='a_List,a_AccList,a_MyList' target='main' />
     <m:item name='评论管理' link='feedback_main.php' rank='sys_Feedback' target='main' />
-  <m:item name='内容回收站' link='recycling.php' ischannel='1' addalt='清空回收站' addico='img/gtk-del.png' linkadd='archives_do.php?dopost=clear&aid=no' rank='a_List' target='main' />
+    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空回收站' addico='img/gtk-del.png' linkadd='archives_do.php?dopost=clear&aid=no' rank='a_List' target='main' />
 </m:top>
-
 <m:top mapitem='1' item='1_' name='内容管理' display='block'>
     $addset
     <m:item name='专题管理' ischannel='1' link='content_s_list.php' linkadd='spec_add.php' channelid='-1' rank='spec_New' target='main' />
 </m:top>
-
 <m:top mapitem='1' item='1_' name='频道模型' display='block' rank='t_List,t_AccList,c_List,temp_One'>
     <m:item name='内容模型管理' link='mychannel_main.php' rank='c_List' target='main' />
     <m:item name='单页文档管理' link='templets_one.php' rank='temp_One' target='main'/>
@@ -59,45 +49,40 @@ $menusMain = "
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
     <m:item name='自定义表单' link='diy_main.php' rank='c_List' target='main' />
 </m:top>
-
 <m:top mapitem='3' item='1_3_3' name='批量维护' display='block'>
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='搜索关键词维护' link='search_keywords_main.php' rank='sys_Keyword' target='main' />
     <m:item name='文档关键词维护' link='article_keywords_main.php' rank='sys_Keyword' target='main' />
-  <m:item name='自动摘要|分页' link='article_description_main.php' rank='sys_Keyword' target='main' />
+    <m:item name='自动摘要分页' link='article_description_main.php' rank='sys_Keyword' target='main' />
     <m:item name='Tag标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='数据库内容替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-
 <m:top mapitem='4' item='5_' name='自动任务' notshowall='1'  display='block' rank='sys_MakeHtml'>
     <m:item name='一键更新网站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-
-<m:top mapitem='4' item='5_' name='HTML更新' notshowall='1' display='none' rank='sys_MakeHtml'>
-  <m:item name='更新主页HTML' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新栏目HTML' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新文档HTML' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
+<m:top mapitem='4' item='5_' name='更新网站' notshowall='1' display='none' rank='sys_MakeHtml'>
+    <m:item name='更新主页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新网站地图' link='makehtml_map_guide.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新RSS文件' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='获取JS文件' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
-  <m:item name='更新专题HTML' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='获取脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
 </m:top>
-
 <m:top mapitem='3' item='1_6_' name='附件管理' display='none' rank='sys_Upload,sys_MyUpload,plus_文件管理器'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
     <m:item name='附件数据管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
     <m:item name='文件式管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
-
 <m:top mapitem='5' item='6_' name='会员管理' display='none' rank='member_List,member_Type'>
     <m:item name='注册会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
 </m:top>
-
 <m:top mapitem='2' item='10_' name='系统设置' display='none' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
     <m:item name='系统基本参数' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统用户管理' link='sys_admin_user.php' rank='sys_User' target='main' />
@@ -108,12 +93,11 @@ $menusMain = "
     <m:item name='软件频道设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
     <m:item name='防采集串混淆' link='article_string_mix.php' rank='sys_StringMix' target='main' />
     <m:item name='随机模板设置' link='article_template_rand.php' rank='sys_StringMix' target='main' />
-  <m:item name='数据库备份/还原' link='sys_data.php' rank='sys_Data' target='main' />
+    <m:item name='数据库备份还原' link='sys_data.php' rank='sys_Data' target='main' />
     <m:item name='SQL命令行工具' link='sys_sql_query.php' rank='sys_Data' target='main' />
-  <m:item name='病毒扫描[S]' link='sys_safetest.php' rank='sys_verify' target='main' />
-  <m:item name='系统错误修复[S]' link='sys_repair.php' rank='sys_verify' target='main' />
+    <m:item name='病毒文件扫描' link='sys_safetest.php' rank='sys_verify' target='main' />
+    <m:item name='系统错误修复' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>
-
 <m:top mapitem='5' item='10_6_' name='支付工具' display='none' rank='sys_Data'>
     <m:item name='点卡产品分类' link='cards_type.php' rank='sys_Data' target='main' />
     <m:item name='点卡产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
@@ -123,17 +107,13 @@ $menusMain = "
     <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
     <m:item name='配货方式设置' link='shops_delivery.php' rank='sys_Data' target='main' />
 </m:top>
-
 <m:top mapitem='2' item='10_7_' name='模板管理' display='none' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main'/>
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main'/>
     <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main'/>
     <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main'/>
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main'/>
-</m:top>
-
-";
-
+</m:top>";
 //载入插件菜单
 $plusset = '';
 $dsql->SetQuery("SELECT * FROM `#@__plus` WHERE isshow=1 ORDER BY aid ASC");
@@ -141,25 +121,20 @@ $dsql->Execute();
 while ($row = $dsql->GetObject()) {
   $plusset .= $row->menustring."\r\n";
 }
-
 $menusMain .= "
 <m:top mapitem='6' name='模块管理' c='6,' display='block'>
     <m:item name='模块管理' link='module_main.php' rank='sys_module' target='main' />
     <m:item name='上传新模块' link='module_upload.php' rank='sys_module' target='main' />
     <m:item name='模块打包' link='module_make.php' rank='sys_module' target='main' />
 </m:top>
-
 <m:top mapitem='6' item='7' name='辅助插件' display='block'>
     <m:item name='插件管理器' link='plus_main.php' rank='10' target='main' />
     $plusset
-</m:top>
-";
-
+</m:top>";
 $mapstring = '';
 $dtp = new DedeTagparse();
 $dtp->SetNameSpace('m', '<', '>');
 $dtp->LoadString($menusMain);
-
 foreach ($maparray as $k => $bigname) {
     $mapstring .= "<dl class='maptop'>\r\n";
     $mapstring .= "<dt class='bigitem'>$bigname</dt>\r\n";

src/dede/inc/inc_menu_module.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 模块菜单
  *
@@ -10,7 +9,6 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/../config.php");
-
 /*
 模块菜单一般在不要直接改此文件，直接保存在#@__sys_module表即可，格式为
 <m:top name='问答模块管理' c='6,' display='block' rank=''>
@@ -20,7 +18,6 @@ require_once(dirname(__FILE__) . "/../config.php");
 </m:top>
 这个菜单可在生成模块时指定
 */
-
 //载入模块菜单
 $moduleset = '';
 $dsql->SetQuery("SELECT * FROM `#@__sys_module` ORDER BY id DESC");
@@ -28,7 +25,6 @@ $dsql->Execute('mm');
 while ($row = $dsql->GetObject('mm')) {
     $moduleset .= $row->menustring."\r\n";
 }
-
 //载入插件菜单
 $plusset = '';
 $dsql->SetQuery("SELECT * FROM `#@__plus` WHERE isshow=1 ORDER BY aid ASC");
@@ -37,7 +33,6 @@ while ($row = $dsql->GetObject()) {
     $row->menustring = str_replace('plus_友情链接', 'plus_友情链接模块', $row->menustring);
     $plusset .= $row->menustring."\r\n";
 }
-
 $adminMenu = '';
 if ($cuserLogin->getUserType() >= 10) {
     $adminMenu = "<m:top name='模块管理' c='6,' display='block'>
@@ -46,15 +41,11 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='模块打包' link='module_make.php' rank='sys_module' target='main' />
     </m:top>";
 }
-
 $menusMoudle = "
------------------------------------------------
 $adminMenu
 <m:top item='7' name='辅助插件' display='block'>
     <m:item name='插件管理器' link='plus_main.php' rank='10' target='main' />
     $plusset
 </m:top>
-
 $moduleset
------------------------------------------------
 ";

src/dede/index_body.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 管理后台首页主体
  *
@@ -15,7 +14,6 @@ require(DEDEINC . '/dedetag.class.php');
 $defaultIcoFile = DEDEDATA.'/admin/quickmenu.txt';
 $myIcoFile = DEDEDATA.'/admin/quickmenu-'.$cuserLogin->getUserID().'.txt';
 if (!file_exists($myIcoFile)) $myIcoFile = $defaultIcoFile;
-
 //默认主页
 if (empty($dopost)) {
     require(DEDEINC.'/inc/inc_fun_funAdmin.php');
@@ -35,47 +33,44 @@ if (empty($dopost)) {
 /*-----------------------
 增加新项
 function _AddNew() {   }
--------------------------*/ else if ($dopost == 'addnew') {
+-------------------------*/
+else if ($dopost == 'addnew') {
     if (empty($link) || empty($title)) {
-        ShowMsg("链接网址或标题不能为空！", "-1");
+        ShowMsg("链接网址或标题不能为空", "-1");
         exit();
     }
-
     $fp = fopen($myIcoFile, 'r');
     $oldct = trim(fread($fp, filesize($myIcoFile)));
     fclose($fp);
-
     $link = preg_replace("#['\"]#", '`', $link);
     $title = preg_replace("#['\"]#", '`', $title);
     $ico = preg_replace("#['\"]#", '`', $ico);
-    $oldct .= "\r\n<menu:item ico=\"{$ico}\" link=\"{$link}\" title=\"{$title}\" />";
-
+    $oldct .= "\r\n<menu:item ico=\"{$ico}\" link=\"{$link}\" title=\"{$title}\">";
     $myIcoFileTrue = DEDEDATA.'/admin/quickmenu-'.$cuserLogin->getUserID().'.txt';
     $fp = fopen($myIcoFileTrue, 'w');
     fwrite($fp, $oldct);
     fclose($fp);
-
-    ShowMsg("成功增加一个项目！", "index_body.php?" . time());
+    ShowMsg("成功增加一个项目", "index_body.php?".time());
     exit();
 }
 /*---------------------------
 保存修改的项
 function _EditSave() {   }
-----------------------------*/ else if ($dopost == 'editsave') {
+----------------------------*/
+else if ($dopost == 'editsave') {
     $quickmenu = stripslashes($quickmenu);
-
     $myIcoFileTrue = DEDEDATA.'/admin/quickmenu-'.$cuserLogin->getUserID().'.txt';
     $fp = fopen($myIcoFileTrue, 'w');
     fwrite($fp, $quickmenu);
     fclose($fp);
-
-    ShowMsg("成功修改快捷操作项目！", "index_body.php?" . time());
+    ShowMsg("成功修改快捷操作项目", "index_body.php?".time());
     exit();
 }
 /*---------------------------
 保存修改的项
 function _EditSave() {   }
-----------------------------*/ else if ($dopost == 'movesave') {
+----------------------------*/
+else if ($dopost == 'movesave') {
     $movedata = str_replace('\\', "", $sortorder);
     $movedata = json_decode($movedata, TRUE);
     $movedata = serialize($movedata);
@@ -87,19 +82,20 @@ function _EditSave() {   }
 /*-----------------------------
 显示修改表单
 function _EditShow() {   }
------------------------------*/ else if ($dopost == 'editshow') {
+-----------------------------*/
+else if ($dopost == 'editshow') {
     $fp = fopen($myIcoFile, 'r');
     $oldct = trim(fread($fp, filesize($myIcoFile)));
     fclose($fp);
 ?>
     <form name='editform' action='index_body.php' method='post'>
-        <input type='hidden' name='dopost' value='editsave' />
+        <input type='hidden' name='dopost' value='editsave'>
         <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
                 <td height='28' background="images/tbg.gif">
                     <div style='float:left'><b>修改快捷操作项</b></div>
                     <div style='float:right;padding:3px 10px 0 0;'>
-                        <a href="javascript:CloseTab('editTab')"><img src="images/close.gif" width="12" height="12" border="0" /></a>
+                        <a href="javascript:CloseTab('editTab')"><img src="images/close.gif" width="12" height="12" border="0"></a>
                     </div>
                 </td>
             </tr>
@@ -107,20 +103,15 @@ function _EditShow() {   }
                 <td style="height:6px;font-size:1px;border-top:1px solid #8DA659">&nbsp;</td>
             </tr>
             <tr>
-                <td>
-                    按原格式修改/增加XML项。
-                </td>
+                <td>按原格式修改/增加XML项。</td>
             </tr>
             <tr>
-                <td align='center'>
-                    <textarea name="quickmenu" rows="10" cols="50" style="width:94%;height:220px"><?php echo $oldct; ?></textarea>
-                </td>
+                <td align='center'><textarea name="quickmenu" rows="10" cols="50" style="width:94%;height:220px"><?php echo $oldct; ?></textarea></td>
             </tr>
             <tr>
-                <td height="45" align="center">
-                    <input type="submit" name="Submit" value="保存项目" class="np coolbg" style="width:80px;cursor:pointer" />
-                    &nbsp;
-                    <input type="reset" name="reset" value="重设" class="np coolbg" style="width:50px;cursor:pointer" />
+                <td height="46" align="center">
+                    <input type="submit" name="Submit" value="保存项目" class="np coolbg" style="width:80px;cursor:pointer">&nbsp;
+                    <input type="reset" name="reset" value="重设" class="np coolbg" style="width:50px;cursor:pointer">
                 </td>
             </tr>
         </table>
@@ -131,19 +122,18 @@ function _EditShow() {   }
 /*---------------------------------
 载入右边内容
 function _getRightSide() {   }
----------------------------------*/ else if ($dopost == 'getRightSide') {
+---------------------------------*/
+else if ($dopost == 'getRightSide') {
     $query = " SELECT COUNT(*) AS dd FROM `#@__member` ";
     $row1 = $dsql->GetOne($query);
     $query = " SELECT COUNT(*) AS dd FROM `#@__feedback` ";
     $row2 = $dsql->GetOne($query);
-
     $chArrNames = array();
     $query = "SELECT id, typename FROM `#@__channeltype` ";
     $dsql->Execute('c', $query);
     while ($row = $dsql->GetArray('c')) {
         $chArrNames[$row['id']] = $row['typename'];
     }
-
     $query = "SELECT COUNT(channel) AS dd, channel FROM `#@__arctiny` GROUP BY channel ";
     $allArc = 0;
     $chArr = array();
@@ -201,9 +191,7 @@ function _getRightSide() {   }
             if ($row['arcrank'] == -1) $linkstr .= "<font color='red'>(未审核)</font>";
         ?>
         <tr>
-                <td class='nline'>
-                    <?php echo $linkstr; ?>
-                </td>
+            <td class='nline'><?php echo $linkstr; ?></td>
         </tr>
         <?php
         }
@@ -223,23 +211,20 @@ function _getRightSide() {   }
     if (!extension_loaded("openssl")) {
         echo json_encode(array(
             "code" => -1001,
-            "msg" => "PHP不支持OpenSSL，无法完成Dede商业授权",
+            "msg" => "PHP不支持OpenSSL，无法完成商业版授权",
             "result" => null,
         ));
         exit;
     }
-
     if (empty($cfg_auth_code)) {
         echo json_encode(array(
             "code" => -1002,
-            "msg" => "当前站点尚未购买Dede商业授权",
+            "msg" => "当前站点尚未购买商业版授权",
             "result" => null,
         ));
         exit;
     }
-
     openssl_public_decrypt(base64_decode($cfg_auth_code), $decotent, DEDEPUB);
-
     $core_info = new stdClass;
     if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
         $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
@@ -248,7 +233,6 @@ function _getRightSide() {   }
         $core_info = $client->SystemInfo();
         $client->Close();
     }
-
     if (!empty($decotent)) {
         $res = json_decode($decotent);
         if (isset($res->sid)) {

src/dede/js/mode/clike/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: C-like mode</title>
 <meta charset="utf-8"/>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">C-like</a>
+    <li><a class=active href="javascript:;">C-like</a>
   </ul>
 </div>
 

src/dede/js/mode/clike/scala.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: Scala mode</title>
 <meta charset="utf-8"/>
@@ -19,7 +19,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Scala</a>
+    <li><a class=active href="javascript:;">Scala</a>
   </ul>
 </div>
 

src/dede/js/mode/css/gss.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: Closure Stylesheets (GSS) mode</title>
 <meta charset="utf-8"/>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Closure Stylesheets (GSS)</a>
+    <li><a class=active href="javascript:;">Closure Stylesheets (GSS)</a>
   </ul>
 </div>
 

src/dede/js/mode/css/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: CSS mode</title>
 <meta charset="utf-8"/>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CSS</a>
+    <li><a class=active href="javascript:;">CSS</a>
   </ul>
 </div>
 

src/dede/js/mode/css/less.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: LESS mode</title>
 <meta charset="utf-8"/>
@@ -19,7 +19,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">LESS</a>
+    <li><a class=active href="javascript:;">LESS</a>
   </ul>
 </div>
 

src/dede/js/mode/css/scss.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: SCSS mode</title>
 <meta charset="utf-8"/>
@@ -18,7 +18,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">SCSS</a>
+    <li><a class=active href="javascript:;">SCSS</a>
   </ul>
 </div>
 

src/dede/js/mode/htmlmixed/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: HTML mixed mode</title>
 <meta charset="utf-8"/>
@@ -23,7 +23,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">HTML mixed</a>
+    <li><a class=active href="javascript:;">HTML mixed</a>
   </ul>
 </div>
 

src/dede/js/mode/javascript/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: JavaScript mode</title>
 <meta charset="utf-8"/>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">JavaScript</a>
+    <li><a class=active href="javascript:;">JavaScript</a>
   </ul>
 </div>
 

src/dede/js/mode/javascript/json-ld.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: JSON-LD mode</title>
 <meta charset="utf-8"/>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">JSON-LD</a>
+    <li><a class=active href="javascript:;">JSON-LD</a>
   </ul>
 </div>
 

src/dede/js/mode/javascript/typescript.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: TypeScript mode</title>
 <meta charset="utf-8"/>
@@ -18,7 +18,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">TypeScript</a>
+    <li><a class=active href="javascript:;">TypeScript</a>
   </ul>
 </div>
 

src/dede/js/mode/php/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: PHP mode</title>
 <meta charset="utf-8"/>
@@ -24,7 +24,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">PHP</a>
+    <li><a class=active href="javascript:;">PHP</a>
   </ul>
 </div>
 

src/dede/js/mode/sql/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: SQL Mode for CodeMirror</title>
 <meta charset="utf-8"/>
@@ -26,7 +26,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">SQL Mode for CodeMirror</a>
+    <li><a class=active href="javascript:;">SQL Mode for CodeMirror</a>
   </ul>
 </div>
 

src/dede/js/mode/xml/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <title>CodeMirror: XML mode</title>
 <meta charset="utf-8"/>
@@ -18,7 +18,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">XML</a>
+    <li><a class=active href="javascript:;">XML</a>
   </ul>
 </div>
 

src/dede/templets/album_add.htm

@@ -81,7 +81,7 @@
           <table width="168" border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规内容&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>高级参数</u></a>&nbsp;</td>
             </tr>
           </table>
@@ -93,7 +93,7 @@
         <td colspan="2">
           <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem1()"><u>常规内容</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">高级参数&nbsp;</td>
             </tr>

src/dede/templets/album_edit.htm

@@ -83,7 +83,7 @@ body {
       <td colspan="2"><table width="168" border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规内容&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>图集图片</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()"><u>图集图片</u></a>&nbsp;</td>
           </tr>
         </table></td>
     </tr>
@@ -92,7 +92,7 @@ body {
     <tr>
       <td colspan="2"><table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规内容</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()"><u>常规内容</u></a>&nbsp;</td>
             <td width="84" align="center" background="images/itemnote1.gif">图集图片&nbsp;</td>
           </tr>
         </table></td>

src/dede/templets/archives_add.htm

@@ -63,7 +63,7 @@
         <table width="800" border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                 onClick="ShowItem2()"><u>高级参数</u></a></td>
             <td>&nbsp;</td>
           </tr>
@@ -77,7 +77,7 @@
       <td colspan="2">
         <table height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                 onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>

src/dede/templets/archives_edit.htm

@@ -58,7 +58,7 @@
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                 onClick="ShowItem2()"><u>高级参数</u></a></td>
           </tr>
         </table>
@@ -70,7 +70,7 @@
       <td colspan="2">
         <table height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                 onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>

src/dede/templets/article_add.htm

@@ -31,13 +31,14 @@
 }
 </script>
 <style>
-body{background-image:#ffffff}
-table{border-collapse:separate}
+body{background:#ffffff}
 img{vertical-align:baseline}
-.albCt img{cursor:pointer}
+table{border-collapse:separate}
 input,select{height:auto!important}
+.albCt img{cursor:pointer}
 .multipic{border:1px dashed #FC6}
 .albCt{border-bottom:1px dashed #FC0;margin-bottom:10px;padding-bottom:10px}
+.btn+.btn{margin-left:10px}
 </style>
 </head>
 <body topmargin="8">
@@ -53,7 +54,7 @@ input,select{height:auto !important}
         <table width="800" border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
-            <td><a href="#" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集</a></td>
+            <td><a href="javascript:;" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集</a></td>
           </tr>
         </table>
       </td>
@@ -100,7 +101,7 @@ input,select{height:auto !important}
         <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100" style="padding-left:10px">自定义属性：</td>
+              <td width="90" style="padding-left:10px">自定义属性：</td>
               <td align="left">
               <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
@@ -108,9 +109,9 @@ input,select{height:auto !important}
             	while($trow = $dsql->GetObject())
             	{
             		if($trow->att=='j')
-            		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' onclick='ShowUrlTr()'> {$trow->attname}[{$trow->att}]</label> ";
+            		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' onclick='ShowUrlTr()'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
             		else
-            		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'> {$trow->attname}[{$trow->att}]</label> ";
+            		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
             	}
             	?>
               </td>
@@ -151,7 +152,7 @@ input,select{height:auto !important}
                     <td height="30">
                       <input name="picname" type="text" id="picname" style="width:240px">
                       <button type="button" name="Submit2" style="margin-left:8px" onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择</button>
-                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'>远程</label>
+                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'>&nbsp;远程</label>
                       <span class="btn btn-success btn-sm fileinput-button">
                         <i class="glyphicon glyphicon-plus"></i>
                         选择图片
@@ -192,18 +193,18 @@ input,select{height:auto !important}
         <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100" style="padding-left:10px">文章主栏目：</td>
+              <td width="90" style="padding-left:10px">文章主栏目：</td>
               <td>
-                <span id='typeidct'>
+                <span id="typeidct">
                   <?php
                   $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
-                  echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-                  echo "<option value='0'>请选择栏目...</option>\r\n";
+                  echo "<select name='typeid' id='typeid' style='width:240px'>";
+                  echo "<option value='0'>请选择栏目</option>";
                   echo $typeOptions;
                   echo "</select>";
                   ?>
                 </span>
-                <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择'>
+                <img src="images/menusearch.gif" style="cursor:pointer" onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid')" alt="快捷选择" title="快捷选择">
                 <?php
                 if($cfg_need_typeid2=='Y')
                 {
@@ -370,7 +371,7 @@ input,select{height:auto !important}
                 $dsql->Execute();
                 while($row = $dsql->GetObject())
                 {
-                	echo "<option value='".$row->rank."'>".$row->membername."</option>\r\n";
+                	echo "<option value='".$row->rank."'>".$row->membername."</option>";
                 }
                 ?>
                 </select> </td>
@@ -394,7 +395,8 @@ input,select{height:auto !important}
               <td width="90" style="padding-left:10px">发布选项：</td>
               <td width="380">
                 <label><input name="ishtml" type="radio" class="np" value="1" checked="1">&nbsp;生成HTML&nbsp;</label>
-                <label><input type="radio" name="ishtml" class="np" value="0">&nbsp;仅动态浏览</label></td>
+                <label><input type="radio" name="ishtml" class="np" value="0">&nbsp;仅动态浏览</label>
+              </td>
             </tr>
           </table>
         </td>
@@ -417,7 +419,7 @@ input,select{height:auto !important}
                 foreach($cfg_tamplate_arr as $k=>$v)
                 {
                   $v = trim($v);
-                    echo ($k==$rndsel ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
+                  echo ($k==$rndsel ? "<option value='$v' selected>$v</option>" : "<option value='$v'>$v</option>");
                 }
                 ?>
                 </select>
@@ -432,10 +434,9 @@ input,select{height:auto !important}
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
+    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
       <tr height="36">
-        <td width="4%"></td>
-        <td width="96%" class="py-3">
+        <td style="padding:.6rem">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/dede/templets/article_description_main.htm

@@ -91,7 +91,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/article_edit.htm

@@ -29,10 +29,11 @@
 }
 </script>
 <style>
-body{background-image:#ffffff}
-table{border-collapse:separate}
+body{background:#ffffff}
 img{vertical-align:baseline}
+table{border-collapse:separate}
 .albCt img{cursor:pointer}
+.btn+.btn{margin-left:10px}
 </style>
 </head>
 <body topmargin="8">
@@ -48,7 +49,7 @@ img{vertical-align:baseline}
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()">高级参数</a></td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
           </tr>
         </table>
       </td>
@@ -59,7 +60,7 @@ img{vertical-align:baseline}
       <td colspan="2">
         <table height="26" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()">常规信息</a></td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>
         </table>
@@ -71,7 +72,7 @@ img{vertical-align:baseline}
     <input type="hidden" name="channelid" value="<?php echo $channelid?>">
     <input type="hidden" name="id" value="<?php echo $aid?>">
     <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff">
       <tr>
         <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
@@ -88,7 +89,7 @@ img{vertical-align:baseline}
         <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100" style="padding-left:10px">自定义属性：</td>
+              <td width="90" style="padding-left:10px">自定义属性：</td>
               <td>
                 <?php
                 $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
@@ -103,9 +104,9 @@ img{vertical-align:baseline}
                   }
                   if(preg_match("#".$trow->att."#", $arcRow['flag']))
                   {
-                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked'> {$trow->attname}[{$trow->att}]</label> ";
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
                   } else {
-                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick}> {$trow->attname}[{$trow->att}]</label> ";
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick}>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
                   }
                 }
                 ?>
@@ -143,7 +144,7 @@ img{vertical-align:baseline}
               <td width="90" height="80" style="padding-left:10px">缩略图：</td>
               <td>
                 <input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow['litpic']?>">
-                <label><input type='checkbox' class='np' name='ddisremote' value='1'>远程</label>
+                <label><input type='checkbox' class='np' name='ddisremote' value='1'>&nbsp;远程</label>
                 <span class="btn btn-success btn-sm fileinput-button">
                   <i class="glyphicon glyphicon-plus"></i>
                   选择图片
@@ -182,7 +183,7 @@ img{vertical-align:baseline}
         <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100" style="padding-left:10px">文章主栏目：</td>
+              <td width="90" style="padding-left:10px">文章主栏目：</td>
               <td>
                 <?php
                 $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
@@ -311,7 +312,8 @@ img{vertical-align:baseline}
               <td width="90">发布选项：</td>
               <td>
                 <label><input name="ishtml" type="radio" class="np" value="1" <?php if($arcRow["ismake"]!=-1) echo " checked";?>>&nbsp;生成HTML&nbsp;</label>
-                <label><input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>&nbsp;仅动态浏览</label></td>
+                <label><input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>&nbsp;仅动态浏览</label>
+              </td>
             </tr>
           </table>
         </td>
@@ -384,21 +386,14 @@ img{vertical-align:baseline}
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
-      <tr>
-        <td height="36">
-          <table width="100%" border="0" cellspacing="1" cellpadding="1">
-            <tr>
-              <td width="4%"></td>
-              <td width="96%">
+    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
+      <tr height="36">
+        <td style="padding:.6rem">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>
       </tr>
     </table>
-        </td>
-      </tr>
-    </table>
     <script language='javascript'>InitPage();</script>
   </form>
   <div id="__tmpbody" style="display:none"></div>

src/dede/templets/article_keywords_make.htm

@@ -43,7 +43,7 @@
             		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
             	}
             	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>] 
+            [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>] 
           </td>
         </tr>
       </table></td>

src/dede/templets/cards_make.htm

@@ -92,7 +92,7 @@ $dsql->Close();
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/catalog_add.htm

@@ -181,9 +181,9 @@ $i = 0;
                 <table border="0" cellpadding="0" cellspacing="0">
                   <tr>
                     <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规选项&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem2()"><u>高级选项</u></a>&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem3()"><u>栏目内容</u></a>&nbsp;</td>
                   </tr>
                 </table>
@@ -196,10 +196,10 @@ $i = 0;
               <td colspan="2" bgcolor="#FFFFFF" style="text-align:left;">
                 <table height="24" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;"
                         onClick="ShowItem1()"><u>常规选项</u></a>&nbsp;</td>
                     <td width="84" align="center" background="images/itemnote1.gif">高级选项&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem3()"><u>栏目内容</u></a>&nbsp;</td>
                   </tr>
                 </table>
@@ -212,9 +212,9 @@ $i = 0;
               <td colspan="2" bgcolor="#FFFFFF" style="text-align:left;">
                 <table height="24" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;"
                         onClick="ShowItem1()"><u>常规选项</u></a>&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem2()"><u>高级选项</u>&nbsp;</td>
                     <td width="84" align="center" background="images/itemnote1.gif">栏目内容&nbsp;</td>
                   </tr>

src/dede/templets/catalog_edit.htm

@@ -157,9 +157,9 @@ $i = 0;
                 <table border="0" cellpadding="0" cellspacing="0">
                   <tr>
                     <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规选项&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem2()"><u>高级选项</u></a>&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem3()"><u>栏目内容</u></a>&nbsp;</td>
                   </tr>
                 </table>
@@ -172,10 +172,10 @@ $i = 0;
               <td colspan="2" bgcolor="#FFFFFF" style="text-align:left;">
                 <table height="24" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;"
                         onClick="ShowItem1()"><u>常规选项</u></a>&nbsp;</td>
                     <td width="84" align="center" background="images/itemnote1.gif">高级选项&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem3()"><u>栏目内容</u></a>&nbsp;</td>
                   </tr>
                 </table>
@@ -188,9 +188,9 @@ $i = 0;
               <td colspan="2" bgcolor="#FFFFFF" style="text-align:left;">
                 <table height="24" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;"
                         onClick="ShowItem1()"><u>常规选项</u></a>&nbsp;</td>
-                    <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                    <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                         onClick="ShowItem2()"><u>高级选项</u>&nbsp;</td>
                     <td width="84" align="center" background="images/itemnote1.gif">栏目内容&nbsp;</td>
                   </tr>

src/dede/templets/catalog_main.htm

@@ -1,32 +1,29 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>栏目管理</title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="js/global.js"></script>
-<script language="javascript" src="js/context_menu.js"></script>
-<script language="javascript" src="js/ieemu.js"></script>
-<script language="javascript" src="js/dialog.js"></script>
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript">
+<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="css/base.css">
+<script src="js/global.js"></script>
+<script src="js/context_menu.js"></script>
+<script src="js/ieemu.js"></script>
+<script src="js/dialog.js"></script>
+<script src="../static/js/dedeajax2.js"></script>
+<script>
 function LoadSuns(ctid,tid)
 { 
-    
   if($DE(ctid).innerHTML.length < 10){
     $DE('img'+tid).src = 'images/dedecontract.gif';
 	  var myajax = new DedeAjax($DE(ctid));
 	  myajax.SendGet('catalog_do.php?dopost=GetSunLists&cid='+tid);
-  }
-  else{ 
+  } else {
     showHide(ctid,tid); 
   }
 }
 function showHide(objname,tid)
 {
-    
   if($DE(objname).style.display=="none")
   {
     $DE('img'+tid).src = 'images/dedecontract.gif';
@@ -104,84 +101,64 @@ function SingleMenu(eobj,obj,tid,tname)
 }
 </script>
 <style>
-.coolbg2 {
-border: 1px solid #000000;
-background-color: #F2F5E9;
-height:18px
-}
-.coolbt2 {
-  border-left: 2px solid #EFEFEF;
-  border-top: 2px solid #EFEFEF;
-  border-right: 2px solid #ACACAC;
-  border-bottom: 2px solid #ACACAC;
-  background-color: #F7FCDA
-}
-.nbline {border-bottom: 1px solid #d6d6d6; background-color:#FFFFFF; }
-.bline2 {border-bottom: 1px solid #d6d6d6; background-color:#F9FCEF; }
-td, th{
-  padding: .25em;
-}
-.maintable {
-  border: 1px solid #DEE2E6;
-}
+td,th{padding:.3rem}
+.coolbg2{border:1px solid #000000;background-color:#F2F5E9;height:18px}
+.coolbt2{border-left:2px solid #EFEFEF;border-top:2px solid #EFEFEF;border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#F7FCDA}
+.nbline{border-bottom:1px solid #d6d6d6;background-color:#FFFFFF}
+.bline2{border-bottom:1px solid #d6d6d6;background-color:#F9FCEF}
+.maintable{border:1px solid #DEE2E6}
+.btn+.btn{margin-left:10px}
 </style>
 </head>
-<body background='images/allbg.gif' leftmargin='8' topmargin='8' onLoad="ContextMenu.intializeContextMenu()">
+<body background="images/allbg.gif" leftmargin="8" topmargin="8" onLoad="ContextMenu.intializeContextMenu()">
 <table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf" align="center" class="maintable mt-3">
 <tr>
-   <td height="28" background='images/tbg.gif' style="padding-left:10px;">
-   <div style="float:left" class="py-3">
+  <td height="26" background="images/tbg.gif">
+    <span style="float:left;padding-left:10px;line-height:26px" class="py-3">
     	<strong>网站栏目管理</strong>
-   </div>
-   <div style="float:right;padding-right:6px;" class="py-3">
-   	<a href='catalog_add.php?listtype=all' class='btn btn-success btn-sm'>增加顶级栏目</a>
-    <a href='catalog_add.php?dopost=quick' class='btn btn-success btn-sm'>批量增加栏目</a>
-   	<a href="catalog_do.php?dopost=upcatcache" class='btn btn-success btn-sm'>更新栏目缓存</a>
-   	<a href="makehtml_list.php" class='btn btn-success btn-sm'>更新栏目HTML</a>
-   </a>
+    </span>
+    <span style="float:right;padding-right:10px" class="py-3">
+   	  <a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a>
+      <a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量增加栏目</a>
+   	  <a href="catalog_do.php?dopost=upcatcache" class="btn btn-success btn-sm">更新栏目缓存</a>
+   	  <a href="makehtml_list.php" class="btn btn-success btn-sm">更新栏目</a></a>
+    </span>
   </td>
 </tr>
 <tr>
-    <td height="28" bgcolor="#ffffff">
+  <td height="26" bgcolor="#ffffff">
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr>
-          <td width="51%">提示：可使用右键菜单进行操作。</td>
-          <td width="49%" align="right">
+        <td width="50%" style="padding-left:10px;line-height:26px">提示：可使用右键菜单进行操作</td>
+        <td width="50%" style="padding-right:10px" align="right">
         <?php if(!isset($exallct)) { ?>
-          	<a href='catalog_main.php?exallct=all'>[展开全部]</a>
+        <a href="catalog_main.php?exallct=all" class="btn btn-success btn-sm">展开全部</a>
         <?php } else { ?>
-           	<a href='catalog_main.php'>[普通模式]</a>
+        <a href="catalog_main.php" class="btn btn-success btn-sm">普通模式</a>
         <?php } ?>
         </td>
       </tr>
     </table>
   </td>
 </tr>
-<form name='form1' method='post' action='catalog_do.php?dopost=upRankAll'>
+<form name="form1" method="post" action="catalog_do.php?dopost=upRankAll">
 <tr>
-<td height="120" bgcolor="#FFFFFF" valign="top">
+<td bgcolor="#FFFFFF" valign="top">
 <?php
 if(empty($opendir)) $opendir=-1;
 if($userChannel>0) $opendir=$userChannel;
 $tu = new TypeUnit();
 $tu->ListAllType($userChannel,$opendir);
 ?>
-<br/>
 </td>
 </tr>
 </form>
 <tr>
- <td height="36" bgcolor="#FFFFFF" align="center">
- <table width="98%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
-   <tr>
-    <td align="right">
+  <td height="36" bgcolor="#FFFFFF" align="right" class="py-3" style="padding-right:10px">
     <button type="button" name="sb1" class="btn btn-success btn-sm" onClick="document.form1.submit();">更新排序</button>
-      <button type="button" name="sb4" class="btn btn-success btn-sm" onClick="location='makehtml_js.php';">获取JS</button>
-		  <button type="button" name="sb2" class="btn btn-success btn-sm" onClick="location='makehtml_list.php';">更新栏目HTML</button>
-      <button type="button" name="sb3" class="btn btn-success btn-sm" onClick="location='makehtml_archives.php';">更新文档HTML</button>
-		  </td>
-    </tr>
-   </table>
+    <button type="button" name="sb4" class="btn btn-success btn-sm" onClick="location='makehtml_js.php';">获取脚本</button>
+		<button type="button" name="sb2" class="btn btn-success btn-sm" onClick="location='makehtml_list.php';">更新栏目</button>
+    <button type="button" name="sb3" class="btn btn-success btn-sm" onClick="location='makehtml_archives.php';">更新文档</button>
   </td>
 </tr>
 </table>

src/dede/templets/catalog_menu.htm

@@ -184,7 +184,7 @@ body
  </tr>
  <tr> 
    <td width="23%" align='center' background='images/mtbg1.gif'  style='border-left: 1px solid #74c63f;'>
-    	<a href="#" onClick="showHide('items1')" target="_self"><img src="images/mtimg1.gif" width="21" height="24" border="0" /></a>
+    	<a href="javascript:;" onClick="showHide('items1')" target="_self"><img src="images/mtimg1.gif" width="21" height="24" border="0" /></a>
    </td>
    <td width="77%" background='images/mtbg1.gif'  style='border-right: 1px solid #74c63f;'>站点目录树</td>
  </tr>

src/dede/templets/catalog_menu2.htm

@@ -1,15 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>类别管理</title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-<link href="css/base.css" rel='stylesheet' type="text/css" />
-<script language="javascript" src="js/context_menu.js"></script>
-<script language="javascript" src="js/ieemu.js"></script>
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript">
+<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="css/base.css">
+<script src="js/context_menu.js"></script>
+<script src="js/ieemu.js"></script>
+<script src="../static/js/dedeajax2.js"></script>
+<script>
 function LoadSuns(ctid,tid)
 {
     if($DE(ctid).innerHTML.length < 10){
@@ -29,14 +29,10 @@ if(moz) {
     extendElementModel();
     emulateAttachEvent();
 }
-
-
-function JumpOneUrl(surl)
-{
+function JumpOneUrl(surl) {
     document.formjump.action=surl;
     document.formjump.submit();
 }
-
 //普通栏目
 function CommonMenu(eobj,obj,tid,tname)
 {
@@ -112,86 +108,37 @@ function JumpMenu(eobj,obj,tid,tname)
 }
 </script>
 <style>
-.nbt{
-  font:12px 宋体; padding: 1px 1px 0 1px ;
-  vertical-align:middle ;
-  margin:2px 0 2px 0;
-  border-left:1px solid #DADF9D;
-  border-top:1px solid #DADF9D;
-  border-right:1px solid #666666;
-  border-bottom:1px solid #666666;
-  background:#eff6b6; height:21px ;
-  float:left;
-  margin-left:8px;
-}
-div,dd{ margin:0px; padding:0px }
-.dlf { margin-right:3px; margin-left:6px; margin-top:2px; float:left }
-.dlr { float:left }
-.topcc { margin-top:5px }
-.suncc { margin-bottom:3px }
-dl { clear:left; margin:0px; padding:0px }
-#items1
-{
-	border-bottom: 1px solid #FBFCE2;
-  border-left: 1px solid #FBFCE2;
-  border-right: 1px solid #FBFCE2;
-}
-.sunlist { width:100%; padding-left:0px; margin:0px; clear:left } 
-.tdborder {
-  border-left: 1px solid #43938B;
-  border-right: 1px solid #43938B;
-  border-bottom: 1px solid #43938B;
-}
-.tdline-left {
-  border-bottom: 1px solid #656363;
-  border-left: 1px solid #788C47;
-}
-.tdline-right {
-  border-bottom: 1px solid #656363;
-  border-right: 1px solid #788C47;
-}
-.tdrl {
-border-left: 1px solid #FBFCE2;
-border-right: 1px solid #FBFCE2;
-}
-.top { cursor: pointer; }
-body
-{
- padding:3px 0px 0px 0px;
- margin:auto;
- text-align:center;
- background-color:#FBFCE2;
- background:url(images/leftmenu_bg.gif);
-}
+body{margin:0;background:#f8f8f8}
+dl{clear:left}
+.dlf{float:left;margin-top:12px;margin-left:10px}
+.dlr{float:left;margin-top:10px}
+.sunlist{display:inline-block;margin-top:10px;width:100%}
 </style>
-<base target="main" />
+<base target="main">
 </head>
 <body target="main" onLoad="ContextMenu.intializeContextMenu()">
-<form name="formjump" method="post" target="main" action=""></form>	
-<table width='98%' border='0' align='center' cellpadding='0' cellspacing='0'>
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
         <tr> 
-    <td height='32' colspan="2" align='center' style='padding-bottom:3px'>
-	 <form name="form1" target="main" action="public_guide.php"><input type='hidden' name='action' value='edit' /></form>
+            <td height="36" colspan="2" style="padding:10px">
+                <form name="form1" target="main" action="public_guide.php"><input type="hidden" name="action" value="edit"></form>
                 <form name="form2" target="main" action="catalog_main.php"></form>
                 <form name="form3" target="menu" action="index_menu.php"></form>
-	 <form name="form5" target="main" action="catalog_add.php"><input type="hidden" name="dopost" value="quick" /></form>
+                <form name="form5" target="main" action="catalog_add.php"><input type="hidden" name="dopost" value="quick"></form>
                 <form name="form6" target="main" action="content_list.php"></form>
                 <button type="button" name="sb5" class="btn btn-success btn-sm" onClick="document.form5.submit();">批量增加栏目</button>
                 <button type="button" name="sb2" class="btn btn-success btn-sm" onClick="document.form2.submit();">栏目管理</button>
-   <br />
-   <button type="button" name="sb3" class="btn btn-success btn-sm mt-1" onClick="document.form3.submit();">菜单</button>
-   <button type="button" name="sb6" class="btn btn-success btn-sm mt-1" onClick="document.form6.submit();">文档列表</button>
-   <button type="button" name="sb1" class="btn btn-success btn-sm mt-1" onClick="document.form1.submit();">发布向导</button>
+                <br>
+                <button type="button" name="sb3" class="btn btn-success btn-sm mt-2" onClick="document.form3.submit();">菜单</button>
+                <button type="button" name="sb6" class="btn btn-success btn-sm mt-2" onClick="document.form6.submit();">文档列表</button>
+                <button type="button" name="sb1" class="btn btn-success btn-sm mt-2" onClick="document.form1.submit();">发布向导</button>
             </td>
         </tr>
         <tr> 
-    <td width="20%" align='center' background='images/mtbg1.gif'  style='border-left: 1px solid #FBFCE2;'>
-    	<a href="#" onClick="showHide('items1')" target="_self"><img src="images/mtimg1.gif" width="21" height="24" border="0" /></a>
-    </td>
-    <td width="80%" background='images/mtbg1.gif'  style='border-right: 1px solid #FBFCE2;'>站点目录树</td>
+            <td width="20%" align="center" background="images/mtbg1.gif"><a href="javascript:;" onClick="showHide('items1')" target="_self"><img src="images/mtimg1.gif"></a></td>
+            <td width="80%" background="images/mtbg1.gif">站点目录树</td>
         </tr>
         <tr> 
-    <td colspan='2' id='items1' align='center'> 
+            <td colspan="2" id="items1" align="center"> 
             <?php 
             $tu = new TypeUnit($userChannel);
             $tu->ListAllType($userChannel,$opendir);

src/dede/templets/content_batch_up.htm

@@ -167,7 +167,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/content_list.htm

@@ -39,7 +39,7 @@
 		<input type="hidden" name="dopost" value="listArchives">
 		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
 			<tr>
-				<td style="background:#f2f2f2">
+				<td style="background:#f8f8f8">
 					<table cellpadding="0" cellspacing="0" height="36">
 						<tr>
 							<td>
@@ -76,7 +76,7 @@
 	<form name="form2">
 		<table width="98%" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center" class="table table-bordered maintable" style="margin-top:10px">
 			<tr>
-				<td height="30" colspan="10" style="margin-left:10px;background:#f2f2f2">{dede:global.positionname/}文档列表（使用鼠标右键弹出菜单）</td>
+				<td height="30" colspan="10" style="margin-left:10px;background:#f8f8f8">{dede:global.positionname/}文档列表（使用鼠标右键弹出菜单）</td>
 			</tr>
 			<tr align="center" bgcolor="#FBFCE2" height="26">
 				<td width="6%">ID</td>
@@ -128,7 +128,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize=6/}</td>
+				<td height="36" colspan="10" align="center" style="background:#f8f8f8">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>
 	</form>

src/dede/templets/diy_list.htm

@@ -1,11 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title><?php echo $diy->name; ?></title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
 <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 <link rel="stylesheet" href="css/base.css">
+<style>
+.btn+.btn{margin-left:10px}
+</style>
 </head>
 <body background="images/allbg.gif" leftmargin="8" topmargin="8">
 	<div class="bodytitle mt-3">
@@ -14,9 +17,9 @@
 	</div>
 	<form action="diy_list.php" method="post">
 		<input type="hidden" name="diyid" value="<?php echo $diyid; ?>">
-		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="background:#CFCFCF">
+		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="margin-top:10px;background:#CFCFCF">
 			<tr>
-				<td colspan="3" height="28" background="images/tbg.gif">
+				<td colspan="3" height="26" background="images/tbg.gif">
 					<div style="float:left"><a href="diy_main.php">自定义表单管理</a> &gt; <?php echo $diy->name; ?></div>
 					<div style="float:right;padding-right:10px"><a href="/plus/diy.php?action=list&diyid=<?php echo $diy->diyid; ?>" target="_blank"><img src="images/gtk-tmp.png" align="left" title="前台预览">前台预览</a></div>
 				</td>
@@ -27,7 +30,7 @@
 			{
 				$allowhtml = array('htmltext');
 				$fields['sta'] = $fields['ifcheck'] == 1 ? '已审核':'未审核';
-				echo '<tr bgcolor="#F8FDE3" height="28"><td width="18%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np"></td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> '.$fields['sta'].'</td><td width="12%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="46" height="18"></a></td></tr>';
+				echo '<tr bgcolor="#F8FDE3" height="26"><td width="18%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np"></td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> '.$fields['sta'].'</td><td width="12%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="46" height="18"></a></td></tr>';
 				foreach($fieldlist as $field=>$fielddata)
 				{
 					if($fields[$field]=='') continue;
@@ -41,23 +44,23 @@
 							$fields[$field] = dede_htmlspecialchars($fields[$field]);
 						}
 					}
-					echo '<tr height="28"><td bgcolor="#fff">'.$fielddata[0].'</td><td bgcolor="#fff" colspan="2">'.$fields[$field].'</td></tr>';
+					echo '<tr height="26"><td bgcolor="#fff">'.$fielddata[0].'</td><td bgcolor="#fff" colspan="2">'.$fields[$field].'</td></tr>';
 				}
 			} else {
-				echo '<tr height="28"><td bgcolor="#fff">暂无记录</td></tr>';
+				echo '<tr height="26"><td bgcolor="#fff">暂无记录</td></tr>';
 			}
 			?>
 			{/dede:datalist}
 			<tr>
-				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='8'/}</td>
+				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='6'/}</td>
 			</tr>
 			<tr>
-				<td colspan="3" height="36" bgcolor="#F8FCF1">
-					<label><input type="button" name="select" onClick="selAll()" value="全选"></label>
-					<label><input type="button" name="select" onClick="noSelAll()" value="取消"></label>
-					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="check">审核</label>
-					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="delete">删除</label>
-					<label><input type="submit" name="submit" class="btn btn-success btn-sm" value="提交"></label>
+				<td colspan="3" height="36" bgcolor="#f8f8f8">
+					<input type="radio" name="action" value="check">&nbsp;审核
+					<input type="radio" name="action" value="delete">&nbsp;删除
+					<input type="button" name="select" onClick="selAll()" class="btn btn-success btn-sm" value="全选">
+					<input type="button" name="select" onClick="noSelAll()" class="btn btn-success btn-sm" value="取消">
+					<input type="submit" name="submit" class="btn btn-success btn-sm" value="提交">
 				</td>
 			</tr>
 		</table>

src/dede/templets/diy_main.htm

@@ -1,39 +1,34 @@
-{dede:page pagesize="50"/}
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+{dede:page pagesize='40'/}
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>自定义表单管理</title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-	<link href="css/base.css" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="css/base.css">
+<style>
+.btn+.btn{margin-left:10px}
+</style>
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
 	<div class="bodytitle mt-3">
 		<div class="bodytitleleft"></div>
-		<div class="bodytitletxt" style="padding-left:10px;">自定义表单管理</div>
+		<div class="bodytitletxt" style="padding-left:10px">自定义表单管理</div>
 	</div>
-
-	<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="maintable"
-		style="border:1px solid #CFCFCF;border-bottom:none;">
+	<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="maintable" style="margin-top:10px;border:1px solid #CFCFCF;border-bottom:none">
 		<tr>
 			<td bgcolor="#EDF9D5" class="tbtitletxt" background="images/tbg.gif">
-				<table width='96%' border="0" cellpadding='0' cellspacing='0'>
+				<table width="96%" border="0" cellpadding="0" cellspacing="0">
 					<tr>
-						<td width='30%' class="py-3"><a href="diy_add.php" class="btn btn-success btn-sm ml-3">增加新的自定义表单</a></td>
-						<td align='right'>
-						</td>
+						<td width="30%" class="py-3"><a href="diy_add.php" class="btn btn-success btn-sm ml-3">增加新的自定义表单</a></td>
+						<td align="right"></td>
 					</tr>
 				</table>
 			</td>
 		</tr>
 	</table>
-
-	<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class='table maintable table-bordered'
-		style='background:#CFCFCF;margin-bottom:5px;'>
+	<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable table-bordered" style="margin-bottom:10px;background:#CFCFCF">
 		<tr align="center" bgcolor="#FBFCE2" height="26">
 			<td>diyid</td>
 			<td>名称</td>
@@ -41,28 +36,23 @@
 			<td>管理</td>
 		</tr>
 		{dede:datalist}
-		<tr align="center" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';"
-			onMouseOut="javascript:this.bgColor='#FFFFFF';">
+		<tr align="center" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
 			<td>{dede:field.diyid/}</td>
-			<td><a href="diy_list.php?action=list&diyid={dede:field.diyid/}"><u>{dede:field.name/}</u></a></td>
+			<td><a href="diy_list.php?action=list&diyid={dede:field.diyid/}">{dede:field.name/}</a></td>
 			<td>{dede:field.table/}</td>
 			<td>
-				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=edit' class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 更改</a>
-				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=delete' class="btn btn-success btn-sm"> <i class="fa fa-trash" aria-hidden="true"></i> 删除 </a>
-				<a href="../plus/diy.php?action=list&diyid={dede:field.diyid/}" class="btn btn-success btn-sm" target="_blank"> <i class="fa fa-globe" aria-hidden="true"></i> 前台预览</a>
+				<a href="diy_edit.php?diyid={dede:field.diyid/}&dopost=edit" class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;更改</a>
+				<a href="diy_edit.php?diyid={dede:field.diyid/}&dopost=delete" class="btn btn-success btn-sm"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;删除</a>
+				<a href="diy_list.php?action=excel&diyid={dede:field.diyid/}" target="_blank" class="btn btn-success btn-sm"><i class="fa fa-share-square" aria-hidden="true"></i>&nbsp;导出</a>
+				<a href="../plus/diy.php?action=list&diyid={dede:field.diyid/}" class="btn btn-success btn-sm" target="_blank"><i class="fa fa-globe" aria-hidden="true"></i>&nbsp;预览</a>
 			</td>
 		</tr>
 		{/dede:datalist}
 	</table>
-
-
-	<table class="mb-3" width="98%" border="0" cellpadding="5" cellspacing="1" align="center"
-		style=" border:1px solid #CFCFCF;line-height:31px;margin:auto;">
+	<table class="mb-3" width="98%" border="0" cellpadding="5" cellspacing="1" align="center" style="margin:auto;border:1px solid #CFCFCF">
 		<tr>
-			<td height="35" align="center" style="background:#F9FCEF;padding:7px 6px 6px 10px;">{dede:pagelist
-				listsize=6/}</td>
+			<td height="36" align="center" style="background:#f8f8f8">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 </body>
-
 </html>

src/dede/templets/freelist_main.htm

@@ -60,20 +60,20 @@
 			var startloop = 1;
 			var endnum = 0;
 			ahtml += "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共：" + totalrow + " 条记录/" + pagenum + "页</span></li>";
-			if (pageno > 1 && pageno != 1) ahtml += "<li class='page-item d-none d-sm-block disabled'><a href='#' class=\"page-link\" onclick='LoadPage(1)'>首页</a></li>";
-			if (pageno > 1) ahtml += "<li class='page-item d-none d-sm-block'><a href='#' class=\"page-link\" onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a></li> ";
+			if (pageno > 1 && pageno != 1) ahtml += "<li class='page-item d-none d-sm-block disabled'><a href='javascript:;' class=\"page-link\" onclick='LoadPage(1)'>首页</a></li>";
+			if (pageno > 1) ahtml += "<li class='page-item d-none d-sm-block'><a href='javascript:;' class=\"page-link\" onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a></li> ";
 			if (startnum >= pagenum - listsize) {
 				startloop = pagenum - (listsize * 2);
 				if (startloop < 1) startloop = 1;
 				for (i = startloop; i <= pagenum; i++) {
 					if (i == pageno) ahtml += "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">" + i + "</span></li>";
-					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
+					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
 				}
 			}
 			else if (pagenum < listsize) {
 				for (i = 1; i <= pagenum; i++) {
 					if (i == pageno) ahtml += i + " ";
-					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
+					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
 				}
 			}
 			else {
@@ -83,11 +83,11 @@
 				if (endnum >= pagenum) endnum = pagenum;
 				for (i = startloop; i <= endnum; i++) {
 					if (i == pageno) ahtml += i + " ";
-					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
+					else ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a></li>";
 				}
 			}
-			if (pageno < pagenum) ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='#' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a></li>";
-			if (pageno != pagenum && pagenum > 1) ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='#' onclick='LoadPage(" + pagenum + ")'>末页</a></li>";
+			if (pageno < pagenum) ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='javascript:;' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a></li>";
+			if (pageno != pagenum && pagenum > 1) ahtml += "<li class='page-item d-none d-sm-block'><a class=\"page-link\" href='javascript:;' onclick='LoadPage(" + pagenum + ")'>末页</a></li>";
 			ListArea.innerHTML = ahtml+"</ul>";
 		}
 	</script>

src/dede/templets/friendlink_main.htm

@@ -113,9 +113,9 @@
     <tr bgcolor="#ffffff" height="28">
       <td colspan="8">
         　
-        <a href='#' onclick='Sel("all")' class="btn btn-success btn-sm">全选</a>
-        <a href='#' onclick='Sel("none")' class="btn btn-success btn-sm">取消</a>
-        <a href='#' onclick='checkSubmit()' class="btn btn-success btn-sm">批量删除</a>
+        <a href='javascript:;' onclick='Sel("all")' class="btn btn-success btn-sm">全选</a>
+        <a href='javascript:;' onclick='Sel("none")' class="btn btn-success btn-sm">取消</a>
+        <a href='javascript:;' onclick='checkSubmit()' class="btn btn-success btn-sm">批量删除</a>
 
       </td>
     </tr>

src/dede/templets/index2.htm

@@ -36,16 +36,16 @@
     </div>
     <div class="head">
         <div class="top">
-            <div class="top_logo"><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');"><?php echo $cfg_webname; ?>系统</a></div>
+            <div class="top_logo"><a href="javascript:;" onclick="JumpFrame('index_menu.php','index_body.php');"><?php echo $cfg_webname; ?>系统</a></div>
             <div class="top_version"><?php echo $cfg_version_detail; ?></div>
             <div class="top_link">
                 <ul>
-                    <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php" target="_top">注销</a></li>
-                    <li><a href="#" onclick="JumpFrame('catalog_menu.php','public_guide.php');">发布文档</a></li>
-                    <li><a href="#" onclick="JumpFrame('index_menu.php','content_list.php');">所有文档</a></li>
-                    <li><a href="#" onclick="JumpFrame('index_menu.php','catalog_main.php');">栏目管理</a></li>
-                    <li><a href="#" onclick="JumpFrame('index_menu.php','file_manage_main.php');">文件管理</a></li>
-                    <li><a href="#" onclick="JumpFrame('index_menu.php','templets_main.php');">模板管理</a></li>
+                    <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php">注销</a></li>
+                    <li><a href="public_guide.php" target="main">发布文档</a></li>
+                    <li><a href="content_list.php" target="main">所有文档</a></li>
+                    <li><a href="catalog_main.php" target="main">栏目管理</a></li>
+                    <li><a href="file_manage_main.php" target="main">文件管理</a></li>
+                    <li><a href="templets_main.php" target="main">模板管理</a></li>
                     <?php echo ($cfg_mb_open=='Y')?'<li><a href="../member" target="_blank">会员中心</a></li>':''; ?>
                     <li><a href="../index.php?upcache=1" target="_blank">网站主页</a></li>
                 </ul>
@@ -53,9 +53,9 @@
         </div>
         <div class="topnav">
             <div class="menuact">
-                <a href="#" id="togglemenu">隐藏菜单</a>
+                <a href="javascript:;" id="togglemenu">隐藏菜单</a>
                 <?php
-                if($cuserLogin->getUserType()>=10) echo'<a href="#" id="allmenu">功能地图</a>';
+                if($cuserLogin->getUserType()>=10) echo'<a href="javascript:;" id="allmenu">功能地图</a>';
                 ?>
             </div>
             <div id="skin">
@@ -65,8 +65,8 @@
             <div class="sysmsg">
                 <div class="scroll">
                     <form action="action_search.php" target="main" method="post">
-                        <input name="keyword" type="text" placeholder="请输入" class="allsearch">
-                        <input name="" type="submit" value="搜索" class="np">
+                        <input name="keyword" type="text" placeholder="功能搜索" class="allsearch">
+                        <input type="submit" value="搜索" class="np">
                         <a href="<?php echo $cfg_biz_gitUrl;?>" target="_blank">代码托管</a>
                         <a href="<?php echo $cfg_biz_helpUrl;?>" target="_blank">帮助中心</a>
                     </form>
@@ -81,7 +81,7 @@
     </div>
     <div class="right">
         <div class="main">
-            <iframe id="main" name="main" frameborder="0" src="index_body.php"></iframe>
+            <iframe src="index_body.php" id="main" name="main" frameborder="0"></iframe>
         </div>
     </div>
     <div class="qucikmenu" id="qucikmenu">

src/dede/templets/index_body.htm

@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>系统概况</title>
 <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
 <base target="_self">
@@ -57,14 +57,12 @@
                     </div>
                 </div>
             </div>
-
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">商业授权</div>
+                    <div class="card-header">版本授权</div>
                     <div class="card-body" id="_systeminfo">正在载入中...</div>
                 </div>
             </div>
-
             <div class="col-md-6 mt-3">
                 <div class="card">
                     <div class="card-header">快捷操作<span class="float-right"><a href="javascript:AddNew()" class="btn btn-success btn-sm">新增</a><a href="javascript:ListAll()" class="btn btn-success btn-sm">管理</a></span></div>
@@ -86,7 +84,6 @@
                     </div>
                 </div>
             </div>
-
             <div class="col-md-6 mt-3">
                 <div class="card">
                     <div class="card-header">基本信息</div>
@@ -172,7 +169,6 @@
                     </div>
                 </div>
             </div>
-
             <div class="col-md-6 mt-3">
                 <div class="card">
                     <div class="card-header">信息统计</div>
@@ -181,7 +177,6 @@
                     </div>
                 </div>
             </div>
-
             <div class="col-md-6 mt-3">
                 <div class="card">
                     <div class="card-header">最新文档</div>
@@ -228,7 +223,6 @@
             </div>
         </div>
     </div>
-
     <div class="footer">
         <!--下面是隐藏的项目-->
         <div id="loaddiv" style="display:none">
@@ -243,22 +237,22 @@
                 <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr>
                         <td height="28" colspan="3" background="images/tbg.gif">
-                            <div style="float:left">增加快捷操作项</div>
+                            <div style="float:left;padding-left:10px">增加快捷操作项</div>
                             <div style="float:right;padding:4px 10px 0 0">
                                 <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12" height="12" border="0"></a>
                             </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2"></td>
+                        <td colspan="2" style="height:10px;border-top:1px solid #8DA659"></td>
                     </tr>
                     <tr>
-                        <td width="20%" height="28" align="right">链接标题：</td>
-                        <td width="70%"><input name="title" type="text" id="title" class="pubinputs" style="width:255px"></td>
+                        <td width="20%" height="26" align="right">链接标题：</td>
+                        <td width="70%"><input name="title" type="text" id="title" class="pubinputs" style="margin-bottom:10px;width:260px"></td>
                     </tr>
                     <tr>
-                        <td height="28" width="20%" align="right">链接网址：</td>
-                        <td width="70%"><input name="link" type="text" id="link" class="pubinputs" style="width:255px"></td>
+                        <td width="20%" height="26" align="right">链接网址：</td>
+                        <td width="70%"><input name="link" type="text" id="link" class="pubinputs" style="width:260px"></td>
                     </tr>
                     <tr>
                         <td height="36"></td>
@@ -268,7 +262,6 @@
             </form>
         </div>
     </div>
-
     <script>
         var dedebizInfo;
         function ViewDedeBIZ() {
@@ -338,7 +331,7 @@
                         //下面是DedeBIZ Core组件信息
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left">商业组件：</td>
+                            <td class="nline" style="text-align:left">版本组件：</td>
                             <td class="nline" style="text-align:left"><a class="btn btn-danger btn-sm" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008">如何启动组件</a></td>
                         </tr>
                         `;
@@ -346,7 +339,7 @@
                         dedebizInfo = JSON.parse(rsp.result.core.data);
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left">商业组件：</td>
+                            <td class="nline" style="text-align:left">版本组件：</td>
                             <td class="nline" style="text-align:left"><a class="btn btn-success btn-sm" href="javascript:ViewDedeBIZ()">查看组件信息</a></td>
                         </tr>
                         `;
@@ -355,9 +348,9 @@
                     $("#_systeminfo").html(infoStr);
                 } else {
                     $("#_systeminfo").html(`
-                    <div class="py-1">尚未启动商业站点服务，原因：<b>${rsp.msg}</b></div>
-                    <div class="py-1">商业服务可以提升性能、增强安全、支持开源。</div>
-                    <div class="py-1"><a class="btn btn-danger" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}">开启商业服务</a></div>
+                    <div class="py-1">尚未启动商业版服务，原因：${rsp.msg}</div>
+                    <div class="py-1">目前是社区版开源免费，但商业版可以优化性能，数据分离，在线支付，小程序，APP等等。</div>
+                    <div class="py-1"><a class="btn btn-danger" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}">开启商业版</a></div>
                     `);
                 }
             });

src/dede/templets/index_menu2.htm

@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>DedeBIZ menu</title>
@@ -10,32 +11,29 @@
 ?>
 <script src="js/leftmenu.js"></script>
 <style>
-body{margin:0;background:#f2f2f2;padding-left:8px;overflow:scroll;overflow-x:hidden}
-img{margin-right:0}
+body{margin:0;background:#f8f8f8;padding-left:6px;overflow:scroll;overflow-x:hidden}
+img{margin-right:0;border-radius:0}
 div{margin:0;padding:0}
-dl.bitem{margin:0 0 0 10px;width:140px;background:url(images/menunewbg.gif)repeat-x;clear:both}
-dl.bitem2{margin:0 0 0 10px;width:140px;background:url(images/menunewbg2.gif)repeat-x;clear:both}
+dl.bitem{margin:0 0 2px 10px;width:140px;background:url(images/menunewbg.gif)repeat-x;clear:both}
+dl.bitem2{margin:0 0 2px 10px;width:140px;background:url(images/menunewbg2.gif)repeat-x;clear:both}
 dl.bitem dt,dl.bitem2 dt{padding-left:30px;height:26px;line-height:26px;cursor:pointer}
-dl.bitem dt b,dl.bitem2 dt b{color:#4D6C2F}
-dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#ffffff}
-div.items{clear:both;padding:0;height:0}
-.fllct{float:left;width:80px}
-.flrct{float:left;padding-top:4px}
-.sitemu li{padding:0 0 0 20px;height:26px;line-height:26px;background:url(images/arr4.gif)no-repeat 6px 10px}
-a.mmac div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#325304;background:url(images/leftbg2.gif)no-repeat;word-wrap:break-word;word-break:break-all}
-a.mm div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#475645;cursor:pointer;background:url(images/leftmbg1.gif) no-repeat;word-wrap:break-word;word-break:break-all}
+dl.bitem dd,dl.bitem2 dd{padding:10px;background:#ffffff}
+dl.bitem dt b,dl.bitem2 dt b{color:#4f7632}
+a.mm div{padding:7px 4px 4px 10px;height:40px;font-weight:600;color:#666666;background:url(images/leftmbg1.gif)no-repeat;cursor:pointer}
 a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif)no-repeat}
-.mmf{padding:6px;height:1px}
+a.mmac div{padding:7px 4px 4px 10px;height:40px;font-weight:600;color:#4f7632;background:url(images/leftbg2.gif)no-repeat}
 #mainct{padding-top:12px;background:url(images/idnbg1.gif)repeat-y}
+.sitemu li{padding:0 0 0 20px;height:26px;line-height:26px;background:url(images/arr4.gif)no-repeat 6px 10px}
+.fllct{float:left;width:80px}
+.flrct{float:left;padding-top:4px}
 </style>
 <link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
 <base target="main">
 </head>
-
 <body target="main" onLoad="CheckOpenMenu();">
 	<table width="180" align="left" cellspacing="0" cellpadding="0">
 		<tr>
-			<td valign="top" style="padding-top:10" width="20">
+			<td valign="top" style="padding-top:10px" width="26">
 				<a id="link1" class="mmac"><div onClick="ShowMainMenu(1)">核心</div></a>
 				<a id="link100" class="mm"><div onClick="ShowMainMenu(100)">模块</div></a>
 				<a id="link5" class="mm"><div onClick="ShowMainMenu(5)">生成</div></a>
@@ -48,7 +46,6 @@ a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif)no-repeat}
 				<?php
 				}
 				?>
-				<div class="mmf"></div>
 			</td>
 			<td width="160" id="mainct" valign="top">
 				<div id="ct1">
@@ -67,7 +64,7 @@ a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif)no-repeat}
 		</tr>
 		<tr>
 			<td width="26"></td>
-			<td width="160" valign="top"><img src='images/idnbgfoot.gif'></td>
+			<td width="160" valign="top"><img src="images/idnbgfoot.gif"></td>
 		</tr>
 	</table>
 	<?php

src/dede/templets/login.htm

@@ -9,25 +9,27 @@
 <link rel="stylesheet" href="../static/css/dede.css">
 <title><?php echo $cfg_webname; ?>后台登录</title>
 <style>
-body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background:#f2f2f2}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}
+img{max-width:100%}
 header{background:#ffffff}
-header .logo{width:260px;padding:1em 0}
+header .logo{width:300px;padding:1rem 0}
+.goindex{line-height:68px}
+.fa{font-size:16px}
 .login-from{max-width:580px;width:100%}
-.login-area{background:#ffffff;padding:2em;border-radius:.25rem}
+.login-area{background:#ffffff;padding:2rem;border-radius:.25rem}
 .login-area .btnLogin{width:100%}
-.login-power{padding-top:1em}
-.login-power a,.goindex a{color:#3DB058}
-.goindex{line-height:60px}
+.login-power{padding-top:1rem}
+.login-power a,.goindex a{color:#008e38}
 </style>
 </head>
 <body>
 	<header>
 		<div class="container top">
 			<div class="row">
-				<div class="col-6">
-					<a href="."><img class="logo" src="../static/img/admin-logo.png" title="<?php echo $cfg_soft_enname; ?>"></a>
+				<div class="col-10">
+					<div class="logo"><img src="../static/img/admin-logo.png" title="<?php echo $cfg_soft_enname; ?>"></div>
 				</div>
-				<div class="col-6 d-flex justify-content-end goindex">
+				<div class="col-2 d-flex justify-content-end goindex">
 					<a href="../index.php" target="_blank"><i class="fa fa-home" aria-hidden="true"></i></a>
 				</div>
 			</div>
@@ -36,7 +38,7 @@ header .logo{width:260px;padding:1em 0}
 	<main class="container login-from mt-5">
 		<?php echo $redmsg; ?>
 		<div class="login-area">
-			<h3 class="mb-3 text-center">后台登录</h3>
+			<h4 class="mb-4 text-center">后台登录</h4>
 			<form name="form1" method="post" action="login.php">
 				<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>">
 				<input type="hidden" name="dopost" value="login">

src/dede/templets/makehtml_all.htm

@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>一键更新</title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<link href="../static/css/daterangepicker.css" rel="stylesheet">
-<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-<script type="text/javascript" src="../static/js/moment.min.js"></script>
-<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-<script language="javascript">
+<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="css/base.css" rel="stylesheet">
+<link rel="stylesheet" href="../static/css/daterangepicker.css">
+<script src="../static/js/jquery.js"></script>
+<script src="../static/js/moment.min.js"></script>
+<script src="../static/js/daterangepicker.js"></script>
+<script>
 $(document).ready(function () {
     $('.datepicker').daterangepicker({
         "singleDatePicker": true,
@@ -19,7 +19,6 @@
         "linkedCalendars": false,
         "timePicker": true,
         "timePicker24Hour": true,
-      // "timePickerSeconds": true,
         "showCustomRangeLabel": false,
         ranges: {
             '今日': [moment(), moment()],
@@ -32,17 +31,15 @@
             applyLabel: '确定',
             cancelLabel: '取消',
             daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
-        monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
-          '七月', '八月', '九月', '十月', '十一月', '十二月'],
+            monthNames: ['一月', '二月', '三月', '四月', '五月', '六月','七月', '八月', '九月', '十月', '十一月', '十二月'],
             firstDay: 1
         }
     }, function (start) {
         $(this).val(start.format("YYYY-MM-DD HH:mm"));
     });
-
 })
 </script>
-<script language='javascript'>
+<script>
 function SelUp(){
     var ob1 = document.getElementById("uptype1");
     var ob2 = document.getElementById("uptype2");
@@ -60,68 +57,54 @@ function SelUp(){
 }
 </script>
 </head>
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
     <table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
         <form name="form1" action="makehtml_all.php" target="stafrm" method="post">
-  <input type="hidden" name="action" value="make" />
+            <input type="hidden" name="action" value="make">
             <tr>
-    <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;">
+                <td height="30" colspan="2" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px">
                     <strong>一键更新网站：</strong></td>
                 </td>
             </tr>
             <tr>
-      <td width="30%" height="30"  bgcolor="#FFFFFF">&nbsp;&nbsp;更新选项：</td>
+                <td width="30%" height="30"  bgcolor="#FFFFFF">&nbsp;更新选项：</td>
                 <td valign="top" bgcolor="#FFFFFF">
-	   <label><input name="uptype" id="uptype1" type="radio" class="btn btn-success btn-sm" value="time" onClick="SelUp()" checked="checked" />
-	   指定时间的所有更新</label>
-	   <label><input name="uptype" id="uptype2" type="radio" class="btn btn-success btn-sm" onClick="SelUp()" value="id" />
-	   指定ID文档的所有更新</label>
-	   <label><input name="uptype" id="uptype3" type="radio" class="btn btn-success btn-sm" onClick="SelUp()" value="mkall" />
-	   更新所有</label>
+                  <label><input name="uptype" id="uptype1" type="radio" value="time" onClick="SelUp()" checked="checked">&nbsp;指定时间的所有更新</label>
+                  <label><input name="uptype" id="uptype2" type="radio" onClick="SelUp()" value="id">&nbsp;指定ID文档的所有更新</label>
+                  <label><input name="uptype" id="uptype3" type="radio" onClick="SelUp()" value="mkall">&nbsp;更新所有</label>
                 </td>
             </tr>
-    <tr id='seltime'>
-      <td height="20"  bgcolor="#FFFFFF">&nbsp;&nbsp;起始时间：</td>
-      <td height="20"  bgcolor="#FFFFFF">
-      	<input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time()); ?>" style="width:200px" class="datepicker"/>
-      </td>
+            <tr id="seltime">
+                <td height="26"  bgcolor="#FFFFFF">&nbsp;起始时间：</td>
+                <td height="26"  bgcolor="#FFFFFF"><input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time()); ?>" style="width:200px" class="datepicker"></td>
             </tr>
-    <tr bgcolor="#FFFFFF" id="selid" style="display:none;">
-      <td height="20">&nbsp;&nbsp;起始ID：</td>
-      <td height="20">
-      	<input name="startid" type="text" id="startid" value="0" size="4" />
-      </td>
+            <tr bgcolor="#FFFFFF" id="selid" style="display:none">
+                <td height="26">&nbsp;起始ID：</td>
+                <td height="26"><input name="startid" type="text" id="startid" value="0" size="4"></td>
             </tr>
             <tr>
-      <td height="31" colspan="2" bgcolor="#ffffff" align="center" style="padding-top:6px">
-       <button type="submit" name="Submit" class="btn btn-success">开始更新</button>
-      </td>
+                <td height="30" colspan="2" bgcolor="#ffffff" align="center"><button type="submit" name="Submit" class="btn btn-success">开始更新</button></td>
             </tr>
         </form>
         <tr bgcolor="#F9FCEF">
-    <td height="20" colspan="2">
-    <table width="100%" class="table table-borderless">
-     <tr>
-      <td width="74%">进行状态： </td>
-       <td width="26%" align="right">
-		    <script language='javascript'>
+            <td colspan="2" style="line-height:26px">&nbsp;进行状态：
+                <script>
                 function ResizeDiv(obj,ty)
                 {
                     if(ty=="+") document.all[obj].style.pixelHeight += 50;
                     else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
                 </script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]          </td>
-        </tr>
-      </table>
+                <span style="float:right">
+                    <a href="javascript:;" onClick="ResizeDiv('mdv','+');" class="btn btn-success btn-sm">增大</a>&nbsp;
+                    <a href="javascript:;" onClick="ResizeDiv('mdv','-');" class="btn btn-success btn-sm">缩小</a>
+                </span>
             </td>
         </tr>
         <tr bgcolor="#FFFFFF">
             <td colspan="2" id="mtd">
-	  <div id='mdv' style='width:100%;height:350px;'>
-      <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="350px"></iframe>
-   </div>
-   <script language="JavaScript">
+                <div id="mdv" style="width:100%;height:350px"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="350px"></iframe></div>
+                <script>
                 document.all.mdv.style.pixelHeight = screen.height - 360;
                 </script>
             </td>

src/dede/templets/makehtml_archives.htm

@@ -79,7 +79,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_freelist.htm

@@ -70,7 +70,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_homepage.htm

@@ -160,7 +160,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_js.htm

@@ -94,7 +94,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_list.htm

@@ -74,7 +74,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_map_guide.htm

@@ -52,7 +52,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_rss.htm

@@ -48,7 +48,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_spec.htm

@@ -50,7 +50,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makehtml_taglist.htm

@@ -79,7 +79,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/makeremote_all.htm

@@ -88,7 +88,7 @@ function changeDopost(postval)
             		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
             	}
             	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>] </td>
+            [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>] </td>
         </tr>
       </table></td>
   </tr>

src/dede/templets/mychannel_edit.htm

@@ -75,7 +75,7 @@
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;基本设置&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>字段管理</u></a>&nbsp;</td>
             </tr>
           </table>
@@ -88,7 +88,7 @@
         <td colspan="2">
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" height="24" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="#"
+              <td width="84" height="24" align="center" background="images/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;"
                   onClick="ShowItem1()"><u>基本设置</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">字段管理&nbsp;</td>
             </tr>
@@ -368,7 +368,7 @@ if($ft==1)
                   href='mychannel_field_edit.php?id=<?php echo $id; ?>&fname=<?php echo $ctag->GetTagName(); ?>&issystem=<?php echo $row['issystem']; ?>'><img
                     src='images/gtk-edit.png' alt='更改' title='更改' /></a>
                 <?php if($row['issystem']!=1){ ?>
-                | <a href='#'
+                | <a href='javascript:;'
                   onClick='javascript:DelNote("mychannel_field_edit.php?id=<?php echo $id; ?>&fname=<?php echo $ctag->GetTagName(); ?>&action=delete");'><img
                     src='images/gtk-del.png' alt='删除' title='删除' /></a>
                 <?php } ?>

src/dede/templets/mychannel_modifysearch.htm

@@ -115,7 +115,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/search_keywords_main.htm

@@ -1,7 +1,5 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>搜索关键字管理</title>
@@ -38,7 +36,6 @@
     var kw = $Obj('keyword' + nid).value;
     var kws = $Obj('spwords' + nid).value;
     var ct = $Obj('count' + nid).value;
-
     var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('" + pageno + "')\"><u>点击此重新加载列表</u></a>]";
     var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理...");
     <?php
@@ -57,7 +54,6 @@
     elseif(strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
         echo 'myajax.SendGet2("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno+"&orderby="+orderby);';
     }
-      
     ?>
     ShowMsg('成功更新关键词');
     //myajax.SendGet("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno);
@@ -82,80 +78,59 @@
     var startloop = 1;
     var endnum = 0;
     ahtml += "共：" + totalrow + " 条记录/" + pagenum + "页 ";
-      if (pageno > 1) ahtml += "<a href='#' onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a> ";
+    if (pageno > 1) ahtml += "<a href='javascript:;' onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a> ";
     if (startnum >= pagenum - listsize) {
         startloop = pagenum - (listsize * 2);
         if (startloop < 1) startloop = 1;
         for (i = startloop; i <= pagenum; i++) {
             if (i == pageno) ahtml += i + " ";
-          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+            else ahtml += "<a href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
         }
     }
     else if (pagenum < listsize) {
         for (i = 1; i <= pagenum; i++) {
             if (i == pageno) ahtml += i + " ";
-          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+            else ahtml += "<a href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
         }
-      }
-      else {
+    } else {
         startloop = startnum - listsize;
         if (startloop < 1) { startloop = 1; endnum = startloop + (listsize * 2); }
         else { endnum = startnum + listsize; }
         if (endnum >= pagenum) endnum = pagenum;
         for (i = startloop; i <= endnum; i++) {
             if (i == pageno) ahtml += i + " ";
-          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+            else ahtml += "<a href='javascript:;' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
         }
     }
-      if (pageno < pagenum) ahtml += "<a href='#' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a> ";
+    if (pageno < pagenum) ahtml += "<a href='javascript:;' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a> ";
       ListArea.innerHTML = ahtml;
 }
 </script>
 <style>
-    .nnpp {
-      border-bottom: 1px solid #666666;
-      border-top: 1px solid #FFFFFF;
-      border-left: 1px solid #FFFFFF;
-      border-right: 1px solid #FFFFFF;
-      filter: alpha(opacity=50);
-    }
+.nnpp{border-bottom:1px solid #666666;border-top:1px solid #FFFFFF;border-left:1px solid #FFFFFF;border-right:1px solid #FFFFFF;filter:alpha(opacity=50)}
 </style>
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-  <div class="main" align='center'>
-    <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#D6D6D6" style="margin-bottom:3px"  class="table maintable table-bordered mt-3">
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
+    <div class="main" align="center">
+        <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#f8f8f8" class="table maintable table-bordered mt-3">
             <tr>
-        <td height="26" colspan="8" background="images/tbg.gif">
-          <table width="100%" border="0" class="table table-borderless">
-            <tr>
-              <td width="31%" align="left" style="padding-left:10px;"><strong>搜索关键词维护</strong></td>
-              <td align="right">
-                &nbsp;
-                <button class="btn btn-success btn-sm" name="n1" type="button" id="n1"
-                  onClick="location='article_keywords_main.php';">文档关键字维护</button>
-              </td>
-            </tr>
-          </table>
-        </td>
+                <td width="30%" align="left" style="padding-left:10px"><strong>搜索关键词维护</strong></td>
+                <td align="right"><button class="btn btn-success btn-sm" name="n1" type="button" id="n1" onClick="location='article_keywords_main.php';">文档关键字维护</button></td>
             </tr>
         </table>
-    <span id='rslist'>
+        <span id="rslist">
         <?php
         GetKeywordList($dsql,$pageno,$pagesize,$orderby);
         ?>
         </span>
-
-    <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#cfcfcf" style="margin-bottom:3px">
+        <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#f8f8f8" class="table maintable table-bordered mt-3">
             <tr align="center">
-        <td height="35" colspan="8" bgcolor="#F9FCEF">
-          <span id='pagelist'></span>
-          <script language='javascript'>ReloadPageNum(1);</script>
+                <td height="36" colspan="8" bgcolor="#f8f8f8">
+                    <span id="pagelist"></span>
+                    <script>ReloadPageNum(1);</script>
                 </td>
             </tr>
         </table>
-
     </div>
 </body>
-
 </html>

src/dede/templets/soft_add.htm

@@ -80,7 +80,7 @@
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>高级参数</u></a></td>
             </tr>
           </table>
@@ -93,7 +93,7 @@
         <td colspan="2">
           <table height="24" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
             </tr>

src/dede/templets/soft_edit.htm

@@ -68,7 +68,7 @@
           <table width="168" border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规参数&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>高级参数</u></a>&nbsp;</td>
             </tr>
           </table>
@@ -80,7 +80,7 @@
         <td colspan="2">
           <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem1()"><u>常规参数</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">高级参数&nbsp;</td>
             </tr>

src/dede/templets/spec_add.htm

@@ -100,7 +100,7 @@
           <table width="168" border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规参数&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>专题文档</u></a>&nbsp;</td>
             </tr>
           </table>
@@ -112,7 +112,7 @@
         <td colspan="2">
           <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem1()"><u>常规参数</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">专题文档</td>
             </tr>

src/dede/templets/spec_edit.htm

@@ -107,7 +107,7 @@
           <table width="168" border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规参数&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem2()"><u>专题文档</u></a>&nbsp;</td>
             </tr>
           </table>
@@ -119,7 +119,7 @@
         <td colspan="2">
           <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="javascript:;"
                   onClick="ShowItem1()"><u>常规参数</u></a>&nbsp;</td>
               <td width="84" align="center" background="images/itemnote1.gif">专题文档</td>
             </tr>

src/dede/templets/stepselect_showajax.htm

@@ -6,7 +6,7 @@ if($arr['issystem']==0) $sbjs = '';
 ?>
 <!-- 编辑表单 -->
 <div style='float:left;'><b>修改类别</b></div>
-<div style='float:right;'>[<a href="#" onclick="javascript:CloseTWin();">关闭</a>]</div>
+<div style='float:right;'>[<a href="javascript:;" onclick="javascript:CloseTWin();">关闭</a>]</div>
 <br style='clear:both' />
 <form action='stepselect_main.php' method='post'<?php echo $sbjs; ?>>
 <INPUT TYPE="hidden" NAME="action" value="edit_save" />
@@ -21,7 +21,7 @@ if($arr['issystem']==0) $sbjs = '';
 ?>
 <!-- 新增类别表单 -->
 <div style='float:left;'><b>新增类别</b></div>
-<div style='float:right;'>[<a href="#" onclick="javascript:CloseTWin();">关闭</a>]</div>
+<div style='float:right;'>[<a href="javascript:;" onclick="javascript:CloseTWin();">关闭</a>]</div>
 <br style='clear:both' />
 <form action='stepselect_main.php' method='post'>
 <INPUT TYPE="hidden" NAME="action" value="addnew_save" />
@@ -42,7 +42,7 @@ if($arr['issign']==0)
 ?>
 <!-- 新增枚举表单 -->
 <div style='float:left;'><b>添加枚举</b></div>
-<div style='float:right;'>[<a href="#" onclick="javascript:CloseTWin();">关闭</a>]</div>
+<div style='float:right;'>[<a href="javascript:;" onclick="javascript:CloseTWin();">关闭</a>]</div>
 <br style='clear:both' />
 <form action='stepselect_main.php' method='post'>
 <INPUT TYPE="hidden" NAME="action" value="addenum_save" />
@@ -78,7 +78,7 @@ if($arr['issign']==0)
 ?>
 <!-- 预览联动表单 -->
 <div style='float:left;'><b>预览联动表单</b></div>
-<div style='float:right;'>[<a href="#" onclick="javascript:CloseTWin();">关闭</a>]</div>
+<div style='float:right;'>[<a href="javascript:;" onclick="javascript:CloseTWin();">关闭</a>]</div>
 <br style='clear:both' />
 <br style='clear:both' />
 <div>

src/dede/templets/sys_cache_up.htm

@@ -58,7 +58,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/sys_data.htm

@@ -133,11 +133,11 @@
         <?php echo TjCount($t,$dsql); ?>
       </td>
       <td>
-        <a href="#" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">优化</a>
-        <a href="#" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">修复</a>
-        <a href="#" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">结构</a>
       </td>
       <?php
@@ -155,11 +155,11 @@
         <?php echo TjCount($t,$dsql); ?>
       </td>
       <td>
-        <a href="#" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">优化</a>
-        <a href="#" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">修复</a>
-        <a href="#" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">结构</a>
       </td>
       <?php
@@ -200,11 +200,11 @@
         <?php echo TjCount($t,$dsql); ?>
       </td>
       <td>
-        <a href="#" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">优化</a>
-        <a href="#" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">修复</a>
-        <a href="#" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">结构</a>
       </td>
       <?php
@@ -222,11 +222,11 @@
         <?php echo TjCount($t,$dsql); ?>
       </td>
       <td>
-        <a href="#" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=opimize&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">优化</a>
-        <a href="#" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=repair&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">修复</a>
-        <a href="#" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
+        <a href="javascript:;" onClick="LoadUrl('dopost=viewinfo&tablename=<?php echo $t; ?>');"
           class="btn btn-success btn-sm">结构</a>
       </td>
       <?php

src/dede/templets/sys_data_replace.htm

@@ -155,7 +155,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/sys_info.htm

@@ -1,13 +1,11 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>系统配置参数</title>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript">
+<script src="../static/js/dedeajax2.js"></script>
+<script src="../static/js/jquery.js"></script>
+<script>
 var searchconfig = false;
 function Nav() {
   if (window.navigator.userAgent.indexOf("MSIE") >= 1) return 'IE';
@@ -25,13 +23,11 @@
   }
   $Obj('addvar').style.display = 'none';
 }
-
 function ShowHide(objname) {
   var obj = $Obj(objname);
   if (obj.style.display != "none") obj.style.display = "none";
   else obj.style.display = (Nav() == 'IE' ? 'block' : 'table-row');
 }
-
 function backSearch() {
   location.reload();
 }
@@ -51,19 +47,22 @@
 }
 </script>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="css/base.css" rel="stylesheet" type="text/css">
+<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="css/base.css">
+<style>
+.table{margin-bottom:0}
+.btn+.btn{margin-left:10px}
+</style>
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
   <div style="min-width:780px">
-    <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D6D6D6" align="center"
-      class="table maintable table-bordered mt-3">
+    <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
       <tr>
-        <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b>DedeBIZV6系统配置参数：</b></td>
+        <td height="30" background="images/tbg.gif" style="padding-left:10px"><b>系统配置参数</b></td>
       </tr>
       <tr>
-        <td height="24" bgcolor="#ffffff" align="center"><?php
+        <td height="30" bgcolor="#ffffff" align="left">
+        <?php
         $ds = file(DEDEADMIN.'/inc/configgroup.txt');
         $totalGroup = count($ds);
         $i = 0;
@@ -73,53 +72,52 @@ foreach($ds as $dl)
           if(empty($dl)) continue;
           $dls = explode(',',$dl);
           $i++;
-	if($i>1) echo " | <a href='javascript:ShowConfig($i,$totalGroup)'>{$dls[1]}</a> ";
+          if($i>1) echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
           else {
-		echo " <a href='javascript:ShowConfig($i,$totalGroup)'>{$dls[1]}</a> ";
+            echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
           }
         }
         ?>
-          | <a href="#" onClick="ShowHide('addvar')">添加新变量</a></td>
+        <a href="javascript:;" onClick="ShowHide('addvar')" class="btn btn-success btn-sm">添加新变量</a>
+        </td>
       </tr>
       <tr id="addvar" style="display:none">
-        <td height="24" bgcolor="#ffffff" align="center">
+        <td height="26" bgcolor="#ffffff" align="center">
           <form name="fadd" action="sys_info.php" method="post">
             <input type='hidden' name='dopost' value='add'>
-            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
-            <table width="98%" border="0" cellspacing="0" cellpadding="0">
+            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0">
               <tr>
-                <td width="12%" height="26">变量名称：</td>
-                <td width="38%" align="left"><input name="nvarname" type="text" id="nvarname" class="npvar"
-                    style="width:80%" /></td>
-                <td width="12%" align="center">变量值：</td>
-                <td width="38%" align="left"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar"
-                    style="width:80%" /></td>
+                <td width="12%" height="26">变量名称</td>
+                <td width="38%" align="left"><input name="nvarname" type="text" id="nvarname" class="npvar" style="width:80%"></td>
+                <td width="12%" align="center">变量值</td>
+                <td width="38%" align="left"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar" style="width:80%"></td>
               </tr>
               <tr>
-                <td width="10%" height="26">变量类型：</td>
-                <td colspan='3' align="left"><input name="vartype" type="radio" value="string" class='np'
-                    checked='checked' />
+                <td width="10%" height="26">变量类型</td>
+                <td colspan='3' align="left"><input name="vartype" type="radio" value="string" class='np' checked='checked'>
                   文本
-                  <input name="vartype" type="radio" value="number" class='np' />
+                  <input name="vartype" type="radio" value="number" class='np'>
                   数字
-                  <input type="radio" name="vartype" value="bool" class='np' />
+                  <input type="radio" name="vartype" value="bool" class='np'>
                   布尔(Y/N)
-                  <input type="radio" name="vartype" value="bstring" class='np' />
+                  <input type="radio" name="vartype" value="bstring" class='np'>
                   多行文本 </td>
               </tr>
               <tr>
-                <td height="26">参数说明：</td>
-                <td align="left"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:80%" /></td>
-                <td align="center">所属组：</td>
-                <td align="left"><?php
-                echo "<select name='vargroup' class='npvar'>\r\n";
+                <td height="26">参数说明</td>
+                <td align="left"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:80%"></td>
+                <td align="center">所属组</td>
+                <td align="left">
+                <?php
+                echo "<select name='vargroup' class='npvar'>";
                 foreach($ds as $dl){
                   $dl = trim($dl);
                   if(empty($dl)) continue;
                   $dls = explode(',',$dl);
-                	echo "<option value='{$dls[0]}'>{$dls[1]}</option>\r\n";
+                  echo "<option value='{$dls[0]}'>{$dls[1]}</option>";
                 }
-                echo "</select>\r\n";
+                echo "</select>";
                 ?>
                 <button type="submit" class="btn btn-success btn-sm">保存变量</button>
                 </td>
@@ -129,19 +127,19 @@ foreach($ds as $dl)
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" cellpadding="0" cellspacing="0" style="margin-top:10px" bgcolor="#D6D6D6"
-      align="center" class="table maintable table-bordered mt-3">
+    <table width="98%" border="0" cellpadding="0" cellspacing="0" style="margin-top:10px" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
       <tr>
-        <td height="28" align="right" background="images/tbg.gif" style="border:1px solid #cfcfcf;border-bottom:none;">
-          &nbsp;&nbsp;&nbsp;配置搜索：
-          <input type="text" name="keywds" id="keywds" />
+        <td height="26" align="right" background="images/tbg.gif" style="border:1px solid #cfcfcf;border-bottom:none">
+          <span style="line-height:26px">配置搜索：</span>
+          <input type="text" name="keywds" id="keywds">
           <button type="button" onclick="getSearch()" class="btn btn-success btn-sm">搜索</button>
-          &nbsp;<span id="_searchback"></span></td>
+          <span id="_searchback"></span>
+        </td>
       </tr>
       <tr>
         <td bgcolor="#FFFFFF" width="100%">
           <form action="sys_info.php" method="post" name="form1">
-            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
             <input type="hidden" name="dopost" value="save">
             <div id="_search"></div>
             <div id="_mainsearch">
@@ -155,8 +153,7 @@ foreach($ds as $dl)
               $dls = explode(',',$dl);
               $n++;
             ?>
-              <table width="100%" style='<?php if($n!=$gp) echo "display:none"; ?>' id="td<?php echo $n?>" border="0"
-                cellspacing="1" cellpadding="1" bgcolor="#cfcfcf">
+            <table width="100%" style="<?php if($n!=$gp) echo 'display:none'; ?>" id="td<?php echo $n?>" border="0" cellspacing="1" cellpadding="1" bgcolor="#cfcfcf">
               <tr align="center" bgcolor="#FBFCE2">
                 <td width="300">参数说明</td>
                 <td>参数值</td>
@@ -171,63 +168,50 @@ while($row = $dsql->GetArray())
                 if($i%2==0)
                 {
                   $bgcolor = "#F9FCEF";
-	}
-	else
-	{
+                } else {
                   $bgcolor = "#ffffff";
                 }
                 $i++;
               ?>
               <tr align="center" bgcolor="<?php echo $bgcolor?>">
-                  <td width="300"><?php echo $row['info']; ?>： </td>
-                  <td align="left" style="padding:8px;"><?php
+                <td width="300"><?php echo $row['info']; ?></td>
+                <td align="left">
+                <?php
                 if($row['type']=='bool')
                 {
                   $c1='';
                   $c2 = '';
                   $row['value']=='Y' ? $c1=" checked" : $c2=" checked";
-	echo "<label><input type='radio' class='np' name='edit___{$row['varname']}' value='Y'$c1> 是 </label> ";
-	echo "<label><input type='radio' class='np' name='edit___{$row['varname']}' value='N'$c2> 否 </label> ";
-}else if($row['type']=='bstring')
-{
-	echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:98%;height:50px'>".dede_htmlspecialchars($row['value'])."</textarea>";
-}else if($row['type']=='number')
-{
+                  echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='Y'$c1> 是 </label> ";
+                  echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='N'$c2> 否 </label> ";
+                } else if($row['type']=='bstring') {
+                  echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:100%;height:40px'>".dede_htmlspecialchars($row['value'])."</textarea>";
+                } else if($row['type']=='number') {
                   echo "<input type='text' name='edit___{$row['varname']}' id='edit___{$row['varname']}' value='{$row['value']}' style='width:30%'>";
-}else
-{
+                } else {
                   $addstr='';
                   if ($row['varname']=='cfg_cookie_encode') {
                     $addstr=' <a href="javascript:resetCookieEncode();" class="btn btn-success btn-sm">重新生成</a>';
                   }
                   echo "<input type='text' name='edit___{$row['varname']}' id='edit___{$row['varname']}' value=\"".dede_htmlspecialchars($row['value'])."\" style='width:80%'>{$addstr}";
                 }
-?></td>
-                  <td><?php echo $row['varname']?></td>
+                ?>
+                </td>
+                <td>{dede:field.<?php echo $row['varname']?>/}</td>
               </tr>
               <?php
               }
-
               ?>
             </table>
             <?php
             }
             ?>
             </div>
-            <table width="100%" border="0" cellspacing="1" cellpadding="1"
-              style="border:1px solid #cfcfcf;border-top:none;" class="table table-borderless">
-              <tr bgcolor="#F9FCEF">
-                <td height="50" colspan="3">
-                  <table width="98%" border="0" cellspacing="1" cellpadding="1">
-                    <tr>
-                      <td width="11%">&nbsp;</td>
-                      <td width="11%">
+            <table width="100%" border="0" cellspacing="1" cellpadding="1" bgcolor="#f8f8f8" style="border:1px solid #cfcfcf;border-top:none" class="table table-borderless">
+              <tr height="36">
+                <td>
                   <button type="submit" class="btn btn-success">确定</button>
-                      </td>
-                      <td width="78%"><button type="button" onClick="document.form1.reset()"
-                          class="btn btn-success">重置</button></td>
-                    </tr>
-                  </table>
+                  <button type="button" onClick="document.form1.reset()" class="btn btn-success">重置</button>
                 </td>
               </tr>
             </table>
@@ -237,5 +221,4 @@ if($row['type']=='bool')
     </table>
   </div>
 </body>
-
 </html>

src/dede/templets/sys_safetest_viewdiff.htm

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 
 <head>

src/dede/templets/tag_test.htm

@@ -95,7 +95,7 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight + 50;
                 }
               </script>
-              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>

src/dede/templets/templets_default.htm

@@ -1,54 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+<meta charset="<?php echo $cfg_soft_lang; ?>">
 <title>模板管理器</title>
 <link rel="stylesheet" href="../static/css/bootstrap.min.css">
 <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 <link rel="stylesheet" href="css/base.css">
 <style>
 .linerow{border-bottom:1px solid #CBD8AC}
-td{padding-left:6px}
 a.btn{color:white!important}
+.btn+.btn{margin-left:10px}
 </style>
-	<script language="javascript">
+<script>
 function DelTpl(filename) {
 	if (window.confirm('你确定要删除这篇文档吗')) location = 'tpl.php?action=del&acdir=<?php echo $acdir; ?>&filename=' + filename;
 	else return false;
 }
 </script>
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-	<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6"
-		class="table maintable table-bordered mt-3">
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
+	<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
 		<tr>
-			<td height="28" background="images/tbg.gif" colspan="7">
+			<td height="30" background="images/tbg.gif" colspan="7">
 				<b>模板管理</b>
 			</td>
 		</tr>
 	</table>
-	<table width='98%' border='0' cellspacing='1' cellpadding='0' align="center" bgcolor="#cfcfcf" class="table maintable table-bordered">
-		<tr height="26" align="center">
+	<table width="98%" border="0" cellspacing="1" cellpadding="0" align="center" bgcolor="#cfcfcf" class="table maintable table-bordered">
+		<tr height="30" align="center">
 			<td width="25%" background="images/wbg.gif"><strong>文件名</strong></td>
-			<td width="33%" background="images/wbg.gif"><strong>文件描述</strong></td>
-			<td width="22%" background="images/wbg.gif"><strong>修改时间</strong></td>
+			<td width="30%" background="images/wbg.gif"><strong>文件描述</strong></td>
+			<td width="25%" background="images/wbg.gif"><strong>修改时间</strong></td>
 			<td width="20%" background="images/wbg.gif"><strong>操作</strong></td>
 		</tr>
 		<tr>
-			<td colspan='4' height="28" bgcolor="#F9FCEF">
-				<div style='float:left'>
+			<td colspan="4" height="30" bgcolor="#F9FCEF">
+				<span style="float:left;line-height:26px">
 				当前位置：
 				<?php
       			if($acdir=='plus') echo '插件模板';
       			else if($acdir=='system') echo '底层模板';
       			else echo '核心模板 &gt; '.$acdir;
       			?>
-				</div>
-				<div style='float:right;padding-right:10px'>
-					<a class="btn btn-success btn-sm" href='templets_main.php'>默认模板目录</a>
-					<a class="btn btn-success btn-sm" href='templets_main.php?acdir=plus'>插件模板目录</a>
-				</div>
+				</span>
+				<span style="float:right;padding-right:10px">
+					<a class="btn btn-success btn-sm" href="templets_main.php">默认模板目录</a>
+					<a class="btn btn-success btn-sm" href="templets_main.php?acdir=plus">插件模板目录</a>
+				</span>
 			</td>
 		</tr>
 		<?php
@@ -60,20 +58,16 @@ a.btn{color:white!important}
 			$filetime = MyDate("Y-m-d H:i",$filetime);
 			$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename]:'未知模板');
 		?>
-		<tr height="26" bgcolor='#FFFFFF' onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-			<td>
-				<a href='<?php echo $templeturld.'/'.$filename; ?>' target='_blank'><img src='images/htm.gif' border='0' align='absmiddle' /> <?php echo $filename; ?></a>
-			</td>
+		<tr height="26" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+			<td><a href="<?php echo $templeturld.'/'.$filename; ?>" target="_blank"><img src="images/htm.gif"><?php echo $filename; ?></a></td>
 			<td><?php echo $fileinfo; ?></td>
-			<td align='center'><?php echo $filetime; ?></td>
-			<td align='center'>
-				<a class="btn btn-success btn-sm" href='tpl.php?action=edit&acdir=<?php echo $acdir; ?>&filename=<?php echo $filename; ?>' title="编辑"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+			<td align="center"><?php echo $filetime; ?></td>
+			<td align="center">
+				<a href="tpl.php?action=edit&acdir=<?php echo $acdir; ?>&filename=<?php echo $filename; ?>" title="编辑" class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
 				<?php
-				if(!isset($fileinfos[$filename]))
-				{
+				if(!isset($fileinfos[$filename])){
 				?>
-				|
-				<a href='#' class="btn btn-success btn-sm" onClick="javascript:DelTpl('<?php echo $filename; ?>');" title="删除"><i class="fa fa-trash" aria-hidden="true"></i></a>
+				<a href="javascript:;" class="btn btn-success btn-sm" onClick="javascript:DelTpl('<?php echo $filename; ?>');" title="删除"><i class="fa fa-trash" aria-hidden="true"></i></a>
 				<?php
 		   		}
 				?>
@@ -83,7 +77,10 @@ a.btn{color:white!important}
 		}
 		?>
 		<tr>
-			<td colspan="4" height='36' bgcolor="#F9FCEF"><a class="btn btn-success" href='tpl.php?action=newfile&acdir=<?php echo $acdir; ?>'>新建模板</a>&nbsp;<a class="btn btn-success" href='tpl.php?action=upload&acdir=<?php echo $acdir; ?>'>上传模板</a></td>
+			<td colspan="4" height="36" bgcolor="#f8f8f8">
+				<a class="btn btn-success" href="tpl.php?action=newfile&acdir=<?php echo $acdir; ?>">新建模板</a>
+				<a class="btn btn-success" href="tpl.php?action=upload&acdir=<?php echo $acdir; ?>">上传模板</a>
+			</td>
 		</tr>
 	</table>
 </body>

src/dede/templets/templets_one.htm

@@ -59,7 +59,7 @@
             </div>
             <div style="float:right">
                <a href="templets_one_add.php" class="btn btn-success btn-sm">增加一个页面</a>
-               &nbsp;<a href="#" onClick="document.form1.submit();" class="btn btn-success btn-sm">更新选中页面</a>
+               &nbsp;<a href="javascript:;" onClick="document.form1.submit();" class="btn btn-success btn-sm">更新选中页面</a>
                &nbsp;<a href="templets_one_edit.php?dopost=mkall" class="btn btn-success btn-sm">更新所有页面</a>
                &nbsp;&nbsp;&nbsp;&nbsp;
             </div>

src/dede/templets/update_guide_getfiles.htm

@@ -36,7 +36,7 @@
             		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
             	}
             	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>] 
+            [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>] 
           </td>
         </tr>
       </table>

src/include/arc.archives.class.php

@@ -12,7 +12,6 @@ if (!defined('DEDEINC')) exit("Request Error!");
 require_once(DEDEINC."/typelink.class.php");
 require_once(DEDEINC."/channelunit.class.php");
 require_once(DEDEINC."/downmix.inc.php");
-
 @set_time_limit(0);
 /**
  * 主文档类(Archives类)
@@ -42,7 +41,6 @@ class Archives
     var $PreNext;
     var $addTableRow;
     var $remoteDir;
-
     /**
      *  php5构造函数
      *
@@ -56,7 +54,6 @@ class Archives
         $this->IsError = FALSE;
         $this->ArcID = $aid;
         $this->PreNext = array();
-
         $this->dsql = $dsql;
         $query = "SELECT channel,typeid FROM `#@__arctiny` WHERE id='$aid' ";
         $arr = $this->dsql->GetOne($query);
@@ -67,7 +64,7 @@ class Archives
             $this->ChannelUnit = new ChannelUnit($arr['channel'], $aid);
             $this->TypeLink = new TypeLink($arr['typeid']);
             if ($this->ChannelUnit->ChannelInfos['issystem'] != -1) {
-                // 如果当前文档不是系统模型,为单表模型
+                // 如果当前文档不是系统模型，为单表模型
                 $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable
                     FROM `#@__archives` arc
                     LEFT JOIN #@__arctype tp on tp.id=arc.typeid
@@ -81,11 +78,9 @@ class Archives
                 $this->Fields['ismake'] = 1;
                 $this->Fields['filename'] = '';
             }
-
             if ($this->TypeLink->TypeInfos['corank'] > 0 && $this->Fields['arcrank'] == 0) {
                 $this->Fields['arcrank'] = $this->TypeLink->TypeInfos['corank'];
             }
-
             $this->Fields['tags'] = GetTags($aid);
             $this->dtp = new DedeTagParse();
             $this->dtp->SetRefObj($this);
@@ -102,24 +97,20 @@ class Archives
             } else {
                 $this->NowPage = $GLOBALS['pageno'];
             }
-
             //特殊的字段数据处理
             $this->Fields['aid'] = $aid;
             $this->Fields['id'] = $aid;
             $this->Fields['position'] = $this->TypeLink->GetPositionLink(TRUE);
             $this->Fields['typeid'] = $arr['typeid'];
-
             //设置一些全局参数的值
             foreach ($GLOBALS['PubFields'] as $k => $v) {
                 $this->Fields[$k] = $v;
             }
-
             //为了减少重复查询，这里直接把附加表查询记录放在 $this->addTableRow 中，在 ParAddTable() 不再查询
             if ($this->ChannelUnit->ChannelInfos['addtable'] != '') {
                 $query = "SELECT * FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` WHERE `aid` = '$aid'";
                 $this->addTableRow = $this->dsql->GetOne($query);
             }
-
             //issystem==-1 表示单表模型，单表模型不支持redirecturl这类参数，因此限定内容普通模型才进行下面查询
             if ($this->ChannelUnit->ChannelInfos['addtable'] != '' && $this->ChannelUnit->ChannelInfos['issystem'] != -1) {
                 if (is_array($this->addTableRow)) {
@@ -135,13 +126,11 @@ class Archives
             }
         } //!error
     }
-
     //php4构造函数
     function Archives($aid)
     {
         $this->__construct($aid);
     }
-
     /**
      *  解析附加表的内容
      *
@@ -162,7 +151,6 @@ class Archives
                 $this->Fields['money'] = 0;
                 $this->Fields['filename'] = '';
             }
-
             if (is_array($row)) {
                 foreach ($row as $k => $v) $row[strtolower($k)] = $v;
             }
@@ -204,10 +192,19 @@ class Archives
             //设置全局环境变量
             $this->Fields['typename'] = $this->TypeLink->TypeInfos['typename'];
             @SetSysEnv($this->Fields['typeid'], $this->Fields['typename'], $this->Fields['id'], $this->Fields['title'], 'archives');
+            //文章的图片注释替换为标题
+            $this->Fields['body'] = str_ireplace(array('alt=""','alt=\'\''),'',$this->Fields['body']);
+            $this->Fields['body'] = preg_replace("@ [\s]{0,}alt[\s]{0,}=[\"'\s]{0,}[\s\S]{0,}[\"'\s] @isU"," ",$this->Fields['body']);
+            $this->Fields['body'] = str_ireplace("<img","<img alt=\"".$this->Fields['title']."\" title=\"".$this->Fields['title']."\" style=\"margin:20px 0;box-shadow:0 1px 2px rgba(0,0,0,.1)\"",$this->Fields['body']);
+            //图集的图片注释替换为标题
+            $this->Fields['imgurls'] = str_ireplace(array('alt=""','alt=\'\''),'',$this->Fields['imgurls']);
+            $this->Fields['imgurls'] = preg_replace("@ [\s]{0,}alt[\s]{0,}=[\"'\s]{0,}[\s\S]{0,}[\"'\s] @isU"," ",$this->Fields['imgurls']);
+            $this->Fields['imgurls'] = str_ireplace("<img","<img alt=\"".$this->Fields['title']."\" title=\"".$this->Fields['title']."\" ",$this->Fields['imgurls']);
+            //去掉文章图片的宽度和高度
+            $this->Fields['body'] = preg_replace("/style=\"width\:(.*)\"/","",$this->Fields['body']);
         }
         //完成附加表信息读取
         unset($row);
-
         //处理要分页显示的字段
         $this->SplitTitles = array();
         if ($this->SplitPageField != '' && $GLOBALS['cfg_arcsptitle'] = 'Y'
@@ -235,7 +232,6 @@ class Archives
             $this->TotalPage = count($this->SplitFields);
             $this->Fields['totalpage'] = $this->TotalPage;
         }
-
         //处理默认缩略图等
         if (isset($this->Fields['litpic'])) {
             if ($this->Fields['litpic'] == '-' || $this->Fields['litpic'] == '') {
@@ -245,7 +241,6 @@ class Archives
                 $this->Fields['litpic'] = $GLOBALS['cfg_mainsite'].$this->Fields['litpic'];
             }
             $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']}' />");
         }
@@ -258,7 +253,6 @@ class Archives
                 $this->Fields['vote'] = "<script language='javascript' src='{$GLOBALS['cfg_mainsite']}/data/vote/vote_{$voteid}.js'></script>";
             }
         }
-
         if (isset($this->Fields['goodpost']) && isset($this->Fields['badpost'])) {
             //digg
             if ($this->Fields['goodpost'] + $this->Fields['badpost'] == 0) {
@@ -269,7 +263,6 @@ class Archives
             }
         }
     }
-
     //获得当前字段参数
     function GetCurTag($fieldname)
     {
@@ -285,7 +278,6 @@ class Archives
         }
         return '';
     }
-
     /**
      *  生成静态HTML
      *
@@ -311,7 +303,6 @@ class Archives
         $this->Fields['ismake'] = empty($this->Fields['ismake']) ? 0 : $this->Fields['ismake'];
         $this->Fields['money'] = empty($this->Fields['money']) ? 0 : $this->Fields['money'];
         $this->Fields['filename'] = empty($this->Fields['filename']) ? '' : $this->Fields['filename'];
-
         //分析要创建的文件名称
         $filename = GetFileNewName(
             $this->ArcID,
@@ -325,7 +316,6 @@ class Archives
             $this->Fields['money'],
             $this->Fields['filename']
         );
-
         $filenames  = explode(".", $filename);
         $this->ShortName = $filenames[count($filenames) - 1];
         if ($this->ShortName == '') $this->ShortName = 'html';
@@ -336,7 +326,6 @@ class Archives
         if ($this->NameFirst == '') {
             $this->NameFirst = $this->arcID;
         }
-
         //获得当前文档的全名
         $filenameFull = GetFileUrl(
             $this->ArcID,
@@ -354,12 +343,9 @@ class Archives
             $this->TypeLink->TypeInfos['sitepath']
         );
         $this->Fields['arcurl'] = $this->Fields['fullname'] = $filenameFull;
-
         //对于已设置不生成HTML的文章直接返回网址
         if (
-            $this->Fields['ismake'] == -1 || $this->Fields['arcrank'] != 0 || $this->Fields['money'] > 0
-            || ($this->Fields['typeid'] == 0 && $this->Fields['channel'] != -1)
-        ) {
+            $this->Fields['ismake'] == -1 || $this->Fields['arcrank'] != 0 || $this->Fields['money'] > 0 || ($this->Fields['typeid'] == 0 && $this->Fields['channel'] != -1)) {
             return $this->GetTrueUrl($filename);
         }
         //循环生成HTML文件
@@ -385,7 +371,6 @@ class Archives
         $this->dsql->ExecuteNoneQuery("Update `#@__archives` SET ismake=1 WHERE id='".$this->ArcID."'");
         return $this->GetTrueUrl($filename);
     }
-
     /**
      *  获得真实连接路径
      *
@@ -411,7 +396,6 @@ class Archives
             $this->TypeLink->TypeInfos['sitepath']
         );
     }
-
     /**
      *  获得站点的真实根路径
      *
@@ -423,7 +407,6 @@ class Archives
         $TRUEpath = $GLOBALS["cfg_basedir"];
         return $TRUEpath;
     }
-
     /**
      *  获得指定键值的字段
      *
@@ -454,7 +437,6 @@ class Archives
         }
         return '';
     }
-
     /**
      *  获得模板文件位置
      *
@@ -494,7 +476,6 @@ class Archives
         if (!preg_match("#.htm$#", $tmpfile)) return FALSE;
         return $tmpfile;
     }
-
     /**
      *  动态输出结果
      *
@@ -512,16 +493,14 @@ class Archives
         //预编译
         $this->LoadTemplet();
         $this->ParAddTable();
-
         $this->ParseTempletsFirst();
-
         //跳转网址
         $this->Fields['flag'] = empty($this->Fields['flag']) ? "" : $this->Fields['flag'];
         if (preg_match("#j#", $this->Fields['flag']) && $this->Fields['redirecturl'] != '') {
             if ($GLOBALS['cfg_jump_once'] == 'N') {
                 $pageHtml = "<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; 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 .= "现在正在转向：".$this->Fields['title']."，请稍候...<br/><br/>\r\n转向内容简介：".$this->Fields['description']."\r\n</body>\r\n</html>\r\n";
                 echo $pageHtml;
             } else {
                 header("location:{$this->Fields['redirecturl']}");
@@ -532,7 +511,6 @@ class Archives
         $this->ParseDMFields($pageCount, 0);
         $this->dtp->display();
     }
-
     /**
      *  载入模板
      *
@@ -554,7 +532,6 @@ class Archives
             $this->dtp->LoadSource($this->TempSource);
         }
     }
-
     /**
      *  解析模板，对固定的标记进行初始给值
      *
@@ -566,36 +543,25 @@ class Archives
         if (empty($this->Fields['keywords'])) {
             $this->Fields['keywords'] = '';
         }
-
         if (empty($this->Fields['reid'])) {
             $this->Fields['reid'] = 0;
         }
-
         $GLOBALS['envs']['tags'] = $this->Fields['tags'];
 
         if (isset($this->TypeLink->TypeInfos['reid'])) {
             $GLOBALS['envs']['reid'] = $this->TypeLink->TypeInfos['reid'];
         }
-
         $GLOBALS['envs']['keyword'] = $this->Fields['keywords'];
-
         $GLOBALS['envs']['typeid'] = $this->Fields['typeid'];
-
         $GLOBALS['envs']['topid'] = GetTopid($this->Fields['typeid']);
-
         $GLOBALS['envs']['aid'] = $GLOBALS['envs']['id'] = $this->Fields['id'];
-
         $GLOBALS['envs']['adminid'] = $GLOBALS['envs']['mid'] = isset($this->Fields['mid']) ? $this->Fields['mid'] : 1;
-
         $GLOBALS['envs']['channelid'] = $this->TypeLink->TypeInfos['channeltype'];
-
         if ($this->Fields['reid'] > 0) {
             $GLOBALS['envs']['typeid'] = $this->Fields['reid'];
         }
-
         MakeOneTag($this->dtp, $this, 'N');
     }
-
     /**
      *  解析模板，对内容里的变动进行赋值
      *
@@ -612,7 +578,6 @@ class Archives
             $this->Fields[$this->SplitPageField] = $this->SplitFields[$pageNo - 1];
             if ($pageNo > 1) $this->Fields['description'] = trim(preg_replace("/[\r\n\t]/", ' ', cn_substr(html2text($this->Fields[$this->SplitPageField]), 200)));
         }
-
         //解析模板
         if (is_array($this->dtp->CTags)) {
             foreach ($this->dtp->CTags as $i => $ctag) {
@@ -632,7 +597,34 @@ class Archives
                     }
                 } else if ($ctag->GetName() == 'prenext') {
                     $this->dtp->Assign($i, $this->GetPreNext($ctag->GetAtt('get')));
-                } else if ($ctag->GetName() == 'fieldlist') {
+                }
+                //二次开发上一篇下一篇{dede:prenextdiy get='pre'}{/dede:prenextdiy}{dede:prenextdiy get='next'}{/dede:prenextdiy} 
+                else if($ctag->GetName()=='prenextdiy')
+                {
+                    $innertext = trim($ctag->GetInnerText());
+                    if($innertext)
+                    {
+                        $get = $ctag->GetAtt('get');
+                        $diys['diy'] = $this->GetPreNext('diy');
+                        $revalue = '';
+                        $dtp2 = new DedeTagParse();
+                        $dtp2->SetNameSpace('field','[',']');
+                        $dtp2->LoadSource($innertext);
+                        foreach($diys as $row)
+                        {
+                            foreach($dtp2->CTags as $tid=>$ctag2)
+                            {
+                                if(isset($row[$get][$ctag2->GetName()]))
+                                {
+                                    $dtp2->Assign($tid,$row[$get][$ctag2->GetName()]);
+                                }
+                            }
+                            $revalue .= $dtp2->GetResult();
+                        }
+                        if($row[$get]['id']) $this->dtp->Assign($i,$revalue);
+                    }
+                }
+                else if ($ctag->GetName() == 'fieldlist') {
                     $innertext = trim($ctag->GetInnerText());
                     if ($innertext == '') $innertext = GetSysTemplets('tag_fieldlist.htm');
                     $dtp2 = new DedeTagParse();
@@ -666,12 +658,9 @@ class Archives
                     }
                     $this->dtp->Assign($i, $res);
                 } //end case
-
             } //结束模板循环
-
         }
     }
-
     /**
      *  关闭所占用的资源
      *
@@ -683,7 +672,6 @@ class Archives
         $this->FixedValues = '';
         $this->Fields = '';
     }
-
     /**
      *  获取上一篇，下一篇链接
      *
@@ -726,7 +714,13 @@ class Archives
                         $preRow['sitepath']
                     );
                 }
-
+                //二次开发上一篇属性
+                $preRow['litpic'] = (empty($preRow['litpic'])) ? $GLOBALS['cfg_cmspath'].'/images/defaultpic.jpg' : $preRow['litpic'];
+                $this->PreNext['diy']['pre']['id'] = $preRow['id'];
+                $this->PreNext['diy']['pre']['arcurl'] = $mlink;
+                $this->PreNext['diy']['pre']['title'] = $preRow['title'];
+                $this->PreNext['diy']['pre']['litpic'] = $preRow['litpic'];
+                $this->PreNext['diy']['pre']['pubdate'] = $preRow['senddate'];
                 $this->PreNext['pre'] = "上一篇：<a href='$mlink'>{$preRow['title']}</a> ";
                 $this->PreNext['preimg'] = "<a href='$mlink'><img src=\"{$preRow['litpic']}\" alt=\"{$preRow['title']}\"/></a> ";
             } else {
@@ -753,7 +747,13 @@ class Archives
                         $nextRow['sitepath']
                     );
                 }
-
+                //二次开发下一篇属性
+                $nextRow['litpic'] = (empty($nextRow['litpic'])) ? $GLOBALS['cfg_cmspath'].'/images/defaultpic.jpg' : $nextRow['litpic'];
+                $this->PreNext['diy']['next']['id'] = $nextRow['id'];
+                $this->PreNext['diy']['next']['arcurl'] = $mlink;
+                $this->PreNext['diy']['next']['title'] = $nextRow['title'];
+                $this->PreNext['diy']['next']['litpic'] = $nextRow['litpic'];
+                $this->PreNext['diy']['next']['pubdate'] = $nextRow['senddate'];
                 $this->PreNext['next'] = "下一篇：<a href='$mlink'>{$nextRow['title']}</a> ";
                 $this->PreNext['nextimg'] = "<a href='$mlink'><img src=\"{$nextRow['litpic']}\" alt=\"{$nextRow['title']}\"/></a> ";
             } else {
@@ -761,22 +761,25 @@ class Archives
                 $this->PreNext['nextimg'] = "<a href='javascript:void(0)' alt=\"\"><img src=\"/templets/default/images/nophoto.jpg\" alt=\"对不起，没有下一图集了！\"/></a>";
             }
         }
-        if ($gtype == 'pre') {
+        //二次开发上一篇下一篇
+        if($gtype=='diy')
+        {
+            return $this->PreNext['diy'];
+        }
+        if($gtype=='pre')
+        {
             $rs =  $this->PreNext['pre'];
         } else if ($gtype == 'preimg') {
-
             $rs =  $this->PreNext['preimg'];
         } else if ($gtype == 'next') {
             $rs =  $this->PreNext['next'];
         } else if ($gtype == 'nextimg') {
-
             $rs =  $this->PreNext['nextimg'];
         } else {
             $rs =  $this->PreNext['pre']." &nbsp; ".$this->PreNext['next'];
         }
         return $rs;
     }
-
     /**
      *  获得动态页面分页列表
      *
@@ -845,7 +848,6 @@ class Archives
         }
         return $PageList;
     }
-
     /**
      *  获得静态页面分页列表
      *
@@ -895,7 +897,6 @@ class Archives
         }
         return $PageList;
     }
-
     /**
      *  获得动态页面小标题
      *
@@ -946,7 +947,6 @@ class Archives
         }
         return $revalue;
     }
-
     /**
      *  获得静态页面小标题
      *
@@ -996,7 +996,6 @@ class Archives
         }
         return $revalue;
     }
-
     /**
      * 高亮问题修正, 排除alt title <a></a>直接的字符替换
      *
@@ -1011,80 +1010,84 @@ class Archives
         $kws = explode(",",trim($kw));//以分好为间隔符
         $i=0;
         $karr = $kaarr = $GLOBALS['replaced'] = array();
-
         //暂时屏蔽超链接
         $body = preg_replace("#(<a(.*))(>)(.*)(<)(\/a>)#isU", '\\1-]-\\4-[-\\6', $body);
-
-        /*
-        foreach($kws as $k)
+        $query = "SELECT * FROM #@__keywords WHERE rpurl<>'' ORDER BY rank DESC";
+        $this->dsql->SetQuery($query);
+        $this->dsql->Execute();
+        while($row = $this->dsql->GetArray())
         {
-            $k = trim($k);
-            if($k!="")
+            global $cfg_replace_num;
+            $key = trim($row['keyword']);
+            $key_url=trim($row['rpurl']);
+            $karr[] = $key;
+            $kaarr[] = "<a href='$key_url' target='_blank'>$key</a>";
+        }
+        //这里可能会有错误
+        if (version_compare(PHP_VERSION, '5.5.0', '>='))
         {
-                if($i > $maxkey)
+            if($cfg_replace_num > 0)
             {
-                    break;
-                }
-                $myrow = $this->dsql->GetOne("SELECT * FROM #@__keywords WHERE keyword='$k' AND rpurl<>'' ");
-                if(is_array($myrow))
+                $query = "SELECT * FROM #@__keywords WHERE rpurl<>'' ORDER BY rank DESC";
+                $this->dsql->SetQuery($query);
+                $this->dsql->Execute();
+                while($row = $this->dsql->GetArray())
                 {
-                    $karr[] = $k;
-                    $GLOBALS['replaced'][$k] = 0;
-                    $kaarr[] = "<a href='{$myrow['rpurl']}'><u>$k</u></a>";
-                }
-                $i++;
-            }
+                    $key = trim($row['keyword']);
+                    $key_url=trim($row['rpurl']);
+                    $body = str_replace_limit($key, "<a href='$key_url' target='_blank'>$key</a>", $body, $cfg_replace_num);
                 }
-        */
+            } else {
                 $query = "SELECT * FROM #@__keywords WHERE rpurl<>'' ORDER BY rank DESC";
                 $this->dsql->SetQuery($query);
                 $this->dsql->Execute();
-        while ($row = $this->dsql->GetArray()) {
+                while($row = $this->dsql->GetArray())
+                {
                     $key = trim($row['keyword']);
                     $key_url=trim($row['rpurl']);
-            $karr[] = $key;
-            $kaarr[] = "<a href='$key_url' target='_blank'><u>$key</u></a>";
+                    $body = str_replace($key, "<a href='$key_url' target='_blank'>$key</a>", $body);
+                }
             }
-
-        $GLOBALS['_dd_karr'] = $karr;
-        $GLOBALS['_dd_kaarr'] = $kaarr;
-
-        // 这里可能会有错误
-        if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            $body = @preg_replace_callback("#(^|>)([^<]+)(?=<|$)#sU", "_highlight8", $body);
-        } else if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-
-            $body = @preg_replace_callback("#(^|>)([^<]+)(?=<|$)#sU", "_highlight('\\2', \$karr, \$kaarr, '\\1')", $body);
         } else {
             $body = @preg_replace("#(^|>)([^<]+)(?=<|$)#sUe", "_highlight('\\2', \$karr, \$kaarr, '\\1')", $body);
         }
-
         //恢复超链接
         $body = preg_replace("#(<a(.*))-\]-(.*)-\[-(\/a>)#isU", '\\1>\\3<\\4', $body);
         return $body;
     }
 }//End Archives
-
-function _highlight8($matches){
-    return _highlight($matches[2], $GLOBALS['_dd_karr'], $GLOBALS['_dd_kaarr'], $matches[1]);
+//指定替换次数功能
+function str_replace_limit($search, $replace, $subject, $limit){
+    if(is_array($search)){
+        foreach($search as $k=>$v){
+            $search[$k] = '`'. preg_quote($search[$k], '`'). '`';
         }
-
-//高亮专用, 替换多次是可能不能达到最多次
+    } else {
+        $search = '`'. preg_quote($search, '`'). '`';
+    }
+    return preg_replace($search, $replace, $subject, $limit);
+}
+//高亮专用, 替换多次时可能不能达到最多次
 function _highlight($string, $words, $result, $pre)
 {
     global $cfg_replace_num;
-    if (version_compare(PHP_VERSION, '5.5.0', '>=') && version_compare(PHP_VERSION, '8.0.0', '<')) {
+    if (version_compare(PHP_VERSION, '5.5.0', '>='))
+    {
         $string = $string[0];
         $pre = $pre[0];
     }
     $string = str_replace('\"', '"', $string);
-    if ($cfg_replace_num > 0) {
-        foreach ($words as $key => $word) {
-            if ($GLOBALS['replaced'][$word] == 1) {
+    if($cfg_replace_num > 0)
+    {
+        foreach ($words as $key => $word)
+        {
+            if($GLOBALS['replaced'][$word] == 1)
+            {
                 continue;
             }
             $string = preg_replace("#".preg_quote($word)."#", $result[$key], $string, $cfg_replace_num);
-            if (strpos($string, $word) !== FALSE) {
+            if(strpos($string, $word) !== FALSE)
+            {
                 $GLOBALS['replaced'][$word] = 1;
             }
         }

src/include/common.func.php

@@ -203,7 +203,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         }
         $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
         $rmsg = $func;
-        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.6;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#666;background:#f2f2f2}a{color:#28a745;text-decoration:none}.xushu-tips{margin:68px auto 0;padding:0;width:360px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.tips{margin:0 20px;padding:12px 0;border-bottom:1px solid #f6f6f6}.tips p{margin:0;padding-left:10px;line-height:16px;font-size:14px;color:#424b51;text-align:left;border-left:3px solid #ff5722}.frame{padding:20px;height:120px}.go a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;color:#fff;background:#28a745;border:1px solid #28a745;box-sizing:border-box;border-radius:.2rem;text-align:center;transition:all .4s}.go a:hover{color:#fff;opacity:.8}@media (max-width:768px){body{padding:0 14px}.xushu-tips{width:100%}}</style>\");";
+        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f2f2f2}a{color:#28a745;text-decoration:none}.xushu-tips{margin:68px auto 0;padding:0;width:420px;height:auto;background:#fff;border-radius:.2rem}.tips{margin:0 20px;padding:16px 0;border-bottom:1px solid #f6f6f6}.tips p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #ff5722}.frame{padding:20px;min-height:120px;color:#666}.go a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border:1px solid #28a745;box-sizing:border-box;border-radius:.2rem;transition:all .6s;text-align:center}.go a:hover{opacity:.8}@media (max-width:768px){body{padding:0 16px}.xushu-tips{width:100%}}</style>\");";
         $rmsg .= "document.write(\"<div class='xushu-tips'>";
         $rmsg .= "<div class='tips'><p>提示信息</p></div>\");";
         $rmsg .= "document.write(\"<div class='frame'>\");";

src/include/common.inc.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @version        $Id: common.inc.php 3 17:44 2010-11-23 tianya $
  * @package        DedeBIZ.Libraries
@@ -7,25 +6,19 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 //生产环境使用production，如果采用dev模式，会有一些php的报错信息提示，便于开发调试
 define('DEDE_ENVIRONMENT', 'production');
-
 if (DEDE_ENVIRONMENT == 'production') {
     error_reporting(E_ALL || ~E_NOTICE);
 } else {
     error_reporting(E_ALL);
 }
-
 define('DEBUG_LEVEL', FALSE);//如果设置为TRUE则会打印执行SQL的时间和标签加载时间方便调试
-
 define('DEDEINC', str_replace("\\", '/', dirname(__FILE__)));
 define('DEDEROOT', str_replace("\\", '/', substr(DEDEINC, 0, -8)));
 define('DEDEDATA', DEDEROOT.'/data');
 define('DEDEMEMBER', DEDEROOT.'/member');
 define('DEDETEMPLATE', DEDEROOT.'/templets');
-
-// ------------------------------------------------------------------------
 define('DEDEBIZURL', "https://www.dedebiz.com");//Dede商业支持
 define('DEDEVER', 6);//当前系统大版本
 define('DEDEPUB', '-----BEGIN PUBLIC KEY-----
@@ -38,11 +31,9 @@ NQabUzX9JoYtXqPcpZRT7ymHrppU0KFdUSEJiW0utTWJo0HrDOBIT5qWlM0MP9p/
 PwIDAQAB
 -----END PUBLIC KEY-----'); //DedeBIZ系统公钥
 define('DEDECDNURL', 'https://cdn.dedebiz.com'); //默认静态资源地址
-
 if (version_compare(PHP_VERSION, '5.3.0', '<') && function_exists("get_magic_quotes_gpc")) {
     set_magic_quotes_runtime(0);
 }
-
 if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
     if (!function_exists('session_register')) {
         function session_register()
@@ -62,12 +53,10 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
         }
     }
 }
-
 //是否启用mb_substr替换cn_substr来提高效率
 $cfg_is_mb = $cfg_is_iconv = FALSE;
 if (function_exists('mb_substr')) $cfg_is_mb = TRUE;
 if (function_exists('iconv_substr')) $cfg_is_iconv = TRUE;
-
 function _RunMagicQuotes(&$svar)
 {
     if (function_exists("get_magic_quotes_gpc") && !@get_magic_quotes_gpc()) {
@@ -82,9 +71,8 @@ function _RunMagicQuotes(&$svar)
     }
     return $svar;
 }
-
 if (!defined('DEDEREQUEST')) {
-    //检查和注册外部提交的变量   (2011.8.10 修改登录时相关过滤)
+    //检查和注册外部提交的变量（2011.8.10 修改登录时相关过滤）
     function CheckRequest(&$val)
     {
         if (is_array($val)) {
@@ -99,11 +87,9 @@ if (!defined('DEDEREQUEST')) {
             }
         }
     }
-
     //var_dump($_REQUEST);exit;
     CheckRequest($_REQUEST);
     CheckRequest($_COOKIE);
-
     foreach (array('_GET', '_POST', '_COOKIE') as $_request) {
         foreach ($$_request as $_k => $_v) {
             if ($_k == 'nvarname') ${$_k} = $_v;
@@ -111,7 +97,6 @@ if (!defined('DEDEREQUEST')) {
         }
     }
 }
-
 //系统相关变量检测
 if (!isset($needFilter)) {
     $needFilter = false;
@@ -122,47 +107,37 @@ $isSafeMode = @ini_get("safe_mode");
 if (preg_match('/windows/i', @getenv('OS'))) {
     $isSafeMode = false;
 }
-
 //系统配置参数
 require_once(DEDEDATA."/config.cache.inc.php");
-
 //Session保存路径
 $sessSaveHandler = @ini_get("session.save_handler");
 if ($sessSaveHandler !== "files") {
     @ini_set("session.save_handler", "files");
 }
-
 $enkey = substr(md5(substr($cfg_cookie_encode, 0, 5)), 0, 10);
 $sessSavePath = DEDEDATA."/sessions_{$enkey}";
 if (!is_dir($sessSavePath)) mkdir($sessSavePath);
-
 if (is_writeable($sessSavePath) && is_readable($sessSavePath)) {
     session_save_path($sessSavePath);
 }
-
 //转换上传的文件相关的变量及安全处理、并引用前台通用的上传函数
 if ($_FILES) {
     require_once(DEDEINC.'/uploadsafe.inc.php');
 }
-
 //数据库配置文件
 require_once(DEDEDATA.'/common.inc.php');
-
 if (!isset($cfg_dbtype)) {
     $cfg_dbtype = 'mysql';
 }
-
 //载入系统验证安全配置
 if (file_exists(DEDEDATA.'/safe/inc_safe_config.php')) {
     require_once(DEDEDATA.'/safe/inc_safe_config.php');
     if (!empty($safe_faqs)) $safefaqs = unserialize($safe_faqs);
 }
-
 //Session跨域设置
 if (!empty($cfg_domain_cookie)) {
     @session_set_cookie_params(0, '/', $cfg_domain_cookie);
 }
-
 //php5.1版本以上时区设置
 //由于这个函数对于是php5.1以下版本并无意义，因此实际上的时间调用，应该用MyDate函数调用
 if (PHP_VERSION > '5.1') {
@@ -170,15 +145,12 @@ if (PHP_VERSION > '5.1') {
     @date_default_timezone_set('Etc/GMT'.$time51);
 }
 $cfg_isUrlOpen = @ini_get("allow_url_fopen");
-
 //用户访问的网站host
 if (PHP_SAPI === 'cli') {
     $cfg_clihost = 'https://www.dedebiz.com';
 } else {
     $cfg_clihost = 'http://'.$_SERVER['HTTP_HOST'];
 }
-
-
 //站点根目录
 $cfg_basedir = preg_replace('#'.$cfg_cmspath.'\/include$#i', '', DEDEINC);
 if ($cfg_multi_site == 'Y') {
@@ -186,95 +158,72 @@ if ($cfg_multi_site == 'Y') {
 } else {
     $cfg_mainsite = '';
 }
-
 //模板的存放目录
 $cfg_templets_dir = $cfg_cmspath.'/templets';
 $cfg_templeturl = $cfg_mainsite.$cfg_templets_dir;
 $cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/default" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style";
-
 //cms安装目录的网址
 $cfg_cmsurl = $cfg_mainsite.$cfg_cmspath;
-
 //插件目录，这个目录是用于存放计数器、投票、评论等程序的必要动态程序
 $cfg_plus_dir = $cfg_cmspath.'/plus';
 $cfg_phpurl = $cfg_mainsite.$cfg_plus_dir;
-
 $cfg_static_dir = $cfg_cmspath.'/static';
 $cfg_staticurl = $cfg_mainsite.$cfg_static_dir;
-
 $cfg_mobile_dir = $cfg_cmspath.'/m';
 $cfg_mobileurl = $cfg_mainsite.$cfg_mobile_dir;
-
 $cfg_data_dir = $cfg_cmspath.'/data';
 $cfg_dataurl = $cfg_mainsite.$cfg_data_dir;
-
 //会员目录
 $cfg_member_dir = $cfg_cmspath.'/member';
 $cfg_memberurl = $cfg_mainsite.$cfg_member_dir;
-
 //专题列表的存放路径
 $cfg_special = $cfg_cmspath.'/special';
 $cfg_specialurl = $cfg_mainsite.$cfg_special;
-
 //附件目录
 $cfg_medias_dir = $cfg_cmspath.$cfg_medias_dir;
 $cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir;
-
 //上传的普通图片的路径,建议按默认
 $cfg_image_dir = $cfg_medias_dir.'/allimg';
-
 //上传的缩略图
 $ddcfg_image_dir = $cfg_medias_dir.'/litimg';
-
 //用户投稿图片存放目录
 $cfg_user_dir = $cfg_medias_dir.'/userup';
-
 //上传的软件目录
 $cfg_soft_dir = $cfg_medias_dir.'/soft';
-
 //上传的多媒体文件目录
 $cfg_other_medias = $cfg_medias_dir.'/media';
-
 //软件摘要信息，****请不要删除本项**** 否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.0.3'; // 详细版本号
+$cfg_version_detail = '6.0.4'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
-
 $cfg_softname = '织梦内容管理系统';
-$cfg_soft_enname = 'DedeBIZ';
+$cfg_soft_enname = 'DedeCMSV6';
 $cfg_soft_devteam = 'DedeBIZ';
-
 //文档的默认命名规则
 $art_shortname = $cfg_df_ext = '.html';
-$cfg_df_namerule = '{typedir}/{Y}/{M}{D}/{aid}' . $cfg_df_ext;
-
+$cfg_df_namerule = '{typedir}/{aid}'.$cfg_df_ext;
 //新建目录的权限，如果你使用别的属性，本程不保证程序能顺利在Linux或Unix系统运行
 if (isset($cfg_ftp_mkdir) && $cfg_ftp_mkdir == 'Y') {
     $cfg_dir_purview = '0755';
 } else {
     $cfg_dir_purview = 0755;
 }
-
 //会员是否使用精简模式（已禁用）
 $cfg_mb_lit = 'N';
-
 //特殊全局变量
 $_sys_globals['curfile'] = '';
 $_sys_globals['typeid'] = 0;
 $_sys_globals['typename'] = '';
 $_sys_globals['aid'] = 0;
-
 if (empty($cfg_addon_savetype)) {
     $cfg_addon_savetype = 'Ymd';
 }
 if ($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_usermail)) {
     $cfg_adminemail = $cfg_smtp_usermail;
 }
-
 //DedeBIZ商业化组件
 require_once(DEDEINC.'/dedebiz.class.php');
-
 //对全局分页传递参数进行过滤
 if (isset($GLOBALS['PageNo'])) {
     $GLOBALS['PageNo'] = intval($GLOBALS['PageNo']);
@@ -282,8 +231,6 @@ if (isset($GLOBALS['PageNo'])) {
 if (isset($GLOBALS['TotalResult'])) {
     $GLOBALS['TotalResult'] = intval($GLOBALS['TotalResult']);
 }
-
-// ------------------------------------------------------------------------
 //设定缓存配置信息
 if ($cfg_memcache_enable == 'Y') {
     $cache_helper_config = array();
@@ -294,35 +241,29 @@ if ($cfg_memcache_enable == 'Y') {
     );
     $cache_helper_config['memcache']['mc_cache_time'] = $GLOBALS["cfg_puccache_time"];
 }
-
 if (!isset($cfg_NotPrintHead)) {
     if (PHP_SAPI != 'cli') {
         header("Content-Type: text/html; charset={$cfg_soft_lang}");
     }
     
 }
-
 //自动加载类库处理
 if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
     require_once(DEDEINC.'/autoload7.inc.php');
 } else {
     require_once(DEDEINC.'/autoload.inc.php');
 }
-
 $cfg_biz_helpUrl = DEDEBIZURL."/help";
 $cfg_biz_gitUrl = DEDEBIZURL."/git";
 $cfg_biz_dedebizUrl = DEDEBIZURL;
-
 //引入数据库类
 if ($GLOBALS['cfg_dbtype'] == 'mysql' || $GLOBALS['cfg_dbtype'] == 'mysqli') {
     require_once(DEDEINC.'/dedesqli.class.php');
 } else {
     require_once(DEDEINC.'/dedesqlite.class.php');
 }
-
 //全局常用函数
 require_once(DEDEINC.'/common.func.php');
-
 //载入小助手配置,并对其进行默认初始化
 $cfg_helper_autoload = array(
     'charset',    /* 编码小助手 */

src/include/oxwindow.class.php

@@ -1,21 +1,21 @@
-<?php if (!defined('DEDEINC')) exit("Request Error!");
+<?php
+if (!defined('DEDEINC')) exit("Request Error!");
 /**
  * 提示窗口对话框类
  *
  * @version        $Id: oxwindow.class.php 2 13:53 2010-11-11 tianya $
- * @package        DedeBIZ.Libraries
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
+ * @package        .Libraries
+ * @copyright      Copyright (c) 2021, .COM
+ * @license        https://www..com/license
+ * @link           https://www..com
  */
 require_once(DEDEINC."/dedetag.class.php");
-
 /**
  * 提示窗口对话框类
  *
  * @package          OxWindow
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
+ * @subpackage       .Libraries
+ * @link             https://www..com
  */
 class OxWindow
 {
@@ -25,7 +25,6 @@ class OxWindow
     var $formName = "";
     var $tmpCode = "//checkcode";
     var $hasStart = false;
-
     /**
      *  初始化为含表单的页面
      *
@@ -37,20 +36,18 @@ class OxWindow
      */
     function Init($formaction = "", $checkScript = "js/blank.js", $formmethod = "POST", $formname = "myform")
     {
-        $this->myWin .= "<script language='javascript'>\r\n";
+        $this->myWin .= "<script>";
         if ($checkScript != "" && file_exists($checkScript)) {
             $fp = fopen($checkScript, "r");
             $this->myWin .= fread($fp, filesize($checkScript));
             fclose($fp);
         } else {
-            $this->myWin .= "<!-- function CheckSubmit()\r\n{ return true; } -->";
+            $this->myWin .= "<!--function CheckSubmit(){return true;}-->";
         }
-        $this->myWin .= "</script>\r\n";
+        $this->myWin .= "</script>";
         $this->formName = $formname;
-        $this->myWin .= "<form name='$formname' method='$formmethod' onSubmit='return CheckSubmit();' action='$formaction'>\r\n";
+        $this->myWin .= "<form name='$formname' method='$formmethod' onSubmit='return CheckSubmit();' action='$formaction'>";
     }
-
-    //
     /**
      *  增加隐藏域
      *
@@ -60,9 +57,8 @@ class OxWindow
      */
     function AddHidden($iname, $ivalue)
     {
-        $this->myWin .= "<input type='hidden' name='$iname' value='$ivalue'>\r\n";
+        $this->myWin .= "<input type='hidden' name='$iname' value='$ivalue'>";
     }
-
     /**
      *  开始创建窗口
      *
@@ -70,9 +66,8 @@ class OxWindow
      */
     function StartWin()
     {
-        $this->myWin .= "<table width='100%'  border='0' cellpadding='3' cellspacing='1' bgcolor='#DADADA'>\r\n";
+        $this->myWin .= "<table width='100%' border='0' cellpadding='3' cellspacing='1'>";
     }
-
     /**
      *  增加一个两列的行
      *
@@ -83,12 +78,11 @@ class OxWindow
      */
     function AddItem($iname, $ivalue)
     {
-        $this->myWinItem .= "<tr bgcolor='#FFFFFF'>\r\n";
-        $this->myWinItem .= "<td width='25%'>$iname</td>\r\n";
-        $this->myWinItem .= "<td width='75%'>$ivalue</td>\r\n";
-        $this->myWinItem .= "</tr>\r\n";
+        $this->myWinItem .= "<tr bgcolor='#FFFFFF'>";
+        $this->myWinItem .= "<td width='30%'>$iname</td>";
+        $this->myWinItem .= "<td width='70%'>$ivalue</td>";
+        $this->myWinItem .= "</tr>";
     }
-
     /**
      *  增加一个单列的消息行
      *
@@ -110,11 +104,10 @@ class OxWindow
         } else {
             $colspan = "";
         }
-        $this->myWinItem .= "<tr bgcolor='#FFFFFF'>\r\n";
-        $this->myWinItem .= "<td $colspan $height> $ivalue </td>\r\n";
-        $this->myWinItem .= "</tr>\r\n";
+        $this->myWinItem .= "<tr bgcolor='#FFFFFF'>";
+        $this->myWinItem .= "<td $colspan $height>$ivalue</td>";
+        $this->myWinItem .= "</tr>";
     }
-
     /**
      *  增加单列的标题行
      *
@@ -131,11 +124,10 @@ class OxWindow
         } else {
             $colspan = "";
         }
-        $this->myWinItem .= "<tr bgcolor='#DADADA'>\r\n";
-        $this->myWinItem .= "<td $colspan background='{$cfg_static_dir}/img/wbg.gif' height='26'><font color='#666600'><b>$title</b></font></td>\r\n";
-        $this->myWinItem .= "</tr>\r\n";
+        $this->myWinItem .= "<tr>";
+        $this->myWinItem .= "<td $colspan style='height:26px;color:#424b51'>$title</td>";
+        $this->myWinItem .= "</tr>";
     }
-
     /**
      *  结束Window
      *
@@ -145,12 +137,11 @@ class OxWindow
     function CloseWin($isform = true)
     {
         if (!$isform) {
-            $this->myWin .= "</table>\r\n";
+            $this->myWin .= "</table>";
         } else {
-            $this->myWin .= "</table></form>\r\n";
+            $this->myWin .= "</table></form>";
         }
     }
-
     /**
      *  增加自定义JS脚本
      *
@@ -164,7 +155,6 @@ class OxWindow
             $this->myWin = substr_replace($this->myWin, $scripts, $pos, strlen($this->tmpCode));
         }
     }
-
     /**
      *  获取窗口
      *
@@ -200,19 +190,15 @@ class OxWindow
             if ($wintype != "hand") {
                 $this->myWin .= "
 <tr>
-<td colspan='2' bgcolor='#F9FCEF'>
-<table width='270' border='0' cellpadding='0' cellspacing='0'>
-<tr align='center' height='28'>
-<td width='90'><button type='submit' class='btn btn-success'>$tt</button></td>
-<td width='90'><button onClick='this.form.reset();return false;' type='button' class='btn btn-success'>重置</button></td>
-<td><button onClick='history.go(-1);' type='button' class='btn btn-success'>返回</button></td>
-</tr>
-</table>
+<td colspan='2' height='30'>
+<button type='submit' class='btn btn-success'>$tt</button>&nbsp;&nbsp;
+<button type='button' class='btn btn-success' onClick='this.form.reset();return false;'>重置</button>&nbsp;&nbsp;
+<button type='button' class='btn btn-success' onClick='history.go(-1);'>返回</button>
 </td>
 </tr>";
             } else {
                 if ($msg != '') {
-                    $this->myWin .= "<tr><td bgcolor='#F5F5F5'>$msg</td></tr>";
+                    $this->myWin .= "<tr><td>$msg</td></tr>";
                 } else {
                     $this->myWin .= '';
                 }
@@ -221,7 +207,6 @@ class OxWindow
         $this->CloseWin($isform);
         return $this->myWin;
     }
-
     /**
      *  显示页面
      *
@@ -233,7 +218,7 @@ class OxWindow
     {
         global $cfg_templets_dir, $wecome_info, $cfg_basedir;
         if (empty($wecome_info)) {
-            $wecome_info = "DedeBIZ OX 通用对话框：";
+            $wecome_info = "通用对话框：";
         }
         $ctp = new DedeTagParse();
         if ($modfile == '') {
@@ -251,7 +236,6 @@ class OxWindow
         $ctp->Clear();
     }
 }//End Class
-
 /**
  *  显示一个不带表单的普通提示
  *
@@ -264,7 +248,7 @@ function ShowMsgWin($msg, $title)
 {
     $win = new OxWindow();
     $win->Init();
-    $win->mainTitle = "DedeBIZ系统提示：";
+    $win->mainTitle = "系统提示：";
     $win->AddTitle($title);
     $win->AddMsgItem("<div style='padding-left:20px;line-height:150%'>$msg</div>");
     $winform = $win->GetWindow("hand");

src/install/common.inc.php

@@ -7,6 +7,4 @@ $cfg_dbuser = '~dbuser~';
 $cfg_dbpwd = '~dbpwd~';
 $cfg_dbprefix = '~dbprefix~';
 $cfg_db_language = '~dblang~';
-
-
 ?>

src/install/index.php

@@ -7,38 +7,28 @@
  * @link           https://www.dedebiz.com
  */
 @set_time_limit(0);
-//error_reporting(E_ALL);
 error_reporting(E_ALL || ~E_NOTICE);
-
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.0.3'; // 详细版本号
+$cfg_version_detail = '6.0.4'; // 详细版本号
 $errmsg = '';
-
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
-
 $moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc';
-
 define('DEDEINC',dirname(__FILE__).'/../include');
 define('DEDEDATA',dirname(__FILE__).'/../data');
 define('DEDEROOT',preg_replace("#[\\\\\/]install#", '', dirname(__FILE__)));
 header("Content-Type: text/html; charset=utf-8");
-
 require_once(DEDEROOT.'/install/install.inc.php');
 require_once(DEDEINC.'/zip.class.php');
-
 foreach(Array('_GET','_POST','_COOKIE') as $_request)
 {
     foreach($$_request as $_k => $_v) ${$_k} = RunMagicQuotes($_v);
 }
-
 require_once(DEDEINC.'/common.func.php');
-
 if(file_exists(INSLOCKFILE))
 {
     exit(" 程序已运行安装，如果你确定要重新安装，请先从FTP中删除 install/install_lock.txt！");
 }
-
 if(empty($step))
 {
     $step = 1;
@@ -62,19 +52,15 @@ if($step==1)
     if (!extension_loaded("gd")) {
         $arrMsg[] = "GD未开启，将无法使用验证码、二维码、图片水印等功能";
     }
-
     if(!empty($_SERVER['REQUEST_URI']))
     $scriptName = $_SERVER['REQUEST_URI'];
     else
     $scriptName = $_SERVER['PHP_SELF'];
-
     $basepath = preg_replace("#\/install(.*)$#i", '', $scriptName);
-
     if(!empty($_SERVER['HTTP_HOST']))
         $baseurl = 'http://'.$_SERVER['HTTP_HOST'];
     else
         $baseurl = "http://".$_SERVER['SERVER_NAME'];
-
     $chars='abcdefghigklmnopqrstuvwxwyABCDEFGHIGKLMNOPQRSTUVWXWY0123456789';
     $rnd_cookieEncode='';
     $length = rand(28,32);
@@ -83,7 +69,6 @@ if($step==1)
         $rnd_cookieEncode .= $chars[mt_rand(0, $max)];
     }
     $module_local = DEDEDATA.'/module/';
-
     include('./templates/step-1.html');
     exit();
 }
@@ -103,7 +88,6 @@ else if($step==2)
     else
         $dfbaseurl = "http://".$_SERVER['SERVER_NAME'];
     $dfbasepath = preg_replace("#\/install(.*)$#i", '', $scriptName);
-
     $dbhost = empty($dbhost)? "localhost" : $dbhost;
     $dbuser = empty($dbuser)? "root" : $dbuser;
     $dbuser = empty($dbuser)? "root" : $dbuser;
@@ -114,36 +98,27 @@ else if($step==2)
     $webname = empty($webname)? "我的网站" : $webname;
     $baseurl = empty($baseurl)? $dfbaseurl : $baseurl;
     $cmspath = empty($cmspath)? $dfbasepath : $cmspath;
-
     if ( $dbtype == 'sqlite' )
     {
         $db = new SQLite3(DEDEDATA.'/'.$dbname.'.db');
     } else {
         $dbtype = 'mysql';
         $conn = mysql_connect($dbhost,$dbuser,$dbpwd) or die("<script>alert('数据库服务器或登录密码无效，\\n\\n无法连接数据库，请重新设定！');history.go(-1);</script>");
-
         mysql_query("CREATE DATABASE IF NOT EXISTS `".$dbname."`;",$conn);
-
         mysql_select_db($dbname, $conn) or die("<script>alert('选择数据库失败，可能是你没权限，请预先创建一个数据库！');history.go(-1);</script>");
-
         //获得数据库版本信息
         $rs = mysql_query("SELECT VERSION();",$conn);
         $row = mysql_fetch_array($rs);
         $mysqlVersions = explode('.',trim($row[0]));
         $mysqlVersion = $mysqlVersions[0].".".$mysqlVersions[1];
-
         mysql_query("SET NAMES '$dblang',character_set_client=binary,sql_mode='';",$conn);
     }
-    
-
     $fp = fopen(dirname(__FILE__)."/common.inc.php","r");
     $configStr1 = fread($fp,filesize(dirname(__FILE__)."/common.inc.php"));
     fclose($fp);
-
     $fp = fopen(dirname(__FILE__)."/config.cache.inc.php","r");
     $configStr2 = fread($fp,filesize(dirname(__FILE__)."/config.cache.inc.php"));
     fclose($fp);
-
     //common.inc.php
     $configStr1 = str_replace("~dbtype~",$dbtype,$configStr1);
     $configStr1 = str_replace("~dbhost~",$dbhost,$configStr1);
@@ -152,39 +127,31 @@ else if($step==2)
     $configStr1 = str_replace("~dbpwd~",$dbpwd,$configStr1);
     $configStr1 = str_replace("~dbprefix~",$dbprefix,$configStr1);
     $configStr1 = str_replace("~dblang~",$dblang,$configStr1);
-
     @chmod(DEDEDATA,0777);
     $fp = fopen(DEDEDATA."/common.inc.php","w") or die("<script>alert('写入配置失败，请检查../data目录是否可写入！');history.go(-1);</script>");
     fwrite($fp,$configStr1);
     fclose($fp);
-
     //config.cache.inc.php
     $cmspath = trim(preg_replace("#\/{1,}#", '/', $cmspath));
     if($cmspath!='' && !preg_match("#^\/#", $cmspath)) $cmspath = '/'.$cmspath;
-
     if($cmspath=='') $indexUrl = '/';
     else $indexUrl = $cmspath;
-
     $configStr2 = str_replace("~baseurl~",$baseurl,$configStr2);
     $configStr2 = str_replace("~basepath~",$cmspath,$configStr2);
     $configStr2 = str_replace("~indexurl~",$indexUrl,$configStr2);
     $configStr2 = str_replace("~cookieEncode~",$cookieencode,$configStr2);
     $configStr2 = str_replace("~webname~",$webname,$configStr2);
     $configStr2 = str_replace("~adminmail~",$adminmail,$configStr2);
-
     $fp = fopen(DEDEDATA.'/config.cache.inc.php','w');
     fwrite($fp,$configStr2);
     fclose($fp);
-
     $fp = fopen(DEDEDATA.'/config.cache.bak.php','w');
     fwrite($fp,$configStr2);
     fclose($fp);
-
     if($mysqlVersion >= 4.1)
     {
         $sql4tmp = "ENGINE=MyISAM DEFAULT CHARSET=".$dblang;
     }
-
     //创建数据表
     $query = '';
     $fp = fopen(dirname(__FILE__).'/sql-dftables.txt','r');
@@ -200,7 +167,6 @@ else if($step==2)
                 $query = preg_replace('/character set (.*?) /i','',$query);
                 $query = str_replace('unsigned','',$query);
                 $query = str_replace('TYPE=MyISAM','',$query);
-                
                 $query = preg_replace ('/TINYINT\(([\d]+)\)/i','INTEGER',$query);
                 $query = preg_replace ('/mediumint\(([\d]+)\)/i','INTEGER',$query);
                 $query = preg_replace ('/smallint\(([\d]+)\)/i','INTEGER',$query);
@@ -232,7 +198,6 @@ else if($step==2)
                     }
                 }
             }
-    
             $query='';
         } else if(!preg_match("#^(\/\/|--)#", $line))
         {
@@ -240,7 +205,6 @@ else if($step==2)
         }
     }
     fclose($fp);
-
     //导入默认数据
     $query = '';
     $fp = fopen(dirname(__FILE__).'/sql-dfdata.txt','r');
@@ -269,7 +233,6 @@ else if($step==2)
         }
     }
     fclose($fp);
-
     //更新配置
     $cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$baseurl}' WHERE varname='cfg_basehost';";
     $dbtype == 'sqlite'?  $db->exec($cquery) : mysql_query($cquery,$conn);
@@ -283,30 +246,22 @@ else if($step==2)
     $dbtype == 'sqlite'?  $db->exec($cquery) : mysql_query($cquery,$conn);
     $cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$adminmail}' WHERE varname='cfg_adminemail';";
     $dbtype == 'sqlite'?  $db->exec($cquery) : mysql_query($cquery,$conn);
-
     //增加管理员帐号
     $adminquery = "INSERT INTO `{$dbprefix}admin` VALUES (1, 10, '$adminuser', '".substr(md5($adminpwd),5,20)."', 'admin', '', '', 0, '".time()."', '127.0.0.1');";
     $dbtype == 'sqlite'?  $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
     //关连前台会员帐号
-    $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,
-                   `scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
+    $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,`scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
         VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); ";
     $dbtype == 'sqlite'?  $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
-    $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,
-                   `income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`)
+    $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`)
         VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); ";
     $dbtype == 'sqlite'?  $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
     $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`)
         VALUES ('1','0','0','0','0','0','0','0','0'); ";
     $dbtype == 'sqlite'?  $db->exec($adminquery): mysql_query($adminquery,$conn);
-
     $adminquery = "INSERT INTO `{$dbprefix}member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`)
         VALUES('1','10','0','{$adminuser}的空间','','person','',''); ";
     $dbtype == 'sqlite'?  $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
     //锁定安装程序
     $fp = fopen($insLockfile,'w');
     fwrite($fp,'ok');
@@ -337,9 +292,7 @@ else if($step==10)
             "data" => $info,
         );
         echo json_encode($result);
-    }
-    else
-    {
+    } else {
         $result = array(
             "code" => -1,
             "data" => "数据库连接失败！",

src/install/style.css

@@ -1,30 +1,28 @@
 @import "tablebox.css";
-
 	* {
 	padding:0px;
 	margin:0px;
-	font-size: 13px;
+	font-size:13px
 }
 body {
 	font-family:Verdana,Arial,Helvetica,sans-serif;
 	font-size:12px;
 	background:url(images/top-bg.png) left top repeat-x;
-	background-color:#FFF;
+	background-color:#FFF
 }
 ul {
-	list-style:none;
+	list-style:none
 }
 a {
-	color:#06C;
+	color:#06C
 }
 a:hover {
 	color:#669900;
-	text-decoration:none;
+	text-decoration:none
 }
 input,button,select {
-	vertical-align:middle;
+	vertical-align:middle
 }
-
 select {
 	height:calc(1.5em + .75rem + 2px);
 	padding:.375rem .75rem;
@@ -34,9 +32,8 @@ select {
 	background-clip:padding-box;
 	border:1px solid #ced4da;
 	border-radius:.25rem;
-	transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+	transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out
 }
-
 input[type="button"],input[type="submit"],input[type="reset"] {
 	border:none;
 	border-right:1px solid #ACACAC;
@@ -45,9 +42,8 @@ input[type="button"],input[type="submit"],input[type="reset"] {
 	padding:2px;
 	padding-right:5px;
 	padding-left:5px;
-	cursor: pointer;
+	cursor:pointer
 }
-
 input[type="text"],input[type="password"] {
 	font-size:1rem;
 	font-weight:400;
@@ -60,20 +56,19 @@ input[type="text"],input[type="password"] {
 	padding:.375rem .75rem;
 	transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;
 	line-height:18px;
-	vertical-align: middle;
+	vertical-align:middle
 }
 .fc-690 {
-	color:#FF760A;
+	color:#FF760A
 }
 .fs-14 {
-	font-size:14px;
+	font-size:14px
 }
-
 .top {
 	width:960px;
 	height:72px;
 	overflow:hidden;
-	margin:0px auto;
+	margin:0px auto
 }
 .top .top-logo {
 	width:280px;
@@ -81,21 +76,21 @@ input[type="text"],input[type="password"] {
 	float:left;
 	padding-left:10px;
 	background:url(images/top-logo.png) 10px 0px no-repeat;
-	overflow:hidden;
+	overflow:hidden
 }
 .top .top-logo h1 {
 	font-size:0px;
-	line-height:1000%;
+	line-height:1000%
 }
 .top .top-link {
 	height:25px;
 	padding:12px 12px 0px 0px;
-	overflow:hidden;
+	overflow:hidden
 }
 .top .top-link ul {
 	height:15px;
 	float:right;
-	overflow:hidden;
+	overflow:hidden
 }
 .top .top-link ul li {
 	float:left;
@@ -103,47 +98,43 @@ input[type="text"],input[type="password"] {
 	padding-right:10px;
 	border-left:1px solid #E8F5E3;
 	margin-left:-1px;
-	line-height:14px;
+	line-height:14px
 }
 .top .top-link ul li a {
 	text-decoration:none;
-	color:#555;
+	color:#555
 }
 .top .top-version {
 	height:40px;
 	float:right;
-	padding:13px 13px 0px 0px;
+	padding:13px 13px 0px 0px
 }
 .top .top-version h2 {
 	color:#FF760A;
 	font-size:22px;
 	font-style:italic;
-	cursor:default;
+	cursor:default
 }
-
 .main {
 	width:900px;
-	margin:14px auto 0px;
+	margin:14px auto 0px
 }
-
 .main .pleft {
 	width:168px;
 	float:left;
 	cursor:default;
-	padding-top:6px;
+	padding-top:6px
 }
 .main .pright {
 	width:720px;
-	float:right;
+	float:right
 }
-
-
 .pr-title {
 	width:720px;
 	height:22px;
 	margin:8px auto 0px;
 	background:url(images/boxtitle_bg.gif) 0px 20px repeat-x;
-	overflow:hidden;
+	overflow:hidden
 }
 .pr-title h3 {
 	width:158px;
@@ -157,11 +148,10 @@ input[type="text"],input[type="password"] {
 	background:url(images/boxtitle_bg.gif) 0px -2px no-repeat;
 	letter-spacing:2px;
 	color:#FF760A;
-	font-weight:bold;
+	font-weight:bold
 }
-
 .t1 {
-	width:162px;
+	width:162px
 }
 .t1 dt {
 	width:162px;
@@ -171,19 +161,19 @@ input[type="text"],input[type="password"] {
 	font-weight:bold;
 	color:#FF760A;
 	text-indent:10px;
-	letter-spacing:2px;
+	letter-spacing:2px
 }
 .t1 dd {
 	width:160px;
 	background-color:#FFFAF7;
-	border:1px solid #FFCABF;
+	border:1px solid #FFCABF
 }
 .t1 dd ul {
 	width:158px;
 	border:1px solid #FFF;
 	overflow:hidden;
 	padding:10px 0px;
-	background:url(images/step-ico-bg.png) 20px 21px no-repeat;
+	background:url(images/step-ico-bg.png) 20px 21px no-repeat
 }
 .t1 dd ul li {
 	height:40px;
@@ -191,52 +181,46 @@ input[type="text"],input[type="password"] {
 	text-indent:52px;
 	display:block;
 	color:#888;
-	font-size:14px;
+	font-size:14px
 }
 .t1 dd ul li.succeed {
 	color:#FF760A;
-	background:url(images/ico-step-succeed.png) 23px 14px no-repeat;
+	background:url(images/ico-step-succeed.png) 23px 14px no-repeat
 }
 .t1 dd ul li.now {
 	color:#FF9900;
 	font-weight:bold;
-	background:url(images/ico-step-now.png) 23px 14px no-repeat;
+	background:url(images/ico-step-now.png) 23px 14px no-repeat
 }
-
 .install-msg {
 	padding:10px 20px;
 	color:#777;
 	line-height:31px;
 	font-size:14px;
 	overflow:hidden;
-	clear:both;
-
+	clear:both
 }
-
-
 .pr-agreement {
 	padding:16px;
 	line-height:21px;
 	color:#666;
 	height:300px;
-	overflow-y:scroll;
+	overflow-y:scroll
 }
 .pr-agreement strong {
 	display:block;
 	color:#333;
 	line-height:27px;
-	margin-top:6px;
+	margin-top:6px
 }
 .pr-agreement p {
-	text-indent:30px;
+	text-indent:30px
 }
-
-
 .btn-box {
 	margin-top:15px;
 	border-top:1px solid #DDD;
 	padding:10px 6px;
-	vertical-align:middle;
+	vertical-align:middle
 }
 .btn-next {
 	width:104px;
@@ -247,7 +231,7 @@ input[type="text"],input[type="password"] {
 	margin-left:10px;
 	overflow:hidden;
 	font-size:0px;
-	line-height:100px;
+	line-height:100px
 }
 .btn-back {
 	width:104px;
@@ -257,20 +241,17 @@ input[type="text"],input[type="password"] {
 	cursor:pointer;
 	overflow:hidden;
 	font-size:0px;
-	line-height:100px;
+	line-height:100px
 }
-
-
 #readpact {
 	*margin-top:-4px;
-	margin-right:4px;
+	margin-right:4px
 }
-
 .over-link {
 	padding:0px 40px;
 	line-height:41px;
 	overflow:hidden;
-	clear:both;
+	clear:both
 }
 .waitpage {
 	top:0;
@@ -282,20 +263,17 @@ input[type="text"],input[type="password"] {
 	background:url(images/loading1.gif) #ababab no-repeat center 200px;
 	width:100%;
 	height:2500px;
-  display:none;
+	display:none
 }
-
 .divpre {
-	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale)
 }
-
 .modulesel {
 	width:120px;
 	margin-right:8px;
-  float:left;
+	float:left
 }
-
 .pr-agreement h2 {
 	font-size:14px;
-	font-weight: bolder;
+	font-weight:bolder
 }

src/install/tablebox.css

@@ -1,7 +1,7 @@
 input {
 	vertical-align:middle;
 	margin-right:3px;
-	font-size:12px;
+	font-size:12px
 }
 textarea {
 	vertical-align:top;
@@ -11,95 +11,78 @@ textarea{
 	padding:3px;
 	letter-spacing:1px;
 	word-break:break-all;
-	overflow-y:auto;
+	overflow-y:auto
 }
 .input-txt {
 	padding:4px 8px 4px 6px;
 	border:1px solid #AAA;
 	font-size:12px;
 	color:#000;
-	width:200px;
+	width:200px
 }
-
 .textipt_on {
-	border:1px solid #F90;
+	border:1px solid #F90
 }
-
-
 hr {
 	height:1px;
 	line-height:1px;
 	overflow:hidden;
 	border-width:1px 0px 0px 0px;
-	border-top:1px solid #FFCABF;/*兼容Opera*/
+	border-top:1px solid #FFCABF
 }
 hr:empty {
 	margin:8px 0px 7px 0px !important;
-	margin:0px;
+	margin:0px
 }
-
 small {
-	font-size:12px;
+	font-size:12px
 }
-
 .moncolor td {
-	background:#FFCABF;
+	background:#FFCABF
 }
-
 .twbox {
 	width:706px;
 	border:1px solid #FFCABF;
 	font-size:12px;
 	overflow:hidden;
-	margin:8px auto;
-
+	margin:8px auto
 }
-
-
 .twbox thead tr td {
 	background:url(body_title_bg.gif) -1px -1px repeat-x;
 	height:31px;
 	line-height:31px;
-	text-indent:10px;
+	text-indent:10px
 }
-
 .twbox thead tr td strong {
 	letter-spacing:2px;
 	margin-right:14px;
 	color:#FFF;
-	font-size:14px;
+	font-size:14px
 }
-
-
 .twbox thead tr td span {
-	color:#CDA;
+	color:#CDA
 }
-
-
 .twbox thead tr td  p {
 	height:31px;
 	display:inline;
 	float:right;
 	margin:-31px 10px 0 0;
-	overflow:hidden;
+	overflow:hidden
 }
 .twbox thead tr td  p * {
-	float:right;
+	float:right
 }
 .twbox thead tr td a.thlink {
-	color:#FFF;
+	color:#FFF
 }
 .twbox thead tr td a.thlink:hover {
 	color:#FFFF00;
-	text-decoration:none;
+	text-decoration:none
 }
-
-
 .twbox tbody {
 	overflow:hidden;
-	text-align:left;
+	text-align:left
 }
-
 .twbox tbody tr th {
 	background:#FFFAF7;
 	color:#FF760A;
@@ -108,41 +91,36 @@ small{
 	text-indent:30px;
 	font-weight:normal;
 	border-bottom:1px solid #FFCABF;
-	letter-spacing:2px;
+	letter-spacing:2px
 }
-
 .twbox tbody tr td {
 	padding:7px;
 	border-bottom:1px solid #F2F2F2;
 	color:#333;
-	vertical-align:top;
+	vertical-align:top
 }
-
 .twbox tbody tr td p {
-	line-height:21px;
+	line-height:21px
 }
 .twbox tbody tr td p strong img {
-	vertical-align:middle;
+	vertical-align:middle
 }
 .twbox tbody tr td img {
 	vertical-align:top;
-	margin:0px 10px 5px 0px;
-
+	margin:0px 10px 5px 0px
 }
 .twbox tbody tr td small {
-	color:#888;
+	color:#888
 }
-
 .twbox tfoot tr td {
 	padding:10px;
 	line-height:25px;
-	text-align:center;
+	text-align:center
 }
 .twbox tfoot tr td p {
 	line-height:21px;
-	margin-bottom:10px;
+	margin-bottom:10px
 }
-
 input.but {
 	height:26px;
 	padding-left:6px;
@@ -151,12 +129,10 @@ input.but{
 	font-weight:bold;
 	letter-spacing:1px;
 	color:#FFF;
-	background-color:#FC3;
+	background-color:#FC3
 }
-
 .onetd {
 	width:120px;
 	text-align:right;
-	line-height:25px;
+	line-height:25px
 }
-

src/install/templates/step-1.html

@@ -1,19 +1,15 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>安装程序 - DedeBIZ - DedeBIZ技术支持
-	</title>
+	<title>安装程序 - DedeBIZ - DedeBIZ技术支持</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/popper.min.js"></script>
 	<script src="../static/js/bootstrap.bundle.js"></script>
 	<script src="../static/js/dede.js"></script>
 </head>
-
 <body>
 	<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
 		<h5 class="my-0 mr-md-auto font-weight-normal text-success">DedeBIZ安装程序</h5>
@@ -23,13 +19,11 @@
 			<a class="p-2 text-dark" href="https://www.dedebiz.com/service" target="_blank">技术服务</a>
 		</nav>
 	</div>
-
 	<main class="container">
 		<?php
 		if(count($arrMsg) > 0){
 			foreach($arrMsg as $msg){
 		?>
-
 		<div class="alert alert-warning" role="alert">
 			<?php echo $msg ?>
 		</div>
@@ -37,7 +31,6 @@
 		}
 		}
 		?>
-
 		<div class="card mb-4 shadow-sm">
 			<div class="card-header bg-success text-white">
 				<h5 class="my-0 fw-normal text-center">首次运行安装程序（v<?php echo $cfg_version_detail;?>）</h5>
@@ -111,18 +104,14 @@
 				</form>
 			</div>
 		</div>
-
 		<footer>
 			<div class="row">
 				<div class="col-12 col-md">
-					<p class="d-block mb-3 text-muted">© 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a></p>
+					<p class="d-block mb-3 text-muted">© 2022 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a></p>
 				</div>
 			</div>
 		</footer>
-
 	</main>
-
-
 	<script>
 	$("#btnCheckConnect").click(function() {
 		let dbhost = $('#dbhost').val();
@@ -141,7 +130,5 @@
 		})
 	})
 	</script>
-
 </body>
-
 </html>

src/robots.txt

@@ -1,18 +1,5 @@
 User-agent: *
-Disallow: /plus/ad_js.php
-Disallow: /plus/advancedsearch.php
-Disallow: /plus/car.php
-Disallow: /plus/carbuyaction.php
-Disallow: /plus/shops_buyaction.php
-Disallow: /plus/erraddsave.php
-Disallow: /plus/posttocar.php
-Disallow: /plus/disdls.php
-Disallow: /plus/feedback_js.php
-Disallow: /plus/mytag_js.php
-Disallow: /plus/rss.php
-Disallow: /plus/search.php
-Disallow: /plus/recommend.php
-Disallow: /plus/stow.php
-Disallow: /plus/count.php
+Disallow: /data
 Disallow: /include
+Disallow: /plus
 Disallow: /templets

src/static/ckeditor/ckeditor.js

@@ -209,7 +209,7 @@ v=this._getNextSourceNode(v,z,p);if((k=!v)||x&&b)break}if(!c){if(!b)return this.
 [];this.exec=function(e){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&b.focus();return!1===this.fire("exec")?!0:!1!==h.exec.call(this,b,e)};this.refresh=function(e,a){if(!this.readOnly&&e.readOnly)return!0;if(this.context&&!a.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[e.mode]&&this.disable();return!1===this.fire("refresh",{editor:e,path:a})?!0:h.refresh&&!1!==h.refresh.apply(this,
 arguments)};var g;this.checkAllowed=function(e){return e||"boolean"!=typeof g?g=b.activeFilter.checkFeature(this):g};CKEDITOR.tools.extend(this,h,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!h.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)};CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},
 setState:function(b){if(this.state==b||b!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=b;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.event.implementOn(CKEDITOR.command.prototype);CKEDITOR.ENTER_P=1;CKEDITOR.ENTER_BR=2;CKEDITOR.ENTER_DIV=3;CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,
-language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};(function(){function b(a,c,d,f,e){var b,g;a=[];for(b in c){g=c[b];g="boolean"==
+language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:450,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};(function(){function b(a,c,d,f,e){var b,g;a=[];for(b in c){g=c[b];g="boolean"==
 typeof g?{}:"function"==typeof g?{match:g}:I(g);"$"!=b.charAt(0)&&(g.elements=b);d&&(g.featureName=d.toLowerCase());var h=g;h.elements=k(h.elements,/\s+/)||null;h.propertiesOnly=h.propertiesOnly||!0===h.elements;var l=/\s*,\s*/,m=void 0;for(m in M){h[m]=k(h[m],l)||null;var n=h,w=J[m],v=k(h[J[m]],l),y=h[m],r=[],E=!0,u=void 0;v?E=!1:v={};for(u in y)"!"==u.charAt(0)&&(u=u.slice(1),r.push(u),v[u]=!0,E=!1);for(;u=r.pop();)y[u]=y["!"+u],delete y["!"+u];n[w]=(E?!1:v)||null}h.match=h.match||null;f.push(g);
 a.push(g)}c=e.elements;e=e.generic;var P;d=0;for(f=a.length;d<f;++d){b=I(a[d]);g=!0===b.classes||!0===b.styles||!0===b.attributes;h=b;m=w=l=void 0;for(l in M)h[l]=x(h[l]);n=!0;for(m in J){l=J[m];w=h[l];v=[];y=void 0;for(y in w)-1<y.indexOf("*")?v.push(new RegExp("^"+y.replace(/\*/g,".*")+"$")):v.push(y);w=v;w.length&&(h[l]=w,n=!1)}h.nothingRequired=n;h.noProperties=!(h.attributes||h.classes||h.styles);if(!0===b.elements||null===b.elements)e[g?"unshift":"push"](b);else for(P in h=b.elements,delete b.elements,
 h)if(c[P])c[P][g?"unshift":"push"](b);else c[P]=[b]}}function h(a,c,d,f){if(!a.match||a.match(c))if(f||l(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=g(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=g(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;f=d.validClasses;if(a)if(!0===a)a=!0;else{for(var e=0,b=c.length,k;e<b;++e)k=c[e],f[k]||(f[k]=a(k));a=!1}else a=!1;d.allClasses=a}}function g(a,c,d){if(!a)return!1;if(!0===a)return!0;

src/static/ckeditor/contents.css

@@ -1,29 +1 @@
-body{font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:12px;color:#333;background-color:#fff;margin:20px}
-blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}
-a{color:#0782C1}
-ol,ul,dl{padding:0 40px}
-h1,h2,h3,h4,h5,h6{font-weight:normal;line-height:1.5}
-hr{border:0px;border-top:1px solid #ccc}
-pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}
-span[lang]{font-style:italic}
-figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,0.05);padding:10px;margin:10px 20px;display:inline-block}
-figure > figcaption{text-align:center;display:block}
-img{border-radius:6px}
-a > img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}
-img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}
-img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}
-.marker{background-color:Yellow}
-.cke_editable{font-size:12px;line-height:1.5;word-wrap:break-word}
-.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}
-.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}
-.code-featured{border:5px solid red}
-.math-featured{padding:20px;box-shadow:0 0 2px rgba(200,0,0,1);background-color:rgba(255,0,0,0.05);margin:10px}
-.image-clean{border:0;background:none;padding:0}
-.image-clean > figcaption{font-size:.9em;text-align:right}
-.image-grayscale{background-color:white;color:#666}
-.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}
-.embed-240p{max-width:426px;max-height:240px;margin:0 auto}
-.embed-360p{max-width:640px;max-height:360px;margin:0 auto}
-.embed-480p{max-width:854px;max-height:480px;margin:0 auto}
-.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}
-.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}
+body{margin:20px;line-height:1.5;font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:14px;color:#424b51;background-color:#fff}blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}a{color:#0782C1}ol,ul,dl{padding:0 40px}h1,h2,h3,h4,h5,h6{font-weight:normal;line-height:1.5}hr{border:0px;border-top:1px solid #ccc}pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}span[lang]{font-style:italic}figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,0.05);padding:10px;margin:10px 20px;display:inline-block}figure > figcaption{text-align:center;display:block}img{border-radius:.2rem}a > img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}.marker{background-color:Yellow}.cke_editable{font-size:14px;word-wrap:break-word}.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}.code-featured{border:5px solid red}.math-featured{padding:20px;box-shadow:0 0 2px rgba(200,0,0,1);background-color:rgba(255,0,0,0.05);margin:10px}.image-clean{border:0;background:none;padding:0}.image-clean > figcaption{font-size:.9em;text-align:right}.image-grayscale{background-color:white;color:#666}.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}.embed-240p{max-width:426px;max-height:240px;margin:0 auto}.embed-360p{max-width:640px;max-height:360px;margin:0 auto}.embed-480p{max-width:854px;max-height:480px;margin:0 auto}.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}

src/templets/plus/win_templet.htm

@@ -1,32 +1,22 @@
+<!DOCTYPE html>
 <html>
-
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}">
+    <meta charset="{dede:global.cfg_soft_lang/}">
     <title>{dede:wintitle/}</title>
     <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/css/bootstrap.min.css">
-  <link href="{dede:global name='cfg_static_dir'/}/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="{dede:global name='cfg_static_dir'/}/img/base.css">
-  <script language="javascript" src="{dede:global name='cfg_static_dir'/}/js/jquery.js"></script>
+    <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/img/base.css">
+    <script src="{dede:global name='cfg_static_dir'/}/js/jquery.js"></script>
 </head>
-
-<body background='{dede:global name=' cfg_static_dir'/}/img/allbg.gif' leftmargin="8" topmargin='8'>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#DFF9AA" class="table maintable table-bordered mt-3">
+<body background="{dede:global name='cfg_static_dir'/}/img/allbg.gif" leftmargin="8" topmargin="8">
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="table maintable table-bordered mt-3">
         <tr>
-      <td height="28" style="border:1px solid #DADADA" background='{dede:global name=' cfg_static_dir'/}/img/wbg.gif'>
-        &nbsp;<b>◇{dede:wecome_info/}</b>
-      </td>
+            <td height="26" background="{dede:global name='cfg_static_dir'/}/img/wbg.gif" style="border:1px solid #DADADA">&nbsp;◇{dede:wecome_info/}</td>
         </tr>
         <tr>
-      <td width="100%" style="padding-top:5px" bgcolor='#ffffff' class="table table-borderless pt-3">
-        {dede:winform/}
-      </td>
+            <td width="100%" class="table table-borderless pt-3" style="margin-top:10px;background:#ffffff">{dede:winform/}</td>
         </tr>
     </table>
-  <p align="center">
-    {dede:lang_cms_powerby/}
-    <br>
-    <br>
-  </p>
+    <p align="center">{dede:lang_cms_powerby/}</p>
 </body>
-
 </html>