diff --git a/docs/changelog.md b/docs/changelog.md
index a26f83bc..f73952d1 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,13 +1,13 @@
# 更新记录
通过访问 https://www.dedebiz.com/git 获取完整更新记录
-## v6.0.4
+# v6.1.0
- 兼容PHP8+;
- 修正已知存在的安全问题;
- 优化系统管理后台界面;
- 修正sqlite3下的错误;
-## v6.0.0
+# v6.0.0
- 调整DedeCMS目录结构,将原有include中外部访问的内容迁移出去;
- 修正已知存在的安全问题;
- 升级内置编辑器ckeditor4为最新版本;
diff --git a/docs/dedebiz_wechat_qr.jpg b/docs/dedebiz_wechat_qr.jpg
index 6466bc11..4bdc7b80 100644
Binary files a/docs/dedebiz_wechat_qr.jpg and b/docs/dedebiz_wechat_qr.jpg differ
diff --git a/src/admin/css/frame.css b/src/admin/css/frame.css
index a1f15b0f..1a4dc62d 100644
--- a/src/admin/css/frame.css
+++ b/src/admin/css/frame.css
@@ -1 +1 @@
-*{padding:0;margin:0;box-sizing:border-box}a{text-decoration:none}html,body{width:100%;height:100%}body{height:100%;font-size:12px;overflow:hidden;z-index:1}body.showmenu{background:url(../images/leftmenu_bg.gif)-10px top repeat-y}body.hidemenu{background:none}ul{list-style:none}form{margin:0;padding:0}.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}.top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}.top .top_logo a{font-size:18px;font-weight:600;color:#fff}.top .top_version{display:inline-block;margin-top:12px;margin-left:10px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;line-height:46px;overflow:hidden}.top .top_link ul li.welcome img{margin-top:-2px;margin-right:10px;width:30px;height:30px;vertical-align:middle;border-radius:50%}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.top .top_link .quick{padding:3px 0px 0px 0px;float:left}.top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden}.topnav{width:100%;height:30px;line-height:30px;background:#393d49;overflow:hidden;clear:both}.topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px}.topnav .menuact a:hover{color:#fff}.nav{float:left;padding-left:2px;line-height:26px;color:#999}.nav ul li{float:left;display:block;margin-left:4px}.nav ul li a{padding:0 10px 0px 10px;color:#FFCC00}.nav ul li a:hover{color:#fff}.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px}.sysmsg{padding-right:30px;float:right;width:500px;color:#999;overflow:hidden}.scroll{float:right;overflow:hidden}.scroll ul li,.sysmsg ul li a{color:#bbb}.scroll ul li a:hover{text-decoration:underline}.scroll a{padding-left:10px;color:#fff}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.top_link{font-size:12px}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}.main{height:100%}.main iframe{height:100%;width:99.99%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px}.qucikmenu ul li a:hover{background:#F7F7F7}.pagemask{width:100%;height:100%;background:#424b51;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}.iframemask{position:absolute;z-index:80;top:0;left:0;background:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}.allmenu{margin-left:-400px;padding:10px;display:none;width:800px;position:absolute;top:76px;left:50%;z-index:999;background:#fff;border-radius:.2rem}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}.maptop dt.bigitem{padding:5px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;font-weight:bold;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif)0 8px no-repeat}.allmenu a{color:#5C604F}.allmenu a:hover{color:#F63}#login .theme{clear:both;padding:10px;width:70%;margin-top:20px}#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:22px;line-height:22px;color:#424b51;text-align:right}input[type="text"],input[type="password"]{padding:2px 4px;width:140px;height:18px;line-height:18px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif)0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px}* html input.radio{margin:-1px 0 0 -2px}.allsearch{float:left;margin-top:6px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem}.np{margin-left:10px;width:40px;height:18px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:none;cursor:pointer}
\ No newline at end of file
+*{padding:0;margin:0;box-sizing:border-box}a{text-decoration:none}html,body{width:100%;height:100%}body{height:100%;font-size:12px;overflow:hidden;z-index:1}body.hidemenu{background:none}ul{list-style:none}form{margin:0;padding:0}.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}.top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}.top .top_logo a{font-size:18px;font-weight:600;color:#fff}.top .top_version{display:inline-block;margin-top:12px;margin-left:10px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;line-height:46px;overflow:hidden}.top .top_link ul li.welcome img{margin-top:-2px;margin-right:10px;width:30px;height:30px;vertical-align:middle;border-radius:50%}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.top .top_link .quick{padding:3px 0px 0px 0px;float:left}.top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden}.topnav{width:100%;height:30px;line-height:30px;background:#393d49;overflow:hidden;clear:both}.topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px}.topnav .menuact a:hover{color:#fff}.nav{float:left;padding-left:2px;line-height:26px;color:#999}.nav ul li{float:left;display:block;margin-left:4px}.nav ul li a{padding:0 10px 0px 10px;color:#FFCC00}.nav ul li a:hover{color:#fff}.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px}.sysmsg{padding-right:30px;float:right;width:500px;color:#999;overflow:hidden}.scroll{float:right;overflow:hidden}.scroll ul li,.sysmsg ul li a{color:#bbb}.scroll ul li a:hover{text-decoration:underline}.scroll a{padding-left:10px;color:#fff}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.top_link{font-size:12px}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}.main{height:100%}.main iframe{height:100%;width:99.99%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px}.qucikmenu ul li a:hover{background:#F7F7F7}.pagemask{width:100%;height:100%;background:#424b51;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}.iframemask{position:absolute;z-index:80;top:0;left:0;background:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}.allmenu{margin-left:-400px;padding:10px;display:none;width:800px;position:absolute;top:76px;left:50%;z-index:999;background:#fff;border-radius:.2rem}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}.maptop dt.bigitem{padding:5px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;font-weight:bold;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif)0 8px no-repeat}.allmenu a{color:#5C604F}.allmenu a:hover{color:#F63}#login .theme{clear:both;padding:10px;width:70%;margin-top:20px}#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:22px;line-height:22px;color:#424b51;text-align:right}input[type="text"],input[type="password"]{padding:2px 4px;width:140px;height:18px;line-height:18px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif)0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px}* html input.radio{margin:-1px 0 0 -2px}.allsearch{float:left;margin-top:6px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem}.np{margin-left:10px;width:40px;height:18px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:none;cursor:pointer}
\ No newline at end of file
diff --git a/src/admin/inc/fieldtype.txt b/src/admin/inc/fieldtype.txt
index 90e05aa3..6b4100b7 100644
--- a/src/admin/inc/fieldtype.txt
+++ b/src/admin/inc/fieldtype.txt
@@ -1,13 +1,13 @@
-text,单行文本(varchar)
-textchar,单行文本(char)
+text,单行文本(varchar)
+textchar,单行文本(char)
multitext,多行文本
htmltext,HTML文本
-textdata,文本保存HTML数据
+textdata,HTML形式保存数据
int,整数类型
float,小数类型
datetime,时间类型
img,图片
-imgfile,图片(无格式)
+imgfile,图片(无格式)
media,多媒体文件
addon,附件类型
select,使用select下拉框
diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php
index f83ccab6..c954ea1e 100644
--- a/src/admin/inc/inc_menu.php
+++ b/src/admin/inc/inc_menu.php
@@ -123,7 +123,6 @@ $adminMenu1
$adminMenu2
-
+
-
";
\ No newline at end of file
diff --git a/src/include/common.inc.php b/src/include/common.inc.php
index e4870544..85e45865 100755
--- a/src/include/common.inc.php
+++ b/src/include/common.inc.php
@@ -194,7 +194,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
$cfg_other_medias = $cfg_medias_dir.'/media';
//软件摘要信息,****请不要删除本项**** 否则系统无法正确接收系统漏洞或升级信息
$cfg_version = 'V6';
-$cfg_version_detail = '6.0.4'; //详细版本号
+$cfg_version_detail = '6.1.0'; //详细版本号
$cfg_soft_lang = 'utf-8';
$cfg_soft_public = 'base';
$cfg_softname = '织梦内容管理系统';
diff --git a/src/include/data/base_dic_full.zip b/src/include/data/base_dic_full.zip
deleted file mode 100755
index d2e7cc3b..00000000
Binary files a/src/include/data/base_dic_full.zip and /dev/null differ
diff --git a/src/include/inc/inc_fun_funAdmin.php b/src/include/inc/inc_fun_funAdmin.php
index 831c8d91..45afe688 100755
--- a/src/include/inc/inc_fun_funAdmin.php
+++ b/src/include/inc/inc_fun_funAdmin.php
@@ -123,7 +123,6 @@ function jsScript($js)
$out .= $js;
$out .= "\n//]]>";
$out .= "\n";
-
return $out;
}
/**
diff --git a/src/include/uploadsafe.inc.php b/src/include/uploadsafe.inc.php
index 0e5b7041..34406a7f 100755
--- a/src/include/uploadsafe.inc.php
+++ b/src/include/uploadsafe.inc.php
@@ -9,9 +9,7 @@
* @link https://www.dedebiz.com
*/
if (!defined('DEDEINC')) exit('dedebiz');
-
if (isset($_FILES['GLOBALS'])) exit('Request not allow!');
-
//为了防止用户通过注入的可能性改动了数据库
//这里强制限定的某些文件类型禁止上传
$cfg_not_allowall = "php|pl|cgi|asp|aspx|jsp|php3|shtm|shtml";
@@ -37,7 +35,6 @@ foreach ($_FILES as $_key => $_value) {
${$_key.'_name'} = $_FILES[$_key]['name'];
${$_key.'_type'} = $_FILES[$_key]['type'] = preg_replace('#[^0-9a-z\./]#i', '', $_FILES[$_key]['type']);
${$_key.'_size'} = $_FILES[$_key]['size'] = preg_replace('#[^0-9]#', '', $_FILES[$_key]['size']);
-
if (is_array(${$_key.'_name'}) && count(${$_key.'_name'}) > 0) {
foreach (${$_key.'_name'} as $key => $value) {
if (!empty($value) && (preg_match("#\.(".$cfg_not_allowall.")$#i", $value) || !preg_match("#\.#", $value))) {
@@ -53,12 +50,10 @@ foreach ($_FILES as $_key => $_value) {
}
}
}
-
if (empty(${$_key.'_size'})) {
${$_key.'_size'} = @filesize($$_key);
}
$imtypes = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/bmp");
-
if (is_array(${$_key.'_type'}) && count(${$_key.'_type'}) > 0) {
foreach (${$_key.'_type'} as $key => $value) {
if (in_array(strtolower(trim($value)), $imtypes)) {
@@ -70,12 +65,9 @@ foreach ($_FILES as $_key => $_value) {
exit('Upload filetype not allow !');
}
}
-
$imtypes = array(
- "image/pjpeg", "image/jpeg", "image/gif", "image/png",
- "image/xpng", "image/wbmp", "image/bmp"
+ "image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/bmp"
);
-
if (in_array(strtolower(trim($value)), $imtypes)) {
$image_dd = @getimagesize($$_key);
if ($image_dd == false) {
@@ -96,12 +88,9 @@ foreach ($_FILES as $_key => $_value) {
exit('Upload filetype not allow !');
}
}
-
$imtypes = array(
- "image/pjpeg", "image/jpeg", "image/gif", "image/png",
- "image/xpng", "image/wbmp", "image/bmp"
+ "image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/bmp"
);
-
if (in_array(strtolower(trim(${$_key.'_type'})), $imtypes)) {
$image_dd = @getimagesize($$_key);
if ($image_dd == false) {
@@ -112,4 +101,4 @@ foreach ($_FILES as $_key => $_value) {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/install/config.cache.inc.php b/src/install/config.cache.inc.php
index 7c7e7066..907550ee 100755
--- a/src/install/config.cache.inc.php
+++ b/src/install/config.cache.inc.php
@@ -23,7 +23,7 @@ $cfg_replacestr = '他妈的|TMD|傻逼|贱人';
$cfg_feedbackcheck = 'N';
$cfg_keyword_replace = 'Y';
$cfg_fck_xhtml = 'N';
-$cfg_df_style = 'default';
+$cfg_df_style = 'muban';
$cfg_multi_site = 'N';
$cfg_dede_log = 'N';
$cfg_powerby = 'Copyright © 2022 DedeBIZ 版权所有';
diff --git a/src/install/index.php b/src/install/index.php
index 1b0cacd0..ce213264 100644
--- a/src/install/index.php
+++ b/src/install/index.php
@@ -10,7 +10,7 @@
error_reporting(E_ALL || ~E_NOTICE);
$verMsg = 'V6';
$dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.0.4'; //详细版本号
+$cfg_version_detail = '6.1.0'; //详细版本号
$errmsg = '';
if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
mysqli_report(MYSQLI_REPORT_OFF);
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index b2f34a8b..249ac133 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -502,12 +502,12 @@ INSERT INTO `#@__area` VALUES('1','北京市','0','0'),
('33','澳门区','0','0'),
('35','台湾省','0','0');
-INSERT INTO `#@__channeltype` VALUES('1','article','普通文章','#@__archives','#@__addonarticle','article_add.php','content_list.php','article_edit.php','article_add.php','content_list.php','article_edit.php','\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('2','image','图片集','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('3','soft','软件','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('-1','spec','专题','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
-('6','shop','商品','#@__archives','#@__addonshop','archives_add.php','content_list.php','archives_edit.php','archives_add.php','content_list.php','archives_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\n\t\n\n\t\n\t\n\n\t\n\t\n\n\t\n\t\n','price,trueprice,brand,units','','0','1','1','-1','','10','0','1','1','商品名称','0','0'),
-('-8','infos','分类信息','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
+INSERT INTO `#@__channeltype` VALUES('1','article','普通文章','#@__archives','#@__addonarticle','article_add.php','content_list.php','article_edit.php','article_add.php','content_list.php','article_edit.php','\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('2','image','图片集','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('3','soft','软件','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('-1','spec','专题','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
+('6','shop','商品','#@__archives','#@__addonshop','archives_add.php','content_list.php','archives_edit.php','archives_add.php','content_list.php','archives_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\n\t\n\n\t\n\t\n\n\t\n\t\n\n\t\n\t\n','price,trueprice,brand,units','','0','1','1','-1','','10','0','1','1','商品名称','0','0'),
+('-8','infos','分类信息','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
INSERT INTO `#@__co_onepage` VALUES('5','www.dedebiz.com','DedeBIZ','1','gb2312','
{@body}
'),
('4','www.techweb.com.cn','Techweb','1','gb2312','
{@body}
\t\n'),
@@ -532,14 +532,14 @@ INSERT INTO `#@__freelist` VALUES('1','测试内容','{listdir}/index_{listid}_{
INSERT INTO `#@__member_type` VALUES('1','50','中级会员半年','100','7');
-INSERT INTO `#@__homepageset` VALUES('default/index.htm','../index.html','0');
+INSERT INTO `#@__homepageset` VALUES('{style}/index.htm','../index.html','0');
INSERT INTO `#@__moneycard_type` VALUES('1','100','30','100点卡'),
('2','200','55','200点卡'),
('3','300','75','300点卡');
-INSERT INTO `#@__member_model` VALUES('1','个人','#@__member_person','个人会员模型','1','1','\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n'),
-('2','企业','#@__member_company','公司企业会员模型','1','1','\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n');
+INSERT INTO `#@__member_model` VALUES('1','个人','#@__member_person','个人会员模型','1','1','\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n'),
+('2','企业','#@__member_company','公司企业会员模型','1','1','\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n\t\n
\t\n\t\n');
INSERT INTO `#@__scores` VALUES('2','列兵','1','0','1'),
('3','班长','2','1000','1'),
@@ -567,7 +567,7 @@ INSERT INTO `#@__payment` VALUES('3','alipay','支付宝','2','支付宝网站(w
('1','cod','货到付款','0','开通城市:×××\t\n货到付款区域:×××','3','a:0:{}','1','1','0'),
('6','yeepay','YeePay易宝','12','YeePay易宝(北京通融通信息技术有限公司)是专业从事多元化电子支付业务一站式服务的领跑者。在立足于网上支付的同时,YeePay易宝不断创新,将互联网、手机、固定电话整合在一个平台上,继短信支付、手机充值之后,首家推出了YeePay易宝电话支付业务,真正实现了离线支付,为更多传统行业搭建了电子支付的高速公路。YeePay易宝融合世界先进的电子支付文化,聚合众多金融、电信、IT、互联网等领域内的巨擘,旨在通过创新的支付机制,推动中国电子商务新进程。YeePay易宝致力于成为世界一流的电子支付应用和服务提供商,专注于金融增值服务和移动增值服务两大领域,创新并推广多元化、低成本的、安全有效的支付服务。
','2','a:2:{s:10:"yp_account";a:4:{s:5:"title";s:8:"商户编号";s:11:"description";s:0:"";s:4:"type";s:4:"text";s:5:"value";s:2:"aa";}s:6:"yp_key";a:4:{s:5:"title";s:8:"商户密钥";s:11:"description";s:0:"";s:4:"type";s:4:"text";s:5:"value";s:3:"dsa";}}','1','0','1');
-INSERT INTO `#@__softconfig` VALUES('0','1','1','1','http://www.aaa.com | 镜像地址一\t\nhttp://www.bbb.com | 镜像地址二\t\nhttp://www.ccc.com | 镜像地址三\t\n','
■ 推荐使用第三方专业下载工具下载本站软件,使用 WinRAR v3.10 以上版本解压本站软件。
\t\n ■ 如果这个软件总是不能下载的请点击报告错误,谢谢合作!!
\t\n ■ 下载本站资源,如果服务器暂不能下载请过一段时间重试
\t\n ■ 如果遇到什么问题,请到本站论坛去咨寻,我们将在那里提供更多 、更好的资源
\t\n ■ 本站提供的一些商业软件是供学习研究之用,如用于商业用途,请购买正版。
','0','0','0','0');
+INSERT INTO `#@__softconfig` VALUES('0','1','1','1','http://www.aaa.com | 下载地址一\t\nhttp://www.bbb.com | 下载地址二\t\nhttp://www.ccc.com | 下载地址三\t\n','
如果这个软件总是不能下载的请点击报告错误,谢谢合作。
\t\n下载本站资源,如果服务器暂不能下载请过一段时间重试。
\t\n如果遇到什么问题,请联系我们,我们将在那里提供更多,更好的资源。
','0','0','0','0');
INSERT INTO `#@__stepselect` VALUES('1','血型','blood','1','1'),
('2','体型','bodytype','1','1'),
@@ -3943,11 +3943,11 @@ INSERT INTO `#@__sys_enum` VALUES('139','cms制作','503','vocation','503','0'),
('16795','东城区','1001','nativeplace','1001','1'),
('16794','北京市','1000','nativeplace','1000','0');
-INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址http://开头','1','string',''),
+INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址(http://域名)','1','string',''),
('2','cfg_cmspath','安装目录','2','string',''),
('3','cfg_cookie_encode','Cookies加密码','2','string',''),
('4','cfg_indexurl','首页链接','1','string','/'),
-('5','cfg_backup_dir','数据备份目录,在data目录内,','2','string','backupdata'),
+('5','cfg_backup_dir','数据备份目录,在data文件夹里','2','string','backupdata'),
('6','cfg_indexname','首页链接名','1','string','首页'),
('7','cfg_webname','网站名称','1','string','某某公司'),
('8','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'),
@@ -3962,7 +3962,7 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址http://开头
('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_fck_xhtml','是否使用富文本XHTML','1','bool','N'),
@@ -4011,7 +4011,7 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址http://开头
('67','cfg_album_pagesize','图集多页多图每页显示最大数','3','number','12'),
('68','cfg_album_style','图集默认样式(1为多页多图、2为多页单图、3为缩略图列表)','3','number','2'),
('69','cfg_album_ddwidth','图集默认缩略图大小','3','number','200'),
-('70','cfg_mb_notallow','不允许注册的会员id','4','bstring','www,bbs,ftp,mail,user,users,admin,administrator'),
+('70','cfg_mb_notallow','不允许注册的会员ID','4','bstring','www,bbs,ftp,mail,user,users,admin,administrator'),
('71','cfg_mb_idmin','用户ID最小长度','4','number','6'),
('72','cfg_mb_pwdmin','用户密码最小长度','4','number','6'),
('73','cfg_md_idurl','是否严格限定会员登录ID,允许会员使用二级域名必须设置此项','4','bool','N'),
diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html
index 26bcefe8..a8628f82 100755
--- a/src/install/templates/step-1.html
+++ b/src/install/templates/step-1.html
@@ -9,12 +9,12 @@
-
+
-
-
DedeBIZ安装程序
-