fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 21:32:51 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/1.8.13'

Browse source
This commit is contained in:
bnu 2015-10-23 16:10:34 +09:00
commit 7dcc32e868
7 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/context/Context.class.php
View file

@ -668,7 +668,8 @@ class Context
$url_info = parse_url($url);
$oModuleModel = getModel('module');
$site_info = $oModuleModel->getSiteInfoByDomain($url_info['host']);
$target_domain = (stripos($url, $default_url) !== 0) ? $url_info['host'] : $default_url;
$site_info = $oModuleModel->getSiteInfoByDomain($target_domain);
if(!$site_info->site_srl) {
$oModuleObject = new ModuleObject();
$oModuleObject->stop('msg_invalid_request');

4
classes/module/ModuleHandler.class.php
View file

@ -410,8 +410,8 @@ class ModuleHandler extends Handler
$logged_info = Context::get('logged_info');
// check CSRF for admin actions
if(Context::getRequestMethod() === 'POST' && Context::isInstalled() && !checkCSRF()) {
// check CSRF for POST actions
if(Context::getRequestMethod() === 'POST' && Context::isInstalled() && $this->act !== 'procFileUpload' && !checkCSRF()) {
$this->error = 'msg_invalid_request';
$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
$oMessageObject->setError(-1);

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.8.12');
define('__XE_VERSION__', '1.8.13');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

15
modules/board/board.class.php
View file

@ -18,6 +18,21 @@ class board extends ModuleObject
var $page_count = 10; ///< page number
var $category_list = NULL; ///< category list
/**
* constructor
*
* @return void
*/
function board()
{
if(!Context::isInstalled()) return;
if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
{
$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
Context::addSSLActions($ssl_actions);
}
}
/**
* @brief install the module

4
modules/member/conf/module.xml
View file

@ -62,8 +62,8 @@
<action name="procMemberSaveDocument" type="controller" standalone="true" />
<action name="procMemberDeleteSavedDocument" type="controller" standalone="true" />
<action name="procMemberFindAccount" type="controller" ruleset="findAccount" standalone="true" />
<action name="procMemberFindAccountByQuestion" type="controller" standalone="true" />
<action name="procMemberFindAccount" type="controller" method="GET|POST" ruleset="findAccount" standalone="true" />
<action name="procMemberFindAccountByQuestion" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberAuthAccount" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberAuthEmailAddress" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberResendAuthMail" type="controller" ruleset="resendAuthMail" standalone="true" />

2
modules/member/tpl/group_list.html
View file

@ -15,7 +15,7 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/member/tpl/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="" method="post" ruleset="insertGroupConfig">
<form action="" method="post" id="fo_member_group" ruleset="insertGroupConfig">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberAdminGroupConfig" />
<input type="hidden" name="xe_validator_id" value="modules/member/tpl/1" />

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

@ -981,7 +981,7 @@ class moduleController extends module
}
}
$oDB->commit;
$oDB->commit();
return new Object();
}