Update fax_to_email.php

This commit is contained in:
FusionPBX 2018-02-06 18:23:09 -07:00 committed by GitHub
parent 4d6d7a2d20
commit b5b2032ecc
1 changed files with 10 additions and 10 deletions

View File

@ -362,30 +362,30 @@ if (!function_exists('fax_split_dtmf')) {
//prepare smtp server settings
// load default smtp settings
$smtp['method'] = $_SESSION['email']['smtp_method']['text'];
$smtp['host'] = (strlen($_SESSION['email']['smtp_host']['var'])?$_SESSION['email']['smtp_host']['var']:'127.0.0.1');
$smtp['host'] = (strlen($_SESSION['email']['smtp_host']['text'])?$_SESSION['email']['smtp_host']['text']:'127.0.0.1');
if (isset($_SESSION['email']['smtp_port'])) {
$smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric'];
} else {
$smtp['port'] = 0;
}
$smtp['secure'] = $_SESSION['email']['smtp_secure']['var'];
$smtp['auth'] = $_SESSION['email']['smtp_auth']['var'];
$smtp['username'] = $_SESSION['email']['smtp_username']['var'];
$smtp['password'] = $_SESSION['email']['smtp_password']['var'];
$smtp['secure'] = $_SESSION['email']['smtp_secure']['text'];
$smtp['auth'] = $_SESSION['email']['smtp_auth']['text'];
$smtp['username'] = $_SESSION['email']['smtp_username']['text'];
$smtp['password'] = $_SESSION['email']['smtp_password']['text'];
if (strlen($_SESSION['fax']['smtp_from']) > 0) {
$smtp['from'] = $_SESSION['fax']['smtp_from']['var'];
$smtp['from'] = $_SESSION['fax']['smtp_from']['text'];
}
else {
$smtp['from'] = $_SESSION['email']['smtp_from']['var'];
$smtp['from'] = $_SESSION['email']['smtp_from']['text'];
}
if (strlen($_SESSION['fax']['smtp_from_name']) > 0) {
$smtp['from_name'] = $_SESSION['fax']['smtp_from_name']['var'];
$smtp['from_name'] = $_SESSION['fax']['smtp_from_name']['text'];
}
else {
$smtp['from_name'] = $_SESSION['email']['smtp_from_name']['var'];
$smtp['from_name'] = $_SESSION['email']['smtp_from_name']['text'];
}
// overwrite with domain-specific smtp server settings, if any
@ -395,7 +395,7 @@ if (!function_exists('fax_split_dtmf')) {
$sql .= "where domain_uuid = '".$domain_uuid."' ";
$sql .= "and (domain_setting_category = 'email' ";
$sql .= "or domain_setting_category = 'fax') ";
$sql .= "and domain_setting_name = 'var' ";
$sql .= "and domain_setting_name = 'text' ";
$sql .= "and domain_setting_enabled = 'true' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {