细节优化、移除生成网站地图、伪静态功能增强、模块优化

src/admin/article_template_rand.php

@@ -94,9 +94,9 @@ function DoRand(jobname)
 <tr>
     <td height='26'>
     如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理(必须设置好模板项)
-    &nbsp; <a href='#' onclick='DoRand(\"makeold\")' class='btn btn-success btn-sm'>设置全部</a>
-    &nbsp; <a href='#' onclick='DoRand(\"clearold\")' class='btn btn-success btn-sm'>取消全部</a>
-    &nbsp; <span id='tmpct' style='color:#dc3545;font-weight:bold'>$okmsg</span>
+    &nbsp;<a href='#' onclick='DoRand(\"makeold\")' class='btn btn-success btn-sm'>设置全部</a>
+    &nbsp;<a href='#' onclick='DoRand(\"clearold\")' class='btn btn-success btn-sm'>取消全部</a>
+    &nbsp;<span id='tmpct' style='color:#dc3545;font-weight:bold'>$okmsg</span>
     </td>
 </tr>
 <tr>

src/admin/catalog_del.php

@@ -9,13 +9,11 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__).'/config.php');
-
 //检查权限许可
 CheckPurview('t_Del,t_AccDel');
 require_once(DEDEINC.'/typelink/typeunit.class.admin.php');
 require_once(DEDEINC.'/libraries/oxwindow.class.php');
 $id = trim(preg_replace("#[^0-9]#", '', $id));
-
 //检查栏目操作许可
 CheckCatalog($id, "您无权删除本栏目");
 if (empty($dopost)) $dopost = '';
