diff --git a/src/install/common.inc.php b/src/install/common.inc.php
index 08a6bc0b..e9264064 100755
--- a/src/install/common.inc.php
+++ b/src/install/common.inc.php
@@ -7,6 +7,4 @@ $cfg_dbuser = '~dbuser~';
$cfg_dbpwd = '~dbpwd~';
$cfg_dbprefix = '~dbprefix~';
$cfg_db_language = '~dblang~';
-
-
?>
\ No newline at end of file
diff --git a/src/install/index.php b/src/install/index.php
index 93cd95ad..2bce7687 100644
--- a/src/install/index.php
+++ b/src/install/index.php
@@ -7,38 +7,28 @@
* @link https://www.dedebiz.com
*/
@set_time_limit(0);
-//error_reporting(E_ALL);
error_reporting(E_ALL || ~E_NOTICE);
-
$verMsg = 'V6';
$dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.0.3'; // 详细版本号
+$cfg_version_detail = '6.0.4'; // 详细版本号
$errmsg = '';
-
define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
-
$moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc';
-
define('DEDEINC',dirname(__FILE__).'/../include');
define('DEDEDATA',dirname(__FILE__).'/../data');
define('DEDEROOT',preg_replace("#[\\\\\/]install#", '', dirname(__FILE__)));
header("Content-Type: text/html; charset=utf-8");
-
require_once(DEDEROOT.'/install/install.inc.php');
require_once(DEDEINC.'/zip.class.php');
-
foreach(Array('_GET','_POST','_COOKIE') as $_request)
{
foreach($$_request as $_k => $_v) ${$_k} = RunMagicQuotes($_v);
}
-
require_once(DEDEINC.'/common.func.php');
-
if(file_exists(INSLOCKFILE))
{
exit(" 程序已运行安装，如果你确定要重新安装，请先从FTP中删除 install/install_lock.txt！");
}
-
if(empty($step))
{
$step = 1;
@@ -62,19 +52,15 @@ if($step==1)
if (!extension_loaded("gd")) {
$arrMsg[] = "GD未开启，将无法使用验证码、二维码、图片水印等功能";
}
-
if(!empty($_SERVER['REQUEST_URI']))
$scriptName = $_SERVER['REQUEST_URI'];
else
$scriptName = $_SERVER['PHP_SELF'];
-
$basepath = preg_replace("#\/install(.*)$#i", '', $scriptName);
-
if(!empty($_SERVER['HTTP_HOST']))
$baseurl = 'http://'.$_SERVER['HTTP_HOST'];
else
$baseurl = "http://".$_SERVER['SERVER_NAME'];
-
$chars='abcdefghigklmnopqrstuvwxwyABCDEFGHIGKLMNOPQRSTUVWXWY0123456789';
$rnd_cookieEncode='';
$length = rand(28,32);
@@ -83,7 +69,6 @@ if($step==1)
$rnd_cookieEncode .= $chars[mt_rand(0, $max)];
}
$module_local = DEDEDATA.'/module/';
-
include('./templates/step-1.html');
exit();
}
@@ -103,7 +88,6 @@ else if($step==2)
else
$dfbaseurl = "http://".$_SERVER['SERVER_NAME'];
$dfbasepath = preg_replace("#\/install(.*)$#i", '', $scriptName);
-
$dbhost = empty($dbhost)? "localhost" : $dbhost;
$dbuser = empty($dbuser)? "root" : $dbuser;
$dbuser = empty($dbuser)? "root" : $dbuser;
@@ -114,36 +98,27 @@ else if($step==2)
$webname = empty($webname)? "我的网站" : $webname;
$baseurl = empty($baseurl)? $dfbaseurl : $baseurl;
$cmspath = empty($cmspath)? $dfbasepath : $cmspath;
-
if ( $dbtype == 'sqlite' )
{
$db = new SQLite3(DEDEDATA.'/'.$dbname.'.db');
} else {
$dbtype = 'mysql';
$conn = mysql_connect($dbhost,$dbuser,$dbpwd) or die("");
-
mysql_query("CREATE DATABASE IF NOT EXISTS `".$dbname."`;",$conn);
-
mysql_select_db($dbname, $conn) or die("");
-
//获得数据库版本信息
$rs = mysql_query("SELECT VERSION();",$conn);
$row = mysql_fetch_array($rs);
$mysqlVersions = explode('.',trim($row[0]));
$mysqlVersion = $mysqlVersions[0].".".$mysqlVersions[1];
-
mysql_query("SET NAMES '$dblang',character_set_client=binary,sql_mode='';",$conn);
}
-
-
$fp = fopen(dirname(__FILE__)."/common.inc.php","r");
$configStr1 = fread($fp,filesize(dirname(__FILE__)."/common.inc.php"));
fclose($fp);
-
$fp = fopen(dirname(__FILE__)."/config.cache.inc.php","r");
$configStr2 = fread($fp,filesize(dirname(__FILE__)."/config.cache.inc.php"));
fclose($fp);
-
//common.inc.php
$configStr1 = str_replace("~dbtype~",$dbtype,$configStr1);
$configStr1 = str_replace("~dbhost~",$dbhost,$configStr1);
@@ -152,39 +127,31 @@ else if($step==2)
$configStr1 = str_replace("~dbpwd~",$dbpwd,$configStr1);
$configStr1 = str_replace("~dbprefix~",$dbprefix,$configStr1);
$configStr1 = str_replace("~dblang~",$dblang,$configStr1);
-
@chmod(DEDEDATA,0777);
$fp = fopen(DEDEDATA."/common.inc.php","w") or die("");
fwrite($fp,$configStr1);
fclose($fp);
-
//config.cache.inc.php
$cmspath = trim(preg_replace("#\/{1,}#", '/', $cmspath));
if($cmspath!='' && !preg_match("#^\/#", $cmspath)) $cmspath = '/'.$cmspath;
-
if($cmspath=='') $indexUrl = '/';
else $indexUrl = $cmspath;
-
$configStr2 = str_replace("~baseurl~",$baseurl,$configStr2);
$configStr2 = str_replace("~basepath~",$cmspath,$configStr2);
$configStr2 = str_replace("~indexurl~",$indexUrl,$configStr2);
$configStr2 = str_replace("~cookieEncode~",$cookieencode,$configStr2);
$configStr2 = str_replace("~webname~",$webname,$configStr2);
$configStr2 = str_replace("~adminmail~",$adminmail,$configStr2);
-
$fp = fopen(DEDEDATA.'/config.cache.inc.php','w');
fwrite($fp,$configStr2);
fclose($fp);
-
$fp = fopen(DEDEDATA.'/config.cache.bak.php','w');
fwrite($fp,$configStr2);
fclose($fp);
-
if($mysqlVersion >= 4.1)
{
$sql4tmp = "ENGINE=MyISAM DEFAULT CHARSET=".$dblang;
}
-
//创建数据表
$query = '';
$fp = fopen(dirname(__FILE__).'/sql-dftables.txt','r');
@@ -200,7 +167,6 @@ else if($step==2)
$query = preg_replace('/character set (.*?) /i','',$query);
$query = str_replace('unsigned','',$query);
$query = str_replace('TYPE=MyISAM','',$query);
-
$query = preg_replace ('/TINYINT\(([\d]+)\)/i','INTEGER',$query);
$query = preg_replace ('/mediumint\(([\d]+)\)/i','INTEGER',$query);
$query = preg_replace ('/smallint\(([\d]+)\)/i','INTEGER',$query);
@@ -232,7 +198,6 @@ else if($step==2)
}
}
}
-
$query='';
} else if(!preg_match("#^(\/\/|--)#", $line))
{
@@ -240,7 +205,6 @@ else if($step==2)
}
}
fclose($fp);
-
//导入默认数据
$query = '';
$fp = fopen(dirname(__FILE__).'/sql-dfdata.txt','r');
@@ -269,7 +233,6 @@ else if($step==2)
}
}
fclose($fp);
-
//更新配置
$cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$baseurl}' WHERE varname='cfg_basehost';";
$dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
@@ -283,30 +246,22 @@ else if($step==2)
$dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
$cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$adminmail}' WHERE varname='cfg_adminemail';";
$dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
-
//增加管理员帐号
$adminquery = "INSERT INTO `{$dbprefix}admin` VALUES (1, 10, '$adminuser', '".substr(md5($adminpwd),5,20)."', 'admin', '', '', 0, '".time()."', '127.0.0.1');";
$dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
//关连前台会员帐号
- $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,
- `scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
- VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); ";
+ $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,`scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
+ VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); ";
$dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
- $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,
- `income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`)
- VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); ";
+ $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`)
+ VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); ";
$dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
$adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`)
- VALUES ('1','0','0','0','0','0','0','0','0'); ";
+ VALUES ('1','0','0','0','0','0','0','0','0'); ";
$dbtype == 'sqlite'? $db->exec($adminquery): mysql_query($adminquery,$conn);
-
$adminquery = "INSERT INTO `{$dbprefix}member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`)
- VALUES('1','10','0','{$adminuser}的空间','','person','',''); ";
+ VALUES('1','10','0','{$adminuser}的空间','','person','',''); ";
$dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn);
-
//锁定安装程序
$fp = fopen($insLockfile,'w');
fwrite($fp,'ok');
@@ -329,7 +284,7 @@ else if($step==10)
{
if(empty($dbname)){
$info = "信息正确";
- }else{
+ } else {
$info = mysql_select_db($dbname,$conn)? "数据库已经存在，系统将覆盖数据库": "数据库不存在,系统将自动创建";
}
$result = array(
@@ -337,9 +292,7 @@ else if($step==10)
"data" => $info,
);
echo json_encode($result);
- }
- else
- {
+ } else {
$result = array(
"code" => -1,
"data" => "数据库连接失败！",
@@ -348,4 +301,4 @@ else if($step==10)
}
@mysql_close($conn);
exit();
-}
+}
\ No newline at end of file
diff --git a/src/install/style.css b/src/install/style.css
index 458181f3..426be8d5 100755
--- a/src/install/style.css
+++ b/src/install/style.css
@@ -1,151 +1,142 @@
@import "tablebox.css";
-
-*{
+ * {
padding:0px;
margin:0px;
- font-size: 13px;
+ font-size:13px
}
-body{
- font-family:Verdana, Arial, Helvetica, sans-serif;
+body {
+ font-family:Verdana,Arial,Helvetica,sans-serif;
font-size:12px;
background:url(images/top-bg.png) left top repeat-x;
- background-color:#FFF;
+ background-color:#FFF
}
-ul{
- list-style:none;
+ul {
+ list-style:none
}
-a{
- color:#06C;
+a {
+ color:#06C
}
-a:hover{
+a:hover {
color:#669900;
- text-decoration:none;
+ text-decoration:none
}
-input,button,select{
- vertical-align:middle;
+input,button,select {
+ vertical-align:middle
}
-
select {
- height: calc(1.5em + .75rem + 2px);
- padding: .375rem .75rem;
- font-weight: 400;
- color: #495057;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #ced4da;
- border-radius: .25rem;
- transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
-}
-
-input[type="button"],input[type="submit"],input[type="reset"] {
- border: none;
- border-right: 1px solid #ACACAC;
- border-bottom: 1px solid #ACACAC;
- background-color: #F1F8B4;
- padding: 2px;
- padding-right: 5px;
- padding-left: 5px;
- cursor: pointer;
-}
-
-input[type="text"],input[type="password"] {
- font-size: 1rem;
- font-weight: 400;
- color: #495057;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #ced4da;
- border-radius: .25rem;
- height: calc(1.5em + .75rem + 2px);
- padding: .375rem .75rem;
- transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
- line-height: 18px;
- vertical-align: middle;
-}
-.fc-690{
- color:#FF760A;
+ height:calc(1.5em + .75rem + 2px);
+ padding:.375rem .75rem;
+ font-weight:400;
+ color:#495057;
+ background-color:#fff;
+ background-clip:padding-box;
+ border:1px solid #ced4da;
+ border-radius:.25rem;
+ transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out
}
-.fs-14{
- font-size:14px;
+input[type="button"],input[type="submit"],input[type="reset"] {
+ border:none;
+ border-right:1px solid #ACACAC;
+ border-bottom:1px solid #ACACAC;
+ background-color:#F1F8B4;
+ padding:2px;
+ padding-right:5px;
+ padding-left:5px;
+ cursor:pointer
}
-
-.top{
+input[type="text"],input[type="password"] {
+ font-size:1rem;
+ font-weight:400;
+ color:#495057;
+ background-color:#fff;
+ background-clip:padding-box;
+ border:1px solid #ced4da;
+ border-radius:.25rem;
+ height:calc(1.5em + .75rem + 2px);
+ padding:.375rem .75rem;
+ transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+ line-height:18px;
+ vertical-align:middle
+}
+.fc-690 {
+ color:#FF760A
+}
+.fs-14 {
+ font-size:14px
+}
+.top {
width:960px;
height:72px;
overflow:hidden;
- margin:0px auto;
+ margin:0px auto
}
-.top .top-logo{
+.top .top-logo {
width:280px;
height:72px;
float:left;
padding-left:10px;
background:url(images/top-logo.png) 10px 0px no-repeat;
- overflow:hidden;
+ overflow:hidden
}
-.top .top-logo h1{
+.top .top-logo h1 {
font-size:0px;
- line-height:1000%;
+ line-height:1000%
}
-.top .top-link{
+.top .top-link {
height:25px;
padding:12px 12px 0px 0px;
- overflow:hidden;
+ overflow:hidden
}
-.top .top-link ul{
+.top .top-link ul {
height:15px;
float:right;
- overflow:hidden;
+ overflow:hidden
}
-.top .top-link ul li{
+.top .top-link ul li {
float:left;
padding-left:10px;
padding-right:10px;
border-left:1px solid #E8F5E3;
margin-left:-1px;
- line-height:14px;
+ line-height:14px
}
-.top .top-link ul li a{
+.top .top-link ul li a {
text-decoration:none;
- color:#555;
+ color:#555
}
-.top .top-version{
+.top .top-version {
height:40px;
float:right;
- padding:13px 13px 0px 0px;
+ padding:13px 13px 0px 0px
}
-.top .top-version h2{
+.top .top-version h2 {
color:#FF760A;
font-size:22px;
font-style:italic;
- cursor:default;
+ cursor:default
}
-
-.main{
+.main {
width:900px;
- margin:14px auto 0px;
+ margin:14px auto 0px
}
-
-.main .pleft{
+.main .pleft {
width:168px;
float:left;
cursor:default;
- padding-top:6px;
+ padding-top:6px
}
-.main .pright{
+.main .pright {
width:720px;
- float:right;
+ float:right
}
-
-
-.pr-title{
+.pr-title {
width:720px;
height:22px;
margin:8px auto 0px;
background:url(images/boxtitle_bg.gif) 0px 20px repeat-x;
- overflow:hidden;
+ overflow:hidden
}
-.pr-title h3{
+.pr-title h3 {
width:158px;
height:22px;
line-height:22px;
@@ -157,13 +148,12 @@ input[type="text"],input[type="password"] {
background:url(images/boxtitle_bg.gif) 0px -2px no-repeat;
letter-spacing:2px;
color:#FF760A;
- font-weight:bold;
+ font-weight:bold
}
-
-.t1{
- width:162px;
+.t1 {
+ width:162px
}
-.t1 dt{
+.t1 dt {
width:162px;
height:25px;
line-height:25px;
@@ -171,74 +161,68 @@ input[type="text"],input[type="password"] {
font-weight:bold;
color:#FF760A;
text-indent:10px;
- letter-spacing:2px;
+ letter-spacing:2px
}
-.t1 dd{
+.t1 dd {
width:160px;
background-color:#FFFAF7;
- border:1px solid #FFCABF;
+ border:1px solid #FFCABF
}
-.t1 dd ul{
+.t1 dd ul {
width:158px;
border:1px solid #FFF;
overflow:hidden;
padding:10px 0px;
- background:url(images/step-ico-bg.png) 20px 21px no-repeat;
+ background:url(images/step-ico-bg.png) 20px 21px no-repeat
}
-.t1 dd ul li{
+.t1 dd ul li {
height:40px;
line-height:36px;
text-indent:52px;
display:block;
color:#888;
- font-size:14px;
+ font-size:14px
}
-.t1 dd ul li.succeed{
+.t1 dd ul li.succeed {
color:#FF760A;
- background:url(images/ico-step-succeed.png) 23px 14px no-repeat;
+ background:url(images/ico-step-succeed.png) 23px 14px no-repeat
}
-.t1 dd ul li.now{
+.t1 dd ul li.now {
color:#FF9900;
font-weight:bold;
- background:url(images/ico-step-now.png) 23px 14px no-repeat;
+ background:url(images/ico-step-now.png) 23px 14px no-repeat
}
-
-.install-msg{
+.install-msg {
padding:10px 20px;
color:#777;
line-height:31px;
font-size:14px;
overflow:hidden;
- clear:both;
-
+ clear:both
}
-
-
-.pr-agreement{
+.pr-agreement {
padding:16px;
line-height:21px;
color:#666;
height:300px;
- overflow-y:scroll;
+ overflow-y:scroll
}
-.pr-agreement strong{
+.pr-agreement strong {
display:block;
color:#333;
line-height:27px;
- margin-top:6px;
+ margin-top:6px
}
-.pr-agreement p{
- text-indent:30px;
+.pr-agreement p {
+ text-indent:30px
}
-
-
-.btn-box{
+.btn-box {
margin-top:15px;
border-top:1px solid #DDD;
padding:10px 6px;
- vertical-align:middle;
+ vertical-align:middle
}
-.btn-next{
+.btn-next {
width:104px;
height:34px;
border:none;
@@ -247,9 +231,9 @@ input[type="text"],input[type="password"] {
margin-left:10px;
overflow:hidden;
font-size:0px;
- line-height:100px;
+ line-height:100px
}
-.btn-back{
+.btn-back {
width:104px;
height:34px;
border:none;
@@ -257,45 +241,39 @@ input[type="text"],input[type="password"] {
cursor:pointer;
overflow:hidden;
font-size:0px;
- line-height:100px;
+ line-height:100px
}
-
-
-#readpact{
+#readpact {
*margin-top:-4px;
- margin-right:4px;
+ margin-right:4px
}
-
-.over-link{
+.over-link {
padding:0px 40px;
line-height:41px;
overflow:hidden;
- clear:both;
+ clear:both
}
.waitpage {
- top:0;
- left:0;
- filter:Alpha(opacity=70);
- -moz-opacity:0.7;
- position:absolute;
- z-index:10000;
- background:url(images/loading1.gif) #ababab no-repeat center 200px;
- width:100%;
- height:2500px;
- display:none;
-}
-
+ top:0;
+ left:0;
+ filter:Alpha(opacity=70);
+ -moz-opacity:0.7;
+ position:absolute;
+ z-index:10000;
+ background:url(images/loading1.gif) #ababab no-repeat center 200px;
+ width:100%;
+ height:2500px;
+ display:none
+}
.divpre {
- filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);
+ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale)
}
-
.modulesel {
- width:120px;
- margin-right:8px;
- float:left;
+ width:120px;
+ margin-right:8px;
+ float:left
}
-
.pr-agreement h2 {
- font-size: 14px;
- font-weight: bolder;
+ font-size:14px;
+ font-weight:bolder
}
\ No newline at end of file
diff --git a/src/install/tablebox.css b/src/install/tablebox.css
index 5b3f8be5..50390de8 100755
--- a/src/install/tablebox.css
+++ b/src/install/tablebox.css
@@ -1,106 +1,89 @@
-input{
+input {
vertical-align:middle;
margin-right:3px;
- font-size:12px;
+ font-size:12px
}
-textarea{
+textarea {
vertical-align:top;
font-size:12px;
line-height:156%;
border:1px solid #AAA;
padding:3px;
letter-spacing:1px;
- word-break:break-all;
- overflow-y:auto;
+ word-break:break-all;
+ overflow-y:auto
}
-.input-txt{
+.input-txt {
padding:4px 8px 4px 6px;
border:1px solid #AAA;
font-size:12px;
color:#000;
- width:200px;
+ width:200px
}
-
-.textipt_on{
- border:1px solid #F90;
+.textipt_on {
+ border:1px solid #F90
}
-
-
-hr{
+hr {
height:1px;
line-height:1px;
overflow:hidden;
- border-width:1px 0px 0px 0px ;
- border-top:1px solid #FFCABF;/*兼容Opera*/
- }
+ border-width:1px 0px 0px 0px;
+ border-top:1px solid #FFCABF
+}
hr:empty {
margin:8px 0px 7px 0px !important;
- margin:0px;
+ margin:0px
}
-
-small{
- font-size:12px;
+small {
+ font-size:12px
}
-
-.moncolor td{
- background:#FFCABF;
+.moncolor td {
+ background:#FFCABF
}
-
-.twbox{
+.twbox {
width:706px;
border:1px solid #FFCABF;
font-size:12px;
overflow:hidden;
- margin:8px auto;
-
+ margin:8px auto
}
-
-
-.twbox thead tr td{
+.twbox thead tr td {
background:url(body_title_bg.gif) -1px -1px repeat-x;
height:31px;
line-height:31px;
- text-indent:10px;
+ text-indent:10px
}
-
-.twbox thead tr td strong{
+.twbox thead tr td strong {
letter-spacing:2px;
margin-right:14px;
color:#FFF;
- font-size:14px;
+ font-size:14px
}
-
-
-.twbox thead tr td span{
- color:#CDA;
+.twbox thead tr td span {
+ color:#CDA
}
-
-
-.twbox thead tr td p{
+.twbox thead tr td p {
height:31px;
display:inline;
float:right;
margin:-31px 10px 0 0;
- overflow:hidden;
+ overflow:hidden
}
-.twbox thead tr td p *{
- float:right;
+.twbox thead tr td p * {
+ float:right
}
-.twbox thead tr td a.thlink{
- color:#FFF;
+.twbox thead tr td a.thlink {
+ color:#FFF
}
-.twbox thead tr td a.thlink:hover{
+.twbox thead tr td a.thlink:hover {
color:#FFFF00;
- text-decoration:none;
+ text-decoration:none
}
-
-
.twbox tbody {
overflow:hidden;
- text-align:left;
+ text-align:left
}
-
-.twbox tbody tr th{
+.twbox tbody tr th {
background:#FFFAF7;
color:#FF760A;
line-height:21px;
@@ -108,42 +91,37 @@ small{
text-indent:30px;
font-weight:normal;
border-bottom:1px solid #FFCABF;
- letter-spacing:2px;
+ letter-spacing:2px
}
-
-.twbox tbody tr td{
+.twbox tbody tr td {
padding:7px;
border-bottom:1px solid #F2F2F2;
color:#333;
- vertical-align:top;
+ vertical-align:top
}
-
-.twbox tbody tr td p{
- line-height:21px;
+.twbox tbody tr td p {
+ line-height:21px
}
-.twbox tbody tr td p strong img{
- vertical-align:middle;
+.twbox tbody tr td p strong img {
+ vertical-align:middle
}
-.twbox tbody tr td img{
+.twbox tbody tr td img {
vertical-align:top;
- margin:0px 10px 5px 0px;
-
+ margin:0px 10px 5px 0px
}
-.twbox tbody tr td small{
- color:#888;
+.twbox tbody tr td small {
+ color:#888
}
-
-.twbox tfoot tr td{
+.twbox tfoot tr td {
padding:10px;
line-height:25px;
- text-align:center;
+ text-align:center
}
-.twbox tfoot tr td p{
+.twbox tfoot tr td p {
line-height:21px;
- margin-bottom:10px;
+ margin-bottom:10px
}
-
-input.but{
+input.but {
height:26px;
padding-left:6px;
padding-right:6px;
@@ -151,12 +129,10 @@ input.but{
font-weight:bold;
letter-spacing:1px;
color:#FFF;
- background-color:#FC3;
+ background-color:#FC3
}
-
-.onetd{
+.onetd {
width:120px;
text-align:right;
- line-height:25px;
-}
-
+ line-height:25px
+}
\ No newline at end of file
diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html
index 0a22bca4..7dcd696f 100755
--- a/src/install/templates/step-1.html
+++ b/src/install/templates/step-1.html
@@ -1,19 +1,15 @@
-
+
-
- 安装程序 - DedeBIZ - DedeBIZ技术支持
-
+ 安装程序 - DedeBIZ - DedeBIZ技术支持
-
+
-
DedeBIZ安装程序
@@ -23,21 +19,18 @@
技术服务
-
0){
foreach($arrMsg as $msg){
?>
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/src/robots.txt b/src/robots.txt
index d7111802..93cccb3e 100755
--- a/src/robots.txt
+++ b/src/robots.txt
@@ -1,18 +1,5 @@
-User-agent: *
-Disallow: /plus/ad_js.php
-Disallow: /plus/advancedsearch.php
-Disallow: /plus/car.php
-Disallow: /plus/carbuyaction.php
-Disallow: /plus/shops_buyaction.php
-Disallow: /plus/erraddsave.php
-Disallow: /plus/posttocar.php
-Disallow: /plus/disdls.php
-Disallow: /plus/feedback_js.php
-Disallow: /plus/mytag_js.php
-Disallow: /plus/rss.php
-Disallow: /plus/search.php
-Disallow: /plus/recommend.php
-Disallow: /plus/stow.php
-Disallow: /plus/count.php
+User-agent: *
+Disallow: /data
Disallow: /include
+Disallow: /plus
Disallow: /templets
\ No newline at end of file