From fce135d197d4e13c509b7516533361b2da044fd0 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 14 Feb 2007 09:59:08 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@27 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../install/{install.info.xml => info.xml} | 0 modules/install/install.controller.php | 56 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) rename modules/install/{install.info.xml => info.xml} (100%) diff --git a/modules/install/install.info.xml b/modules/install/info.xml similarity index 100% rename from modules/install/install.info.xml rename to modules/install/info.xml diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 2c413e542..47debf0c9 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -17,7 +17,7 @@ } /** - * $brief 인스톨 환경을 체크하여 결과 return + * @brief 인스톨 환경을 체크하여 결과 return **/ function checkInstallEnv() { // 각 필요한 항목 체크 @@ -63,7 +63,7 @@ function procInstall() { // 설치가 되어 있는지에 대한 체크 if(Context::isInstalled()) { - return $this->doError('msg_already_installed'); + return $this->doError('msg_already_installed'); } // DB와 관련된 변수를 받음 @@ -77,7 +77,7 @@ // DB접속이 가능한지 체크 if(!$oDB->isConnected()) { - return $this->doError('msg_dbconnect_failed'); + return $this->doError('msg_dbconnect_failed'); } // 모든 모듈의 테이블 생성 @@ -132,20 +132,20 @@ **/ function makeDefaultDirectory() { $directory_list = array( - './files', - './files/modules', - './files/plugins', - './files/addons', - './files/layouts', - './files/queries', - './files/schemas', - './files/js_filter_compiled', - './files/template_compiled', - './files/config', - './files/attach', - './files/attach/images', - './files/attach/binaries', - ); + './files', + './files/modules', + './files/plugins', + './files/addons', + './files/layouts', + './files/queries', + './files/schemas', + './files/js_filter_compiled', + './files/template_compiled', + './files/config', + './files/attach', + './files/attach/images', + './files/attach/binaries', + ); foreach($directory_list as $dir) { if(is_dir($dir)) continue; @@ -168,19 +168,19 @@ $module_list_2 = FileHandler::readDir('./files/modules/', NULL, false, true); $module_list = array_merge($module_list_1, $module_list_2); foreach($module_list as $module_path) { - $schema_dir = sprintf('%s/schemas/', $module_path); - $schema_files = FileHandler::readDir($schema_dir, NULL, false, true); - $file_cnt = count($schema_files); - if(!$file_cnt) continue; + $schema_dir = sprintf('%s/schemas/', $module_path); + $schema_files = FileHandler::readDir($schema_dir, NULL, false, true); + $file_cnt = count($schema_files); + if(!$file_cnt) continue; - for($i=0;$i<$file_cnt;$i++) { - $file = trim($schema_files[$i]); - if(!$file || substr($file,-4)!='.xml') continue; - $output = $oDB->createTableByXmlFile($file); - if($oDB->isError()) return $oDB->getError(); + for($i=0;$i<$file_cnt;$i++) { + $file = trim($schema_files[$i]); + if(!$file || substr($file,-4)!='.xml') continue; + $output = $oDB->createTableByXmlFile($file); + if($oDB->isError()) return $oDB->getError(); + } } - } - return new Output(); + return new Object(); } /**