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-fix-special-day-related-api' into 'develop' 

Fixed wrong behavior of special_day related APIs.

See merge request artica/pandorafms!3787
This commit is contained in:
Daniel Rodriguez 2021-02-01 13:41:20 +01:00
parent 897064183c 4311d1caac
commit 231981bcc9
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/functions_api.php
View File

@ -13090,7 +13090,8 @@ function api_get_special_days($thrash1, $thrash2, $other, $thrash3)
$separator = $other['data'][0]; $separator = $other['data'][0];
} }
$filter = false; $user_groups = implode(',', array_keys(users_get_groups($config['id_user'], 'LM')));
$filter = "id_group IN ($user_groups)";
$special_days = @db_get_all_rows_filter('talert_special_days', $filter); $special_days = @db_get_all_rows_filter('talert_special_days', $filter);
@ -13127,17 +13128,17 @@ function api_set_create_special_day($thrash1, $thrash2, $other, $thrash3)
return; return;
} }
if (!check_acl($config['id_user'], 0, 'LM')) {
returnError('forbidden', 'string');
return;
}
$special_day = $other['data'][0]; $special_day = $other['data'][0];
$same_day = $other['data'][1]; $same_day = $other['data'][1];
$description = $other['data'][2]; $description = $other['data'][2];
$idGroup = $other['data'][3]; $idGroup = $other['data'][3];
$check_id_special_day = db_get_value('id', 'talert_special_days', 'date', $special_day); if (!check_acl($config['id_user'], $idGroup, 'LM', true)) {
returnError('forbidden', 'string');
return;
}
$check_id_special_day = db_get_value_filter('id', 'talert_special_days', ['date' => $special_day, 'id_group' => $idGroup]);
if ($check_id_special_day) { if ($check_id_special_day) {
returnError('error_create_special_day', __('Error creating special day. Specified day already exists.')); returnError('error_create_special_day', __('Error creating special day. Specified day already exists.'));
@ -13155,7 +13156,7 @@ function api_set_create_special_day($thrash1, $thrash2, $other, $thrash3)
} else { } else {
$group = groups_get_group_by_id($idGroup); $group = groups_get_group_by_id($idGroup);
if ($group == false) { if ($idGroup != 0 && $group == false) {
returnError('error_create_special_day', __('Error creating special day. Id_group doesn\'t exist.')); returnError('error_create_special_day', __('Error creating special day. Id_group doesn\'t exist.'));
return; return;
} }
@ -13641,16 +13642,16 @@ function api_set_update_special_day($id_special_day, $thrash2, $other, $thrash3)
return; return;
} }
if (!check_acl($config['id_user'], 0, 'LM')) {
returnError('forbidden', 'string');
return;
}
$special_day = $other['data'][0]; $special_day = $other['data'][0];
$same_day = $other['data'][1]; $same_day = $other['data'][1];
$description = $other['data'][2]; $description = $other['data'][2];
$idGroup = $other['data'][3]; $idGroup = $other['data'][3];
if (!check_acl($config['id_user'], $idGroup, 'LM', true)) {
returnError('forbidden', 'string');
return;
}
if ($id_special_day == '') { if ($id_special_day == '') {
returnError('error_update_special_day', __('Error updating special day. Id cannot be left blank.')); returnError('error_update_special_day', __('Error updating special day. Id cannot be left blank.'));
return; return;
@ -13663,6 +13664,13 @@ function api_set_update_special_day($id_special_day, $thrash2, $other, $thrash3)
return; return;
} }
$id_group_org = db_get_value('id_group', 'talert_special_days', 'id', $id_special_day);
if (!check_acl($config['id_user'], $id_group_org, 'LM', true)) {
returnError('forbidden', 'string');
return;
}
if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $special_day)) { if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $special_day)) {
returnError('error_update_special_day', __('Error updating special day. Invalid date format.')); returnError('error_update_special_day', __('Error updating special day. Invalid date format.'));
return; return;
@ -13725,6 +13733,12 @@ function api_set_delete_special_day($id_special_day, $thrash2, $thrash3, $thrash
return; return;
} }
$id_group = db_get_value('id_group', 'talert_special_days', 'id', $id_special_day);
if (!check_acl($config['id_user'], $id_group, 'LM', true)) {
returnError('forbidden', 'string');
return;
}
$return = alerts_delete_alert_special_day($id_special_day); $return = alerts_delete_alert_special_day($id_special_day);
if (is_error($return)) { if (is_error($return)) {