From a5528e0099fd41b13c23424cc611cf510ea320ad Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 30 Mar 2007 04:45:50 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@798 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/tpl/addon_info.html | 46 +++---- modules/addon/tpl/addon_list.html | 56 ++++----- .../tpl/filter/toggle_activate_addon.xml | 16 +-- modules/addon/tpl/js/addon.js | 6 +- modules/admin/admin.class.php | 6 - modules/admin/admin.controller.php | 54 +-------- modules/admin/admin.view.php | 61 +--------- modules/admin/conf/info.xml | 13 +- modules/admin/conf/module.xml | 13 +- modules/admin/queries/deleteShortCut.xml | 12 +- modules/admin/queries/insertShortCut.xml | 22 ++-- modules/admin/schemas/admin_shortcut.xml | 12 +- modules/admin/tpl/css/admin.css | 36 +++--- modules/admin/tpl/filter/delete_shortcut.xml | 16 +-- modules/admin/tpl/index.html | 2 +- modules/admin/tpl/js/admin.js | 12 +- modules/admin/tpl/layout.html | 26 ++-- modules/admin/tpl/shortcut_list.html | 46 ++++--- modules/board/board.class.php | 17 +++ modules/board/board.controller.php | 59 +++------ modules/board/board.view.php | 113 +++++------------- modules/board/conf/info.xml | 13 +- modules/board/conf/module.xml | 75 ++++++------ modules/board/queries/getBoardList.xml | 44 +++---- .../{tpl.admin => tpl}/board_config.html | 0 .../{tpl.admin => tpl}/board_delete.html | 0 .../board/{tpl.admin => tpl}/board_info.html | 0 .../{tpl.admin => tpl}/board_insert.html | 0 .../{tpl.admin => tpl}/category_list.html | 0 .../category_update_form.html | 0 .../filter/delete_board.xml | 0 .../filter/insert_board.xml | 0 .../filter/insert_category.xml | 0 .../filter/insert_config.xml | 0 .../filter/insert_grant.xml | 0 .../filter/update_category.xml | 0 .../board/{tpl.admin => tpl}/grant_list.html | 0 modules/board/{tpl.admin => tpl}/header.html | 0 modules/board/{tpl.admin => tpl}/index.html | 0 modules/board/{tpl.admin => tpl}/js/admin.js | 0 .../board/{tpl.admin => tpl}/skin_info.html | 0 41 files changed, 298 insertions(+), 478 deletions(-) rename modules/board/{tpl.admin => tpl}/board_config.html (100%) rename modules/board/{tpl.admin => tpl}/board_delete.html (100%) rename modules/board/{tpl.admin => tpl}/board_info.html (100%) rename modules/board/{tpl.admin => tpl}/board_insert.html (100%) rename modules/board/{tpl.admin => tpl}/category_list.html (100%) rename modules/board/{tpl.admin => tpl}/category_update_form.html (100%) rename modules/board/{tpl.admin => tpl}/filter/delete_board.xml (100%) rename modules/board/{tpl.admin => tpl}/filter/insert_board.xml (100%) rename modules/board/{tpl.admin => tpl}/filter/insert_category.xml (100%) rename modules/board/{tpl.admin => tpl}/filter/insert_config.xml (100%) rename modules/board/{tpl.admin => tpl}/filter/insert_grant.xml (100%) rename modules/board/{tpl.admin => tpl}/filter/update_category.xml (100%) rename modules/board/{tpl.admin => tpl}/grant_list.html (100%) rename modules/board/{tpl.admin => tpl}/header.html (100%) rename modules/board/{tpl.admin => tpl}/index.html (100%) rename modules/board/{tpl.admin => tpl}/js/admin.js (100%) rename modules/board/{tpl.admin => tpl}/skin_info.html (100%) diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index e927f3403..16e953cbc 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -2,57 +2,57 @@ - {$lang->addon_maker} + {$lang->addon_maker} - {$lang->title} - {$addon_info->title} ver. {$addon_info->version} + {$lang->title} + {$addon_info->title} ver. {$addon_info->version} - {$lang->author} - {$addon_info->author->name} + {$lang->author} + {$addon_info->author->name} - {$lang->homepage} - {$addon_info->author->homepage} + {$lang->homepage} + {$addon_info->author->homepage} - {$lang->regdate} - {$addon_info->author->date} + {$lang->regdate} + {$addon_info->author->date} - {$lang->description} - {nl2br($addon_info->author->description)} + {$lang->description} + {nl2br($addon_info->author->description)} - {$lang->addon_history} + {$lang->addon_history} - {$lang->name} - {$history->name} + {$lang->name} + {$history->name} - {$lang->homepage} - {$history->homepage} + {$lang->homepage} + {$history->homepage} - {$lang->regdate} - {$history->date} + {$lang->regdate} + {$history->date} - {$lang->description} - {nl2br($history->description)} + {$lang->description} + {nl2br($history->description)} - - {$lang->cmd_close} - + + {$lang->cmd_close} + diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index d8e949e4d..b1f23712b 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -3,43 +3,45 @@
- +
- - - - - - - + + + + + + + + - - - - - - - + + + + + + + - + +
{$lang->addon_name}{$lang->version}{$lang->author}{$lang->date}{$lang->installed_path}{$lang->addon_info}{$lang->use}{$lang->addon_name}{$lang->version}{$lang->author}{$lang->date}{$lang->installed_path}{$lang->addon_info}{$lang->use}
- {$val->title}
- ({$val->addon}) - 		{$val->version}{$val->author->name}{$val->author->date}{$val->path}{$lang->cmd_view} - - {$lang->notuse} - - {$lang->use} - - + {$val->title}
+ ({$val->addon}) + 		{$val->version}{$val->author->name}{$val->author->date}{$val->path}{$lang->cmd_view} + + {$lang->notuse} + + {$lang->use} + +
- {nl2br($val->author->description)} - + {nl2br($val->author->description)} +
diff --git a/modules/addon/tpl/filter/toggle_activate_addon.xml b/modules/addon/tpl/filter/toggle_activate_addon.xml index e18e2f683..3ed304fa1 100644 --- a/modules/addon/tpl/filter/toggle_activate_addon.xml +++ b/modules/addon/tpl/filter/toggle_activate_addon.xml @@ -1,9 +1,9 @@ - -
- - - - - - + +
+ + + + + +
diff --git a/modules/addon/tpl/js/addon.js b/modules/addon/tpl/js/addon.js index e1cedd536..c65d1ba66 100644 --- a/modules/addon/tpl/js/addon.js +++ b/modules/addon/tpl/js/addon.js @@ -3,7 +3,7 @@ * fo_addon이라는 id를 가지는 form에 인자로 주어진 addon값을 세팅후 실행 **/ function doToggleAddon(addon) { - var fo_obj = xGetElementById('fo_addon'); - fo_obj.addon.value = addon; - procFilter(fo_obj, toggle_activate_addon); + var fo_obj = xGetElementById('fo_addon'); + fo_obj.addon.value = addon; + procFilter(fo_obj, toggle_activate_addon); } diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 4746647a5..78b8166e5 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -7,12 +7,6 @@ class admin extends ModuleObject { - /** - * @brief MVC 에서 공통으로 사용되는 설정등을 모아 놓은것.. - **/ - function init() { - } - /** * @brief 설치시 추가 작업이 필요할시 구현 **/ diff --git a/modules/admin/admin.controller.php b/modules/admin/admin.controller.php index 5b4c0480c..a612b2f15 100644 --- a/modules/admin/admin.controller.php +++ b/modules/admin/admin.controller.php @@ -12,55 +12,12 @@ function init() { } - /** - * @brief admin 모듈내에서 다른 모듈을 실행하는 부분 - **/ - function procOtherModule($module, $act) { - $oModuleHandler = new ModuleHandler($module, $act); - $oModule = &$oModuleHandler->procModule(); - return $oModule; - } - - /** - * @brief 로그인 시킴 - **/ - function procLogin() { - // 아이디, 비밀번호를 받음 - $user_id = Context::get('user_id'); - $password = Context::get('password'); - - // member controller 객체 생성 - $oMemberController = &getController('member'); - return $oMemberController->procLogin($user_id, $password); - } - - /** - * @brief 로그아웃 시킴 - **/ - function procLogout() { - // member controller 객체 생성 - $oMemberController = &getController('member'); - $output = $oMemberController->procLogout(); - if(!$output->toBool()) return $output; - - $this->setRedirectUrl('./?module=admin'); - } - /** * @brief 숏컷 추가 **/ - function procInsertShortCut() { + function procAdminInsertShortCut() { $module = Context::get('selected_module'); - $output = $this->insertShortCut($module); - if(!$output->toBool()) return $output; - $this->setMessage('success_registed'); - } - - /** - * @brief 숏컷을 추가하는 method - **/ - function insertShortCut($module) { // 선택된 모듈의 정보중에서 admin_index act를 구함 $oModuleModel = &getModel('module'); $module_info = $oModuleModel->getModuleInfoXml($module); @@ -72,14 +29,15 @@ $oDB = &DB::getInstance(); $output = $oDB->executeQuery('admin.insertShortCut', $args); - return $output; + if(!$output->toBool()) return $output; + + $this->setMessage('success_registed'); } - /** - * @brief 숏컷의 내용 수정 + * @brief 숏컷의 삭제 **/ - function procDeleteShortCut() { + function procAdminDeleteShortCut() { $oDB = &DB::getInstance(); diff --git a/modules/admin/admin.view.php b/modules/admin/admin.view.php index ee72bf6d7..4b643c72a 100644 --- a/modules/admin/admin.view.php +++ b/modules/admin/admin.view.php @@ -32,75 +32,20 @@ $oAdminModel = &getModel('admin'); $shortcut_list = $oAdminModel->getShortCuts(); Context::set('shortcut_list', $shortcut_list); - } /** * @brief 관리자 메인 페이지 출력 **/ - function dispIndex() { - // mo(module), act 변수값이 넘어오면 해당 모듈을 실행 - $mo = Context::get('mo'); - $act = Context::get('act'); - - if($mo && $mo != 'admin' && $act) { - $oAdminController = &getController('admin'); - $oModule = &$oAdminController->procOtherModule($mo, $act); - } - - // 만약 oModule이 없으면 관리자 초기 페이지 출력 - if(!$oModule || !is_object($oModule)) { - $this->setTemplateFile('index'); - - // oModule이 정상이라면 - } else { - // 모듈의 타이틀 값을 구해옴 - $oModuleModel = &getModel('module'); - $module_info = $oModuleModel->getModuleInfoXml($mo); - Context::set('selected_module_info', $module_info); - - // 해당 모듈의 template path, file을 가로챔 - $this->setTemplatePath($oModule->getTemplatePath()); - $this->setTemplateFile($oModule->getTemplateFile()); - } + function dispAdminIndex() { + $this->setTemplateFile('index'); } /** * @brief 관리자 메뉴 숏컷 출력 **/ - function dispShortCut() { - + function dispAdminShortCut() { $this->setTemplateFile('shortcut_list'); } - - /** - * @brief 관리자 로그인 페이지 출력 - **/ - function dispLogin() { - // 로그인 되어 있으면 메인 페이지 표시 - if(Context::get('is_logged')) return $this->dispIndex(); - - // member모듈의 로그인 act를 이용 - $oMemberView = &getView('member'); - $oMemberView->dispLoginForm(); - - $this->setTemplatePath($oMemberView->getTemplatePath()); - $this->setTemplateFile($oMemberView->getTemplateFile()); - } - - /** - * @brief 관리자 로그아웃 페이지 출력 - **/ - function dispLogout() { - // 로그인 되어 있지 않으면 메인 페이지 표시 - if(!Context::get('is_logged')) return $this->dispIndex(); - - // member모듈의 로그아웃 act를 이용 - $oMemberView = &getView('member'); - $oMemberView->dispLogout(); - - $this->setTemplatePath($oMemberView->getTemplatePath()); - $this->setTemplateFile($oMemberView->getTemplateFile()); - } } ?> diff --git a/modules/admin/conf/info.xml b/modules/admin/conf/info.xml index ea81fb562..2e639acc9 100644 --- a/modules/admin/conf/info.xml +++ b/modules/admin/conf/info.xml @@ -1,11 +1,8 @@ - 관리자 모듈 - admin module - - 제로 - zero - 관리자 모듈 - admin module - + 관리자 모듈 + + 제로 + 각 모듈들의 기능을 나열하고 관리자용 레이아웃을 적용하여 관리 기능을 사용할 수 있도록 하는 모듈입니다. + diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml index 23bdded21..b9afae3b4 100644 --- a/modules/admin/conf/module.xml +++ b/modules/admin/conf/module.xml @@ -1,15 +1,10 @@ - - + + - - - - - - - + + diff --git a/modules/admin/queries/deleteShortCut.xml b/modules/admin/queries/deleteShortCut.xml index 1ce179c72..7640bfb45 100644 --- a/modules/admin/queries/deleteShortCut.xml +++ b/modules/admin/queries/deleteShortCut.xml @@ -1,8 +1,8 @@ - - - - - - + +
+ + + + diff --git a/modules/admin/queries/insertShortCut.xml b/modules/admin/queries/insertShortCut.xml index fdb75938e..29133f77c 100644 --- a/modules/admin/queries/insertShortCut.xml +++ b/modules/admin/queries/insertShortCut.xml @@ -1,13 +1,13 @@ - -
- - - - - - - - - + +
+ + + + + + + + + diff --git a/modules/admin/schemas/admin_shortcut.xml b/modules/admin/schemas/admin_shortcut.xml index 4b2c6a1e1..7494ef01d 100644 --- a/modules/admin/schemas/admin_shortcut.xml +++ b/modules/admin/schemas/admin_shortcut.xml @@ -1,8 +1,8 @@
- - - - - - + + + + + +
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index cdd35c68b..9e8c289d7 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -1,37 +1,39 @@ +@charset "utf-8"; + #admin_title { - font-size:20pt; - font-weight:bold; - float:left; - height:30px; + font-size:20pt; + font-weight:bold; + float:left; + height:30px; } #admin_sub_menu{ - float:right; - height:30px; + float:right; + height:30px; } #admin_main_menu { - clear:both; - text-align:right; - margin-bottom:10px; + clear:both; + text-align:right; + margin-bottom:10px; } #admin_main_menu .selected { - font-weight:bold; + font-weight:bold; } #admin_module_info { - border:1px solid #EEEEEE; - padding:5px; - margin-bottom:20px; + border:1px solid #EEEEEE; + padding:5px; + margin-bottom:20px; } #admin_module_info a { - color:#000000; - font-weight:bold; - text-decoration:none; + color:#000000; + font-weight:bold; + text-decoration:none; } #admin_content { - clear:both; + clear:both; } diff --git a/modules/admin/tpl/filter/delete_shortcut.xml b/modules/admin/tpl/filter/delete_shortcut.xml index 85995b54c..e70f82f9d 100644 --- a/modules/admin/tpl/filter/delete_shortcut.xml +++ b/modules/admin/tpl/filter/delete_shortcut.xml @@ -1,9 +1,9 @@ - -
- - - - - - + +
+ + + + + +
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index 5ad28e227..9c42a70c2 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -1 +1 @@ -haha +관리자 페이지.. diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index e3c2cd695..b01bc664b 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -1,12 +1,12 @@ /** - * @file : modules/admin/js/admin.js - * @author : zero - * @desc : admin 모듈의 javascript + * @file admin.js + * @author zero (zero@nzeo.com) + * @desc admin 모듈의 javascript **/ // 숏컷 삭제 function doDeleteShortCut(selected_module) { - var fo_obj = xGetElementById('fo_shortcut_info'); - fo_obj.selected_module.value = selected_module; - procFilter(fo_obj, delete_shortcut); + var fo_obj = xGetElementById('fo_shortcut_info'); + fo_obj.selected_module.value = selected_module; + procFilter(fo_obj, delete_shortcut); } diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html index 12db95e64..11b3b6c91 100644 --- a/modules/admin/tpl/layout.html +++ b/modules/admin/tpl/layout.html @@ -2,31 +2,31 @@
- -
- - module)-->class="selected"> - {$val->title} - - - [{$lang->cmd_management}] -
+ +
+ + module)-->class="selected"> + {$val->title} + + + [{$lang->cmd_management}] +
- {$selected_module_info->title} (ver {$selected_module_info->version}) + {$selected_module_info->title} (ver {$selected_module_info->version})
- {$content} + {$content}
diff --git a/modules/admin/tpl/shortcut_list.html b/modules/admin/tpl/shortcut_list.html index e60ad4593..36d568166 100644 --- a/modules/admin/tpl/shortcut_list.html +++ b/modules/admin/tpl/shortcut_list.html @@ -5,31 +5,29 @@
- +
- - - - - - - - - - - - - - - - - - - - -
{$lang->title}{$lang->module}{$lang->regdate}{$lang->cmd_delete}
{$lang->msg_shortcut_is_null}
{$shortcut_info->title}{$shortcut_info->module}{zdate($shortcut_info->last_update,"Y-m-d H:i:s")}{$lang->cmd_delete}
+ + + + + + + + + + + + + + + + + + + + +
{$lang->title}{$lang->module}{$lang->regdate}{$lang->cmd_delete}
{$lang->msg_shortcut_is_null}
{$shortcut_info->title}{$shortcut_info->module}{zdate($shortcut_info->last_update,"Y-m-d H:i:s")}{$lang->cmd_delete}
- - diff --git a/modules/board/board.class.php b/modules/board/board.class.php index 79b28eb51..b186b8b77 100644 --- a/modules/board/board.class.php +++ b/modules/board/board.class.php @@ -20,6 +20,23 @@ * @brief 설치시 추가 작업이 필요할시 구현 **/ function moduleInstall() { + // action forward에 등록 (관리자 모드에서 사용하기 위함) + $oModuleController = &getController('module'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminContent'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminModuleConfig'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminBoardInfo'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminInsertBoard'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminDeleteBoard'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminSkinInfo'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminCategoryInfo'); + $oModuleController->insertActionFoward('board', 'view', 'dispBoardAdminGrantInfo'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminInsertGrant'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminUpdateSkinInfo'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminDeleteBoard'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminInsertCategory'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminUpdateCategory'); + $oModuleController->insertActionFoward('board', 'view', 'procBoardAdminInsertConfig'); + return new Object(); } diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 4adc37297..c2b940e71 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -13,33 +13,10 @@ function init() { } - /** - * @brief 로그인 - **/ - function procLogin() { - // 아이디, 비밀번호를 받음 - $user_id = Context::get('user_id'); - $password = Context::get('password'); - - // member모듈 controller 객체 생성 - $oMemberController = &getController('member'); - $output = $oMemberController->procLogin($user_id, $password); - if(!$output->toBool()) return $output; - } - - /** - * @brief 로그아웃 - **/ - function procLogout() { - // member모듈 controller 객체 생성 - $oMemberController = &getController('member'); - return $oMemberController->procLogout(); - } - /** * @brief 문서 입력 **/ - function procInsertDocument() { + function procBoardInsertDocument() { // 글작성시 필요한 변수를 세팅 $obj = Context::getRequestVars(); $obj->module_srl = $this->module_srl; @@ -83,7 +60,7 @@ /** * @brief 문서 삭제 **/ - function procDeleteDocument() { + function procBoardDeleteDocument() { // 문서 번호 확인 $document_srl = Context::get('document_srl'); if(!$document_srl) return $this->doError('msg_invalid_document'); @@ -103,7 +80,7 @@ /** * @brief 추천 **/ - function procVoteDocument() { + function procBoardVoteDocument() { // document module controller 객체 생성 $oDocumentController = &getController('document'); @@ -114,7 +91,7 @@ /** * @brief 코멘트 추가 **/ - function procInsertComment() { + function procBoardInsertComment() { // 댓글 입력에 필요한 데이터 추출 $obj = Context::gets('document_srl','comment_srl','parent_srl','content','password','nick_name','nick_name','member_srl','email_address','homepage'); $obj->module_srl = $this->module_srl; @@ -161,7 +138,7 @@ /** * @brief 코멘트 삭제 **/ - function procDeleteComment() { + function procBoardDeleteComment() { // 댓글 번호 확인 $comment_srl = Context::get('comment_srl'); if(!$comment_srl) return $this->doError('msg_invalid_request'); @@ -182,7 +159,7 @@ /** * @brief 엮인글 추가 **/ - function procReceiveTrackback() { + function procBoardReceiveTrackback() { $obj = Context::gets('document_srl','url','title','excerpt'); // trackback module의 controller 객체 생성 @@ -193,7 +170,7 @@ /** * @brief 엮인글 삭제 **/ - function procDeleteTrackback() { + function procBoardDeleteTrackback() { $trackback_srl = Context::get('trackback_srl'); // trackback module의 controller 객체 생성 @@ -210,7 +187,7 @@ /** * @brief 문서와 댓글의 비밀번호를 확인 **/ - function procVerificationPassword() { + function procBoardVerificationPassword() { // 비밀번호와 문서 번호를 받음 $password = md5(Context::get('password')); $document_srl = Context::get('document_srl'); @@ -248,7 +225,7 @@ * @brief 첨부파일 삭제 * 에디터에서 개별 파일 삭제시 사용 **/ - function procDeleteFile() { + function procBoardDeleteFile() { // 기본적으로 필요한 변수인 upload_target_srl, module_srl을 설정 $upload_target_srl = Context::get('upload_target_srl'); $module_srl = $this->module_srl; @@ -267,7 +244,7 @@ * * editor에서는 upload_target_srl을 넘겨주고 게시판에서는 document_srl을 upload_target_srl로 설정해 놓은 상태이다. **/ - function procUploadFile() { + function procBoardUploadFile() { // 업로드 권한이 없거나 정보가 없을시 종료 if(!Context::isUploaded() || !$this->grant->fileupload) exit(); @@ -289,7 +266,7 @@ * file_srl : 파일의 sequence\n * sid : db에 저장된 비교 값, 틀리면 다운로드 하지 낳음\n **/ - function procDownloadFile() { + function procBoardDownloadFile() { // 다운로드에 필요한 변수 체크 $file_srl = Context::get('file_srl'); $sid = Context::get('sid'); @@ -302,7 +279,7 @@ /** * @brief 권한 추가 **/ - function procInsertGrant() { + function procBoardAdminInsertGrant() { $module_srl = Context::get('module_srl'); // 현 모듈의 권한 목록을 가져옴 @@ -326,7 +303,7 @@ /** * @brief 스킨 정보 업데이트 **/ - function procUpdateSkinInfo() { + function procBoardAdminUpdateSkinInfo() { // module_srl에 해당하는 정보들을 가져오기 $module_srl = Context::get('module_srl'); $oModuleModel = &getModel('module'); @@ -410,7 +387,7 @@ /** * @brief 게시판 추가 **/ - function procInsertBoard() { + function procBoardAdminInsertBoard() { // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 $args = Context::gets('module_srl','layout_srl','module_category_srl','board_name','skin','browser_title','description','is_default','header_text','footer_text','admin_id'); $args->module = 'board'; @@ -463,7 +440,7 @@ /** * @brief 게시판 삭제 **/ - function procDeleteBoard() { + function procBoardAdminDeleteBoard() { $module_srl = Context::get('module_srl'); // 원본을 구해온다 @@ -479,7 +456,7 @@ /** * @brief 카테고리 추가 **/ - function procInsertCategory() { + function procBoardAdminInsertCategory() { // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 $module_srl = Context::get('module_srl'); $category_title = Context::get('category_title'); @@ -497,7 +474,7 @@ /** * @brief 카테고리의 내용 수정 **/ - function procUpdateCategory() { + function procBoardAdminUpdateCategory() { $module_srl = Context::get('module_srl'); $category_srl = Context::get('category_srl'); $mode = Context::get('mode'); @@ -536,7 +513,7 @@ /** * @brief 게시판 기본 정보의 추가 **/ - function procInsertConfig() { + function procBoardAdminInsertConfig() { // 기본 정보를 받음 $args = Context::gets('test'); diff --git a/modules/board/board.view.php b/modules/board/board.view.php index bdb860d8c..9dd135c9b 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -79,12 +79,12 @@ /** * @brief 목록 및 선택된 글 출력 **/ - function dispContent() { + function dispBoardContent() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->list) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->list) return $this->dispBoardMessage('msg_not_permitted'); // 목록 구현에 필요한 변수들을 가져온다 $document_srl = Context::get('document_srl'); @@ -158,12 +158,12 @@ /** * @brief 글 작성 화면 출력 **/ - function dispWrite() { + function dispBoardWrite() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->write_document) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->write_document) return $this->dispBoardMessage('msg_not_permitted'); // GET parameter에서 document_srl을 가져옴 $document_srl = Context::get('document_srl'); @@ -202,12 +202,12 @@ /** * @brief 문서 삭제 화면 출력 **/ - function dispDelete() { + function dispBoardDelete() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->write_document) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->write_document) return $this->dispBoardMessage('msg_not_permitted'); // 삭제할 문서번호를 가져온다 $document_srl = Context::get('document_srl'); @@ -219,7 +219,7 @@ } // 삭제하려는 글이 없으면 에러 - if(!$document) return $this->dispContent(); + if(!$document) return $this->dispBoardContent(); // 권한이 없는 경우 비밀번호 입력화면으로 if($document&&!$document->is_granted) return $this->setTemplateFile('input_password_form'); @@ -232,12 +232,12 @@ /** * @brief 댓글의 답글 화면 출력 **/ - function dispReplyComment() { + function dispBoardReplyComment() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->write_comment) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->write_comment) return $this->dispBoardMessage('msg_not_permitted'); // 목록 구현에 필요한 변수들을 가져온다 $document_srl = Context::get('document_srl'); @@ -251,7 +251,7 @@ $source_comment = $oCommentModel->getComment($parent_srl, $this->grant->manager); // 댓글이 없다면 오류 - if(!$source_comment) return $this->dispMessage('msg_invalid_request'); + if(!$source_comment) return $this->dispBoardMessage('msg_invalid_request'); // 필요한 정보들 세팅 Context::set('document_srl',$document_srl); @@ -268,12 +268,12 @@ /** * @brief 댓글 수정 폼 출력 **/ - function dispModifyComment() { + function dispBoardModifyComment() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->write_comment) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->write_comment) return $this->dispBoardMessage('msg_not_permitted'); // 목록 구현에 필요한 변수들을 가져온다 $document_srl = Context::get('document_srl'); @@ -287,7 +287,7 @@ $comment = $oCommentModel->getComment($comment_srl, $this->grant->manager); // 댓글이 없다면 오류 - if(!$comment) return $this->dispMessage('msg_invalid_request'); + if(!$comment) return $this->dispBoardMessage('msg_invalid_request'); // 글을 수정하려고 할 경우 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); @@ -306,12 +306,12 @@ /** * @brief 댓글 삭제 화면 출력 **/ - function dispDeleteComment() { + function dispBoardDeleteComment() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->write_comment) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->write_comment) return $this->dispBoardMessage('msg_not_permitted'); // 삭제할 댓글번호를 가져온다 $comment_srl = Context::get('comment_srl'); @@ -323,7 +323,7 @@ } // 삭제하려는 글이 없으면 에러 - if(!$comment) return $this->dispContent(); + if(!$comment) return $this->dispBoardContent(); // 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); @@ -336,7 +336,7 @@ /** * @brief 엮인글 삭제 화면 출력 **/ - function dispDeleteTrackback() { + function dispBoardDeleteTrackback() { // 모듈 관련 정보 세팅 $this->initNormal(); @@ -349,70 +349,13 @@ $trackback = $output->data; // 삭제하려는 글이 없으면 에러 - if(!$trackback) return $this->dispContent(); + if(!$trackback) return $this->dispBoardContent(); Context::set('trackback',$trackback); $this->setTemplateFile('delete_trackback_form'); } - /** - * @brief 회원가입폼 - **/ - function dispSignUpForm() { - // 모듈 관련 정보 세팅 - $this->initNormal(); - - // 이미 로그인되어 있으면 로그인 한 회원의 정보를 세팅하여 정보 수정을 시킴 - if(Context::get('is_logged')) { - Context::set('member_info', Context::get('logged_info')); - } - - // member view 객체 생성후 dispSignUpForm method호출후 템플릿 가로챔 - $oMemberView = &getView('member'); - $oMemberView->dispSignUpForm(); - - $this->setTemplatePath($oMemberView->getTemplatePath()); - $this->setTemplateFile($oMemberView->getTemplateFile()); - } - - /** - * @brief 로그인 폼 출력 - **/ - function dispLogin() { - // 모듈 관련 정보 세팅 - $this->initNormal(); - - // 로그인 되어 있으면 무시 - if(Context::get('is_logged')) return $this->dispContent(); - - // member모듈의 로그인 act를 이용 - $oMemberView = &getView('member'); - $oMemberView->dispLoginForm(); - - $this->setTemplatePath($oMemberView->getTemplatePath()); - $this->setTemplateFile($oMemberView->getTemplateFile()); - } - - /** - * @brief 로그아웃 화면 출력 - **/ - function dispLogout() { - // 모듈 관련 정보 세팅 - $this->initNormal(); - - // 로그인 되어 있으면 무시 - if(!Context::get('is_logged')) return $this->dispContent(); - - // member모듈의 로그아웃 act를 이용 - $oMemberView = &getView('member'); - $oMemberView->dispLogout(); - - $this->setTemplatePath($oMemberView->getTemplatePath()); - $this->setTemplateFile($oMemberView->getTemplateFile()); - } - - /** * @brief 메세지 출력 **/ @@ -429,12 +372,12 @@ /** * @brief RSS 출력 **/ - function dispRss() { + function dispBoardRss() { // 모듈 관련 정보 세팅 $this->initNormal(); // 권한 체크 - if(!$this->grant->list) return $this->dispMessage('msg_not_permitted'); + if(!$this->grant->list) return $this->dispBoardMessage('msg_not_permitted'); // 컨텐츠 추출 $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl @@ -490,7 +433,7 @@ /** * @brief 게시판 관리 목록 보여줌 **/ - function dispAdminContent() { + function dispBoardAdminContent() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -517,7 +460,7 @@ /** * @brief 게시판에 필요한 기본 설정들 **/ - function dispAdminModuleConfig() { + function dispBoardAdminModuleConfig() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -534,7 +477,7 @@ /** * @brief 선택된 게시판의 정보 출력 **/ - function dispAdminBoardInfo() { + function dispBoardAdminBoardInfo() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -563,7 +506,7 @@ /** * @brief 게시판 추가 폼 출력 **/ - function dispAdminInsertBoard() { + function dispBoardAdminInsertBoard() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -584,7 +527,7 @@ /** * @brief 게시판 삭제 화면 출력 **/ - function dispAdminDeleteBoard() { + function dispBoardAdminDeleteBoard() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -605,7 +548,7 @@ /** * @brief 스킨 정보 보여줌 **/ - function dispAdminSkinInfo() { + function dispBoardAdminSkinInfo() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -634,7 +577,7 @@ /** * @brief 카테고리의 정보 출력 **/ - function dispAdminCategoryInfo() { + function dispBoardAdminCategoryInfo() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -668,7 +611,7 @@ /** * @brief 권한 목록 출력 **/ - function dispAdminGrantInfo() { + function dispBoardAdminGrantInfo() { // 관리자 관련 정보 세팅 $this->initAdmin(); diff --git a/modules/board/conf/info.xml b/modules/board/conf/info.xml index 1326d60a6..a944c1a86 100644 --- a/modules/board/conf/info.xml +++ b/modules/board/conf/info.xml @@ -1,11 +1,8 @@ - 게시판 - BBS - - 제로 - zero - 게시판 모듈 - board - + 게시판 + + 제로 + 게시판의 기능을 담당하는 모듈. 게시판의 생성/추가 관리등의 관리자 기능도 포함 + diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml index 1046f346e..1fe798690 100644 --- a/modules/board/conf/module.xml +++ b/modules/board/conf/module.xml @@ -27,48 +27,43 @@ - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + diff --git a/modules/board/queries/getBoardList.xml b/modules/board/queries/getBoardList.xml index a66289766..2f1ba2323 100644 --- a/modules/board/queries/getBoardList.xml +++ b/modules/board/queries/getBoardList.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/modules/board/tpl.admin/board_config.html b/modules/board/tpl/board_config.html similarity index 100% rename from modules/board/tpl.admin/board_config.html rename to modules/board/tpl/board_config.html diff --git a/modules/board/tpl.admin/board_delete.html b/modules/board/tpl/board_delete.html similarity index 100% rename from modules/board/tpl.admin/board_delete.html rename to modules/board/tpl/board_delete.html diff --git a/modules/board/tpl.admin/board_info.html b/modules/board/tpl/board_info.html similarity index 100% rename from modules/board/tpl.admin/board_info.html rename to modules/board/tpl/board_info.html diff --git a/modules/board/tpl.admin/board_insert.html b/modules/board/tpl/board_insert.html similarity index 100% rename from modules/board/tpl.admin/board_insert.html rename to modules/board/tpl/board_insert.html diff --git a/modules/board/tpl.admin/category_list.html b/modules/board/tpl/category_list.html similarity index 100% rename from modules/board/tpl.admin/category_list.html rename to modules/board/tpl/category_list.html diff --git a/modules/board/tpl.admin/category_update_form.html b/modules/board/tpl/category_update_form.html similarity index 100% rename from modules/board/tpl.admin/category_update_form.html rename to modules/board/tpl/category_update_form.html diff --git a/modules/board/tpl.admin/filter/delete_board.xml b/modules/board/tpl/filter/delete_board.xml similarity index 100% rename from modules/board/tpl.admin/filter/delete_board.xml rename to modules/board/tpl/filter/delete_board.xml diff --git a/modules/board/tpl.admin/filter/insert_board.xml b/modules/board/tpl/filter/insert_board.xml similarity index 100% rename from modules/board/tpl.admin/filter/insert_board.xml rename to modules/board/tpl/filter/insert_board.xml diff --git a/modules/board/tpl.admin/filter/insert_category.xml b/modules/board/tpl/filter/insert_category.xml similarity index 100% rename from modules/board/tpl.admin/filter/insert_category.xml rename to modules/board/tpl/filter/insert_category.xml diff --git a/modules/board/tpl.admin/filter/insert_config.xml b/modules/board/tpl/filter/insert_config.xml similarity index 100% rename from modules/board/tpl.admin/filter/insert_config.xml rename to modules/board/tpl/filter/insert_config.xml diff --git a/modules/board/tpl.admin/filter/insert_grant.xml b/modules/board/tpl/filter/insert_grant.xml similarity index 100% rename from modules/board/tpl.admin/filter/insert_grant.xml rename to modules/board/tpl/filter/insert_grant.xml diff --git a/modules/board/tpl.admin/filter/update_category.xml b/modules/board/tpl/filter/update_category.xml similarity index 100% rename from modules/board/tpl.admin/filter/update_category.xml rename to modules/board/tpl/filter/update_category.xml diff --git a/modules/board/tpl.admin/grant_list.html b/modules/board/tpl/grant_list.html similarity index 100% rename from modules/board/tpl.admin/grant_list.html rename to modules/board/tpl/grant_list.html diff --git a/modules/board/tpl.admin/header.html b/modules/board/tpl/header.html similarity index 100% rename from modules/board/tpl.admin/header.html rename to modules/board/tpl/header.html diff --git a/modules/board/tpl.admin/index.html b/modules/board/tpl/index.html similarity index 100% rename from modules/board/tpl.admin/index.html rename to modules/board/tpl/index.html diff --git a/modules/board/tpl.admin/js/admin.js b/modules/board/tpl/js/admin.js similarity index 100% rename from modules/board/tpl.admin/js/admin.js rename to modules/board/tpl/js/admin.js diff --git a/modules/board/tpl.admin/skin_info.html b/modules/board/tpl/skin_info.html similarity index 100% rename from modules/board/tpl.admin/skin_info.html rename to modules/board/tpl/skin_info.html