From 08c1507444abf151f82360e8f07067faa506ff38 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Mon, 4 Jan 2010 08:43:12 +0000
Subject: [PATCH] =?UTF-8?q?install=20script=20=EC=A7=80=EC=9B=90=20?=
 =?UTF-8?q?=EB=B0=8F=20PHP=EC=9D=98=20safe=5Fmode=EA=B0=80=20=EC=95=84?=
 =?UTF-8?q?=EB=8B=8C=EA=B2=BD=EC=9A=B0=20FTP=EC=84=A4=EC=A0=95=20=EB=84=98?=
 =?UTF-8?q?=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7106 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/install.view.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 202c97165..63dffe292 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -31,7 +31,20 @@
          * @brief license 메세지 노출
          **/
         function dispInstallIntroduce() {
-            $this->setTemplateFile('introduce');
+			$install_config_file = FileHandler::getRealPath('./config/install.config.php');
+			if(file_exists($install_config_file)){
+				include $install_config_file;
+				if(is_array($install_config)){
+					foreach($install_config as $k => $v) Context::set($k,$v,true);
+					unset($GLOBALS['__DB__']);
+					$oInstallController = &getController('install');
+					$oInstallController->procInstall();
+					header("location: ./");
+					exit;
+				}
+			}
+
+			$this->setTemplateFile('introduce');
         }
 
         /**
@@ -50,7 +63,7 @@
             if(!$this->install_enable) return $this->dispInstallCheckEnv();
 
             // ftp 정보 입력
-            if(!Context::isFTPRegisted()) {
+            if(ini_get('safe_mode') && !Context::isFTPRegisted()) {
                 $this->setTemplateFile('ftp');
             } else {
                 $this->setTemplateFile('select_db');