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

Fix misc warnings in PHP 8.0

Browse source
This commit is contained in:
Kijin Sung 2020-12-13 21:21:10 +09:00
parent b5cdd1212e
commit 855e12a5de
7 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/autoinstall/autoinstall.model.php
View file

@ -349,16 +349,16 @@ class autoinstallModel extends autoinstall
$path = substr($path, 0, strlen($path) - 1);
}
if(!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
if(!$GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
{
$args = new stdClass();
$args->path = $path;
$output = executeQuery('autoinstall.getPackageSrlByPath', $args);
$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl;
$GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl;
}
return $GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path];
return $GLOBALS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path];
}
/**

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

@ -1067,12 +1067,13 @@ class memberModel extends member
{
return null;
}
$info = null;
$member_group = self::getMemberGroups($member_srl, $site_srl);
$groups_info = self::getGroups($site_srl);
if(count($member_group) > 0 && is_array($member_group))
{
$memberGroups = array_keys($member_group);
foreach($groups_info as $group_srl=>$group_info)
{
if(in_array($group_srl, $memberGroups))
@ -1097,11 +1098,20 @@ class memberModel extends member
}
}
}
if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
if (!$info)
{
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
}
}
if (isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]) && $GLOBALS['__member_info__']['group_image_mark'][$member_srl] !== 'N')
{
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
}
else
{
return null;
}
if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
}
/**

7
modules/widget/widget.view.php
View file

@ -86,7 +86,12 @@ class widgetView extends widget
// module_category and module combination
if($module_categories)
{
foreach($mid_list as $module_srl => $module) {
foreach($mid_list as $module_srl => $module)
{
if(!isset($module_categories[$module->module_category_srl]))
{
$module_categories[$module->module_category_srl] = new stdClass();
}
$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
}
}