From 0f8052d4487d9d508a20d17fe6112d02ac914884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <2449271624@qq.com> Date: Mon, 29 Jan 2024 17:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E9=9B=85=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=A0=E6=95=88htm=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E7=A7=BB=E9=99=A4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?cfg=5Ffck=5Fxhtml=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/tpl.php | 2 +- src/install/config.cache.inc.php | 7 +- src/install/sql-dfdata.txt | 99 +++++++++++----------- src/system/archive/searchview.class.php | 2 +- src/system/common.inc.php | 3 +- src/system/inc/inc_fun_funString.php | 12 +-- src/system/taglib/arclist.lib.php | 2 +- src/system/taglib/arclistsg.lib.php | 1 - src/system/taglib/cattree.lib.php | 3 +- src/system/taglib/channelartlist.lib.php | 5 +- src/system/taglib/demotag.lib.php | 5 +- src/system/taglib/feedback.lib.php | 2 +- src/system/taglib/infoguide.lib.php | 3 +- src/system/taglib/infolink.lib.php | 3 +- src/system/taglib/likearticle.lib.php | 3 +- src/system/taglib/likesgpage.lib.php | 7 +- src/system/taglib/loop.lib.php | 2 +- src/system/taglib/productimagelist.lib.php | 2 +- src/system/taglib/relation.lib.php | 3 +- src/system/taglib/statistics.lib.php | 1 - src/system/taglib/tag.lib.php | 1 - src/system/taglib/type.lib.php | 2 +- src/system/taglib/userinfo.lib.php | 2 +- src/system/taglib/vote.lib.php | 3 +- src/system/tpllib/plus_channel.php | 1 - src/user/edit_baseinfo.php | 3 +- 26 files changed, 79 insertions(+), 100 deletions(-) diff --git a/src/admin/tpl.php b/src/admin/tpl.php index e03bbeee..01d69b0b 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -165,7 +165,7 @@ function lib_demotag(\$ctag, \$refObj) extract(\$ctag->CAttribute->Items, EXTR_SKIP); \$revalue = ''; //您需编写的代码,不能用echo之类语法,把最终返回值传给\$revalue - \$revalue = 'Hello Word!'; + \$revalue = '您好,欢迎使用DedeBIZ系统'; return \$revalue; } ?".'>'; diff --git a/src/install/config.cache.inc.php b/src/install/config.cache.inc.php index 1e9c8e6c..c47436f2 100755 --- a/src/install/config.cache.inc.php +++ b/src/install/config.cache.inc.php @@ -18,15 +18,14 @@ $cfg_softtype = 'zip|gz|rar|iso|doc|xsl|ppt|wps'; $cfg_mediatype = 'swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'; $cfg_specnote = 10; $cfg_list_symbol = ''; -$cfg_notallowstr = '乡巴佬|傻子'; -$cfg_replacestr = '乡巴佬|傻子'; +$cfg_notallowstr = '渣男|直男'; +$cfg_replacestr = '渣男|直男'; $cfg_feedbackcheck = 'N'; $cfg_keyword_replace = 'Y'; -$cfg_fck_xhtml = 'N'; $cfg_df_style = 'dedebiz'; $cfg_multi_site = 'N'; $cfg_dede_log = 'N'; -$cfg_powerby = 'Copyright © 2023 DedeBIZ 版权所有'; +$cfg_powerby = 'Copyright © 2024 DedeBIZ 版权所有'; $cfg_arcsptitle = 'N'; $cfg_arcautosp = 'N'; $cfg_arcautosp_size = 5; diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 65a59151..4a5d8ec3 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -3946,7 +3946,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'), ('18','cfg_specnote','专题的最大节点数','2','number','10'), ('19','cfg_list_symbol','栏目位置的间隔符号','2','string',''), -('20','cfg_notallowstr','禁用关键词,用|分开,但不要在结尾加|','5','bstring','乡巴佬|傻子'), +('20','cfg_notallowstr','禁用关键词,用|分开,但不要在结尾加|','5','bstring','渣男|直男'), ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'), ('22','cfg_keyword_replace','是否使用关键词替换功能,开启影响文档生成速度','2','bool','Y'), ('23','cfg_rewrite','是否启用伪静态,参考栏目修改提示里默认规则','1','bool','N'), @@ -3954,7 +3954,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('25','cfg_multi_site','是否支持多站点,开启此项后附件栏目连接arclist文档启用绝对网址','2','bool','N'), ('26','cfg_rm_remote','下载远程图片和资源','7','bool','Y'), ('27','cfg_dede_log','是否开启管理日志','2','bool','N'), -('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2023 DedeBIZ 版权所有'), +('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2024 DedeBIZ 版权所有'), ('29','cfg_jump_once','跳转网址是否直接跳转否则显示中转页','7','bool','Y'), ('30','cfg_task_pwd','系统计划任务客户端许可密码,需要客户端,通常不会太重要','7','string',''), ('31','cfg_arcsptitle','是否开启分页标题,开启影响文档生成速度','6','bool','N'), @@ -3971,7 +3971,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('42','cfg_cli_time','服务器时区设置','2','number','8'), ('43','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'), ('44','cfg_mb_max','会员附件总大小限制(MB)','4','number','500'), -('45','cfg_replacestr','禁用关键词替换成*,用|分开,但不要在结尾加|','5','bstring','乡巴佬|傻子'), +('45','cfg_replacestr','禁用关键词替换成*,用|分开,但不要在结尾加|','5','bstring','渣男|直男'), ('46','cfg_keyword_like','使用关键词关连文档','6','bool','Y'), ('47','cfg_index_max','首页调用函数最大索引文档数,不适用于经常单栏目采集过多文档网站,不启用本项此值设置为0即可','6','number','10000'), ('48','cfg_index_cache','arclist标签调用缓存(0不启用,大于0值为多少秒)','6','number','86400'), @@ -4017,53 +4017,52 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('88','cfg_smtp_password','SMTP服务器密码','2','string','tianya'), ('89','cfg_online_type','在线支付网关类型','2','string','nps'), ('90','cfg_upload_switch','删除文档同时删除相关附件文件','2','bool','Y'), -('91','cfg_fck_xhtml','是否使用XHTML富文本','2','bool','N'), -('92','cfg_allsearch_limit','网站全局搜索时间限制(秒)','2','string','1'), -('93','cfg_delete','是否开启文档回收站','2','bool','Y'), -('94','cfg_keywords','首页关键词','1','string',''), -('95','cfg_description','首页描述','1','bstring',''), -('96','cfg_beian','网站备案号','1','string',''), -('97','cfg_need_typeid2','是否启用副栏目','6','bool','Y'), -('98','cfg_mb_pwdtype','前台密码验证类型32-32位md5,可选l16-前16位、r16-后16位、m16-中间16位','4','string','32'), -('99','cfg_cache_type','文档ID,content标签最终文档,修改此变量后必须更新缓存','6','string','id'), -('100','cfg_max_face','会员上传头像大小限制(KB)','3','number','2024'), -('101','cfg_typedir_df','栏目网址使用目录名(不显示默认页,则是/a/b/c形式)','2','bool','Y'), -('102','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'), -('103','cfg_make_prenext','发布文档后马上更新上下篇','6','bool','N'), -('104','cfg_make_andcat','发布文档后马上更新相关栏目','6','bool','N'), -('105','cfg_feedback_forbid','是否禁止所有评论,包括禁止顶踩等','5','bool','N'), -('106','cfg_addon_domainbind','是否绑定附件目录为指定的二级域名','7','bool','N'), -('107','cfg_addon_domain','附件目录的二级域名','7','string',''), -('108','cfg_df_dutyadmin','默认作者名称','7','string','网站管理员'), -('109','cfg_face_adds','上传头像增加积分','5','number','10'), -('110','cfg_moreinfo_adds','填写详细资料增加积分','5','number','20'), -('111','cfg_money_scores','多少积分可以兑换一个金币','5','number','50'), -('112','cfg_mb_wnameone','是否允许会员昵称重复','4','bool','N'), -('113','cfg_arc_dirname','是否允许用目录作为文档文件名,文档命名规则:{typedir}/{aid}/index.html','7','bool','Y'), -('114','cfg_puccache_time','需缓存文档全局缓存时间(秒)','6','number','36000'), -('115','cfg_arc_click','文档默认浏览数(-1表示随机1000到6000之间)','7','number','-1'), -('116','cfg_addon_savetype','附件保存形式,按data函数日期参数(y年m月d日)','3','string','ymd'), -('117','cfg_qk_uploadlit','异步上传缩略图,空间太不稳定会员关闭此项','3','bool','Y'), -('118','cfg_login_adds','登录会员中心获积分','5','number','2'), -('119','cfg_userad_adds','会员推广获积分','5','number','10'), -('120','cfg_replace_num','文档关键词替换次数(0为全部替换)','7','number','1'), -('121','cfg_uplitpic_cut','是否上传缩略图后马上弹出裁剪框','3','bool','Y'), -('122','cfg_album_mark','是否使用图集水印,小图也会受影响','3','bool','N'), -('123','cfg_mb_feedcheck','是否需要会员动态审核','4','bool','N'), -('124','cfg_mb_msgischeck','是否需要会员状态审核','4','bool','N'), -('125','cfg_title_site','是否发布和修改文档时远程发布,启用远程站点的前提下','2','bool','N'), -('126', 'cfg_domain_cookie', '跨域共享Cookie的域名', 2, 'string', ''), -('127', 'cfg_cross_sectypeid', '支持交叉栏目显示副栏目文档', '7', 'bool', 'Y'), -('128', 'cfg_digg_update', '顶踩缓存异步更新间隔(0为不缓存)', '6', 'number', '0'), -('129', 'cfg_feedback_guest', '是否允许匿名评论', '5', 'bool', 'N'), -('130', 'cfg_feedback_msglen', '评论文档字数限定', 5, 'number', '255'), -('131', 'cfg_auth_code', '商业版授权码', 1, 'bstring', ''), -('132', 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1'), -('133', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'), -('134', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), -('135', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), -('136', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'), -('137', 'cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); +('91','cfg_allsearch_limit','网站全局搜索时间限制(秒)','2','string','1'), +('92','cfg_delete','是否开启文档回收站','2','bool','Y'), +('93','cfg_keywords','首页关键词','1','string',''), +('94','cfg_description','首页描述','1','bstring',''), +('95','cfg_beian','网站备案号','1','string',''), +('96','cfg_need_typeid2','是否启用副栏目','6','bool','Y'), +('97','cfg_mb_pwdtype','前台密码验证类型32-32位md5,可选l16-前16位、r16-后16位、m16-中间16位','4','string','32'), +('98','cfg_cache_type','文档ID,content标签最终文档,修改此变量后必须更新缓存','6','string','id'), +('99','cfg_max_face','会员上传头像大小限制(KB)','3','number','2024'), +('100','cfg_typedir_df','栏目网址使用目录名(不显示默认页,则是/a/b/c形式)','2','bool','Y'), +('101','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'), +('105','cfg_make_prenext','发布文档后马上更新上下篇','6','bool','N'), +('103','cfg_make_andcat','发布文档后马上更新相关栏目','6','bool','N'), +('104','cfg_feedback_forbid','是否禁止所有评论,包括禁止顶踩等','5','bool','N'), +('105','cfg_addon_domainbind','是否绑定附件目录为指定的二级域名','7','bool','N'), +('106','cfg_addon_domain','附件目录的二级域名','7','string',''), +('107','cfg_df_dutyadmin','默认作者名称','7','string','网站管理员'), +('108','cfg_face_adds','上传头像增加积分','5','number','10'), +('109','cfg_moreinfo_adds','填写详细资料增加积分','5','number','20'), +('110','cfg_money_scores','多少积分可以兑换一个金币','5','number','50'), +('111','cfg_mb_wnameone','是否允许会员昵称重复','4','bool','N'), +('112','cfg_arc_dirname','是否允许用目录作为文档文件名,文档命名规则:{typedir}/{aid}/index.html','7','bool','Y'), +('113','cfg_puccache_time','需缓存文档全局缓存时间(秒)','6','number','36000'), +('114','cfg_arc_click','文档默认浏览数(-1表示随机1000到6000之间)','7','number','-1'), +('115','cfg_addon_savetype','附件保存形式,按data函数日期参数(y年m月d日)','3','string','ymd'), +('116','cfg_qk_uploadlit','异步上传缩略图,空间太不稳定会员关闭此项','3','bool','Y'), +('117','cfg_login_adds','登录会员中心获积分','5','number','2'), +('118','cfg_userad_adds','会员推广获积分','5','number','10'), +('119','cfg_replace_num','文档关键词替换次数(0为全部替换)','7','number','1'), +('120','cfg_uplitpic_cut','是否上传缩略图后马上弹出裁剪框','3','bool','Y'), +('121','cfg_album_mark','是否使用图集水印,小图也会受影响','3','bool','N'), +('122','cfg_mb_feedcheck','是否需要会员动态审核','4','bool','N'), +('123','cfg_mb_msgischeck','是否需要会员状态审核','4','bool','N'), +('124','cfg_title_site','是否发布和修改文档时远程发布,启用远程站点的前提下','2','bool','N'), +('125', 'cfg_domain_cookie', '跨域共享Cookie的域名', 2, 'string', ''), +('126', 'cfg_cross_sectypeid', '支持交叉栏目显示副栏目文档', '7', 'bool', 'Y'), +('127', 'cfg_digg_update', '顶踩缓存异步更新间隔(0为不缓存)', '6', 'number', '0'), +('128', 'cfg_feedback_guest', '是否允许匿名评论', '5', 'bool', 'N'), +('129', 'cfg_feedback_msglen', '评论文档字数限定', 5, 'number', '255'), +('130', 'cfg_auth_code', '商业版授权码', 1, 'bstring', ''), +('131', 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1'), +('132', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'), +('133', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), +('134', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), +('135', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'), +('136', 'cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''), (2, 'b437d85a7a7bc778c9c79b5ec36ab9aa', '友情链接', '', '', 0, ''), diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index e9bb3016..50063efe 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -501,7 +501,7 @@ class SearchView $colWidth = $colWidth."%"; $innertext = trim($innertext); if ($innertext == '') { - $innertext = GetSysTemplets("search_list.htm"); + $innertext = GetSysTemplets("list_fulllist.htm"); } //排序方式 $ordersql = ''; diff --git a/src/system/common.inc.php b/src/system/common.inc.php index a70ab3a3..e4a6d53e 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -21,8 +21,7 @@ if (!defined('DEBUG_LEVEL')) { } if (DEDE_ENVIRONMENT == 'production') { ini_set('display_errors', 0); - if (version_compare(PHP_VERSION, '5.3', '>=')) - { + if (version_compare(PHP_VERSION, '5.3', '>=')) { error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); } else { error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); diff --git a/src/system/inc/inc_fun_funString.php b/src/system/inc/inc_fun_funString.php index d6c79ba5..04936867 100755 --- a/src/system/inc/inc_fun_funString.php +++ b/src/system/inc/inc_fun_funString.php @@ -5,19 +5,15 @@ function SpHtml2Text($str) $str = preg_replace("/||/isU","",$str); $alltext = ''; $start = 1; - for ($i=0;$i") { + if ($start == 0 && $str[$i] == ">") { $start = 1; - } - else if ($start==1) - { + } else if ($start==1) { if ($str[$i]=="<") { $start = 0; $alltext .= " "; - } - else if (ord($str[$i])>31) - { + } else if (ord($str[$i]) > 31) { $alltext .= $str[$i]; } } diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index d113b6e1..486d8e30 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -225,7 +225,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele } } $orwheres[] = 'arc.arcrank > -1'; - //否定指定栏目 + //否定栏目调用 if (!empty($notypeid)) { $orwheres[] = "and arc.typeid NOT IN (".GetSonIds($notypeid).")"; } diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php index 8784d93c..a0d680f0 100755 --- a/src/system/taglib/arclistsg.lib.php +++ b/src/system/taglib/arclistsg.lib.php @@ -20,7 +20,6 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_arclistsg(&$ctag, &$refObj) { global $dsql, $PubFields, $cfg_keyword_like, $cfg_index_cache, $_arclistEnv, $envs, $_sys_globals; - //属性处理 $attlist = "typeid|0,row|10,col|1,flag|,titlelen|30,sort|default,keyword|,innertext|,arcid|0,idlist|,channelid|0,limit|,orderway|desc,subday|0"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); diff --git a/src/system/taglib/cattree.lib.php b/src/system/taglib/cattree.lib.php index 31632769..74a488a4 100755 --- a/src/system/taglib/cattree.lib.php +++ b/src/system/taglib/cattree.lib.php @@ -10,8 +10,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_cattree(&$ctag, &$refObj) { global $dsql; - //属性处理showall在空或不存在时,强制用产品模型id;如果是yes刚显示整个语言区栏目树,为其它数字则是这个数字的模型的id;typeid指定顶级树id,指定后,前一个属性无效 - $attlist = "showall|,catid|0"; + $attlist = "showall|,catid|0"; //处理showall在空或不存在时,强制用产品模型id。如果是yes刚显示整个语言区栏目树,为其它数字则是这个数字的模型的id;typeid指定顶级树id,指定后的前一个属性无效 FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/channelartlist.lib.php b/src/system/taglib/channelartlist.lib.php index 2055b71e..bb4f1506 100755 --- a/src/system/taglib/channelartlist.lib.php +++ b/src/system/taglib/channelartlist.lib.php @@ -13,8 +13,7 @@ require_once(DEDEINC.'/archive/partview.class.php'); function lib_channelartlist(&$ctag, &$refObj) { global $dsql, $envs, $_sys_globals; - //添加不调用指定栏目参数notypeid - $attlist = 'typeid|0,row|20,cacheid|,notypeid|0,currentstyle|'; + $attlist = "typeid|0,row|10,cacheid|,notypeid|0,currentstyle|"; //后续添加否定栏目调用notypeid FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); @@ -42,7 +41,7 @@ function lib_channelartlist(&$ctag, &$refObj) $tpsql = " id IN($typeid) AND ishidden<>1 "; } } - //否定指定栏目 + //否定栏目调用 if ($notypeid!=0) { $tpsql = $tpsql."and not(id in($notypeid))"; } diff --git a/src/system/taglib/demotag.lib.php b/src/system/taglib/demotag.lib.php index 8e3d0eba..5194421c 100755 --- a/src/system/taglib/demotag.lib.php +++ b/src/system/taglib/demotag.lib.php @@ -12,13 +12,12 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_demotag(&$ctag, &$refObj) { global $dsql, $envs; - //属性处理 - $attlist = "row|12,titlelen|24"; + $attlist = "row|10,titlelen|24"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; //您需编写的代码,不能用echo之类语法,把最终返回值传给$revalue - $revalue = 'Hello Word!'; + $revalue = '您好,欢迎使用DedeBIZ系统'; return $revalue; } ?> \ No newline at end of file diff --git a/src/system/taglib/feedback.lib.php b/src/system/taglib/feedback.lib.php index ec95d03b..f3afce73 100755 --- a/src/system/taglib/feedback.lib.php +++ b/src/system/taglib/feedback.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_feedback(&$ctag, &$refObj) { global $dsql; - $attlist = "row|12,titlelen|30,infolen|100,orderby|"; + $attlist = "row|10,titlelen|30,infolen|160,orderby|"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); diff --git a/src/system/taglib/infoguide.lib.php b/src/system/taglib/infoguide.lib.php index d12dbb90..ba0e92ed 100755 --- a/src/system/taglib/infoguide.lib.php +++ b/src/system/taglib/infoguide.lib.php @@ -12,8 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_infoguide(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_mainsite; - //属性处理 - //$attlist="row|12,titlelen|30"; + //$attlist="row|10,titlelen|30"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); if (empty($refObj->Fields['typeid'])) { diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index b87bc066..ad7a8ee9 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -26,8 +26,7 @@ function is_str_float($value){ function lib_infolink(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_mainsite, $em_nativeplaces, $em_infotypes; - //属性处理 - //$attlist="row|12,titlelen|30"; + //$attlist="row|10,titlelen|30"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); $baseurl = preg_replace("#\/$#", '', $cfg_mainsite); diff --git a/src/system/taglib/likearticle.lib.php b/src/system/taglib/likearticle.lib.php index 805861d3..57e34800 100755 --- a/src/system/taglib/likearticle.lib.php +++ b/src/system/taglib/likearticle.lib.php @@ -12,8 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_likearticle(&$ctag, &$refObj) { global $dsql; - //属性处理 - $attlist = "row|12,titlelen|28,infolen|150,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90"; + $attlist = "row|10,titlelen|30,infolen|160,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/likesgpage.lib.php b/src/system/taglib/likesgpage.lib.php index 7267c290..9e81b55c 100755 --- a/src/system/taglib/likesgpage.lib.php +++ b/src/system/taglib/likesgpage.lib.php @@ -12,14 +12,13 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_likesgpage(&$ctag, &$refObj) { global $dsql; - //把属性转为变量,如果不想进行此步骤,也可以直接从 $ctag->CAttribute->Items 获得,这样也可以支持中文名 - $attlist = "row|8"; + $attlist = "row|10"; //把属性转为变量,如果不想进行此步骤,也可以直接从$ctag->CAttribute->Items获得,这样也可以支持中文名 FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); $aid = (isset($refObj->Fields['aid']) ? $refObj->Fields['aid'] : 0); $revalue = ''; - if ($innertext == '') $innertext = GetSysTemplets("part_likesgpage.htm"); + if ($innertext == '') $innertext = GetSysTemplets("part_arclist.htm"); $likeid = (empty($refObj->Fields['likeid']) ? 'all' : $refObj->Fields['likeid']); $dsql->SetQuery("SELECT aid,title,filename FROM `#@__sgpage` WHERE likeid LIKE '$likeid' LIMIT 0,$row"); $dsql->Execute(); @@ -34,7 +33,7 @@ function lib_likesgpage(&$ctag, &$refObj) } $revalue .= $ctp->GetResult(); } else { - $revalue .= '
'.$row['title'].'
'; + $revalue .= '

