diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 8567a0023d..dc9b788ffa 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -277,6 +277,14 @@
$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_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'] = "";
+ $z++;
//$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "fax_keep_local";
//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "fax_local";
//$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -499,4 +507,75 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+ $y = 4; //table array index
+ $z = 0; //field array index
+ $apps[$x]['db'][$y]['table'] = 'v_fax_tasks';
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_uuid';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_uuid';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+ $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_fax';
+ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'fax_uuid';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'FAX server primary key';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_next_time';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'timestamp';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_lock_time';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'timestamp';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_fax_file';
+ $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'] = 'task_wav_file';
+ $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'] = 'task_uri';
+ $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'] = 'task_dial_string';
+ $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'] = 'task_dtmf';
+ $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'] = 'task_interrupted';
+ $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'] = 'task_status';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_no_answer_counter';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_no_answer_retry_counter';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_retry_counter';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
+ $apps[$x]['db'][$y]['fields'][$z]['name'] = 'task_description';
+ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+ $z++;
?>
\ No newline at end of file
diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php
index b3ab8cd98c..d688de4388 100644
--- a/app/fax/app_defaults.php
+++ b/app/fax/app_defaults.php
@@ -60,6 +60,55 @@ if ($domains_processed == 1) {
$array[$x]['default_setting_enabled'] = 'true';
$array[$x]['default_setting_description'] = 'Keep the file after sending or receiving the fax.';
$x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_mode';
+ $array[$x]['default_setting_name'] = 'text';
+ $array[$x]['default_setting_value'] = 'queue';
+ $array[$x]['default_setting_enabled'] = 'false';
+ $array[$x]['default_setting_description'] = '';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_retry_limit';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '5';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Number of attempts to send fax (count only calls with answer)';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_retry_interval';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '15';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Delay before we make next call after answered call';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_no_answer_retry_limit';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '3';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Number of unanswered attempts in sequence';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_no_answer_retry_interval';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '30';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Delay before we make next call after no answered call';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_no_answer_limit';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '3';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Giveup reach the destination after this number of sequences';
+ $x++;
+ $array[$x]['default_setting_category'] = 'fax';
+ $array[$x]['default_setting_subcategory'] = 'send_no_answer_interval';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '300';
+ $array[$x]['default_setting_enabled'] = 'true';
+ $array[$x]['default_setting_description'] = 'Delay before next call sequence';
+ $x++;
//get an array of the default settings
$sql = "select * from v_default_settings ";
$prep_statement = $db->prepare($sql);
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 27ffdc8ca4..28d7613324 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -135,8 +135,10 @@ else {
} else {
$forward_prefix = $forward_prefix.$fax_forward_number.'#'; //found
}
- $fax_local = check_str($_POST["fax_local"]);
+ $fax_local = check_str($_POST["fax_local"]); //! @todo check in database
$fax_description = check_str($_POST["fax_description"]);
+ $fax_send_greeting = check_str($_POST["fax_send_greeting"]);
+ $fax_send_channels = check_str($_POST["fax_send_channels"]);
}
//delete the user from the fax users
@@ -274,6 +276,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (strlen($fax_forward_number) > 0) {
$sql .= "fax_forward_number, ";
}
+ $sql .= "fax_send_greeting,";
+ $sql .= "fax_send_channels,";
$sql .= "fax_description ";
$sql .= ")";
$sql .= "values ";
@@ -305,6 +309,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (strlen($fax_forward_number) > 0) {
$sql .= "'$fax_forward_number', ";
}
+ $sql .= (strlen($fax_send_greeting)==0?'NULL':"'$fax_send_greeting'") . ",";
+ $sql .= (strlen($fax_send_channels)==0?'NULL':"'$fax_send_channels'") . ",";
+
$sql .= "'$fax_description' ";
$sql .= ")";
$db->exec(check_sql($sql));
@@ -345,9 +352,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
else {
$sql .= "fax_forward_number = null, ";
}
+ $tmp = strlen($fax_send_greeting)==0?'NULL':"'$fax_send_greeting'";
+ $sql .= "fax_send_greeting = $tmp,";
+ $tmp = strlen($fax_send_channels)==0?'NULL':"'$fax_send_channels'";
+ $sql .= "fax_send_channels = $tmp,";
+
$sql .= "fax_description = '$fax_description' ";
+
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and fax_uuid = '$fax_uuid' ";
+
$db->exec(check_sql($sql));
unset($sql);
}
@@ -426,9 +440,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$fax_caller_id_number = $row["fax_caller_id_number"];
$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 ($prep_statement);
}
+ else{
+ $fax_send_channels = 10;
+ }
//replace the dash with a space
$fax_name = str_replace("-", " ", $fax_name);
@@ -678,6 +697,27 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "\n";
echo "\n";
+ echo "\n";
+ echo "| \n";
+ echo " ".$text['label-fax_send_greeting']."\n";
+ 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";
+ echo " | \n";
+ echo "\n";
+ echo " \n";
+ echo "
\n";
+ echo " ".$text['description-fax_send_channels']."\n";
+ echo " | \n";
+ echo "
\n";
}
echo " \n";
diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index 3c615a8e75..f1762bc8fd 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.php
@@ -74,6 +74,7 @@ if (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 = $row["fax_email_outbound_authorized_senders"];
+ $fax_send_greeting = $row["fax_send_greeting"];
//load default settings, then domain settings over top
unset($_SESSION);
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 315737f933..0e710bcf07 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -84,21 +84,27 @@ if (!$included) {
}
foreach ($result as &$row) {
//set database fields as variables
+ $fax_uuid = $row["fax_uuid"];
$fax_extension = $row["fax_extension"];
$fax_caller_id_name = $row["fax_caller_id_name"];
$fax_caller_id_number = $row["fax_caller_id_number"];
$fax_accountcode = $row["accountcode"];
+ $fax_send_greeting = $row["fax_send_greeting"];
//limit to one row
break;
}
unset ($prep_statement);
+ $fax_send_mode = $_SESSION['fax']['send_mode']['text'];
+ if(strlen($fax_send_mode) == 0){
+ $fax_send_mode = 'direct';
+ }
}
//set the fax directory
$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax'.((count($_SESSION["domains"]) > 1) ? '/'.$_SESSION['domain_name'] : null);
}
-else {
+else{
require_once "resources/classes/EventSocket.php";
}
@@ -534,7 +540,7 @@ if(!function_exists('gs_cmd')) {
}
//preview, if requested
- if ($_REQUEST['submit'] == $text['button-preview']) {
+ if (($_REQUEST['submit'] != '') && ($_REQUEST['submit'] == $text['button-preview'])) {
unset($file_type);
if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.'.pdf')) {
$file_type = 'pdf';
@@ -599,29 +605,96 @@ if(!function_exists('gs_cmd')) {
}
//send the fax
+ $fax_file = $dir_fax_temp."/".$fax_instance_uuid.".tif";
+ $common_dial_string = "for_fax=1,";
+ $common_dial_string .= "accountcode='" . $fax_accountcode . "',";
+ $common_dial_string .= "sip_h_X-accountcode='" . $fax_accountcode . "',";
+ $common_dial_string .= "domain_uuid=" . $_SESSION["domain_uuid"] . ",";
+ $common_dial_string .= "domain_name=" . $_SESSION["domain_name"] . ",";
+ $common_dial_string .= "mailto_address='" . $mailto_address . "',";
+ $common_dial_string .= "mailfrom_address='" . $mailfrom_address . "',";
+ $common_dial_string .= "origination_caller_id_name='" . $fax_caller_id_name . "',";
+ $common_dial_string .= "origination_caller_id_number='" . $fax_caller_id_number . "',";
+ $common_dial_string .= "fax_ident='" . $fax_caller_id_number . "',";
+ $common_dial_string .= "fax_header='" . $fax_caller_id_name . "',";
+ $common_dial_string .= "fax_file='" . $fax_file . "',";
+
foreach ($fax_numbers as $fax_number) {
- $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
- if ($fp) {
- //prepare the fax command
- $route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_prefix.$fax_number);
- $fax_file = $dir_fax_temp."/".$fax_instance_uuid.".tif";
- if (count($route_array) == 0) {
- //send the internal call to the registered extension
- $fax_uri = "user/".$fax_number."@".$_SESSION['domain_name'];
- $t38 = "";
+ $dial_string = $common_dial_string;
+
+ //prepare the fax command
+ $route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_prefix . $fax_number);
+
+ if (count($route_array) == 0) {
+ //send the internal call to the registered extension
+ $fax_uri = "user/".$fax_number."@".$_SESSION['domain_name'];
+ $t38 = "";
+ }
+ else {
+ //send the external call
+ $fax_uri = $route_array[0];
+ $t38 = "fax_enable_t38=true,fax_enable_t38_request=true,";
+ }
+ $tail_dial_string = $fax_uri." &txfax('".$fax_file."')";
+
+ if ($fax_send_mode != 'queue') {
+ $dial_string .= $t38;
+ $dial_string .= "fax_uri=" . $fax_uri . ",";
+ $dial_string .= "fax_retry_attempts=1" . ",";
+ $dial_string .= "fax_retry_limit=20" . ",";
+ $dial_string .= "fax_retry_sleep=180" . ",";
+ $dial_string .= "fax_verbose=true" . ",";
+ $dial_string .= "fax_use_ecm=off" . ",";
+ $dial_string .= "api_hangup_hook='lua fax_retry.lua'";
+ $dial_string = "{" . $dial_string . "}" . $tail_dial_string;
+
+ $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+ if ($fp) {
+ $cmd = "api originate " . $dial_string;
+ // echo($cmd . "
\n");
+ //send the command to event socket
+ $response = event_socket_request($fp, $cmd);
+ $response = str_replace("\n", "", $response);
+ $uuid = str_replace("+OK ", "", $response);
}
- else {
- //send the external call
- $fax_uri = $route_array[0];
- $t38 = "fax_enable_t38=true,fax_enable_t38_request=true,";
- }
- $cmd = "api originate {for_fax=1,accountcode='".$fax_accountcode."',sip_h_X-accountcode='".$fax_accountcode."',domain_uuid=".$_SESSION["domain_uuid"].",domain_name=".$_SESSION["domain_name"].",mailto_address='".$mailto_address."',mailfrom_address='".$mailfrom_address."',origination_caller_id_name='".$fax_caller_id_name."',origination_caller_id_number='".$fax_caller_id_number."',fax_ident='".$fax_caller_id_number."',fax_header='".$fax_caller_id_name."',fax_uri=".$fax_uri.",fax_file='".$fax_file."',fax_retry_attempts=1,fax_retry_limit=20,fax_retry_sleep=180,fax_verbose=true,fax_use_ecm=off,".$t38."api_hangup_hook='lua fax_retry.lua'}".$fax_uri." &txfax('".$fax_file."')";
- //send the command to event socket
- $response = event_socket_request($fp, $cmd);
- $response = str_replace("\n", "", $response);
- $uuid = str_replace("+OK ", "", $response);
fclose($fp);
}
+ else{ // enqueue
+ $task_uuid = uuid();
+ $dial_string .= "task_uuid='" . $task_uuid . "',";
+ $wav_file = ''; //! @todo add custom message
+ $dtmf = ''; //! @todo add generate dtmf
+ $description = ''; //! @todo add description
+ $sql = <<prepare($sql);
+ $i = 0;
+ $stmt->bindValue(++$i, $task_uuid);
+ $stmt->bindValue(++$i, $fax_uuid);
+ $stmt->bindValue(++$i, $fax_file);
+ $stmt->bindValue(++$i, $wav_file);
+ $stmt->bindValue(++$i, $fax_uri);
+ $stmt->bindValue(++$i, $dial_string);
+ $stmt->bindValue(++$i, $dtmf);
+ $stmt->bindValue(++$i, $description);
+ if ($stmt->execute()) {
+ $response = 'Enqueued';
+ }
+ else{
+ //! @todo log error
+ $response = 'Fail enqueue';
+ }
+ }
}
//wait for a few seconds