From 9e573df09aab9f9067edab1d1224827b7ad34c62 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 2 Apr 2007 06:21:47 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@886 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/message/message.addon.php | 2 +- common/js/common.js | 2 -- modules/member/lang/ko.lang.php | 1 + modules/member/member.view.php | 26 +++++++++---------- .../default/filter/{insert.xml => signup.xml} | 2 +- .../{insert_member.html => signup_form.html} | 4 +-- 6 files changed, 17 insertions(+), 20 deletions(-) rename modules/member/skins/default/filter/{insert.xml => signup.xml} (95%) rename modules/member/skins/default/{insert_member.html => signup_form.html} (99%) diff --git a/addons/message/message.addon.php b/addons/message/message.addon.php index 4a79a1db1..a736031f7 100644 --- a/addons/message/message.addon.php +++ b/addons/message/message.addon.php @@ -37,7 +37,7 @@ $menu_link = sprintf('./?module=message&act=dispSendMessage&target_member_srl=%s',$member_srl); // 메뉴에 새로 만든 쪽지 발송 메뉴를 추가 - $menu_list .= sprintf("\n%s,%s", $menu_str, $menu_link); + $menu_list .= sprintf("\n%s,popopen('%s','sendMessage')", $menu_str, $menu_link); // 템플릿에 적용되게 하기 위해 module의 variables에 재등록 $this->add('menu_list', $menu_list); diff --git a/common/js/common.js b/common/js/common.js index 89b853071..9506c7051 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -418,7 +418,6 @@ function chkMemberMenu(evt) { var member_srl = obj.className.replace(/member_([0-9]+)/,'$1'); if(member_srl<1) return; - // 현재 글의 mid, module를 구함 var mid = location.href.getQuery("mid"); var module = location.href.getQuery("module"); @@ -438,7 +437,6 @@ function chkMemberMenu(evt) { displayMemberMenu(params, response_tags, params); return; } - show_waiting_message = false; exec_xml("member", "getMemberMenu", params, displayMemberMenu, response_tags, params); show_waiting_message = true; diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index 480a772c3..5e474734e 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -62,6 +62,7 @@ $lang->msg_exists_nick_name = '이미 존재하는 닉네임입니다. 다른 닉네임을 입력해주세요'; $lang->msg_signup_disabled = '회원 가입을 하실 수 없습니다'; $lang->msg_already_logged = '이미 회원 가입을 하신 상태입니다'; + $lang->msg_not_logged = '로그인을 하지 않으셨습니다'; $lang->msg_not_uploaded_image_name = '이미지 이름을 등록할 수가 없습니다'; $lang->msg_not_uploaded_image_mark = '이미지 마크를 등록할 수가 없습니다'; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 78e53883a..958933ae0 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -101,36 +101,34 @@ // 회원가입을 중지시켰을 때는 에러 표시 if($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled'); + + Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info)); // 템플릿 파일 지정 $this->setTemplateFile('signup_form'); } /** - * @brief 회원 가입 폼 출력 + * @brief 회원 정보 수정 **/ - function dispMemberSignUpForm() { + function dispMemberModifyInfo() { $this->initNormal(); $oMemberModel = &getModel('member'); - // 로그인한 회원일 경우 해당 회원의 정보를 받음 - if($oMemberModel->isLogged()) { - $logged_info = Context::get('logged_info'); - $member_srl = $logged_info->member_srl; - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); - Context::set('member_info',$member_info); - // 비로그인 회원 - } else { - // 회원가입을 중지시켰을 때는 에러 표시 - if($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled'); - } + // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력 + if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged'); + + $logged_info = Context::get('logged_info'); + $member_srl = $logged_info->member_srl; + $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); + Context::set('member_info',$member_info); // 추가 가입폼 목록을 받음 Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info)); // 템플릿 파일 지정 - $this->setTemplateFile('insert_member'); + $this->setTemplateFile('modify_info'); } /** diff --git a/modules/member/skins/default/filter/insert.xml b/modules/member/skins/default/filter/signup.xml similarity index 95% rename from modules/member/skins/default/filter/insert.xml rename to modules/member/skins/default/filter/signup.xml index 0804d9fe4..1a2c947b2 100644 --- a/modules/member/skins/default/filter/insert.xml +++ b/modules/member/skins/default/filter/signup.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/member/skins/default/insert_member.html b/modules/member/skins/default/signup_form.html similarity index 99% rename from modules/member/skins/default/insert_member.html rename to modules/member/skins/default/signup_form.html index 3adecb61a..8cf3d0c71 100644 --- a/modules/member/skins/default/insert_member.html +++ b/modules/member/skins/default/signup_form.html @@ -1,4 +1,4 @@ - +
@@ -9,7 +9,7 @@
- +