From 828ddc87b1279d46293ac08dac5ac8eac993e37c Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 4 Dec 2008 01:50:00 +0000 Subject: [PATCH] =?UTF-8?q?=20=20*=20=EC=83=88=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=8B=9C=20=EC=83=88=20=EC=AA=BD=EC=A7=80?= =?UTF-8?q?=EC=9D=98=20=EC=88=98=EB=A5=BC=20=ED=91=9C=EC=8B=9C=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20=20=20=20=20*=20?= =?UTF-8?q?=EB=A7=88=EC=A7=80=EB=A7=89=20=EC=95=8C=EB=A6=BC=20=EC=9D=B4?= =?UTF-8?q?=ED=9B=84=EC=9D=98=20=EC=AA=BD=EC=A7=80=20=EC=88=98=EB=A7=8C=20?= =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=20=20*=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=EC=B0=BD=20=EB=9C=A8=EB=8A=94=20=EC=8B=9C=EC=A0=90=EC=9D=84=20?= =?UTF-8?q?=EC=82=B4=EC=A7=9D=20=EC=95=9E=20=EB=8B=B9=EA=B9=80.=20onload?= =?UTF-8?q?=20->=20onready?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5038 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/member_communication/lang/ko.lang.php | 2 +- .../member_communication.addon.php | 35 ++++++++----------- .../communication.controller.php | 3 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/addons/member_communication/lang/ko.lang.php b/addons/member_communication/lang/ko.lang.php index 5dc594d0d..697ef6d93 100644 --- a/addons/member_communication/lang/ko.lang.php +++ b/addons/member_communication/lang/ko.lang.php @@ -1,3 +1,3 @@ alert_new_message_arrived = '새로운 메세지가 도착하였습니다. 확인하시겠습니까?'; + $lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?'; ?> diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php index 26563ce0a..7f9213fa1 100644 --- a/addons/member_communication/member_communication.addon.php +++ b/addons/member_communication/member_communication.addon.php @@ -11,14 +11,14 @@ * - MemberModel::getMemberMenu 호출시 친구 등록 메뉴를 추가합니다. **/ + // 비로그인 사용자면 중지 + $logged_info = Context::get('logged_info'); + if(!$logged_info) return; + /** * 기능 수행 : 팝업 및 회원정보 보기에서 쪽지/친구 메뉴 추가. 시작할때 새쪽지가 왔는지 검사 - * 조건 : called_position = 'before_module_init', module = 'member' **/ - if($called_position == 'before_module_init' && $this->module != 'member' && Context::get('is_logged') ) { - - // 로그인된 사용자 정보를 구함 - $logged_info = Context::get('logged_info'); + if($called_position == 'before_module_init' && $this->module != 'member') { // 커뮤니케이션 모듈의 언어파일을 읽음 Context::loadLang('./modules/communication/lang'); @@ -28,31 +28,26 @@ $oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend'); $oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box'); - // 새로운 쪽지에 대한 플래그가 있으면 쪽지 보기 팝업 띄움 + // 새로운 쪽지에 대한 플래그가 있으면 쪽지 보기 팝업 띄움 $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl); $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl); if(file_exists($flag_file)) { + $new_message_count = FileHandler::readFile($flag_file); FileHandler::removeFile($flag_file); Context::loadLang('./addons/member_communication/lang'); - $script = sprintf('', Context::getLang('alert_new_message_arrived'), Context::getRequestUri().'?module=communication&act=dispCommunicationNewMessage'); - + $script = sprintf('', sprintf(Context::getLang('alert_new_message_arrived'), $new_message_count), Context::getRequestUri().'?module=communication&act=dispCommunicationNewMessage'); + Context::addHtmlHeader( $script ); } /** * 기능 수행 : 사용자 이름을 클릭시 요청되는 팝업메뉴의 메뉴에 쪽지 발송, 친구추가등의 링크 추가 - * 조건 : called_position == 'after_module_proc', module = 'member', act = 'getMemberMenu' **/ } elseif($called_position == 'before_module_proc' && $this->module == 'member' && $this->act == 'getMemberMenu') { - // 비로그인 사용자라면 패스 - if(!Context::get('is_logged')) return; $oMemberController = &getController('member'); - - // 로그인된 사용자 정보를 구함 - $logged_info = Context::get('logged_info'); $member_srl = Context::get('target_srl'); $mid = Context::get('cur_mid'); @@ -71,19 +66,19 @@ // 아니라면 쪽지 발송, 친구 등록 추가 } else { // 대상 회원의 정보를 가져옴 - $target_member_info = $this->getMemberInfoByMemberSrl($member_srl); + $target_member_info = $this->getMemberInfoByMemberSrl($member_srl); if(!$target_member_info->member_srl) return; // 로그인된 사용자 정보를 구함 $logged_info = Context::get('logged_info'); - + // 쪽지 발송 메뉴를 만듬 - if( $logged_info->is_admin == 'Y' || $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) + if( $logged_info->is_admin == 'Y' || $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationSendMessage','receiver_srl',$member_srl), 'cmd_send_message', './modules/communication/tpl/images/icon_write_message.gif', 'popup'); - // 친구 등록 메뉴를 만듬 (이미 등록된 친구가 아닐 경우) - if(!$oCommunicationModel->isAddedFriend($member_srl)) + // 친구 등록 메뉴를 만듬 (이미 등록된 친구가 아닐 경우) + if(!$oCommunicationModel->isAddedFriend($member_srl)) $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', './modules/communication/tpl/images/icon_add_friend.gif', 'popup'); } } -?> +?> \ No newline at end of file diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 4343a8883..7ebaa9923 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -135,7 +135,8 @@ $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($receiver_srl); FileHandler::makeDir($flag_path); $flag_file = sprintf('%s%s', $flag_path, $receiver_srl); - FileHandler::writeFile($flag_file,'1'); + $flag_count = FileHandler::readFile($flag_file); + FileHandler::writeFile($flag_file, ++$flag_count); $oDB->commit();