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

merge from 1.5.1.8

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -629,8 +629,10 @@
/**
* @brief Get the image mark of the group
**/
function getGroupImageMark($member_srl,$site_srl=0) {
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) {
function getGroupImageMark($member_srl,$site_srl=0)
{
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
{
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y'){
@ -638,20 +640,23 @@
}
$member_group = $this->getMemberGroups($member_srl,$site_srl);
$groups_info = $this->getGroups($site_srl);
$image_mark_info = null;
if(count($member_group) > 0 && is_array($member_group)){
$group_srl = array_keys($member_group);
}
if(count($member_group) > 0 && is_array($member_group))
{
$memberGroups = array_keys($member_group);
$i = 0;
while($i < count($group_srl)){
$target = $groups_info[$group_srl[$i++]];
if ($target->image_mark)
foreach($groups_info as $group_srl=>$group_info)
{
$info->title = $target->title;
$info->description = $target->description;
$info->src = $target->image_mark;
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
if(in_array($group_srl, $memberGroups))
{
if($group_info->image_mark)
{
$info->title = $group_info->title;
$info->description = $group_info->description;
$info->src = $group_info->image_mark;
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
break;
}
}
}
}
if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';