From 15e3e5cc9a6072cbed769b81ad9a0df255d70b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
<93301500+xushubieli@users.noreply.github.com>
Date: Fri, 16 Dec 2022 11:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6=E6=A0=87?=
=?UTF-8?q?=E8=AF=86=EF=BC=8Crobots=E5=8D=8F=E8=AE=AE=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/ad_edit.php | 2 +-
src/admin/inc/inc_action_info.php | 4 +--
src/admin/index_body.php | 2 +-
src/admin/login.php | 4 +--
src/admin/makehtml_all.php | 4 +--
src/admin/makehtml_archives_action.php | 2 +-
src/admin/sys_repair.php | 2 +-
src/admin/task_do.php | 38 ++++++-----------------
src/admin/templets/content_att.htm | 2 +-
src/admin/templets/freelist_add.htm | 2 +-
src/admin/templets/freelist_edit.htm | 2 +-
src/admin/templets/index.htm | 2 +-
src/admin/templets/tag_test.htm | 2 +-
src/apps/ad_js.php | 2 +-
src/apps/list.php | 2 +-
src/apps/mytag_js.php | 2 +-
src/apps/tags.php | 2 ++
src/apps/view.php | 3 +-
src/index.php | 5 ++-
src/install/config.cache.inc.php | 2 +-
src/install/sql-dfdata.txt | 12 +++----
src/robots.txt | 2 ++
src/static/web/css/style.css | 31 +++++++++---------
src/system/archive/freelist.class.php | 4 +--
src/system/archive/listview.class.php | 19 +++++-------
src/system/archive/searchview.class.php | 2 +-
src/system/archive/sglistview.class.php | 4 +--
src/system/archive/specview.class.php | 2 +-
src/system/archive/taglist.class.php | 2 +-
src/system/helpers/channelunit.helper.php | 18 +++++------
src/system/taglib/arclist.lib.php | 2 +-
src/system/taglib/sonchannel.lib.php | 1 -
src/system/typelink/typelink.class.php | 24 +++++---------
src/theme/dedebiz/index.htm | 19 ++++++------
src/theme/dedebiz/index_article.htm | 4 +--
src/theme/dedebiz/index_default.htm | 4 +--
src/theme/dedebiz/index_default_sg.htm | 4 +--
src/theme/dedebiz/index_image.htm | 6 ++--
src/theme/dedebiz/index_infos.htm | 4 +--
src/theme/dedebiz/index_soft.htm | 4 +--
src/theme/dedebiz/list_image.htm | 2 +-
src/theme/dedebiz/search.htm | 2 +-
src/theme/dedebiz/singlepage.htm | 2 +-
src/theme/templet-filelist.inc | 2 +-
src/user/index_do.php | 2 +-
45 files changed, 121 insertions(+), 143 deletions(-)
diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php
index b1d67817..850dc4ca 100644
--- a/src/admin/ad_edit.php
+++ b/src/admin/ad_edit.php
@@ -25,7 +25,7 @@ if ($dopost == 'delete') {
$showhtml .= "预览:";
$row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' ");
$showtag = '{'."dede:myad name='{$row['tagname']}'/".'}';
- $info = "说明:如果嵌入的是Dede广告标签,那会解析成标签中的文档到页面,广告修改后需要重新生成
如果不希望重新生成所有页面,则直接调用js代码即可";
+ $info = "广告标签会解析成标签中文档到页面,广告修改后需要重新生成
如果不希望重新生成所有页面,则直接js调用代码即可";
$wintitle = "广告管理-获取广告标签";
$wecome_info = "广告管理::获取js";
$win = new OxWindow();
diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php
index b5f79bff..b6d7953e 100644
--- a/src/admin/inc/inc_action_info.php
+++ b/src/admin/inc/inc_action_info.php
@@ -250,8 +250,8 @@ $actionSearch[7] = array(
'linkurl' => 'makehtml_all.php'
),
1 => array(
- 'title' => '更新主页',
- 'description' => '生成网站主页面',
+ 'title' => '更新首页',
+ 'description' => '生成网站首页面',
'purview' => 'sys_MakeHtml',
'linkurl' => 'makehtml_homepage.php'
),
diff --git a/src/admin/index_body.php b/src/admin/index_body.php
index 71afd46e..6a3fad4a 100644
--- a/src/admin/index_body.php
+++ b/src/admin/index_body.php
@@ -11,7 +11,7 @@
require(dirname(__FILE__).'/config.php');
require(DEDEINC.'/image.func.php');
require(DEDEINC.'/dedetag.class.php');
-//默认主页
+//默认首页
if (empty($dopost)) {
require(DEDEINC.'/inc/inc_fun_funAdmin.php');
$verLockFile = DEDEDATA.'/admin/ver.txt';
diff --git a/src/admin/login.php b/src/admin/login.php
index 728d1f7f..6c9b4226 100644
--- a/src/admin/login.php
+++ b/src/admin/login.php
@@ -54,10 +54,10 @@ if ($dopost == 'login') {
if ($res == 1) {
$cuserLogin->keepUser();
if (!empty($gotopage)) {
- ShowMsg('成功登录,正在跳转管理管理主页', $gotopage);
+ ShowMsg('成功登录,正在跳转管理首页', $gotopage);
exit();
} else {
- ShowMsg('成功登录,正在跳转管理管理主页', 'index.php');
+ ShowMsg('成功登录,正在跳转管理首页', 'index.php');
exit();
}
} else if ($res == -1) {
diff --git a/src/admin/makehtml_all.php b/src/admin/makehtml_all.php
index 539cfef9..26aad2bb 100644
--- a/src/admin/makehtml_all.php
+++ b/src/admin/makehtml_all.php
@@ -15,7 +15,7 @@ if ($action == '') {
require_once(DEDEADMIN."/templets/makehtml_all.htm");
exit();
} else if ($action == 'make') {
- //step = 1 更新主页、step = 2 更新文档、step = 3 更新栏目
+ //step = 1 更新首页、step = 2 更新文档、step = 3 更新栏目
if (empty($step)) $step = 1;
//更新文档前优化数据
/*-------------------
@@ -36,7 +36,7 @@ else if ($step == 2) {
include_once(DEDEADMIN."/makehtml_archives_action.php");
exit();
}
- //更新主页
+ //更新首页
/*-------------------------
function _3_MakeHomePage()
-------------------*/
diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php
index b83cce5f..a546a166 100644
--- a/src/admin/makehtml_archives_action.php
+++ b/src/admin/makehtml_archives_action.php
@@ -95,7 +95,7 @@ if ($tjnum < $totalnum) {
if ($uptype == '') {
ShowMsg("更新文档$totalnum,用时{$ttime}分钟,完成所有文档更新", "javascript:;");
} else {
- ShowMsg("完成所有文档更新,开始更新主页", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
+ ShowMsg("完成所有文档更新,开始更新首页", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
}
}
}
diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php
index bb0bb4db..d78ff387 100644
--- a/src/admin/sys_repair.php
+++ b/src/admin/sys_repair.php
@@ -15,7 +15,7 @@ if (empty($dopost)) {
$win = new OxWindow();
$win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
$win->mainTitle = "系统修复工具";
- $wecome_info = "系统主页 > 系统错误修复";
+ $wecome_info = "系统首页 > 系统错误修复";
$win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
$msg = "
diff --git a/src/admin/task_do.php b/src/admin/task_do.php
index 831c20e0..f00c2acd 100644
--- a/src/admin/task_do.php
+++ b/src/admin/task_do.php
@@ -10,14 +10,7 @@
*/
require(dirname(__FILE__).'/config.php');
$dopost = (!isset($dopost) ? '' : $dopost);
-/******************************
-返回到下一任务的URL
-特殊变量,除非知道作用,否则不能在任务传递中占用
-f 临时,仅为了方便网址结构
-dopost 当前任务(指向下一个任务),由用户自行处理或在 nextdo 中自动获得
-del 上一次任务删除的变量
-morejob,设定后,表示当前任务需请求多次,会把 dopost 和 nextdo 处理后转为 doposttmp, nextdotmp,然后由用户自行处理
- ******************************/
+//返回到下一任务链接,特殊变量,除非知道作用,否则不能在任务传递中占用:f临时,仅为了方便网址结构,dopost当前任务指向下一个任务,由用户自行处理或在nextdo中自动获得,del上一次任务删除的变量,morejob设定后,表示当前任务需请求多次,会把 dopost和nextdo处理后转为doposttmp和nextdotmp,然后由用户自行处理
function GetNextUrl($notallowArr = array('dopost', 'f', 'del'))
{
$reurl = "task_do.php?f=0";
@@ -47,10 +40,7 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del'))
}
return $reurl;
}
-/******************************
//更新上一篇和下一篇
-function makeprenext() { }
- ******************************/
if ($dopost == 'makeprenext') {
require_once(DEDEINC.'/archive/archives.class.php');
$aid = intval($aid);
@@ -75,10 +65,7 @@ if ($dopost == 'makeprenext') {
exit();
}
}
-/******************************
-//更新主页的任务
-function makeindex() { }
- ******************************/
+//更新首页的任务
if ($dopost == 'makeindex') {
require_once(DEDEINC.'/archive/partview.class.php');
$envs = $_sys_globals = array();
@@ -88,37 +75,32 @@ if ($dopost == 'makeindex') {
$templet = str_replace("{style}", $cfg_df_style, $row['templet']);
$homeFile = dirname(__FILE__).'/'.$row['position'];
$homeFile = str_replace("//", "/", str_replace("\\", "/", $homeFile));
- $fp = fopen($homeFile, 'w') or die("无法更新网站主页到:$homeFile 位置");
+ $fp = fopen($homeFile, 'w') or die("无法更新网站首页到:$homeFile 位置");
fclose($fp);
$tpl = $cfg_basedir.$cfg_templets_dir.'/'.$templet;
if (!file_exists($tpl)) {
$tpl = $cfg_basedir.$cfg_templets_dir.'/default/index.htm';
- if (!file_exists($tpl)) exit("无法找到主页模板:$tpl ");
+ if (!file_exists($tpl)) exit("无法找到首页模板:$tpl ");
}
$GLOBALS['_arclistEnv'] = 'index';
$pv->SetTemplet($tpl);
$pv->SaveToHtml($homeFile);
$pv->Close();
if (empty($nextdo)) {
- ShowMsg("完成主页更新任务完成所有更新任务", "close::tgtable");
+ ShowMsg("完成首页更新任务完成所有更新任务", "close::tgtable");
exit();
} else {
$jumpurl = GetNextUrl();
- ShowMsg("完成主页更新 现在跳转其它更新任务", $jumpurl, 0, 500);
+ ShowMsg("完成首页更新 现在跳转其它更新任务", $jumpurl, 0, 500);
exit();
}
}
-/******************************
//更新所有关连的栏目
-function makeparenttype() { }
-******************************/
else if ($dopost == 'makeparenttype') {
require_once(DEDEDATA."/cache/inc_catalog_base.inc");
require_once(DEDEINC.'/archive/listview.class.php');
$notallowArr = array('dopost', 'f', 'del', 'curpage', 'morejob');
-
$jumpurl = GetNextUrl($notallowArr);
-
if (empty($typeid)) {
ShowMsg("完成栏目更新任务完成所有更新任务", "close::tgtable");
exit();
@@ -126,7 +108,6 @@ else if ($dopost == 'makeparenttype') {
$topids = explode(',', GetTopids($typeid));
if (empty($curpage)) $curpage = 0;
$tid = $topids[$curpage];
-
if (isset($cfg_Cs[$tid]) && $cfg_Cs[$tid][1] > 0) {
require_once(DEDEINC."/archive/listview.class.php");
$lv = new ListView($tid);
@@ -140,21 +121,20 @@ else if ($dopost == 'makeparenttype') {
$lv->MakeHtml();
$lv->Close();
}
-
if ($curpage >= count($topids) - 1) {
if (!empty($doposttmp)) {
$jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl);
$jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}";
- ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务,继续执行后续任务", $jumpurl, 0, 500);
+ ShowMsg("完成栏目:{$tid}更新
完成栏目更新任务,继续执行后续任务", $jumpurl, 0, 500);
exit();
} else {
- ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务,完成所有更新任务", "close::tgtable");
+ ShowMsg("完成栏目:{$tid}更新
完成栏目更新任务,完成所有更新任务", "close::tgtable");
exit();
}
} else {
$curpage++;
$jumpurl .= "&curpage={$curpage}&dopost=makeparenttype";
- ShowMsg("完成栏目:{$tid} 更新,继续更新其它栏目", $jumpurl, 0, 500);
+ ShowMsg("完成栏目:{$tid}更新,继续更新其它栏目", $jumpurl, 0, 500);
exit();
}
}
diff --git a/src/admin/templets/content_att.htm b/src/admin/templets/content_att.htm
index 2c81429c..2f44e910 100644
--- a/src/admin/templets/content_att.htm
+++ b/src/admin/templets/content_att.htm
@@ -17,7 +17,7 @@
- 自定义属性使用说明:以往的版本中,网站主页、封面栏目的设计,都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist标记加上att='自定义属性的id'的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项:这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许用户增加其它类型,但调用时允许使用组合条件att='c,p'表示推荐图片
+ 自定义属性使用说明:以往的版本中,网站首页、封面栏目的设计,都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist标记加上att='自定义属性的id'的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项:这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许用户增加其它类型,但调用时允许使用组合条件att='c,p'表示推荐图片
|
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm
index 99b2a8e8..d79b1602 100644
--- a/src/admin/templets/freelist_add.htm
+++ b/src/admin/templets/freelist_add.htm
@@ -85,7 +85,7 @@
目录默认页名称: |
-
+
|
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm
index 4b23604a..8417dd12 100644
--- a/src/admin/templets/freelist_edit.htm
+++ b/src/admin/templets/freelist_edit.htm
@@ -43,7 +43,7 @@
目录默认页名称: |
-
+
|
diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index f389948a..09fcdf7b 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -39,7 +39,7 @@
':'';?>
-
+
- 全局标记应用在网站主页、单独页面、封面栏目使用的单独模板标记,在列表或文档模板中,一般只允许调用channel、arclist标记(hotart、coolart、imglist等都是这个标记延伸出来的标记),但是环境变量限定为文档或列表所在的栏目,如果您要测试的标记是在列表或文档中使用,请指定环境变量(栏目id)各标记的具体含义和用途
+ 全局标记应用在网站首页、单独页面、封面栏目使用的单独模板标记,在列表或文档模板中,一般只允许调用channel、arclist标记(hotart、coolart、imglist等都是这个标记延伸出来的标记),但是环境变量限定为文档或列表所在的栏目,如果您要测试的标记是在列表或文档中使用,请指定环境变量(栏目id)各标记的具体含义和用途
|
diff --git a/src/apps/ad_js.php b/src/apps/ad_js.php
index d6dcbc47..75e83809 100755
--- a/src/apps/ad_js.php
+++ b/src/apps/ad_js.php
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/src/install/config.cache.inc.php b/src/install/config.cache.inc.php
index c484f17e..35b7888e 100755
--- a/src/install/config.cache.inc.php
+++ b/src/install/config.cache.inc.php
@@ -4,7 +4,7 @@ $cfg_cmspath = '~basepath~';
$cfg_cookie_encode = '~cookieEncode~';
$cfg_indexurl = '~indexurl~';
$cfg_backup_dir = 'backupdata';
-$cfg_indexname = '网站主页';
+$cfg_indexname = '网站首页';
$cfg_indexseo = '';
$cfg_webname = '~webname~';
$cfg_adminemail = '~adminmail~';
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index c4d275c2..f833e98d 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -3938,10 +3938,10 @@ INSERT INTO `#@__sys_enum` VALUES ('139','cms制作','503','vocation','503','0')
INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','string',''),
('2','cfg_cmspath','安装目录','2','string',''),
('3','cfg_cookie_encode','Cookies加密码','2','string',''),
-('4','cfg_indexurl','主页链接','1','string','/'),
+('4','cfg_indexurl','首页链接','1','string','/'),
('5','cfg_backup_dir','数据备份目录,存data文件夹里','2','string','backupdata'),
-('6','cfg_indexname','主页链接名','1','string','网站主页'),
-('7','cfg_indexseo','主页SEO标题','1','string',''),
+('6','cfg_indexname','首页链接名','1','string','网站首页'),
+('7','cfg_indexseo','首页SEO标题','1','string',''),
('8','cfg_webname','网站名称','1','string','某某公司'),
('9','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'),
('10','cfg_html_editor','富文本,默认CKEditor可自行更换其它富文本','2','string','ckeditor'),
@@ -3987,7 +3987,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
('50','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'),
('51','cfg_mb_max','会员附件总大小限制(MB)','4','number','500'),
('52','cfg_replacestr','禁用关键词替换成*,用“|”分开,但不要在结尾加“|”','5','bstring','草你妈|你妈的|你妹的'),
-('53','cfg_makeindex','发布文档后马上更新网站主页','6','bool','N'),
+('53','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'),
('54','cfg_keyword_like','使用关键词关连文档','6','bool','Y'),
('55','cfg_index_max','首页调用函数最大索引文档数,不适用于经常单栏目采集过多文档网站,不启用本项此值设置为0即可','6','number','10000'),
('56','cfg_index_cache','arclist标签调用缓存(0不启用,大于0值为多少秒)','6','number','86400'),
@@ -4036,8 +4036,8 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
('100','cfg_fck_xhtml','是否使用富文本','2','bool','N'),
('101','cfg_allsearch_limit','网站全局搜索时间限制(秒)','2','string','1'),
('102','cfg_delete','是否开启文档回收站','2','bool','Y'),
-('103','cfg_keywords','主页关键词','1','string',''),
-('104','cfg_description','主页描述','1','bstring',''),
+('103','cfg_keywords','首页关键词','1','string',''),
+('104','cfg_description','首页描述','1','bstring',''),
('105','cfg_beian','网站备案号','1','string',''),
('106','cfg_need_typeid2','是否启用副栏目','6','bool','Y'),
('107','cfg_mb_pwdtype','前台密码验证类型32—32位md5,可选l16—前16位、r16—后16位、m16—中间16位','4','string','32'),
diff --git a/src/robots.txt b/src/robots.txt
index 9b7ce108..2c073958 100644
--- a/src/robots.txt
+++ b/src/robots.txt
@@ -1,5 +1,7 @@
User-agent: *
Disallow: /data
+Disallow: /static/ckeditor
+Disallow: /static/enums
Disallow: /system
Disallow: /theme
Disallow: /user
\ No newline at end of file
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index cd9ad895..b8c2e458 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -55,14 +55,23 @@ form.search {
font-size:16px
}
.spec .card {
+ background:#f5f5f5;
text-align:center
}
.spec .card img {
- max-width:200px;
- margin:0 auto
+ height:160px;
+ border-radius:.25rem .25rem 0 0
}
.spec .card-body {
- padding:.25rem
+ padding:.65rem
+}
+.spec .card-title {
+ margin-bottom:0;
+ font-size:14px;
+ font-weight:400;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap
}
.spec .border-bottom-dashed {
border-bottom:dashed 1px #929292
@@ -95,10 +104,6 @@ form.search {
background:#fff;
border-bottom:0
}
-.ddcard-normal > .card-header .caption,.ddcard > .card-header .caption {
- font-size:18px;
- font-weight:600
-}
.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a {
font-size:14px;
color:#1eb867
@@ -119,6 +124,8 @@ form.search {
.ddcard > .card-header .caption span {
display:inline-block;
padding:6px 12px;
+ font-size:18px;
+ font-weight:600;
color:#fff;
background:#1eb867;
border-radius:.2rem .2rem 0 0
@@ -133,13 +140,6 @@ form.search {
.ddcard-normal ul {
padding:10px
}
-.title::before {
- margin-right:10px;
- padding:2px;
- content:" ";
- background:#1eb867;
- border-radius:.2rem
-}
.breadcrumb {
margin-bottom:0
}
@@ -329,4 +329,7 @@ form.search {
.m-pb-2 {
padding-bottom:2rem
}
+.spec .card img {
+ height:130px
+}
}
\ No newline at end of file
diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php
index 605a4d7f..eac1b580 100755
--- a/src/system/archive/freelist.class.php
+++ b/src/system/archive/freelist.class.php
@@ -649,7 +649,7 @@ class FreeList
$purl = $this->GetCurUrl();
$tnamerule = $this->GetMakeFileRule();
$tnamerule = preg_replace("#^(.*)\/#", '', $tnamerule);
- //获得上一页和主页的链接
+ //获得上一页和首页的链接
if ($this->PageNo != 1) {
$prepage .= "上一页\r\n";
$indexpage = "首页\r\n";
@@ -844,7 +844,7 @@ class FreeList
);
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access public
* @return void
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index 40ca9fdc..5405873a 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -633,12 +633,10 @@ class ListView
{
$nfields[$v] = $k;
}
- if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields))
- {
+ if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields)) {
foreach($this->ChannelUnit->ChannelFields as $k=>$arr)
{
- if (isset($nfields[$k]))
- {
+ if (isset($nfields[$k])) {
if (!empty($arr['rename'])) {
$addField .= ','.$addtable.'.'.$k.' as '.$arr['rename'];
}
@@ -798,7 +796,7 @@ class ListView
*/
function GetPageListST($list_len, $listitem = "index,end,pre,next,pageno")
{
- global $cfg_rewrite,$cfg_cmspath;
+ global $cfg_cmspath, $cfg_rewrite;
$prepage = $nextpage = '';
$prepagenum = $this->PageNo - 1;
$nextpagenum = $this->PageNo + 1;
@@ -815,7 +813,7 @@ class ListView
$purl = $this->GetCurUrl();
$maininfo = "{$totalpage}页".$this->TotalResult."条\r\n";
$tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']);
- //获得上一页和主页的链接
+ //获得上一页和首页的链接
if ($this->PageNo != 1) {
$prepage .= "上一页\r\n";
$indexpage = "首页\r\n";
@@ -886,7 +884,7 @@ class ListView
*/
function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno")
{
- global $cfg_rewrite,$cfg_cmspath;
+ global $cfg_cmspath, $cfg_rewrite;
$prepage = $nextpage = '';
$prepagenum = $this->PageNo - 1;
$nextpagenum = $this->PageNo + 1;
@@ -959,18 +957,17 @@ class ListView
if (preg_match('/option/i', $listitem)) $plist .= $optionlist;
if (preg_match('/info/i', $listitem)) $plist .= $maininfo;
//伪静态分页
- if ($cfg_rewrite == 'Y')
- {
+ 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;
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access public
* @return string
diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php
index 13d9f4aa..aebc5007 100755
--- a/src/system/archive/searchview.class.php
+++ b/src/system/archive/searchview.class.php
@@ -720,7 +720,7 @@ class SearchView
return $plist;
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access public
* @return string
diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php
index ceb77e9a..6438bd2f 100755
--- a/src/system/archive/sglistview.class.php
+++ b/src/system/archive/sglistview.class.php
@@ -695,7 +695,7 @@ class SgListView
$maininfo = "{$totalpage}页".$this->TotalResult."条";
$tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']);
$tnamerule = preg_replace("/^(.*)\//", '', $tnamerule);
- //获得上一页和主页的链接
+ //获得上一页和首页的链接
if ($this->PageNo != 1) {
$prepage .= "上一页\r\n";
$indexpage = "首页\r\n";
@@ -846,7 +846,7 @@ class SgListView
return $plist;
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access private
* @return string
diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php
index 8040aaf0..2e9ece83 100755
--- a/src/system/archive/specview.class.php
+++ b/src/system/archive/specview.class.php
@@ -555,7 +555,7 @@ class SpecView
return $plist;
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access private
* @return string
diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php
index 230ff968..d937428a 100755
--- a/src/system/archive/taglist.class.php
+++ b/src/system/archive/taglist.class.php
@@ -648,7 +648,7 @@ class TagList
return GetFileUrl($aid, $typeid, $timetag, $title, $ismake, $rank, $namerule, $artdir, $money, $filename);
}
/**
- * 获得当前的页面文件的url
+ * 获得当前的页面文件链接
*
* @access private
* @return string
diff --git a/src/system/helpers/channelunit.helper.php b/src/system/helpers/channelunit.helper.php
index 6547a1b6..e4244421 100755
--- a/src/system/helpers/channelunit.helper.php
+++ b/src/system/helpers/channelunit.helper.php
@@ -139,7 +139,7 @@ if (!function_exists('GetFileNewName')) {
if (!function_exists('GetFileName')) {
function GetFileName($aid, $typeid, $timetag, $title, $ismake = 0, $rank = 0, $namerule = '', $typedir = '', $money = 0, $filename = '')
{
- global $cfg_rewrite, $cfg_cmspath, $cfg_arcdir, $cfg_special, $cfg_arc_dirname;
+ global $cfg_cmspath, $cfg_arcdir, $cfg_special, $cfg_arc_dirname, $cfg_rewrite;
//没指定栏目时用固定专题规则
if (empty($namerule)) {
$namerule = $cfg_special.'/{aid}.html';
@@ -149,7 +149,7 @@ if (!function_exists('GetFileName')) {
if ($rank != 0 || $ismake == -1 || $typeid == 0 || $money > 0) {
if ($cfg_rewrite == 'Y') {
//目录版return "/article/".$aid."";
- //网页版
+ //网页版默认,文档形式:域名/1.html、域名/2.html,分页形式:域名/1-1.html、域名/1-2.html
return "/".$aid.".html";
} else {
return $GLOBALS['cfg_phpurl']."/view.php?aid=$aid";
@@ -184,7 +184,7 @@ if (!function_exists('GetFileName')) {
}
}
/**
- * 获得指定栏目的URL链接
+ * 获得指定栏目链接
* 对于使用封面文件和单独页面的情况,强制使用默认页名称
*
* @param int $typeid 栏目id
@@ -201,15 +201,15 @@ if (!function_exists('GetFileName')) {
if (!function_exists('GetTypeUrl')) {
function GetTypeUrl($typeid, $typedir, $isdefault, $defaultname, $ispart, $namerule2, $moresite = 0, $siteurl = '', $sitepath = '')
{
- global $cfg_typedir_df,$cfg_rewrite;
+ global $cfg_typedir_df, $cfg_rewrite;
$typedir = MfTypedir($typedir);
$sitepath = MfTypedir($sitepath);
//伪静态栏目
if ($isdefault==-1) {
//动态
if ($cfg_rewrite == 'Y') {
- //目录版return "/article/".$aid."";
- //网页版
+ //网页版return $GLOBALS['cfg_cmspath']."/list-".$typeid.".html";
+ //目录版默认,栏目形式:域名/list-1、域名/list-2,分页形式:域名/list-1-1、域名/list-1-2
return $GLOBALS['cfg_cmspath']."/list-".$typeid."";
} else {
$reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid;
@@ -486,7 +486,7 @@ function MakeOneTag(&$dtp, &$refObj, $parfield = 'Y')
}
}
/**
- * 获取某栏目的url
+ * 获取某栏目链接
*
* @param array $typeinfos 栏目信息
* @return string
@@ -532,9 +532,9 @@ function SetSysEnv($typeid = 0, $typename = '', $aid = 0, $title = '', $curfile
}
}
/**
- * 获得图书的URL
+ * 获得图书链接
*
- * @param string $bid 书籍ID
+ * @param string $bid 书籍id
* @param string $title 标题
* @param string $gdir
* @return string
diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php
index a740c8a8..f1ef6b01 100755
--- a/src/system/taglib/arclist.lib.php
+++ b/src/system/taglib/arclist.lib.php
@@ -172,7 +172,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
if (!empty($typeid) && $typeid != 'top') {
//指定了多个栏目时,不再获取子类的id
if (preg_match('#,#', $typeid)) {
- //指定了getall属性或主页模板例外
+ //指定了getall属性或首页模板例外
if ($getall == 1 || empty($refObj->Fields['typeid'])) {
$typeids = explode(',', $typeid);
foreach ($typeids as $ttid) {
diff --git a/src/system/taglib/sonchannel.lib.php b/src/system/taglib/sonchannel.lib.php
index 5fc9360a..59213ed3 100755
--- a/src/system/taglib/sonchannel.lib.php
+++ b/src/system/taglib/sonchannel.lib.php
@@ -20,7 +20,6 @@ function lib_sonchannel(&$ctag, &$refObj)
return $ctag->GetAtt('nosonmsg');
}
$sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0,$row";
- //And id<>'$typeid'
$dtp2 = new DedeTagParse();
$dtp2->SetNameSpace("field", "[", "]");
$dtp2->LoadSource($innertext);
diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php
index 702b78fb..dff48f09 100755
--- a/src/system/typelink/typelink.class.php
+++ b/src/system/typelink/typelink.class.php
@@ -56,8 +56,7 @@ class TypeLink
}
}
}
- //对于使用默认构造函数的情况
- //GetPositionLink()不可用
+ //对于使用默认构造函数的情况GetPositionLink()不可用
function TypeLink($typeid)
{
$this->__construct($typeid);
@@ -88,8 +87,7 @@ class TypeLink
return $this->TypeInfos['typedir'];
}
}
- //获得某栏目的链接列表 如:栏目一>>栏目二>> 这样的形式
- //islink 表示返回的列表是否带连接
+ //获得某栏目的链接列表:栏目一>栏目二>形式,islink表示返回的列表是否带连接
function GetPositionLink($islink = true)
{
$indexpage = "".$this->indexName."";
@@ -150,7 +148,7 @@ class TypeLink
$typelink = "".$typeinfos['typename']."";
return $typelink;
}
- //获得某分类连接的URL
+ //获得某分类连接链接
function GetOneTypeUrl($typeinfos)
{
return GetTypeUrl(
@@ -165,10 +163,7 @@ class TypeLink
$typeinfos['sitepath']
);
}
- //获得类别列表
- //hid是指默认选中栏目,0表示“请选择栏目”或“不限栏目”
- //oper是用户允许管理的栏目,0表示所有栏目
- //channeltype是指栏目的文档类型,0表示不限栏目
+ //获得类别列表:hid是指默认选中栏目,0表示请选择栏目或不限栏目,oper是用户允许管理的栏目,0表示所有栏目,channeltype是指栏目的文档类型,0表示不限栏目
function GetOptionArray($hid = 0, $oper = 0, $channeltype = 0, $usersg = 0)
{
return $this->GetOptionList($hid, $oper, $channeltype, $usersg);
@@ -254,8 +249,7 @@ class TypeLink
}
}
/**
- * 获得与该类相关的栏目,本函数应用于模板标记{dede:channel}{/dede:channel}中
- * $typetype 的值为:sun下级分类 self同级分类 top顶级分类
+ * 获得与该类相关的栏目,本函数应用于模板标记{dede:channel}{/dede:channel}中$typetype的值为:sun下级分类,self同级分类,top顶级分类
*
* @access public
* @param int $typeid 栏目id
@@ -304,7 +298,6 @@ class TypeLink
} else if ($typetype == "self") {
$sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row";
}
- //AND ID<>'$typeid'
$dtp2 = new DedeTagParse();
$dtp2->SetNameSpace("field", "[", "]");
$dtp2->LoadSource($innertext);
@@ -346,20 +339,19 @@ class TypeLink
$likeType .= " \r\n";
}
$GLOBALS['autoindex']++;
- } //Loop Col
+ }//Loop Col
if ($col > 1) {
$i += $col - 1;
}
if ($col > 1) {
$likeType .= "
\r\n";
}
- } //Loop for $i
-
+ }//Loop for $i
if ($col > 1) {
$likeType .= "
\r\n";
}
$this->dsql->FreeResult();
return $likeType;
- } //GetChannel
+ }//GetChannel
}//End Class
?>
\ No newline at end of file
diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm
index 03554097..e536e86b 100644
--- a/src/theme/dedebiz/index.htm
+++ b/src/theme/dedebiz/index.htm
@@ -49,8 +49,8 @@