DedeBIZ
/
DedeV6
Watch 2
Star 0
Fork 0
Code Pull Requests 0 Releases 25 Activity
Browse Source

安装包调整

tags/6.0.0
tianya 3 years ago
parent
058dfa70df
commit
299a8b0f75
9 changed files with 50 additions and 78 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -7
      src/dede/templets/index_body.htm
  2. +10
    -52
      src/dede/update_guide.php
  3. +1
    -1
      src/include/common.inc.php
  4. +3
    -5
      src/include/taglib/arclist.lib.php
  5. +1
    -1
      src/include/taglib/arcpagelist.lib.php
  6. +1
    -1
      src/install/sql-dfdata.txt
  7. +19
    -10
      src/install/sql-dftables.txt
  8. +5
    -0
      src/install/v57sp2_to_v6.txt
  9. +1
    -1
      src/plus/arcmulti.php

+ 9
- 7
src/dede/templets/index_body.htm View File

@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
<title>DedeCMS Home</title>
<title>DedeCMSV6系统概况</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<base target="_self">
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
@@ -68,12 +68,14 @@
</div>
<!--/.card-header-->
<div class="card-body">
<?php
echo "<div class='updatedvt py-3'><b>您系统版本最后更新时间为：{$oktime} </b><br/>";
echo " <a href='javascript:LoadUpdateInfos();' class='btn btn-success btn-sm'>进行在线更新</a> &nbsp; \r\n";
echo " <a href='sys_repair.php' class='btn btn-success btn-sm'>系统错误修复</a></div>\r\n";
echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='80'></iframe>";
?>
<div id="updateinfos">
<?php
echo "<div class='updatedvt py-3'><b>您系统版本最后更新时间为：{$oktime} </b><br/>";
echo " <a href='javascript:LoadUpdateInfos();' class='btn btn-success btn-sm'>进行在线更新</a> &nbsp; \r\n";
echo " <a href='sys_repair.php' class='btn btn-success btn-sm'>系统错误修复</a></div>\r\n";
echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='80'></iframe>";
?>
</div>
</div>
<!--/.card-body-->
</div>


+ 10
- 52
src/dede/update_guide.php View File

@@ -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 "<xmp>";
//判断是否需要更新，并返回适合的结果
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 "</xmp>";


+ 1
- 1
src/include/common.inc.php View File

@@ -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';



+ 3
- 5
src/include/taglib/arclist.lib.php View File

@@ -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 .= " </div>\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'];
}


+ 1
- 1
src/include/taglib/arcpagelist.lib.php View File

@@ -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']);


+ 1
- 1
src/install/sql-dfdata.txt View File

@@ -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',''),


+ 19
- 10
src/install/sql-dftables.txt View File

@@ -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`)


src/install/v57sp2_to_v58.txt → src/install/v57sp2_to_v6.txt View File

@@ -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,

+ 1
- 1
src/plus/arcmulti.php View File

@@ -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);
//取出属性并解析为变量


Write Preview
Loading…
Cancel
Save