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)}
- + -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->no}{$lang->module}{$lang->file_name}{$lang->file_size}{$lang->download_count}{$lang->date}{$lang->ipaddress}{$lang->cmd_move_to_document}{$lang->cmd_download}
{$no}{$module_list[$val->module_srl]->browser_title}{$val->source_filename}{$val->file_size}{$val->download_count}{zdate($val->regdate,"Y-m-d")}{$val->ipaddress}{$lang->cmd_move}{$lang->cmd_download}
-
+
+ + + + + + + + + + + + - -
- -
+ + + + + + + + + + + + + + + +
{$lang->no}{$lang->module}{$lang->file_name}{$lang->file_size}{$lang->download_count}{$lang->date}{$lang->ipaddress}{$lang->cmd_move_to_document}{$lang->cmd_download}
{$no}{$module_list[$val->module_srl]->browser_title}{$val->source_filename}{$val->file_size}{$val->download_count}{zdate($val->regdate,"Y-m-d")}{$val->ipaddress}{$lang->cmd_move}{$lang->cmd_download}
+
+ + +
+ +
-
- - - + + + + -
- - - - -
-
+
+ + + + +
+
- [{$lang->first_page}] + [{$lang->first_page}] - - - {$page_no} - - [{$page_no}] - - + + + {$page_no} + + [{$page_no}] + + - [{$lang->last_page}] + [{$lang->last_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 @@
- - - - - - - - - - - - - - - - - - - - - - - - - -
- {$lang->db_title} -
{$lang->db_hostname} - -
{$lang->db_userid} - -
{$lang->db_password} - -
{$lang->db_database} - -
{$lang->db_table_prefix} - -
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$lang->admin_title} -
{$lang->user_id} - -
{$lang->password1} - -
{$lang->password2} - -
{$lang->user_name} - -
{$lang->nick_name} - -
{$lang->email_address} - -
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ {$lang->db_title} +
{$lang->db_hostname} + +
{$lang->db_userid} + +
{$lang->db_password} + +
{$lang->db_database} + +
{$lang->db_table_prefix} + +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {$lang->admin_title} +
{$lang->user_id} + +
{$lang->password1} + +
{$lang->password2} + +
{$lang->user_name} + +
{$lang->nick_name} + +
{$lang->email_address} + +
+ +
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]}
- - - - - - + +
{$lang->db_type} - -
+ + + +
{$lang->db_type} + +
+ {$lang->cmd_install_fix_checklist} + diff --git a/modules/krzip/conf/info.xml b/modules/krzip/conf/info.xml index 10678837d..52fccdf8d 100644 --- a/modules/krzip/conf/info.xml +++ b/modules/krzip/conf/info.xml @@ -1,11 +1,8 @@ - 한국 우편번호 검색 - Korea Zipcode Finder - - 제로 - zero - 한국 우편번호 검색을 담당합니다. - Korea Zipcode Finder - + 한국 우편번호 검색 + + 제로 + 제로보드에서 운영하는 우편번호서버를 이용하여 우편번호 검색을 합니다. + diff --git a/modules/krzip/conf/module.xml b/modules/krzip/conf/module.xml index 685353430..9aef3127e 100644 --- a/modules/krzip/conf/module.xml +++ b/modules/krzip/conf/module.xml @@ -2,8 +2,8 @@ - - - + + + diff --git a/modules/krzip/krzip.class.php b/modules/krzip/krzip.class.php index df3129f87..de142c32f 100644 --- a/modules/krzip/krzip.class.php +++ b/modules/krzip/krzip.class.php @@ -15,6 +15,11 @@ * @brief 설치시 추가 작업이 필요할시 구현 **/ function moduleInstall() { + // action forward에 등록 (관리자 모드에서 사용하기 위함) + $oModuleController = &getController('module'); + $oModuleController->insertActionFoward('krzip', 'view', 'dispKrzipAdminConfig'); + $oModuleController->insertActionFoward('krzip', 'controller', 'procKrzipAdminInsertConfig'); + return new Object(); } diff --git a/modules/krzip/krzip.controller.php b/modules/krzip/krzip.controller.php index f069fd071..a2717dae9 100644 --- a/modules/krzip/krzip.controller.php +++ b/modules/krzip/krzip.controller.php @@ -16,7 +16,7 @@ /** * @brief 설정 **/ - function procInsertConfig() { + function procKrzipAdminInsertConfig() { // 기본 정보를 받음 $args = Context::gets('krzip_server_hostname','krzip_server_port','krzip_server_query'); if(!$args->krzip_server_hostname) $args->krzip_server_hostname = $this->hostname; diff --git a/modules/krzip/krzip.model.php b/modules/krzip/krzip.model.php index b0ce3ceea..f119cbbea 100644 --- a/modules/krzip/krzip.model.php +++ b/modules/krzip/krzip.model.php @@ -17,7 +17,7 @@ * @brief 우편 번호 검색 * 동이름을 입력받아서 지정된 서버에 우편번호 목록을 요청한다 **/ - function getZipCodeList() { + function getKrzipCodeList() { // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('krzip'); diff --git a/modules/krzip/krzip.view.php b/modules/krzip/krzip.view.php index dcd03ff96..b2331b7d5 100644 --- a/modules/krzip/krzip.view.php +++ b/modules/krzip/krzip.view.php @@ -17,7 +17,7 @@ /** * @brief 설정 **/ - function dispConfig() { + function dispKrzipAdminConfig() { // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('krzip'); diff --git a/modules/krzip/tpl.admin/filter/insert_config.xml b/modules/krzip/tpl/filter/insert_config.xml similarity index 100% rename from modules/krzip/tpl.admin/filter/insert_config.xml rename to modules/krzip/tpl/filter/insert_config.xml diff --git a/modules/krzip/tpl.admin/index.html b/modules/krzip/tpl/index.html similarity index 100% rename from modules/krzip/tpl.admin/index.html rename to modules/krzip/tpl/index.html