fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 11:33:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

merger from branch luminous (~r11576)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-10-04 05:04:23 +00:00
commit 51bb8d1985
91 changed files with 1157 additions and 703 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,7 @@
function _getDisplayedMemberInfo($memberInfo, $extendFormInfo, $memberConfig)
{
$logged_info = Context::get('logged_info');
$displayDatas = array();
foreach($memberConfig->signupForm as $no=>$formInfo)
{
@ -270,6 +271,7 @@
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$member_info->signature = $oMemberModel->getSignature($member_srl);
Context::set('member_info',$member_info);
// Get a list of extend join form
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
@ -291,6 +293,8 @@
Context::set('editor', $editor);
}
$this->member_info = $member_info;
$oMemberAdminView = &getAdminView('member');
$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
Context::set('formTags', $formTags);
@ -382,7 +386,7 @@
**/
function dispMemberLoginForm() {
if(Context::get('is_logged')) {
Context::set('redirect_url', getUrl('act',''));
Context::set('redirect_url', getNotEncodedUrl('act',''));
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('redirect.html');
return;
@ -542,7 +546,7 @@
}
/**
* @brief 이메일 주소를 기본 로그인 계정 사용시 이메일 주소 변경을 위한 화면 추가
* @brief ?´ë©”??주소ë¥?기본 로그??계정 ?¬ìš©???´ë©”??주소 변경ì<EFBFBD>„ ?„í•œ ?”ë©´ 추ê?
**/
function dispMemberModifyEmailAddress(){
if(!Context::get('is_logged')) return $this->stop('msg_not_logged');