fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/session-class

Browse source
This commit is contained in:
Kijin Sung 2017-02-07 22:13:08 +09:00
commit 483ac84796
454 changed files with 10659 additions and 30145 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/member/member.model.php
View file

@ -142,6 +142,7 @@ class memberModel extends member
$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
$oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
}
// When click other's nickname
if($member_srl != $logged_info->member_srl && $logged_info->member_srl)
{
@ -166,12 +167,42 @@ class memberModel extends member
}
}
}
// Check if homepage and blog are public
$homepage_is_public = false;
$blog_is_public = false;
if ($logged_info->is_admin === 'Y' || ($logged_info->member_srl && $logged_info->member_srl == $member_srl))
{
$homepage_is_public = true;
$blog_is_public = true;
}
else
{
foreach ($this->module_config->signupForm as $field)
{
if ($field->name === 'homepage' && $field->isPublic === 'Y')
{
$homepage_is_public = true;
}
if ($field->name === 'blog' && $field->isPublic === 'Y')
{
$blog_is_public = true;
}
}
}
// View homepage info
if($member_info->homepage)
if($member_info->homepage && $homepage_is_public)
{
$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
}
// View blog info
if($member_info->blog)
if($member_info->blog && $blog_is_public)
{
$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
}
// Call a trigger (after)
ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
// Display a menu for editting member info to a top administrator