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

issue 2363 api protocol modify.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11728 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-10-16 04:47:44 +00:00
parent c725edc586
commit 005dff1ad4
2 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1143,8 +1143,8 @@
public function procMenuAdminUpdateAuth()
{
$menuItemSrl = Context::get('menu_item_srl');
$exposureTarget = Context::get('exposure_target');
$exposureGroupList = Context::get('exposure_group_list');
$exposure = Context::get('exposure');
$htPerm = Context::get('htPerm');
$oMenuModel = &getAdminModel('menu');
$itemInfo = $oMenuModel->getMenuItemInfo($menuItemSrl);
@ -1152,24 +1152,20 @@
// Menu Exposure update
// if exposure target is only login user...
if($exposureTarget == -1)
if(!$exposure)
{
$args->group_srls = -1;
}
else if($exposureGroupList)
{
if(is_array($exposureGroupList))
{
$args->group_srls = implode(',', $exposureGroupList);
}
else
{
$args->group_srls = $exposureGroupList;
}
$args->group_srls = '';
}
else
{
$args->group_srls = '';
if(is_array($exposure))
{
$args->group_srls = implode(',', $exposure);
}
else if($exposure && !is_array($exposure))
{
$args->group_srls = -1;
}
}
$output = executeQuery('menu.updateMenuItem', $args);
@ -1194,25 +1190,21 @@
foreach($grantList AS $grantName=>$grantInfo)
{
// Get the default value
$default = Context::get($grantName.'_default');
// -1 = Log-in user only, -2 = site members only, 0 = all users
if(strlen($default))
if(!$htPerm[$grantName])
{
$grant->{$grantName}[] = $default;
continue;
}
// users in a particular group
if(is_array($htPerm[$grantName]))
{
$grant->{$grantName} = $htPerm[$grantName];
continue;
}
// -1 = Log-in user only, -2 = site members only, 0 = all users
else
{
$group_srls = Context::get($grantName);
if($group_srls) {
if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
else $group_srls = array($group_srls);
$grant->{$grantName} = $group_srls;
}
$grant->{$grantName}[] = $htPerm[$grantName];
continue;
}
$grant->{$group_srls} = array();