diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index db1eeec77c..b3983ef308 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2023 the Initial Developer. All Rights Reserved. Contributor(s): @@ -126,7 +126,7 @@ $offset = $rows_per_page * $page; //get the call broadcasts - $sql = "select call_broadcast_uuid, domain_uuid, broadcast_name "; + $sql = "select call_broadcast_uuid, domain_uuid, broadcast_name, "; $sql .= "broadcast_description, broadcast_start_time, broadcast_timeout, "; $sql .= "broadcast_concurrent_limit, recording_uuid, broadcast_caller_id_name, "; $sql .= "broadcast_caller_id_number, broadcast_destination_type, broadcast_phone_numbers, "; diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 4840890ca2..364dd446ee 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -144,7 +144,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { //delete the call broadcast if (permission_exists('call_broadcast_delete')) { - if ($_POST['action'] == 'delete' && is_uuid($call_broadcast_uuid)) { + if (!empty($_POST['action']) && $_POST['action'] == 'delete' && is_uuid($call_broadcast_uuid)) { //prepare $call_broadcasts[0]['checked'] = 'true'; $call_broadcasts[0]['uuid'] = $call_broadcast_uuid; @@ -227,7 +227,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { if (!empty($array)) { //add file selection and download sample - $file_res = upload_file($sql, $broadcast_phone_numbers); + $file_res = upload_file($sql ?? '', $broadcast_phone_numbers); if ($file_res['code'] != true) { $_SESSION["message_mood"] = "negative"; $_SESSION["message"] = $text['file-error']; @@ -538,11 +538,10 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { echo "\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "
\n"; echo $text['description-avmd']."\n"; echo "\n"; echo "\n"; @@ -584,4 +583,4 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { //include the footer require_once "resources/footer.php"; -?> +?> \ No newline at end of file diff --git a/app/call_broadcast/resources/classes/call_broadcast.php b/app/call_broadcast/resources/classes/call_broadcast.php index 110eaa3111..4b3f45cc20 100644 --- a/app/call_broadcast/resources/classes/call_broadcast.php +++ b/app/call_broadcast/resources/classes/call_broadcast.php @@ -1,5 +1,30 @@ + Portions created by the Initial Developer are Copyright (C) 2008-2023 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ + /** * call broadcast class * @@ -56,7 +81,7 @@ if (!class_exists('call_broadcast')) { //build the delete array foreach($records as $x => $record) { - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $array[$this->table][$x][$this->uuid_prefix.'uuid'] = $record['uuid']; $array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid']; } @@ -103,7 +128,7 @@ if (!class_exists('call_broadcast')) { //get checked records foreach($records as $x => $record) { - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if (!empty($record['checked']) && $record['checked'] == 'true' && is_uuid($record['uuid'])) { $uuids[] = "'".$record['uuid']."'"; } }