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

Merge branch 'hotfix/1.7.5.2' into develop

Browse source
This commit is contained in:
akasima 2014-06-10 10:44:20 +09:00
commit 0be1d74edc
5 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,11 @@ class ModuleHandler extends Handler
{
if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
{
header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
if(Context::get('_https_port')!=null) {
header('location:https://' . $_SERVER['HTTP_HOST'] . ':' . Context::get('_https_port') . $_SERVER['REQUEST_URI']);
} else {
header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
}
return;
}
}

6
modules/install/install.admin.controller.php
View file

@ -335,14 +335,10 @@ class installAdminController extends install
list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
if($iconname == 'favicon.ico')
{
if(!preg_match('/^.*\.icon$/i',$type)) {
if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
return;
}
if($width && $height && ($width != '16' || $height != '16')) {
Context::set('msg', Context::getLang('msg_invalid_format').' (size : 16x16)');
return;
}
}
else if($iconname == 'mobicon.png')
{

15
modules/member/member.controller.php
View file

@ -454,7 +454,14 @@ class memberController extends member
$_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD';
$redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
if(Context::get('success_return_url'))
{
$redirectUrl = Context::get('success_return_url');
}
else
{
$redirectUrl = getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
}
$this->setRedirectUrl($redirectUrl);
}
@ -2407,6 +2414,12 @@ class memberController extends member
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
if($member_srl) return new Object(-1,'msg_exists_email_address');
if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
{
return $this->stop('msg_invalid_request');
}
unset($_SESSION['rechecked_password_step']);
$auth_args = new stdClass;
$auth_args->user_id = $newEmail;
$auth_args->member_srl = $member_info->member_srl;

9
modules/member/member.view.php
View file

@ -578,7 +578,14 @@ class memberView extends member
function dispMemberModifyEmailAddress()
{
if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
if($_SESSION['rechecked_password_step'] != 'VALIDATE_PASSWORD' && $_SESSION['rechecked_password_step'] != 'INPUT_DATA')
{
Context::set('success_return_url', getUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyEmailAddress'));
$this->dispMemberModifyInfoBefore();
return;
}
$_SESSION['rechecked_password_step'] = 'INPUT_DATA';
$this->setTemplateFile('modify_email_address');
}

1
modules/member/skins/default/rechecked_password.html
View file

@ -8,6 +8,7 @@
<input type="hidden" name="act" value="procMemberModifyInfoBefore" />
<input type="hidden" name="module" value="member" />
<input type="hidden" name="xe_validator_id" value="modules/member/skins/default/1" />
<input cond="$success_return_url" type="hidden" name="success_return_url" value="{$success_return_url}" />
<div>
<input type="email" value="{$identifierValue}" readonly title="{$lang->email}" />
</div>