diff --git a/src/admin/album_add.php b/src/admin/album_add.php index ab008fdd..3ceeb699 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -19,14 +19,14 @@ if ($dopost != 'save') { ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得栏目模型id if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; } else { if ($channelid == 0) $channelid = 2; } - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index 52ee0010..3c6388fa 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -28,7 +28,7 @@ if ($dopost != 'save') { $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index 3aeec1ba..749660bc 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -19,7 +19,7 @@ if ($dopost != 'save') { ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得栏目模型id if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; @@ -29,7 +29,7 @@ if ($dopost != 'save') { exit(); } } - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index 3705ab3a..d9fbe494 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -289,7 +289,7 @@ else if ($dopost == 'moveArchives') { 文档id:
- 移动到目标栏目必须和选定文档频道类型一致,否则程序会自动勿略不符合文档 + 移动到目标栏目必须和选定文档栏目类型一致,否则程序会自动勿略不符合文档 diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index 6dd29a8b..51ed9133 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -28,7 +28,7 @@ if ($dopost != 'save') { $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index e0123e4c..3a0d492d 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -19,7 +19,7 @@ if ($dopost != 'save') { ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得栏目模型id if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; @@ -29,7 +29,7 @@ if ($dopost != 'save') { exit(); } } - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne(" SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; include DedeInclude("templets/archives_sg_add.htm"); diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index 0a938371..2c0be33a 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -22,7 +22,7 @@ if ($dopost != 'save') { $arcQuery = "SELECT ch.*,arc.* FROM `#@__arctiny` arc LEFT JOIN `#@__channeltype` ch on ch.id=arc.channel WHERE arc.id='$aid' "; $cInfos = $dsql->GetOne($arcQuery); if (!is_array($cInfos)) { - ShowMsg("读频道模型信息出错", "-1"); + ShowMsg("读栏目模型信息出错", "-1"); exit(); } $addtable = $cInfos['addtable']; diff --git a/src/admin/article_add.php b/src/admin/article_add.php index d5f17861..029c73fa 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -30,7 +30,7 @@ if ($dopost != 'save') { $redatas = CoOnePage($geturl); extract((array)$redatas); } - //获得频道模型id + //获得栏目模型id if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; @@ -39,7 +39,7 @@ if ($dopost != 'save') { $channelid = 1; } } - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); //获取文档最大id+1以确定当前权重 $maxWright = $dsql->GetOne("SELECT id+1 AS cc FROM `#@__archives` ORDER BY id DESC LIMIT 1"); diff --git a/src/admin/article_coonepage_rule.php b/src/admin/article_coonepage_rule.php deleted file mode 100644 index 5dda021f..00000000 --- a/src/admin/article_coonepage_rule.php +++ /dev/null @@ -1,116 +0,0 @@ -GetOne("SELECT * FROM `#@__co_onepage` WHERE url LIKE '$url' "); - if (is_array($row)) { - echo "系统已经存在这个网址的条目"; - } else { - $query = " INSERT INTO `#@__co_onepage` (`url`,`title`,`issource`,`lang`,`rule`) VALUES ('$url','$title','$issource','$lang','$rule'); "; - $dsql->ExecuteNonequery($query); - echo $dsql->GetError(); - } -} -/*------ -function _DelNote(){ } --------*/ -else if ($action == 'del') { - if (!preg_match("#,#", $ids)) { - $query = "DELETE FROM `#@__co_onepage` WHERE id='$ids' "; - } else { - $query = "DELETE FROM `#@__co_onepage` WHERE id IN($ids) "; - } - $dsql->ExecuteNonequery($query); -} -/*------ -function _EditNote(){ } --------*/ -else if ($action == 'editsave') { - $query = "UPDATE `#@__co_onepage` SET `url`='$url',`title`='$title',`issource`='$issource',`lang`='$lang',`rule`='$rule' WHERE id='$id' "; - $dsql->ExecuteNonequery($query); - echo $dsql->GetError(); -} -/*------ -function _EditNoteLoad(){ } --------*/ -else if ($action == 'editload') { - $row = $dsql->GetOne("SELECT * FROM `#@__co_onepage` WHERE id='$id' "); - AjaxHead(); -?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
网站名称:
原内容编码: - - -
用作文档来源: - - -
网站网址:
- 使用不带http及任何附加目录的网址
- 如:news.dedebiz.com -
采集规则:仅针对文档内容,格式:前面HTML{@body}后面HMTL
- - -
-
-SetTemplate(DEDEADMIN."/templets/article_coonepage_rule.htm"); -$dlist->SetSource($sql); -$dlist->Display(); -?> \ No newline at end of file diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 39fc7068..c32fdb4a 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -31,7 +31,7 @@ if ($dopost != 'save') { $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; diff --git a/src/admin/article_test_same.php b/src/admin/article_test_same.php index 4bec7dcc..815165d3 100644 --- a/src/admin/article_test_same.php +++ b/src/admin/article_test_same.php @@ -17,7 +17,7 @@ if ($dopost == 'analyse') { if (is_array($arr)) { $maintable = $arr['maintable']; } else { - showmsg('频道id不正确,无法处理', 'javascript:;'); + showmsg('栏目id不正确,无法处理', 'javascript:;'); exit(); } $dsql->SetQuery("SELECT COUNT(title) AS dd,title FROM `$maintable` WHERE channel='$channelid' GROUP BY title ORDER BY dd DESC LIMIT 0, $pagesize"); diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index 9231a015..17876907 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -31,7 +31,7 @@ if ($dopost == "save") { if ($ispart != 0) $cross = 0; $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typename='$typename',cnoverview='$cnoverview',enname='$enname',enoverview='$enoverview',bigpic='$bigpic',litimg='$litimg',typedir='$typedir',isdefault='$isdefault',defaultname='$defaultname',issend='$issend',ishidden='$ishidden',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ispart='$ispart',corank='$corank',description='$description',keywords='$keywords',seotitle='$seotitle',moresite='$moresite',`cross`='$cross',`content`='$content',`crossid`='$crossid',`smalltypes`='$smalltypes'$uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("保存当前栏目修改时失败,请检查您的输入资料是否存在问题", "-1"); + ShowMsg("保存栏目失败,请您检查栏目字段是否存在问题", "-1"); exit(); } //如果选择子栏目可投稿,更新顶级栏目为可投稿 @@ -48,12 +48,12 @@ if ($dopost == "save") { if (!empty($upnext)) { $upquery = "UPDATE `#@__arctype` SETissend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks"; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("修改当前栏目成功,但修改下级栏目属性时失败", "-1"); + ShowMsg("修改栏目成功,但修改下级栏目属性时失败", "-1"); exit(); } } UpDateCatCache(); - ShowMsg("成功修改一个分类", "catalog_main.php"); + ShowMsg("成功修改一个栏目", "catalog_main.php"); exit(); } //End Save Action else if ($dopost == "savetime") { @@ -74,11 +74,11 @@ else if ($dopost == "savetime") { } $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typedir='$typedir',typename='$typename',isdefault='$isdefault',defaultname='$defaultname',ispart='$ispart',corank='$corank' $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("保存当前栏目修改时失败,请检查您的输入资料是否存在问题", "-1"); + ShowMsg("保存栏目失败,请您检查栏目字段是否存在输入问题", "-1"); exit(); } UpDateCatCache(); - ShowMsg("成功修改一个分类", "catalog_main.php"); + ShowMsg("成功修改一个栏目", "catalog_main.php"); exit(); } //读取栏目信息 @@ -94,7 +94,7 @@ if ($topid > 0) { } } $myrow['content'] = empty($myrow['content']) ? " " : $myrow['content']; -//读取频道模型信息 +//读取栏目模型信息 $channelid = $myrow['channeltype']; $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id"); $dsql->Execute(); diff --git a/src/admin/config.php b/src/admin/config.php index 8f905302..514ad91c 100644 --- a/src/admin/config.php +++ b/src/admin/config.php @@ -84,7 +84,7 @@ if ($cfg_dede_log == 'Y') { if (file_exists(DEDEDATA."/downmix.data.php")) { rename(DEDEDATA."/downmix.data.php",DEDEDATA."/downmix.data.inc"); } -//管理缓存管理员频道缓存 +//管理缓存管理员栏目缓存 $cache1 = DEDEDATA.'/cache/inc_catalog_base.inc'; if (!file_exists($cache1)) UpDateCatCache(); $cacheFile = DEDEDATA.'/cache/admincat_'.$cuserLogin->userID.'.inc'; diff --git a/src/admin/diy_edit.php b/src/admin/diy_edit.php index 7e0b23c7..f0420568 100644 --- a/src/admin/diy_edit.php +++ b/src/admin/diy_edit.php @@ -56,7 +56,7 @@ else if ($dopost == "delete") { } //删除表 $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$row['table']}`;"); - //删除频道配置信息 + //删除栏目配置信息 $dsql->ExecuteNoneQuery("DELETE FROM `#@__diyforms` WHERE diyid='$diyid'"); ShowMsg("成功删除一个自定义表单", "diy_main.php"); exit(); diff --git a/src/admin/freelist_add.php b/src/admin/freelist_add.php index 4f95fe91..10e95c29 100644 --- a/src/admin/freelist_add.php +++ b/src/admin/freelist_add.php @@ -21,7 +21,7 @@ if (empty($dopost)) { $ntype = ''; $edtime = time(); if (empty($channel)) { - showmsg('频道类型不能为空', '-1'); + showmsg('栏目类型不能为空', '-1'); exit(); } if (is_array($types)) { diff --git a/src/admin/inc/grouplist.txt b/src/admin/inc/grouplist.txt index fa4a5b45..da2f320c 100644 --- a/src/admin/inc/grouplist.txt +++ b/src/admin/inc/grouplist.txt @@ -2,12 +2,12 @@ >admin_AllowAll>可以进行任意操作 ->>频道管理 +>>栏目管理 ->c_List>列出频道 ->c_New>新建频道 ->c_Edit>修改频道 ->c_Del>删除频道 +>c_List>列出栏目 +>c_New>新建栏目 +>c_Edit>修改栏目 +>c_Del>删除栏目 >c_Stepselect>联动类别管理 >>栏目管理 @@ -73,7 +73,7 @@ >sys_ArcTj>文档信息统计 >sys_Source>新闻来源 >sys_Writer>作者管理 ->sys_SoftConfig>软件频道参数 +>sys_SoftConfig>软件栏目参数 >sys_Keyword>关键词管理 >sys_MakeHtml>更新网页 >sys_Feedback>评论管理 diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 278be1a1..dd5b5e5e 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -84,7 +84,7 @@ $actionSearch[2] = array( ) ); $actionSearch[3] = array( - 'title' => '频道模型', + 'title' => '栏目模型', 'description' => '所有上传的附件管理', 'soniterm' => array( 0 => array( @@ -358,7 +358,7 @@ $actionSearch[9] = array( 'linkurl' => 'content_att.php' ), 7 => array( - 'title' => '软件频道设置', + 'title' => '软件栏目设置', 'description' => '可以对软件下载时的连接显示方式,下载方式,镜像服务器等等进行配置', 'purview' => 'sys_SoftConfig', 'linkurl' => 'soft_config.php' diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index acf4231e..a3cd70cb 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -219,11 +219,11 @@ function GetRemoteImage($url, $uid = 0) return ($ok ? $revalues : ''); } /** - * 检测频道id + * 检测栏目id * * @access public * @param int $typeid 栏目id - * @param int $channelid 频道id + * @param int $channelid 栏目id * @return bool */ function CheckChannel($typeid, $channelid) diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index df090a54..960a770e 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -14,7 +14,7 @@ * @access public * @param string $selid 选择id * @param string $userCatalog 用户类目 - * @param string $channeltype 频道类型 + * @param string $channeltype 栏目类型 * @return string */ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) @@ -28,7 +28,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) //当前选中的栏目 if ($selid > 0) { $row = $dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$selid'"); - if ($row['ispart'] == 1) $OptionArrayList .= ""; + if ($row['ispart'] == 1) $OptionArrayList .= ""; else $OptionArrayList .= ""; } //是否限定用户管理的栏目 diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index e58fa096..bc7f1701 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/../config.php"); require_once(dirname(__FILE__)."/inc_menu_module.php"); -//载入可发布频道 +//载入可发布栏目 $addset = ''; //检测可用的内容模型 if ($cfg_admin_channel = 'array' && count($admin_catalogs) > 0) { @@ -42,7 +42,7 @@ if ($cuserLogin->getUserType() >= 10) { ")." - + @@ -63,7 +63,7 @@ if ($cuserLogin->getUserType() >= 10) { - + ".(DEDEBIZ_SAFE_MODE? "" : "")." diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 33ab00c4..7677d38a 100644 --- a/src/admin/mychannel_add.php +++ b/src/admin/mychannel_add.php @@ -1,6 +1,6 @@ '频道id'必须为数字", "-1"); + ShowMsg("'栏目id'必须为数字", "-1"); exit(); } if (preg_match("#[^a-z0-9]#i", $nid) || $nid == "") { - ShowMsg("'频道名字标识'必须为英文字母或与数字混合字符串", "-1"); + ShowMsg("'栏目名字标识'必须为英文字母或与数字混合字符串", "-1"); exit(); } if ($addtable == "") { @@ -33,7 +33,7 @@ if ($action == 'add') { //检查id是否重复 $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' OR nid LIKE '$nid' OR addtable LIKE '$addtable'"); if (is_array($row)) { - ShowMsg("可能‘频道id’、‘频道名称标识’、‘附加表名称’在数据库已存在,不能重复使用", "-1"); + ShowMsg("可能‘栏目id’、‘栏目名称标识’、‘附加表名称’在数据库已存在,不能重复使用", "-1"); exit(); } $mysql_version = $dsql->GetVersion(); @@ -84,7 +84,7 @@ if ($action == 'add') { } $listfields = $fieldset = ''; if ($issystem == -1) { - $fieldset = " + $fieldset = " @@ -101,7 +101,7 @@ if ($action == 'add') { } $inQuery = "INSERT INTO `#@__channeltype` (id,nid,typename,addtable,addcon,mancon,editcon,useraddcon,usermancon,usereditcon,fieldset,listfields,issystem,issend,arcsta,usertype,sendrank,needdes,needpic,titlename,onlyone,dfcid) VALUES ('$id','$nid','$typename','$addtable','$addcon','$mancon','$editcon','$useraddcon','$usermancon','$usereditcon','$fieldset','$listfields','$issystem','$issend','$arcsta','$usertype','$sendrank','$needdes','$needpic','$titlename','$onlyone','$dfcid');"; $dsql->ExecuteNoneQuery($inQuery); - ShowMsg("成功增加一个频道模型", "mychannel_edit.php?id=".$id); + ShowMsg("成功增加一个栏目模型", "mychannel_edit.php?id=".$id); exit(); } $row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id DESC LIMIT 0,1 "); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index a6ac83f7..4377767e 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -51,26 +51,26 @@ else if ($dopost == "copystart") { $idname = 'w'.($newid * -1); } $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); - $wintitle = "频道管理-模型复制"; - $wecome_info = "频道管理::模型复制"; + $wintitle = "栏目管理-模型复制"; + $wecome_info = "栏目管理::模型复制"; $win = new OxWindow(); $win->Init("mychannel_edit.php", "js/blank.js", "post"); - $win->AddTitle("被复制频道:[".$row['typename']."]"); + $win->AddTitle("被复制栏目:[".$row['typename']."]"); $win->AddHidden("cid", $id); $win->AddHidden("id", $id); $win->AddHidden("dopost", 'copysave'); $msg = " - + - + - + @@ -305,11 +305,11 @@ function __GetTemplate() else if ($dopost == "gettemplets") { require_once(DEDEINC."/libraries/oxwindow.class.php"); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); - $wintitle = "频道管理-查看模板"; - $wecome_info = "频道管理::查看模板"; + $wintitle = "栏目管理-查看模板"; + $wecome_info = "栏目管理::查看模板"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); - $win->AddTitle("频道[".$row['typename']."]默认模板文件说明:"); + $win->AddTitle("栏目[".$row['typename']."]默认模板文件说明:"); $defaulttemplate = $cfg_templets_dir.'/'.$cfg_df_style; $msg = " 文档模板:{$defaulttemplate}/article_{$row['nid']}.htm @@ -339,14 +339,14 @@ else if ($dopost == "delete") { if ($job == "") //确认提示 { require_once(DEDEINC."/libraries/oxwindow.class.php"); - $wintitle = "频道管理-删除模型"; - $wecome_info = "频道管理::删除模型"; + $wintitle = "栏目管理-删除模型"; + $wecome_info = "栏目管理::删除模型"; $win = new OxWindow(); $win->Init("mychannel_edit.php", "js/blank.js", "POST"); $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("id", $id); - $win->AddTitle("您确定要删除 (".$row['typename'].") 这个频道"); + $win->AddTitle("您确定要删除 (".$row['typename'].") 这个栏目"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); @@ -355,14 +355,14 @@ else if ($dopost == "delete") { require_once(DEDEINC."/typelink/typeunit.class.admin.php"); $myrow = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$id'", MYSQL_ASSOC); if (!is_array($myrow)) { - ShowMsg('您所指定的频道信息不存在!', '-1'); + ShowMsg('您所指定的栏目信息不存在!', '-1'); exit(); } - //检查频道的表是否独占数据表 + //检查栏目的表是否独占数据表 $addtable = str_replace($cfg_dbprefix, '', str_replace('#@__', $cfg_dbprefix, $myrow['addtable'])); $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ; "); $isExclusive2 = ($row['dd'] > 1 ? 0 : 1); - //获取与频道关连的所有栏目id + //获取与栏目关连的所有栏目id $tids = ''; $dsql->Execute('qm', "SELECT id FROM `#@__arctype` WHERE channeltype='$id'"); while ($row = $dsql->GetArray('qm')) { @@ -384,7 +384,7 @@ else if ($dopost == "delete") { $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['addtable']}` WHERE typeid IN ($tids); "); } } - //删除频道配置信息 + //删除栏目配置信息 $dsql->ExecuteNoneQuery("DELETE FROM `#@__channeltype` WHERE id='$id' "); //更新栏目缓存 UpDateCatCache($dsql); diff --git a/src/admin/mychannel_field_add.php b/src/admin/mychannel_field_add.php index a7b01adc..0165da88 100644 --- a/src/admin/mychannel_field_add.php +++ b/src/admin/mychannel_field_add.php @@ -116,7 +116,7 @@ $f = ''; foreach ($fields as $k => $v) { $f .= ($f == '' ? $k : ' '.$k); } -//获取频道模型 +//获取栏目模型 $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id"); $dsql->Execute(); while ($row = $dsql->GetObject()) { diff --git a/src/admin/mychannel_field_edit.php b/src/admin/mychannel_field_edit.php index 2ba15a7c..9a9e963c 100644 --- a/src/admin/mychannel_field_edit.php +++ b/src/admin/mychannel_field_edit.php @@ -31,7 +31,7 @@ foreach ($ds as $d) { $dds = explode(',', trim($d)); $fieldtypes[$dds[0]] = $dds[1]; } -//获取频道模型 +//获取栏目模型 $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id"); $dsql->Execute(); while ($crow = $dsql->GetObject()) { diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 21561ebb..ab7fe5db 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -19,7 +19,7 @@ if ($dopost != 'save') { ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得栏目模型id if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; @@ -27,7 +27,7 @@ if ($dopost != 'save') { if ($channelid == 0) $channelid = 1; } $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig` "); - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index ff01d021..e3347df0 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -30,7 +30,7 @@ if ($dopost != 'save') { $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index 4b60fa3a..163683d9 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -19,7 +19,7 @@ if ($dopost != 'save') { ClearMyAddon(); $channelid = -1; $cid = isset($cid) && is_numeric($cid) ? $cid : 0; - //获得频道模型信息 + //获得栏目模型信息 $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); include DedeInclude("templets/spec_add.htm"); exit(); diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index 6f9f622c..02d6fe4a 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -29,7 +29,7 @@ if ($dopost != 'save') { $query = "SELECT * FROM `#@__channeltype` WHERE id='-1'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addRow = $dsql->GetOne("SELECT * FROM `#@__addonspec` WHERE aid='$aid'"); diff --git a/src/admin/sys_admin_user.php b/src/admin/sys_admin_user.php index 52d5ce65..a02d7c43 100644 --- a/src/admin/sys_admin_user.php +++ b/src/admin/sys_admin_user.php @@ -32,7 +32,7 @@ function GetUserType($trank) } function GetChannel($c) { - if ($c == "" || $c == 0) return "所有频道"; + if ($c == "" || $c == 0) return "所有栏目"; else return $c; } ?> \ No newline at end of file diff --git a/src/admin/sys_payment.php b/src/admin/sys_payment.php index 0080bfb1..737a1a0d 100644 --- a/src/admin/sys_payment.php +++ b/src/admin/sys_payment.php @@ -13,31 +13,6 @@ require_once(DEDEINC.'/datalistcp.class.php'); CheckPurview('sys_Data'); $dopost = (empty($dopost)) ? '' : $dopost; $pid = (empty($pid)) ? 0 : intval($pid); -//一个简单的[数组<->表单]解析类 -/*数组结构应该为: - array( - [name]=>array( - [title]=>'当前表单项的名称', - [type]=>'text|select', - [description]=>'表单内容的介绍说明' - [iterm]=>'1:使用标准双接口,使用担保交易接口', //如果含有":",则前面为value值,后面为显示内容 - [value]=>'使用担保交易接口', - ), - - ) - 使用方法: - 将上述的格式传入到数组中去,然后进行解析: - 1.声明类,并创建数组 - $af = new Array2form($config); - 2.设置一个表单模板(可选,如果不设置载入默认) - $af->SetDefaultTpl($templets); $templets:为一个底册模板文件 - 表单模板格式为: -

~title~:~form~~description~

- 3.获取特定项目表单 - $af->GetIterm('alipay', 1) //1.表示获取一个默认模板下的完整表单,2.仅获取一个表单项 - 4.获取所有表单内容 - $af->GetAll() //获取表单所有解析后的内容 -*/ class Array2form { var $FormArray = array(); @@ -82,13 +57,13 @@ class Array2form case 'text': //生成文本编辑框 $valstr = (empty($formarry['value'])) ? "value=''" : "value='{$formarry['value']}'"; - $reval_form = ""; + $reval_form = ""; break; case 'select': //生成选择框 $reval_title = $formarry['title']; $items = explode(',', $formarry['iterm']); - $reval_form = ""; if (is_array($items)) { foreach ($items as $v) { $v = trim($v); diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 9b569dd9..3b54fb0a 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -41,32 +41,11 @@
新频道id:新栏目id:
新频道名称:新栏目名称:
新频道标识:新栏目标识:
-
常规内容单页采集
-
- - - - - - -
- - - - - - -
采集单页: - - -
-
-
diff --git a/src/admin/templets/article_coonepage_rule.htm b/src/admin/templets/article_coonepage_rule.htm deleted file mode 100644 index e632813a..00000000 --- a/src/admin/templets/article_coonepage_rule.htm +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - 单页采集规则管理 - - - - - - - - - - - - - - - - - - - - - - - - - {dede:datalist empty=''} - - - - - - - - - {/dede:datalist} - - - - - - - -
- - - - - -
单页采集规则管理增加新网址
-
id选择网址编码网站名称操作
暂无内容
- 编辑 - 删除 -
- 全选 - 取消 - 删除 -
{dede:pagelist listsize='6'/}
- -
- 正在加载 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
网站名称:
原内容编码: - - -
用作文档来源: - - -
网站网址:
使用不带http及任何附加目录的网址
- 如:news.dedebiz.com
采集规则:仅针对文档内容,格式:前面HTML{@body}后面HMTL
- - -
-
-
- - \ No newline at end of file diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index 7fb339d0..ee4e1d6b 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -18,7 +18,7 @@
用于自动更新您系统没有填写摘要的文档的摘要信息或更新没分页的文档的自动分页标识(文档使用了自动分页后会降低网页生成速度,并且在没人工干扰的情况下可能导致分页内容的网页错误,请小心使用此功能)
- 频道id:(可在“频道模型管理”处获得) + 栏目id:(可在“栏目模型管理”处获得) 摘要大小:(最大250字节) diff --git a/src/admin/templets/article_test_same.htm b/src/admin/templets/article_test_same.htm index 35d11dc4..1f40eed1 100644 --- a/src/admin/templets/article_test_same.htm +++ b/src/admin/templets/article_test_same.htm @@ -20,7 +20,7 @@ - + diff --git a/src/admin/templets/content_tj.htm b/src/admin/templets/content_tj.htm index 9fe1143e..87149be5 100644 --- a/src/admin/templets/content_tj.htm +++ b/src/admin/templets/content_tj.htm @@ -34,11 +34,11 @@ - + - - + + {dede:datalist empty=''} - + diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index b83515b8..56a3c336 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -56,10 +56,10 @@ - + diff --git a/src/apps/count.php b/src/apps/count.php index f4a72e54..1a91a260 100755 --- a/src/apps/count.php +++ b/src/apps/count.php @@ -21,7 +21,7 @@ $format = isset($format) ? $format : ""; $maintable = '#@__archives'; $idtype = 'id'; if ($aid == 0) exit(); -//获得频道模型id +//获得栏目模型id if ($cid < 0) { $row = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$cid' AND issystem='-1';"); $maintable = empty($row['addtable']) ? '' : $row['addtable']; diff --git a/src/apps/digg_ajax.php b/src/apps/digg_ajax.php index a859dcf3..9290c95b 100755 --- a/src/apps/digg_ajax.php +++ b/src/apps/digg_ajax.php @@ -19,7 +19,7 @@ if ($id < 1) { } $idtype = 'id'; $maintable = '#@__archives'; -//获得频道模型id +//获得栏目模型id if ($cid < 0) { $row = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$cid' AND issystem='-1';"); $maintable = empty($row['addtable']) ? '' : $row['addtable']; diff --git a/src/apps/list.php b/src/apps/list.php index 1dfc3d55..c2b2c8d6 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -1,6 +1,6 @@ GetOne("SELECT tp.id,ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.channeltype='$channelid' And tp.reid=0 order by sortrank asc"); if (!is_array($tinfos)) die(" No catalogs in the channel! "); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index f25a7ffe..9771939f 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -1,5 +1,5 @@ INSERT INTO `#@__admintype` VALUES ('1','信息发布员','1','t_AccList a_AccNew a_AccList a_MyList a_MyEdit a_MyDel sys_MdPwd sys_Feedback sys_MyUpload plus_留言簿模块 '), -('5','频道管理员','1','t_AccList t_AccNew t_AccEdit t_AccDel a_AccNew a_AccList a_AccEdit a_AccDel a_AccCheck a_MyList a_MyEdit a_MyDel a_MyCheck spec_New spec_List spec_Edit sys_MdPwd sys_Log sys_ArcTj sys_Source sys_Writer sys_Keyword sys_MakeHtml sys_Feedback sys_Upload sys_MyUpload member_List member_Edit plus_站内新闻发布 plus_友情链接模块 plus_留言簿模块 plus_投票模块 plus_广告管理 '), +('5','栏目管理员','1','t_AccList t_AccNew t_AccEdit t_AccDel a_AccNew a_AccList a_AccEdit a_AccDel a_AccCheck a_MyList a_MyEdit a_MyDel a_MyCheck spec_New spec_List spec_Edit sys_MdPwd sys_Log sys_ArcTj sys_Source sys_Writer sys_Keyword sys_MakeHtml sys_Feedback sys_Upload sys_MyUpload member_List member_Edit plus_站内新闻发布 plus_友情链接模块 plus_留言簿模块 plus_投票模块 plus_广告管理 '), ('10','超级管理员','1','admin_AllowAll '); INSERT INTO `#@__arcatt` VALUES ('1','h','头条'), @@ -506,7 +506,7 @@ INSERT INTO `#@__channeltype` VALUES ('1','article','文档模型','#@__archives ('2','image','图片模型','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'), ('3','soft','软件模型','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'), ('-1','spec','专题模型','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','','','','1','1','0','-1','','10','0','1','1','标题','0','0'), -('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0'); +('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0'); INSERT INTO `#@__co_onepage` VALUES ('5','www.dedebiz.com','DedeBIZ','1','gb2312','
{@body}
'), ('4','www.techweb.com.cn','Techweb','1','gb2312','
{@body}
\t\n'), @@ -4051,7 +4051,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('115','cfg_addon_domain','附件目录的二级域名','7','string',''), ('116','cfg_df_dutyadmin','默认责任编辑名称','7','string','网站管理员'), ('117','cfg_mb_allowncarc','是否允许用户空间显示未审核文档','4','bool','Y'), -('118','cfg_mb_spaceallarc','会员空间中所有文档的频道ID(不限为0)','4','number','0'), +('118','cfg_mb_spaceallarc','会员空间中所有文档的栏目ID(不限为0)','4','number','0'), ('119','cfg_face_adds','上传头像增加积分','5','number','10'), ('120','cfg_moreinfo_adds','填写详细资料增加积分','5','number','20'), ('121','cfg_money_scores','多少积分可以兑换一个金币','5','number','50'), diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index db4c6347..314db685 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -60,7 +60,7 @@ class FreeList /* if (empty($channelid)) { - showmsg('必须指定频道','-1');exit(); + showmsg('必须指定栏目','-1');exit(); } else { $channelid = intval($channelid); $channelinfo = $this->dsql->getone("select maintable from #@__channeltype WHERE id='$channelid'"); @@ -144,7 +144,7 @@ class FreeList $flags = explode(',', $att); for ($i = 0; isset($flags[$i]); $i++) $addSql .= " AND FIND_IN_SET('{$flags[$i]}',flag)>0 "; } - //文档的频道模型 + //文档的栏目模型 if ($channelid > 0 && !preg_match("#spec#i", $listtype)) { $addSql .= " AND channel = '$channelid' "; } @@ -425,7 +425,7 @@ class FreeList $flags = explode(',', $att); for ($i = 0; isset($flags[$i]); $i++) $orwhere .= " AND FIND_IN_SET('{$flags[$i]}',flag)>0 "; } - //文档的频道模型 + //文档的栏目模型 if ($channelid > 0 && !preg_match("#spec#i", $listtype)) { $orwhere .= " AND arc.channel = '$channelid' "; } diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 9a54d6bd..c995fd86 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -57,7 +57,7 @@ class SearchView * @param int $typeid 栏目id * @param string $keyword 关键词 * @param string $orderby 排序 - * @param string $achanneltype 频道类型 + * @param string $achanneltype 栏目类型 * @param string $searchtype 搜索类型 * @param string $starttime 开始时间 * @param string $upagesize 页数 @@ -448,7 +448,7 @@ class SearchView $this->dtp->Assign($tagid, ""); } } else if ($tagname == "channel") { - //下级频道列表 + //下级栏目列表 if ($this->TypeID > 0) { $typeid = $this->TypeID; $reid = $this->TypeLink->TypeInfos['reid']; diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index d91fe032..0f8c6c19 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -611,7 +611,7 @@ class TagList } } /** - * 获得一个指定的频道的链接 + * 获得一个指定的栏目的链接 * * @access private * @param int $typeid 栏目id diff --git a/src/system/channelunit.class.php b/src/system/channelunit.class.php index 627cdedd..43b4568c 100755 --- a/src/system/channelunit.class.php +++ b/src/system/channelunit.class.php @@ -1,7 +1,7 @@ ChannelInfos = $this->dsql->GetOne($sql); if (!is_array($this->ChannelInfos)) { - echo '读取频道信息失败,无法进行后续操作'; + echo '读取栏目信息失败,无法进行后续操作'; exit(); } $dtp = new DedeTagParse(); diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php index dfb72023..c3cc9696 100755 --- a/src/system/customfields.func.php +++ b/src/system/customfields.func.php @@ -99,7 +99,7 @@ function GetFormItem($ctag, $admintype = 'admin') $innertext = GetEditor($fieldname, $dfvalue, 360, 'Member', 'string'); } } else if ($fieldType == "multitext") { - $innertext = ""; + $innertext = ""; } else if ($fieldType == "datetime") { $nowtime = GetDateTimeMk(time()); $innertext = ""; @@ -107,30 +107,30 @@ function GetFormItem($ctag, $admintype = 'admin') if ($admintype == 'diy') { $innertext = ""; } else { - $innertext = " "; + $innertext = " "; } } else if ($fieldType == 'media') { if ($admintype == 'diy') { $innertext = " 不支持的类型"; } else { - $innertext = " "; + $innertext = " "; } } else if ($fieldType == 'addon') { if ($admintype == 'diy') { $innertext = ""; } else { - $innertext = " "; + $innertext = " "; } } else if ($fieldType == 'int' || $fieldType == 'float') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0'); - $innertext = "(填写数值)"; + $innertext = "(填写数值)"; } else if ($fieldType == 'relation') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : ''); $channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel'); - $innertext = "
+ $innertext = "
"; if ($ctag->GetAtt('automake') == 1) { - $innertext .= ""; + $innertext .= ""; } $innertext .= << @@ -145,7 +145,7 @@ if (typeof SelectArcList === "undefined") { EOT; } else { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : ''); - $innertext = " + $innertext = " "; } $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); @@ -370,7 +370,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') if (in_array($v, $fvalues)) { $myformItem .= "
"; } else { - $myformItem .= "
"; + $myformItem .= "
"; } } } @@ -402,10 +402,10 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') } $innertext = $myformItem; } else if ($ftype == "multitext") { - $innertext = ""; + $innertext = ""; } else if ($ftype == "datetime") { $nowtime = GetDateTimeMk($fvalue); - $innertext = ""; + $innertext = ""; } else if ($ftype == "img") { $ndtp = new DedeTagParse(); $ndtp->LoadSource($fvalue); @@ -416,21 +416,21 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $ntag = $ndtp->GetTag("img"); $fvalue = trim($ntag->GetInnerText()); } - $innertext = " "; + $innertext = " "; } else if ($ftype == "imgfile") { - $innertext = " "; + $innertext = " "; } else if ($ftype == "media") { - $innertext = " "; + $innertext = " "; } else if ($ftype == "addon") { - $innertext = " "; + $innertext = " "; } else if ($ftype == "int" || $ftype == "float") { - $innertext = "(填写数值)"; + $innertext = "(填写数值)"; } else if ($ftype == "relation") { $channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel'); - $innertext = "
+ $innertext = "
"; if ($ctag->GetAtt('automake') == 1) { - $innertext .= ""; + $innertext .= ""; } $innertext .= << @@ -444,7 +444,7 @@ if (typeof SelectArcList === "undefined") { EOT; } else { - $innertext = ""; + $innertext = ""; } $formitem = str_replace('~name~', $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace('~form~', $innertext, $formitem); diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php index 65082f7f..bd2b052f 100755 --- a/src/system/memberlogin.class.php +++ b/src/system/memberlogin.class.php @@ -465,7 +465,7 @@ class MemberLogin $sta .= " 拥有金币:{$this->M_Money} 个,积分:{$this->M_Scores}分"; return $sta; } - //获取能够发布内容的频道 + //获取能够发布内容的栏目 public static function GetEnabledChannels() { global $dsql; $result = array(); diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index 5ccf18b3..e3279610 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -95,7 +95,7 @@ function lib_arclist(&$ctag, &$refObj) * @param string $innertext 底层模板 * @param int $arcid 文档id * @param string $idlist ID列表 - * @param int $channelid 频道id + * @param int $channelid 栏目id * @param string $limit 限制 * @param string $att 属性 * @param string $order 排序类型 @@ -212,7 +212,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele else $orwheres[] = ' arc.typeid IN ('.GetSonIds($typeid).','.$CrossID.')'; } } - //频道id + //栏目id if (preg_match('#spec#i', $listtype)) $channelid == -1; if (!empty($channelid)) $orwheres[] = " And arc.channel = '$channelid' "; if (!empty($noflag)) { @@ -472,7 +472,7 @@ function GetArclistCache($md5hash) } } /** - * 获取自动频道id + * 获取自动栏目id * * @access public * @param string $sortid diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php index b07bdc7a..8515d654 100755 --- a/src/system/taglib/arclistsg.lib.php +++ b/src/system/taglib/arclistsg.lib.php @@ -104,7 +104,7 @@ function lib_arclistsg(&$ctag, &$refObj) else $orwheres[] = ' typeid IN ('.GetSonIds($typeid).','.$CrossID.')'; } } - //频道id + //栏目id if (!empty($channelid)) $orwheres[] = " AND arc.channel = '$channelid' "; //由于这个条件会导致缓存功能失去意义,因此取消 //if ($arcid!=0) $orwheres[] = " arc.id<>'$arcid' "; diff --git a/src/system/taglib/channelartlist.lib.php b/src/system/taglib/channelartlist.lib.php index a3d2fa1e..e61ad862 100755 --- a/src/system/taglib/channelartlist.lib.php +++ b/src/system/taglib/channelartlist.lib.php @@ -1,7 +1,7 @@ >dede>> {dede:adminname/} ->>dede>> +>>dede>> \ No newline at end of file diff --git a/src/system/taglib/help/arclist.txt b/src/system/taglib/help/arclist.txt index 43b3984d..b1ea0fd4 100755 --- a/src/system/taglib/help/arclist.txt +++ b/src/system/taglib/help/arclist.txt @@ -1,33 +1,34 @@ 文档列表调用标记 >>dede>> -{dede:arclist flag='h' typeid='' row='' col='' titlelen='' infolen='' imgwidth='' imgheight='' listtype='' orderby='' keyword='' limit='0,1'} -[field:title/] +{dede:arclist typeid='' notypeid='' row='' col='' titlelen='' flag='h' infolen='' imgwidth='' imgheight='' listtype='' orderby='' keyword='' limit='0,1'} + [field:title/] {/dede:arclist} >>dede>> col='' 分多少列显示(默认为单列) row='10' 返回文档列表总数 -typeid='' 栏目id,在列表模板和文档模板中一般不需要指定,在封面模板中允许用英文逗号分开表示多个栏目; -titlelen='30' 标题长度 等同于titlelength -infolen='160' 表示内容简介长度 等同于infolength +typeid='' 调用栏目id,用英文逗号分开表示多个栏目 +notypeid='' 不调用栏目id,用英文逗号分开表示多个栏目 +titlelen='30' 标题长度等同于titlelength +infolen='160' 表示内容简介长度等同于infolength imgwidth='120' 缩略图宽度 imgheight='90' 缩略图高度 listtype='all' 栏目类型(顶级栏目) orderby='sortrank' 文档排序方式 - § orderby='hot' 或 orderby='click' 表示按点击数排列 - § orderby='sortrank' 或 orderby='pubdate' 按出版时间排列 - § orderby='near' - § orderby=='lastpost' 按最后评论时间 - § orderby=='scores' 按得分排序 - § orderby='id' 按文档id排序 - § orderby='rand' 随机获得指定条件的文档列表 -keyword='' 含有指定关键词的文档列表,多个关键词用","分 + orderby='hot' 或orderby='click'表示按点击数排列 + orderby='sortrank' 或orderby='pubdate'按出版时间排列 + orderby='near' + orderby=='lastpost' 按最后评论时间 + orderby=='scores' 按得分排序 + orderby='id' 按文档id排序 + orderby='rand' 随机获得指定条件的文档列表 +keyword='' 含有指定关键词的文档列表,多个关键词用英文逗号分开 innertext='' 单条记录样式 aid='' 指定文档id idlist='' 提取特定文档(文档id) -isweight='n' 开启按照权重排序,默认为n/N,如果设为y/Y,则内容会按照weight字段排序,数值越小越靠前 -channelid 频道id +isweight='n' 开启按照权重排序,默认为n/N,如果设为y/Y,则内容会按照weight字段排序,数值越小越靠前 +channelid 栏目id limit='' 起始,结束 表示限定的记录范围(如:limit='1,2') flag='h' 自定义属性值:头条[h]推荐[c]图片[p]幻灯[f]滚动[s]跳转[j]图文[a]加粗[b] noflag='' 同flag,但这里是表示不包含这些属性 -orderway='desc' 值为 desc 或 asc,指定排序方式是降序还是顺向排序,默认为降序 -subday='天数' 表示在多少天以内的文档 +orderway='desc' 值为desc或asc,指定排序方式是降序还是顺向排序,默认为降序 +subday='天数' 表示在多少天以内的文档 \ No newline at end of file diff --git a/src/system/taglib/help/arclistsg.txt b/src/system/taglib/help/arclistsg.txt index 68e20c44..db5818e6 100755 --- a/src/system/taglib/help/arclistsg.txt +++ b/src/system/taglib/help/arclistsg.txt @@ -1,19 +1,19 @@ 单表模型的文档列表调用标记 >>dede>> -{dede:arclistsg flag='h' typeid='' row='' col='' titlelen='' orderway='' keyword='' limit='0,1'} -[field:title/] +{dede:arclistsg typeid='' row='' flag='h' col='' titlelen='' orderway='' keyword='' limit='0,1'} + [field:title/] {/dede:arclistsg} >>dede>> -col='' 分多少列显示(默认为单列),5.3版中本属性无效,要多列显示的可用div+css实现 +col='' 分多少列显示(默认为单列) row='10' 返回文档列表总数 -typeid='' 栏目id,在列表模板和文档模板中一般不需要指定,在封面模板中允许用英文逗号分开表示多个栏目; -titlelen='30' 标题长度 等同于titlelength -orderwey='desc'或'asc' 排序方向 -keyword= 含有指定关键词的文档列表,多个关键词用","分 +typeid='' 调用栏目id,用英文逗号分开表示多个栏目 +titlelen='30' 标题长度等同于titlelength +orderwey='desc'或'asc'排序方向 +keyword= 含有指定关键词的文档列表,多个关键词用英文逗号分开 innertext="[field:title/]" 单条记录样式(innertext是放在标签之间的代码) arcid='' 指定文档id idlist='' 提取特定文档(文档id) -channelid='' 频道id -limit='' 起始,结束 表示限定的记录范围(如:limit='1,2') +channelid='' 栏目id +limit='' 起始结束表示限定的记录范围(如:limit='1,2') flag='h' 自定义属性值:头条[h]推荐[c]图片[p]幻灯[f]滚动[s]跳转[j]图文[a]加粗[b] -subday='天数' 表示在多少天以内的文档 +subday='天数' 表示在多少天以内的文档 \ No newline at end of file diff --git a/src/system/taglib/help/ask.txt b/src/system/taglib/help/ask.txt index 1a226f75..5f710189 100755 --- a/src/system/taglib/help/ask.txt +++ b/src/system/taglib/help/ask.txt @@ -7,7 +7,7 @@ {/dede:ask} >>dede>> -row='6' 调用条数 -qtype='new' 排序类型 commend 推荐、ok 表示已解决问题、high 高分问题 、new 最新问题 -tid='0' 栏目id,默认是全部 -titlelen='24' 标题长度 \ No newline at end of file +row='6' 调用条数 +qtype='new' 排序类型commend推荐、ok表示已解决问题、high高分问题 、new最新问题 +tid='0' 栏目id,默认是全部 +titlelen='24' 标题长度 \ No newline at end of file diff --git a/src/system/taglib/help/bookcontentlist.txt b/src/system/taglib/help/bookcontentlist.txt index c150606c..a6ef5720 100755 --- a/src/system/taglib/help/bookcontentlist.txt +++ b/src/system/taglib/help/bookcontentlist.txt @@ -2,18 +2,17 @@ >>dede>> {dede:bookcontentlist row='12' booktype='-1' orderby='lastpost' author='' keyword=''}
频道类型:栏目类型: {tid}表示栏目id,
- {cid}表示频道模型的名字id( + {cid}表示栏目模型的名字id( $arr) { diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 3e0ee939..d3173633 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -322,7 +322,7 @@
支持变量: {tid}表示栏目id,
- {cid}表示频道模型的名字id( + {cid}表示栏目模型的名字id( $arr) { diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index d6efb83e..81cd534d 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -90,7 +90,7 @@
- +
频道信息统计:栏目信息统计: - + - diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index a658d92e..4274d85b 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -105,7 +105,7 @@ - diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index aef60802..72d33950 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -50,7 +50,7 @@ diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index eaecc6b6..29a01907 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -64,32 +64,32 @@ - - + + - + {dede:datalist empty=''} - - + - - + + - + diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index d2f6f682..a4879265 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -43,23 +43,23 @@ - + 与文档的模板相关连,建议由英文、数字或下划线组成,因为部份Unix系统无法识别中文文件,栏目默认文档模板是“default/article_名字标识.htm”,列表模板、封面模板类推 - - + + + 栏目除主表以外其它自定义类型数据存放数据的表,如果您不使用主表关连的各种特性(推荐、会员权限等),也可以使用完全以附加表作为存储数据 - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 1f6c0180..1c7a2475 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -321,7 +321,7 @@ } ?> - 软件频道设置 + 软件栏目设置
频道名称栏目名称 文档总数
限定频道: + 限定栏目: "; echo ""; @@ -181,7 +181,7 @@ echo ""; } echo ""; - ?>(如果限定了频道内容模型,则允许使用附加表指定的列表字段作为底层变量) + ?>(如果限定了栏目内容模型,则允许使用附加表指定的列表字段作为底层变量)
限定频道: + 限定栏目: GetAtt('channel'); echo ""; - ?>(如果限定了频道内容模型,则允许使用附加表指定的列表字段作为底层变量) + ?>(如果限定了栏目内容模型,则允许使用附加表指定的列表字段作为底层变量)
选择 mid登录名邮箱用户名称邮箱 性别 会员等级 会员属性最后登录地址时间 操作
暂无内容
{dede:field.mid/} + ";}; echo ''.$fields['userid'].''; - if ($fields['spacesta']==-2) echo "[禁言]"; - if ($fields['spacesta']==-1) echo "[未审核]"; + if ($fields['spacesta']==-2) echo " [禁言]"; + if ($fields['spacesta']==-1) echo " [未审核]"; ?> {dede:field.matt function="GetMAtt(@me)"/} 邮箱:{dede:field.email/} 昵称:{dede:field.uname/}{dede:field.uname/}丨{dede:field.email/} {dede:field.sex/} {dede:field.rank function="GetMemberName(@me,'限制会员')"/}{dede:field.mtype/}用户 金币:{dede:field.money/} 积分:{dede:field.scores/}{dede:field.logintime function="MyDate('y-m-d H:i',@me)"/} {dede:field.loginip/}{dede:field.mtype/}用户丨金币{dede:field.money/}丨积分{dede:field.scores/}{dede:field.loginip/}丨{dede:field.logintime function="MyDate('y-m-d H:i',@me)"/} 修改 删除 diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index ce87b501..1d3cfb4f 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -79,10 +79,10 @@
负责频道:负责栏目: (按Ctrl可以进行多选) 内容模型管理 > 新增内容模型
频道id
+
栏目id
数字,创建后不可修改,并具有唯一性
*
名字标识
- 与文档的模板相关连,建议由英文、数字或下划线组成,因为部份Unix系统无法识别中文文件,频道默认文档模板是“default/article_名字标识.htm”,列表模板、封面模板类推
*
频道名称
- 频道的中文名称,在后台管理,前台发布等均使用此名字
*栏目名称
+ 栏目的中文名称,在后台管理,前台发布等均使用此名字
*
附加表
- 频道除主表以外其它自定义类型数据存放数据的表,如果您不使用主表关连的各种特性(推荐、会员权限等),也可以使用完全以附加表作为存储数据
必须由英文、数字、下划线组成 * diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 3740b8c0..36c2d465 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -46,7 +46,7 @@ - + @@ -62,22 +62,22 @@ - + 与文档的模板相关连,建议由英文、数字或下划线组成,因为部份Unix系统无法识别中文文件,栏目默认文档模板是“default/article_名字标识.htm”,列表模板、封面模板类推 - + + 栏目除主表以外其它自定义类型数据存放数据的表,如果您不使用主表关连的各种特性(推荐、会员权限等),也可以使用完全以附加表作为存储数据 diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index ac2dd618..a239d02c 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -27,7 +27,7 @@ - + diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm index 4d95a046..6e30dc3f 100644 --- a/src/admin/templets/mychannel_modifysearch.htm +++ b/src/admin/templets/mychannel_modifysearch.htm @@ -25,11 +25,11 @@ - + - + -
您目前所展开的是系统模型,系统模型一般对发布程序和管理程序已经固化,如果您胡乱修改系统模型将会导致使用这种内容类型的频道可能崩溃
您目前所展开的是系统模型,系统模型一般对发布程序和管理程序已经固化,如果您胡乱修改系统模型将会导致使用这种内容类型的栏目可能崩溃
频道id
+
栏目id
数字,创建后不可修改,并具有唯一性
名字标识
- 与文档的模板相关连,建议由英文、数字或下划线组成,因为部份Unix系统无法识别中文文件,频道默认文档模板是“default/article_名字标识.htm”,列表模板、封面模板类推
频道名称
频道的中文名称,在后台管理,前台发布等均使用此名字
栏目名称
栏目的中文名称,在后台管理,前台发布等均使用此名字
附加表
- 频道除主表以外其它自定义类型数据存放数据的表,如果您不使用主表关连的各种特性(推荐、会员权限等),也可以使用完全以附加表作为存储数据
(#@__ 是表示数据表前缀)
id频道名称栏目名称 识别id 附加表 状态
频道id:栏目id:
频道名称:
栏目名称:
限定频道: + 限定栏目: "; - echo ""; + echo ""; $tl->dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0"); $tl->dsql->Execute(); while($row = $tl->dsql->GetObject()) diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index ce6667ce..df118a91 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -329,7 +329,7 @@ } ?> - 软件频道设置 + 软件栏目设置
diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index ba1a6293..3b3f5ad6 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -3,7 +3,7 @@ - 软件频道设置 + 软件栏目设置 @@ -24,7 +24,7 @@
软件频道设置软件栏目设置
链接显示方式:
diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index 5c281486..56121f48 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -31,15 +31,15 @@
id 名称时间频道地址时间栏目 管理项
暂无内容
{dede:field.userid/} {dede:field.uname/}{dede:field.usertype function="GetUserType(@me)"/}登录时间:{dede:field.logintime function="GetDateTimeMk(@me)"/} 登录ip:{dede:field.loginip/}{dede:field.loginip/}丨{dede:field.logintime function="GetDateTimeMk(@me)"/} {dede:field.typename function="GetChannel(@me)"/} 修改 diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 071083c3..75708f34 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -81,7 +81,7 @@ 授权栏目: (按Ctrl可以进行多选)
负责频道:负责栏目: (按Ctrl可以进行多选)
- - - - - + + + + +
-[[field:cataloglink/]] [field:booklink/][field:contentlink/][field:lastpost function="GetDateMk(@me)"/]
[[field:cataloglink/]] [field:booklink/][field:contentlink/][field:lastpost function="GetDateMk(@me)"/]
{/dede:bookcontentlist} >>dede>> 这个标签和booklist实际是完全相同的,只是默认底层模板不同 row='12' 调用记录条数 -booktype='-1' 图书类型,0 图书、1 漫画,默认全部 -orderby='lastpost' 排序类型,当按排序类型为 commend 表示推荐图书 -author='' 作者 +booktype='-1' 图书类型,0图书、1漫画,默认全部 +orderby='lastpost' 排序类型,当按排序类型为commend表示推荐图书 +author='' 作者 keyword='' 关键词(用英文逗号分开多个关键词) \ No newline at end of file diff --git a/src/system/taglib/help/booklist.txt b/src/system/taglib/help/booklist.txt index 1026c50f..b63652ef 100755 --- a/src/system/taglib/help/booklist.txt +++ b/src/system/taglib/help/booklist.txt @@ -1,12 +1,12 @@ 连载图书调用 >>dede>> {dede:booklist row='12' booktype='-1' orderby='lastpost' author='' keyword=''} -[field:bookname/]
+ [field:bookname/] {/dede:booklist} >>dede>> 这个标签和bookcontentlist实际是完全相同的,只是默认底层模板不同 row='12' 调用记录条数 -booktype='-1' 图书类型,0 图书、1 漫画,默认全部 +booktype='-1' 图书类型,0图书、1漫画,默认全部 orderby='lastpost' 排序类型,当按排序类型为 commend 表示推荐图书 -author='' 作者 +author='' 作者 keyword='' 关键词(用英文逗号分开多个关键词) \ No newline at end of file diff --git a/src/system/taglib/help/channelartlist.txt b/src/system/taglib/help/channelartlist.txt index d80886fc..7fe7c2f2 100755 --- a/src/system/taglib/help/channelartlist.txt +++ b/src/system/taglib/help/channelartlist.txt @@ -1,18 +1,20 @@ -获取当前频道的下级栏目的内容列表标签 +获取当前栏目的下级栏目的内容列表标签 >>dede>> {dede:channelartlist row=6}
-
{dede:field name='typename'/}
-
- {dede:arclist titlelen='42' row='10'}
    -
  • [field:title/]
  • -
  • ([field:pubdate function="MyDate('m-d',@me)"/])
  • -
-{/dede:arclist} +
{dede:field name='typename'/}
+
+ {dede:arclist titlelen='42' row='10'} +
    +
  • [field:title/]
  • +
  • ([field:pubdate function="MyDate('m-d',@me)"/])
  • +
+ {/dede:arclist} +
{/dede:channelartlist} >>dede>> -typeid='0' 频道id,多个请用","分隔 +typeid='' 调用栏目id,用英文逗号分开表示多个栏目 row='20' 获取的栏目返回值 其他说明: 除了宏标记外,channelArtlist 是唯一一个可以直接嵌套其它标记的标记,不过仅限于嵌套 diff --git a/src/system/taglib/help/feedback.txt b/src/system/taglib/help/feedback.txt index 9fcf7722..54bd5e92 100755 --- a/src/system/taglib/help/feedback.txt +++ b/src/system/taglib/help/feedback.txt @@ -2,8 +2,8 @@ >>dede>> {dede:feedback}
    -
  • [field:username function="(@me=='guest' ? '游客' : @me)"/] 对 [field:title/] 的评论:
  • -
  •  [field:msg/]
  • +
  • [field:username function="(@me=='guest' ? '游客' : @me)"/]对[field:title/]的评论:
  • +
  • [field:msg/]
{/dede:feedback} >>dede>> diff --git a/src/system/taglib/help/group.txt b/src/system/taglib/help/group.txt index 784d78f0..17a31dea 100755 --- a/src/system/taglib/help/group.txt +++ b/src/system/taglib/help/group.txt @@ -2,8 +2,8 @@ >>dede>> {dede:group row='6' orderby='threads' titlelen='30'}
  • - -[field:groupname/] + + [field:groupname/]
  • {/dede:group} >>dede>> diff --git a/src/system/taglib/help/groupthread.txt b/src/system/taglib/help/groupthread.txt index 4c9217d0..6cf93224 100755 --- a/src/system/taglib/help/groupthread.txt +++ b/src/system/taglib/help/groupthread.txt @@ -2,13 +2,13 @@ >>dede>> {dede:groupthread gid='0' orderby='dateline' orderway='desc' row='12' titlelen='30'}
  • -[[field:groupname function="cn_substr(@me,10)"/]] -[field:subject/]([field:lastpost function="GetDateMk('@me')"/]) + [[field:groupname function="cn_substr(@me,10)"/]] + [field:subject/]([field:lastpost function="GetDateMk('@me')"/])
  • {/dede:groupthread} >>dede>> gid='0' 圈子id,默认为全部 -orderby='dateline' 排序,默认为时间 -orderway='desc' 排序方向,默认是最新主题在前 -row='12' 记录数 -titlelen='30' 主题标题(subject)最大长度 \ No newline at end of file +orderby='dateline' 排序,默认为时间 +orderway='desc' 排序方向,默认是最新主题在前 +row='12' 记录数 +titlelen='30' 主题标题(subject)最大长度 \ No newline at end of file diff --git a/src/system/taglib/help/likearticle.txt b/src/system/taglib/help/likearticle.txt index ba3cdbbf..91e6f8c8 100755 --- a/src/system/taglib/help/likearticle.txt +++ b/src/system/taglib/help/likearticle.txt @@ -1,12 +1,12 @@ 自动关连文档标签 >>dede>> {dede:likearticle row='' col='' titlelen='' infolen=''} -[field:title/] + [field:title/] {/dede:likearticle} >>dede>> col='' 分多少列显示(默认为单列) row='10' 返回文档列表总数 -titlelen='30' 标题长度 等同于titlelength +titlelen='30' 标题长度等同于titlelength infolen='160' 表示内容简介长度 等同于infolength mytypeid='0' 手工指定要限定的栏目id,用英文逗号表示多个 -innertext='' 单条记录样式(指标签中间的内容) \ No newline at end of file +innertext='' 单条记录样式(指标签中间的内容) \ No newline at end of file diff --git a/src/system/taglib/help/loop.txt b/src/system/taglib/help/loop.txt index f5b18c68..9644fda8 100755 --- a/src/system/taglib/help/loop.txt +++ b/src/system/taglib/help/loop.txt @@ -1,10 +1,10 @@ 调用任意表的数据标签 >>dede>> {dede:loop table='dede_archives' sort='' row='4' if=''} -[field:title/] + [field:title/] {/dede:loop} >>dede>> table='' 查询表名 sort='' 用于排序的字段 -row='' 返回结果的条数 +row='' 返回结果的条数 if='' 查询的条件 \ No newline at end of file diff --git a/src/system/taglib/help/memberlist.txt b/src/system/taglib/help/memberlist.txt index b16d5f17..091fe260 100755 --- a/src/system/taglib/help/memberlist.txt +++ b/src/system/taglib/help/memberlist.txt @@ -1,7 +1,7 @@ 会员信息调用标签 >>dede>> {dede:memberlist orderby='scores' row='20'} -{dede:field.userid/} + {dede:field.userid/} {dede:field.scores/} {/dede:memberlist} >>dede>> diff --git a/src/system/taglib/help/myad.txt b/src/system/taglib/help/myad.txt index 4f185530..74c254e7 100755 --- a/src/system/taglib/help/myad.txt +++ b/src/system/taglib/help/myad.txt @@ -2,6 +2,6 @@ >>dede>> {dede:myad name=''/} >>dede>> -typeid='0' 投放范围,0为全站 +typeid='0' 投放范围,0为全站 name='' 广告标识 \ No newline at end of file diff --git a/src/system/taglib/help/mytag.txt b/src/system/taglib/help/mytag.txt index d28ef095..de9f753e 100755 --- a/src/system/taglib/help/mytag.txt +++ b/src/system/taglib/help/mytag.txt @@ -2,5 +2,5 @@ >>dede>> {dede:mytag typeid='0' name=''/} >>dede>> -typeid='0' 栏目id 0为全站栏目 +typeid='0' 栏目id,0为全站栏目 name='' 标记名 \ No newline at end of file diff --git a/src/system/taglib/help/sonchannel.txt b/src/system/taglib/help/sonchannel.txt index 514e05e8..f1d419af 100755 --- a/src/system/taglib/help/sonchannel.txt +++ b/src/system/taglib/help/sonchannel.txt @@ -1,7 +1,7 @@ 子栏目调用标签 >>dede>> {dede:sonchannel} -[field:typename/] + [field:typename/] {/dede:sonchannel} >>dede>> row='100' 返回数目 diff --git a/src/system/taglib/help/sql.txt b/src/system/taglib/help/sql.txt index 2fc5d670..fce438af 100755 --- a/src/system/taglib/help/sql.txt +++ b/src/system/taglib/help/sql.txt @@ -1,7 +1,5 @@ SQL标签 >>dede>> -{dede:sql sql=''} -[field:title/] -{/dede} +{dede:sql sql=''}[field:title/]{/dede} >>dede>> sql='' 完整的SQL语句 \ No newline at end of file diff --git a/src/system/taglib/help/type.txt b/src/system/taglib/help/type.txt index d6c686e1..3bc7d12e 100755 --- a/src/system/taglib/help/type.txt +++ b/src/system/taglib/help/type.txt @@ -1,7 +1,7 @@ 指定的单个栏目的链接标签 >>dede>> {dede:type} -[field:typename/] + [field:typename/] {/dede:type} >>dede>> typeid='' 指定栏目id \ No newline at end of file diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index 662ebfe5..a4e30a23 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -168,7 +168,7 @@ class TypeLink //获得类别列表 //hid是指默认选中类目,0表示“请选择类目”或“不限类目” //oper是用户允许管理的类目,0表示所有类目 - //channeltype是指类目的内容类型,0表示不限频道 + //channeltype是指类目的内容类型,0表示不限栏目 function GetOptionArray($hid = 0, $oper = 0, $channeltype = 0, $usersg = 0) { return $this->GetOptionList($hid, $oper, $channeltype, $usersg); diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 2e95771f..e79853e5 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -75,7 +75,7 @@ class TypeUnit * 读出所有分类,在类目管理页(list_type)中使用 * * @access public - * @param int $channel 频道id + * @param int $channel 栏目id * @param int $nowdir 当前操作ID * @return string */ @@ -127,7 +127,7 @@ class TypeUnit echo ""; echo ""; } - //带封面的频道 + //带封面的栏目 else if ($ispart == 1) { echo ""; echo "
    封面{$nss}".$typeName."[id:".$id."]"; @@ -210,7 +210,7 @@ class TypeUnit echo ""; echo "
    "; } - //封面频道 + //封面栏目 else if ($ispart == 1) { echo ""; echo "
    "; @@ -247,7 +247,7 @@ class TypeUnit * * @access public * @param int $id 栏目id - * @param int $channel 频道id + * @param int $channel 栏目id * @return array */ function GetSunTypes($id, $channel = 0) diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 383a3d7d..c7a8666b 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -57,7 +57,7 @@ class TypeUnit * 读出所有分类,在类目管理页(list_type)中使用 * * @access public - * @param int $channel 频道id + * @param int $channel 栏目id * @param int $nowdir 当前操作ID * @return string */ @@ -94,7 +94,7 @@ class TypeUnit //普通栏目 if ($ispart == 0) { } - //封面频道 + //封面栏目 else if ($ispart == 1) { } //独立页面 @@ -151,7 +151,7 @@ class TypeUnit //普通列表 if ($ispart == 0 || empty($ispart)) { } - //封面频道 + //封面栏目 else if ($ispart == 1) { } //独立页面 diff --git a/src/system/typelink/typeunit.class.selector.php b/src/system/typelink/typeunit.class.selector.php index eda95ce8..537c60ee 100755 --- a/src/system/typelink/typeunit.class.selector.php +++ b/src/system/typelink/typeunit.class.selector.php @@ -36,10 +36,10 @@ class TypeUnitSelector { } /** - * 列出某一频道下的所有栏目 + * 列出某一栏目下的所有栏目 * * @access public - * @param string $channel 频道id + * @param string $channel 栏目id * @return void */ function ListAllType($channel = 0) @@ -94,7 +94,7 @@ class TypeUnitSelector * * @access public * @param int $id 栏目id - * @param int $channel 频道id + * @param int $channel 栏目id * @param int $soncat 子级分类 * @return string */ diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index 36df2959..b82b9641 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -79,7 +79,7 @@ $DedeUserCatalogs = array(); * 检测用户是否有权限操作某栏目 * * @access public - * @param int $cid 频道id + * @param int $cid 栏目id * @param string $msg 返回消息 * @return string */ @@ -273,7 +273,7 @@ class userLogin } } /** - * 重写用户权限频道 + * 重写用户权限栏目 * * @access public * @return void @@ -282,7 +282,7 @@ class userLogin { //$this->userChannel $cacheFile = DEDEDATA.'/cache/admincat_'.$this->userID.'.inc'; - //管理员管理的频道列表 + //管理员管理的栏目列表 $typeid = trim($this->userChannel); if (empty($typeid) || $this->getUserType() >= 10) { $firstConfig = "\$cfg_admin_channel = 'all';\r\n\$admin_catalogs = array();\r\n"; @@ -326,7 +326,7 @@ class userLogin $_SESSION = array(); } /** - * 获得用户管理频道的值 + * 获得用户管理栏目的值 * * @access public * @return array @@ -407,7 +407,7 @@ class userLogin * * @access public * @param int $id 栏目id - * @param int $channel 频道id + * @param int $channel 栏目id * @param int $addthis 是否加入当前这个栏目 * @return string */ @@ -428,7 +428,7 @@ function GetSonIdsUL($id, $channel = 0, $addthis = TRUE) * @access public * @param int $id 栏目id * @param array $sArr 缓存数组 - * @param int $channel 频道id + * @param int $channel 栏目id * @param int $addthis 是否加入当前这个栏目 * @return string */ diff --git a/src/theme/templet-filelist.inc b/src/theme/templet-filelist.inc index 8757f1b1..fac01d81 100644 --- a/src/theme/templet-filelist.inc +++ b/src/theme/templet-filelist.inc @@ -12,7 +12,7 @@ head.htm,头部模板 index.htm,主页模板 index_article.htm,文档封面模板 index_default.htm,封面栏目模板 -index_default_sg.htm,频道表单封面模板 +index_default_sg.htm,栏目表单封面模板 index_image.htm,图片封面模板 index_infos.htm,分类信息封面模板 index_shop.htm,商品封面模板 diff --git a/src/theme/templets/article_default.htm b/src/theme/templets/article_default.htm index 44731681..5f640c7f 100644 --- a/src/theme/templets/article_default.htm +++ b/src/theme/templets/article_default.htm @@ -46,7 +46,7 @@ -
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在频道模型管理的地方查看
    +
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在栏目模型管理的地方查看
    {dede:fieldlist} diff --git a/src/theme/templets/article_default_sg.htm b/src/theme/templets/article_default_sg.htm index 64fad075..0c64f66d 100644 --- a/src/theme/templets/article_default_sg.htm +++ b/src/theme/templets/article_default_sg.htm @@ -49,7 +49,7 @@ -
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在频道模型管理的地方查看
    +
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在栏目模型管理的地方查看
    {dede:fieldlist}
    diff --git a/src/user/album_add.php b/src/user/album_add.php index 4153773f..86ce2cf3 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -41,11 +41,11 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } include(DEDEMEMBER."/templets/album_add.htm"); diff --git a/src/user/archives_add.php b/src/user/archives_add.php index 954d80ed..f26bc8f8 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -34,11 +34,11 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } include(DEDEMEMBER."/templets/archives_add.htm"); diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index cbe9e789..fb9d1db0 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -34,11 +34,11 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } include(DEDEMEMBER."/templets/archives_sg_add.htm"); @@ -75,14 +75,14 @@ else if ($dopost == 'save') { ShowMsg("您所选择的栏目不支持投稿", "-1"); exit(); } - //检查频道设定的投稿许可权限 + //检查栏目设定的投稿许可权限 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("Select membername From #@__arcrank where `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } //文档的默认状态 diff --git a/src/user/article_add.php b/src/user/article_add.php index f6d6fea3..e2d87021 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -28,11 +28,11 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } include(DEDEMEMBER."/templets/article_add.htm"); diff --git a/src/user/config.php b/src/user/config.php index bb28382d..d6464d8c 100755 --- a/src/user/config.php +++ b/src/user/config.php @@ -211,7 +211,7 @@ function CheckRank($rank = 0, $money = 0) * 更新文档统计 * * @access public - * @param int $channelid 频道模型id + * @param int $channelid 栏目模型id * @return string */ function countArchives($channelid) diff --git a/src/user/inc/archives_check.php b/src/user/inc/archives_check.php index a8adf1d6..65966610 100755 --- a/src/user/inc/archives_check.php +++ b/src/user/inc/archives_check.php @@ -36,14 +36,14 @@ if ($cInfos['issend'] != 1 || $cInfos['ispart'] != 0 || $cInfos['channeltype'] ShowMsg("您所选择的栏目不支持投稿", "-1"); exit(); } -//检查频道设定的投稿许可权限 +//检查栏目设定的投稿许可权限 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } //文档的默认状态 diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php index 5709e408..eed1c89b 100755 --- a/src/user/inc/inc_catalog_options.php +++ b/src/user/inc/inc_catalog_options.php @@ -13,7 +13,7 @@ if (!defined('DEDEMEMBER')) exit('dedebiz'); * 获取选项列表 * * @param string $selid 当前选择id - * @param string $channeltype 频道类型 + * @param string $channeltype 栏目类型 * @return string */ function GetOptionList($selid = 0, $channeltype = 0) @@ -82,7 +82,7 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0) * * @param int $mid 会员id * @param int $mtypeid 自定义类别id - * @param int $channelid 频道id + * @param int $channelid 栏目id * @return string */ function classification($mid, $mtypeid = 0, $channelid = 1) diff --git a/src/user/soft_add.php b/src/user/soft_add.php index 52383885..85c28b7b 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -39,11 +39,11 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); - ShowMsg("对不起,需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$row['membername']."]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { - ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个频道发布文档", "-1", "0", 5000); + ShowMsg("对不起,需要[".$cInfos['usertype']."帐号]才能在这个栏目发布文档", "-1", "0", 5000); exit(); } include(DEDEMEMBER."/templets/soft_add.htm"); diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index d41c1b98..97642a93 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -39,7 +39,7 @@ if (empty($dopost)) { $query = "SELECT * FROM `#@__channeltype` WHERE id='".$row['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg("读取频道配置信息出错", "javascript:;"); + ShowMsg("读取栏目配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable'];