From 53d027c43eee41dd5bd961283a911ba343b0b4c7 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Fri, 24 Apr 2026 12:04:58 -0600 Subject: [PATCH] Add conference center required message When trying to add a conference room and a conference center doesn't exist then show a message to the user that the conference center is required. --- app/conference_centers/app_languages.php | 26 +++++++++++++++++++ .../conference_room_edit.php | 8 ++++++ app/conference_centers/conference_rooms.php | 5 +--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 1ec69aa4b..0f52fa186 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -702,6 +702,32 @@ $text['message-minimum_pin_length']['zh-cn'] = "最低生活年限:"; $text['message-minimum_pin_length']['ja-jp'] = "必要な最低PINの長さ:"; $text['message-minimum_pin_length']['ko-kr'] = "요구되는 최소한도 PIN 길이:"; +$text['message-conference_center_required']['en-us'] = "Conference Center Required"; +$text['message-conference_center_required']['en-gb'] = "Conference Center Required"; +$text['message-conference_center_required']['ar-eg'] = "مركز المؤتمرات مطلوب"; +$text['message-conference_center_required']['de-at'] = "Konferenzzentrum erforderlich"; +$text['message-conference_center_required']['de-ch'] = "Konferenzzentrum erforderlich"; +$text['message-conference_center_required']['de-de'] = "Konferenzzentrum erforderlich"; +$text['message-conference_center_required']['el-gr'] = "Απαιτείται Κέντρο Συνεδρίων"; +$text['message-conference_center_required']['es-cl'] = "Centro de conferencias requerido"; +$text['message-conference_center_required']['es-mx'] = "Centro de conferencias requerido"; +$text['message-conference_center_required']['fr-ca'] = "Centre de conférences requis"; +$text['message-conference_center_required']['fr-fr'] = "Centre de conférences requis"; +$text['message-conference_center_required']['he-il'] = "מרכז כנסים נדרש"; +$text['message-conference_center_required']['it-it'] = "Centro conferenze richiesto"; +$text['message-conference_center_required']['ka-ge'] = "კონფერენციების ცენტრი საჭიროა"; +$text['message-conference_center_required']['nl-nl'] = "Conferentiecentrum vereist"; +$text['message-conference_center_required']['pl-pl'] = "Wymagane jest centrum konferencyjne"; +$text['message-conference_center_required']['pt-br'] = "Centro de conferências obrigatório"; +$text['message-conference_center_required']['pt-pt'] = "Centro de conferências obrigatório"; +$text['message-conference_center_required']['ro-ro'] = "Centru de conferințe necesar"; +$text['message-conference_center_required']['ru-ru'] = "Требуется конференц-зал"; +$text['message-conference_center_required']['sv-se'] = "Konferenscenter krävs"; +$text['message-conference_center_required']['uk-ua'] = "Потрібен конференц-зал"; +$text['message-conference_center_required']['zh-cn'] = "需要会议中心"; +$text['message-conference_center_required']['ja-jp'] = "会議センターが必要です"; +$text['message-conference_center_required']['ko-kr'] = "회의 센터가 필요합니다"; + $text['label-wait_moderator']['en-us'] = "Secure"; $text['label-wait_moderator']['en-gb'] = "Secure"; $text['label-wait_moderator']['ar-eg'] = "يؤمن"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 044831026..f5163f27e 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -121,6 +121,13 @@ $conference_centers = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); +//conference center to be setup first before adding a room + if (empty($conference_centers)) { + message::add($text['message-conference_center_required'], 'negative'); + header("Location: conference_rooms.php"); + exit; + } + //get the conference profiles $sql = "select * "; $sql .= "from v_conference_profiles "; @@ -196,6 +203,7 @@ unset($sql, $parameters); //generate the pin numbers + $pin_length = (empty($pin_length)) ? '9' : $pin_length; if (empty($moderator_pin)) { $moderator_pin = get_conference_pin($pin_length, $conference_room_uuid ?? null); } diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index c2adf090e..2eb51e144 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -160,10 +160,7 @@ //get conference array $switch_cmd = "conference xml_list"; $esl = event_socket::create(); - if (!$esl->is_connected()) { - trigger_error('Unable to connect to FreeSWITCH', E_USER_WARNING); - } - else { + if ($esl->is_connected()) { $xml_str = trim(event_socket::api($switch_cmd)); try { $xml = new SimpleXMLElement($xml_str, true);