diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 25c0050878..91e680c1e4 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -252,6 +252,10 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "meeting_uuid"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Meeting UUID"; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_room_name"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference room name."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "profile"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the conference profile."; diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index ae27ba9244..3a443db5fa 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -198,6 +198,16 @@ $text['label-conference-name']['pt-pt'] = "Nome da Conferência"; $text['label-conference-name']['fr-fr'] = "Nom de la Conférence"; + $text['label-room-name']['en-us'] = "Room Name"; + $text['label-room-name']['es-cl'] = "Nombre de la Sala"; + $text['label-room-name']['pt-pt'] = "Nome da Sala"; + $text['label-room-name']['fr-fr'] = "Nom de Chambre"; + + $text['description-room-name']['en-us'] = "Enter a name for the conference room."; + $text['description-room-name']['es-cl'] = "Introduzca un nombre para la sala de conferencias."; + $text['description-room-name']['pt-pt'] = "Digite um nome para a sala de conferências."; + $text['description-room-name']['fr-fr'] = "Entrez un nom pour la salle de conférence."; + $text['label-greeting']['en-us'] = "Greeting"; $text['label-greeting']['es-cl'] = "Mensaje"; $text['label-greeting']['pt-pt'] = "Saudaçãoa"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 6ab9162574..ee84b42110 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -53,6 +53,7 @@ else { if (count($_POST) > 0) { $conference_center_uuid = check_str($_POST["conference_center_uuid"]); $meeting_uuid = check_str($_POST["meeting_uuid"]); + $conference_room_name = check_str($_POST['conference_room_name']); $moderator_pin = check_str($_POST["moderator_pin"]); $participant_pin = check_str($_POST["participant_pin"]); $profile = check_str($_POST["profile"]); @@ -286,6 +287,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "conference_room_uuid, "; $sql .= "conference_center_uuid, "; $sql .= "meeting_uuid, "; + $sql .= "conference_room_name, "; $sql .= "profile, "; $sql .= "record, "; $sql .= "max_members, "; @@ -306,6 +308,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$conference_room_uuid', "; $sql .= "'$conference_center_uuid', "; $sql .= "'$meeting_uuid', "; + $sql .= "'$conference_room_name', "; $sql .= "'$profile', "; $sql .= "'$record', "; $sql .= "'$max_members', "; @@ -378,6 +381,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql = "update v_conference_rooms set "; $sql .= "conference_center_uuid = '$conference_center_uuid', "; //$sql .= "meeting_uuid = '$meeting_uuid', "; + $sql .= "conference_room_name = '$conference_room_name', "; if (strlen($profile) > 0) { $sql .= "profile = '$profile', "; } @@ -458,6 +462,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $meeting_uuid = $row["meeting_uuid"]; $moderator_pin = $row["moderator_pin"]; $participant_pin = $row["participant_pin"]; + $conference_room_name = $row["conference_room_name"]; $profile = $row["profile"]; $record = $row["record"]; $max_members = $row["max_members"]; @@ -525,9 +530,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; - echo " ".$text['label-conference-name'].":\n"; - echo "\n"; + echo "".$text['label-conference-name']."\n"; echo "\n"; echo " \n"; + echo "
\n"; + echo " ".$text['description-room-name']."\n"; + echo " "; + echo " "; + + echo " "; + echo " ".$text['label-moderator-pin'].""; echo " "; echo " \n"; echo "
\n"; echo " ".$text['description-moderator-pin']."\n"; - echo "
\n"; echo " "; echo " "; echo " "; - echo " ".$text['label-participant-pin'].":"; + echo " ".$text['label-participant-pin'].""; echo " "; echo " \n"; echo "
\n"; echo " ".$text['description-participant-pin']."\n"; - echo "
\n"; echo " "; echo " "; echo " "; - echo " ".$text['label-users'].":"; + echo " ".$text['label-users'].""; echo " "; if ($action == "update") { echo " \n"; @@ -611,15 +621,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { unset($sql, $result); echo "
\n"; echo " ".$text['description-users']."\n"; - echo "
\n"; echo " "; echo " "; if (permission_exists('conference_room_profile')) { echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; } if (permission_exists('conference_room_max_members')) { echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; } if (permission_exists('conference_room_announce')) { echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; } @@ -746,9 +740,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('conference_room_mute')) { echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; } - /* - if ($action == "update" && permission_exists('conference_room_edit')) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - */ - if (permission_exists('conference_room_profile')) { echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; - echo " "; + echo " \n"; + echo " \n"; + echo ""; + echo "
\n"; - echo " ".$text['label-profile'].":\n"; - echo "".$text['label-profile']."\n"; echo " \n"; echo "
\n"; @@ -630,9 +637,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('conference_room_record')) { echo "
\n"; - echo " ".$text['label-record'].":\n"; - echo "".$text['label-record']."\n"; echo " \n"; echo "
\n"; - echo "\n"; echo "
\n"; - echo " ".$text['label-max-members'].":\n"; - echo "".$text['label-max-members']."\n"; echo " \n"; echo "
\n"; @@ -669,9 +671,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } echo "
\n"; - echo " ".$text['label-schedule']."\n"; - echo "".$text['label-schedule']."\n"; echo " \n"; echo " \n"; @@ -681,9 +681,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('conference_room_wait_mod')) { echo "
\n"; - echo " ".$text['label-wait-for-moderator'].":\n"; - echo "".$text['label-wait-for-moderator']."\n"; echo " \n"; echo "
\n"; - echo "\n"; echo "
\n"; - echo " ".$text['label-announce'].":\n"; - echo "".$text['label-announce']."\n"; echo " \n"; echo "
\n"; - echo "\n"; echo "
\n"; - echo " ".$text['label-mute'].":\n"; - echo "".$text['label-mute']."\n"; echo "
\n"; - echo " Created:\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "
\n"; - echo " Created By:\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo "\n"; - echo "
\n"; - echo " ".$text['label-enabled'].":\n"; - echo "".$text['label-enabled']."\n"; echo "
\n"; - echo " ".$text['label-sounds'].":\n"; - echo "".$text['label-sounds']."\n"; echo "
\n"; - echo " ".$text['label-description'].":\n"; - echo "".$text['label-description']."\n"; echo " \n"; echo "
\n"; echo "\n"; echo "
\n"; - echo "
"; + + echo "
\n"; + echo "
"; if ($action == "update") { - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; } - echo " \n"; - echo "
"; echo "
"; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 564370a082..56b7a203a1 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -208,17 +208,16 @@ else { echo "\n"; //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); + echo "".$text['label-name']."\n"; echo "".$text['label-moderator-pin']."\n"; echo "".$text['label-participant-pin']."\n"; //echo th_order_by('profile', $text['label-profile'], $order_by, $order); echo th_order_by('record', $text['label-record'], $order_by, $order); //echo th_order_by('max_members', 'Max', $order_by, $order); - echo th_order_by('wait_mod', $text['label-moderator'], $order_by, $order); + echo th_order_by('wait_mod', $text['label-wait-moderator'], $order_by, $order); echo th_order_by('announce', $text['label-announce'], $order_by, $order); //echo th_order_by('enter_sound', 'Enter Sound', $order_by, $order); echo th_order_by('mute', $text['label-mute'], $order_by, $order); - //echo th_order_by('created', 'Created', $order_by, $order); - //echo th_order_by('created_by', 'Created By', $order_by, $order); echo th_order_by('sounds', $text['label-sounds'], $order_by, $order); echo "".$text['label-members']."\n"; echo "".$text['label-tools']."\n"; @@ -240,6 +239,7 @@ else { if ($result_count > 0) { foreach($result as $row) { $meeting_uuid = $row['meeting_uuid']; + $conference_room_name = $row['conference_room_name']; $moderator_pin = $row['moderator_pin']; $participant_pin = $row['participant_pin']; if (strlen($moderator_pin) == 9) { @@ -251,6 +251,7 @@ else { $tr_link = (permission_exists('conference_room_edit')) ? "href='conference_room_edit.php?id=".$row['conference_room_uuid']."'" : null; echo "\n"; + echo " ".(($conference_room_name != '') ? "".$conference_room_name."" : " ")."\n"; echo " ".$moderator_pin."\n"; echo " ".$participant_pin."\n"; //echo " ".$row['conference_center_uuid']." \n"; diff --git a/app/conference_centers/resources/classes/conference_center.php b/app/conference_centers/resources/classes/conference_center.php index 64d492de90..36905a9c6a 100644 --- a/app/conference_centers/resources/classes/conference_center.php +++ b/app/conference_centers/resources/classes/conference_center.php @@ -64,7 +64,7 @@ public function rooms() { //get the list of rooms - $fields = "r.domain_uuid, r.conference_room_uuid, r.conference_center_uuid, r.meeting_uuid, max_members, "; + $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 .= "profile, meeting_user_uuid, user_uuid, moderator_pin, participant_pin "; $sql = "select ".$fields." from v_conference_rooms as r, v_meeting_users as u, v_meetings as p "; @@ -101,6 +101,7 @@ $result[$x]["conference_room_uuid"] = $row["conference_room_uuid"]; $result[$x]["conference_center_uuid"] = $row["conference_center_uuid"]; $result[$x]["meeting_uuid"] = $row["meeting_uuid"]; + $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"];