diff --git a/src/install/index.php b/src/install/index.php
new file mode 100644
index 00000000..1aacba8c
--- /dev/null
+++ b/src/install/index.php
@@ -0,0 +1,392 @@
+ $_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;
+}
+/*------------------------
+使用协议书
+function _1_Agreement()
+------------------------*/
+if($step==1)
+{
+ include('./templates/step-1.html');
+ exit();
+}
+/*------------------------
+环境测试
+function _2_TestEnv()
+------------------------*/
+else if($step==2)
+{
+ $phpv = phpversion();
+ $sp_os = PHP_OS;
+ $sp_gd = gdversion();
+ $sp_server = $_SERVER['SERVER_SOFTWARE'];
+ $sp_host = (empty($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_HOST'] : $_SERVER['REMOTE_ADDR']);
+ $sp_name = $_SERVER['SERVER_NAME'];
+ $sp_max_execution_time = ini_get('max_execution_time');
+ $sp_openssl = (extension_loaded("openssl") ? '[√]On' : '[×]Off');
+ $sp_sockets = (extension_loaded("sockets") ? '[√]On' : '[×]Off');
+ $sp_allow_reference = (ini_get('allow_call_time_pass_reference') ? '[√]On' : '[×]Off');
+ $sp_allow_url_fopen = (ini_get('allow_url_fopen') ? '[√]On' : '[×]Off');
+ $sp_safe_mode = (ini_get('safe_mode') ? '[×]On' : '[√]Off');
+ $sp_gd = ($sp_gd>0 ? '[√]On' : '[×]Off');
+ $sp_mysql = (function_exists('mysql_connect') ? '[√]On' : '[×]Off');
+
+ if($sp_mysql=='[×]Off')
+ $sp_mysql_err = TRUE;
+ else
+ $sp_mysql_err = FALSE;
+
+ $sp_testdirs = array(
+ '/',
+ '/plus/*',
+ '/dede/*',
+ '/data/*',
+ '/a/*',
+ '/install',
+ '/special',
+ '/uploads/*'
+ );
+ include('./templates/step-2.html');
+ exit();
+}
+/*------------------------
+设置参数
+function _3_WriteSeting()
+------------------------*/
+else if($step==3)
+{
+ 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);
+ $max = strlen($chars) - 1;
+ for($i = 0; $i < $length; $i++) {
+ $rnd_cookieEncode .= $chars[mt_rand(0, $max)];
+ }
+ $module_local = DEDEDATA.'/module/';
+ include('./templates/step-3.html');
+ exit();
+}
+/*------------------------
+普通安装
+function _4_Setup()
+------------------------*/
+else if($step==4)
+{
+
+ 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);
+ $configStr1 = str_replace("~dbname~",$dbname,$configStr1);
+ $configStr1 = str_replace("~dbuser~",$dbuser,$configStr1);
+ $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');
+ while(!feof($fp))
+ {
+ $line = rtrim(fgets($fp,1024));
+ if(preg_match("#;$#", $line))
+ {
+ $query .= $line."\n";
+ $query = str_replace('#@__',$dbprefix,$query);
+ if ( $dbtype == 'sqlite' )
+ {
+ $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);
+ $query = preg_replace('/int\(([\d]+)\)/i','INTEGER',$query);
+ $query = preg_replace('/auto_increment/i','PRIMARY KEY AUTOINCREMENT',$query);
+ $query = preg_replace('/, KEY(.*?)MyISAM;/','',$query);
+ $query = preg_replace('/, KEY(.*?);/',');',$query);
+ $query = preg_replace('/, UNIQUE KEY(.*?);/',');',$query);
+ $query = preg_replace('/set\(([^\)]*?)\)/','varchar',$query);
+ $query = preg_replace('/enum\(([^\)]*?)\)/','varchar',$query);
+ if ( preg_match("/PRIMARY KEY AUTOINCREMENT/",$query) )
+ {
+ $query = preg_replace('/,([\t\s ]+)PRIMARY KEY \(`([0-9a-zA-Z]+)`\)/i','',$query);
+ $query = str_replace(', PRIMARY KEY (`id`)','',$query);
+ }
+ $db->exec($query);
+ } else {
+ if($mysqlVersion < 4.1)
+ {
+ $rs = mysql_query($query,$conn);
+ } else {
+ if(preg_match('#CREATE#i', $query))
+ {
+ $rs = mysql_query(preg_replace("#TYPE=MyISAM#i",$sql4tmp,$query),$conn);
+ }
+ else
+ {
+ $rs = mysql_query($query,$conn);
+ }
+ }
+ }
+
+ $query='';
+ } else if(!preg_match("#^(\/\/|--)#", $line))
+ {
+ $query .= $line;
+ }
+ }
+ fclose($fp);
+
+ //导入默认数据
+ $query = '';
+ $fp = fopen(dirname(__FILE__).'/sql-dfdata.txt','r');
+ while(!feof($fp))
+ {
+ $line = rtrim(fgets($fp, 1024));
+ if(preg_match("#;$#", $line))
+ {
+ if ( $dbtype == 'sqlite' )
+ {
+ $query .= $line;
+ $query = str_replace('#@__',$dbprefix,$query);
+ $query = str_replace("\'","\"",$query);
+ $db->exec($query);
+ } else {
+ $query .= $line;
+ $query = str_replace('#@__',$dbprefix,$query);
+ if($mysqlVersion < 4.1) $rs = mysql_query($query,$conn);
+ else $rs = mysql_query(str_replace('#~lang~#',$dblang,$query),$conn);
+ }
+
+ $query='';
+ } else if(!preg_match("#^(\/\/|--)#", $line))
+ {
+ $query .= $line;
+ }
+ }
+ fclose($fp);
+
+ //更新配置
+ $cquery = "Update `{$dbprefix}sysconfig` set value='{$baseurl}' where varname='cfg_basehost';";
+ $dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
+ $cquery = "Update `{$dbprefix}sysconfig` set value='{$cmspath}' where varname='cfg_cmspath';";
+ $dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
+ $cquery = "Update `{$dbprefix}sysconfig` set value='{$indexUrl}' where varname='cfg_indexurl';";
+ $dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
+ $cquery = "Update `{$dbprefix}sysconfig` set value='{$cookieencode}' where varname='cfg_cookie_encode';";
+ $dbtype == 'sqlite'? $db->exec($cquery) : mysql_query($cquery,$conn);
+ $cquery = "Update `{$dbprefix}sysconfig` set value='{$webname}' where varname='cfg_webname';";
+ $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',''); ";
+ $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'); ";
+ $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'); ";
+ $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','',''); ";
+ $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn);
+
+ //不安装任何可选模块
+ if(!isset($modules) || !is_array($modules))
+ {
+ //锁定安装程序
+ $fp = fopen($insLockfile,'w');
+ fwrite($fp,'ok');
+ fclose($fp);
+ include('./templates/step-5.html');
+ exit();
+ }
+ else
+ {
+ $module = join(',',$modules);
+ $fp = fopen($moduleCacheFile,'w');
+ fwrite($fp,'<'.'?php'."\r\n");
+ fwrite($fp,'$selModule = "'.$module.'"; '."\r\n");
+ fwrite($fp,'?'.'>');
+ //如果不能写入缓存文件,退出模块安装
+ if(!$fp)
+ {
+ //锁定安装程序
+ $fp = fopen($insLockfile,'w');
+ fwrite($fp,'ok');
+ fclose($fp);
+ $errmsg = "由于无法写入模块缓存,安装可选模块失败,请登录后在模块管理处安装。";
+ include('./templates/step-5.html');
+ exit();
+ }
+ fclose($fp);
+ include('./templates/step-4.html');
+ exit();
+ }
+ exit();
+}
+/*------------------------
+安装可选模块
+function _5_SetupModule()
+------------------------*/
+else if($step==5)
+{
+ header("location:module-install.php");
+ exit();
+}
+/*------------------------
+检测数据库是否有效
+function _10_TestDbPwd()
+------------------------*/
+else if($step==10)
+{
+ header("Pragma:no-cache\r\n");
+ header("Cache-Control:no-cache\r\n");
+ header("Expires:0\r\n");
+ $conn = @mysql_connect($dbhost,$dbuser,$dbpwd);
+ if($conn)
+ {
+ if(empty($dbname)){
+ echo "信息正确";
+ }else{
+ $info = mysql_select_db($dbname,$conn)?"数据库已经存在,系统将覆盖数据库":"数据库不存在,系统将自动创建";
+ echo $info;
+ }
+ }
+ else
+ {
+ echo "数据库连接失败!";
+ }
+ @mysql_close($conn);
+ exit();
+}
diff --git a/src/install/module-install.php b/src/install/module-install.php
new file mode 100644
index 00000000..21b6b823
--- /dev/null
+++ b/src/install/module-install.php
@@ -0,0 +1,120 @@
+由于无法找到模块缓存文件,安装可选模块失败,请登录后在模块管理处安装。
";
+ $msg .= "点击此完成安装 >>";
+ ShowMsg($msg,'javascript:;');
+ exit();
+}
+
+//模块文件夹权限
+if(!TestWrite($moduleDir))
+{
+ $msg = "目录 {$moduleDir} 不支持写入,不能安装模块,请登录后在模块管理处安装。
";
+ $msg .= "点击此完成安装 >>";
+ ShowMsg($msg,"javascript:;");
+ exit();
+}
+
+include($moduleCacheFile);
+$modules = split(',',$selModule);
+$totalMod = count($modules);
+if($step >= $totalMod)
+{
+ $msg = "完成所有模块的安装!
";
+ $msg .= "点击此进行下一步操作 >>";
+ ShowMsg($msg,'javascript:;');
+ exit();
+}
+$moduleHash = $modules[$step];
+$moduleFile = $allmodules[$moduleHash];
+
+$dm = new DedeModule($moduleDir);
+
+$minfos = $dm->GetModuleInfo($moduleHash);
+extract($minfos, EXTR_SKIP);
+$menustring = addslashes($dm->GetSystemFile($moduleHash,'menustring'));
+
+$query = "INSERT INTO `#@__sys_module`(`hashcode` , `modname` , `indexname` , `indexurl` , `ismember` , `menustring` )
+ VALUES ('$moduleHash' , '$name' , '$indexname' , '$indexurl' , '$ismember' , '$menustring' ) ";
+
+$rs = $dsql->ExecuteNoneQuery("Delete From `#@__sys_module` where hashcode like '$moduleHash' ");
+$rs = $dsql->ExecuteNoneQuery($query);
+
+if(!$rs)
+{
+ $msg = "保存数据库信息失败,无法完成你选择的模块安装!
";
+ $msg .= "点击此进行下一步操作 >>";
+ exit();
+}
+
+//写文件
+$dm->WriteFiles($moduleHash,1);
+$dm->WriteSystemFile($moduleHash,'readme');
+
+$setupsql = $dm->GetSystemFile($moduleHash,'setupsql40');
+
+//运行SQL
+$mysql_version = $dsql->GetVersion(TRUE);
+$setupsql = preg_replace("#ENGINE=MyISAM#i", 'TYPE=MyISAM', $setupsql);
+$sql41tmp = 'ENGINE=MyISAM DEFAULT CHARSET='.$cfg_db_language;
+
+if($mysql_version >= 4.1) {
+ $setupsql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $setupsql);
+}
+
+//_ROOTURL_
+if($cfg_cmspath=='/') $cfg_cmspath = '';
+
+$rooturl = $cfg_basehost.$cfg_cmspath;
+$setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql);
+$setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql);
+$sqls = preg_split("#;[ \t]{0,}\n#", $setupsql);
+
+foreach($sqls as $sql) {
+ if(trim($sql)!='') $dsql->executenonequery($sql);
+}
+
+$dm->Clear();
+
+$step = $step + 1;
+ShowMsg("模块 {$name} 安装完成,准备下一模块安装...", "module-install.php?step={$step}");
+exit();
\ No newline at end of file
diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html
index ad03e0ae..7cdbd238 100755
--- a/src/install/templates/step-1.html
+++ b/src/install/templates/step-1.html
@@ -22,7 +22,7 @@