diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 184f91791..b70d8981d 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -2,83 +2,85 @@
- {$lang->total_count} : {number_format($total_count)},
- {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
+ {$lang->total_count} : {number_format($total_count)},
+ {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
diff --git a/modules/file/tpl/filter/delete_checked.xml b/modules/file/tpl/filter/delete_checked.xml
index 6540e70a1..50e94c3ba 100644
--- a/modules/file/tpl/filter/delete_checked.xml
+++ b/modules/file/tpl/filter/delete_checked.xml
@@ -1,12 +1,12 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/modules/install/conf/info.xml b/modules/install/conf/info.xml
index 023fbbba8..9e948124f 100644
--- a/modules/install/conf/info.xml
+++ b/modules/install/conf/info.xml
@@ -1,11 +1,8 @@
- 설치관리
- install
-
- 제로
- zero
- 설치 관리 모듈
- install
-
+ 설치관리
+
+ 제로
+ 설치 관리 모듈
+
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 3d0d0b0df..2ee4ae4d2 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 6127e7dc4..71b1727cc 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -16,6 +16,37 @@
if(Context::isInstalled()) return $this->dispMessage('msg_already_installed');
}
+ /**
+ * @brief 입력받은 정보로 설치를 함
+ **/
+ function procInstall() {
+ // 설치가 되어 있는지에 대한 체크
+ if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+
+ // DB와 관련된 변수를 받음
+ $db_info = Context::gets('db_type','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+
+ // DB의 타입과 정보를 등록
+ Context::setDBInfo($db_info);
+
+ // DB Instance 생성
+ $oDB = &DB::getInstance();
+
+ // DB접속이 가능한지 체크
+ if(!$oDB->isConnected()) return new Object(-1, 'msg_dbconnect_failed');
+
+ // 모든 모듈의 설치
+ $output = $this->installDownloadedModule();
+ if(!$output->toBool()) return $output;
+
+ // config 파일 생성
+ if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+
+ // 설치 완료 메세지 출력
+ $this->setMessage('msg_install_completed');
+ $this->setRedirectUrl('./');
+ }
+
/**
* @brief 인스톨 환경을 체크하여 결과 return
**/
@@ -57,38 +88,6 @@
return $install_enable;
}
-
- /**
- * @brief 입력받은 정보로 설치를 함
- **/
- function procInstall() {
- // 설치가 되어 있는지에 대한 체크
- if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
-
- // DB와 관련된 변수를 받음
- $db_info = Context::gets('db_type','db_hostname','db_userid','db_password','db_database','db_table_prefix');
-
- // DB의 타입과 정보를 등록
- Context::setDBInfo($db_info);
-
- // DB Instance 생성
- $oDB = &DB::getInstance();
-
- // DB접속이 가능한지 체크
- if(!$oDB->isConnected()) return new Object(-1, 'msg_dbconnect_failed');
-
- // 모든 모듈의 설치
- $output = $this->installDownloadedModule();
- if(!$output->toBool()) return $output;
-
- // config 파일 생성
- if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
-
- // 설치 완료 메세지 출력
- $this->setMessage('msg_install_completed');
- $this->setRedirectUrl('./');
- }
-
/**
* @brief files 및 하위 디렉토리 생성
* DB 정보를 바탕으로 실제 install하기 전에 로컬 환경 설저d
diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 80ab05958..7698f4cdc 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -30,7 +30,7 @@
/**
* @brief license 및 설치 환경에 대한 메세지 보여줌
**/
- function dispIntroduce() {
+ function dispInstallIntroduce() {
$this->setTemplateFile('introduce');
}
diff --git a/modules/install/schemas/sequence.xml b/modules/install/schemas/sequence.xml
index d3f6a9331..28a05541a 100644
--- a/modules/install/schemas/sequence.xml
+++ b/modules/install/schemas/sequence.xml
@@ -1,3 +1,3 @@
diff --git a/modules/install/tpl/filter/mysql.xml b/modules/install/tpl/filter/mysql.xml
index a2daa489f..6121f4b69 100644
--- a/modules/install/tpl/filter/mysql.xml
+++ b/modules/install/tpl/filter/mysql.xml
@@ -1,34 +1,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index 5aec3c660..1cc857a77 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -1,88 +1,89 @@
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index 48e6a0334..3e0fdfbdd 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -1,46 +1,50 @@
- | {$lang->introduce_title} |
+ {$lang->introduce_title} |
- |
- {nl2br($lang->introduce)}
- |
+
+ {nl2br($lang->introduce)}
+ |
- | {$lang->install_condition_title} |
+ {$lang->install_condition_title} |
+
- | {$lang->install_checklist_title[$key]} |
- {$lang->enable}{$lang->disable} |
+ {$lang->install_checklist_title[$key]} |
+ {$lang->enable}{$lang->disable} |
- | {$lang->install_checklist_desc[$key]} |
+ {$lang->install_checklist_desc[$key]} |
+