From 299a8b0f759c97f0fd1c6e085e75bbc7f5bb0954 Mon Sep 17 00:00:00 2001 From: tianya Date: Wed, 28 Oct 2020 07:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/templets/index_body.htm | 16 ++--- src/dede/update_guide.php | 62 +++---------------- src/include/common.inc.php | 2 +- src/include/taglib/arclist.lib.php | 8 +-- src/include/taglib/arcpagelist.lib.php | 2 +- src/install/sql-dfdata.txt | 2 +- src/install/sql-dftables.txt | 29 ++++++--- .../{v57sp2_to_v58.txt => v57sp2_to_v6.txt} | 5 ++ src/plus/arcmulti.php | 2 +- 9 files changed, 50 insertions(+), 78 deletions(-) rename src/install/{v57sp2_to_v58.txt => v57sp2_to_v6.txt} (53%) diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index efa5f042..b1a07787 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -4,7 +4,7 @@ - DedeCMS Home + DedeCMSV6系统概况 @@ -68,12 +68,14 @@
- 您系统版本最后更新时间为：{$oktime}
"; - echo " 进行在线更新   \r\n"; - echo " 系统错误修复
\r\n"; - echo ""; - ?> +
+ 您系统版本最后更新时间为：{$oktime}
"; + echo " 进行在线更新   \r\n"; + echo " 系统错误修复
\r\n"; + echo ""; + ?> + diff --git a/src/dede/update_guide.php b/src/dede/update_guide.php index d7a29b6f..5fe82ac7 100755 --- a/src/dede/update_guide.php +++ b/src/dede/update_guide.php @@ -3,7 +3,7 @@ * 本文件用于从镜像服务器获取升级信息与文件 * 并由用户自行控制升级 * - * @version $Id: vote_main.php 1 23:54 2010年7月20日Z tianya $ + * @version $Id: update_guide.php 1 23:54 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2020, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -95,45 +95,15 @@ if($dopost=='test') AjaxHead(); //下载远程数据 $dhd = new DedeHttpDown(); - $dhd->OpenUrl(UPDATEHOST.'/verinfo.txt'); - $verlist = trim($dhd->GetHtml()); + $dhd->OpenUrl(DEDECDNURL.'/release/latest.txt'); + $verlatest = trim($dhd->GetHtml()); $dhd->Close(); - if($cfg_soft_lang=='utf-8') - { - $verlist = gb2utf8($verlist); - } - $verlist = preg_replace("#[\r\n]{1,}#", "\n", $verlist); - $verlists = explode("\n", $verlist); - - //分析数据 - $updateVers = array(); - $upitems = $lastTime = ''; - $n = 0; - foreach($verlists as $verstr) - { - if( empty($verstr) || preg_match("#^\/\/#", $verstr) ) - { - continue ; - } - list($vtime, $vlang, $issafe, $vmsg) = explode(',', $verstr); - $vtime = trim($vtime); - $vlang = trim($vlang); - $issafe = trim($issafe); - $vmsg = trim($vmsg); - if($vtime > $upTime && $vlang==$cfg_soft_lang) - { - $updateVers[$n]['issafe'] = $issafe; - $updateVers[$n]['vmsg'] = $vmsg; - $upitems .= ($upitems=='' ? $vtime : ','.$vtime); - $lastTime = $vtime; - $updateVers[$n]['vtime'] = substr($vtime,0,4).'-'.substr($vtime,4,2).'-'.substr($vtime,6,2); - $n++; - } - } - + + //echo ""; //判断是否需要更新，并返回适合的结果 - if($n==0) + + if(version_compare($verlatest, $cfg_version_detail,"<=")) { $offUrl = SpGetNewInfo(); echo "<div class='updatedvt'><b>你系统版本最后更新时间为：{$oktime}，当前没有可用的更新</b></div>\r\n"; @@ -143,21 +113,9 @@ if($dopost=='test') { echo "<div style='width:98%'><form name='fup' action='update_guide.php' method='post' onsubmit='ShowWaitDiv()'>\r\n"; echo "<input type='hidden' name='dopost' value='getlist' />\r\n"; - echo "<input type='hidden' name='vtime' value='$lastTime' />\r\n"; - echo "<input type='hidden' name='upitems' value='$upitems' />\r\n"; - echo "<div class='upinfotitle'>你系统版本最后更新时间为：{$oktime}，当前可用的更新有：</div>\r\n"; - foreach($updateVers as $vers) - { - $style = ''; - if($vers['issafe']==1) - { - $style = "color:red;"; - } - echo "<div style='{$style}' class='verline'>【".($vers['issafe']==1 ? "安全更新" : "普通更新")."】"; - echo $vers['vtime']."，更新说明：{$vers['vmsg']}</div>\r\n"; - } - echo "<div style='line-height:32px'><input type='submit' name='sb1' value=' 点击此获取所有更新文件，然后选择安装 ' class='np coolbg' style='cursor:pointer' />\r\n"; - echo " &nbsp; <input type='button' name='sb2' value=' 忽略这些更新 ' onclick='SkipReload({$lastTime})' class='np coolbg' style='cursor:pointer' /></div>\r\n"; + echo "<div class='upinfotitle'>当前有可用的更新，可以通过<a href='$cfg_biz_gitUrl' target='_blank'>代码托管</a>查看更新记录：</div>\r\n"; + echo "<div style='line-height:32px'><button type='submit' name='sb1' class='btn btn-success btn-sm' style='cursor:pointer'>获取并安装</button>\r\n"; + echo " &nbsp;</div>\r\n"; echo "</form></div>"; } //echo ""; diff --git a/src/include/common.inc.php b/src/include/common.inc.php index 635896be..592fd134 100755 --- a/src/include/common.inc.php +++ b/src/include/common.inc.php @@ -261,7 +261,7 @@ $cfg_other_medias = $cfg_medias_dir.'/media'; //软件摘要信息，****请不要删除本项**** 否则系统无法正确接收系统漏洞或升级信息 $cfg_version = 'V6_UTF8'; -$cfg_version_detail = '6.0.0'; // 详细版本号 +$cfg_version_detail = '6.0.1'; // 详细版本号 $cfg_soft_lang = 'utf-8'; $cfg_soft_public = 'base'; diff --git a/src/include/taglib/arclist.lib.php b/src/include/taglib/arclist.lib.php index 28504722..97337882 100755 --- a/src/include/taglib/arclist.lib.php +++ b/src/include/taglib/arclist.lib.php @@ -19,7 +19,6 @@ * @param object $refObj 引用对象 * @return string 成功后返回解析后的标签内容 */ - function lib_arclist( &$ctag, &$refObj ) { @@ -509,14 +508,13 @@ function lib_arclistDone(&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlelen if($pagesize > 0) { $artlist .= " \r\n"; - $row = $dsql->GetOne("SELECT tagid FROM #@__arcmulti WHERE tagid='$tagid'"); + $row = $dsql->GetOne("SELECT tagid FROM `#@__arcmulti` WHERE tagid='$tagid'"); $uptime = time(); $attstr = addslashes(serialize($attarray)); $innertext = addslashes($innertext); if(!is_array($row)) { - $query = " - INSERT INTO #@__arcmulti(tagid,uptime,innertext,pagesize,arcids,ordersql,addfieldsSql,addfieldsSqlJoin,attstr) + $query = "INSERT INTO `#@__arcmulti`(tagid,uptime,innertext,pagesize,arcids,ordersql,addfieldsSql,addfieldsSqlJoin,attstr) VALUES('$tagid','$uptime','$innertext','$pagesize','$idsstr','$ordersql','$addfieldsSql','$addfieldsSqlJoin','$attstr'); "; $dsql->ExecuteNoneQuery($query); @@ -589,7 +587,7 @@ function lib_GetAutoChannelID($sortid, $topid) global $dsql; if(empty($sortid)) $sortid = 1; $getstart = $sortid - 1; - $row = $dsql->GetOne("SELECT id,typename FROM #@__arctype WHERE reid='{$topid}' And ispart<2 And ishidden<>'1' ORDER BY sortrank asc limit $getstart,1"); + $row = $dsql->GetOne("SELECT id,typename FROM `#@__arctype` WHERE reid='{$topid}' And ispart<2 And ishidden<>'1' ORDER BY sortrank asc limit $getstart,1"); if(!is_array($row)) return 0; else return $row['id']; } diff --git a/src/include/taglib/arcpagelist.lib.php b/src/include/taglib/arcpagelist.lib.php index 5caaa8d7..06917f6b 100755 --- a/src/include/taglib/arcpagelist.lib.php +++ b/src/include/taglib/arcpagelist.lib.php @@ -16,7 +16,7 @@ function lib_arcpagelist(&$ctag, &$refObj) FillAttsDefault($ctag->CAttribute->Items,$attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); - $row = $dsql->GetOne("SELECT * FROM #@__arcmulti WHERE tagid='$tagid'"); + $row = $dsql->GetOne("SELECT * FROM `#@__arcmulti` WHERE tagid='$tagid'"); if(is_array($row)) { $ids = explode(',', $row['arcids']); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 84222220..c15a305f 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -4087,7 +4087,7 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点根网址','1','str ('753','cfg_sphinx_article','是否启用文章全文检索功能（需配置sphinx服务器）','7','bool','N'), ('754','cfg_sphinx_host','Sphinx服务器主机地址','7','string','localhost'), ('755','cfg_sphinx_port','Sphinx服务器端口号','7','number','9312'), -(14, 'cfg_domain_cookie', '跨域共享cookie的域名(例如: .dedecms.com)', 2, 'string', ''), +('14', 'cfg_domain_cookie', '跨域共享cookie的域名(例如: .dedecms.com)', 2, 'string', ''), ('756','cfg_memcache_enable','是否启用memcache缓存，如果为否(N)，默认使用文件缓存',6,'bool','N'), ('757','cfg_memcache_mc_defa','默认memcache缓存服务器地址',6,'string','memcache://127.0.0.1:11211/default127'), ('758','cfg_memcache_mc_oth','附加memcache缓存服务器地址',6,'string',''), diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt index 03864591..1369eee0 100755 --- a/src/install/sql-dftables.txt +++ b/src/install/sql-dftables.txt @@ -426,12 +426,14 @@ DROP TABLE IF EXISTS `#@__feedback`; CREATE TABLE `#@__feedback` ( `id` int(10) unsigned NOT NULL auto_increment, `aid` mediumint(8) unsigned NOT NULL default '0', + `fid` INT(10) UNSIGNED NOT NULL DEFAULT '0', `typeid` smallint(5) unsigned NOT NULL default '0', `username` char(20) NOT NULL default '', `arctitle` varchar(60) NOT NULL default '', `ip` char(15) NOT NULL default '', `ischeck` smallint(6) NOT NULL default '0', `dtime` int(10) unsigned NOT NULL default '0', + `replycount` INT(10) UNSIGNED NOT NULL DEFAULT '0', `mid` mediumint(8) unsigned NOT NULL default '0', `bad` mediumint(8) unsigned NOT NULL default '0', `good` mediumint(8) unsigned NOT NULL default '0', @@ -892,6 +894,13 @@ CREATE TABLE `#@__search_limits` ( PRIMARY KEY (`ip`) ) TYPE=MyISAM; +DROP TABLE IF EXISTS `#@__search_limits`; +CREATE TABLE `#@__search_limits` ( + `ip` VARCHAR(200) NOT NULL, + `searchtime` INT(11) NULL DEFAULT NULL, + PRIMARY KEY (`ip`) +) TYPE=MyISAM; + DROP TABLE IF EXISTS `#@__sgpage`; CREATE TABLE `#@__sgpage` ( `aid` smallint(5) unsigned NOT NULL auto_increment, @@ -1059,16 +1068,16 @@ CREATE TABLE `#@__sysconfig` ( DROP TABLE IF EXISTS `#@__tagindex`; CREATE TABLE `#@__tagindex` ( - `id` int(10) unsigned NOT NULL auto_increment, - `tag` char(12) NOT NULL default '', - `typeid` smallint(5) unsigned NOT NULL default '0', - `count` int(10) unsigned NOT NULL default '0', - `total` int(10) unsigned NOT NULL default '0', - `weekcc` int(10) unsigned NOT NULL default '0', - `monthcc` int(10) unsigned NOT NULL default '0', - `weekup` int(10) unsigned NOT NULL default '0', - `monthup` int(10) unsigned NOT NULL default '0', - `addtime` int(10) unsigned NOT NULL default '0', + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `tag` CHAR(12) NOT NULL DEFAULT '', + `typeid` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0', + `count` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `total` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `weekcc` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `monthcc` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `weekup` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `monthup` INT(10) UNSIGNED NOT NULL DEFAULT '0', + `addtime` INT(10) UNSIGNED NOT NULL DEFAULT '0', `uptime` INT(10) UNSIGNED NOT NULL DEFAULT '0', `mktime` INT(10) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`id`) diff --git a/src/install/v57sp2_to_v58.txt b/src/install/v57sp2_to_v6.txt similarity index 53% rename from src/install/v57sp2_to_v58.txt rename to src/install/v57sp2_to_v6.txt index 206dbf3a..6125c96c 100644 --- a/src/install/v57sp2_to_v58.txt +++ b/src/install/v57sp2_to_v6.txt @@ -9,6 +9,11 @@ ALTER TABLE `#@__feedback` ADD COLUMN `replycount` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `dtime`; INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_feedback_msglen', '评论内容字数限定', 5, 'number', '200'); +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_auth_code', '授权码(登录www.dedebiz.com进行商业授权)', 1, 'bstring', ''); +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1'); +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'); +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''); +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''); CREATE TABLE `#@__feedback_goodbad` ( `fgid` INT(11) NOT NULL AUTO_INCREMENT, diff --git a/src/plus/arcmulti.php b/src/plus/arcmulti.php index 77f450dd..126f6056 100755 --- a/src/plus/arcmulti.php +++ b/src/plus/arcmulti.php @@ -11,7 +11,7 @@ if($tagid=='' || $pnum==0) die(" Request Error! "); if($tagid !='') { - $row = $dsql->GetOne("SELECT * FROM #@__arcmulti WHERE tagid='$tagid'"); + $row = $dsql->GetOne("SELECT * FROM `#@__arcmulti` WHERE tagid='$tagid'"); $ids = explode(',', $row['arcids']); $totalnum = $line = count($ids); //取出属性并解析为变量