dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
markjcrane 2016-02-16 13:05:48 -07:00
parent acda022e25 ea07e944a7
commit 11089f6be2
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/access_controls/access_control_delete.php
View File

@ -34,6 +34,9 @@ else {
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
unset($sql); unset($sql);
// clear cache
remove_config_from_cache('configuration:acl.conf');
} }
//redirect the user //redirect the user

2
app/access_controls/access_control_edit.php
View File

@ -74,6 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-add']; $_SESSION['message'] = $text['message-add'];
header('Location: access_controls.php'); header('Location: access_controls.php');
return; return;
@ -89,6 +90,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-update']; $_SESSION['message'] = $text['message-update'];
header('Location: access_controls.php'); header('Location: access_controls.php');
return; return;

1
app/access_controls/access_control_node_delete.php
View File

@ -27,6 +27,7 @@ else {
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf');
} }
//redirect the user //redirect the user

2
app/access_controls/access_control_node_edit.php
View File

@ -85,6 +85,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-add']; $_SESSION['message'] = $text['message-add'];
header('Location: access_control_edit.php?id='.$access_control_uuid); header('Location: access_control_edit.php?id='.$access_control_uuid);
return; return;
@ -102,6 +103,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-update']; $_SESSION['message'] = $text['message-update'];
header('Location: access_control_edit.php?id='.$access_control_uuid); header('Location: access_control_edit.php?id='.$access_control_uuid);
return; return;

4
app/conference_centers/resources/classes/conference_center.php
View File

@ -42,7 +42,7 @@
public function room_count() { public function room_count() {
//get the room count //get the room count
$not_admin = 1; $not_admin = 1;
if (if_permision("conference_room_view_all")) { if (permission_exists("conference_room_view_all")) {
$not_admin = 0; $not_admin = 0;
} }
$sql = "select count(*) as num_rows from v_conference_rooms as r, v_meetings as p "; $sql = "select count(*) as num_rows from v_conference_rooms as r, v_meetings as p ";
@ -79,7 +79,7 @@
public function rooms() { public function rooms() {
//get the list of rooms //get the list of rooms
$not_admin = 1; $not_admin = 1;
if (if_permision("conference_room_view_all")) { if (permission_exists("conference_room_view_all")) {
$not_admin = 0; $not_admin = 0;
} }
$fields = "r.domain_uuid, r.conference_room_uuid, r.conference_center_uuid, r.meeting_uuid, r.conference_room_name, max_members, "; $fields = "r.domain_uuid, r.conference_room_uuid, r.conference_center_uuid, r.meeting_uuid, r.conference_room_name, max_members, ";