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

#19705602 document column parameter modify.

Browse source 
comment column parameter modify.


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8336 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-26 07:03:05 +00:00
parent ef9f94e0da
commit de414300a8
6 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
classes/db/DBMysql.class.php
View file

@ -724,10 +724,15 @@
{ {
$columns = array(); $columns = array();
foreach($output->arg_columns as $col){ foreach($output->arg_columns as $col){
if(strpos($col,'`')===false && strpos($col,' ')==false) $columns[] = '`'.$col.'`'; unset($tmpCol);
else $columns[] = $col; $tmpCol = explode('.', $col);
if(isset($tmpCol[1])) $col = $tmpCol[1];
if(strpos($col,'`')===false && strpos($col,' ')==false) $col = '`'.$col.'`';
if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
$columns[] = $col;
} }
$columns = join(',',$columns); $columns = join(',',$columns);
} }

3
modules/comment/comment.admin.view.php
View file

@ -28,7 +28,8 @@
// get a list by using comment->getCommentList. // get a list by using comment->getCommentList.
$oCommentModel = &getModel('comment'); $oCommentModel = &getModel('comment');
$output = $oCommentModel->getTotalCommentList($args); $columnList = array('comment_srl', 'document_srl', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress');
$output = $oCommentModel->getTotalCommentList($args, $columnList);
// set values in the return object of comment_model:: getTotalCommentList() in order to use a template. // set values in the return object of comment_model:: getTotalCommentList() in order to use a template.
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);

8
modules/comment/comment.item.php
View file

@ -8,9 +8,11 @@
class commentItem extends Object { class commentItem extends Object {
var $comment_srl = 0; var $comment_srl = 0;
var $columnList = array();
function commentItem($comment_srl = 0) { function commentItem($comment_srl = 0, $columnList = array()) {
$this->comment_srl = $comment_srl; $this->comment_srl = $comment_srl;
$this->columnList = $columnList;
$this->_loadFromDB(); $this->_loadFromDB();
} }
@ -23,7 +25,7 @@
if(!$this->comment_srl) return; if(!$this->comment_srl) return;
$args->comment_srl = $this->comment_srl; $args->comment_srl = $this->comment_srl;
$output = executeQuery('comment.getComment', $args); $output = executeQuery('comment.getComment', $args, $this->columnList);
$this->setAttribute($output->data); $this->setAttribute($output->data);
} }
@ -121,7 +123,7 @@
$oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false); $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
} }
function getIpaddress() { function getIpAddress() {
if($this->isGranted()) return $this->get('ipaddress'); if($this->isGranted()) return $this->get('ipaddress');
return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress')); return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress'));
} }

26
modules/comment/comment.model.php
View file

