dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Active Conferences: Show Conference/Room name and extension numbers. Conferences - Edit: Fix View button. Conferences - List: Add View link.

This commit is contained in:
fusionate 2023-01-31 19:59:08 +00:00
parent 3fe43be2a8
commit 2092156157
No known key found for this signature in database
8 changed files with 91 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/conference_centers/app_languages.php
View File

@ -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'] = "";

9
app/conference_centers/conference_rooms.php
View File

@ -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 "<th class='center'>".$text['label-members']."</th>\n";
echo "<th>".$text['label-tools']."</th>\n";
echo "<th class='center'>".$text['label-tools']."</th>\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 " <td class='center'>0</td>\n";
}
echo " <td class='no-link no-wrap'>\n";
echo " <td class='no-link no-wrap center'>\n";
if (permission_exists('conference_interactive_view')) {
echo " <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".urlencode($row['conference_room_uuid'])."'>".$text['label-view']."</a>&nbsp;\n";
echo " <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".urlencode($row['conference_room_uuid'])."'>".$text['label-view']."</a>\n";
}
else if (permission_exists('conference_active_view')) {
echo " <a href='".PROJECT_PATH."/app/conferences_active/conferences_active.php'>".$text['label-view']."</a>\n";
}
if (permission_exists('conference_cdr_view')) {
echo " <a href='/app/conference_cdr/conference_cdr.php?id=".urlencode($row['conference_room_uuid'])."'>".$text['button-cdr']."</a>\n";

23
app/conferences/app_languages.php
View File

@ -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'] = "Перегляд";
?>

2
app/conferences/conference_edit.php
View File

@ -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']);

12
app/conferences/conferences.php
View File

@ -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 "<th style='text-align: center;'>".$text['label-tools']."</th>\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 " <td>".escape($row['conference_extension'])."&nbsp;</td>\n";
echo " <td>".escape($row['conference_profile'])."&nbsp;</td>\n";
echo " <td class='center'>".escape($row['conference_order'])."&nbsp;</td>\n";
echo " <td class='no-link center'>\n";
if (permission_exists('conference_interactive_view')) {
echo " <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".urlencode($row['conference_extension'])."'>".$text['label-view']."</a>\n";
}
else if (permission_exists('conference_active_view')) {
echo " <a href='".PROJECT_PATH."/app/conferences_active/conferences_active.php'>".$text['label-view']."</a>\n";
}
else {
echo " &nsbp;\n";
}
echo " </td>\n";
if (permission_exists('conference_edit')) {
echo " <td class='no-link center'>";
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')"]);

21
app/conferences_active/app_languages.php
View File

@ -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'] = "";

2
app/conferences_active/conference_interactive_inc.php
View File

@ -216,7 +216,7 @@
echo "<td ".$list_row_onclick." ".$list_row_title." class='hide-sm-dn'>".$text['label-'.(($hand_raised == "true") ? 'yes' : 'no')]." ".$hand_raise_icon."</td>\n";
echo "<td ".$list_row_onclick." ".$list_row_title." class='center'>";
echo ($flag_can_speak == "true") ? "<i class='fas fa-microphone fa-fw' title=\"".$text['label-speak']."\"></i>" : "<i class='fas fa-microphone-slash fa-fw' title=\"".$text['label-speak']."\"></i>";
echo ($flag_can_hear == "true") ? "<i class='fas fa-headphones fa-fw' title=\"".$text['label-speak']."\" style='margin-left: 10px;'></i>" : "<i class='fas fa-deaf fa-fw' title=\"".$text['label-hear']."\" style='margin-left: 10px;'></i>";
echo ($flag_can_hear == "true") ? "<i class='fas fa-headphones fa-fw' title=\"".$text['label-hear']."\" style='margin-left: 10px;'></i>" : "<i class='fas fa-deaf fa-fw' title=\"".$text['label-hear']."\" style='margin-left: 10px;'></i>";
if (permission_exists('conference_interactive_video')) {
echo ($flag_has_video == "true") ? "<i class='fas fa-video fa-fw' title=\"".$text['label-video']."\"></i>" : null;
}

55
app/conferences_active/conferences_active_inc.php
View File

@ -73,6 +73,7 @@
echo "<table class='list'>\n";
echo "<tr class='list-header'>\n";
echo " <th>".$text['label-name']."</th>\n";
echo " <th>".$text['label-extension']."</th>\n";
echo " <th>".$text['label-participant-pin']."</th>\n";
echo " <th class='center'>".$text['label-member-count']."</th>\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 " </td>\n";
echo " <td>".escape($conference_extension)."</td>\n";
echo " <td>".escape($participant_pin)."</td>\n";
echo " <td class='center'>".escape($member_count)."</td>\n";
if (permission_exists('conference_interactive_view') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {