diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index dd8e3e7821..be873ff579 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -183,9 +183,6 @@
$apps[$x]['permissions'][$y]['name'] = "fax_active_all";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
- $apps[$x]['permissions'][$y]['name'] = "fax_send_greeting";
- //$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
- $y++;
$apps[$x]['permissions'][$y]['name'] = "fax_destinations";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -565,10 +562,6 @@
$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
- $apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_send_greeting";
- $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'] = "fax_send_channels";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 0fc5e8f6de..07ea9f3a9d 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -2400,30 +2400,6 @@ $text['label-accountcode']['zh-cn'] = "账户法";
$text['label-accountcode']['ja-jp'] = "アカウントコード";
$text['label-accountcode']['ko-kr'] = "계정 코드";
-$text['label-fax_send_greeting']['en-us'] = "Greeting";
-$text['label-fax_send_greeting']['en-gb'] = "Greeting";
-$text['label-fax_send_greeting']['ar-eg'] = "التحية";
-$text['label-fax_send_greeting']['de-at'] = "Begrüßung";
-$text['label-fax_send_greeting']['de-ch'] = "Begrüßung";
-$text['label-fax_send_greeting']['de-de'] = "Begrüßung";
-$text['label-fax_send_greeting']['es-cl'] = "Saludos";
-$text['label-fax_send_greeting']['es-mx'] = "Saludos";
-$text['label-fax_send_greeting']['fr-ca'] = "Salutation";
-$text['label-fax_send_greeting']['fr-fr'] = "Salutation";
-$text['label-fax_send_greeting']['he-il'] = "תגית: Greeting";
-$text['label-fax_send_greeting']['it-it'] = "Saluti";
-$text['label-fax_send_greeting']['nl-nl'] = "Gegroet";
-$text['label-fax_send_greeting']['pl-pl'] = "Powitanie";
-$text['label-fax_send_greeting']['pt-br'] = "Saudação";
-$text['label-fax_send_greeting']['pt-pt'] = "Saudação";
-$text['label-fax_send_greeting']['ro-ro'] = "Salut";
-$text['label-fax_send_greeting']['ru-ru'] = "Приветствие";
-$text['label-fax_send_greeting']['sv-se'] = "Hälsning";
-$text['label-fax_send_greeting']['uk-ua'] = "Вітання";
-$text['label-fax_send_greeting']['zh-cn'] = "招标";
-$text['label-fax_send_greeting']['ja-jp'] = "お問い合わせ";
-$text['label-fax_send_greeting']['ko-kr'] = "주요연혁";
-
$text['label-fax_send_channels']['en-us'] = "Number of channels";
$text['label-fax_send_channels']['en-gb'] = "Number of channels";
$text['label-fax_send_channels']['ar-eg'] = "عدد القنوات";
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index ab765f595b..c669bb30a0 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -150,7 +150,6 @@
}
$fax_local = $_POST["fax_local"] ?? null; //! @todo check in database
$fax_description = $_POST["fax_description"];
- $fax_send_greeting = $_POST["fax_send_greeting"] ?? null;
$fax_send_channels = $_POST["fax_send_channels"];
//restrict size of user data
@@ -345,9 +344,6 @@
if ($action == "update") {
$array['fax'][0]['fax_forward_number'] = !empty($fax_forward_number) ? $fax_forward_number : null;
}
- if (permission_exists('fax_send_greeting')) {
- $array['fax'][0]['fax_send_greeting'] = strlen($fax_send_greeting) != 0 ? $fax_send_greeting : null;
- }
$array['fax'][0]['fax_send_channels'] = strlen($fax_send_channels) != 0 ? $fax_send_channels : null;
$array['fax'][0]['fax_description'] = $fax_description;
@@ -438,7 +434,6 @@
$fax_toll_allow = $row["fax_toll_allow"];
$fax_forward_number = $row["fax_forward_number"];
$fax_description = $row["fax_description"];
- $fax_send_greeting = $row["fax_send_greeting"];
$fax_send_channels = $row["fax_send_channels"];
}
unset($sql, $parameters, $row);
@@ -727,120 +722,6 @@
}
}
- if (permission_exists('fax_send_greeting')) {
- echo "
\n";
- echo "| \n";
- echo " ".$text['label-fax_send_greeting']."\n";
- echo " | \n";
- echo "\n";
- if (permission_exists('fax_extension_add') || permission_exists('fax_extension_edit')) {
- echo "\n";
- echo "\n";
- }
- echo " \n";
- echo " \n";
- echo " ".$text['description-fax_send_greeting']."\n";
- echo " | \n";
- echo "
\n";
- }
-
echo "\n";
echo "| \n";
echo " ".$text['label-fax_send_channels']."\n";
diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index f707d8eb19..a526360881 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.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) 2015 - 2022
+ Portions created by the Initial Developer are Copyright (C) 2015-2023
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -71,7 +71,6 @@ if (!empty($result) && @sizeof($result) != 0) {
$fax_email_connection_mailbox = $row["fax_email_connection_mailbox"];
$fax_email_outbound_subject_tag = $row["fax_email_outbound_subject_tag"];
$fax_email_outbound_authorized_senders = strtolower($row["fax_email_outbound_authorized_senders"]);
- $fax_send_greeting = $row["fax_send_greeting"];
$fax_accountcode = $row["accountcode"];
$fax_toll_allow = $row["fax_toll_allow"];
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 959b18296d..d4e6390bb3 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -75,7 +75,7 @@ if (!$included) {
if (permission_exists('fax_extension_view_domain')) {
//show all fax extensions
$sql = "select fax_uuid, fax_extension, fax_caller_id_name, fax_caller_id_number, ";
- $sql .= "fax_toll_allow, accountcode, fax_send_greeting ";
+ $sql .= "fax_toll_allow, accountcode ";
$sql .= "from v_fax ";
$sql .= "where domain_uuid = :domain_uuid ";
$sql .= "and fax_uuid = :fax_uuid ";
@@ -85,7 +85,7 @@ if (!$included) {
else {
//show only assigned fax extensions
$sql = "select f.fax_uuid, f.fax_extension, f.fax_caller_id_name, f.fax_caller_id_number, ";
- $sql .= "f.fax_toll_allow, f.accountcode, f.fax_send_greeting ";
+ $sql .= "f.fax_toll_allow, f.accountcode ";
$sql .= "from v_fax as f, v_fax_users as u ";
$sql .= "where f.fax_uuid = u.fax_uuid ";
$sql .= "and f.domain_uuid = :domain_uuid ";
@@ -105,7 +105,6 @@ if (!$included) {
$fax_caller_id_number = $row["fax_caller_id_number"];
$fax_toll_allow = $row["fax_toll_allow"];
$fax_accountcode = $row["accountcode"];
- $fax_send_greeting = $row["fax_send_greeting"];
}
else {
if (!permission_exists('fax_extension_view_domain')) {
|