diff --git a/app/access_controls/access_control_delete.php b/app/access_controls/access_control_delete.php index 2996cc85af..9b703f3ac3 100644 --- a/app/access_controls/access_control_delete.php +++ b/app/access_controls/access_control_delete.php @@ -34,6 +34,9 @@ else { $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); unset($sql); + + // clear cache + remove_config_from_cache('configuration:acl.conf'); } //redirect the user diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index 798e2fb4c6..d867fe507c 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -74,6 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); + remove_config_from_cache('configuration:acl.conf'); $_SESSION['message'] = $text['message-add']; header('Location: access_controls.php'); return; @@ -89,6 +90,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); + remove_config_from_cache('configuration:acl.conf'); $_SESSION['message'] = $text['message-update']; header('Location: access_controls.php'); return; diff --git a/app/access_controls/access_control_node_delete.php b/app/access_controls/access_control_node_delete.php index 4329ed4325..fec0b9bd20 100644 --- a/app/access_controls/access_control_node_delete.php +++ b/app/access_controls/access_control_node_delete.php @@ -27,6 +27,7 @@ else { $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); unset($sql); + remove_config_from_cache('configuration:acl.conf'); } //redirect the user diff --git a/app/access_controls/access_control_node_edit.php b/app/access_controls/access_control_node_edit.php index d40622a8ec..2c4d0bdea1 100644 --- a/app/access_controls/access_control_node_edit.php +++ b/app/access_controls/access_control_node_edit.php @@ -85,6 +85,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); + remove_config_from_cache('configuration:acl.conf'); $_SESSION['message'] = $text['message-add']; header('Location: access_control_edit.php?id='.$access_control_uuid); return; @@ -102,6 +103,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); + remove_config_from_cache('configuration:acl.conf'); $_SESSION['message'] = $text['message-update']; header('Location: access_control_edit.php?id='.$access_control_uuid); return; diff --git a/app/conference_centers/resources/classes/conference_center.php b/app/conference_centers/resources/classes/conference_center.php index 92d1c7768b..63089536f8 100644 --- a/app/conference_centers/resources/classes/conference_center.php +++ b/app/conference_centers/resources/classes/conference_center.php @@ -42,7 +42,7 @@ public function room_count() { //get the room count $not_admin = 1; - if (if_permision("conference_room_view_all")) { + if (permission_exists("conference_room_view_all")) { $not_admin = 0; } $sql = "select count(*) as num_rows from v_conference_rooms as r, v_meetings as p "; @@ -79,7 +79,7 @@ public function rooms() { //get the list of rooms $not_admin = 1; - if (if_permision("conference_room_view_all")) { + if (permission_exists("conference_room_view_all")) { $not_admin = 0; } $fields = "r.domain_uuid, r.conference_room_uuid, r.conference_center_uuid, r.meeting_uuid, r.conference_room_name, max_members, ";