fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 14:49:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -256,17 +256,31 @@
/**
* @brief Change the user password
**/
function dispMemberModifyPassword() {
function dispMemberModifyPassword()
{
$oMemberModel = &getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
$memberConfig = $oMemberModel->getMemberConfig();
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
$columnList = array('member_srl', 'user_id');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
Context::set('member_info',$member_info);
if($memberConfig->identifier == 'user_id')
{
Context::set('identifier', 'user_id');
Context::set('formValue', $member_info->user_id);
}
else
{
Context::set('identifier', 'email_address');
Context::set('formValue', $member_info->email_address);
}
// Set a template file
$this->setTemplateFile('modify_password');
}
@ -279,11 +293,24 @@
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
$memberConfig = $oMemberModel->getMemberConfig();
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
Context::set('member_info',$member_info);
if($memberConfig->identifier == 'user_id')
{
Context::set('identifier', 'user_id');
Context::set('formValue', $member_info->user_id);
}
else
{
Context::set('identifier', 'email_address');
Context::set('formValue', $member_info->email_address);
}
// Set a template file
$this->setTemplateFile('leave_form');
}