fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1528 make group_srl encoding more robust in case of incorrect data

Browse source
This commit is contained in:
Kijin Sung 2020-12-26 16:18:58 +09:00
parent 4df36cbde7
commit b9c2cd1494
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/menu/menu.admin.controller.php
View file

@ -1659,7 +1659,7 @@ class menuAdminController extends menu
public function procMenuAdminUpdateAuth()
{
$menuItemSrl = Context::get('menu_item_srl');
$exposure = Context::get('exposure');
$exposure = strval(Context::get('exposure'));
$htPerm = Context::get('htPerm');
$oMenuModel = getAdminModel('menu');
@ -1674,13 +1674,14 @@ class menuAdminController extends menu
}
else
{
$exposure = explode(',', $exposure);
if(in_array($exposure, array('-1','-3')))
{
$args->group_srls = $exposure;
}
if($exposure) $args->group_srls = implode(',', $exposure);
else
{
$args->group_srls = implode(',', $exposure);
}
}
$output = $this->_updateMenuItem($args);
@ -1941,9 +1942,9 @@ class menuAdminController extends menu
}
// If the value of node->group_srls exists
$group_srls = ($node->group_srls) ? (is_array($node->group_srls) ? implode(',', $node->group_srls) : $node->group_srls) : '';
if($group_srls) {
$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
if($node->group_srls) {
$group_srls_exported = json_encode(array_values(is_array($node->group_srls) ? $node->group_srls : array_map('intval', explode(',', $node->group_srls))));
$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged&&%s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0);
}
else
{
@ -2034,10 +2035,10 @@ class menuAdminController extends menu
if($node->url) $child_output['url_list'][] = $node->url;
$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
// If node->group_srls value exists
$group_srls = ($node->group_srls) ? (is_array($node->group_srls) ? implode(',', $node->group_srls) : $node->group_srls) : '';
if($group_srls)
if($node->group_srls)
{
$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))', $group_srls, $group_srls == -1 ? 1 : 0);
$group_srls_exported = json_encode(array_values(is_array($node->group_srls) ? $node->group_srls : array_map('intval', explode(',', $node->group_srls))));
$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, %s)))||($is_logged && %s))', $group_srls_exported, $node->group_srls == '-1' ? 1 : 0);
}
else
{