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

#19705602 communication select column parameter refactoring

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8340 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-27 01:03:25 +00:00
parent ba796d9bad
commit e1ee2ac134
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/communication/communication.model.php
View file

@ -30,11 +30,11 @@
/** /**
* @brief get the message contents * @brief get the message contents
**/ **/
function getSelectedMessage($message_srl) { function getSelectedMessage($message_srl, $columnList = array()) {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$args->message_srl = $message_srl; $args->message_srl = $message_srl;
$output = executeQuery('communication.getMessage',$args); $output = executeQuery('communication.getMessage',$args, $columnList);
$message = $output->data; $message = $output->data;
if(!$message) return ; if(!$message) return ;
// get recipient's information if it is a sent message // get recipient's information if it is a sent message
@ -61,12 +61,12 @@
/** /**
* @brief get a new message * @brief get a new message
**/ **/
function getNewMessage() { function getNewMessage($columnList = array()) {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$args->receiver_srl = $logged_info->member_srl; $args->receiver_srl = $logged_info->member_srl;
$args->readed = 'N'; $args->readed = 'N';
$output = executeQuery('communication.getNewMessage', $args); $output = executeQuery('communication.getNewMessage', $args, $columnList);
if(!count($output->data)) return; if(!count($output->data)) return;
$message = array_pop($output->data); $message = array_pop($output->data);
@ -82,7 +82,7 @@
* type = S: Sent Message * type = S: Sent Message
* type = T: Archive * type = T: Archive
**/ **/
function getMessages($message_type = "R") { function getMessages($message_type = "R", $columnList = array()) {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
switch($message_type) { switch($message_type) {
@ -108,13 +108,13 @@
$args->page = Context::get('page'); $args->page = Context::get('page');
$args->list_count = 20; $args->list_count = 20;
$args->page_count = 10; $args->page_count = 10;
return executeQuery($query_id, $args); return executeQuery($query_id, $args, $columnList);
} }
/** /**
* @brief Get a list of friends * @brief Get a list of friends
**/ **/
function getFriends($friend_group_srl = 0) { function getFriends($friend_group_srl = 0, $columnList = array()) {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$args->friend_group_srl = $friend_group_srl; $args->friend_group_srl = $friend_group_srl;
@ -124,7 +124,7 @@
$args->sort_index = 'friend.list_order'; $args->sort_index = 'friend.list_order';
$args->list_count = 10; $args->list_count = 10;
$args->page_count = 10; $args->page_count = 10;
$output = executeQuery('communication.getFriends', $args); $output = executeQuery('communication.getFriends', $args, $columnList);
return $output; return $output;
} }

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

@ -40,14 +40,16 @@
$oCommunicationModel = &getModel('communication'); $oCommunicationModel = &getModel('communication');
// extract contents if message_srl exists // extract contents if message_srl exists
if($message_srl) { if($message_srl) {
$message = $oCommunicationModel->getSelectedMessage($message_srl); $columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl) ) { 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); stripEmbedTagForAdmin($message->content, $message->sender_srl);
Context::set('message', $message); Context::set('message', $message);
} }
} }
// Extract a list // Extract a list
$output = $oCommunicationModel->getMessages($message_type); $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 // set a template file
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page); Context::set('total_page', $output->total_page);
@ -69,7 +71,8 @@
$oCommunicationModel = &getModel('communication'); $oCommunicationModel = &getModel('communication');
// get a new message // get a new message
$message = $oCommunicationModel->getNewMessage(); $columnList = array('message_srl', 'member_srl', 'nick_name', 'title', 'content', 'sender_srl');
$message = $oCommunicationModel->getNewMessage($columnList);
if($message) { if($message) {
stripEmbedTagForAdmin($message->content, $message->sender_srl); stripEmbedTagForAdmin($message->content, $message->sender_srl);
Context::set('message', $message); Context::set('message', $message);
@ -143,7 +146,8 @@
Context::set('friend_group_list', $friend_group_list); Context::set('friend_group_list', $friend_group_list);
// get a list of friends // get a list of friends
$friend_group_srl = Context::get('friend_group_srl'); $friend_group_srl = Context::get('friend_group_srl');
$output = $oCommunicationModel->getFriends($friend_group_srl); $columnList = array('friend_srl', 'friend_group_srl', 'target_srl', 'member.nick_name', 'friend.regdate');
$output = $oCommunicationModel->getFriends($friend_group_srl, $columnList);
$friend_count = count($output->data); $friend_count = count($output->data);
if($friend_count) { if($friend_count) {
foreach($output->data as $key => $val) { foreach($output->data as $key => $val) {