diff --git a/app/call_broadcast/app_config.php b/app/call_broadcast/app_config.php
index 2be87c9ca5..a65d8ce9b8 100644
--- a/app/call_broadcast/app_config.php
+++ b/app/call_broadcast/app_config.php
@@ -80,6 +80,9 @@
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
+ $apps[$x]['permissions'][$y]['name'] = "call_broadcast_all";
+ $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+ $y++;
$apps[$x]['permissions'][$y]['name'] = "call_broadcast_send";
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index f7f8d8d961..15bba09512 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -90,17 +90,23 @@
//get the count
$sql = "select count(*) from v_call_broadcasts ";
- $sql .= "where domain_uuid = :domain_uuid ";
+ $sql .= "where true ";
+ if ($_GET['show'] != "all" || !permission_exists('call_broadcast_all')) {
+ $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+ $parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+ }
if (isset($sql_search)) {
$sql .= "and ".$sql_search;
}
$database = new database;
- $parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$num_rows = $database->select($sql, $parameters, 'column');
//prepare the paging
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
- $param = "&search=".$search;
+ $param = "&search=".urlencode($search);
+ if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) {
+ $param .= "&show=all";
+ }
$page = $_GET['page'];
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
@@ -137,6 +143,14 @@
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
}
echo "