From 0544a93e3f7ede26756d03fe6d30c4885b582d76 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Mon, 23 May 2022 11:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=87=E7=AD=BE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/js/album.js | 2 +- src/admin/js/base.js | 252 +++++++++--------- src/admin/js/dialog.js | 12 +- src/admin/js/handlers.js | 2 +- src/admin/templets/ad_main.htm | 10 +- src/admin/templets/adtype_main.htm | 2 +- src/admin/templets/album_add.htm | 10 +- src/admin/templets/album_edit.htm | 10 +- src/admin/templets/archives_add.htm | 8 +- src/admin/templets/archives_edit.htm | 8 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/archives_sg_edit.htm | 4 +- src/admin/templets/article_add.htm | 4 +- src/admin/templets/article_edit.htm | 8 +- src/admin/templets/catalog_add.htm | 20 +- src/admin/templets/catalog_add_quick.htm | 4 +- src/admin/templets/catalog_edit.htm | 20 +- src/admin/templets/content_select_list.htm | 8 +- src/admin/templets/erradd.htm | 8 +- src/admin/templets/feedback_main.htm | 4 +- src/admin/templets/friendlink_main.htm | 2 +- src/admin/templets/log_list.htm | 2 +- src/admin/templets/member_main.htm | 12 +- src/admin/templets/member_toadmin.htm | 4 +- src/admin/templets/mychannel_edit.htm | 8 +- src/admin/templets/mychannel_main.htm | 12 +- src/admin/templets/mytag_main.htm | 10 +- src/admin/templets/plus_main.htm | 6 +- src/admin/templets/soft_add.htm | 8 +- src/admin/templets/soft_edit.htm | 8 +- src/admin/templets/spec_add.htm | 10 +- src/admin/templets/spec_edit.htm | 10 +- src/admin/templets/stepselect_main.htm | 22 +- src/admin/templets/sys_admin_user.htm | 6 +- src/admin/templets/sys_admin_user_add.htm | 2 +- src/admin/templets/sys_admin_user_edit.htm | 2 +- src/admin/templets/sys_payment.htm | 12 +- src/admin/templets/templets_one.htm | 14 +- src/admin/templets/vote_main.htm | 22 +- src/apps/diy.php | 2 +- src/apps/download.php | 2 +- src/apps/recommend.php | 12 +- src/apps/stow.php | 4 +- src/apps/vdimgck.php | 16 +- src/apps/view.php | 6 +- src/static/web/img/favicon.ico | Bin 16958 -> 4286 bytes src/system/archive/archives.class.php | 2 +- src/system/dedetag.class.php | 2 +- src/system/filter.inc.php | 2 +- src/system/taglib/flink.lib.php | 2 +- src/system/taglib/flinktype.lib.php | 2 +- src/system/taglib/help/adminname.txt | 2 +- src/system/taglib/help/booklist.txt | 2 +- src/system/taglib/help/channelartlist.txt | 2 +- src/system/taglib/help/demotag.txt | 2 +- src/system/taglib/help/feedback.txt | 2 +- src/system/taglib/help/hotwords.txt | 2 +- src/system/taglib/help/infoguide.txt | 2 +- src/system/taglib/help/infolink.txt | 2 +- src/system/taglib/help/memberlist.txt | 4 +- src/system/taglib/help/softmsg.txt | 2 +- src/system/taglib/help/type.txt | 2 +- src/theme/system/channel_list.htm | 2 +- src/theme/system/info_guide.htm | 6 +- src/theme/system/mynews.htm | 6 +- src/theme/system/part_arclist.htm | 2 +- src/theme/system/part_channelartlist.htm | 6 +- src/theme/system/spec_list.htm | 6 +- src/theme/system/tag_arclist.htm | 2 +- src/theme/templets/advancedsearch.htm | 2 +- src/theme/templets/article_article.htm | 12 +- src/theme/templets/article_default.htm | 12 +- src/theme/templets/article_default_sg.htm | 12 +- src/theme/templets/article_image.htm | 16 +- src/theme/templets/article_infos.htm | 20 +- src/theme/templets/article_shop.htm | 12 +- src/theme/templets/article_soft.htm | 12 +- src/theme/templets/article_spec.htm | 8 +- src/theme/templets/index.htm | 10 +- src/theme/templets/index_article.htm | 8 +- src/theme/templets/index_default.htm | 8 +- src/theme/templets/index_default_sg.htm | 8 +- src/theme/templets/index_image.htm | 8 +- src/theme/templets/index_infos.htm | 8 +- src/theme/templets/index_shop.htm | 8 +- src/theme/templets/index_soft.htm | 8 +- src/theme/templets/list_article.htm | 10 +- src/theme/templets/list_default.htm | 10 +- src/theme/templets/list_default_sg.htm | 10 +- src/theme/templets/list_free.htm | 10 +- src/theme/templets/list_image.htm | 10 +- src/theme/templets/list_infos.htm | 14 +- src/theme/templets/list_shop.htm | 12 +- src/theme/templets/list_soft.htm | 10 +- src/theme/templets/list_spec.htm | 10 +- src/theme/templets/search.htm | 6 +- src/theme/templets/singlepage.htm | 2 +- src/theme/templets/tag.htm | 2 +- src/theme/templets/taglist.htm | 8 +- src/theme/templets/widget_article_digg.htm | 2 +- .../templets/widget_article_feedback.htm | 8 +- src/user/templets/album_edit.htm | 2 +- src/user/templets/archives_add.htm | 2 +- src/user/templets/archives_edit.htm | 2 +- src/user/templets/archives_sg_add.htm | 2 +- src/user/templets/archives_sg_edit.htm | 2 +- src/user/templets/article_add.htm | 2 +- src/user/templets/article_edit.htm | 2 +- src/user/templets/buy.htm | 2 +- src/user/templets/buy_action_payment.htm | 4 +- src/user/templets/content_list.htm | 2 +- src/user/templets/content_sg_list.htm | 2 +- src/user/templets/index-notlogin.htm | 6 +- src/user/templets/index.htm | 16 +- src/user/templets/info.htm | 2 +- src/user/templets/login.htm | 6 +- src/user/templets/menu.htm | 20 +- src/user/templets/operation.htm | 6 +- src/user/templets/reg-new.htm | 2 +- src/user/templets/resetpassword.htm | 2 +- src/user/templets/resetpassword2.htm | 2 +- src/user/templets/resetpassword3.htm | 6 +- src/user/templets/shops_orders.htm | 2 +- src/user/templets/soft_add.htm | 2 +- src/user/templets/soft_edit.htm | 2 +- src/user/templets/top.htm | 4 +- src/user/templets/top_login.htm | 4 +- 127 files changed, 534 insertions(+), 544 deletions(-) diff --git a/src/admin/js/album.js b/src/admin/js/album.js index 0ee23189..2ac87ca9 100644 --- a/src/admin/js/album.js +++ b/src/admin/js/album.js @@ -95,7 +95,7 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) { newobj.style.top = hpos; newobj.style.left = 100; document.body.appendChild(newobj); - newobj.innerHTML = '上传中...'; + newobj.innerHTML = ' 正在上传'; } newobj.style.display = 'block'; //提交后还原form的action等参数 diff --git a/src/admin/js/base.js b/src/admin/js/base.js index ebc30e32..91aa6d55 100644 --- a/src/admin/js/base.js +++ b/src/admin/js/base.js @@ -1,139 +1,139 @@ - $(function(){ - //文本框Style - $(".txt").mouseover(function(){ - $(this).addClass("txt_o"); +$(function(){ + //文本框Style + $(".txt").mouseover(function(){ + $(this).addClass("txt_o"); + }).mouseout(function(){ + $(this).removeClass("txt_o"); + }).focus(function(){ + $(this).addClass("txt_s"); + }).blur(function(){ + $(this).removeClass("txt_s"); + }); + //表格折叠 + $(".tform").find("tbody tr th[_show]").each(function(i){ + //加入折叠提示 + if ($(this).attr("_show")=="no"){ + $(this).append(" "); + } else { + $(this).append(" "); + } + //折叠动作 + $(this).click(function(){ + if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_up"){ + $(this).find("button[class^='tbody_']").attr("class","tbody_down"); + $(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).hide(); + } else if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_down"){ + $(this).find("button[class^='tbody_']").attr("class","tbody_up"); + $(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).show(); + } + }).mouseover(function(){ + $(this).addClass("mouseon"); }).mouseout(function(){ - $(this).removeClass("txt_o"); - }).focus(function(){ - $(this).addClass("txt_s"); - }).blur(function(){ - $(this).removeClass("txt_s"); - }); - //表格折叠 - $(".tform").find("tbody tr th[_show]").each(function(i){ - //加入折叠提示 - if ($(this).attr("_show")=="no"){ - $(this).append(" "); + $(this).removeClass("mouseon"); + }).click(); + }); + //列表行高亮 + $("table[_dlist*='light']").children("tbody").children("tr").mouseover(function(){ + if ($(this).attr("_nolight")!="yes")$(this).addClass("t_on"); + }).mouseout(function(){ + $(this).removeClass("t_on"); + }); + //列表行整行选择 + $("table[_dlist*='check']").each(function(){ + //处理行点击 + $(this).find("tbody tr").click(function(){ + checkbox = $(this).find("td input[type='checkbox']"); + tr = $(this); + if (checkbox.attr("checked")===false){ + checkbox.attr("checked","checked"); + tr.addClass("t_sl"); } else { - $(this).append(" "); + checkbox.removeAttr("checked"); + tr.removeClass("t_sl"); } - //折叠动作 - $(this).click(function(){ - if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_up"){ - $(this).find("button[class^='tbody_']").attr("class","tbody_down"); - $(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).hide(); - } else if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_down"){ - $(this).find("button[class^='tbody_']").attr("class","tbody_up"); - $(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).show(); - } - }).mouseover(function(){ - $(this).addClass("mouseon"); - }).mouseout(function(){ - $(this).removeClass("mouseon"); - }).click(); - }); - //列表行高亮 - $("table[_dlist*='light']").children("tbody").children("tr").mouseover(function(){ - if ($(this).attr("_nolight")!="yes")$(this).addClass("t_on"); - }).mouseout(function(){ - $(this).removeClass("t_on"); }); - //列表行整行选择 - $("table[_dlist*='check']").each(function(){ - //处理行点击 - $(this).find("tbody tr").click(function(){ - checkbox = $(this).find("td input[type='checkbox']"); - tr = $(this); - if (checkbox.attr("checked")===false){ - checkbox.attr("checked","checked"); - tr.addClass("t_sl"); - } else { - checkbox.removeAttr("checked"); - tr.removeClass("t_sl"); - } - }); - //处理checkbox点击 - $(this).find("td input[type='checkbox']").click(function(){ - tr = $(this).parent("td").parent("tr"); - if ($(this).attr("checked")===false){ - $(this).attr("checked","checked"); - tr.removeClass("t_sl"); - } else { - $(this).removeAttr("checked"); - tr.addClass("t_sl"); - } - }); - //排除链接及按钮点击 - $(this).find("tbody tr td a,tbody tr td button,tbody tr td table").click(function(){ - tr = $(this).parent("td").parent("tr"); - checkbox = tr.find("td input[type='checkbox']"); - if (checkbox.attr("checked")===false){ - checkbox.attr("checked","checked"); - tr.removeClass("t_sl"); - } else { - checkbox.removeAttr("checked"); - tr.addClass("t_sl"); - } - }); - }); - //高亮初始化 - setChecklight(); - //全选按钮 - $("button[_click='allSelect']").click(function(){ - ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']"); - ckbox.attr("checked","checked"); - setChecklight(); - }); - //反选按钮 - $("button[_click='unSelect']").click(function(){ - ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']"); - ckbox.each(function(){ - $(this).attr("checked") === false ? $(this).attr("checked","checked") : $(this).removeAttr("checked"); - }); - setChecklight(); - }); - //自定义提交 - $("button[_submit]").click(function(){ - url = $(this).attr("_submit"); - if (/\[new\].*/.test(url)){ - url = url.replace(/\[new\]/,""); + //处理checkbox点击 + $(this).find("td input[type='checkbox']").click(function(){ + tr = $(this).parent("td").parent("tr"); + if ($(this).attr("checked")===false){ + $(this).attr("checked","checked"); + tr.removeClass("t_sl"); } else { - url = $(this).parents("form").attr("action")+url; + $(this).removeAttr("checked"); + tr.addClass("t_sl"); } - $(this).parents("form").attr("action",url).submit(); }); - }); - //高亮初始化 - function setChecklight(){ - $(".tlist[_dlist*='check']").find("tbody tr td input[type='checkbox']").each(function(i){ + //排除链接及按钮点击 + $(this).find("tbody tr td a,tbody tr td button,tbody tr td table").click(function(){ tr = $(this).parent("td").parent("tr"); - if ($(this).attr("checked")){ - tr.addClass("t_sl"); - } else { + checkbox = tr.find("td input[type='checkbox']"); + if (checkbox.attr("checked")===false){ + checkbox.attr("checked","checked"); tr.removeClass("t_sl"); + } else { + checkbox.removeAttr("checked"); + tr.addClass("t_sl"); } }); - } - //栏目跳转 - function AC(mid){ - f = $(window.parent.document); - mlink = f.find("a[id='"+mid+"']"); - if (mlink.size()>0){ - box = mlink.parents("div[id^='menu_']"); - boxid = box.attr("id").substring(5,128); - if ($("body").attr("class")!="showmenu")$("#togglemenu").click(); - if (mlink.attr("_url")){ - $("#menu").find("div[id^=menu]").hide(); - box.show(); - mlink.addClass("thisclass").blur().parents("#menu").find("ul li a").not(mlink).removeClass("thisclass"); - if ($("#mod_"+boxid).attr("class")==""){ - $("#nav").find("a").removeClass("thisclass"); - $("#nav").find("a[id='mod_"+boxid+"']").addClass("thisclass").blur(); - } - window.location.href = mlink.attr("_url"); - } else if (mlink.attr("_open") && mlink.attr("_open")!=undefined){ - window.open(mlink.attr("_open")); + }); + //高亮初始化 + setChecklight(); + //全选按钮 + $("button[_click='allSelect']").click(function(){ + ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']"); + ckbox.attr("checked","checked"); + setChecklight(); + }); + //反选按钮 + $("button[_click='unSelect']").click(function(){ + ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']"); + ckbox.each(function(){ + $(this).attr("checked") === false ? $(this).attr("checked","checked") : $(this).removeAttr("checked"); + }); + setChecklight(); + }); + //自定义提交 + $("button[_submit]").click(function(){ + url = $(this).attr("_submit"); + if (/\[new\].*/.test(url)){ + url = url.replace(/\[new\]/,""); + } else { + url = $(this).parents("form").attr("action")+url; + } + $(this).parents("form").attr("action",url).submit(); + }); +}); +//高亮初始化 +function setChecklight(){ + $(".tlist[_dlist*='check']").find("tbody tr td input[type='checkbox']").each(function(i){ + tr = $(this).parent("td").parent("tr"); + if ($(this).attr("checked")){ + tr.addClass("t_sl"); + } else { + tr.removeClass("t_sl"); + } + }); +} +//栏目跳转 +function AC(mid){ + f = $(window.parent.document); + mlink = f.find("a[id='"+mid+"']"); + if (mlink.size()>0){ + box = mlink.parents("div[id^='menu_']"); + boxid = box.attr("id").substring(5,128); + if ($("body").attr("class")!="showmenu")$("#togglemenu").click(); + if (mlink.attr("_url")){ + $("#menu").find("div[id^=menu]").hide(); + box.show(); + mlink.addClass("thisclass").blur().parents("#menu").find("ul li a").not(mlink).removeClass("thisclass"); + if ($("#mod_"+boxid).attr("class")==""){ + $("#nav").find("a").removeClass("thisclass"); + $("#nav").find("a[id='mod_"+boxid+"']").addClass("thisclass").blur(); } + window.location.href = mlink.attr("_url"); + } else if (mlink.attr("_open") && mlink.attr("_open")!=undefined){ + window.open(mlink.attr("_open")); } - - } \ No newline at end of file + } + +} \ No newline at end of file diff --git a/src/admin/js/dialog.js b/src/admin/js/dialog.js index 3d631e89..9da64a9a 100644 --- a/src/admin/js/dialog.js +++ b/src/admin/js/dialog.js @@ -18,20 +18,20 @@ function AlertMsg(title, id) { var msgw, msgh, msgbg, msgcolor, titlecolor, titlebg, content; //弹出窗口设置 msgw = 600;//窗口宽度 - msgbg = "#FFF";//内容背景 - msgcolor = "#333";//内容颜色 + msgbg = "#fff";//内容背景 + msgcolor = "#545b62";//内容颜色 titlecolor = "#254015";//标题颜色 titlebg = "#f8f8f8"; - //遮罩背景设置 - content = "
对不起，载入失败
"; + //遮罩背景设置 + content = "
载入失败
"; var sWidth, sHeight; sWidth = screen.availWidth; if (screen.availHeight > document.body.scrollHeight) { sHeight = screen.availHeight;//少于一屏 } else { - sHeight = document.body.scrollHeight;//多于一屏 + sHeight = document.body.scrollHeight;//多于一屏 } - //创建遮罩背景 + //创建遮罩背景 var maskObj = document.createElement("div"); maskObj.setAttribute('id', 'maskdiv'); maskObj.style.position = "absolute"; diff --git a/src/admin/js/handlers.js b/src/admin/js/handlers.js index f04e01f9..aab624f8 100644 --- a/src/admin/js/handlers.js +++ b/src/admin/js/handlers.js @@ -14,7 +14,7 @@ function addImage(src, pid) { albImg++; if (pid != 0) { albImg = 'ok' + pid; - delstr = '删除'; + delstr = '删除'; } else { albImg = 'err' + albImg; } diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 2318729d..5ff626de 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -44,16 +44,16 @@ {dede:datalist empty='
暂无内容
'} - {dede:field.aid /} + {dede:field.aid/} {dede:field.clsname function='TestType(@me,1)'/} - {dede:field.adname /} + {dede:field.adname/} {dede:field.typename function='TestType(@me)'/} {dede:field.timeset function='TimeSetValue(@me)'/} {dede:field.endtime function='GetDateMk(@me)'/} - 代码 - 修改 - 删除 + 代码 + 修改 + 删除 {/dede:datalist} diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index 4562e2e5..59a2bd85 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -12,7 +12,7 @@ - + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 3968260e..73e04a3d 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -73,8 +73,8 @@ table{border-collapse:separate} @@ -85,8 +85,8 @@ table{border-collapse:separate} @@ -280,7 +280,7 @@ table{border-collapse:separate} - +
广告分类管理广告管理广告分类管理广告管理
类型ID - - + +
常规内容高级参数常规内容高级参数
- - + +
常规内容高级参数常规内容高级参数
（系统仅是每页输出"行x列"张图片，实现需自行控制样式表）
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 132215d2..17ac0586 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -73,8 +73,8 @@ table{border-collapse:separate} - - + +
常规内容图集图片常规内容图集图片
@@ -85,8 +85,8 @@ table{border-collapse:separate} - - + +
常规内容图集图片常规内容图集图片
@@ -380,7 +380,7 @@ table{border-collapse:separate} - + （系统仅是每页输出"行x列"张图片，实现需自行控制样式表） diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 62d46228..b58d996f 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -49,8 +49,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
@@ -62,8 +62,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 485bc0cd..0fc5ac7f 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -46,8 +46,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
@@ -58,8 +58,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index fb464a53..6e02393a 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -50,7 +50,7 @@ table{border-collapse:separate} - +
常规信息常规信息
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 3a2b60ce..7d73839d 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -47,8 +47,8 @@ table{border-collapse:separate} - - + +
常规信息常规信息
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 4fbc0603..c2ab5fe1 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -53,7 +53,7 @@ table{border-collapse:separate} - +
常规信息常规信息 单页采集
@@ -288,7 +288,7 @@ table{border-collapse:separate} - +
高级参数高级参数
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index d26993be..35e30b51 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -51,8 +51,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
@@ -63,8 +63,8 @@ table{border-collapse:separate} - - + +
常规信息高级参数常规信息高级参数
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 7630590b..d24eaecc 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -145,9 +145,9 @@ - - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
@@ -158,9 +158,9 @@ - - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
@@ -171,9 +171,9 @@ - - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
@@ -460,7 +460,7 @@ SEO标题： - （栏目模板里用{dede:field.seotitle /}调用） + （栏目模板里用{dede:field.seotitle/}调用） 关键词： diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 3c21eff5..f0c3a5db 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -105,9 +105,9 @@ diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 7a763a3b..6f24d9a4 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -126,9 +126,9 @@ @@ -139,9 +139,9 @@ @@ -152,9 +152,9 @@ @@ -400,7 +400,7 @@ - + diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 3410299f..9299f14c 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -69,12 +69,12 @@ - + - - - + + + {/dede:datalist} diff --git a/src/admin/templets/erradd.htm b/src/admin/templets/erradd.htm index 1319bcc4..866736cb 100644 --- a/src/admin/templets/erradd.htm +++ b/src/admin/templets/erradd.htm @@ -72,13 +72,13 @@ {dede:datalist empty=''} - + - + - - + + {/dede:datalist} diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index 0fe59383..c54e715c 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -76,7 +76,7 @@ @@ -100,7 +100,7 @@ - + diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index cd671b51..0cd2761b 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -97,7 +97,7 @@ - + {/dede:datalist} diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index f061a020..70203858 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -92,7 +92,7 @@ [禁言]"; - if($fields['spacesta']==-1) echo "[未审核]"; + if($fields['spacesta']==-1) echo "[未审核]"; if(!empty($fields['face'])) { echo "
"; } @@ -100,12 +100,12 @@ - + - - + + - - + +
- +
- +
常规选项常规选项
- - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
- - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
- - - + + +
常规选项高级选项栏目内容常规选项高级选项栏目内容
SEO标题：（栏目模板里用{dede:field.seotitle /}调用）（栏目模板里用{dede:field.seotitle/}调用）
关键词：{dede:field.id/} {dede:field.title/}{dede:field.senddate function="GetDateMk(@me)" /}{dede:field.senddate function="GetDateMk(@me)"/} {dede:field.typeid function='GetTypename(@me)'/} {dede:field.click/}{dede:field.ismake function="IsHtmlArchives(@me)" /}{dede:field.arcrank function="GetRankName(@me)" /}{dede:field.flag function="IsCommendArchives(@me)" /}{dede:field.ismake function="IsHtmlArchives(@me)"/}{dede:field.arcrank function="GetRankName(@me)"/}{dede:field.flag function="IsCommendArchives(@me)"/}
暂无内容
{dede:field.id /}{dede:field.id/} {dede:field.mid function='username(@me)'/}{dede:field.title /}{dede:field.title/} {dede:field.type function='typename(@me)'/} {dede:field.sendtime function='GetDateMk(@me)'/}{dede:field.errtxt /}{dede:field.oktxt /}{dede:field.errtxt/}{dede:field.oktxt/}
IP地址：{dede:field.ip/}时间：{dede:field.dtime function="GetDateTimeMK(@me)" /}时间：{dede:field.dtime function="GetDateTimeMK(@me)"/} 编辑评论 更新评论 diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 5d7f1e2f..79d67f0f 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -43,7 +43,7 @@
{dede:field.method/} {dede:field.cip/}{dede:field.dtime function="MyDate('y/m/d H:i:s',@me)" /}{dede:field.dtime function="MyDate('y/m/d H:i:s',@me)"/}
{dede:field.email/}
昵称：{dede:field.uname/}		{dede:field.sex /}{dede:field.sex/} {dede:field.rank function="GetMemberName(@me,'限制会员')"/}{dede:field.mtype /} 用户 {dede:field.matt function="GetMAtt(@me)" /}
- 金币：{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.matt function="GetMAtt(@me)"/}
+ 金币：{dede:field.money/} 积分：{dede:field.scores/}		{dede:field.logintime function="MyDate('y-m-d H:i',@me)"/}
+ {dede:field.loginip/}		 修改 删除 diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index 3e8536f5..ce4a2dae 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -35,7 +35,7 @@ 已经是管理员了，不要再提升了"; + echo "已经是管理员了，不要再提升了"; } else { ?> @@ -99,7 +99,7 @@ + （安全码：） @@ -88,8 +88,8 @@ diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 975052af..f31178a0 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -55,16 +55,16 @@ '} - - - - - + + + + + {dede:datalist empty=''} - - + + {/dede:datalist} diff --git a/src/admin/templets/plus_main.htm b/src/admin/templets/plus_main.htm index ecbf5555..5aca3efb 100644 --- a/src/admin/templets/plus_main.htm +++ b/src/admin/templets/plus_main.htm @@ -23,9 +23,9 @@ {dede:datalist empty=''} - - - + + + {/dede:datalist} diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index d5fc727a..57b41c38 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -68,8 +68,8 @@ table{border-collapse:separate} @@ -80,8 +80,8 @@ table{border-collapse:separate} diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index c24eede1..b030d86b 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -62,8 +62,8 @@ table{border-collapse:separate} @@ -74,8 +74,8 @@ table{border-collapse:separate} diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 8f142086..117dd254 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -78,8 +78,8 @@ table{border-collapse:separate} @@ -90,8 +90,8 @@ table{border-collapse:separate} @@ -281,7 +281,7 @@ table{border-collapse:separate} diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index 6984a515..c4b0b896 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -76,8 +76,8 @@ table{border-collapse:separate} @@ -88,8 +88,8 @@ table{border-collapse:separate} @@ -295,7 +295,7 @@ table{border-collapse:separate}
验证安全码： - （安全码：）
diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 270a52a6..c518e5ef 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -76,8 +76,8 @@ - - + +
基本设置字段管理基本设置字段管理
- - + +
基本设置字段管理基本设置字段管理
{dede:field.id /}{dede:field.typename /}{dede:field.nid /}{dede:field.addtable function="str_replace('#@__',$cfg_dbprefix,@me)" /}{dede:field.isshow function="GetSta(@me,$fields['id'])" /}{dede:field.id/}{dede:field.typename/}{dede:field.nid/}{dede:field.addtable function="str_replace('#@__',$cfg_dbprefix,@me)"/}{dede:field.isshow function="GetSta(@me,$fields['id'])"/} {dede:field.issystem function='IsSystem(@me)'/} - + diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index 2a3fe4a5..de6affc3 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -24,15 +24,15 @@
暂无内容
{dede:field.aid /}{dede:field.tagname /}{dede:field.aid/}{dede:field.tagname/} {dede:field.typename function='TestType(@me)'/} {dede:field.timeset function='TimeSetValue(@me)'/} {dede:field.endtime function='GetDateMk(@me)'/} - 修改 | - 删除 | - JS调用 + 修改 | + 删除 | + JS调用
暂无内容
{dede:field.aid /}{dede:field.plusname /}{dede:field.writer /}{dede:field.aid/}{dede:field.plusname/}{dede:field.writer/} {dede:field.isshow function="GetSta(@me,$fields['aid'],$fields['plusname'])"/}
- - + +
常规信息高级参数常规信息高级参数
- - + +
常规信息高级参数常规信息高级参数
- - + +
常规参数高级参数常规参数高级参数
- - + +
常规参数高级参数常规参数高级参数
- - + +
常规参数专题文档常规参数专题文档
- - + +
常规参数专题文档常规参数专题文档
专题节点列表：
1、文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章；
- 2、关于单条记录模板里的[field:fieldname /]标记的使用，请参考关于系统帮助关于 arclist 标记的说明；
+ 2、关于单条记录模板里的[field:fieldname/]标记的使用，请参考关于系统帮助关于 arclist 标记的说明；
3、节点ID是节点的唯一标识，专题模板中用{dede:field.note noteid='标识'/}这样来表示单个节点，不指定noteid时为所有节点列表
4、正常的情况下，每个节点显示的是“节点文章列表”里的文档，如果您指定为“自动获取模式”，那么必须指定关键词和栏目ID
- - + +
常规参数专题文档常规参数专题文档
- - + +
常规参数专题文档常规参数专题文档
- + '} - - + + - + - - + + - - - + + + - - + + {dede:datalist empty=''} - - + + diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 58b8f4bb..180ecdc6 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -98,7 +98,7 @@ diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index 23bbe431..6f66d73d 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -76,7 +76,7 @@ diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index b58339e8..fd0ed6a2 100644 --- a/src/admin/templets/sys_payment.htm +++ b/src/admin/templets/sys_payment.htm @@ -34,20 +34,20 @@ {dede:datalist empty=''} - - - + + + '} - - - + + + - + {/dede:datalist} diff --git a/src/admin/templets/vote_main.htm b/src/admin/templets/vote_main.htm index a80b06e0..eaae7003 100644 --- a/src/admin/templets/vote_main.htm +++ b/src/admin/templets/vote_main.htm @@ -25,20 +25,16 @@ {dede:datalist empty=''} - + + + + + + - - - - - {/dede:datalist} diff --git a/src/apps/diy.php b/src/apps/diy.php index 3ca09e1b..a7bce1f6 100755 --- a/src/apps/diy.php +++ b/src/apps/diy.php @@ -13,7 +13,7 @@ $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0; $action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post'; $id = isset($id) && is_numeric($id) ? $id : 0; if (empty($diyid)) { - showMsg('非法操作!', 'javascript:;'); + showMsg('非法操作', 'javascript:;'); exit(); } require_once DEDEINC.'/diyform.class.php'; diff --git a/src/apps/download.php b/src/apps/download.php index aadf00f7..f7ad239e 100755 --- a/src/apps/download.php +++ b/src/apps/download.php @@ -17,7 +17,7 @@ if ($open == 0) { if ($aid == 0) exit('dedebiz'); $arcRow = GetOneArchive($aid); if ($arcRow['aid'] == '') { - ShowMsg('无法获取未知文档的信息!', '-1'); + ShowMsg('无法获取未知文档的信息', '-1'); exit(); } extract($arcRow, EXTR_SKIP); diff --git a/src/apps/recommend.php b/src/apps/recommend.php index 04763472..55e9c29b 100755 --- a/src/apps/recommend.php +++ b/src/apps/recommend.php @@ -16,7 +16,7 @@ if (isset($arcID)) $aid = $arcID; $arcID = $aid = (isset($aid) && is_numeric($aid) ? $aid : 0); $type = (!isset($type) ? "" : $type); if (empty($aid)) { - ShowMsg("文档ID不能为空!", "-1"); + ShowMsg("文档ID不能为空", "-1"); exit(); } //读取文档信息 @@ -24,7 +24,7 @@ if ($action == '') { //读取文档信息 $arcRow = GetOneArchive($aid); if ($arcRow['aid'] == '') { - ShowMsg("无法把未知文档推荐给好友!", "-1"); + ShowMsg("无法把未知文档推荐给好友", "-1"); exit(); } extract($arcRow, EXTR_OVERWRITE); @@ -39,8 +39,7 @@ else if ($action == 'send') { $msg = RemoveXSS(dede_htmlspecialchars($msg)); $mailtitle = "您的好友给您推荐了一篇文章"; $mailbody .= "$msg \r\n\r\n"; - $mailbody .= "Powered by https://www.dedebiz.com DedeBIZ内容管理系统"; - + $mailbody .= "Powered by DedeBIZ"; $headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail; if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); @@ -59,13 +58,12 @@ else if ($action == 'send') { @mail($email, $mailtitle, $mailbody, $headers); } } - - ShowMsg("成功推荐一篇文章!", $arcurl); + ShowMsg("成功推荐一篇文章", $arcurl); exit(); } $arcRow = GetOneArchive($aid); if ($arcRow['aid'] == '') { - ShowMsg("无法把未知文档推荐给好友!", "-1"); + ShowMsg("无法把未知文档推荐给好友", "-1"); exit(); } extract($arcRow, EXTR_OVERWRITE); diff --git a/src/apps/stow.php b/src/apps/stow.php index db1cea1d..a36c1fd4 100755 --- a/src/apps/stow.php +++ b/src/apps/stow.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/../system/common.inc.php"); $aid = (isset($aid) && is_numeric($aid)) ? $aid : 0; $type = empty($type) ? "" : HtmlReplace($type, 1); if ($aid == 0) { - ShowMsg('文档id不能为空!', 'javascript:window.close();'); + ShowMsg('文档id不能为空', 'javascript:window.close();'); exit(); } require_once(DEDEINC."/memberlogin.class.php"); @@ -25,7 +25,7 @@ if ($ml->M_ID == 0) { //读取文档信息 $arcRow = GetOneArchive($aid); if ($arcRow['aid'] == '') { - ShowMsg("无法收藏未知文档!", "javascript:window.close();"); + ShowMsg("无法收藏未知文档", "javascript:window.close();"); exit(); } extract($arcRow, EXTR_SKIP); diff --git a/src/apps/vdimgck.php b/src/apps/vdimgck.php index 3601a10e..96f44935 100755 --- a/src/apps/vdimgck.php +++ b/src/apps/vdimgck.php @@ -12,14 +12,14 @@ require_once(dirname(__FILE__).'/../system/common.inc.php'); require_once(DEDEDATA.'/config.cache.inc.php'); //安全提示 $config = array( - 'font_size' => 20, - 'img_height' => '36', - 'word_type' => 3, - 'img_width' => '80', - 'use_boder' => TRUE, - 'font_file' => DEDEINC.'/data/fonts/'.mt_rand(1, 6).'.ttf', - 'wordlist_file' => DEDEINC.'/data/words/words.txt', - 'filter_type' => 5 + 'font_size' => 20, + 'img_height' => '36', + 'word_type' => 3, + 'img_width' => '80', + 'use_boder' => TRUE, + 'font_file' => DEDEINC.'/data/fonts/'.mt_rand(1, 6).'.ttf', + 'wordlist_file' => DEDEINC.'/data/words/words.txt', + 'filter_type' => 5 ); $enkey = substr(md5(substr($cfg_cookie_encode, 0, 5)), 0, 10); $sessSavePath = DEDEDATA."/sessions_{$enkey}"; diff --git a/src/apps/view.php b/src/apps/view.php index 99b43eec..f7b8af1e 100755 --- a/src/apps/view.php +++ b/src/apps/view.php @@ -47,7 +47,7 @@ if ($needMoney > 0 || $needRank > 1) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要 ".$memberTypes[$needRank]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; + $moremsg = "这篇文档需要 ".$memberTypes[$needRank]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank].""; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(); } @@ -59,7 +59,7 @@ if ($needMoney > 0 || $needRank > 1) { if (!is_array($row)) { if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) { $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币：".$cfg_ml->M_Money." 个 "; + $moremsg = "这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币：".$cfg_ml->M_Money." 个"; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); $arc->Close(); exit(); @@ -76,7 +76,7 @@ if ($needMoney > 0 || $needRank > 1) { showmsg('购买成功，购买扣点不会重扣金币，谢谢', '/plus/view.php?aid='.$aid); exit; } else { - showmsg('购买失败, 请返回', -1); + showmsg('购买失败，请返回', -1); exit; } } diff --git a/src/static/web/img/favicon.ico b/src/static/web/img/favicon.ico index c20184e2af957570abfe582bffb63ec2a89a50cd..a0d83587a7bb2ea994c573b5d791019af3a01789 100644 GIT binary patch literal 4286 zcmcgwTT4_?6yBpL6ckcYq#0%fCQ-fg&`VSgJ@yCkrMHTR=&6f&$?2j&78dj(Q;-;m zNu|_-k>w>KBFro-D$52l5vepYo%#CKIdkT^kDk#Pw|t&+_C9-kYkzC4y^kv8;!kd_ zlHcl9hEmIwQuzeC)DA-Wjm9x;b0bf={k6)C0b)GK7^MA1qQLOQjn%xrPhfuGZ{wOb zk@NEW@`kU|?;*E0$Y0K}({q5#k59*bYA|8U;anGyPX5^-wUpc^h?9h4KZM&a`3A-L z`B#CSA)t3Se!TDko|nMhdLZvSu;7$wb9y}tZj-+R*m4b+^kGhIiu1b$fbtd~=S)Bk zx$5I$)fyD}Hg;G?M%kG;jLbUN1uVETt`?gI$D26Klvkd3)e96 zp7ys^GakQUeHa=8)?FgMti_B$;`wPeoqJEsE5PrM^g*7t)sQW?^Y6N0&u{I&KI#;XPR2jmY5b}GBCfBtTd)6ikB$D!iIr8rxelPB zGlWXsA9@HZ(eIy@j-e~hzuh&!@SkYqf#2L8He4Y;>orDy$wzXel$bRtb!x%IKBH#D z2RqRJ6s~(c_W{vM*PeTU6{4fqh|YiW+4N1$i+I2_=aBbcBk=A=tnT8AoU7%JfmE(5 zz%AEM{*ynAx*TBM)W30#+l=#rUf>(|-*N8qcI^|-!nKv;rcQSJGFHI-VQ|#W%Iy1# zTF84mf;(pYhF{cjKXsH`Nko%9;KCCiBT{!ug9!aCT^2Ks>NNEek3UksBdmd{c3`38 zlD>Ym{8Arl_zkDq!)Nm0AJ4fSp0(A_fQ=W)E8JFY$6m=F`2LI@HCGdj2eXb^KB3aju$oeGzdunc@)Y+ zKqNp27=l2dU=ff<>w^jgjSo~n*qVX@5u`=i0%bnGZ)c`0X1jZ5IxV|XZ*%wVc4uei z`_4J{oO|Y6%j(3xp+hac=2`uRSyoTWvih_0U)Feb{XgD@I)lmU;Tl-wm9TDIXj@hR z`-BYYyx*>qZEIAiZPlEC3EakGw#8tLEwg)$T#Ni+%TSU#4W(8A`-BYYyx&VEp|tN@ zls>c)MPs&O@T}eF+z7ITH=7Qk+lXR}zHT;RohJgs-P9-WeJ1s0_kP7x)D2vWHRHjUN9gV;;DPR6-7?o7g(>R!o3Cmz#pK8{VRupj;}2U`xJ^JA+q|I$gWyi=Vo zQ@RLR%lLU*+%7KG*p^%=rgP%j7V*nYUjG!B^hNvhiJt?nYzFRM0o*Vb zU@X$afB0N5rcEyYEMD`#3A9_YZ9x6pdEi7Xu6ej>lI6%+>g6S}UZ;X=Mg}>VekbZ)|neg{CB| zqYcQGlK8{Sz%LBsfH_Nib=VX=*X>*<={J$U?{YBeWAph?YlFPm(ZZiM2RQzZnGPr> zzI}0o@KXnJn5X`-$_)Q``oRa7M~jU9%Ldq2{Ah+>aljMw8#IWHf!KQ$0lS%7kWHJmt%p*sfm7oT6GxD9x!8rp4|Z|%_KuXgn4b7$KkTyidzJ%x zkNd|i+rMpLNci3R32X~Key{mP&$X1l`iOb3TH^5Aq$k^BM$ZF`Areq(W^+a2CzxJJoADyGD61Z$ic=*L5 zYv%Af{YkpFQ_PVW=6wM(k=J$c4f42uB^J@sZass)^^`)NkJnX*pKdwtW{|mGO z)#s!`lb()1CFCNndhQ|%3l6lws!Qi6N5ap7Pxx4i#wRiL&G1p z1NwuLT$6^?k8y65e0Nqk&#}jr0a{aEJF8i3N9%EW90b#UPX~A(iq)@~8D3`{I=VC7 zR-U`juEWFY;r2!ce*x=%+wL0PwbE-8Ubp_Y&m4PDyl%*oYeyJ~pU(zM`_8kiqFop$ zol6lbM(cax*WNzuZ(RNZx^R6H>qs`Bdda8PAz%AnHXeX=?}r$ZJ<*Pqj9ao}%3k{$ zwZ~KV)uvXUH+5id{IECxn<6nQVymCom!Q_h&%;EZ>9 Ga{m|chY#cc diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index a068ceaf..78e52723 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -140,7 +140,7 @@ class Archives */ function ParAddTable() { - //读取附加表信息，并把附加表的资料经过编译处理后导入到$this->Fields中，以方便在模板中用 {dede:field name='fieldname' /} 标记统一调用 + //读取附加表信息，并把附加表的资料经过编译处理后导入到$this->Fields中，以方便在模板中用 {dede:field name='fieldname'/} 标记统一调用 if ($this->ChannelUnit->ChannelInfos['addtable'] != '') { $row = $this->addTableRow; if ($this->ChannelUnit->ChannelInfos['issystem'] == -1) { diff --git a/src/system/dedetag.class.php b/src/system/dedetag.class.php index b093130a..e412603a 100755 --- a/src/system/dedetag.class.php +++ b/src/system/dedetag.class.php @@ -718,7 +718,7 @@ class DedeTagParse $e1 = strpos($this->SourceString, $eTagEndWord, $i); $e2 = strpos($this->SourceString, $FullTagStartWord, $i); $e3 = strpos($this->SourceString, $fullTagEndWordThis, $i); - //$eTagEndWord = /} $FullTagStartWord = {tag: $fullTagEndWordThis = {/tag:xxx] + //$eTagEndWord =/} $FullTagStartWord = {tag: $fullTagEndWordThis = {/tag:xxx] $e1 = trim($e1); $e2 = trim($e2); $e3 = trim($e3); diff --git a/src/system/filter.inc.php b/src/system/filter.inc.php index 47f0de61..131aad18 100755 --- a/src/system/filter.inc.php +++ b/src/system/filter.inc.php @@ -26,7 +26,7 @@ function _FilterAll($fk, &$svar) } } else { if ($cfg_notallowstr != '' && preg_match("#".$cfg_notallowstr."#i", $svar)) { - ShowMsg("{$fk}字段中包含禁用词!", '-1'); + ShowMsg("{$fk}字段中包含禁用词", '-1'); exit(); } if ($cfg_replacestr != '') { diff --git a/src/system/taglib/flink.lib.php b/src/system/taglib/flink.lib.php index 4dedb6f7..2a8eb15d 100755 --- a/src/system/taglib/flink.lib.php +++ b/src/system/taglib/flink.lib.php @@ -34,7 +34,7 @@ function lib_flink(&$ctag, &$refObj) $wsql .= " And logo='' "; } $equery = "SELECT * FROM `#@__flink` $wsql order by sortrank asc limit 0,$totalrow"; - if (trim($ctag->GetInnerText()) == '') $innertext = "[field:link /] "; + if (trim($ctag->GetInnerText()) == '') $innertext = "[field:link/] "; else $innertext = $ctag->GetInnerText(); $dsql->SetQuery($equery); $dsql->Execute(); diff --git a/src/system/taglib/flinktype.lib.php b/src/system/taglib/flinktype.lib.php index 8e3c3f38..ad405617 100755 --- a/src/system/taglib/flinktype.lib.php +++ b/src/system/taglib/flinktype.lib.php @@ -19,7 +19,7 @@ function lib_flinktype(&$ctag, &$refObj) $totalrow = $row; $revalue = ''; $equery = "SELECT * FROM `#@__flinktype` order by id asc limit 0,$totalrow"; - if (trim($ctag->GetInnerText()) == '') $innertext = "
  • [field:typename /]
    • "; + if (trim($ctag->GetInnerText()) == '') $innertext = "
  • [field:typename/]
    • "; else $innertext = $ctag->GetInnerText(); if (!isset($type)) $type = ''; $dtp = new DedeTagParse(); diff --git a/src/system/taglib/help/adminname.txt b/src/system/taglib/help/adminname.txt index 4f42ce82..a03feff0 100755 --- a/src/system/taglib/help/adminname.txt +++ b/src/system/taglib/help/adminname.txt @@ -1,4 +1,4 @@ 获得责任编辑名称 >>dede>> -{dede:adminname /} +{dede:adminname/} >>dede>> diff --git a/src/system/taglib/help/booklist.txt b/src/system/taglib/help/booklist.txt index b1b5f3d4..c23b41ef 100755 --- a/src/system/taglib/help/booklist.txt +++ b/src/system/taglib/help/booklist.txt @@ -1,7 +1,7 @@ 连载图书调用 >>dede>> {dede:booklist row='12' booktype='-1' orderby='lastpost' author='' keyword=''} -[field:bookname /]
    +[field:bookname/]
    {/dede:booklist} >>dede>> 这个标签和bookcontentlist实际是完全相同的，只是默认底层模板不同 diff --git a/src/system/taglib/help/channelartlist.txt b/src/system/taglib/help/channelartlist.txt index 5250838e..53f30c04 100755 --- a/src/system/taglib/help/channelartlist.txt +++ b/src/system/taglib/help/channelartlist.txt @@ -5,7 +5,7 @@
    {dede:field name='typename'/}
    {dede:arclist titlelen='42' row='10'} {/dede:arclist} diff --git a/src/system/taglib/help/demotag.txt b/src/system/taglib/help/demotag.txt index 198fdd4c..42eb66a0 100755 --- a/src/system/taglib/help/demotag.txt +++ b/src/system/taglib/help/demotag.txt @@ -1,5 +1,5 @@ 这仅是一个演示标签 >>dede>> -{dede:demotag /} +{dede:demotag/} >>dede>> 无属性信息 diff --git a/src/system/taglib/help/feedback.txt b/src/system/taglib/help/feedback.txt index 5556f7f9..9fcf7722 100755 --- a/src/system/taglib/help/feedback.txt +++ b/src/system/taglib/help/feedback.txt @@ -3,7 +3,7 @@ {dede:feedback}
    • [field:username function="(@me=='guest' ? '游客' : @me)"/] 对 [field:title/] 的评论：
      • -
    •  [field:msg /]
      • +
    •  [field:msg/]
    {/dede:feedback} >>dede>> diff --git a/src/system/taglib/help/hotwords.txt b/src/system/taglib/help/hotwords.txt index a47cb4dc..54acf2c7 100755 --- a/src/system/taglib/help/hotwords.txt +++ b/src/system/taglib/help/hotwords.txt @@ -1,6 +1,6 @@ 获取网站搜索的热门关键词 >>dede>> -{dede:hotwords /} +{dede:hotwords/} >>dede>> num='6' 关键词数目 subday='365' 天数 diff --git a/src/system/taglib/help/infoguide.txt b/src/system/taglib/help/infoguide.txt index 695be580..5a568a22 100755 --- a/src/system/taglib/help/infoguide.txt +++ b/src/system/taglib/help/infoguide.txt @@ -1,5 +1,5 @@ 分类信息的地区与小分类搜索 >>dede>> -{dede:infoguide /} +{dede:infoguide/} >>dede>> 无属性 \ No newline at end of file diff --git a/src/system/taglib/help/infolink.txt b/src/system/taglib/help/infolink.txt index d49f893e..4c4c6fd4 100755 --- a/src/system/taglib/help/infolink.txt +++ b/src/system/taglib/help/infolink.txt @@ -1,5 +1,5 @@ 分类信息地区与类型快捷链接 >>dede>> -{dede:infolink /} +{dede:infolink/} >>dede>> 无属性 \ No newline at end of file diff --git a/src/system/taglib/help/memberlist.txt b/src/system/taglib/help/memberlist.txt index 4650b987..57f6dc8a 100755 --- a/src/system/taglib/help/memberlist.txt +++ b/src/system/taglib/help/memberlist.txt @@ -1,8 +1,8 @@ 会员信息调用标签 >>dede>> {dede:memberlist orderby='scores' row='20'} -{dede:field.userid /} -{dede:field.scores /} +{dede:field.userid/} +{dede:field.scores/} {/dede:memberlist} >>dede>> orderby = 'scores' 按积分排序 diff --git a/src/system/taglib/help/softmsg.txt b/src/system/taglib/help/softmsg.txt index 1d2197a8..40bb2fc4 100755 --- a/src/system/taglib/help/softmsg.txt +++ b/src/system/taglib/help/softmsg.txt @@ -1,4 +1,4 @@ 下载说明标签 >>dede>> -{dede:softmsg /} +{dede:softmsg/} >>dede>> \ No newline at end of file diff --git a/src/system/taglib/help/type.txt b/src/system/taglib/help/type.txt index 0a46fbee..86d182a0 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/theme/system/channel_list.htm b/src/theme/system/channel_list.htm index 60c17e2a..0b6aa972 100644 --- a/src/theme/system/channel_list.htm +++ b/src/theme/system/channel_list.htm @@ -1 +1 @@ - | [field:typename /] \ No newline at end of file + | [field:typename/] \ No newline at end of file diff --git a/src/theme/system/info_guide.htm b/src/theme/system/info_guide.htm index af6ebc50..48d778ad 100644 --- a/src/theme/system/info_guide.htm +++ b/src/theme/system/info_guide.htm @@ -2,9 +2,9 @@
    diff --git a/src/theme/system/spec_list.htm b/src/theme/system/spec_list.htm index 1c37d264..1910e735 100644 --- a/src/theme/system/spec_list.htm +++ b/src/theme/system/spec_list.htm @@ -7,12 +7,12 @@     		[field:typelink /] [field:textlink /]点击:[field:click /][field:typelink/] [field:textlink/]点击:[field:click/]
    - [field:description /]([field:stime /]) + [field:description/]([field:stime/])
    \ No newline at end of file diff --git a/src/theme/system/tag_arclist.htm b/src/theme/system/tag_arclist.htm index e906512b..929150be 100644 --- a/src/theme/system/tag_arclist.htm +++ b/src/theme/system/tag_arclist.htm @@ -1 +1 @@ -[field:title /]
    \ No newline at end of file +[field:title/]
    \ No newline at end of file diff --git a/src/theme/templets/advancedsearch.htm b/src/theme/templets/advancedsearch.htm index e6cfd830..ae0e7543 100644 --- a/src/theme/templets/advancedsearch.htm +++ b/src/theme/templets/advancedsearch.htm @@ -3,7 +3,7 @@ - 搜索结果页-<?php echo $cfg_webname;?> + 搜索结果页-<?php echo $cfg_webname; ?>