fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate duplicate methods in communication mobile class

Browse source
This commit is contained in:
Kijin Sung 2017-11-21 18:06:04 +09:00
parent 94cdcb2e7c
commit 17c6e48784
2 changed files with 12 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

172
modules/communication/communication.mobile.php
View file

@ -1,8 +1,6 @@
<?php <?php
/* Copyright (C) NAVER <http://www.navercorp.com> */ /* Copyright (C) NAVER <http://www.navercorp.com> */
require_once(_XE_PATH_ . 'modules/communication/communication.view.php');
/** /**
* @class communicationMobile * @class communicationMobile
* @author NAVER (developers@xpressengine.com) * @author NAVER (developers@xpressengine.com)
@ -32,100 +30,6 @@ class communicationMobile extends communicationView
} }
} }
/**
* Display message box
* @return Object (void : success, Object : fail)
*/
function dispCommunicationMessages()
{
// Error appears if not logged-in
if(!Context::get('is_logged'))
{
return new Object(-1,'msg_not_logged');
}
$logged_info = Context::get('logged_info');
if(!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
{
return new Object(-1,'msg_invalid_request');
}
// Set the variables
$message_srl = Context::get('message_srl');
$message_type = Context::get('message_type');
if(!in_array($message_type, array('R', 'S', 'T', 'N')))
{
$message_type = 'R';
Context::set('message_type', $message_type);
}
$oCommunicationModel = getModel('communication');
// extract contents if message_srl exists
if($message_srl)
{
$templateFile = 'read_message';
$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
switch($message->message_type)
{
case 'R':
if($message->receiver_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
case 'S':
if($message->sender_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
case 'T':
if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
case 'N':
if($message->receiver_srl != $logged_info->member_srl)
{
return new Object(-1, 'msg_invalid_request');
}
break;
}
if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
{
stripEmbedTagForAdmin($message->content, $message->sender_srl);
Context::set('message', $message);
}
}
else
{
$templateFile = 'messages';
}
// Extract a list
$columnList = array('message_srl', 'readed', 'title', 'member.member_srl', 'member.nick_name', 'message.regdate', 'readed_date');
$output = $oCommunicationModel->getMessages($message_type, $columnList);
// set a template file
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
Context::set('page', $output->page);
Context::set('message_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
$oSecurity = new Security();
$oSecurity->encodeHTML('message_list..nick_name');
$this->setTemplateFile($templateFile);
}
/** /**
* Display list of message box * Display list of message box
* @return void * @return void
@ -134,82 +38,6 @@ class communicationMobile extends communicationView
{ {
$this->setTemplateFile('message_box'); $this->setTemplateFile('message_box');
} }
/**
* Display message sending
* @return void|Object (void : success, Object : fail)
*/
function dispCommunicationSendMessage()
{
$oCommunicationModel = getModel('communication');
$oMemberModel = getModel('member');
// Error appears if not logged-in
if(!Context::get('is_logged'))
{
return $this->stop('msg_not_logged');
}
$logged_info = Context::get('logged_info');
// get receipient's information
// check inalid request
$receiver_srl = Context::get('receiver_srl');
if(!$receiver_srl)
{
return $this->stop('msg_invalid_request');
}
// check receiver and sender are same
if($logged_info->member_srl == $receiver_srl)
{
return $this->stop('msg_cannot_send_to_yourself');
}
// get message_srl of the original message if it is a reply
$message_srl = Context::get('message_srl');
if($message_srl)
{
$source_message = $oCommunicationModel->getSelectedMessage($message_srl);
if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
{
if(strncasecmp('[re]', $source_message->title, 4) !== 0)
{
$source_message->title = '[re] ' . $source_message->title;
}
$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">" . trim($source_message->content) . "</div>";
Context::set('source_message', $source_message);
}
}
$receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
if(!$receiver_info)
{
return $this->stop('msg_invalid_request');
}
Context::set('receiver_info', $receiver_info);
// set a signiture by calling getEditor of the editor module
$oEditorModel = getModel('editor');
$option = $oEditorModel->getEditorConfig();
$option->primary_key_name = 'receiver_srl';
$option->content_key_name = 'content';
$option->allow_fileupload = FALSE;
$option->enable_autosave = FALSE;
$option->enable_default_component = TRUE; // FALSE;
$option->enable_component = FALSE;
$option->resizable = FALSE;
$option->disable_html = TRUE;
$option->height = 300;
$option->skin = $this->config->editor_skin;
$option->colorset = $this->config->editor_colorset;
$editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
Context::set('editor', $editor);
$this->setTemplateFile('send_message');
}
} }
/* End of file communication.mobile.php */ /* End of file communication.mobile.php */
/* Location: ./modules/comment/communication.mobile.php */ /* Location: ./modules/comment/communication.mobile.php */

17
modules/communication/communication.view.php
View file

@ -73,9 +73,9 @@ class communicationView extends communication
Context::set('message_type', $message_type); Context::set('message_type', $message_type);
} }
$oCommunicationModel = getModel('communication');
// extract contents if message_srl exists // extract contents if message_srl exists
$oCommunicationModel = getModel('communication');
$template_filename = 'messages';
if($message_srl) if($message_srl)
{ {
$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate'); $columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
@ -116,6 +116,10 @@ class communicationView extends communication
{ {
stripEmbedTagForAdmin($message->content, $message->sender_srl); stripEmbedTagForAdmin($message->content, $message->sender_srl);
Context::set('message', $message); Context::set('message', $message);
if(Context::get('m'))
{
$template_filename = 'read_message';
}
} }
} }
@ -133,7 +137,7 @@ class communicationView extends communication
$oSecurity = new Security(); $oSecurity = new Security();
$oSecurity->encodeHTML('message_list..nick_name'); $oSecurity->encodeHTML('message_list..nick_name');
$this->setTemplateFile('messages'); $this->setTemplateFile($template_filename);
} }
/** /**
@ -178,8 +182,11 @@ class communicationView extends communication
*/ */
function dispCommunicationSendMessage() function dispCommunicationSendMessage()
{ {
$this->setLayoutPath('./common/tpl/'); if(!Context::get('m'))
$this->setLayoutFile("popup_layout"); {
$this->setLayoutPath('./common/tpl/');
$this->setLayoutFile("popup_layout");
}
if($this->config->enable_message == 'N') if($this->config->enable_message == 'N')
{ {