From 13901b88c83ce2adfa2b921644532c33771e1dbf Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 30 Mar 2007 06:48:43 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@811 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.class.php | 37 +- modules/member/member.controller.php | 372 +++++++++--------- modules/member/member.model.php | 108 ++--- modules/member/member.view.php | 26 +- .../member/skins/default/filter/insert.xml | 46 +-- modules/member/skins/default/filter/login.xml | 30 +- .../member/skins/default/filter/logout.xml | 12 +- .../member/skins/default/insert_member.html | 356 ++++++++--------- modules/member/skins/default/js/member.js | 24 +- modules/member/skins/default/login_form.html | 50 +-- modules/member/skins/default/logout.html | 30 +- modules/member/skins/default/member_info.html | 62 +-- modules/member/skins/default/skin.xml | 31 +- .../member/tpl/filter/delete_image_mark.xml | 2 +- .../member/tpl/filter/delete_image_name.xml | 3 +- modules/member/tpl/filter/delete_member.xml | 18 +- modules/member/tpl/filter/insert.xml | 54 +-- modules/member/tpl/filter/insert_config.xml | 12 +- .../member/tpl/filter/insert_denied_id.xml | 18 +- modules/member/tpl/filter/insert_group.xml | 18 +- .../member/tpl/filter/insert_join_form.xml | 22 +- .../member/tpl/filter/update_denied_id.xml | 20 +- modules/member/tpl/filter/update_group.xml | 18 +- .../member/tpl/filter/update_join_form.xml | 18 +- modules/member/tpl/js/admin.js | 334 ++++++++-------- modules/message/conf/info.xml | 13 +- modules/message/conf/module.xml | 4 +- modules/message/message.class.php | 6 + modules/message/message.controller.php | 2 +- modules/message/message.view.php | 4 +- .../message/{tpl.admin => tpl}/config.html | 0 .../filter/insert_config.xml | 0 32 files changed, 888 insertions(+), 862 deletions(-) rename modules/message/{tpl.admin => tpl}/config.html (100%) rename modules/message/{tpl.admin => tpl}/filter/insert_config.xml (100%) diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 506fb33d3..6b6f29577 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -11,9 +11,34 @@ * @brief 설치시 추가 작업이 필요할시 구현 **/ function moduleInstall() { - // member 에서 사용할 cache디렉토리 생성 - FileHandler::makeDir('./files/attach/image_name'); - FileHandler::makeDir('./files/attach/image_mark'); + // action forward에 등록 (관리자 모드에서 사용하기 위함) + $oModuleController = &getController('module'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberInfo'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminList'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminConfig'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminInsert'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminDeleteForm'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminGroupList'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminJoinFormList'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminInfo'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminInsertJoinForm'); + $oModuleController->insertActionFoward('member', 'view', 'dispMemberAdminDeniedIDList'); + $oModuleController->insertActionFoward('member', 'model', 'getmemberMenu'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberLogin'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberLogout'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberInsertImageName'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberInsertImageMark'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberDeleteImageName'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberDeleteImageMark'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminInsert'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminDelete'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminInsertConfig'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminInsertGroup'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminUpdateGroup'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminInsertJoinForm'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminUpdateJoinForm'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminInsertDeniedID'); + $oModuleController->insertActionFoward('member', 'controller', 'procMemberAdminUpdateDeniedID'); // 멤버 컨트롤러 객체 생성 $oMemberController = &getController('member'); @@ -47,9 +72,13 @@ $oMemberController->insertDeniedID('http',''); // 로그인 처리시킴 - $output = $oMemberController->procLogin($admin_info->user_id, $admin_info->password); + $output = $oMemberController->procMemberLogin($admin_info->user_id, $admin_info->password); if(!$output) return $output; + // member 에서 사용할 cache디렉토리 생성 + FileHandler::makeDir('./files/attach/image_name'); + FileHandler::makeDir('./files/attach/image_mark'); + return new Object(); } diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index f8e8a92e9..8d77194cb 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -16,7 +16,7 @@ /** * @brief user_id, password를 체크하여 로그인 시킴 **/ - function procLogin($user_id, $password) { + function procMemberLogin($user_id, $password) { // 변수 정리 if(!$user_id) $user_id = Context::get('user_id'); $user_id = trim($user_id); @@ -63,7 +63,7 @@ /** * @brief 로그아웃 **/ - function procLogout() { + function procMemberLogout() { $_SESSION['is_logged'] = false; $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; $_SESSION['logged_info'] = NULL; @@ -76,7 +76,7 @@ /** * @brief 사용자 추가 (관리자용) **/ - function procInsert() { + function procMemberAdminInsert() { // 필수 정보들을 미리 추출 $args = Context::gets('member_srl','user_id','user_name','nick_name','email_address','password','allow_mailing','denied','is_admin','signature','profile_image','image_nick','image_mark','description','group_srl_list'); @@ -119,7 +119,7 @@ /** * @brief 사용자 삭제 (관리자용) **/ - function procDelete() { + function procMemberAdminDelete() { // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 $member_srl = Context::get('member_srl'); @@ -133,7 +133,7 @@ /** * @brief 회원 관리용 기본 정보의 추가 **/ - function procInsertConfig() { + function procMemberAdminInsertConfig() { // 기본 정보를 받음 $args = Context::gets('enable_join','redirect_url','agreement','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height'); if($args->enable_join!='Y') $args->enable_join = 'N'; @@ -149,7 +149,7 @@ /** * @brief 사용자 그룹 추가 **/ - function procInsertGroup() { + function procMemberAdminInsertGroup() { $args = Context::gets('title','description','is_default'); $output = $this->insertGroup($args); if(!$output->toBool()) return $output; @@ -162,7 +162,7 @@ /** * @brief 사용자 그룹 정보 수정 **/ - function procUpdateGroup() { + function procMemberAdminUpdateGroup() { $group_srl = Context::get('group_srl'); $mode = Context::get('mode'); @@ -188,7 +188,7 @@ /** * @brief 가입 항목 추가 **/ - function procInsertJoinForm() { + function procMemberAdminInsertJoinForm() { $oDB = &DB::getInstance(); $args->member_join_form_srl = Context::get('member_join_form_srl'); @@ -224,7 +224,7 @@ /** * @brief 가입 항목의 상/하 이동 및 내용 수정 **/ - function procUpdateJoinForm() { + function procMemberAdminUpdateJoinForm() { $member_join_form_srl = Context::get('member_join_form_srl'); $mode = Context::get('mode'); @@ -252,7 +252,7 @@ /** * @brief 금지 아이디 추가 **/ - function procInsertDeniedID() { + function procMemberAdminInsertDeniedID() { $user_id = Context::get('user_id'); $description = Context::get('description'); @@ -268,7 +268,7 @@ /** * @brief 금지 아이디 업데이트 **/ - function procUpdateDeniedID() { + function procMemberAdminUpdateDeniedID() { $user_id = Context::get('user_id'); $mode = Context::get('mode'); @@ -286,6 +286,181 @@ $this->setMessage($msg_code); } + /** + * @brief 이미지 이름을 추가 + **/ + function procMemberInsertImageName() { + // 정상적으로 업로드 된 파일인지 검사 + $file = $_FILES['image_name']; + if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name'); + + // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시 + $member_srl = Context::get('member_srl'); + if(!$member_srl) return $this->stop('msg_not_uploaded_image_name'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name'); + + // 회원 모듈 설정에서 이미지 이름 사용 금지를 하였을 경우 관리자가 아니면 return; + $oModuleModel = &getModel('module'); + $config = $oModuleModel->getModuleConfig('member'); + if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name'); + + // 정해진 사이즈를 구함 + $max_width = $config->image_name_max_width; + if(!$max_width) $max_width = "80"; + $max_height = $config->image_name_max_height; + if(!$max_height) $max_height = "20"; + + // 이미지 정보를 구함 + list($width, $height, $type, $attrs) = getimagesize($file['tmp_name']); + + // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 + if($width>$max_width) $new_width = $max_width; + else $new_width = $width; + if($height>$max_height) $new_height = $max_height; + else $new_height = $height; + + // 업로드한 파일을 옮기지 않고 gd를 이용해서 gif 이미지를 만듬 (gif, jpg, png, bmp가 아니면 역시 무시) + $thumb = imagecreatetruecolor($new_width, $new_height); + switch($type) { + // gif + case 1 : + $source = imagecreatefromgif($file['tmp_name']); + break; + // jpg + case 2 : + $source = imagecreatefromjpeg($file['tmp_name']); + break; + // png + case 3 : + $source = imagecreatefrompng($file['tmp_name']); + break; + // bmp + case 6 : + $source = imagecreatefromwbmp($file['tmp_name']); + break; + } + + if(!$source) return $this->stop('msg_not_uploaded_image_name'); + + if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); + else imagecopyresized($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); + + // 파일을 쓰고 끝냄 + $target_filename = sprintf('files/attach/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl); + imagegif($thumb, $target_filename, 100); + @unlink($file['tmp_name']); + + // 페이지 리프레쉬 + $this->setRefreshPage(); + } + + /** + * @brief 이미지 이름을 삭제 + **/ + function procMemberDeleteImageName() { + $member_srl = Context::get('member_srl'); + if(!$member_srl) return new Object(0,'success'); + + $oModuleModel = &getModel('module'); + $config = $oModuleModel->getModuleConfig('member'); + if($config->image_mark == 'N') return new Object(0,'success'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { + $oMemberModel = &getModel('member'); + $image_name = $oMemberModel->getImageName($member_srl); + @unlink($image_name->file); + } + return new Object(0,'success'); + } + + /** + * @brief 이미지 마크를 추가 + **/ + function procMemberInsertImageMark() { + // 정상적으로 업로드 된 파일인지 검사 + $file = $_FILES['image_mark']; + if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark'); + + // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시 + $member_srl = Context::get('member_srl'); + if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark'); + + // 회원 모듈 설정에서 이미지 마크 사용 금지를 하였을 경우 관리자가 아니면 return; + $oModuleModel = &getModel('module'); + $config = $oModuleModel->getModuleConfig('member'); + if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark'); + + // 정해진 사이즈를 구함 + $max_width = $config->image_mark_max_width; + if(!$max_width) $max_width = "80"; + $max_height = $config->image_mark_max_height; + if(!$max_height) $max_height = "20"; + + // 이미지 정보를 구함 + list($width, $height, $type, $attrs) = getimagesize($file['tmp_name']); + + // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 + if($width>$max_width) $new_width = $max_width; + else $new_width = $width; + if($height>$max_height) $new_height = $max_height; + else $new_height = $height; + + // 업로드한 파일을 옮기지 않고 gd를 이용해서 gif 이미지를 만듬 (gif, jpg, png, bmp가 아니면 역시 무시) + $thumb = imagecreatetruecolor($new_width, $new_height); + switch($type) { + // gif + case 1 : + $source = imagecreatefromgif($file['tmp_name']); + break; + // jpg + case 2 : + $source = imagecreatefromjpeg($file['tmp_name']); + break; + // png + case 3 : + $source = imagecreatefrompng($file['tmp_name']); + break; + // bmp + case 6 : + $source = imagecreatefromwbmp($file['tmp_name']); + break; + } + + if(!$source) return $this->stop('msg_not_uploaded_image_mark'); + + if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); + else imagecopyresized($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); + + // 파일을 쓰고 끝냄 + $target_filename = sprintf('files/attach/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl); + imagegif($thumb, $target_filename, 100); + + // 페이지 리프레쉬 + $this->setRefreshPage(); + } + + /** + * @brief 이미지 마크를 삭제 + **/ + function procMemberDeleteImageMark() { + $member_srl = Context::get('member_srl'); + if(!$member_srl) return new Object(0,'success'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { + $oMemberModel = &getModel('member'); + $image_mark = $oMemberModel->getImageMark($member_srl); + @unlink($image_mark->file); + } + return new Object(0,'success'); + } + /** * @brief 관리자를 추가한다 **/ @@ -657,181 +832,6 @@ return new Object(); } - /** - * @brief 이미지 이름을 추가 - **/ - function procInsertImageName() { - // 정상적으로 업로드 된 파일인지 검사 - $file = $_FILES['image_name']; - if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name'); - - // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시 - $member_srl = Context::get('member_srl'); - if(!$member_srl) return $this->stop('msg_not_uploaded_image_name'); - - $logged_info = Context::get('logged_info'); - if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name'); - - // 회원 모듈 설정에서 이미지 이름 사용 금지를 하였을 경우 관리자가 아니면 return; - $oModuleModel = &getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); - if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name'); - - // 정해진 사이즈를 구함 - $max_width = $config->image_name_max_width; - if(!$max_width) $max_width = "80"; - $max_height = $config->image_name_max_height; - if(!$max_height) $max_height = "20"; - - // 이미지 정보를 구함 - list($width, $height, $type, $attrs) = getimagesize($file['tmp_name']); - - // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 - if($width>$max_width) $new_width = $max_width; - else $new_width = $width; - if($height>$max_height) $new_height = $max_height; - else $new_height = $height; - - // 업로드한 파일을 옮기지 않고 gd를 이용해서 gif 이미지를 만듬 (gif, jpg, png, bmp가 아니면 역시 무시) - $thumb = imagecreatetruecolor($new_width, $new_height); - switch($type) { - // gif - case 1 : - $source = imagecreatefromgif($file['tmp_name']); - break; - // jpg - case 2 : - $source = imagecreatefromjpeg($file['tmp_name']); - break; - // png - case 3 : - $source = imagecreatefrompng($file['tmp_name']); - break; - // bmp - case 6 : - $source = imagecreatefromwbmp($file['tmp_name']); - break; - } - - if(!$source) return $this->stop('msg_not_uploaded_image_name'); - - if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - else imagecopyresized($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - - // 파일을 쓰고 끝냄 - $target_filename = sprintf('files/attach/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl); - imagegif($thumb, $target_filename, 100); - @unlink($file['tmp_name']); - - // 페이지 리프레쉬 - $this->setRefreshPage(); - } - - /** - * @brief 이미지 이름을 삭제 - **/ - function procDeleteImageName() { - $member_srl = Context::get('member_srl'); - if(!$member_srl) return new Object(0,'success'); - - $oModuleModel = &getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); - if($config->image_mark == 'N') return new Object(0,'success'); - - $logged_info = Context::get('logged_info'); - if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { - $oMemberModel = &getModel('member'); - $image_name = $oMemberModel->getImageName($member_srl); - @unlink($image_name->file); - } - return new Object(0,'success'); - } - - /** - * @brief 이미지 마크를 추가 - **/ - function procInsertImageMark() { - // 정상적으로 업로드 된 파일인지 검사 - $file = $_FILES['image_mark']; - if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark'); - - // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시 - $member_srl = Context::get('member_srl'); - if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark'); - - $logged_info = Context::get('logged_info'); - if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark'); - - // 회원 모듈 설정에서 이미지 마크 사용 금지를 하였을 경우 관리자가 아니면 return; - $oModuleModel = &getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); - if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark'); - - // 정해진 사이즈를 구함 - $max_width = $config->image_mark_max_width; - if(!$max_width) $max_width = "80"; - $max_height = $config->image_mark_max_height; - if(!$max_height) $max_height = "20"; - - // 이미지 정보를 구함 - list($width, $height, $type, $attrs) = getimagesize($file['tmp_name']); - - // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 - if($width>$max_width) $new_width = $max_width; - else $new_width = $width; - if($height>$max_height) $new_height = $max_height; - else $new_height = $height; - - // 업로드한 파일을 옮기지 않고 gd를 이용해서 gif 이미지를 만듬 (gif, jpg, png, bmp가 아니면 역시 무시) - $thumb = imagecreatetruecolor($new_width, $new_height); - switch($type) { - // gif - case 1 : - $source = imagecreatefromgif($file['tmp_name']); - break; - // jpg - case 2 : - $source = imagecreatefromjpeg($file['tmp_name']); - break; - // png - case 3 : - $source = imagecreatefrompng($file['tmp_name']); - break; - // bmp - case 6 : - $source = imagecreatefromwbmp($file['tmp_name']); - break; - } - - if(!$source) return $this->stop('msg_not_uploaded_image_mark'); - - if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - else imagecopyresized($thumb, $source, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - - // 파일을 쓰고 끝냄 - $target_filename = sprintf('files/attach/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl); - imagegif($thumb, $target_filename, 100); - - // 페이지 리프레쉬 - $this->setRefreshPage(); - } - - /** - * @brief 이미지 마크를 삭제 - **/ - function procDeleteImageMark() { - $member_srl = Context::get('member_srl'); - if(!$member_srl) return new Object(0,'success'); - - $logged_info = Context::get('logged_info'); - if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { - $oMemberModel = &getModel('member'); - $image_mark = $oMemberModel->getImageMark($member_srl); - @unlink($image_mark->file); - } - return new Object(0,'success'); - } - /** * @brief 최종 출력물에서 이미지 이름을 변경 * imgae_name 애드온에서 요청이 됨 diff --git a/modules/member/member.model.php b/modules/member/member.model.php index eead4eeb6..bc5ecabb7 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -20,6 +20,60 @@ function init() { } + /** + * @brief 선택된 회원의 간단한 메뉴를 표시 + **/ + function getMemberMenu() { + // 요청된 회원 번호와 현재 사용자의 로그인 정보 구함 + $member_srl = Context::get('member_srl'); + $mid = Context::get('cur_mid'); + $module = Context::get('cur_module'); + $logged_info = Context::get('logged_info'); + + // 자신의 아이디를 클릭한 경우 + if($member_srl == $logged_info->member_srl) { + $member_info = $logged_info; + + // 다른 사람의 아이디를 클릭한 경우 + } else { + // 회원의 정보를 구함 + $member_info = $this->getMemberInfoByMemberSrl($member_srl); + } + + // 변수 정리 + $user_id = $member_info->user_id; + $user_name = $member_info->user_name; + $email_address = $member_info->email_address; + + // menu_list 에 "표시할글,target,url" 을 배열로 넣는다 + $menu_list = array(); + + // 게시판이나 블로그등일 경우는 특별 옵션 지정 + if($mid) { + // 회원 정보 보기 + $menu_str = Context::getLang('cmd_view_member_info'); + $menu_url = sprintf('./?mid=%s&act=dispSignUpForm&member_srl=%s', $mid, $member_srl); + $menu_list[] = sprintf('%s,move_url(\'%s\')', $menu_str, $menu_url); + + // 아이디로 검색 + $menu_str = Context::getLang('cmd_view_own_document'); + $menu_url = sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $user_id); + $menu_list[] = sprintf('%s,move_url(\'%s\')', $menu_str, $menu_url); + } + + // 다른 사람의 아이디를 클릭한 경우 (메일, 쪽지 보내기등은 다른 사람에게만 보내는거로 설정) + if($member_srl != $logged_info->member_srl) { + + // 메일 보내기 + $menu_str = Context::getLang('cmd_send_email'); + $menu_url = sprintf('%s <%s>', $user_name, $email_address); + $menu_list[] = sprintf('%s,sendMailTo(\'%s\')', $menu_str, $menu_url); + } + + // 정보를 저장 + $this->add("menu_list", implode("\n",$menu_list)); + } + /** * @brief 로그인 되어 있는지에 대한 체크 **/ @@ -454,59 +508,5 @@ $info->file = './'.$image_mark_file; return $info; } - - /** - * @brief 선택된 회원의 간단한 메뉴를 표시 - **/ - function getMemberMenu() { - // 요청된 회원 번호와 현재 사용자의 로그인 정보 구함 - $member_srl = Context::get('member_srl'); - $mid = Context::get('cur_mid'); - $module = Context::get('cur_module'); - $logged_info = Context::get('logged_info'); - - // 자신의 아이디를 클릭한 경우 - if($member_srl == $logged_info->member_srl) { - $member_info = $logged_info; - - // 다른 사람의 아이디를 클릭한 경우 - } else { - // 회원의 정보를 구함 - $member_info = $this->getMemberInfoByMemberSrl($member_srl); - } - - // 변수 정리 - $user_id = $member_info->user_id; - $user_name = $member_info->user_name; - $email_address = $member_info->email_address; - - // menu_list 에 "표시할글,target,url" 을 배열로 넣는다 - $menu_list = array(); - - // 게시판이나 블로그등일 경우는 특별 옵션 지정 - if($mid) { - // 회원 정보 보기 - $menu_str = Context::getLang('cmd_view_member_info'); - $menu_url = sprintf('./?mid=%s&act=dispSignUpForm&member_srl=%s', $mid, $member_srl); - $menu_list[] = sprintf('%s,move_url(\'%s\')', $menu_str, $menu_url); - - // 아이디로 검색 - $menu_str = Context::getLang('cmd_view_own_document'); - $menu_url = sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $user_id); - $menu_list[] = sprintf('%s,move_url(\'%s\')', $menu_str, $menu_url); - } - - // 다른 사람의 아이디를 클릭한 경우 (메일, 쪽지 보내기등은 다른 사람에게만 보내는거로 설정) - if($member_srl != $logged_info->member_srl) { - - // 메일 보내기 - $menu_str = Context::getLang('cmd_send_email'); - $menu_url = sprintf('%s <%s>', $user_name, $email_address); - $menu_list[] = sprintf('%s,sendMailTo(\'%s\')', $menu_str, $menu_url); - } - - // 정보를 저장 - $this->add("menu_list", implode("\n",$menu_list)); - } } ?> diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 6190f15ab..3d8d089d2 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -61,7 +61,7 @@ /** * @brief 회원 정보 출력 **/ - function dispMember() { + function dispMemberInfo() { $this->initNormal(); $oMemberModel = &getModel('member'); @@ -74,7 +74,7 @@ /** * @brief 회원 가입 폼 출력 **/ - function dispSignUpForm() { + function dispMemberSignUpForm() { $this->initNormal(); $oMemberModel = &getModel('member'); @@ -101,7 +101,7 @@ /** * @brief 로그인 폼 출력 **/ - function dispLoginForm() { + function dispMemberLoginForm() { $this->initNormal(); // 템플릿 파일 지정 @@ -111,7 +111,7 @@ /** * @brief 로그아웃 출력 **/ - function dispLogout() { + function dispMemberLogout() { $this->initNormal(); // 템플릿 파일 지정 @@ -121,7 +121,7 @@ /** * @brief 회원 목록 출력 **/ - function dispMemberList() { + function dispMemberAdminList() { // member model 객체 생성후 목록을 구해옴 $oMemberModel = &getModel('member'); @@ -141,7 +141,7 @@ /** * @brief 회원 관리에 필요한 기본 설정들 **/ - function dispModuleConfig() { + function dispMemberAdminConfig() { // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); @@ -162,7 +162,7 @@ /** * @brief 회원 정보 출력 **/ - function dispMemberInfo() { + function dispMemberAdminInfo() { // 추가 가입폼 목록을 받음 $oMemberModel = &getModel('member'); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info)); @@ -173,7 +173,7 @@ /** * @brief 회원 정보 입력 화면 출력 **/ - function dispMemberInsert() { + function dispMemberAdminInsert() { // 추가 가입폼 목록을 받음 $oMemberModel = &getModel('member'); Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info)); @@ -185,7 +185,7 @@ /** * @brief 회원 삭제 화면 출력 **/ - function dispDeleteForm() { + function dispMemberAdminDeleteForm() { if(!Context::get('member_srl')) return $this->dispContent(); $this->setTemplateFile('delete_form'); } @@ -193,7 +193,7 @@ /** * @brief 그룹 목록 출력 **/ - function dispGroupList() { + function dispMemberAdminGroupList() { $group_srl = Context::get('group_srl'); if($group_srl && $this->group_list[$group_srl]) { @@ -207,7 +207,7 @@ /** * @brief 회원 가입 폼 목록 출력 **/ - function dispJoinFormList() { + function dispMemberAdminJoinFormList() { // 멤버모델 객체 생성 $oMemberModel = &getModel('member'); @@ -221,7 +221,7 @@ /** * @brief 회원 가입 폼 관리 화면 출력 **/ - function dispInsertJoinForm() { + function dispMemberAdminInsertJoinForm() { // 수정일 경우 대상 join_form의 값을 구함 $member_join_form_srl = Context::get('member_join_form_srl'); if($member_join_form_srl) { @@ -236,7 +236,7 @@ /** * @brief 금지 목록 아이디 출력 **/ - function dispDeniedIDList() { + function dispMemberAdminDeniedIDList() { // 멤버모델 객체 생성 $oMemberModel = &getModel('member'); diff --git a/modules/member/skins/default/filter/insert.xml b/modules/member/skins/default/filter/insert.xml index 96e434c56..0804d9fe4 100644 --- a/modules/member/skins/default/filter/insert.xml +++ b/modules/member/skins/default/filter/insert.xml @@ -1,24 +1,24 @@ - -
- - - - - - - - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + +
diff --git a/modules/member/skins/default/filter/login.xml b/modules/member/skins/default/filter/login.xml index 5ec18a97a..d72dcc608 100644 --- a/modules/member/skins/default/filter/login.xml +++ b/modules/member/skins/default/filter/login.xml @@ -1,16 +1,16 @@ - -
- - - - - - - - - - - - - + +
+ + + + + + + + + + + + +
diff --git a/modules/member/skins/default/filter/logout.xml b/modules/member/skins/default/filter/logout.xml index 444c50ad8..dea1c9cb4 100644 --- a/modules/member/skins/default/filter/logout.xml +++ b/modules/member/skins/default/filter/logout.xml @@ -1,7 +1,7 @@ - -
- - - - + + + + + + diff --git a/modules/member/skins/default/insert_member.html b/modules/member/skins/default/insert_member.html index 003956c2f..478f9d11d 100644 --- a/modules/member/skins/default/insert_member.html +++ b/modules/member/skins/default/insert_member.html @@ -3,11 +3,11 @@
- - {$lang->msg_new_member} - - {$lang->msg_update_member} - + + {$lang->msg_new_member} + + {$lang->msg_update_member} +
@@ -19,184 +19,184 @@ - -
- - - - - - - -
{nl2br($member_config->agreement)}
- - -
-
- - -
- {$lang->member_default_info} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->user_id} - - {$member_info->user_id} - - - -
{$lang->about_user_id}
{$lang->password1} - -
- {$lang->password2} -
{$lang->about_password}
{$lang->user_name} - -
{$lang->about_user_name}
{$lang->nick_name} - -
{$lang->about_nick_name}
{$lang->email_address} - -
{$lang->allow_mailing}allow_mailing!='N')-->checked="true"/>
{$lang->about_allow_mailing}
- - -
- {$lang->member_extend_info} -
- - - - - - - - - - - +
- - * - - {$val->column_title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - value)&&in_array($v, $val->value))-->checked="true"/> {$v} - - - - - - - - - -
- - -
- -
- - -
- +
- + + + + + + + +
{nl2br($member_config->agreement)}
+ + +
+ - - - +
+ {$lang->member_default_info} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->user_id} + + {$member_info->user_id} + + + +
{$lang->about_user_id}
{$lang->password1} + +
+ {$lang->password2} +
{$lang->about_password}
{$lang->user_name} + +
{$lang->about_user_name}
{$lang->nick_name} + +
{$lang->about_nick_name}
{$lang->email_address} + +
{$lang->allow_mailing}allow_mailing!='N')-->checked="true"/>
{$lang->about_allow_mailing}
- + +
+ {$lang->member_extend_info} +
-
{$val->description}
+ + + + + + + + + + + +
+ + * + + {$val->column_title} + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + value)&&in_array($v, $val->value))-->checked="true"/>{$v} + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ +
+ + + + + + + +
{$val->description}
- - - - - - - -
- - -
+ + + + +
+ + +
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js index 660a8a795..c8669721e 100644 --- a/modules/member/skins/default/js/member.js +++ b/modules/member/skins/default/js/member.js @@ -1,19 +1,19 @@ /* 사용자 추가 */ function completeInsert(ret_obj, response_tags, args, fo_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; + var error = ret_obj['error']; + var message = ret_obj['message']; - alert(message); + alert(message); - var url = new Array(); - var mid = fo_obj.mid.value; - var document_srl = fo_obj.document_srl.value; - var page = fo_obj.page.value; + var url = new Array(); + var mid = fo_obj.mid.value; + var document_srl = fo_obj.document_srl.value; + var page = fo_obj.page.value; - if(mid) url[url.length] = "mid="+mid; - if(document_srl) url[url.length] = "document_srl="+document_srl; - if(page) url[url.length] = "page="+page; + if(mid) url[url.length] = "mid="+mid; + if(document_srl) url[url.length] = "document_srl="+document_srl; + if(page) url[url.length] = "page="+page; - if(url.length>0) location.href="./?"+url.join("&"); - else location.href="./"; + if(url.length>0) location.href="./?"+url.join("&"); + else location.href="./"; } diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index 0c1a9d11d..1c43b2e04 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -1,33 +1,33 @@
- - - - - - - - - - - - - - - - - - -
{$lang->user_id}
{$lang->password}
- - -
- {$lang->cmd_signup} -
+ + + + + + + + + + + + + + + + + + +
{$lang->user_id}
{$lang->password}
+ + +
+ {$lang->cmd_signup} +
diff --git a/modules/member/skins/default/logout.html b/modules/member/skins/default/logout.html index f17ce1c3d..565f24f0d 100644 --- a/modules/member/skins/default/logout.html +++ b/modules/member/skins/default/logout.html @@ -1,21 +1,21 @@
- - - - - - - - - - - -
{$lang->cmd_logout}
{$lang->confirm_logout}
- - -
+ + + + + + + + + + + +
{$lang->cmd_logout}
{$lang->confirm_logout}
+ + +
diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html index 16ddf630f..ef183a6ab 100644 --- a/modules/member/skins/default/member_info.html +++ b/modules/member/skins/default/member_info.html @@ -1,58 +1,58 @@ - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + +
{$lang->user_id}{$member_info->user_id}{$lang->user_id}{$member_info->user_id}
{$lang->user_name}{$member_info->user_name}{$lang->user_name}{$member_info->user_name}
{$lang->nick_name}{$member_info->nick_name}{$lang->nick_name}{$member_info->nick_name}
{$lang->image_name}image_name{$lang->image_name}image_name
{$lang->image_mark}image_mark{$lang->image_mark}image_mark
{$lang->group} - - {$val} - - {$lang->group} + + {$val} + +
{$val->column_title} - - {$val->value[0]} - {$val->value[1]} - {$val->value[2]} - - {$val->value[0]} {$val->value[1]} - - {implode(",",$val->value)} - - {$val->value} - - {$val->column_title} + + {$val->value[0]} - {$val->value[1]} - {$val->value[2]} + + {$val->value[0]} {$val->value[1]} + + {implode(",",$val->value)} + + {$val->value} + +
{$lang->description}{$member_info->description}{$lang->description}{$member_info->description}
diff --git a/modules/member/skins/default/skin.xml b/modules/member/skins/default/skin.xml index f4550710e..e8e4d2059 100644 --- a/modules/member/skins/default/skin.xml +++ b/modules/member/skins/default/skin.xml @@ -1,21 +1,16 @@ - 회원 기본 스킨 - Member default skin - - 제로 - zero - 회원모듈의 default스킨 - default skin of the member module - - - - 기본 - normal - - - 이상한거 - deep - - + 회원 기본 스킨 + + 제로 + 회원모듈의 default스킨 + + + + 기본 + + + 이상한거 + + diff --git a/modules/member/tpl/filter/delete_image_mark.xml b/modules/member/tpl/filter/delete_image_mark.xml index 93bd1cd6f..95ae69d58 100644 --- a/modules/member/tpl/filter/delete_image_mark.xml +++ b/modules/member/tpl/filter/delete_image_mark.xml @@ -1,2 +1,2 @@ - + diff --git a/modules/member/tpl/filter/delete_image_name.xml b/modules/member/tpl/filter/delete_image_name.xml index 12aa37712..70efc0365 100644 --- a/modules/member/tpl/filter/delete_image_name.xml +++ b/modules/member/tpl/filter/delete_image_name.xml @@ -1,2 +1 @@ - - + diff --git a/modules/member/tpl/filter/delete_member.xml b/modules/member/tpl/filter/delete_member.xml index 72350ffc1..ca3a6bcf5 100644 --- a/modules/member/tpl/filter/delete_member.xml +++ b/modules/member/tpl/filter/delete_member.xml @@ -1,11 +1,11 @@ - -
- - - - - - - + +
+ + + + + + +
diff --git a/modules/member/tpl/filter/insert.xml b/modules/member/tpl/filter/insert.xml index 30c55050a..7075afa21 100644 --- a/modules/member/tpl/filter/insert.xml +++ b/modules/member/tpl/filter/insert.xml @@ -1,28 +1,28 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/modules/member/tpl/filter/insert_config.xml b/modules/member/tpl/filter/insert_config.xml index 26b68a791..33ba120c7 100644 --- a/modules/member/tpl/filter/insert_config.xml +++ b/modules/member/tpl/filter/insert_config.xml @@ -1,7 +1,7 @@ - -
- - - - + + + + + + diff --git a/modules/member/tpl/filter/insert_denied_id.xml b/modules/member/tpl/filter/insert_denied_id.xml index 62d462f0c..3af715be5 100644 --- a/modules/member/tpl/filter/insert_denied_id.xml +++ b/modules/member/tpl/filter/insert_denied_id.xml @@ -1,10 +1,10 @@ - - - - - - - - - + +
+ + + + + + +
diff --git a/modules/member/tpl/filter/insert_group.xml b/modules/member/tpl/filter/insert_group.xml index 556e02aff..52f35ac36 100644 --- a/modules/member/tpl/filter/insert_group.xml +++ b/modules/member/tpl/filter/insert_group.xml @@ -1,10 +1,10 @@ - -
- - - - - - - + +
+ + + + + + +
diff --git a/modules/member/tpl/filter/insert_join_form.xml b/modules/member/tpl/filter/insert_join_form.xml index 644bc3431..5d3cd97ee 100644 --- a/modules/member/tpl/filter/insert_join_form.xml +++ b/modules/member/tpl/filter/insert_join_form.xml @@ -1,12 +1,12 @@ - -
- - - - - - - - - + +
+ + + + + + + + +
diff --git a/modules/member/tpl/filter/update_denied_id.xml b/modules/member/tpl/filter/update_denied_id.xml index 90865990b..1620e11be 100644 --- a/modules/member/tpl/filter/update_denied_id.xml +++ b/modules/member/tpl/filter/update_denied_id.xml @@ -1,11 +1,11 @@ - -
- - - - - - - - + +
+ + + + + + + +
diff --git a/modules/member/tpl/filter/update_group.xml b/modules/member/tpl/filter/update_group.xml index 4678f7f57..b15ad6a10 100644 --- a/modules/member/tpl/filter/update_group.xml +++ b/modules/member/tpl/filter/update_group.xml @@ -1,10 +1,10 @@ - -
- - - - - - - + +
+ + + + + + +
diff --git a/modules/member/tpl/filter/update_join_form.xml b/modules/member/tpl/filter/update_join_form.xml index aeed725ca..dd0d331fb 100644 --- a/modules/member/tpl/filter/update_join_form.xml +++ b/modules/member/tpl/filter/update_join_form.xml @@ -1,10 +1,10 @@ - -
- - - - - - - + +
+ + + + + + +
diff --git a/modules/member/tpl/js/admin.js b/modules/member/tpl/js/admin.js index f072d2164..8c1cc1a73 100644 --- a/modules/member/tpl/js/admin.js +++ b/modules/member/tpl/js/admin.js @@ -1,269 +1,269 @@ /* 사용자 추가 */ function completeInsert(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var member_srl = ret_obj['member_srl']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var member_srl = ret_obj['member_srl']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispMemberInfo&member_srl="+member_srl; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispMemberInfo&member_srl="+member_srl; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 사용자 삭제 */ function completeDelete(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispMemberList"; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispMemberList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 그룹 추가 */ function completeInsertGroup(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispGroupList"; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispGroupList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 그룹 관련 작업들 */ function doUpdateGroup(group_srl, mode, message) { - if(typeof(message)!='undefined'&&!confirm(message)) return; + if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_group_info'); - fo_obj.group_srl.value = group_srl; - fo_obj.mode.value = mode; - procFilter(fo_obj, update_group); + var fo_obj = xGetElementById('fo_group_info'); + fo_obj.group_srl.value = group_srl; + fo_obj.mode.value = mode; + procFilter(fo_obj, update_group); } function completeUpdateGroup(ret_obj) { - var page = ret_obj['page']; - var url = "./?module=admin&mo=member&act=dispGroupList"; - if(page) url += "&page="+page; + var page = ret_obj['page']; + var url = "./?module=admin&mo=member&act=dispGroupList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 금지아이디 추가 */ function completeInsertDeniedID(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispDeniedIDList"; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispDeniedIDList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 금지아이디 관련 작업들 */ function doUpdateDeniedID(user_id, mode, message) { - if(typeof(message)!='undefined'&&!confirm(message)) return; + if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_denied_id_info'); - fo_obj.user_id.value = user_id; - fo_obj.mode.value = mode; - procFilter(fo_obj, update_denied_id); + var fo_obj = xGetElementById('fo_denied_id_info'); + fo_obj.user_id.value = user_id; + fo_obj.mode.value = mode; + procFilter(fo_obj, update_denied_id); } /* 가입폼 관련 작업들 */ function doUpdateJoinForm(member_join_form_srl, mode, message) { - if(typeof(message)!='undefined'&&!confirm(message)) return; + if(typeof(message)!='undefined'&&!confirm(message)) return; - var fo_obj = xGetElementById('fo_join_form_info'); - fo_obj.member_join_form_srl.value = member_join_form_srl; - fo_obj.mode.value = mode; + var fo_obj = xGetElementById('fo_join_form_info'); + fo_obj.member_join_form_srl.value = member_join_form_srl; + fo_obj.mode.value = mode; - procFilter(fo_obj, update_member_join_form); + procFilter(fo_obj, update_member_join_form); } function completeUpdateJoinForm(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispJoinFormList"; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispJoinFormList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 가입폼 추가 */ function completeInsertJoinForm(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - var page = ret_obj['page']; + var error = ret_obj['error']; + var message = ret_obj['message']; + var page = ret_obj['page']; - alert(message); + alert(message); - var url = "./?module=admin&mo=member&act=dispJoinFormList"; - if(page) url += "&page="+page; + var url = "./?module=admin&mo=member&act=dispJoinFormList"; + if(page) url += "&page="+page; - location.href = url; + location.href = url; } /* 가입폼의 기본 값 관리 */ function doShowJoinFormValue(sel_obj) { - var val = sel_obj.options[sel_obj.selectedIndex].value; - switch(val) { - case 'checkbox' : - case 'select' : - xGetElementById('zone_default_value').style.display = 'block'; - break; - default : - xGetElementById('zone_default_value').style.display = 'none'; - break; - } + var val = sel_obj.options[sel_obj.selectedIndex].value; + switch(val) { + case 'checkbox' : + case 'select' : + xGetElementById('zone_default_value').style.display = 'block'; + break; + default : + xGetElementById('zone_default_value').style.display = 'none'; + break; + } } function doEditDefaultValue(obj, cmd) { - var listup_obj = xGetElementById('default_value_listup'); - var item_obj = xGetElementById('default_value_item'); - var idx = listup_obj.selectedIndex; - var lng = listup_obj.options.length; - var val = item_obj.value; - switch(cmd) { - case 'insert' : - if(!val) return; - var opt = new Option(val, val, false, true); - listup_obj.options[listup_obj.length] = opt; - item_obj.value = ''; - item_obj.focus(); - break; - case 'up' : - if(lng < 2 || idx<1) return; + var listup_obj = xGetElementById('default_value_listup'); + var item_obj = xGetElementById('default_value_item'); + var idx = listup_obj.selectedIndex; + var lng = listup_obj.options.length; + var val = item_obj.value; + switch(cmd) { + case 'insert' : + if(!val) return; + var opt = new Option(val, val, false, true); + listup_obj.options[listup_obj.length] = opt; + item_obj.value = ''; + item_obj.focus(); + break; + case 'up' : + if(lng < 2 || idx<1) return; - var value1 = listup_obj.options[idx].value; - var value2 = listup_obj.options[idx-1].value; - listup_obj.options[idx] = new Option(value2,value2,false,false); - listup_obj.options[idx-1] = new Option(value1,value1,false,true); - break; - case 'down' : - if(lng < 2 || idx == lng-1) return; + var value1 = listup_obj.options[idx].value; + var value2 = listup_obj.options[idx-1].value; + listup_obj.options[idx] = new Option(value2,value2,false,false); + listup_obj.options[idx-1] = new Option(value1,value1,false,true); + break; + case 'down' : + if(lng < 2 || idx == lng-1) return; - var value1 = listup_obj.options[idx].value; - var value2 = listup_obj.options[idx+1].value; - listup_obj.options[idx] = new Option(value2,value2,false,false); - listup_obj.options[idx+1] = new Option(value1,value1,false,true); - break; - case 'delete' : - listup_obj.remove(idx); - if(idx==0) listup_obj.selectedIndex = 0; - else listup_obj.selectedIndex = idx-1; - break; - } + var value1 = listup_obj.options[idx].value; + var value2 = listup_obj.options[idx+1].value; + listup_obj.options[idx] = new Option(value2,value2,false,false); + listup_obj.options[idx+1] = new Option(value1,value1,false,true); + break; + case 'delete' : + listup_obj.remove(idx); + if(idx==0) listup_obj.selectedIndex = 0; + else listup_obj.selectedIndex = idx-1; + break; + } - var value_list = new Array(); - for(var i=0;i - 메세지 - message - - 제로 - zero - 메세지 관리 모듈 - message - + 메세지 + + 제로 + 오류 메세지 관리 모듈 + diff --git a/modules/message/conf/module.xml b/modules/message/conf/module.xml index 9fc87db6e..7c34885c1 100644 --- a/modules/message/conf/module.xml +++ b/modules/message/conf/module.xml @@ -3,7 +3,7 @@ - - + + diff --git a/modules/message/message.class.php b/modules/message/message.class.php index 5daff494c..2b938b8eb 100644 --- a/modules/message/message.class.php +++ b/modules/message/message.class.php @@ -11,6 +11,12 @@ * @brief 설치시 추가 작업이 필요할시 구현 **/ function moduleInstall() { + // action forward에 등록 (관리자 모드에서 사용하기 위함) + $oModuleController = &getController('module'); + $oModuleController->insertActionFoward('message', 'view', 'dispMessage'); + $oModuleController->insertActionFoward('message', 'view', 'dispMessageAdminConfig'); + $oModuleController->insertActionFoward('message', 'controller', 'procMessageAdminInsertConfig'); + return new Object(); } diff --git a/modules/message/message.controller.php b/modules/message/message.controller.php index b62054eca..0df34a881 100644 --- a/modules/message/message.controller.php +++ b/modules/message/message.controller.php @@ -16,7 +16,7 @@ /** * @brief 설정 **/ - function procInsertConfig() { + function procMessageAdminInsertConfig() { // 기본 정보를 받음 $args->skin = Context::get('skin'); diff --git a/modules/message/message.view.php b/modules/message/message.view.php index 2ed77d32a..7d5646178 100644 --- a/modules/message/message.view.php +++ b/modules/message/message.view.php @@ -16,7 +16,7 @@ /** * @brief 메세지 출력 **/ - function dispContent() { + function dispMessage() { // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('rss'); @@ -34,7 +34,7 @@ /** * @brief 설정 **/ - function dispConfig() { + function dispMessageAdminConfig() { // 스킨 목록을 구해옴 $oModuleModel = &getModel('module'); $skin_list = $oModuleModel->getskins($this->module_path); diff --git a/modules/message/tpl.admin/config.html b/modules/message/tpl/config.html similarity index 100% rename from modules/message/tpl.admin/config.html rename to modules/message/tpl/config.html diff --git a/modules/message/tpl.admin/filter/insert_config.xml b/modules/message/tpl/filter/insert_config.xml similarity index 100% rename from modules/message/tpl.admin/filter/insert_config.xml rename to modules/message/tpl/filter/insert_config.xml