diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php index f2aec142e4..914574a686 100644 --- a/app/call_broadcast/call_broadcast_delete.php +++ b/app/call_broadcast/call_broadcast_delete.php @@ -55,13 +55,9 @@ else { unset($sql); } -//redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "".$text['confirm-delete']."\n"; - echo "
\n"; - require_once "resources/footer.php"; - return; + +$_SESSION["message"] = $text['confirm-delete']; +header("Location: call_broadcast.php"); +return; ?> \ No newline at end of file diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 31737866fa..809779c36d 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -141,12 +141,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "".$text['confirm-add']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['confirm-add']; + header("Location: call_broadcast.php"); return; } //if ($action == "add") @@ -177,12 +173,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "".$text['confirm-update']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['confirm-update']; + header("Location: call_broadcast.php"); return; } //if ($action == "update") } //if ($_POST["persistformvar"] != "true") diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index 16dfaa0d57..9ebbdaf8e9 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -118,7 +118,7 @@ function cmd_async($cmd) { //get information over event socket if (!$fp) { require_once "resources/header.php"; - $msg = "
Connection to Event Socket failed.
"; + $msg = "
Connection to Event Socket failed.
"; echo "
\n"; echo "\n"; echo "\n"; @@ -179,13 +179,13 @@ function cmd_async($cmd) { //method 1 $response = trim(event_socket_request($fp, 'api '.$cmd)); - + //method 2 //cmd_async($_SESSION['switch']['bin']['dir']."/fs_cli -x \"".$cmd."\";"); //spread the calls out so that they are scheduled with different times if (strlen($broadcast_concurrent_limit) > 0 && strlen($broadcast_timeout) > 0) { - if ($broadcast_concurrent_limit == $count) { + if ($broadcast_concurrent_limit == $count) { $sched_seconds = $sched_seconds + $broadcast_timeout; $count=0; } @@ -195,7 +195,6 @@ function cmd_async($cmd) { } fclose($fp); - //echo "\n"; echo "
\n"; echo "
\n"; echo "\n"; @@ -203,19 +202,23 @@ function cmd_async($cmd) { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "
\n"; - echo " ".$text['label-call-broadcast']." $broadcast_name ".$text['label-has-been']."\n"; - echo "

\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo " ".$text['label-view-calls']."\n"; - echo "
\n"; + echo " ".$text['label-call-broadcast']." ".$broadcast_name." ".$text['label-has-been']."\n"; + + if (permission_exists('call_active_view')) { + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " ".$text['label-view-calls']."\n"; + echo "
\n"; + } + echo "
\n"; echo "
\n"; - + } //show the footer