From 6a2dc40d7ab5719dc7eb39fece0a78f4957f22b6 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 10 Apr 2014 11:28:18 +0900
Subject: [PATCH] =?UTF-8?q?579=20table=20create=EC=97=90=20=EC=8B=A4?=
 =?UTF-8?q?=ED=8C=A8=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/install/install.controller.php | 13 ++++++++++---
 modules/install/lang/lang.xml          |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 5c2143df9..e62f5961d 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -167,9 +167,14 @@ class installController extends install
 		if(!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
-		$oDB->begin();
-		$this->installDownloadedModule();
-		$oDB->commit();
+		try {
+			$oDB->begin();
+			$this->installDownloadedModule();
+			$oDB->commit();
+		} catch(Exception $e) {
+			$oDB->rollback();
+			return new Object(-1, $e->getMessage());
+		}
 
 		// Create a config file
 		if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
@@ -515,6 +520,8 @@ class installController extends install
 			$file = trim($schema_files[$i]);
 			if(!$file || substr($file,-4)!='.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
+			if($output === false)
+				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
index 75d4b81be..437196e3d 100644
--- a/modules/install/lang/lang.xml
+++ b/modules/install/lang/lang.xml
@@ -808,6 +808,10 @@
 		<value xml:lang="tr"><![CDATA[Kurulum dosyası oluşturulurken bir hata oluştu.]]></value>
 		<value xml:lang="vi"><![CDATA[Đã có lỗi xảy ra khi tạo File cài đặt.]]></value>
 	</item>
+	<item name="msg_create_table_failed">
+		<value xml:lang="ko"><![CDATA[DB 테이블 생성에 실패했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to create database tables.]]></value>
+	</item>
 	<item name="ftp_get_list">
 		<value xml:lang="ko"><![CDATA[목록 가져오기]]></value>
 		<value xml:lang="en"><![CDATA[Get List]]></value>