From c4f44f9ad5ac17cb3bbc8795ac406ca6776b99fa Mon Sep 17 00:00:00 2001 From: fusionate Date: Mon, 29 May 2023 19:57:35 +0000 Subject: [PATCH] Dashboard - Recent Calls: Updates for PHP 8.1 --- .../resources/dashboard/recent_calls.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php index df498b3241..fe5c7311c8 100644 --- a/app/xml_cdr/resources/dashboard/recent_calls.php +++ b/app/xml_cdr/resources/dashboard/recent_calls.php @@ -161,28 +161,28 @@ $tmp_start_epoch = !empty($_SESSION['domain']['time_format']) && $_SESSION['domain']['time_format']['text'] == '12h' ? date("n/j g:ia", $row['start_epoch']) : date("n/j H:i", $row['start_epoch']); //determine name - $cdr_name = ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && is_array($assigned_extensions) && in_array($row['destination_number'], $assigned_extensions))) ? $row['caller_id_name'] : $row['destination_number']; + $cdr_name = ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && !empty($assigned_extensions) && is_array($assigned_extensions) && in_array($row['destination_number'], $assigned_extensions))) ? $row['caller_id_name'] : $row['destination_number']; //determine number to display - if ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && is_array($assigned_extensions) && in_array($row['destination_number'], $assigned_extensions))) { + if ($row['direction'] == 'inbound' || ($row['direction'] == 'local' && !empty($assigned_extensions) && is_array($assigned_extensions) && in_array($row['destination_number'], $assigned_extensions))) { $cdr_number = (is_numeric($row['caller_id_number'])) ? format_phone($row['caller_id_number']) : $row['caller_id_number']; $dest = $row['caller_id_number']; } - else if ($row['direction'] == 'outbound' || ($row['direction'] == 'local' && is_array($assigned_extensions) && in_array($row['caller_id_number'], $assigned_extensions))) { + else if ($row['direction'] == 'outbound' || ($row['direction'] == 'local' && !empty($assigned_extensions) && is_array($assigned_extensions) && in_array($row['caller_id_number'], $assigned_extensions))) { $cdr_number = (is_numeric($row['destination_number'])) ? format_phone($row['destination_number']) : $row['destination_number']; $dest = $row['destination_number']; } //set click-to-call variables if (permission_exists('click_to_call_call')) { $tr_link = "onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php". - "?src_cid_name=".urlencode($cdr_name). - "&src_cid_number=".urlencode($cdr_number). - "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name']). - "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number']). - "&src=".urlencode($_SESSION['user']['extension'][0]['user']). - "&dest=".urlencode($dest). - "&rec=".(isset($_SESSION['click_to_call']['record']['boolean'])?$_SESSION['click_to_call']['record']['boolean']:"false"). - "&ringback=".(isset($_SESSION['click_to_call']['ringback']['text'])?$_SESSION['click_to_call']['ringback']['text']:"us-ring"). - "&auto_answer=".(isset($_SESSION['click_to_call']['auto_answer']['boolean'])?$_SESSION['click_to_call']['auto_answer']['boolean']:"true"). + "?src_cid_name=".urlencode($cdr_name ?? ''). + "&src_cid_number=".urlencode($cdr_number ?? ''). + "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name'] ?? ''). + "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number'] ?? ''). + "&src=".urlencode($_SESSION['user']['extension'][0]['user'] ?? ''). + "&dest=".urlencode($dest ?? ''). + "&rec=".(isset($_SESSION['click_to_call']['record']['boolean']) ? $_SESSION['click_to_call']['record']['boolean'] : "false"). + "&ringback=".(isset($_SESSION['click_to_call']['ringback']['text']) ? $_SESSION['click_to_call']['ringback']['text'] : "us-ring"). + "&auto_answer=".(isset($_SESSION['click_to_call']['auto_answer']['boolean']) ? $_SESSION['click_to_call']['auto_answer']['boolean'] : "true"). "');\" ". "style='cursor: pointer;'"; } @@ -206,7 +206,7 @@ } } echo "\n"; - echo "".$cdr_number."\n"; + echo "".($cdr_number ?? '')."\n"; echo "".$tmp_start_epoch."\n"; echo "\n"; @@ -224,4 +224,4 @@ echo ""; echo "\n"; -?> +?> \ No newline at end of file