@@ -29,7 +27,7 @@ if ($dopost == 'ok') {
 $dsql->SetQuery("SELECT typename,typedir FROM #@__arctype WHERE id=".$id);
 $row = $dsql->GetOne();
 $wintitle = "删除栏目确认";
-$wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt;&gt; 删除栏目确认";
+$wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt; 删除栏目确认";
 $win = new OxWindow();
 $win->Init('catalog_del.php', 'js/blank.js', 'POST');
 $win->AddHidden('id', $id);
@@ -38,4 +36,4 @@ $win->AddTitle("您要确实要删除栏目：[{$row['typename']}] 吗");
 $win->AddItem('栏目的文件保存目录：', $row['typedir']);
 $win->AddItem('是否删除文件：', "<label><input type='radio' name='delfile' class='np' value='no' checked='1' /> 否</label> <label>&nbsp;<input type='radio' name='delfile' class='np' value='yes' /> 是</label>");
 $winform = $win->GetWindow('ok');
-$win->Display();
+$win->Display();

src/admin/catalog_do.php

@@ -16,7 +16,6 @@ if (empty($dopost)) {
 $cid = empty($cid) ? 0 : intval($cid);
 $unittype = empty($unittype) ? 0 : intval($unittype);
 $channelid = empty($channelid) ? 0 : intval($channelid);
-
 /*--------------------------
 //增加文档
 function addArchives();
@@ -105,7 +104,6 @@ function upRank()
 else if ($dopost == "upRank") {
     //检查权限许可
     CheckPurview('t_Edit,t_AccEdit');
-
     //检查栏目操作许可
     CheckCatalog($cid, "您无权修改本栏目");
     $row = $dsql->GetOne("SELECT reid,sortrank FROM #@__arctype WHERE id='$cid'");
@@ -143,12 +141,10 @@ else if ($dopost == "upcatcache") {
     UpDateCatCache();
     $sql = " TRUNCATE TABLE `#@__arctiny`";
     $dsql->ExecuteNoneQuery($sql);
-
     //导入普通模型微数据
     $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid)  
-            SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` ";
+        SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` ";
     $dsql->ExecuteNoneQuery($sql);
-
     //导入单表模型微数据
     $dsql->SetQuery("SELECT id,addtable FROM `#@__channeltype` WHERE id < -1 ");
     $dsql->Execute();
@@ -224,7 +220,7 @@ else if ($dopost == 'unitCatalog') {
         }
         $typeOptions = $tl->GetOptionArray(0, 0, $channelid);
         $wintitle = '合并栏目';
-        $wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt;&gt; 合并栏目";
+        $wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt; 合并栏目";
         $win = new OxWindow();
         $win->Init('catalog_do.php', 'js/blank.js', 'POST');
         $win->AddHidden('dopost', 'unitCatalog');
@@ -277,7 +273,7 @@ else if ($dopost == 'moveCatalog') {
         $channelid = $tl->TypeInfos['channeltype'];
         $typeOptions = $tl->GetOptionArray(0, 0, $channelid);
         $wintitle = "移动栏目";
-        $wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt;&gt; 移动栏目";
+        $wecome_info = "<a href='catalog_main.php'>栏目管理</a> &gt; 移动栏目";
         $win = new OxWindow();
         $win->Init('catalog_do.php', 'js/blank.js', 'POST');
         $win->AddHidden('dopost', 'moveCatalog');
@@ -305,4 +301,4 @@ else if ($dopost == 'moveCatalog') {
         ShowMsg('成功移动目录', 'catalog_main.php');
         exit();
     }
-}
+}

src/admin/inc/inc_action_info.php

@@ -289,44 +289,38 @@ $actionSearch[8] = array(
     'description' => '针对主页、栏目、文档、专题等等进行更新',
     'soniterm' => array(
         0  =>  array(
-            'title' => '更新主页HTML',
-            'description' => '生成网站主页面的HTML',
+            'title' => '更新主页',
+            'description' => '生成网站主页面',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_homepage.php'
         ),
         1  =>  array(
             'title' => '更新栏目 HTML',
-            'description' => '对每个栏目进行静态HTML页面的生成',
+            'description' => '对每个栏目进行静态页面的生成',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_list.php'
         ),
         2  =>  array(
             'title' => '更新文档H',
-            'description' => '对每个栏目下的文档进行静态HTML页面的生成',
+            'description' => '对每个栏目下的文档进行静态页面的生成',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_archives.php'
         ),
         3  =>  array(
-            'title' => '更新网站地图',
-            'description' => '生成网站地图的静态HTML页面',
-            'purview' => 'sys_MakeHtml',
-            'linkurl' => 'makehtml_map_guide.php'
-        ),
-        4  =>  array(
-            'title' => '更新订阅 HTML',
+            'title' => '更新订阅',
             'description' => '对全站的RSS进行更新',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_rss.php'
         ),
-        5  =>  array(
-            'title' => '获取JS文件',
-            'description' => '可以获取某个栏目的js连接',
+        4  =>  array(
+            'title' => '更新脚本',
+            'description' => '可以获取某个栏目的脚本连接',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_js.php'
         ),
-        6  =>  array(
-            'title' => '更新专题 HTML',
-            'description' => '对专题进行静态HTML页面的生成',
+        5  =>  array(
+            'title' => '更新专题',
+            'description' => '对专题进行静态页面的生成',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_spec.php'
         ),

src/admin/inc/inc_menu.php

@@ -109,7 +109,6 @@ $adminMenu1
     <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='更新订阅' 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' />

src/admin/inc/inc_menu_map.php

@@ -66,7 +66,6 @@ $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <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='更新订阅' 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' />

src/admin/index_body.php

@@ -27,87 +27,7 @@ if (empty($dopost)) {
     include DedeInclude('templets/index_body.htm');
     exit();
 }
-/*---------------------------------
-载入右边内容
-function _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();
-    $dsql->Execute('a', $query);
-    while ($row = $dsql->GetArray('a')) {
-        $allArc += $row['dd'];
-        $row['typename'] = $chArrNames[$row['channel']];
-        $chArr[] = $row;
-    }
-?>
-    <table width="100%" class="table table-borderless">
-        <tr>
-            <td class="nline" style="width:50%;text-align:left">会员数：</td>
-            <td class="nline" style="text-align:left"><?php echo $row1['dd']; ?></td>
-        </tr>
-        <tr>
-            <td class="nline" style="text-align:left">文档数：</td>
-            <td class="nline" style="text-align:left"><?php echo $allArc; ?></td>
-        </tr>
-        <?php
-        foreach ($chArr as $row) {
-        ?>
-            <tr>
-                <td class="nline" style="text-align:left"><?php echo $row['typename']; ?>：</td>
-                <td class="nline" style="text-align:left"><?php echo $row['dd']; ?></td>
-            </tr>
-        <?php
-        }
-        ?>
-        <tr>
-            <td style="text-align:left">评论数：</td>
-            <td style="text-align:left"><?php echo $row2['dd']; ?></td>
-        </tr>
-    </table>
-<?php
-exit();
-} else if ($dopost == 'getRightSideNews') {
-    $query = "SELECT arc.id, arc.arcrank, arc.title, arc.channel, ch.editcon  FROM `#@__archives` arc
-        LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel
-        WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 6 ";
-    $arcArr = array();
-    $dsql->Execute('m', $query);
-    while ($row = $dsql->GetArray('m')) {
-        $arcArr[] = $row;
-    }
-    AjaxHead();
-?>
-    <table width="100%" class="table table-borderless">
-        <?php
-        foreach ($arcArr as $row) {
-            if (trim($row['editcon']) == '') {
-                $row['editcon'] = 'archives_edit.php';
-            }
-            $linkstr = "·<a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>";
-            if ($row['arcrank'] == -1) $linkstr .= "<span style='color:#dc3545'>(未审核)</span>";
-        ?>
-        <tr>
-            <td class="nline"><?php echo $linkstr; ?></td>
-        </tr>
-        <?php
-        }
-        ?>
-    </table>
-<?php
-exit;
-} else if ($dopost == 'setskin') {
+else if ($dopost == 'setskin') {
     $cskin = empty($cskin) ? 1 : $cskin;
     $skin = !in_array($cskin, array(1, 2, 3, 4)) ? 1 : $cskin;
     $skinconfig = DEDEDATA.'/admin/skin.txt';

src/admin/index_testenv.php

@@ -145,7 +145,7 @@ if ($rs < 0) {
 <?php
 if (count($safeMsg) > 0) {
 ?>
-	<div class="alert alert-danger mt-3 mb-3">
+	<div class="alert alert-danger mt-3 m-0">
 		<?php
 		$i = 1;
 		foreach ($safeMsg as $key => $val) {

src/admin/makehtml_archives_action.php

@@ -90,7 +90,7 @@ if ($tjnum < $totalnum) {
     exit();
 } else {
     if ($typeid != '') {
-        ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新&gt;&gt;", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1");
+        ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新&gt;", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1");
     } else {
         if ($uptype == '') {
             ShowMsg("完成所有创建任务，生成文件：$totalnum 总用时：{$ttime} 分钟", "javascript:;");

src/admin/makehtml_map_guide.php

@@ -1,12 +0,0 @@
-<?php
-/**
- * 生成网站地图向导
- *
- * @version        $Id: makehtml_map_guide.php 1 11:17 2010年7月19日Z tianya $
- * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/config.php");
-include DedeInclude('templets/makehtml_map_guide.htm');

src/admin/module_main.php

@@ -159,8 +159,7 @@ else if ($action == 'setup') {
     if (($devInfo['dev_id'] == $infos['dev_id']) && !empty($devInfo['dev_id'])) {
       $s = "已认证";
     }
-
-    $win->AddTitle("&nbsp;<a href='module_main.php'>模块管理</a> &gt;&gt; 安装模块：{$infos['name']}");
+    $win->AddTitle("&nbsp;<a href='module_main.php'>模块管理</a> &gt; 安装模块：{$infos['name']}");
     $win->AddHidden("hash", $hash);
     $win->AddHidden("action", 'setupstart');
     $msg = "<style>.dtb{border-bottom:1px dotted #ccc}</style>
@@ -291,11 +290,11 @@ else if ($action == 'del') {
     $dm = new DedeModule($mdir);
     $infos = $dm->GetModuleInfo($hash);
     $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>（这个模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性）');
-    $dev_id = empty($infos['dev_id'])? "<a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>未认证</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>未认证</a>";
+    $dev_id = empty($infos['dev_id'])? "<a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>未认证</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>已认证</a>";
     $win = new OxWindow();
     $win->Init("module_main.php", "js/blank.js", "post");
     $wecome_info = "模块管理";
-    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt;&gt; 删除模块：{$infos['name']}");
+    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt; 删除模块：{$infos['name']}");
     $win->AddHidden('hash', $hash);
     $win->AddHidden('action', 'delok');
     $msg = "<style>.dtb{border-bottom:1px dotted #ccc}</style>
@@ -356,11 +355,11 @@ else if ($action == 'uninstall') {
         else $v['type'] = '文件';
         $filelist .= "{$v['type']}|{$v['name']}\r\n";
     }
-    $dev_id = empty($infos['dev_id'])? "<a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>未认证</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>未认证</a>";
+    $dev_id = empty($infos['dev_id'])? "<a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>未认证</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>已认证</a>";
     $win = new OxWindow();
     $win->Init("module_main.php", "js/blank.js", "post");
     $wecome_info = "模块管理";
-    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt;&gt; 卸载模块：{$infos['name']}");
+    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt; 卸载模块：{$infos['name']}");
     $win->AddHidden("hash", $hash);
     $win->AddHidden("action", 'uninstallok');
     $msg = "<style>.dtb{border-bottom:1px dotted #ccc}</style>
@@ -390,7 +389,8 @@ else if ($action == 'uninstall') {
     <td class='dtb'><a href='module_main.php?action=showreadme&hash={$hash}' target='_blank' class='btn btn-success btn-sm'>浏览</a></td>
   </tr>
   <tr>
-    <td height='26'>模块包含的文件：<br>（文件路径相对于当前目录）</td><td>&nbsp;</td>
+    <td height='26'>模块包含的文件（文件路径相对于当前目录）</td>
+    <td></td>
   </tr>
   <tr>
     <td height='160' colspan='2'>
@@ -460,7 +460,7 @@ else if ($action == 'showreadme') {
     $win = new OxWindow();
     $win->Init("module_main.php", "js/blank.js", "post");
     $wecome_info = "模块管理";
-    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt;&gt; 使用说明：");
+    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt; 使用说明：");
     $win->AddMsgItem("<div style='padding-left:10px;line-height:150%'>$msg</div>");
     $winform = $win->GetWindow("hand");
     $win->Display();
@@ -498,11 +498,11 @@ else if ($action == 'view') {
         $setupinfo = "未安装 <a href='module_main.php?action=setup&hash={$hash}'>安装</a>";
     }
 
-    $dev_id = empty($infos['dev_id'])? "<a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>{$s}</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>{$s}</a>";
+    $dev_id = empty($infos['dev_id'])? "<a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-danger btn-sm'>{$s}</a>" : "{$infos['dev_id']} <a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-danger btn-sm'>{$s}</a>";
     $win = new OxWindow();
     $win->Init("", "js/blank.js", "");
     $wecome_info = "模块管理";
-    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt;&gt; 模块详情：{$infos['name']}");
+    $win->AddTitle("<a href='module_main.php'>模块管理</a> &gt; 模块详情：{$infos['name']}");
     $msg = "<style>.dtb{border-bottom:1px dotted #ccc}</style>
     <table width='98%' border='0' cellspacing='0' cellpadding='0'>
   <tr>
@@ -530,7 +530,8 @@ else if ($action == 'view') {
     <td class='dtb'><a href='module_main.php?action=showreadme&hash={$hash}' target='_blank' class='btn btn-success btn-sm'>浏览</a></td>
   </tr>
   <tr>
-    <td height='26'>模块包含的文件：<br>（文件路径相对于当前目录）</td><td>&nbsp;</td>
+    <td height='26'>模块包含的文件（文件路径相对于当前目录）</td>
+    <td></td>
   </tr>
   <tr>
     <td height='160' colspan='2'>

src/admin/module_upload.php

@@ -76,7 +76,7 @@ if ($action == 'upload') {
     $win = new OxWindow();
     $win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data");
     $win->mainTitle = "模块管理";
-    $wecome_info = "<a href='module_main.php'>模块管理</a> &gt;&gt; 上传模块";
+    $wecome_info = "<a href='module_main.php'>模块管理</a> &gt; 上传模块";
     $win->AddTitle('请选择要上传的文件:');
     $win->AddHidden("action", 'upload');
     $msg = "<table width='600' border='0' cellspacing='0' cellpadding='0'>

src/admin/plus_edit.php

@@ -32,7 +32,7 @@ if ($dopost == "show") {
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("aid", $aid);
         $win->AddTitle("您确实要删除'".$title."'这个插件");
-        $win->AddMsgItem("警告：在这里删除仅仅删除菜单项，要干净删除请在模块管理处删除<br><br><a href='module_main.php?moduletype=plus'>模块管理&gt;&gt;</a>");
+        $win->AddMsgItem("警告：在这里删除仅仅删除菜单项，要干净删除请在模块管理处删除<br><br><a href='module_main.php?moduletype=plus'>模块管理&gt;</a>");
         $winform = $win->GetWindow("ok");
         $win->Display();
         exit();

src/admin/public_guide.php

@@ -11,7 +11,6 @@
 require_once(dirname(__FILE__)."/config.php");
 require_once(DEDEINC."/libraries/oxwindow.class.php");
 if (empty($action)) $action = '';
-
 /*--------------------
 function __SetDefault();
 ----------------------*/
@@ -25,18 +24,18 @@ if ($action == 'setdefault') {
     $win->Init();
     $win->mainTitle = "内容发布向导";
     $wecome_info = "<a href='public_guide.php?action=edit'>内容发布向导</a>";
-    $win->AddTitle("<a href='public_guide.php?action=edit'>内容发布向导</a> &gt;&gt; 设置默认发布表单");
+    $win->AddTitle("<a href='public_guide.php?action=edit'>内容发布向导</a> &gt; 设置默认发布表单");
     if ($cid == 0) {
         $msg = "
-         成功取消默认发布表单
-           <hr style='width:90%' size='1' />
-           您目前想要进行的操作：<a href='public_guide.php?action=edit'>返回发布向导页</a>
+        成功取消默认发布表单
+        <hr style='width:90%' size='1' />
+        您目前想要进行的操作：<a href='public_guide.php?action=edit'>返回发布向导页</a>
       ";
     } else {
         $msg = "
         成功保存默认发布表单，以后点击“内容发布”面板将直接跳转到您选择的内容发布页
         <hr style='width:90%' size='1' />
-           您目前想要进行的操作：<a href='public_guide.php'>转到默认发布表单</a> &nbsp; <a href='public_guide.php?action=edit'>返回发布向导页</a>
+        您目前想要进行的操作：<a href='public_guide.php'>转到默认发布表单</a> &nbsp; <a href='public_guide.php?action=edit'>返回发布向导页</a>
       ";
     }
     $win->AddMsgItem("<div style='padding-left:20px;line-height:150%'>$msg</div>");
@@ -44,13 +43,11 @@ if ($action == 'setdefault') {
     $win->Display();
     exit();
 }
-
 //以下为正常浏览的内容
 /*--------------------
 function __PageShow();
 ----------------------*/
 $row = $dsql->GetOne("SELECT id,addcon FROM `#@__channeltype` WHERE isdefault='1' ");
-
 //已经设置了默认发布表单
 if (is_array($row) && $action != 'edit') {
     $addcon = $row['addcon'];
@@ -62,17 +59,15 @@ if (is_array($row) && $action != 'edit') {
     require_once(DEDEADMIN.'/'.$addcon);
     exit();
 }
-
 //没有设置默认发布表单
 else {
     $dsql->SetQuery("SELECT id,typename,mancon,isdefault,addtable FROM `#@__channeltype` WHERE id<>-1 And isshow=1 ");
     $dsql->Execute();
 }
 include DedeInclude('templets/public_guide.htm');
-
 //获取频道栏目数
 function GetCatalogs(&$dsql, $cid)
 {
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctype` WHERE channeltype='$cid' ");
     return (!is_array($row) ? '0' : $row['dd']);
-}
+}

src/admin/sys_repair.php

@@ -11,13 +11,13 @@
 require_once(dirname(__FILE__).'/config.php');
 CheckPurview('sys_ArcBatch');
 require_once(DEDEINC.'/libraries/oxwindow.class.php');
-//ShowMsg("目前暂不需要此工具，以后有需要系统会进行自动升级这个程序<br><a href='index_body.php'>&lt;&lt;点击此返回&gt;&gt;</a>", "javascript:;");
+//ShowMsg("目前暂不需要此工具，以后有需要系统会进行自动升级这个程序<br><a href='index_body.php'>&lt;&lt;点击此返回&gt;</a>", "javascript:;");
 //exit();
 if (empty($dopost)) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
-    $wecome_info = "<a href='index_body.php'>系统主页</a> &gt;&gt; 系统错误修复工具";
+    $wecome_info = "<a href='index_body.php'>系统主页</a> &gt; 系统错误修复工具";
     $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
     $msg = "
     <table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
@@ -32,7 +32,7 @@ if (empty($dopost)) {
     4、检测微表与主表数据一致性<br>
     <br>
     <br>
-    <a href='sys_repair.php?dopost=1' class='btn btn-danger'>点击此开始进行常规检测&gt;&gt;</a>
+    <a href='sys_repair.php?dopost=1' class='btn btn-danger'>点击此开始进行常规检测&gt;</a>
     <br><br><br>
     </td>
   </tr>
@@ -51,7 +51,7 @@ else if ($dopost == 1) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
-    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt;&gt; 检测数据结构";
+    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 检测数据结构";
     $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
     $msg = "
     <table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
@@ -65,7 +65,7 @@ else if ($dopost == 1) {
     2、更新数据库archives表时出错<br>
     3、列表显示数据目与实际文档数不一致<br>
     <br>
-    <a href='sys_repair.php?dopost=2' class='btn btn-danger'>点击此检测微表正确性&gt;&gt;</a>
+    <a href='sys_repair.php?dopost=2' class='btn btn-danger'>点击此检测微表正确性&gt;</a>
     <br><br><br>
     </td>
   </tr>
@@ -104,7 +104,7 @@ else if ($dopost == 2) {
         }
     }
     $msg .= "※总有效记录数：{$allarcnum} <br> ";
-    $errall = "<a href='index_body.php' style='font-size:14px;'>完成修正或无错误返回&gt;&gt;</a>";
+    $errall = "<a href='index_body.php' style='font-size:14px;'>完成修正或无错误返回&gt;</a>";
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` ");
     $msg .= "※微统计表记录数：{$row['dd']}<br>";
     if ($row['dd'] == $allarcnum) {
@@ -129,14 +129,14 @@ else if ($dopost == 2) {
             $msg .= "<p style='color:green;font-size:16px'>修正记录成功</p><br>";
         } else {
             $msg .= "<p style='color:#dc3545;font-size:16px'>修正记录失败，建议进行高级综合检测</p><br>";
-            $errall = " <a href='sys_repair.php?dopost=3' class='btn btn-danger'>进行高级结合性检测&gt;&gt;</a> ";
+            $errall = " <a href='sys_repair.php?dopost=3' class='btn btn-danger'>进行高级结合性检测&gt;</a> ";
         }
     }
     UpDateCatCache();
     $win = new OxWindow();
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
-    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt;&gt; 检测微表正确性";
+    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 检测微表正确性";
     $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
     $msg = "
     <table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
@@ -197,7 +197,7 @@ else if ($dopost == 3) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
-    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt;&gt; 高级综合检测修复";
+    $wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 高级综合检测修复";
     $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
     $msg = "
     <table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
@@ -206,7 +206,7 @@ else if ($dopost == 3) {
     完成所有修复操作，移除错误记录 {$errnum} 条
     <hr />
     <br>
-    <a href='index_body.php' class='btn btn-success'>完成修正或无错误返回&gt;&gt;</a>
+    <a href='index_body.php' class='btn btn-success'>完成修正或无错误返回&gt;</a>
     </td>
   </tr>
  </table>

src/admin/templets/article_result_same.htm

@@ -48,9 +48,7 @@ function noSelAll()
 <body>
 <table width="100%" border="0" cellpadding="2" cellspacing="1" class="tbtitle">
   <tr bgcolor="#E7E7E7">
-    <td height="26" colspan="3" bgcolor="#EDF9D5">
-    	·重复文档列表：
-    </td>
+    <td height="26" colspan="3" bgcolor="#EDF9D5">重复文档列表：</td>
   </tr>
   <form name="form2" method="POST" action="article_test_same.php">
    <input type='hidden' name='deltype' value='<?php echo $deltype; ?>' />
@@ -60,9 +58,9 @@ function noSelAll()
    <input type='hidden' name='maintable' value='<?php echo $maintable; ?>' />
    <input type='hidden' name='titles' value='' />
   <tr bgcolor="#F8FBFB" height="26" align="center">
-    <td width="9%"> 选择 </td>
-    <td width="10%"> 重复数量 </td>
-    <td width="81%"> 文档标题 </td>
+    <td width="9%">选择</td>
+    <td width="10%">重复数量</td>
+    <td width="81%">文档标题</td>
   </tr>
  <?php
  while($row = $dsql->GetArray())

src/admin/templets/catalog_main.htm

@@ -114,9 +114,7 @@ td,th{padding:.25rem}
 <table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf" align="center" class="maintable mt-3">
 <tr>
   <td height="26" background="images/tbg.gif">
-    <span style="float:left;padding-left:10px;line-height:26px" class="py-3">
-    	网站栏目管理
-    </span>
+    <span style="float:left;padding-left:10px;line-height:26px" class="py-3">网站栏目管理</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>
@@ -129,7 +127,7 @@ td,th{padding:.25rem}
   <td height="26" bgcolor="#ffffff">
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr>
-        <td width="50%" style="padding-left:10px">温馨提示（使用鼠标右键弹出菜单）</td>
+        <td width="50%" style="padding-left:10px">修改栏目属性（使用鼠标右键弹出菜单）</td>
         <td width="50%" style="padding-right:10px" align="right">
         <?php if(!isset($exallct)) { ?>
         <a href="catalog_main.php?exallct=all" class="btn btn-success btn-sm">展开栏目</a>

src/admin/templets/content_select_list.htm

@@ -47,12 +47,9 @@
 	</script>
 </head>
 <body leftmargin="0" topmargin="0" background='images/allbg.gif'>
-
 	<table width="100%" border="0" align="center" cellpadding="2" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
 		<tr bgcolor="#E7E7E7">
-			<td height="26" colspan="9" background="images/tbg.gif">
-				 §文章列表
-			</td>
+			<td height="26" colspan="9" background="images/tbg.gif">文章列表</td>
 		</tr>
 		<form name="form2">
 			<tr align="center" bgcolor="#FAFAF1" height="26">
@@ -71,9 +68,7 @@
 				onMouseOut="javascript:this.bgColor='#FFFFFF';" height="26">
 				<td>{dede:field.id/}</td>
 				<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np"></td>
-				<td align='left'>
-					<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'>{dede:field.title/}</a>
-				</td>
+				<td align='left'><a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'>{dede:field.title/}</a></td>
 				<td>{dede:field.senddate function="GetDateMk(@me)" /}</td>
 				<td>{dede:field.typeid function='GetTypename(@me)'/}</td>
 				<td>{dede:field.click/}</td>
@@ -84,11 +79,8 @@
 			{/dede:datalist}
 			<tr bgcolor="#FAFAF1">
 				<td height="26" colspan="9">
-					&nbsp;
 					<a href="javascript:selAll()" class="btn btn-success btn-sm">全选</a>
-					&nbsp;
 					<a href="javascript:noSelAll()" class="btn btn-success btn-sm">取消</a>
-					&nbsp;
 					<a href="javascript:ReturnValue()" class="btn btn-success btn-sm">把选定值加到列表</a>
 				</td>
 			</tr>
@@ -113,15 +105,9 @@
 									<?php echo $optionarr?>
 								</select>
 							</td>
-							<td width='100'>
-								关键词：
-							</td>
-							<td width='160'>
-								<input type='text' name='keyword' value='<?php echo $keyword?>' style='width:150'>
-							</td>
-							<td width='100'>
-								<button type="submit" class="btn btn-success btn-sm">搜索</button>
-							</td>
+							<td width='100'>关键词：</td>
+							<td width='160'><input type='text' name='keyword' value='<?php echo $keyword?>' style='width:150'></td>
+							<td width='100'><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 						</tr>
 					</table>
 				</td>

src/admin/templets/diy_edit.htm

@@ -52,8 +52,7 @@
       <input type='hidden' name='dopost' value='save'>
       <tr bgcolor="#CFCFCF">
         <td height="26" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px">
-          <a href="diy_main.php">自定义表单管理</a> &gt; 修改自定义表单：
-          (修改表名不会创建新表，如果您不懂手工处理这些表，请不要修改)
+          <a href="diy_main.php">自定义表单管理</a> &gt; 修改自定义表单（修改表名不会创建新表，如果您不懂手工处理这些表，请不要修改）
         </td>
       </tr>
       <tr>

src/admin/templets/index.htm

@@ -41,7 +41,7 @@
             <div class="top_link">
                 <ul>
                     <li class="welcome">
-                        <a target="main" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID(); ?>&dopost=edit"><img src="../static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?></a>
+                        <a target="main" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID(); ?>&dopost=edit"><img src="../static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><?php if($cuserLogin->getUserType()==10) {echo "管理员";} else if($cuserLogin->getUserType()==5) {echo "频道员";} else {echo "信息员";}?></a>
                         <a href="exit.php">退出</a>
                     </li>
                     <?php

src/admin/templets/index_body.htm

@@ -16,25 +16,15 @@
 <script src="js/indexbody.js"></script>
 <script src="js/main.js"></script>
 <style>
+table.stattable td{padding:.6rem;font-size:12px;border-bottom:1px solid #f0f0f0;text-align:right;vertical-align:middle}
+table.stattable td.today{font-size:12px;color:#000}
 .row{display:flex;flex-wrap:wrap}
 .row>[class*='col-']{display:flex;flex-direction:column}
 .table{margin-bottom:0}
-.stattable{width: 100%;}
-table.stattable td {
-    padding: 0 5px;
-    height: 25px;
-    line-height: 25px;
-    border-bottom: 1px solid #f0f0f0;
-    font-size: 12px;
-    text-align: right;
-}
-table.stattable td.today {
-    font-size: 12px;
-    color: #000;
-    height: 25px;
-    line-height: 25px;
-    font-weight: 700;
-}
+.stattable{width:100%}
+.col-md-6:nth-child(2n){margin-left:-15px}
+.web-info{padding:10px;background:#f6f6f6;border-radius:.2rem;text-align:center}
+.web-info p{margin-bottom:10px}
 </style>
 </head>
 <body>
@@ -43,7 +33,7 @@ table.stattable td.today {
             <div id="__testEvn" class="col-md-12"></div>
             <div class="col-md-12 mt-3">
                 <div class="card">
-                    <div class="card-header">流量统计 <a title="点击查看流量统计图" href="#statChart"><i class="fa fa-line-chart" aria-hidden="true"></i></a></div>
+                    <div class="card-header"><a title="点击查看流量统计图" href="#statChart"><i class="fa fa-line-chart"></i></a>&nbsp;流量统计表</div>
                     <div class="card-body">
                         <table class="stattable">
                             <tbody>
@@ -56,24 +46,24 @@ table.stattable td.today {
                                 </tr>
                                 <tr class="bg-white">
                                     <td class="today">今日</td>
-                                    <td class="today" id="today_pv">...</td>
-                                    <td class="today" id="today_uv">...</td>
-                                    <td class="today" id="today_ip">...</td>
-                                    <td class="today" id="today_vv">...</td>
+                                    <td class="today" id="today_pv"></td>
+                                    <td class="today" id="today_uv"></td>
+                                    <td class="today" id="today_ip"></td>
+                                    <td class="today" id="today_vv"></td>
                                 </tr>
                                 <tr class="bg-white">
-                                    <td class="">昨日</td>
-                                    <td id="yestoday_pv">...</td>
-                                    <td id="yestoday_uv">...</td>
-                                    <td id="yestoday_ip">...</td>
-                                    <td id="yestoday_vv">...</td>
+                                    <td>昨日</td>
+                                    <td id="yestoday_pv"></td>
+                                    <td id="yestoday_uv"></td>
+                                    <td id="yestoday_ip"></td>
+                                    <td id="yestoday_vv"></td>
                                 </tr>
-                                <tr class="bg-white grey9 hide" style="display: table-row;">
-                                    <td class="">历史累计</td>
-                                    <td id="total_pv">...</td>
-                                    <td id="total_uv">...</td>
-                                    <td id="total_ip">...</td>
-                                    <td id="total_vv">...</td>
+                                <tr class="bg-white grey9 hide" style="display:table-row">
+                                    <td>历史累计</td>
+                                    <td id="total_pv"></td>
+                                    <td id="total_uv"></td>
+                                    <td id="total_ip"></td>
+                                    <td id="total_vv"></td>
                                 </tr>
                             </tbody>
                         </table>
@@ -82,58 +72,89 @@ table.stattable td.today {
             </div>
             <div class="col-md-6 mt-3 updatenews">
                 <div class="card">
-                    <div class="card-header">更新消息</div>
+                    <div class="card-header"><i class="fa fa-gear"></i>&nbsp;系统信息</div>
                     <div class="card-body">
                         <div id="updateinfos">
-                            <?php
-                            echo "<div class='updatedvt py-3'>";
-                            echo "安全操作：<a href='sys_data.php' class='btn btn-success btn-sm'>备份还原</a><a href='sys_safetest.php' class='btn btn-success btn-sm'>病毒扫描</a><a href='sys_repair.php' class='btn btn-success btn-sm'>错误修复</a></div>";
-                            echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='100'></iframe>";
-                            ?>
+                            <?php echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' style='width:98%;height:60px;padding:.6rem'></iframe>"; ?>
                         </div>
+                        <table width="98%" class="table table-borderless">
+                            <tr>
+                                <td>
+                                    <div class="web-info">
+                                        <p>操作系统</p>
+                                        <span><?php echo PHP_OS; ?></span>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="web-info">
+                                        <p>Web服务器</p>
+                                        <span><?php echo $_SERVER['SERVER_SOFTWARE']; ?></span>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="web-info">
+                                        <p>服务器IP</p>
+                                        <span><?php echo gethostbyname($_SERVER['SERVER_NAME']); ?></span>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="web-info">
+                                        <p>PHP版本</p>
+                                        <span><?php echo @phpversion(); ?></span>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
                     </div>
                 </div>
             </div>
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">版本授权</div>
+                    <div class="card-header"><i class="fa fa-database"></i>&nbsp;版本授权</div>
                     <div class="card-body" id="_systeminfo">正在载入</div>
                 </div>
             </div>
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">基本信息</div>
+                    <div class="card-header"><a name="statChart"><i class="fa fa-bar-chart"></i>&nbsp;流量统计图</a></div>
                     <div class="card-body">
-                        <table width="98%" class="table table-borderless">
-                            <tr>
-                                <td width="50%">操作系统：<?php echo PHP_OS; ?></td>
-                                <td>Web服务器：<?php echo $_SERVER['SERVER_SOFTWARE']; ?></td>
-                            </tr>
-                            <tr>
-                                <td>网站域名：<a href="<?php echo $cfg_basehost; ?>" target="_blank"><?php echo $_SERVER['SERVER_NAME']; ?></a></td>
-                                <td>网站地址：<?php echo gethostbyname($_SERVER['SERVER_NAME']); ?></td>
-                            </tr>
-                            <tr>
-                                <td>您的级别：<?php if($cuserLogin->getUserType()==10) {echo "总管理员";} else if($cuserLogin->getUserType()==5) {echo "频道总编";} else {echo "信息采集员或其它管理员";}?></td>
-                                <td>版本信息：<?php echo $cfg_soft_enname; ?></td>
-                            </tr>
-                            <tr>
-                                <td>PHP版本：<?php echo @phpversion(); ?></td>
-                                <td>GD版本：<?php echo @gdversion(); ?></td>
-                            </tr>
-                            <tr>
-                                <td>上传文件：<?php echo ini_get("post_max_size") ?></td>
-                                <td>远程连接：<?php echo ini_get("allow_url_fopen") ? '允许':'不允许'; ?></td>
-                            </tr>
-                        </table>
+                        <canvas id="statChart"></canvas>
                     </div>
                 </div>
             </div>
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header"><a name="statChart">流量统计图</a></div>
+                    <div class="card-header"><i class="fa fa-file-word-o"></i>&nbsp;最新文档</div>
                     <div class="card-body">
-                        <canvas id="statChart" style="height: 260px;"></canvas>
+                        <table width="100%" class="table table-borderless">
+                            <?php
+                            $query = "SELECT arc.id, arc.arcrank, arc.title, arc.typeid, arc.pubdate, arc.channel, ch.editcon, tp.typename  FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0,12";
+                            $arcArr = array();
+                            $dsql->Execute('m', $query);
+                            while($row = $dsql->GetArray('m'))
+                            {
+                                $arcArr[] = $row;
+                            }
+                            ?>
+                            <?php
+                            if(count($arcArr) > 1)
+                            {
+                                foreach($arcArr as $row)
+                                {
+                                    if(trim($row['editcon'])==''){
+                                        $row['editcon'] = 'archives_edit.php';
+                                    }
+                                    $rowarcrank = $row['arcrank']==-1? "&nbsp;<span class='btn btn-danger btn-sm'>未审核</span>":"";
+                                    $pubdate = GetDateMk($row['pubdate']);
+                                    echo "<tr><td><a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>{$rowarcrank}</td><td width='90'>{$pubdate}</td></tr>";
+                                }
+                            } else {
+                            ?>
+                            <tr><td colspan="2">暂无文档</td></tr>
+                            <?php
+                            }
+                            ?>
+                        </table>
                     </div>
                 </div>
             </div>
@@ -187,21 +208,6 @@ table.stattable td.today {
     });
     </script>
     <script>
-    Date.prototype.Format = function (fmt) { //author: meizz 
-        var o = {
-            "M+": this.getMonth() + 1, //月份 
-            "d+": this.getDate(), //日 
-            "h+": this.getHours(), //小时 
-            "m+": this.getMinutes(), //分 
-            "s+": this.getSeconds(), //秒 
-            "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-            "S": this.getMilliseconds() //毫秒 
-        };
-        if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-        for (var k in o)
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-        return fmt;
-    }
     var dedebizInfo;
     function ViewDedeBIZ(){
         console.log(dedebizInfo);
@@ -209,26 +215,25 @@ table.stattable td.today {
         <table width="100%" class="table table-borderless">
             <tbody>
                 <tr>
-                    <td class="nline" style="text-align:left">版本号：</td>
-                    <td class="nline" style="text-align:left">V${dedebizInfo.result.server_version}</td>
+                    <td style="width:50%">版本号：</td>
+                    <td>V${dedebizInfo.result.server_version}</td>
                 </tr>
                 <tr>
-                    <td class="nline" style="text-align:left">运行时间：</td>
-                    <td class="nline" style="text-align:left">${dedebizInfo.result.server_run_time}</td>
+                    <td style="width:50%">运行时间：</td>
+                    <td>${dedebizInfo.result.server_run_time}</td>
                 </tr>
                 <tr>
-                    <td class="nline" style="text-align:left">服务器系统：</td>
-                    <td class="nline" style="text-align:left">${dedebizInfo.result.server_goos}（${dedebizInfo.result.server_goarch}）</td>
+                    <td style="width:50%">服务器系统：</td>
+                    <td>${dedebizInfo.result.server_goos}（${dedebizInfo.result.server_goarch}）</td>
                 </tr>
                 <tr>
-                    <td class="nline" style="text-align:left">内存占用：</td>
-                    <td class="nline" style="text-align:left">${dedebizInfo.result.server_memory_usage}%</td>
+                    <td style="width:50%">内存占用：</td>
+                    <td>${dedebizInfo.result.server_memory_usage}%</td>
                 </tr>
             </tbody>
         </table>
         `);
     }
-    //加载服务信息
     function LoadServer(){
         $.get("index_body.php?dopost=system_info", function(data){
             let rsp = JSON.parse(data);
@@ -237,32 +242,32 @@ table.stattable td.today {
                 if (typeof rsp.result.domain !== "undefined"){
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">授权域名：</td>
-                        <td class="nline" style="text-align:left">${rsp.result.domain} <a href="<?php echo $cfg_biz_dedebizUrl;?>/auth/?domain=${rsp.result.domain}" class="btn btn-success btn-sm">查看</a></td>
+                        <td style="width:50%">授权域名：</td>
+                        <td>${rsp.result.domain} <a href="<?php echo $cfg_biz_dedebizUrl;?>/auth/?domain=${rsp.result.domain}" class="btn btn-success btn-sm">查看</a></td>
                     </tr>
                     `;
                 }
                 if (typeof rsp.result.title !== "undefined"){
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">站点名称：</td>
-                        <td class="nline" style="text-align:left">${rsp.result.title}</td>
+                        <td style="width:50%">站点名称：</td>
+                        <td>${rsp.result.title}</td>
                     </tr>
                     `;
                 }
                 if (typeof rsp.result.stype !== "undefined"){
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">站点类型：</td>
-                        <td class="nline" style="text-align:left">${rsp.result.stype}</td>
+                        <td style="width:50%">站点类型：</td>
+                        <td>${rsp.result.stype}</td>
                     </tr>
                     `;
                 }
                 if (typeof rsp.result.auth_version !== "undefined" && typeof rsp.result.auth_at !== "undefined"){
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">授权版本：</td>
-                        <td class="nline" style="text-align:left">V${rsp.result.auth_version}.x.x（时间：${rsp.result.auth_at}）</td>
+                        <td style="width:50%">授权版本：</td>
+                        <td>V${rsp.result.auth_version}.x.x（时间：${rsp.result.auth_at}）</td>
                     </tr>
                     `;
                 }
@@ -270,16 +275,16 @@ table.stattable td.today {
                     //下面是DedeBIZ Core组件信息
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">版本组件：</td>
-                        <td class="nline" style="text-align:left"><a href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008" target="_blank" class="btn btn-danger btn-sm">如何启动组件</a></td>
+                        <td style="width:50%">版本组件：</td>
+                        <td><a href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008" target="_blank" class="btn btn-danger btn-sm">如何启动组件</a></td>
                     </tr>
                     `;
                 } else {
                     dedebizInfo = JSON.parse(rsp.result.core.data);
                     infoStr += `
                     <tr>
-                        <td class="nline" style="text-align:left">版本组件：</td>
-                        <td class="nline" style="text-align:left"><a href="javascript:ViewDedeBIZ()" class="btn btn-success btn-sm">查看组件信息</a></td>
+                        <td style="width:50%">版本组件：</td>
+                        <td><a href="javascript:ViewDedeBIZ()" class="btn btn-success btn-sm">查看组件信息</a></td>
                     </tr>
                     `;
                 }
@@ -287,13 +292,36 @@ table.stattable td.today {
                 $("#_systeminfo").html(infoStr);
             } else {
                 $("#_systeminfo").html(`
-                <div class="py-1">尚未启动商业版服务，原因：${rsp.msg}</div>
-                <div class="py-1">目前是社区版开源免费，但商业版可以提高性能，支付功能，小程序等</div>
-                <div class="py-1"><a href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}" target="_blank" class="btn btn-danger btn-sm">开启商业版</a></div>
+                <table width="100%" class="table table-borderless">
+                    <tbody>
+                        <tr>
+                            <td style="width:50%">尚未启动商业版服务，原因：${rsp.msg}</td>
+                            <td style="text-align:right">当前版本：社区版<a href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}" target="_blank" class="btn btn-success btn-sm" style="margin-left:10px">升级商业版</a></td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">如果您已购买商业使用授权，您可以在我们的授权中心查询到相信关商业授权信息，如果授权类型同查询不符，则说明您可能购买了非法商业授权，请及时同我们取得联系</td>
+                        </tr>
+                    </tbody>
+                </table>
                 `);
             }
         });
     }
+    Date.prototype.Format = function (fmt) { //author: meizz 
+        var o = {
+            "M+": this.getMonth() + 1, //月份 
+            "d+": this.getDate(), //日 
+            "h+": this.getHours(), //小时 
+            "m+": this.getMinutes(), //分 
+            "s+": this.getSeconds(), //秒 
+            "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+            "S": this.getMilliseconds() //毫秒 
+        };
+        if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+        for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+        return fmt;
+    }
     function LoadStat() {
         $.get("index_body.php?dopost=get_statistics", function(data){
             let rsp = JSON.parse(data);
@@ -306,7 +334,6 @@ table.stattable td.today {
                 $("#today_uv").html(tuv);
                 $("#today_ip").html(tip);
                 $("#today_vv").html(tvv);
-
                 $.get("index_body.php?dopost=get_statistics&sdate=-1", function(data){
                     let rsp = JSON.parse(data);
                     if (rsp.code == 200) {
@@ -318,7 +345,6 @@ table.stattable td.today {
                 });
             }
         });
-
         var d = new Date();
         d.setDate(d.getDate() - 1);
         var s = d.Format("yyyy-MM-dd");
@@ -333,7 +359,6 @@ table.stattable td.today {
             }
         });
     }
-
     async function LoadStatChart() {
         const ctx = document.getElementById('statChart').getContext('2d');
         let labels = [];
@@ -356,12 +381,10 @@ table.stattable td.today {
                 vvs.push(typeof data.result.vv=="undefined"? 0 : data.result.vv);
             }
         }
-
         console.log(pvs);
         console.log(ips);
         console.log(uvs);
         console.log(vvs);
-
         const myChart = new Chart(ctx, {
             type: 'line',
             options: {
@@ -408,7 +431,6 @@ table.stattable td.today {
             },
         });
     }
-
     $(document).ready(function(){
         LoadServer();
         LoadStat();

src/admin/templets/makehtml_map_guide.htm

@@ -1,66 +0,0 @@
-<!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>
-  <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">
-</head>
-<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_map.php" method="get" target='stafrm'>
-      <tr>
-        <td height="26" colspan="2" background='images/tbg.gif'>
-          <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless">
-            <tr>
-              <td width="30%" height="18" style="padding-left:10px">更新网站地图：</td>
-              <td width="70%" align="right"></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr height="26" bgcolor="#FFFFFF">
-        <td width="25%">地图类型：</td>
-        <td>
-          <label><input name="dopost" type="radio" id="mdopost" class="np" value="site" checked>
-          普通地图</label>
-          &nbsp;
-          <label><input name="dopost" type="radio" id="mdopost" class="np" value="rss">
-          RSS地图</label>
-        </td>
-      </tr>
-      <tr>
-        <td height="26" colspan="2" bgcolor="#ffffff" align="center">
-          <button name="b112" type="button" class="btn btn-success" onClick="document.form1.submit();" >开始更新</button>
-        </td>
-      </tr>
-    </form>
-    <tr bgcolor="#F9FCEF">
-      <td height="26" colspan="2">
-        <table width="100%" class="table table-borderless">
-          <tr>
-            <td width="74%">进行状态：</td>
-            <td width="26%" align="right">
-              <script language='javascript'>
-                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='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
-            </td>
-          </tr>
-        </table>
-      </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="100%"></iframe>
-        </div>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>

src/admin/templets/module_main.htm

@@ -24,8 +24,8 @@
     <div class="bodytitleleft"></div>
     <div class="bodytitletxt">模块管理</div>
     <div class="bodytitletxt" style="float:right;padding-right:10px">
-      <a href="<?php echo $cfg_biz_dedebizUrl;?>?from=module" target="_blank">应用市场</a>
-      <a href="module_upload.php">模块上传</a>
+      <a href="<?php echo $cfg_biz_dedebizUrl;?>?from=module" target="_blank">应用市场</a> | 
+      <a href="module_upload.php">模块上传</a> | 
       <a href="module_make.php">模块打包</a>
     </div>
   </div>
@@ -35,13 +35,13 @@
       <input type='hidden' name='dopost' value='save'>
       <tr>
         <td height="26" colspan="7" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px">
-          <div style='float:left'><a href='module_main.php'>模块管理</a> &gt; 模块列表：</div>
-          <div style='float:right;padding-right:10px'>
-            <a href='module_main.php'>全部</a> |
-            <a href='module_main.php?moduletype=soft'>模块</a> |
-            <a href='module_main.php?moduletype=templets'>模板</a> |
-            <a href='module_main.php?moduletype=plus'>小插件</a> |
-            <a href='module_main.php?moduletype=patch'>补丁</a>
+          <div style="float:left"><a href='module_main.php'>模块管理</a> &gt; 模块列表：</div>
+          <div style="float:right;padding-right:10px">
+            <a class="btn btn-success btn-sm" href="module_main.php">全部</a>
+            <a class="btn btn-success btn-sm" href="module_main.php?moduletype=soft">模块</a>
+            <a class="btn btn-success btn-sm" href="module_main.php?moduletype=templets">模板</a>
+            <a class="btn btn-success btn-sm" href="module_main.php?moduletype=plus">小插件</a>
+            <a class="btn btn-success btn-sm" href="module_main.php?moduletype=patch">补丁</a>
           </div>
         </td>
       </tr>

src/admin/tpl.php

@@ -120,7 +120,7 @@ else if ($action == 'upload') {
     make_hash();
     $win->Init("tpl.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "模块管理";
-    $wecome_info = "<a href='templets_main.php'>模板管理</a> &gt;&gt; 上传模板";
+    $wecome_info = "<a href='templets_main.php'>模板管理</a> &gt; 上传模板";
     $win->AddTitle('请选择要上传的文件:');
     $win->AddHidden("action", 'uploadok');
     $msg = "
@@ -231,7 +231,7 @@ else if ($action == 'savetagfile') {
     </form>
     ";
     $wintitle = "成功修改/创建文件";
-    $wecome_info = "<a href='templets_tagsource.php'>标签源码碎片管理</a> &gt;&gt; 修改/新建标签";
+    $wecome_info = "<a href='templets_tagsource.php'>标签源码碎片管理</a> &gt; 修改/新建标签";
     $win = new OxWindow();
     $win->AddTitle("修改/新建标签：");
     $win->AddMsgItem($msg);

src/apps/arcmulti.php

@@ -79,7 +79,7 @@ if($tagid !='')
                     $row['imglink'] = "<a href='".$row['filename']."'>".$row['image']."</a>";
                     $row['fulltitle'] = $row['title'];
                     $row['title'] = cn_substr($row['title'],$titlelen);
-                    if($row['color']!='') $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                    if($row['color']!='') $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                     if(preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title']."";
                     //$row['title'] = "".$row['title']."";
 

src/apps/showphoto.php

@@ -74,7 +74,7 @@ $nextlink = 'javascript:;';
 if ($nextSrc != '') {
     $nextlink = "showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1);
     if ($pageGuide != "") $pageGuide .= " | ";
-    $pageGuide .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1)."'>下一幅图片&gt;&gt;</a>";
+    $pageGuide .= "<a href='showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1)."'>下一幅图片&gt;</a>";
 } else {
     $pageGuide .= " | 没有了";
 }

src/system/archive/freelist.class.php

@@ -568,7 +568,7 @@ class FreeList
                     $row['templeturl'] = $GLOBALS['cfg_templeturl'];
                     $row['title'] = cn_substr($row['title'], $titlelen);
                     if ($row['color'] != "") {
-                        $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                        $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                     }
                     if (preg_match("#c#", $row['flag'])) {
                         $row['title'] = "".$row['title']."";

src/system/archive/listview.class.php

@@ -792,7 +792,7 @@ class ListView
                     $row['fulltitle'] = $row['title'];
                     $row['title'] = cn_substr($row['title'], $titlelen);
                     if ($row['color'] != '') {
-                        $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                        $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                     }
                     if (preg_match('/c/', $row['flag'])) {
                         $row['title'] = "".$row['title']."";
@@ -922,6 +922,16 @@ class ListView
         if (preg_match('/end/i', $listitem)) $plist .= $endpage;
         if (preg_match('/option/i', $listitem)) $plist .= $optionlist;
         if (preg_match('/info/i', $listitem)) $plist .= $maininfo;
+        //伪静态分页处理
+        if ($cfg_rewrite == 'Y')
+        {
+            
+            $plist = str_replace('.php?tid=','-',$plist);
+            $plist = preg_replace("/&TotalResult=(\d+)/i","",$plist);//去掉总结果数值
+            //目录版
+            $plist = preg_replace("/&PageNo=(\d+)/i",'-\\1',$plist);
+            //网页版$plist = preg_replace("/&PageNo=(\d+)/i",'-\\1.html',$plist);
+        }
         return $plist;
     }
     /**

src/system/archive/taglist.class.php

@@ -69,7 +69,7 @@ class TagList
             $this->TagInfos = $this->dsql->GetOne("Select * From `#@__tagindex` where tag like '{$this->Tag}' ");
             if (!is_array($this->TagInfos)) {
                 $fullsearch = $GLOBALS['cfg_phpurl']."/search.php?keyword=".$this->Tag."&searchtype=titlekeyword";
-                $msg = "系统无此标签，可能已经移除<br><br>您还可以尝试通过搜索程序去搜索这个关键词：<a href='$fullsearch'>前往搜索&gt;&gt;</a>";
+                $msg = "系统无此标签，可能已经移除<br><br>您还可以尝试通过搜索程序去搜索这个关键词：<a href='$fullsearch'>前往搜索&gt;</a>";
                 ShowMsg($msg, "-1");
                 exit();
             }
@@ -380,7 +380,7 @@ class TagList
                     $row['fulltitle'] = $row['title'];
                     $row['title'] = cn_substr($row['title'], $titlelen);
                     if ($row['color'] != '') {
-                        $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                        $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                     }
                     if (preg_match('/c/', $row['flag'])) {
                         $row['title'] = "".$row['title']."";

src/system/helpers/channelunit.helper.php

@@ -145,9 +145,11 @@ if (!function_exists('GetFileName')) {
             $typeid = -1;
         }
         if ($rank != 0 || $ismake == -1 || $typeid == 0 || $money > 0) {
-            //动态文章
+            //伪静态文档，Nginx伪静态规则参考：rewrite ^/([0-9]+).html$ /apps/view.php?arcID=$1;rewrite ^/([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;
             if ($cfg_rewrite == 'Y') {
-                return $GLOBALS["cfg_plus_dir"]."/view-".$aid.'-1.html';
+                //目录版return "/article/".$aid."";
+                //网页版
+                return "/".$aid.".html";
             } else {
                 return $GLOBALS['cfg_phpurl']."/view.php?aid=$aid";
             }
@@ -201,9 +203,11 @@ if (!function_exists('GetTypeUrl')) {
         global $cfg_typedir_df;
         $typedir = MfTypedir($typedir);
         $sitepath = MfTypedir($sitepath);
-        if ($isdefault == -1) {
-            //动态
-            $reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid;
+        //伪静态栏目，Nginx伪静态规则参考：rewrite ^/list([0-9]+)$ /apps/list.php?tid=$1;rewrite ^/list([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
+        if($isdefault==-1) {
+            //目录版
+            $reurl = "/list".$typeid."";
+            //网页版$reurl = "/list".$typeid.".html";
         } else if ($ispart == 2) {
             //跳转网址
             $reurl = $typedir;

src/system/taglib/arclist.lib.php

@@ -369,7 +369,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
                 $row['imglink'] = "<a href='".$row['filename']."'>".$row['image']."</a>";
                 $row['fulltitle'] = $row['title'];
                 $row['title'] = cn_substr($row['title'], $titlelen);
-                if ($row['color'] != '') $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                if ($row['color'] != '') $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                 if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title']."";
                 //$row['title'] = "".$row['title']."";
                 $row['textlink'] = "<a href='".$row['filename']."'>".$row['title']."</a>";

src/system/taglib/arcpagelist.lib.php

@@ -52,7 +52,7 @@ function multipage($allItemTotal, $currPageNum, $pageSize, $tagid = '')
   //第一页显示
   $firstPage = ($currPageNum <= 1) ? $currPageNum."&lt;&lt;" : "<a href='javascript:multi(1,\"{$tagid}\")' title='第1页'>1&lt;&lt;</a>";
   //最后一页显示
-  $lastPage = ($currPageNum >= $pagesNum) ? "&gt;&gt;".$currPageNum : "<a href='javascript:multi(".$pagesNum.",\"{$tagid}\")' title='第".$pagesNum."页'>&gt;&gt;".$pagesNum."</a>";
+  $lastPage = ($currPageNum >= $pagesNum) ? "&gt;".$currPageNum : "<a href='javascript:multi(".$pagesNum.",\"{$tagid}\")' title='第".$pagesNum."页'>&gt;".$pagesNum."</a>";
   //上一页显示
   $prePage  = ($currPageNum <= 1) ? "上页" : "<a href='javascript:multi(".($currPageNum - 1).",\"{$tagid}\")'  accesskey='p'  title='上一页'>[上一页]</a>";
   //下一页显示

src/system/taglib/infolink.lib.php

@@ -10,25 +10,20 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC.'/enums.func.php');
-
-
 $cachefile = DEDESTATIC.'/enums/nativeplace.json';
 $data = json_decode(file_get_contents($cachefile));
 foreach ($data as $key => $value) {
     $GLOBALS['em_nativeplaces'][$key] = $value;
 }
-
 $cachefile = DEDESTATIC.'/enums/infotype.json';
 $data = json_decode(file_get_contents($cachefile));
 foreach ($data as $key => $value) {
     $GLOBALS['em_infotypes'][$key] = $value;
 }
-
 function lib_infolink(&$ctag, &$refObj)
 {
     global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_cmspath, $cfg_mainsite;
     global $em_nativeplaces, $em_infotypes;
-
     //属性处理
     //$attlist="row|12,titlelen|24";
     //FillAttsDefault($ctag->CAttribute->Items,$attlist);
@@ -69,7 +64,7 @@ function lib_infolink(&$ctag, &$refObj)
         $sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0);
         $toptype = (($nativeplace % 500 == 0) ? $nativeplace : ($nativeplace - ($nativeplace % 500)));
 
-        $fields['nativeplace'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$toptype}&infotype={$infotype}'> {$em_nativeplaces[$toptype]}</a> &gt;&gt; ";
+        $fields['nativeplace'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$toptype}&infotype={$infotype}'> {$em_nativeplaces[$toptype]}</a> &gt; ";
         foreach ($em_nativeplaces as $eid => $em) {
             if ($eid < $toptype + 1 || $eid > $toptype + 499) continue;
             if ($eid == $nativeplace) {
@@ -94,7 +89,7 @@ function lib_infolink(&$ctag, &$refObj)
     } else {
         $sontype = (($infotype % 500 != 0) ? $infotype : 0);
         $toptype = (($infotype % 500 == 0) ? $infotype : ($infotype - ($infotype % 500)));
-        $fields['infotype'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&infotype={$toptype}&nativeplace={$nativeplace}'>{$em_infotypes[$toptype]}</a> &gt;&gt; ";
+        $fields['infotype'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&infotype={$toptype}&nativeplace={$nativeplace}'>{$em_infotypes[$toptype]}</a> &gt; ";
         foreach ($em_infotypes as $eid => $em) {
             if ($eid < $toptype + 1 || $eid > $toptype + 499) continue;
             if ($eid == $infotype) {

src/system/taglib/likearticle.lib.php

@@ -141,7 +141,7 @@ function lib_likearticle(&$ctag, &$refObj)
                 $row['imglink'] = "<a href='".$row['filename']."'>".$row['image']."</a>";
                 $row['fulltitle'] = $row['title'];
                 $row['title'] = cn_substr($row['title'], $titlelen);
-                if ($row['color'] != '') $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                if ($row['color'] != '') $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                 if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title']."";
                 $row['textlink'] = "<a href='".$row['filename']."'>".$row['title']."</a>";
                 $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl'];

src/system/taglib/relation.lib.php

@@ -129,7 +129,7 @@ function lib_relation(&$ctag, &$refObj)
                 $row['imglink'] = "<a href='".$row['filename']."'>".$row['image']."</a>";
                 $row['fulltitle'] = $row['title'];
                 $row['title'] = cn_substr($row['title'], $titlelen);
-                if (isset($row['color']) && $row['color'] != '') $row['title'] = "<span style='".$row['color']."'>".$row['title']."</span>";
+                if (isset($row['color']) && $row['color'] != '') $row['title'] = "<span style='color:".$row['color']."'>".$row['title']."</span>";
                 if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title']."";
                 $row['textlink'] = "<a href='".$row['filename']."'>".$row['title']."</a>";
                 $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl'];

src/system/userlogin.class.php

@@ -54,7 +54,7 @@ function TestPurview($n)
 function CheckPurview($n)
 {
     if (!TestPurview($n)) {
-        ShowMsg("对不起，您没有权限执行此操作<br><br><a href='javascript:history.go(-1);'>点击此返回上一页&gt;&gt;</a>", 'javascript:;');
+        ShowMsg("对不起，您没有权限执行此操作<br><br><a href='javascript:history.go(-1);'>点击此返回上一页&gt;</a>", 'javascript:;');
         exit();
     }
 }
@@ -90,7 +90,7 @@ function CheckCatalog($cid, $msg)
         return TRUE;
     }
     if (!in_array($cid, $admin_catalogs)) {
-        ShowMsg(" $msg <br><br><a href='javascript:history.go(-1);'>点击此返回上一页&gt;&gt;</a>", 'javascript:;');
+        ShowMsg(" $msg <br><br><a href='javascript:history.go(-1);'>点击此返回上一页&gt;</a>", 'javascript:;');
         exit();
     }
     return TRUE;

src/user/content_sg_list.php

@@ -19,7 +19,6 @@ $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 0;
 $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0;
 if (!isset($keyword)) $keyword = '';
 if (!isset($arcrank)) $arcrank = '';
-
 $positionname = '';
 $menutype = 'content';
 $mid = $cfg_ml->M_ID;
@@ -30,17 +29,15 @@ if (!is_array($cInfos)) {
     exit();
 }
 $arcsta = $cInfos['arcsta'];
-
 //禁止访问无权限的模型
 if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) {
     ShowMsg('您无权限访问该部分', '-1');
     exit();
 }
-
 if ($cid == 0) {
-    $positionname = $cInfos['typename']." >> ";
+    $positionname = $cInfos['typename']." > ";
 } else {
-    $positionname = str_replace($cfg_list_symbol, " >> ", $tl->GetPositionName())." >> ";
+    $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > ";
 }
 $whereSql = " WHERE arc.channel = '$channelid' AND arc.mid='$mid' ";
 if ($keyword != '') {
@@ -58,12 +55,11 @@ if ($arcrank == '1') {
 } else if ($arcrank == '-2') {
     $whereSql .= " And arc.arcrank = -2";
 }
-
 $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.senddate,arc.channel,arc.click,arc.title,arc.mid,tp.typename,arc.arcrank
-        FROM `{$cInfos['addtable']}` arc
-        LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid
-        $whereSql
-        ORDER BY arc.aid desc ";
+    FROM `{$cInfos['addtable']}` arc
+    LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid
+    $whereSql
+    ORDER BY arc.aid desc ";
 $dlist = new DataListCP();
 $dlist->pageSize = 20;
 $dlist->SetParameter("dopost", "listArchives");
@@ -72,4 +68,4 @@ $dlist->SetParameter("cid", $cid);
 $dlist->SetParameter("channelid", $channelid);
 $dlist->SetTemplate(DEDEMEMBER."/templets/content_sg_list.htm");
 $dlist->SetSource($query);
-$dlist->Display();
+$dlist->Display();