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

Merge branch 'develop' into feature/pwhash

Browse source
This commit is contained in:
bnu 2015-01-15 16:46:17 +09:00
commit a837f1e00a
156 changed files with 10370 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -719,9 +719,9 @@ class memberController extends member
// Get file information
list($width, $height, $type, $attrs) = @getimagesize($target_file);
if(IMG_PNG == $type) $ext = 'png';
elseif(IMG_JPG == $type) $ext = 'jpg';
elseif(IMG_GIF == $type) $ext = 'gif';
if(IMAGETYPE_PNG == $type) $ext = 'png';
elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
else
{
return;
@ -1105,7 +1105,12 @@ class memberController extends member
$args->member_srl = $member_srl;
$args->auth_key = $auth_key;
$output = executeQuery('member.getAuthMail', $args);
if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_auth_key');
if(!$output->toBool() || $output->data->auth_key != $auth_key)
{
if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthMail', $args);
return $this->stop('msg_invalid_auth_key');
}
// If credentials are correct, change the password to a new one
if($output->data->is_register == 'Y')
{
@ -2484,7 +2489,11 @@ class memberController extends member
$args->member_srl = $member_srl;
$args->auth_key = $auth_key;
$output = executeQuery('member.getAuthMail', $args);
if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_modify_email_auth_key');
if(!$output->toBool() || $output->data->auth_key != $auth_key)
{
if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
return $this->stop('msg_invalid_modify_email_auth_key');
}
$newEmail = $output->data->user_id;
$args->email_address = $newEmail;