diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php index 080774ed3b..620ceb354e 100644 --- a/app/ring_groups/app_config.php +++ b/app/ring_groups/app_config.php @@ -5,7 +5,7 @@ $apps[$x]['uuid'] = "1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2"; $apps[$x]['category'] = "Switch"; $apps[$x]['subcategory'] = ""; - $apps[$x]['version'] = "1.0"; + $apps[$x]['version'] = "1.1"; $apps[$x]['license'] = "Mozilla Public License 1.1"; $apps[$x]['url'] = "http://www.fusionpbx.com"; $apps[$x]['description']['en-us'] = "A tool to call multiple extensions."; @@ -278,9 +278,9 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the greeting."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_context"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_exit_key"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the context."; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the exit key."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_call_timeout"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; @@ -353,6 +353,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_context"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the context."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_enabled"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select enable or disable the ring group."; diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php index 715be1136b..7dbb97fb68 100644 --- a/app/ring_groups/app_languages.php +++ b/app/ring_groups/app_languages.php @@ -594,8 +594,8 @@ $text['label-url']['zh-cn'] = "URL"; $text['label-url']['ja-jp'] = "URL"; $text['label-url']['ko-kr'] = "URL"; -$text['label-timeout_destination']['en-us'] = "Timeout Destination"; -$text['label-timeout_destination']['en-gb'] = "Timeout Destination"; +$text['label-timeout_destination']['en-us'] = "Exit Action"; +$text['label-timeout_destination']['en-gb'] = "Exit Action"; $text['label-timeout_destination']['ar-eg'] = "تحديد الوقت"; $text['label-timeout_destination']['de-at'] = "Time-Out Ziel"; $text['label-timeout_destination']['de-ch'] = "Time-Out Ziel"; @@ -1458,6 +1458,58 @@ $text['label-context']['zh-cn'] = "语境"; $text['label-context']['ja-jp'] = "コンテクスト"; $text['label-context']['ko-kr'] = "문맥"; +$text['label-ring_group_exit_key']['en-us'] = "Exit Key"; +$text['label-ring_group_exit_key']['en-gb'] = "Exit Key"; +$text['label-ring_group_exit_key']['ar-eg'] = "مفتاح الخروج"; +$text['label-ring_group_exit_key']['de-at'] = "Abbruch Taste"; +$text['label-ring_group_exit_key']['de-ch'] = "Abbruch Taste"; +$text['label-ring_group_exit_key']['de-de'] = "Abbruch Taste"; +$text['label-ring_group_exit_key']['el-gr'] = "Κλειδί εξόδου"; +$text['label-ring_group_exit_key']['es-cl'] = "Tecla de salida"; +$text['label-ring_group_exit_key']['es-mx'] = "Tecla de salida"; +$text['label-ring_group_exit_key']['fr-ca'] = "Touche pour sortir de la file d'attente"; +$text['label-ring_group_exit_key']['fr-fr'] = "Touche pour sortir de la file d'attente"; +$text['label-ring_group_exit_key']['he-il'] = "מפתח יציאה"; +$text['label-ring_group_exit_key']['it-it'] = "Chiave di uscita"; +$text['label-ring_group_exit_key']['ka-ge'] = "გასვლის ღილაკი"; +$text['label-ring_group_exit_key']['nl-nl'] = "Verlaat toets"; +$text['label-ring_group_exit_key']['pl-pl'] = "Klucz wyjścia"; +$text['label-ring_group_exit_key']['pt-br'] = "Chave de saída"; +$text['label-ring_group_exit_key']['pt-pt'] = "Chave de saída"; +$text['label-ring_group_exit_key']['ro-ro'] = "Tasta de ieșire"; +$text['label-ring_group_exit_key']['ru-ru'] = "Выходной ключ"; +$text['label-ring_group_exit_key']['sv-se'] = "Knapp för att lämna"; +$text['label-ring_group_exit_key']['uk-ua'] = "Клавіша виходу"; +$text['label-ring_group_exit_key']['zh-cn'] = "退出键"; +$text['label-ring_group_exit_key']['ja-jp'] = "終了キー"; +$text['label-ring_group_exit_key']['ko-kr'] = "종료 키"; + +$text['description-ring_group_exit_key']['en-us'] = "Define a key to use to send the call to the exit action."; +$text['description-ring_group_exit_key']['en-gb'] = "Define a key to use to send the call to the exit action."; +$text['description-ring_group_exit_key']['ar-eg'] = "حدد مفتاحًا لاستخدامه لإرسال المكالمة إلى إجراء الخروج."; +$text['description-ring_group_exit_key']['de-at'] = "Definieren Sie eine Tastenbelegung, um die Anrufe an die Ausgangsaktion zu senden."; +$text['description-ring_group_exit_key']['de-ch'] = "Definieren Sie eine Tastenbelegung, um die Anrufe an die Ausgangsaktion zu senden."; +$text['description-ring_group_exit_key']['de-de'] = "Definieren Sie eine Tastenbelegung, um die Anrufe an die Ausgangsaktion zu senden."; +$text['description-ring_group_exit_key']['el-gr'] = "Διαφημίστε μια κλειδαριά για να αποστείλετε την προσοχή στην ενεργοποίηση της εξόδου."; +$text['description-ring_group_exit_key']['es-cl'] = "Defina una tecla para enviar la llamada a la acción de salida."; +$text['description-ring_group_exit_key']['es-mx'] = "Defina una tecla para enviar la llamada a la acción de salida."; +$text['description-ring_group_exit_key']['fr-ca'] = "Définissez une touche pour envoyer l'appel à l'action de sortie."; +$text['description-ring_group_exit_key']['fr-fr'] = "Définissez une touche pour envoyer l'appel à l'action de sortie."; +$text['description-ring_group_exit_key']['he-il'] = "הגדיר מפתח לשימוש בהנחתת המרפק לפעולה של יציאה."; +$text['description-ring_group_exit_key']['it-it'] = "Definire una chiave per inviare la chiamata all'azione di uscita."; +$text['description-ring_group_exit_key']['ka-ge'] = "განაცხადეთ კლეიდი, რომელიც გამოიყენება მისი გადასახდელი აქციის გამოსვლას."; +$text['description-ring_group_exit_key']['nl-nl'] = "Definieer een sleutel om de oproep naar de uitgangsactie te sturen."; +$text['description-ring_group_exit_key']['pl-pl'] = "Zdefiniuj klawisz, aby przekierować połączenie do działania wyjściowego."; +$text['description-ring_group_exit_key']['pt-br'] = "Defina uma tecla para enviar a chamada para a ação de saída."; +$text['description-ring_group_exit_key']['pt-pt'] = "Defina uma tecla para enviar a chamada para a ação de saída."; +$text['description-ring_group_exit_key']['ro-ro'] = "Definiți o cheie pentru a trimite apelul la acțiunea de ieșire."; +$text['description-ring_group_exit_key']['ru-ru'] = "Определите клавишу для отправки вызова на выходное действие."; +$text['description-ring_group_exit_key']['sv-se'] = "Definiera en tangent att skicka anropet till utgångsåtgärden."; +$text['description-ring_group_exit_key']['uk-ua'] = "Задайте клавішу для відправки зв'язку до дії виходу."; +$text['description-ring_group_exit_key']['zh-cn'] = "定义一个键来发送呼叫到退出动作."; +$text['description-ring_group_exit_key']['ja-jp'] = "呼び出しを退出アクションに送るためのキーを定義します。"; +$text['description-ring_group_exit_key']['ko-kr'] = "이동을 위한 키를 정의합니다."; + $text['label-cid-number-prefix']['en-us'] = "CID Number Prefix"; $text['label-cid-number-prefix']['en-gb'] = "CID Number Prefix"; $text['label-cid-number-prefix']['ar-eg'] = "بادئة رقم CID"; @@ -1674,59 +1726,59 @@ $text['description-user_list']['zh-cn'] = "定义分配给该响铃组的用户 $text['description-user_list']['ja-jp'] = "この呼び出しグループに割り当てられるユーザーを定義します。"; $text['description-user_list']['ko-kr'] = "이 전화 수신 그룹에 할당된 사용자를 정의합니다."; -$text['description-timeout_destination']['en-us'] = "Select the timeout destination for this ring group."; +$text['description-timeout_destination']['en-us'] = "Select the exit action for this ring group."; $text['description-timeout_destination']['en-gb'] = "Select the timeout destination for this ring group."; -$text['description-timeout_destination']['ar-eg'] = "اختيار الوجهة الزمنية لهذه المجموعة"; -$text['description-timeout_destination']['de-at'] = "Wählen Sie das Abwurfziel für die Rufgruppe."; -$text['description-timeout_destination']['de-ch'] = "Wählen Sie das Abwurfziel für die Rufgruppe."; -$text['description-timeout_destination']['de-de'] = "Wählen Sie das Abwurfziel für die Rufgruppe."; -$text['description-timeout_destination']['el-gr'] = "Επιλέξτε τον προορισμό χρονικού ορίου για αυτήν την ομάδα κουδουνίσματος."; -$text['description-timeout_destination']['es-cl'] = "Ingrese el timeout de destino para este grupo de llamado"; -$text['description-timeout_destination']['es-mx'] = "Ingrese el timeout de destino para este grupo de llamado"; -$text['description-timeout_destination']['fr-ca'] = "Sélectionner la destination vers laquelle diriger l'appel en cas de non réponse"; -$text['description-timeout_destination']['fr-fr'] = "Sélectionner la destination vers laquelle diriger l'appel en cas de non réponse"; -$text['description-timeout_destination']['he-il'] = "בחר את יעד הזמן עבור קבוצה זו."; -$text['description-timeout_destination']['it-it'] = "Seleziona la destinazione al timeout per questo gruppo di squillo."; -$text['description-timeout_destination']['ka-ge'] = "აირჩიეთ მოლოდინის ვადა ამ ზარების ჯგუფის დანიშნულების პუნქტისთვის."; -$text['description-timeout_destination']['nl-nl'] = "Kies de afbreek bestemming voor de belgroep."; -$text['description-timeout_destination']['pl-pl'] = "Wybierz alternatywna destynację rozmowy po upłynięciu limitu czasowego."; -$text['description-timeout_destination']['pt-br'] = "Escolha destino no caso do tempo de saída do grupo"; -$text['description-timeout_destination']['pt-pt'] = "Escolha destino no caso de timeout no grupo."; -$text['description-timeout_destination']['ro-ro'] = "Selectați destinația de expirare pentru acest grup de sonerie."; -$text['description-timeout_destination']['ru-ru'] = "Выберите время ожидания для этой группы вызовов."; -$text['description-timeout_destination']['sv-se'] = "Välj timeout destinationen för denna ringgrupp."; -$text['description-timeout_destination']['uk-ua'] = "Виберіть пункт призначення маршруту для цієї групи."; -$text['description-timeout_destination']['tr-tr'] = "Bu zil grubu için zaman aşımı hedefini seçin."; -$text['description-timeout_destination']['zh-cn'] = "选择此振铃组的超时目的地。"; -$text['description-timeout_destination']['ja-jp'] = "この着信グループのタイムアウト先を選択します。"; -$text['description-timeout_destination']['ko-kr'] = "이 전화 수신 그룹의 시간 제한 대상을 선택하세요."; +$text['description-timeout_destination']['ar-eg'] = "حدد الوجهة الخروجية لهذا المجموعة الدائرية."; +$text['description-timeout_destination']['de-at'] = "Wählen Sie die Timeout-Ziel für diese Ringgruppe aus."; +$text['description-timeout_destination']['de-ch'] = "Wählen Sie die Timeout-Ziel für diese Ringgruppe aus."; +$text['description-timeout_destination']['de-de'] = "Wählen Sie die Timeout-Ziel für diese Ringgruppe aus."; +$text['description-timeout_destination']['el-gr'] = "Επιλέξτε το προορισμό προσανατολισμού για αυτή την ομάδα δακτυλίων."; +$text['description-timeout_destination']['es-cl'] = "Seleccione el destino de timeout para este grupo de anillos."; +$text['description-timeout_destination']['es-mx'] = "Seleccione el destino de timeout para este grupo de anillos."; +$text['description-timeout_destination']['fr-ca'] = "Sélectionnez le destinataire de timeout pour ce groupe de sonnerie."; +$text['description-timeout_destination']['fr-fr'] = "Sélectionnez le destinataire de timeout pour ce groupe de sonnerie."; +$text['description-timeout_destination']['he-il'] = "בחר את היעד של ה-timeout עבור קבוצת הטבעות הזו."; +$text['description-timeout_destination']['it-it'] = "Seleziona il destinatario del timeout per questo gruppo di anelli."; +$text['description-timeout_destination']['ka-ge'] = "გამოირჩეთ გამოსვლის მიმართულება ესენია ამ კირის ჯგუფისთვის."; +$text['description-timeout_destination']['nl-nl'] = "Selecteer de timeoutbestemming voor deze ringgroep."; +$text['description-timeout_destination']['pl-pl'] = "Wybierz cel timeout dla tej grupy dzwonków."; +$text['description-timeout_destination']['pt-br'] = "Selecione o destino de timeout para este grupo de anéis."; +$text['description-timeout_destination']['pt-pt'] = "Selecione o destino de timeout para este grupo de anéis."; +$text['description-timeout_destination']['ro-ro'] = "Selectați destinatia timeout pentru acest grup de aneluri."; +$text['description-timeout_destination']['ru-ru'] = "Выберите целевую точку таймаута для этой группы звонков."; +$text['description-timeout_destination']['sv-se'] = "Välj timeoutmål för denna ringgrupp."; +$text['description-timeout_destination']['uk-ua'] = "Оберіть ціль таймауту для цієї групи дзвінків."; +$text['description-timeout_destination']['tr-tr'] = "Bu halka grubu için timeout hedefini seçin."; +$text['description-timeout_destination']['zh-cn'] = "选择此环组的超时目标."; +$text['description-timeout_destination']['ja-jp'] = "このリンググループのタイムアウト先を選択します。"; +$text['description-timeout_destination']['ko-kr'] = "이 루프 그룹의 타임아웃 대상 선택"; -$text['description-timeout']['en-us'] = "Enter the total call timeout in seconds"; -$text['description-timeout']['en-gb'] = "Enter the total call timeout in seconds"; -$text['description-timeout']['ar-eg'] = "أدخل مجموع وقت النداء في ثواني"; -$text['description-timeout']['de-at'] = "Geben Sie das absolute Time-Out in Sekunden an."; -$text['description-timeout']['de-ch'] = "Geben Sie das absolute Time-Out in Sekunden an."; -$text['description-timeout']['de-de'] = "Geben Sie das absolute Time-Out in Sekunden an."; -$text['description-timeout']['el-gr'] = "Εισαγάγετε το συνολικό χρονικό όριο κλήσης σε δευτερόλεπτα"; -$text['description-timeout']['es-cl'] = "Ingrese el timeout de llamada en segundos"; -$text['description-timeout']['es-mx'] = "Ingrese el timeout de llamada en segundos"; -$text['description-timeout']['fr-ca'] = "Temps total de sonnerie sur l'appel en secondes"; -$text['description-timeout']['fr-fr'] = "Temps total de sonnerie sur l'appel en secondes"; -$text['description-timeout']['he-il'] = "הכנס את זמן השיחה הכולל בתוך שניות"; -$text['description-timeout']['it-it'] = "Inserire il timeout totale di chiamata in secondi"; -$text['description-timeout']['ka-ge'] = "შეიყვანეთ საერთო მოლოდინის ვადა წამებში"; -$text['description-timeout']['nl-nl'] = "Voer de total oproep afbreektijd in seconden in."; -$text['description-timeout']['pl-pl'] = "Wpisz ogólny limit czasu rozmowy (milisekundy)"; -$text['description-timeout']['pt-br'] = "Insira o tempo de saída da chamada em segundos"; -$text['description-timeout']['pt-pt'] = "Introduza o timeout da chamada em segundos"; -$text['description-timeout']['ro-ro'] = "Introduceți durata totală a apelului în secunde"; -$text['description-timeout']['ru-ru'] = "Введите общее время ожидания вызова в секундах"; -$text['description-timeout']['sv-se'] = "Ange den totala samtals timeout tiden i sekunder."; -$text['description-timeout']['uk-ua'] = "Введіть загальний час очікування виклику в секундах"; -$text['description-timeout']['tr-tr'] = "Toplam arama zaman aşımını saniye cinsinden girin"; -$text['description-timeout']['zh-cn'] = "输入以秒为单位的总调用超时"; -$text['description-timeout']['ja-jp'] = "合計通話タイムアウトを秒単位で入力します"; -$text['description-timeout']['ko-kr'] = "총 통화 제한 시간을 초 단위로 입력합니다."; +$text['description-call_timeout']['en-us'] = "Enter the total call timeout in seconds."; +$text['description-call_timeout']['en-gb'] = "Enter the total call timeout in seconds."; +$text['description-call_timeout']['ar-eg'] = "أدخل مجموع وقت النداء في ثواني"; +$text['description-call_timeout']['de-at'] = "Geben Sie das absolute Time-Out in Sekunden an."; +$text['description-call_timeout']['de-ch'] = "Geben Sie das absolute Time-Out in Sekunden an."; +$text['description-call_timeout']['de-de'] = "Geben Sie das absolute Time-Out in Sekunden an."; +$text['description-call_timeout']['el-gr'] = "Εισαγάγετε το συνολικό χρονικό όριο κλήσης σε δευτερόλεπτα"; +$text['description-call_timeout']['es-cl'] = "Ingrese el timeout de llamada en segundos"; +$text['description-call_timeout']['es-mx'] = "Ingrese el timeout de llamada en segundos"; +$text['description-call_timeout']['fr-ca'] = "Temps total de sonnerie sur l'appel en secondes"; +$text['description-call_timeout']['fr-fr'] = "Temps total de sonnerie sur l'appel en secondes"; +$text['description-call_timeout']['he-il'] = "הכנס את זמן השיחה הכולל בתוך שניות"; +$text['description-call_timeout']['it-it'] = "Inserire il timeout totale di chiamata in secondi"; +$text['description-call_timeout']['ka-ge'] = "შეიყვანეთ საერთო მოლოდინის ვადა წამებში"; +$text['description-call_timeout']['nl-nl'] = "Voer de total oproep afbreektijd in seconden in."; +$text['description-call_timeout']['pl-pl'] = "Wpisz ogólny limit czasu rozmowy (milisekundy)"; +$text['description-call_timeout']['pt-br'] = "Insira o tempo de saída da chamada em segundos"; +$text['description-call_timeout']['pt-pt'] = "Introduza o timeout da chamada em segundos"; +$text['description-call_timeout']['ro-ro'] = "Introduceți durata totală a apelului în secunde"; +$text['description-call_timeout']['ru-ru'] = "Введите общее время ожидания вызова в секундах"; +$text['description-call_timeout']['sv-se'] = "Ange den totala samtals timeout tiden i sekunder."; +$text['description-call_timeout']['uk-ua'] = "Введіть загальний час очікування виклику в секундах"; +$text['description-call_timeout']['tr-tr'] = "Toplam arama zaman aşımını saniye cinsinden girin"; +$text['description-call_timeout']['zh-cn'] = "输入以秒为单位的总调用超时"; +$text['description-call_timeout']['ja-jp'] = "合計通話タイムアウトを秒単位で入力します"; +$text['description-call_timeout']['ko-kr'] = "총 통화 제한 시간을 초 단위로 입력합니다."; $text['description-strategy']['en-us'] = "Select the ring strategy."; $text['description-strategy']['en-gb'] = "Select the ring strategy."; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 0605604ab8..6cbabf9b2d 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2010-2024 + Portions created by the Initial Developer are Copyright (C) 2010-2025 the Initial Developer. All Rights Reserved. Contributor(s): @@ -187,6 +187,7 @@ $ring_group_strategy = $_POST["ring_group_strategy"]; $ring_group_destinations = $_POST["ring_group_destinations"]; $ring_group_timeout_action = $_POST["ring_group_timeout_action"]; + $ring_group_exit_key = $_POST["ring_group_exit_key"] ?? null; $ring_group_call_timeout = $_POST["ring_group_call_timeout"]; $ring_group_caller_id_name = $_POST["ring_group_caller_id_name"]; $ring_group_caller_id_number = $_POST["ring_group_caller_id_number"]; @@ -369,6 +370,7 @@ $array['ring_groups'][0]["ring_group_extension"] = $ring_group_extension; $array['ring_groups'][0]["ring_group_greeting"] = $ring_group_greeting; $array['ring_groups'][0]["ring_group_strategy"] = $ring_group_strategy; + $array["ring_groups"][0]["ring_group_exit_key"] = $ring_group_exit_key; $array["ring_groups"][0]["ring_group_call_timeout"] = $ring_group_call_timeout; if (permission_exists('ring_group_caller_id_name')) { $array["ring_groups"][0]["ring_group_caller_id_name"] = $ring_group_caller_id_name; @@ -562,10 +564,10 @@ $ring_group_name = $row["ring_group_name"]; $ring_group_extension = $row["ring_group_extension"]; $ring_group_greeting = $row["ring_group_greeting"]; - $ring_group_context = $row["ring_group_context"]; $ring_group_strategy = $row["ring_group_strategy"]; $ring_group_timeout_app = $row["ring_group_timeout_app"]; $ring_group_timeout_data = $row["ring_group_timeout_data"]; + $ring_group_exit_key = $row["ring_group_exit_key"]; $ring_group_call_timeout = $row["ring_group_call_timeout"]; $ring_group_caller_id_name = $row["ring_group_caller_id_name"]; $ring_group_caller_id_number = $row["ring_group_caller_id_number"]; @@ -581,6 +583,7 @@ $ring_group_forward_enabled = $row["ring_group_forward_enabled"]; $ring_group_forward_destination = $row["ring_group_forward_destination"]; $ring_group_forward_toll_allow = $row["ring_group_forward_toll_allow"]; + $ring_group_context = $row["ring_group_context"]; $ring_group_enabled = $row["ring_group_enabled"]; $ring_group_description = $row["ring_group_description"]; $dialplan_uuid = $row["dialplan_uuid"]; @@ -594,9 +597,7 @@ //set the defaults $destination_delay_max = $settings->get('ring_group', 'destination_delay_max', ''); $destination_timeout_max = $settings->get('ring_group', 'destination_timeout_max', '');; - if (empty($ring_group_call_timeout)) { - $ring_group_call_timeout = '30'; - } + if (empty($ring_group_call_timeout)) { $ring_group_call_timeout = '30'; } if (empty($ring_group_enabled)) { $ring_group_enabled = 'true'; } //get the ring group destination array @@ -1043,6 +1044,17 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-ring_group_exit_key']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-ring_group_exit_key']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-call_timeout']."\n"; @@ -1050,7 +1062,7 @@ echo "\n"; echo " \n"; echo "
\n"; - echo (!empty($text['description-ring_group_call_timeout']))." \n"; + echo $text['description-call_timeout']." \n"; echo "\n"; echo "\n"; diff --git a/app/switch/resources/scripts/app/ring_groups/index.lua b/app/switch/resources/scripts/app/ring_groups/index.lua index 6f91d663f9..d7f9ab7608 100644 --- a/app/switch/resources/scripts/app/ring_groups/index.lua +++ b/app/switch/resources/scripts/app/ring_groups/index.lua @@ -1,5 +1,5 @@ -- Part of FusionPBX --- Copyright (C) 2010-2023 Mark J Crane +-- Copyright (C) 2010-2025 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ -- Gill Abada --include the log -log = require "resources.functions.log".ring_group + log = require "resources.functions.log".ring_group --connect to the database local Database = require "resources.functions.database"; @@ -230,6 +230,9 @@ log = require "resources.functions.log".ring_group ring_group_forward_enabled = row["ring_group_forward_enabled"]; ring_group_forward_destination = row["ring_group_forward_destination"]; ring_group_forward_toll_allow = row["ring_group_forward_toll_allow"]; + ring_group_timeout_app = row["ring_group_timeout_app"]; + ring_group_timeout_data = row["ring_group_timeout_data"]; + ring_group_exit_key = row["ring_group_exit_key"]; ring_group_call_timeout = row["ring_group_call_timeout"]; ring_group_caller_id_name = row["ring_group_caller_id_name"]; ring_group_caller_id_number = row["ring_group_caller_id_number"]; @@ -285,6 +288,17 @@ log = require "resources.functions.log".ring_group session:setVariable("call_timeout", ring_group_call_timeout); end +--set exit key action + if (ring_group_timeout_app and ring_group_timeout_data) then + if (ring_group_exit_key) then + --use the user defined exit key + session:execute("bind_digit_action", "exit_key,"..ring_group_exit_key..",exec:"..ring_group_timeout_app..","..ring_group_timeout_data..",both,self"); + else + --use a default exit key of 9 + session:execute("bind_digit_action", "exit_key,9,exec:"..ring_group_timeout_app..","..ring_group_timeout_data..",both,self"); + end + end + --play the greeting if (session:ready()) then if (ring_group_greeting and #ring_group_greeting > 0) then