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

Updates to Access Controls, Bridges, and Call Block.

Browse Source
This commit is contained in:
Nate
2019-10-21 17:03:59 -06:00
parent be15980392
commit 17ac712cc8
9 changed files with 317 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/access_controls/access_control_edit.php
+29 -9
View File
@@ -51,6 +51,21 @@
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//delete the access control
if (permission_exists('access_control_delete')) {
if ($_POST['action'] == 'delete' && is_uuid($access_control_uuid)) {
//prepare
$array[0]['checked'] = 'true';
$array[0]['uuid'] = $access_control_uuid;
//delete
$obj = new access_controls;
$obj->delete($array);
//redirect
header('Location: access_controls.php');
exit;
}
}
//get the primary key
if ($action == "update") {
$access_control_uuid = $_POST["access_control_uuid"];
@@ -90,15 +105,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$execute = true;
$access_control_uuid = uuid();
//add the message
//set the message
message::add($text['message-add']);
//set redirect url
$redirect_url = 'access_control_edit.php?id='.$access_control_uuid;
}
if ($action == "update" && permission_exists('access_control_edit')) {
$execute = true;
//$access_control_uuid //already set
//add the message
//set the message
message::add($text['message-update']);
}
@@ -123,11 +140,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
//redirect the user
header("Location: access_controls.php");
return;
header('Location: '.($redirect_url ? $redirect_url : 'access_controls.php'));
exit;
}
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
}
//pre-populate the form
if (count($_GET) > 0 && $_POST["persistformvar"] != "true" && is_uuid($_GET["id"])) {
@@ -158,7 +175,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-access_control']."</b><br><br></td>\n";
echo "<td width='70%' align='right' valign='top'>\n";
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='access_controls.php'\" value='".$text['button-back']."'>";
echo " <input type='button' class='btn' style='margin-right: 15px;' name='' alt='".$text['button-back']."' onclick=\"window.location='access_controls.php'\" value='".$text['button-back']."'>";
if ($action == 'update' && permission_exists('access_control_delete')) {
echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','onclick'=>"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }",'style'=>'margin-right: 15px;']);
}
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
echo "</td>\n";
echo "</tr>\n";
@@ -229,4 +249,4 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//include the footer
require_once "resources/footer.php";
?>
?>
app/access_controls/access_controls.php
+4 -5
View File
@@ -78,11 +78,10 @@
$search = strtolower($_GET["search"]);
if (strlen($search) > 0) {
$sql_search = " (";
$sql_search .= " lower(access_control_name) like :search ";
$sql_search .= " or lower(access_control_default) like :search ";
$sql_search .= " or lower(access_control_description) like :search ";
$sql_search .= "lower(access_control_name) like :search ";
$sql_search .= "or lower(access_control_default) like :search ";
$sql_search .= "or lower(access_control_description) like :search ";
$sql_search .= ") ";
$parameters['search'] = '%'.$search.'%';
}
@@ -169,7 +168,7 @@
echo "<tr class='list-row' href='".$list_row_url."'>\n";
echo " <td class='checkbox'>\n";
echo " <input type='checkbox' name='access_controls[".$x."][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
echo " <input type='hidden' name='access_controls[".$x."][access_control_uuid]' value='".escape($row['access_control_uuid'])."' />\n";
echo " <input type='hidden' name='access_controls[".$x."][uuid]' value='".escape($row['access_control_uuid'])."' />\n";
echo " </td>\n";
echo " <td><a href='".$list_row_url."'>".escape($row['access_control_name'])."</a></td>\n";
echo " <td>".escape($row['access_control_default'])."</td>\n";
app/access_controls/resources/classes/access_controls.php
+68 -46
View File
@@ -9,14 +9,34 @@ if (!class_exists('access_controls')) {
class access_controls {
/**
* Called when the object is created
* declare private variables
*/
private $app_name;
private $app_uuid;
private $permission_prefix;
private $list_page;
private $table;
private $uuid_prefix;
private $enabled_prefix;
/**
* called when the object is created
*/
public function __construct() {
//assign private variables
$this->app_name = 'access_controls';
$this->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
$this->permission_prefix = 'access_control';
$this->list_page = 'access_controls.php';
$this->table = 'access_controls';
$this->uuid_prefix = 'access_control_';
$this->enabled_prefix = 'access_control_';
}
/**
* Called when there are no references to a particular object
* called when there are no references to a particular object
* unset the variables used in the class
*/
public function __destruct() {
@@ -26,10 +46,10 @@ if (!class_exists('access_controls')) {
}
/**
* delete access controls
* delete records
*/
public function delete($access_controls) {
if (permission_exists('access_control_delete') && permission_exists('access_control_node_delete')) {
public function delete($records) {
if (permission_exists($this->permission_prefix.'_delete')) {
//add multi-lingual support
$language = new text;
@@ -39,40 +59,44 @@ if (!class_exists('access_controls')) {
$token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) {
message::add($text['message-invalid_token'],'negative');
header('Location: access_controls.php');
header('Location: '.$this->list_page);
exit;
}
//delete multiple access controls
if (is_array($access_controls) && @sizeof($access_controls) != 0) {
//delete multiple records
if (is_array($records) && @sizeof($records) != 0) {
//build the delete array
foreach($access_controls as $x => $row) {
if ($row['checked'] == 'true' && is_uuid($row['access_control_uuid'])) {
$array['access_controls'][$x]['access_control_uuid'] = $row['access_control_uuid'];
$array['access_control_nodes'][$x]['access_control_uuid'] = $row['access_control_uuid'];
foreach($records as $x => $record) {
if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $record['uuid'];
$array['access_control_nodes'][$x][$this->uuid_prefix.'uuid'] = $record['uuid'];
}
}
//delete the checked rows
if (is_array($array) && @sizeof($array) != 0) {
//execute delete
$database = new database;
$database->app_name = 'access_controls';
$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->delete($array);
unset($array);
//set message
message::add($text['message-delete']);
}
unset($access_controls);
unset($records);
}
}
}
/**
* copy access controls
* copy records
*/
public function copy($access_controls) {
if (permission_exists('access_control_add') && permission_exists('access_control_node_add')) {
public function copy($records) {
if (permission_exists($this->permission_prefix.'_add')) {
//add multi-lingual support
$language = new text;
@@ -82,44 +106,44 @@ if (!class_exists('access_controls')) {
$token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) {
message::add($text['message-invalid_token'],'negative');
header('Location: access_controls.php');
header('Location: '.$this->list_page);
exit;
}
//copy the checked access controls
if (is_array($access_controls) && @sizeof($access_controls) != 0) {
//copy the checked records
if (is_array($records) && @sizeof($records) != 0) {
//get checked access controls
foreach($access_controls as $x => $row) {
if ($row['checked'] == 'true' && is_uuid($row['access_control_uuid'])) {
$access_control_uuids[] = "access_control_uuid = '".$row['access_control_uuid']."'";
//get checked records
foreach($records as $x => $record) {
if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
$record_uuids[] = $this->uuid_prefix."uuid = '".$record['uuid']."'";
}
}
//create insert array from existing data
if (is_array($access_control_uuids) && @sizeof($access_control_uuids) != 0) {
$sql = "select * from v_access_controls ";
$sql .= "where ".implode(' or ', $access_control_uuids)." ";
if (is_array($record_uuids) && @sizeof($record_uuids) != 0) {
$sql = "select * from v_".$this->table." ";
$sql .= "where ".implode(' or ', $record_uuids)." ";
$database = new database;
$rows = $database->select($sql, $parameters, 'all');
if (is_array($rows) && @sizeof($rows) != 0) {
$y = 0;
foreach ($rows as $x => $row) {
//access control
$access_control_uuid = uuid();
$array['access_controls'][$x]['access_control_uuid'] = $access_control_uuid;
$array['access_controls'][$x]['access_control_name'] = $row['access_control_name'];
$array['access_controls'][$x]['access_control_default'] = $row['access_control_default'];
$array['access_controls'][$x]['access_control_description'] = trim($row['access_control_description'].' ('.$text['label-copy'].')');
//access control nodes
//primary table
$primary_uuid = uuid();
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $primary_uuid;
$array[$this->table][$x]['access_control_name'] = $row['access_control_name'];
$array[$this->table][$x]['access_control_default'] = $row['access_control_default'];
$array[$this->table][$x]['access_control_description'] = trim($row['access_control_description'].' ('.$text['label-copy'].')');
//sub table
$sql_2 = "select * from v_access_control_nodes where access_control_uuid = :access_control_uuid";
$parameters_2['access_control_uuid'] = $row['access_control_uuid'];
$database = new database;
$rows_2 = $database->select($sql_2, $parameters_2, 'all');
if (is_array($rows_2) && @sizeof($rows_2) != 0) {
foreach ($rows_2 as $row_2) {
$access_control_node_uuid = uuid();
$array['access_control_nodes'][$y]['access_control_node_uuid'] = $access_control_node_uuid;
$array['access_control_nodes'][$y]['access_control_uuid'] = $access_control_uuid;
$array['access_control_nodes'][$y]['access_control_node_uuid'] = uuid();
$array['access_control_nodes'][$y]['access_control_uuid'] = $primary_uuid;
$array['access_control_nodes'][$y]['node_type'] = $row_2['node_type'];
$array['access_control_nodes'][$y]['node_cidr'] = $row_2['node_cidr'];
$array['access_control_nodes'][$y]['node_domain'] = $row_2['node_domain'];
@@ -132,19 +156,22 @@ if (!class_exists('access_controls')) {
}
unset($sql, $parameters, $rows, $row);
}
//save the changes and set the message
if (is_array($array) && @sizeof($array) != 0) {
//save the array
$database = new database;
$database->app_name = 'access_controls';
$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->save($array);
unset($array);
//set message
message::add($text['message-copy']);
}
unset($access_controls);
unset($records);
}
}
@@ -153,9 +180,4 @@ if (!class_exists('access_controls')) {
}
}
/*
$obj = new access_controls;
$obj->delete();
*/
?>