diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index e99d09103..90eef30f3 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -7,7 +7,7 @@ * * xml filter 파일은 js script로 컴파일 되어 캐싱됨\n * \n - * \n + * \n *
<-- 폼 항목의 체크\n * \n * \n @@ -80,7 +80,7 @@ $filter_name = $xml_obj->filter->attrs->name; $confirm_msg_code = $xml_obj->filter->attrs->confirm_msg_code; $module = $xml_obj->filter->attrs->module; - $method_name = $xml_obj->filter->attrs->method_name; + $act = $xml_obj->filter->attrs->act; $field_node = $xml_obj->filter->form->node; @@ -96,7 +96,7 @@ // js function 을 만들기 시작 $js_doc = sprintf("function %s(fo_obj) {\n", $filter_name); - $js_doc .= sprintf("\tvar oFilter = new XmlJsFilter(fo_obj, \"%s\", \"%s\", %s);\n", $module, $method_name, $callback_func); + $js_doc .= sprintf("\tvar oFilter = new XmlJsFilter(fo_obj, \"%s\", \"%s\", %s);\n", $module, $act, $callback_func); // field, 즉 체크항목의 script 생성 $node_count = count($field_node); diff --git a/modules/install/conf/action.xml b/modules/install/conf/action.xml index 0ad99172a..7a68306d7 100644 --- a/modules/install/conf/action.xml +++ b/modules/install/conf/action.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 28ac58eb4..5f8b77c2c 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -58,7 +58,7 @@ /** * @brief 설치 시도 **/ - function doInstall() { + function procInstall() { // 설치가 되어 있는지에 대한 체크 if(Context::isInstalled()) return new Object(-1, 'msg_already_installed'); diff --git a/modules/install/install.view.php b/modules/install/install.view.php index c4e328072..618b8c4d2 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -27,14 +27,14 @@ /** * @brief license 및 설치 환경에 대한 메세지 보여줌 **/ - function viewIntroduce() { + function dispIntroduce() { $this->setTemplateFile('introduce'); } /** - * @brief DB 정보 입력 화면을 보여줌 + * @brief DB 정보/ 최고 관리자 정보 입력 화면을 보여줌 **/ - function viewDBInfoForm() { + function dispInstallForm() { // db_type이 지정되지 않았다면 다시 초기화면 출력 if(!Context::get('db_type')) return $this->viewIntroduce(); diff --git a/modules/install/tpl/filter/mysql.xml b/modules/install/tpl/filter/mysql.xml index ebbb40743..32e7934da 100644 --- a/modules/install/tpl/filter/mysql.xml +++ b/modules/install/tpl/filter/mysql.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html index f2c5963c3..1d08518a1 100644 --- a/modules/install/tpl/introduce.html +++ b/modules/install/tpl/introduce.html @@ -27,7 +27,7 @@ - +
{$lang->db_type}