diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index ab37718066..d6321fc5ee 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -27,7 +27,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2022 + Portions created by the Initial Developer are Copyright (C) 2008-2023 the Initial Developer. All Rights Reserved. Contributor(s): @@ -57,10 +57,10 @@ if (count($_GET) > 0) { $cmd = trim($_GET["cmd"]); $name = trim($_GET["name"]); - $uuid = trim($_GET["uuid"]); + $uuid = trim($_GET["uuid"] ?? ''); $data = trim($_GET["data"]); - $id = trim($_GET["id"]); - $direction = trim($_GET["direction"]); + $id = trim($_GET["id"] ?? ''); + $direction = trim($_GET["direction"] ?? ''); } //authorized commands diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index 59ef97d757..1ad9effd88 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.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-2019 + Portions created by the Initial Developer are Copyright (C) 2008-2023 the Initial Developer. All Rights Reserved. Contributor(s): @@ -117,17 +117,19 @@ $recording_dir = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/archive/'.date("Y").'/'.date("M").'/'.date("d"); $recording_name = ''; - if (file_exists($recording_dir.'/'.$row['uuid'].'.wav')) { - $recording_name = $session_uuid.".wav"; - } - elseif (file_exists($recording_dir.'/'.$row['uuid'].'.mp3')) { - $recording_name = $session_uuid.".mp3"; + if (!empty($recording_dir) && !empty($row['uuid'])) { + if (file_exists($recording_dir.'/'.$row['uuid'].'.wav')) { + $recording_name = $session_uuid.".wav"; + } + else if (file_exists($recording_dir.'/'.$row['uuid'].'.mp3')) { + $recording_name = $session_uuid.".mp3"; + } } - echo "  "; + echo "  "; if (permission_exists('conference_interactive_lock')) { - if ($locked == 'true') { + if (!empty($locked) && $locked == 'true') { echo button::create(['type'=>'button','label'=>$text['label-unlock'],'icon'=>'unlock','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=unlock');"]); } else { @@ -135,7 +137,7 @@ } } if (permission_exists('conference_interactive_mute')) { - if ($mute_all == 'true') { + if (!empty($mute_all) && $mute_all == 'true') { echo button::create(['type'=>'button','label'=>$text['label-unmute-all'],'icon'=>'microphone','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=unmute+non_moderator');"]); } else { @@ -145,7 +147,7 @@ echo button::create(['type'=>'button','label'=>$text['label-end-conference'],'icon'=>'stop','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=kick+all');"]); echo "\n"; - echo "".$text['label-members'].": ".escape($member_count)."\n"; + echo "".$text['label-members'].": ".escape($member_count ?? '')."\n"; echo "

\n"; echo "\n"; @@ -188,8 +190,8 @@ $switch_cmd = "uuid_getvar ".$uuid. " hand_raised"; $hand_raised = (trim(event_socket_request($fp, 'api '.$switch_cmd)) == "true") ? "true" : "false"; //format seconds - $join_time_formatted = sprintf('%02d:%02d:%02d', ($join_time/3600), ($join_time/60%60), $join_time%60); - $last_talking_formatted = sprintf('%02d:%02d:%02d', ($last_talking/3600), ($last_talking/60%60), $last_talking%60); + $join_time_formatted = sprintf('%02d:%02d:%02d', floor($join_time / 3600), floor($join_time / 60), $join_time % 60); + $last_talking_formatted = sprintf('%02d:%02d:%02d', floor($last_talking / 3600), floor($last_talking / 60), $last_talking % 60); if (empty($record_path)) { if (permission_exists('conference_interactive_mute')) { @@ -274,4 +276,4 @@ echo "

"; } -?> +?> \ No newline at end of file diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index ea52640d63..fbf13a5c3e 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.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-2019 + Portions created by the Initial Developer are Copyright (C) 2008-2023 the Initial Developer. All Rights Reserved. Contributor(s): @@ -147,7 +147,7 @@ echo " \n"; echo " \n"; echo " \n"; - if (permission_exists('conference_interactive_view') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { + if (permission_exists('conference_interactive_view') && !empty($_SESSION['theme']['list_row_edit_button']['boolean']) && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { echo " \n"; @@ -160,4 +160,4 @@ echo "

"; } -?> +?> \ No newline at end of file
".escape($conference_extension)."".escape($participant_pin)."".escape($member_count).""; echo button::create(['type'=>'button','title'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'link'=>$list_row_url]); echo "