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

Minor mods to Access Controls, Bridges, Call Block and Call Broadcast lists and classes.

This commit is contained in:
Nate 2019-10-25 19:40:28 -06:00
parent dc1ba5299c
commit 0c584db194
8 changed files with 84 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/access_controls/access_controls.php
View File

@ -130,8 +130,8 @@
if (permission_exists('access_control_delete') && $access_controls) { if (permission_exists('access_control_delete') && $access_controls) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]); echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
} }
echo " <form id='form_search' class='inline' method='get'>\n"; echo "<form id='form_search' class='inline' method='get'>\n";
echo " <input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>"; echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') { if ($paging_controls_mini != '') {

38
app/access_controls/resources/classes/access_controls.php
View File

@ -77,6 +77,10 @@ if (!class_exists('access_controls')) {
//delete the checked rows //delete the checked rows
if (is_array($array) && @sizeof($array) != 0) { if (is_array($array) && @sizeof($array) != 0) {
//grant temporary permissions
$p = new permissions;
$p->add('access_control_node_delete', 'temp');
//execute delete //execute delete
$database = new database; $database = new database;
$database->app_name = $this->app_name; $database->app_name = $this->app_name;
@ -84,6 +88,9 @@ if (!class_exists('access_controls')) {
$database->delete($array); $database->delete($array);
unset($array); unset($array);
//revoke temporary permissions
$p->delete('access_control_node_delete', 'temp');
//set message //set message
message::add($text['message-delete']); message::add($text['message-delete']);
} }
@ -122,6 +129,8 @@ if (!class_exists('access_controls')) {
//create insert array from existing data //create insert array from existing data
if (is_array($record_uuids) && @sizeof($record_uuids) != 0) { if (is_array($record_uuids) && @sizeof($record_uuids) != 0) {
//primary table
$sql = "select * from v_".$this->table." "; $sql = "select * from v_".$this->table." ";
$sql .= "where ".implode(' or ', $record_uuids)." "; $sql .= "where ".implode(' or ', $record_uuids)." ";
$database = new database; $database = new database;
@ -129,12 +138,15 @@ if (!class_exists('access_controls')) {
if (is_array($rows) && @sizeof($rows) != 0) { if (is_array($rows) && @sizeof($rows) != 0) {
$y = 0; $y = 0;
foreach ($rows as $x => $row) { foreach ($rows as $x => $row) {
//primary table
$primary_uuid = uuid(); $primary_uuid = uuid();
//copy data
$array[$this->table][$x] = $row;
//overwrite
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $primary_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'].')'); $array[$this->table][$x]['access_control_description'] = trim($row['access_control_description'].' ('.$text['label-copy'].')');
//sub table //sub table
$sql_2 = "select * from v_access_control_nodes where access_control_uuid = :access_control_uuid"; $sql_2 = "select * from v_access_control_nodes where access_control_uuid = :access_control_uuid";
$parameters_2['access_control_uuid'] = $row['access_control_uuid']; $parameters_2['access_control_uuid'] = $row['access_control_uuid'];
@ -142,13 +154,16 @@ if (!class_exists('access_controls')) {
$rows_2 = $database->select($sql_2, $parameters_2, 'all'); $rows_2 = $database->select($sql_2, $parameters_2, 'all');
if (is_array($rows_2) && @sizeof($rows_2) != 0) { if (is_array($rows_2) && @sizeof($rows_2) != 0) {
foreach ($rows_2 as $row_2) { foreach ($rows_2 as $row_2) {
//copy data
$array['access_control_nodes'][$y] = $row_2;
//overwrite
$array['access_control_nodes'][$y]['access_control_node_uuid'] = 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']; //increment
$array['access_control_nodes'][$y]['node_cidr'] = $row_2['node_cidr'];
$array['access_control_nodes'][$y]['node_domain'] = $row_2['node_domain'];
$array['access_control_nodes'][$y]['node_description'] = $row_2['node_description'];
$y++; $y++;
} }
} }
unset($sql_2, $parameters_2, $rows_2, $row_2); unset($sql_2, $parameters_2, $rows_2, $row_2);
@ -160,6 +175,10 @@ if (!class_exists('access_controls')) {
//save the changes and set the message //save the changes and set the message
if (is_array($array) && @sizeof($array) != 0) { if (is_array($array) && @sizeof($array) != 0) {
//grant temporary permissions
$p = new permissions;
$p->add('access_control_node_add', 'temp');
//save the array //save the array
$database = new database; $database = new database;
$database->app_name = $this->app_name; $database->app_name = $this->app_name;
@ -167,6 +186,9 @@ if (!class_exists('access_controls')) {
$database->save($array); $database->save($array);
unset($array); unset($array);
//revoke temporary permissions
$p->delete('access_control_node_add', 'temp');
//set message //set message
message::add($text['message-copy']); message::add($text['message-copy']);

4
app/bridges/bridges.php
View File

@ -157,7 +157,7 @@
if (permission_exists('bridge_delete') && $bridges) { if (permission_exists('bridge_delete') && $bridges) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]); echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
} }
echo " <form id='form_search' class='inline' method='get'>\n"; echo "<form id='form_search' class='inline' method='get'>\n";
if (permission_exists('bridge_all')) { if (permission_exists('bridge_all')) {
if ($_GET['show'] == 'all') { if ($_GET['show'] == 'all') {
echo " <input type='hidden' name='show' value='all'>"; echo " <input type='hidden' name='show' value='all'>";
@ -166,7 +166,7 @@
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']); echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
} }
} }
echo " <input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>"; echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') { if ($paging_controls_mini != '') {

13
app/bridges/resources/classes/bridges.php
View File

@ -199,13 +199,14 @@ if (!class_exists('bridges')) {
$rows = $database->select($sql, $parameters, 'all'); $rows = $database->select($sql, $parameters, 'all');
if (is_array($rows) && @sizeof($rows) != 0) { if (is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $x => $row) { foreach ($rows as $x => $row) {
$new_uuid = uuid();
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $new_uuid; //copy data
$array[$this->table][$x]['domain_uuid'] = $row['domain_uuid']; $array[$this->table][$x] = $row;
$array[$this->table][$x]['bridge_name'] = $row['bridge_name'];
$array[$this->table][$x]['bridge_destination'] = $row['bridge_destination']; //overwrite
$array[$this->table][$x]['bridge_enabled'] = $row['bridge_enabled']; $array[$this->table][$x][$this->uuid_prefix.'uuid'] = uuid();
$array[$this->table][$x]['bridge_description'] = trim($row['bridge_description'].' ('.$text['label-copy'].')'); $array[$this->table][$x]['bridge_description'] = trim($row['bridge_description'].' ('.$text['label-copy'].')');
} }
} }
unset($sql, $parameters, $rows, $row); unset($sql, $parameters, $rows, $row);

4
app/call_block/call_block.php
View File

@ -148,8 +148,8 @@
if (permission_exists('call_block_delete') && $result) { if (permission_exists('call_block_delete') && $result) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]); echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
} }
echo " <form id='form_search' class='inline' method='get'>\n"; echo "<form id='form_search' class='inline' method='get'>\n";
echo " <input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>"; echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_block.php','style'=>($search == '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_block.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') { if ($paging_controls_mini != '') {

16
app/call_block/resources/classes/call_block.php
View File

@ -199,16 +199,14 @@ if (!class_exists('call_block')) {
$rows = $database->select($sql, $parameters, 'all'); $rows = $database->select($sql, $parameters, 'all');
if (is_array($rows) && @sizeof($rows) != 0) { if (is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $x => $row) { foreach ($rows as $x => $row) {
$new_uuid = uuid();
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $new_uuid; //copy data
$array[$this->table][$x]['domain_uuid'] = $row['domain_uuid']; $array[$this->table][$x] = $row;
$array[$this->table][$x]['call_block_name'] = $row['call_block_name'];
$array[$this->table][$x]['call_block_number'] = $row['call_block_number']; //overwrite
$array[$this->table][$x]['call_block_count'] = 0; $array[$this->table][$x][$this->uuid_prefix.'uuid'] = uuid();
$array[$this->table][$x]['call_block_action'] = $row['call_block_action'];
$array[$this->table][$x]['date_added'] = $row['date_added'];
$array[$this->table][$x]['call_block_enabled'] = $row['call_block_enabled'];
$array[$this->table][$x]['call_block_description'] = trim($row['call_block_description'].' ('.$text['label-copy'].')'); $array[$this->table][$x]['call_block_description'] = trim($row['call_block_description'].' ('.$text['label-copy'].')');
} }
} }
unset($sql, $parameters, $rows, $row); unset($sql, $parameters, $rows, $row);

4
app/call_broadcast/call_broadcast.php
View File

@ -135,8 +135,8 @@
if (permission_exists('call_broadcast_delete')) { if (permission_exists('call_broadcast_delete')) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]); echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
} }
echo " <form id='form_search' class='inline' method='get'>\n"; echo "<form id='form_search' class='inline' method='get'>\n";
echo " <input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>"; echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') { if ($paging_controls_mini != '') {

21
app/call_broadcast/resources/classes/call_broadcast.php
View File

@ -128,21 +128,14 @@ if (!class_exists('call_broadcast')) {
$rows = $database->select($sql, $parameters, 'all'); $rows = $database->select($sql, $parameters, 'all');
if (is_array($rows) && @sizeof($rows) != 0) { if (is_array($rows) && @sizeof($rows) != 0) {
foreach ($rows as $x => $row) { foreach ($rows as $x => $row) {
$new_uuid = uuid();
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $new_uuid; //copy data
$array[$this->table][$x]['domain_uuid'] = $row['domain_uuid']; $array[$this->table][$x] = $row;
$array[$this->table][$x]['broadcast_name'] = $row['broadcast_name'];
//overwrite
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = uuid();
$array[$this->table][$x]['broadcast_description'] = trim($row['broadcast_description'].' ('.$text['label-copy'].')'); $array[$this->table][$x]['broadcast_description'] = trim($row['broadcast_description'].' ('.$text['label-copy'].')');
$array[$this->table][$x]['broadcast_timeout'] = $row['broadcast_timeout'];
$array[$this->table][$x]['broadcast_concurrent_limit'] = $row['broadcast_concurrent_limit'];
$array[$this->table][$x]['recording_uuid'] = $row['recording_uuid'];
$array[$this->table][$x]['broadcast_caller_id_name'] = $row['broadcast_caller_id_name'];
$array[$this->table][$x]['broadcast_caller_id_number'] = $row['broadcast_caller_id_number'];
$array[$this->table][$x]['broadcast_destination_type'] = $row['broadcast_destination_type'];
$array[$this->table][$x]['broadcast_phone_numbers'] = $row['broadcast_phone_numbers'];
$array[$this->table][$x]['broadcast_avmd'] = $row['broadcast_avmd'];
$array[$this->table][$x]['broadcast_destination_data'] = $row['broadcast_destination_data'];
$array[$this->table][$x]['broadcast_accountcode'] = $row['broadcast_accountcode'];
} }
} }
unset($sql, $parameters, $rows, $row); unset($sql, $parameters, $rows, $row);