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

Merge branch 'branch-sync'

Browse source 
Conflicts:
	classes/security/Purifier.class.php
	modules/comment/comment.controller.php
	modules/document/tpl/document_list.html
	modules/widget/ruleset/generateCodeInPage.xml
	modules/widget/widget.controller.php
This commit is contained in:
bnu 2013-12-08 03:21:26 +09:00
commit 20436466fc
7 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/security/Purifier.class.php
View file

@ -41,6 +41,7 @@ class Purifier
$this->_config->set('HTML.SafeIframe', TRUE);
$this->_config->set('URI.SafeIframeRegexp', $whiteDomainRegex);
$this->_config->set('Cache.SerializerPath', $this->_cacheDir);
$this->_config->set('Attr.AllowedFrameTargets', array('_blank'));
//$this->_config->set('Attr.AllowedClasses', $allowdClasses);
$this->_def = $this->_config->getHTMLDefinition(TRUE);

2
modules/comment/comment.controller.php
View file

@ -1086,7 +1086,7 @@ class commentController extends comment
$obj = new stdClass();
$obj->member_srl = $oComment->get('member_srl');
$obj->module_srl = $oComment->get('module_srl');
$obj->comment_srl = $oComment->get('comment');
$obj->comment_srl = $oComment->get('comment_srl');
$obj->update_target = ($point < 0) ? 'blamed_count' : 'voted_count';
$obj->point = $point;
$obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');

4
modules/document/document.controller.php
View file

@ -416,8 +416,8 @@ class documentController extends document
if($source_obj->get('member_srl')==$logged_info->member_srl || $bUseHistory)
{
$obj->member_srl = $logged_info->member_srl;
$obj->user_name = $logged_info->user_name;
$obj->nick_name = $logged_info->nick_name;
$obj->user_name = htmlspecialchars_decode($logged_info->user_name);
$obj->nick_name = htmlspecialchars_decode($logged_info->nick_name);
$obj->email_address = $logged_info->email_address;
$obj->homepage = $logged_info->homepage;
}

2
modules/document/queries/updateDocumentCategory.xml
View file

@ -1,4 +1,4 @@
<query id="updateCategoryDocument" action="update">
<query id="updateDocumentCategory" action="update">
<tables>
<table name="documents" />
</tables>

2
modules/document/tpl/document_list.html
View file

@ -48,7 +48,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</thead>
<tbody>
<tr loop="$document_list => $no, $oDocument">
<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitleText()))-->{$oDocument->getTitleText()}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a></td>
<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitleText()))-->{htmlspecialchars($oDocument->getTitleText())}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a></td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
<td class="nowr">{$oDocument->get('readed_count')}</td>
<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>

2
modules/widget/ruleset/generateCodeInPage.xml
View file

@ -6,6 +6,6 @@
</customrules>
<fields>
<field name="selected_widget" required="true" rule="class_name" />
<field name="skin" required="true" rule="skin_name" />
<field name="skin" rule="skin_name" />
</fields>
</ruleset>

2
modules/widget/widget.controller.php
View file

@ -283,7 +283,7 @@ class widgetController extends widget
else $vars = $xml_doc->attrs;
$widget = $vars->widget;
if(!$widget) return $match[0];
if(!$widget) return $matches[0];
unset($vars->widget);
return $this->execute($widget, $vars, $this->javascript_mode);