diff --git a/app/fax/app_config.php b/app/fax/app_config.php index f972bbefe1..686d76392a 100644 --- a/app/fax/app_config.php +++ b/app/fax/app_config.php @@ -478,6 +478,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'] = "fax_toll_allow"; + $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_user_list"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php index d7feb08cfa..a969937cb5 100644 --- a/app/fax/app_languages.php +++ b/app/fax/app_languages.php @@ -1121,6 +1121,26 @@ $text['label-fax_caller_id_name']['ru-ru'] = "Caller ID Имя"; $text['label-fax_caller_id_name']['sv-se'] = "Namnpresentation"; $text['label-fax_caller_id_name']['uk-ua'] = ""; +$text['label-toll_allow']['en-us'] = "Toll Allow"; +$text['label-toll_allow']['ar-eg'] = ""; +$text['label-toll_allow']['de-at'] = "Berechtigung"; //copied from de-de +$text['label-toll_allow']['de-ch'] = "Berechtigung"; //copied from de-de +$text['label-toll_allow']['de-de'] = "Berechtigung"; +$text['label-toll_allow']['es-cl'] = "Permitir Tarifas Especiales"; +$text['label-toll_allow']['es-mx'] = "Permitir Tarifas Especiales"; //copied from es-cl +$text['label-toll_allow']['fr-ca'] = "droits"; //copied from fr-fr +$text['label-toll_allow']['fr-fr'] = "droits"; +$text['label-toll_allow']['he-il'] = ""; +$text['label-toll_allow']['it-it'] = "Destinazioni Abilitate"; +$text['label-toll_allow']['nl-nl'] = ""; +$text['label-toll_allow']['pl-pl'] = "Zezwalaj na drogie/szczególwe połaczenia"; +$text['label-toll_allow']['pt-br'] = "Permissões"; //copied from pt-pt +$text['label-toll_allow']['pt-pt'] = "Permissões"; +$text['label-toll_allow']['ro-ro'] = ""; +$text['label-toll_allow']['ru-ru'] = "Разрешить Платное Соединение"; +$text['label-toll_allow']['sv-se'] = "Toll Allow"; +$text['label-toll_allow']['uk-ua'] = ""; + $text['label-fax_base64']['en-us'] = "Base64"; $text['label-fax_base64']['ar-eg'] = ""; $text['label-fax_base64']['de-at'] = "Base64"; //copied from de-de @@ -2681,6 +2701,26 @@ $text['description-fax_caller_id_name']['ru-ru'] = ""; $text['description-fax_caller_id_name']['sv-se'] = ""; $text['description-fax_caller_id_name']['uk-ua'] = ""; +$text['description-toll_allow']['en-us'] = "Enter the toll allow value here."; +$text['description-toll_allow']['ar-eg'] = ""; +$text['description-toll_allow']['de-at'] = ""; +$text['description-toll_allow']['de-ch'] = ""; +$text['description-toll_allow']['de-de'] = ""; +$text['description-toll_allow']['es-cl'] = ""; +$text['description-toll_allow']['es-mx'] = ""; +$text['description-toll_allow']['fr-ca'] = ""; +$text['description-toll_allow']['fr-fr'] = ""; +$text['description-toll_allow']['he-il'] = ""; +$text['description-toll_allow']['it-it'] = ""; +$text['description-toll_allow']['nl-nl'] = ""; +$text['description-toll_allow']['pl-pl'] = ""; +$text['description-toll_allow']['pt-br'] = ""; +$text['description-toll_allow']['pt-pt'] = ""; +$text['description-toll_allow']['ro-ro'] = ""; +$text['description-toll_allow']['ru-ru'] = ""; +$text['description-toll_allow']['sv-se'] = ""; +$text['description-toll_allow']['uk-ua'] = ""; + $text['description-fax_base64']['en-us'] = "Base64 encoding."; $text['description-fax_base64']['ar-eg'] = ""; $text['description-fax_base64']['de-at'] = "Base64 Kodierung."; //copied from de-de diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index 03d11ca9a8..19ee479b65 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -107,6 +107,7 @@ $fax_email_outbound_authorized_senders = $_POST["fax_email_outbound_authorized_senders"]; $fax_caller_id_name = $_POST["fax_caller_id_name"]; $fax_caller_id_number = $_POST["fax_caller_id_number"]; + $fax_toll_allow = $_POST["fax_toll_allow"]; $fax_forward_number = $_POST["fax_forward_number"]; if (strlen($fax_destination_number) == 0) { $fax_destination_number = $fax_extension; @@ -307,6 +308,7 @@ } $array['fax'][0]['fax_caller_id_name'] = $fax_caller_id_name; $array['fax'][0]['fax_caller_id_number'] = $fax_caller_id_number; + $array['fax'][0]['fax_toll_allow'] = $fax_toll_allow; if ($action == "add" && strlen($fax_forward_number) > 0) { $array['fax'][0]['fax_forward_number'] = $fax_forward_number; } @@ -398,6 +400,7 @@ $fax_email_outbound_authorized_senders = $row["fax_email_outbound_authorized_senders"]; $fax_caller_id_name = $row["fax_caller_id_name"]; $fax_caller_id_number = $row["fax_caller_id_number"]; + $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"]; @@ -615,6 +618,17 @@ echo "".$text['description-forward-number']."\n"; echo "\n"; echo "\n"; + + echo "\n"; + echo "\n"; + echo " ".$text['label-toll_allow']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "".$text['description-toll_allow']."\n"; + echo "\n"; + echo "\n"; if (permission_exists('fax_user_view')) { if ($action == "update") { @@ -1019,4 +1033,4 @@ //show the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index 5277753b54..89393e2c7e 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -62,7 +62,7 @@ if (!$included) { if (if_group("superadmin") || if_group("admin")) { //show all fax extensions $sql = "select fax_uuid, fax_extension, fax_caller_id_name, fax_caller_id_number, "; - $sql .= "accountcode, fax_send_greeting "; + $sql .= "fax_toll_allow, accountcode, fax_send_greeting "; $sql .= "from v_fax "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and fax_uuid = :fax_uuid "; @@ -72,7 +72,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.accountcode, f.fax_send_greeting "; + $sql .= "f.fax_toll_allow, f.accountcode, f.fax_send_greeting "; $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 "; @@ -90,6 +90,7 @@ if (!$included) { $fax_extension = $row["fax_extension"]; $fax_caller_id_name = $row["fax_caller_id_name"]; $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"]; } @@ -773,7 +774,10 @@ if (!function_exists('fax_split_dtmf')) { fax_split_dtmf($fax_number, $fax_dtmf); //prepare the fax command - $route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_prefix . $fax_number); + if (strlen($fax_toll_allow) > 0) { + $channel_variables["toll_allow"] = $fax_toll_allow; + } + $route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_prefix . $fax_number, $channel_variables); if (count($route_array) == 0) { //send the internal call to the registered extension $fax_uri = "user/".$fax_number."@".$_SESSION['domain_name'];