diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 44db43b252..b2f7d2e9df 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -251,7 +251,9 @@
echo " ";
echo " ";
echo " ";
- echo " ";
+ echo " ";
+ echo " ";
+ echo " ";
echo " ";
echo " ";
echo " ";
@@ -303,7 +305,9 @@
echo th_order_by('record', $text['label-record'], $order_by, $order, null, "class='center'");
//echo th_order_by('max_members', 'Max', $order_by, $order);
echo th_order_by('wait_mod', $text['label-wait_moderator'], $order_by, $order, null, "class='center'");
- echo th_order_by('announce', $text['label-announce'], $order_by, $order, null, "class='center'");
+ echo th_order_by('announce', $text['label-announce_name'], $order_by, $order, null, "class='center'");
+ echo th_order_by('announce', $text['label-announce_count'], $order_by, $order, null, "class='center'");
+ echo th_order_by('announce', $text['label-announce_recording'], $order_by, $order, null, "class='center'");
//echo th_order_by('enter_sound', 'Enter Sound', $order_by, $order);
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'");
@@ -388,13 +392,31 @@
// }
// echo " \n";
- if (permission_exists('conference_room_edit')) {
+ if (permission_exists('conference_room_edit') && permission_exists('conference_room_announce_name')) {
echo " | \n";
- echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['announce'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'announce'; list_form_submit('form_list')"]);
+ echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['announce_name'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'announce_name'; list_form_submit('form_list')"]);
}
else {
echo " | \n";
- echo $text['label-'.($row['announce'] == "true" ? 'true' : 'false')];
+ echo $text['label-'.($row['announce_name'] == "true" ? 'true' : 'false')];
+ }
+ echo " | \n";
+ if (permission_exists('conference_room_edit') && permission_exists('conference_room_announce_count')) {
+ echo " \n";
+ echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['announce_count'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'announce_count'; list_form_submit('form_list')"]);
+ }
+ else {
+ echo " | \n";
+ echo $text['label-'.($row['announce_count'] == "true" ? 'true' : 'false')];
+ }
+ echo " | \n";
+ if (permission_exists('conference_room_edit') && permission_exists('conference_room_announce_recording')) {
+ echo " \n";
+ echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['announce_recording'] == "true" ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); document.getElementById('toggle_field').value = 'announce_recording'; list_form_submit('form_list')"]);
+ }
+ else {
+ echo " | \n";
+ echo $text['label-'.($row['announce_recording'] == "true" ? 'true' : 'false')];
}
echo " | \n";
// echo " ";
@@ -494,4 +516,4 @@
//include the footer
require_once "resources/footer.php";
-?>
\ No newline at end of file
+?>
diff --git a/app/conference_centers/resources/classes/conference_centers.php b/app/conference_centers/resources/classes/conference_centers.php
index 8d0e04d268..cf6a458ffb 100644
--- a/app/conference_centers/resources/classes/conference_centers.php
+++ b/app/conference_centers/resources/classes/conference_centers.php
@@ -140,7 +140,7 @@ if (!class_exists('conference_centers')) {
$not_admin = 0;
}
$fields = "r.domain_uuid, r.conference_room_uuid, r.conference_center_uuid, r.meeting_uuid, r.conference_room_name, max_members, ";
- $fields .= "wait_mod, announce, mute, sounds, created, created_by, r.enabled, r.description, record, ";
+ $fields .= "wait_mod, announce_name, announce_count, announce_recording, mute, sounds, created, created_by, r.enabled, r.description, record, ";
$fields .= "profile, moderator_pin, participant_pin";
if ($not_admin) {
$fields .= ", meeting_user_uuid, user_uuid";
@@ -194,7 +194,9 @@ if (!class_exists('conference_centers')) {
$result[$x]["conference_room_name"] = $row["conference_room_name"];
$result[$x]["max_members"] = $row["max_members"];
$result[$x]["wait_mod"] = $row["wait_mod"];
- $result[$x]["announce"] = $row["announce"];
+ $result[$x]["announce_name"] = $row["announce_name"];
+ $result[$x]["announce_count"] = $row["announce_count"];
+ $result[$x]["announce_recording"] = $row["announce_recording"];
$result[$x]["mute"] = $row["mute"];
$result[$x]["record"] = $row["record"];
$result[$x]["sounds"] = $row["sounds"];
@@ -581,7 +583,7 @@ if (!class_exists('conference_centers')) {
if (is_array($records) && @sizeof($records) != 0) {
//validate submitted toggle field
- if (!in_array($this->toggle_field, ['record','wait_mod','announce','mute','sounds','enabled'])) {
+ if (!in_array($this->toggle_field, ['record','wait_mod','announce_name','announce_count','announce_recording','mute','sounds','enabled'])) {
header('Location: '.$this->list_page);
exit;
}
@@ -759,4 +761,4 @@ if (!class_exists('conference_centers')) {
print_r($result);
*/
-?>
\ No newline at end of file
+?>
|