From 20921561578f6e8517d3977b6a7c72291c3b6167 Mon Sep 17 00:00:00 2001 From: fusionate Date: Tue, 31 Jan 2023 19:59:08 +0000 Subject: [PATCH] Active Conferences: Show Conference/Room name and extension numbers. Conferences - Edit: Fix View button. Conferences - List: Add View link. --- app/conference_centers/app_languages.php | 1 - app/conference_centers/conference_rooms.php | 9 ++- app/conferences/app_languages.php | 23 +++++++- app/conferences/conference_edit.php | 2 +- app/conferences/conferences.php | 12 ++++ app/conferences_active/app_languages.php | 21 +++++++ .../conference_interactive_inc.php | 2 +- .../conferences_active_inc.php | 55 ++++++++++--------- 8 files changed, 91 insertions(+), 34 deletions(-) diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 25920b8630..af85456827 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -85,7 +85,6 @@ $text['title_description-conference_rooms']['ru-ru'] = "Conference Rooms are ind $text['title_description-conference_rooms']['sv-se'] = "Conference Rooms are individual meeting places within a Conference Center."; $text['title_description-conference_rooms']['uk-ua'] = "Conference Rooms are individual meeting places within a Conference Center."; - $text['label-conference_center_name']['en-us'] = "Name"; $text['label-conference_center_name']['en-gb'] = "Name"; $text['label-conference_center_name']['ar-eg'] = ""; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 75a666dffc..242501b4fe 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -291,7 +291,7 @@ echo th_order_by('mute', $text['label-mute'], $order_by, $order, null, "class='center'"); echo th_order_by('sounds', $text['label-sounds'], $order_by, $order, null, "class='center'"); echo "".$text['label-members']."\n"; - echo "".$text['label-tools']."\n"; + echo "".$text['label-tools']."\n"; if (permission_exists('conference_room_enabled')) { echo th_order_by('enabled', $text['label-enabled'], $order_by, $order, null, "class='center'"); } @@ -446,9 +446,12 @@ else { echo " 0\n"; } - echo " \n"; + echo " \n"; if (permission_exists('conference_interactive_view')) { - echo " ".$text['label-view']." \n"; + echo " ".$text['label-view']."\n"; + } + else if (permission_exists('conference_active_view')) { + echo " ".$text['label-view']."\n"; } if (permission_exists('conference_cdr_view')) { echo " ".$text['button-cdr']."\n"; diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php index 7bb87fd058..27156a793d 100644 --- a/app/conferences/app_languages.php +++ b/app/conferences/app_languages.php @@ -799,4 +799,25 @@ $text['label-account_code']['ru-ru'] = "Код Учетной Записи"; $text['label-account_code']['sv-se'] = "Kontokod"; $text['label-account_code']['uk-ua'] = ""; -?> +$text['label-view']['en-us'] = "View"; +$text['label-view']['en-gb'] = "View"; +$text['label-view']['ar-eg'] = ""; +$text['label-view']['de-at'] = "Ansicht"; //copied from de-de +$text['label-view']['de-ch'] = "Ansicht"; //copied from de-de +$text['label-view']['de-de'] = "Ansicht"; +$text['label-view']['es-cl'] = "Ver"; +$text['label-view']['es-mx'] = "Ver"; //copied from es-cl +$text['label-view']['fr-ca'] = "Vue"; //copied from fr-fr +$text['label-view']['fr-fr'] = "Vue"; +$text['label-view']['he-il'] = ""; +$text['label-view']['it-it'] = "Mostra"; +$text['label-view']['nl-nl'] = "Bekijken"; +$text['label-view']['pl-pl'] = "Widok"; +$text['label-view']['pt-br'] = "Visualizar"; +$text['label-view']['pt-pt'] = "Vista"; +$text['label-view']['ro-ro'] = ""; +$text['label-view']['ru-ru'] = "Просмотр"; +$text['label-view']['sv-se'] = "Visa"; +$text['label-view']['uk-ua'] = "Перегляд"; + +?> \ No newline at end of file diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index a9322e3d81..3a1c6559e5 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -352,7 +352,7 @@ echo button::create(['type'=>'button','label'=>$text['button-cdr'],'icon'=>'list','link'=>PROJECT_PATH.'/app/conference_cdr/conference_cdr.php?id='.urlencode($conference_uuid)]); } if (permission_exists('conference_active_view')) { - echo button::create(['type'=>'button','label'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'style'=>'','link'=>'../conferences_active/conferences_active.php?c='.urlencode(str_replace(' ', '-', $conference_name))]); + echo button::create(['type'=>'button','label'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'style'=>'','link'=>'../conferences_active/conference_interactive.php?c='.urlencode($conference_extension)]); } } echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save']); diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index 9e2b205b8f..6188ec7daa 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -216,6 +216,7 @@ echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order); echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order); echo th_order_by('conference_order', $text['table-order'], $order_by, $order, null, "class='center'"); + echo "".$text['label-tools']."\n"; echo th_order_by('conference_enabled', $text['table-enabled'], $order_by, $order, null, "class='center'"); echo th_order_by('conference_description', $text['table-description'], $order_by, $order, null, "class='hide-sm-dn'"); if (permission_exists('conference_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { @@ -249,6 +250,17 @@ echo " ".escape($row['conference_extension'])." \n"; echo " ".escape($row['conference_profile'])." \n"; echo " ".escape($row['conference_order'])." \n"; + echo " \n"; + if (permission_exists('conference_interactive_view')) { + echo " ".$text['label-view']."\n"; + } + else if (permission_exists('conference_active_view')) { + echo " ".$text['label-view']."\n"; + } + else { + echo " &nsbp;\n"; + } + echo " \n"; if (permission_exists('conference_edit')) { echo " "; echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['conference_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]); diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php index abe8fb0f02..984e381ffb 100644 --- a/app/conferences_active/app_languages.php +++ b/app/conferences_active/app_languages.php @@ -106,6 +106,27 @@ $text['message-click_to_mute']['ru-ru'] = "Нажмите, чтобы отклю $text['message-click_to_mute']['sv-se'] = "Klicka för att Stänga Av Deltagares Mikrofon"; $text['message-click_to_mute']['uk-ua'] = "Натисніть, щоб вилючити учасника"; +$text['label-conference_center_room']['en-us'] = "Conference Center Room"; +$text['label-conference_center_room']['en-gb'] = "Conference Center Room"; +$text['label-conference_center_room']['ar-eg'] = ""; +$text['label-conference_center_room']['de-at'] = "Konferenz Zentrale"; //copied from de-de +$text['label-conference_center_room']['de-ch'] = "Konferenz Zentrale"; //copied from de-de +$text['label-conference_center_room']['de-de'] = "Konferenz Zentrale"; +$text['label-conference_center_room']['es-cl'] = "Centro de Conferencia"; +$text['label-conference_center_room']['es-mx'] = "Centro de Conferencia"; //copied from es-cl +$text['label-conference_center_room']['fr-ca'] = "Centre de conférence"; //copied from fr-fr +$text['label-conference_center_room']['fr-fr'] = "Centre de conférence"; +$text['label-conference_center_room']['he-il'] = ""; +$text['label-conference_center_room']['it-it'] = "Centro Conferenza"; +$text['label-conference_center_room']['nl-nl'] = "Conferentie centrum"; +$text['label-conference_center_room']['pl-pl'] = "Centrum Konferencyjne"; +$text['label-conference_center_room']['pt-br'] = "Centro de conferência"; +$text['label-conference_center_room']['pt-pt'] = "Centro de Conferência"; +$text['label-conference_center_room']['ro-ro'] = ""; +$text['label-conference_center_room']['ru-ru'] = "Конференц-центр"; +$text['label-conference_center_room']['sv-se'] = "Konferenscenter"; +$text['label-conference_center_room']['uk-ua'] = "Конференц-центр"; + $text['label-yes']['en-us'] = "Yes"; $text['label-yes']['en-gb'] = "Yes"; $text['label-yes']['ar-eg'] = ""; diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index c7c15db10a..ba65adcc60 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -216,7 +216,7 @@ echo "".$text['label-'.(($hand_raised == "true") ? 'yes' : 'no')]." ".$hand_raise_icon."\n"; echo ""; echo ($flag_can_speak == "true") ? "" : ""; - echo ($flag_can_hear == "true") ? "" : ""; + echo ($flag_can_hear == "true") ? "" : ""; if (permission_exists('conference_interactive_video')) { echo ($flag_has_video == "true") ? "" : null; } diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index 0ee4683dfb..ea52640d63 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -73,6 +73,7 @@ echo "\n"; echo "\n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; if (permission_exists('conference_interactive_view')) { @@ -95,42 +96,41 @@ if (isset($name_array[0]) && is_uuid($name_array[0])) { //check for the conference center room $sql = "select "; - $sql .= "conference_room_name, "; - $sql .= "participant_pin "; - $sql .= "from v_conference_rooms "; - $sql .= "where conference_room_uuid = :conference_room_uuid "; + $sql .= "cr.conference_room_name, "; + $sql .= "cc.conference_center_extension, "; + $sql .= "cr.participant_pin "; + $sql .= "from v_conference_rooms as cr "; + $sql .= "left join v_conference_centers as cc on cr.conference_center_uuid = cc.conference_center_uuid "; + $sql .= "where cr.conference_room_uuid = :conference_room_uuid "; $parameters['conference_room_uuid'] = $conference_uuid; $database = new database; $conference = $database->select($sql, $parameters, 'row'); $conference_name = $conference['conference_room_name']; + $conference_extension = $conference['conference_center_extension']; $participant_pin = $conference['participant_pin']; unset ($parameters, $conference, $sql); - $conference_uuid = $name_array[0]; - + } + else if (isset($name_array[0]) && is_numeric($name_array[0])) { //check the conference table - if (strlen($conference_name) == 0) { - $sql = "select "; - $sql .= "conference_name, "; - $sql .= "conference_pin_number "; - $sql .= "from "; - $sql .= "v_conferences "; - $sql .= "where "; - $sql .= "domain_uuid = :domain_uuid "; - $sql .= "and conference_uuid = :conference_uuid "; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $parameters['conference_uuid'] = $conference_uuid; - $database = new database; - $conference = $database->select($sql, $parameters, 'row'); - $conference_name = $conference['conference_name']; - $participant_pin = $conference['conference_pin_number']; - unset ($parameters, $sql); - } + $sql = "select "; + $sql .= "conference_name, "; + $sql .= "conference_extension, "; + $sql .= "conference_pin_number "; + $sql .= "from "; + $sql .= "v_conferences "; + $sql .= "where "; + $sql .= "domain_uuid = :domain_uuid "; + $sql .= "and conference_extension = :conference_extension "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['conference_extension'] = $name_array[0]; + $database = new database; + $conference = $database->select($sql, $parameters, 'row'); + $conference_name = $conference['conference_name']; + $conference_extension = $conference['conference_extension']; + $participant_pin = $conference['conference_pin_number']; + unset ($parameters, $sql); } - //if numeric use the conference extension as the name - if (isset($name_array[0]) && is_numeric($name_array[0])) { - $conference_name = $name_array[0]; - } if (permission_exists('conference_interactive_view')) { $list_row_url = 'conference_interactive.php?c='.urlencode($conference_uuid); } @@ -144,6 +144,7 @@ echo escape($conference_name); } echo " \n"; + echo " \n"; echo " \n"; echo " \n"; if (permission_exists('conference_interactive_view') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
".$text['label-name']."".$text['label-extension']."".$text['label-participant-pin']."".$text['label-member-count']."".escape($conference_extension)."".escape($participant_pin)."".escape($member_count)."