tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' 

Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
This commit is contained in:
Daniel Rodriguez 2019-06-10 16:05:21 +02:00
parent d14ad39785 ea4b24de2e
commit 81ac4e5bef
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_console/include/functions_config.php
View File

@ -2167,9 +2167,9 @@ function config_process_config()
if (!isset($config['ad_adv_perms'])) {
config_update_value('ad_adv_perms', '');
} else {
$temp_ad_adv_perms = [];
if (!json_decode(io_safe_output($config['ad_adv_perms']))) {
$temp_ad_adv_perms = [];
if (!isset($config['ad_adv_perms']) && $config['ad_adv_perms'] != '') {
if ($config['ad_adv_perms'] != '') {
$perms = explode(';', io_safe_output($config['ad_adv_perms']));
foreach ($perms as $ad_adv_perm) {
if (preg_match('/[\[\]]/', $ad_adv_perm)) {
@ -2232,22 +2232,26 @@ function config_process_config()
if (!empty($new_ad_adv_perms)) {
$temp_ad_adv_perms = json_encode($new_ad_adv_perms);
}
} else {
$temp_ad_adv_perms = '';
}
config_update_value('ad_adv_perms', $temp_ad_adv_perms);
} else {
$temp_ad_adv_perms = $config['ad_adv_perms'];
}
config_update_value('ad_adv_perms', $temp_ad_adv_perms);
}
if (!isset($config['ldap_adv_perms'])) {
config_update_value('ldap_adv_perms', '');
} else {
$temp_ldap_adv_perms = [];
if (!json_decode(io_safe_output($config['ldap_adv_perms']))) {
$temp_ldap_adv_perms = [];
if (!isset($config['ad_adv_perms']) && $config['ldap_adv_perms'] != '') {
if ($config['ldap_adv_perms'] != '') {
$perms = explode(';', io_safe_output($config['ldap_adv_perms']));
foreach ($perms as $ad_adv_perm) {
if (preg_match('/[\[\]]/', $ad_adv_perm)) {
$all_data = explode(',', io_safe_output($ad_adv_perm));
foreach ($perms as $ldap_adv_perm) {
if (preg_match('/[\[\]]/', $ldap_adv_perm)) {
$all_data = explode(',', io_safe_output($ldap_adv_perm));
$profile = $all_data[0];
$group_pnd = $all_data[1];
$groups_ad = str_replace(['[', ']'], '', $all_data[2]);
@ -2277,7 +2281,7 @@ function config_process_config()
'groups_ldap' => $groups_ldap,
];
} else {
$all_data = explode(',', io_safe_output($ad_adv_perm));
$all_data = explode(',', io_safe_output($ldap_adv_perm));
$profile = $all_data[0];
$group_pnd = $all_data[1];
$groups_ad = $all_data[2];
@ -2306,10 +2310,14 @@ function config_process_config()
if (!empty($new_ldap_adv_perms)) {
$temp_ldap_adv_perms = json_encode($new_ldap_adv_perms);
}
} else {
$temp_ldap_adv_perms = '';
}
config_update_value('ldap_adv_perms', $temp_ldap_adv_perms);
} else {
$temp_ldap_adv_perms = $config['ldap_adv_perms'];
}
config_update_value('ldap_adv_perms', $temp_ldap_adv_perms);
}
if (!isset($config['rpandora_server'])) {