@ -35,7 +35,8 @@
if($logged_info->member_srl) { if($logged_info->member_srl) {
$oCommentModel = &getModel('comment'); $oCommentModel = &getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, false, false); $columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
$oComment = $oCommentModel->getComment($comment_srl, false, $columnList);
$module_srl = $oComment->get('module_srl'); $module_srl = $oComment->get('module_srl');
$member_srl = $oComment->get('member_srl'); $member_srl = $oComment->get('member_srl');
@ -65,11 +66,11 @@
if($oComment->isExists()) { if($oComment->isExists()) {
// Find a post of the corresponding ip address // Find a post of the corresponding ip address
$url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->get('ipaddress')); $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->getIpAddress());
$icon_path = './modules/member/tpl/images/icon_management.gif'; $icon_path = './modules/member/tpl/images/icon_management.gif';
$oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
$url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment-> getIpAddress()); $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment->getIpAddress());
$oCommentController->addCommentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript'); $oCommentController->addCommentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript');
} }
} }
@ -105,8 +106,8 @@
/** /**
* @brief get the comment * @brief get the comment
**/ **/
function getComment($comment_srl=0, $is_admin = false) { function getComment($comment_srl=0, $is_admin = false, $columnList = array()) {
$oComment = new commentItem($comment_srl); $oComment = new commentItem($comment_srl, $columnList);
if($is_admin) $oComment->setGrant(); if($is_admin) $oComment->setGrant();
return $oComment; return $oComment;
@ -115,11 +116,11 @@
/** /**
* @brief get the multiple comments(not paginating) * @brief get the multiple comments(not paginating)
**/ **/
function getComments($comment_srl_list) { function getComments($comment_srl_list, $columnList = array()) {
if(is_array($comment_srl_list)) $comment_srls = implode(',',$comment_srl_list); if(is_array($comment_srl_list)) $comment_srls = implode(',',$comment_srl_list);
// fetch from a database // fetch from a database
$args->comment_srls = $comment_srls; $args->comment_srls = $comment_srls;
$output = executeQuery('comment.getComments', $args); $output = executeQuery('comment.getComments', $args, $columnList);
if(!$output->toBool()) return; if(!$output->toBool()) return;
$comment_list = $output->data; $comment_list = $output->data;
if(!$comment_list) return; if(!$comment_list) return;
@ -164,7 +165,7 @@
/** /**
* @brief get the comment in corresponding with mid. * @brief get the comment in corresponding with mid.
**/ **/
function getNewestCommentList($obj) { function getNewestCommentList($obj, $columnList = array()) {
if($obj->mid) { if($obj->mid) {
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid); $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@ -175,7 +176,7 @@
else $args->module_srl = $obj->module_srl; else $args->module_srl = $obj->module_srl;
$args->list_count = $obj->list_count; $args->list_count = $obj->list_count;
$output = executeQuery('comment.getNewestCommentList', $args); $output = executeQuery('comment.getNewestCommentList', $args, $columnList);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$comment_list = $output->data; $comment_list = $output->data;
@ -201,7 +202,8 @@
function getCommentList($document_srl, $page = 0, $is_admin = false, $count = 0) { function getCommentList($document_srl, $page = 0, $is_admin = false, $count = 0) {
// get the number of comments on the document module // get the number of comments on the document module
$oDocumentModel = &getModel('document'); $oDocumentModel = &getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl); $columnList = array('document_srl', 'module_srl', 'comment_count');
$oDocument = $oDocumentModel->getDocument($document_srl, false, true, $columnList);
// return if no doc exists. // return if no doc exists.
if(!$oDocument->isExists()) return; if(!$oDocument->isExists()) return;
// return if no comment exists // return if no comment exists
@ -321,7 +323,7 @@
/** /**
* @brief get all the comments in time decending order(for administrators) * @brief get all the comments in time decending order(for administrators)
**/ **/
function getTotalCommentList($obj) { function getTotalCommentList($obj, $columnList = array()) {
$query_id = 'comment.getTotalCommentList'; $query_id = 'comment.getTotalCommentList';
// Variables // Variables
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
@ -376,7 +378,7 @@
} }
} }
// comment.getTotalCommentList query execution // comment.getTotalCommentList query execution
$output = executeQueryArray($query_id, $args); $output = executeQueryArray($query_id, $args, $columnList);
// return when no result or error occurance // return when no result or error occurance
if(!$output->toBool()||!count($output->data)) return $output; if(!$output->toBool()||!count($output->data)) return $output;
foreach($output->data as $key => $val) { foreach($output->data as $key => $val) {

2
modules/comment/queries/getTotalCommentList.xml
View file

@ -1,6 +1,6 @@
<query id="getTotalCommentList" action="select"> <query id="getTotalCommentList" action="select">
<tables> <tables>
<table name="comments" /> <table name="comments" alias="comments" />
</tables> </tables>
<columns> <columns>
<column name="*" /> <column name="*" />

8
modules/document/document.item.php
View file

@ -11,11 +11,13 @@
var $lang_code = null; var $lang_code = null;
var $allow_trackback_status = null; var $allow_trackback_status = null;
var $columnList = array();
function documentItem($document_srl = 0, $load_extra_vars = true, $columnList = array()) { function documentItem($document_srl = 0, $load_extra_vars = true, $columnList = array()) {
$this->document_srl = $document_srl; $this->document_srl = $document_srl;
$this->columnList = $columnList;
$this->_loadFromDB($load_extra_vars, $columnList); $this->_loadFromDB($load_extra_vars);
} }
function setDocument($document_srl, $load_extra_vars = true) { function setDocument($document_srl, $load_extra_vars = true) {
@ -23,11 +25,11 @@
$this->_loadFromDB($load_extra_vars); $this->_loadFromDB($load_extra_vars);
} }
function _loadFromDB($load_extra_vars = true, $columnList = array()) { function _loadFromDB($load_extra_vars = true) {
if(!$this->document_srl) return; if(!$this->document_srl) return;
$args->document_srl = $this->document_srl; $args->document_srl = $this->document_srl;
$output = executeQuery('document.getDocument', $args, $columnList); $output = executeQuery('document.getDocument', $args, $this->columnList);
$this->setAttribute($output->data,$load_extra_vars); $this->setAttribute($output->data,$load_extra_vars);
} }