From 800e7423875c19fe662c8a9455bfc98c64282879 Mon Sep 17 00:00:00 2001 From: emak Date: Mon, 10 Apr 2023 11:31:16 -0400 Subject: [PATCH] Disable fax sending when domain is disabled (#6606) * Add warning_bar style for disabled fax sending Add styles for .warning_bar class when fax server sending is disabled due to disabled domain. * Disable fax sending if domain is disabled When domain is disabled, users should not be able to send faxes either. * Add text for fax sending disabled warning --- app/fax/app_languages.php | 21 +++++++++++++++++++++ app/fax/fax_send.php | 18 ++++++++++++++++-- themes/default/css.php | 11 +++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php index 35bd5ce740..509fefc2e1 100644 --- a/app/fax/app_languages.php +++ b/app/fax/app_languages.php @@ -3571,6 +3571,27 @@ $text['description-2']['ru-ru'] = "Чтобы послать факс, загр $text['description-2']['sv-se'] = "Om du vill skicka ett fax, ladda upp en PDF eller TIF -fil. För att generera ett försättsblad, ange ett Ämne och / eller meddelande nedan."; $text['description-2']['uk-ua'] = ""; +$text['notice-sending-disabled']['en-us'] = "Notice: Sending Disabled"; +$text['notice-sending-disabled']['en-gb'] = "Notice: Sending Disabled"; +$text['notice-sending-disabled']['ar-eg'] = "إشعار: إرسال معطل"; +$text['notice-sending-disabled']['de-at'] = "Hinweis: Senden deaktiviert"; +$text['notice-sending-disabled']['de-ch'] = "Hinweis: Senden deaktiviert"; +$text['notice-sending-disabled']['de-de'] = "Hinweis: Senden deaktiviert"; +$text['notice-sending-disabled']['es-cl'] = "Aviso: Envío deshabilitado"; +$text['notice-sending-disabled']['es-mx'] = "Aviso: Envío deshabilitado"; +$text['notice-sending-disabled']['fr-ca'] = "Avis : Envoi désactivé"; +$text['notice-sending-disabled']['fr-fr'] = "Avis : Envoi désactivé"; +$text['notice-sending-disabled']['he-il'] = "שים לב: השליחה מושבתת"; +$text['notice-sending-disabled']['it-it'] = "Avviso: invio disabilitato"; +$text['notice-sending-disabled']['nl-nl'] = "Let op: Verzenden uitgeschakeld"; +$text['notice-sending-disabled']['pl-pl'] = "Uwaga: Wysyłanie wyłączone"; +$text['notice-sending-disabled']['pt-br'] = "Aviso: Envio desativado"; +$text['notice-sending-disabled']['pt-pt'] = "Aviso: Envio desativado"; +$text['notice-sending-disabled']['ro-ro'] = "Notă: Trimiterea este dezactivată"; +$text['notice-sending-disabled']['ru-ru'] = "Уведомление: отправка отключена"; +$text['notice-sending-disabled']['sv-se'] = "Observera: Sändning avaktiverad"; +$text['notice-sending-disabled']['uk-ua'] = "Примітка: надсилання вимкнено"; + $text['description']['en-us'] = "To receive a FAX setup a fax extension and then direct the incoming to it."; $text['description']['en-gb'] = "To receive a FAX setup a fax extension and then direct the incoming to it."; $text['description']['ar-eg'] = ""; diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index ce53a031b2..35d56bd40a 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -184,13 +184,21 @@ if (!function_exists('fax_split_dtmf')) { } } +//check if the domain is enabled +if($_SESSION['domains'][$_SESSION['domain_uuid']]['domain_enabled'] == "1" || $_SESSION['domains'][$_SESSION['domain_uuid']]['domain_enabled'] == "true") { + $domain_enabled = true; +} +else { + $domain_enabled = false; +} + //clear file status cache clearstatcache(); //send the fax $continue = false; if (!$included) { - if (($_POST['action'] == "send")) { + if (($_POST['action'] == "send") && $domain_enabled == true) { //get the values from the HTTP POST $fax_numbers = $_POST['fax_numbers']; $fax_uuid = $_POST["id"]; @@ -940,14 +948,20 @@ if (!$included) { echo "
".$text['header-new_fax']."
\n"; echo "
\n"; echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'fax.php']); + if ($domain_enabled == true) { echo button::create(['type'=>'submit','label'=>$text['button-preview'],'icon'=>'eye','name'=>'submit','value'=>'preview']); echo button::create(['type'=>'submit','label'=>$text['button-send'],'icon'=>'paper-plane','id'=>'btn_save','name'=>'submit','value'=>'send','style'=>'margin-left: 15px;']); + } echo "
\n"; echo "
\n"; echo "\n"; echo $text['description-2']." ".(permission_exists('fax_extension_view_domain') ? $text['description-3'] : null)."\n"; echo "

\n"; - + + if ($domain_enabled == false) { + echo "
".$text['notice-sending-disabled']."
\n"; + } + echo "\n"; echo "\n"; diff --git a/themes/default/css.php b/themes/default/css.php index ea5671749d..505ecc9277 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -2759,6 +2759,17 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); font-size: 100%; } + .warning_bar { + width: 100%; + text-align: center; + border: 2px dashed #c00; + padding: 10px 20px; + margin-bottom: 16px; + color: #e00; + background: #fafafa; + font-size: 1.4em; + } + /* LIST ************************************************************************/ .list {