'.$row['title'].'

'; } } return $revalue; diff --git a/src/system/taglib/loop.lib.php b/src/system/taglib/loop.lib.php index 6df3bdc5..3670e371 100755 --- a/src/system/taglib/loop.lib.php +++ b/src/system/taglib/loop.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_loop(&$ctag, &$refObj) { global $dsql; - $attlist = "table|,tablename|,row|8,sort|,if|,ifcase|,orderway|desc"; + $attlist = "table|,tablename|,row|10,sort|,if|,ifcase|,orderway|desc"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnertext()); diff --git a/src/system/taglib/productimagelist.lib.php b/src/system/taglib/productimagelist.lib.php index 8f7a30bf..252c0a60 100755 --- a/src/system/taglib/productimagelist.lib.php +++ b/src/system/taglib/productimagelist.lib.php @@ -15,8 +15,8 @@ function lib_productimagelist(&$ctag, &$refObj) extract($ctag->CAttribute->Items, EXTR_SKIP); if (!isset($refObj->addTableRow['imgurls'])) return; $revalue = ''; + if (empty($innerText)) $innerText = GetSysTemplets('part_arclist.htm'); $innerText = trim($ctag->GetInnerText()); - if (empty($innerText)) $innerText = GetSysTemplets('productimagelist.htm'); $dtp = new DedeTagParse(); $dtp->LoadSource($refObj->addTableRow['imgurls']); $images = array(); diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php index 6a7a9110..aa6d132a 100644 --- a/src/system/taglib/relation.lib.php +++ b/src/system/taglib/relation.lib.php @@ -13,8 +13,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_relation(&$ctag, &$refObj) { global $dsql; - //属性处理 - $attlist = "row|12,titlelen|28,infolen|150,name|default,orderby|"; + $attlist = "row|10,titlelen|30,infolen|160,name|default,orderby|"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); if (get_class($refObj) != "Archives") { diff --git a/src/system/taglib/statistics.lib.php b/src/system/taglib/statistics.lib.php index 3b9b781e..adac8c3d 100755 --- a/src/system/taglib/statistics.lib.php +++ b/src/system/taglib/statistics.lib.php @@ -13,7 +13,6 @@ require_once(DEDEINC."/libraries/statistics.class.php"); function lib_statistics(&$ctag, &$refObj) { global $envs; - //属性处理 $attlist = ''; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); diff --git a/src/system/taglib/tag.lib.php b/src/system/taglib/tag.lib.php index 01464447..f84b8572 100755 --- a/src/system/taglib/tag.lib.php +++ b/src/system/taglib/tag.lib.php @@ -12,7 +12,6 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_tag(&$ctag, &$refObj) { global $dsql, $envs, $cfg_cmsurl, $cfg_tags_dir; - //属性处理 $attlist = "row|30,sort|new,getall|0,typeid|0,ishtml|0"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); diff --git a/src/system/taglib/type.lib.php b/src/system/taglib/type.lib.php index 55811083..be8ea50d 100755 --- a/src/system/taglib/type.lib.php +++ b/src/system/taglib/type.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_type(&$ctag, &$refObj) { global $dsql, $envs; - $attlist = 'typeid|0'; + $attlist = "typeid|0"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); diff --git a/src/system/taglib/userinfo.lib.php b/src/system/taglib/userinfo.lib.php index a25c5495..1c1f7b9d 100755 --- a/src/system/taglib/userinfo.lib.php +++ b/src/system/taglib/userinfo.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_userinfo(&$ctag, &$refObj) { global $dsql; - $attlist="mid|0"; + $attlist = "mid|0"; FillAttsDefault($ctag->CAttribute->Items,$attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $rmid = !empty($refObj->Fields['mid'])? intval($refObj->Fields['mid']) : 0; diff --git a/src/system/taglib/vote.lib.php b/src/system/taglib/vote.lib.php index a8ee02af..1cdb14ce 100755 --- a/src/system/taglib/vote.lib.php +++ b/src/system/taglib/vote.lib.php @@ -13,10 +13,9 @@ require_once(DEDEINC.'/dedevote.class.php'); function lib_vote(&$ctag, &$refObj) { global $dsql; - $attlist = "id|0,lineheight|30,tablewidth|100%,titlebgcolor|#EDEDE2,titlebackgroup|,tablebg|#ffffff"; + $attlist = "id|0,lineheight|30,tablewidth|100%,titlebgcolor|#dee2e6,titlebackgroup|,tablebg|#ffffff"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); - if (empty($id)) $id = 0; if ($id == 0) { $row = $dsql->GetOne("SELECT aid FROM `#@__vote` ORDER BY aid DESC LIMIT 0,1"); diff --git a/src/system/tpllib/plus_channel.php b/src/system/tpllib/plus_channel.php index 95138d2f..6709b61f 100755 --- a/src/system/tpllib/plus_channel.php +++ b/src/system/tpllib/plus_channel.php @@ -82,7 +82,6 @@ function plus_channel(&$atts, &$refObj, &$fields) $reArray[] = $row; $GLOBALS['autoindex']++; } - //Loop for $i $dsql->FreeResult(); return $reArray; } diff --git a/src/user/edit_baseinfo.php b/src/user/edit_baseinfo.php index fb4c8d8f..f756aa77 100755 --- a/src/user/edit_baseinfo.php +++ b/src/user/edit_baseinfo.php @@ -36,8 +36,7 @@ if ($dopost == 'save') { $pwd = $row['pwd']; } } else { - if (function_exists('password_hash')) - { + if (function_exists('password_hash')) { $pp = "pwd_new"; $pwd = password_hash($userpwd, PASSWORD_BCRYPT); $pwd2 = password_hash($userpwd, PASSWORD_BCRYPT);