lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix getAllowedPages / privileges

Browse Source
This commit is contained in:
Ad Schellevis 2015-04-14 08:26:54 +00:00
parent b79592582e
commit ee7be889ed
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/auth.inc
View File

@ -536,7 +536,7 @@ function local_user_get_groups($user, $all = false)
}
foreach ($config['system']['group'] as $group) {
if (is_array($group['member'])) {
if (isset($group['member'])) {
if (in_array($user['uid'], $group['member']) || ($group['name'] == "all" && $all)) {
$groups[] = $group['name'];
}

6
src/etc/inc/priv.defs.inc
View File

@ -1462,3 +1462,9 @@ $priv_list['user-pptp-dialin']['descr'] = "Indicates whether the user is allowed
$priv_list['user-pppoe-dialin'] = array();
$priv_list['user-pppoe-dialin']['name'] = "User - VPN - PPPOE Dialin";
$priv_list['user-pppoe-dialin']['descr'] = "Indicates whether the user is allowed to dial in via PPPOE";
// sort by name ( case insensitive )
uasort($priv_list,function($a,$b) {
return strcasecmp($a["name"], $b["name"]) ;
});

26
src/etc/inc/priv.inc
View File

@ -32,12 +32,6 @@
require_once 'priv.defs.inc';
if (is_array($priv_list)) {
usort($priv_list, function($a, $b) {
return strcasecmp($a['name'], $b['name']);
});
}
function cmp_page_matches($page, & $matches, $fullwc = true) {
// $dbg_matches = implode(",", $matches);
@ -172,7 +166,7 @@ function isAllowedPage($page)
function getPrivPages(& $entry, & $allowed_pages) {
global $priv_list;
if (!is_array($entry['priv']))
if (!isset($entry['priv']) || !is_array($entry['priv']))
return;
foreach ($entry['priv'] as $pname) {
@ -198,7 +192,11 @@ function getAllowedPages($username) {
$allowed_pages = array();
$allowed_groups = array();
$authcfg = auth_get_authserver($config['system']['webgui']['authmode']);
if (isset($config['system']['webgui']['authmode'])) {
$authcfg = auth_get_authserver($config['system']['webgui']['authmode']);
} else {
$authcfg['type'] = 'local';
}
// obtain ldap groups if we are in ldap mode
if ($authcfg['type'] == "ldap")
$allowed_groups = @ldap_get_groups($username, $authcfg);
@ -208,15 +206,17 @@ function getAllowedPages($username) {
getPrivPages($local_user, $allowed_pages);
// obtain local groups if we have a local user
if ($local_user)
$allowed_groups = local_user_get_groups($local_user);
$allowed_groups = local_user_get_groups($local_user);
}
// build a list of allowed pages
if (is_array($config['system']['group']) && is_array($allowed_groups))
foreach ($config['system']['group'] as $group)
if (in_array($group['name'], $allowed_groups))
if (is_array($config['system']['group']) && is_array($allowed_groups)) {
foreach ($config['system']['group'] as $group) {
if (in_array($group['name'], $allowed_groups)) {
getPrivPages($group, $allowed_pages);
}
}
}
// $dbg_pages = implode(",", $allowed_pages);
// $dbg_groups = implode(",", $allowed_groups);