dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update v_mailto.php

This commit is contained in:
FusionPBX 2018-02-06 18:21:35 -07:00 committed by GitHub
parent fe252717b9
commit 4d6d7a2d20
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
secure/v_mailto.php
View File

@ -1,5 +1,4 @@
<?php <?php
/* /*
FusionPBX FusionPBX
Version: MPL 1.1 Version: MPL 1.1
@ -136,27 +135,27 @@
//prepare smtp server settings //prepare smtp server settings
// load default smtp settings // load default smtp settings
$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'])) { if (isset($_SESSION['email']['smtp_port'])) {
$smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric']; $smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric'];
} else { } else {
$smtp['port'] = 0; $smtp['port'] = 0;
} }
$smtp['secure'] = $_SESSION['email']['smtp_secure']['var']; $smtp['secure'] = $_SESSION['email']['smtp_secure']['text'];
$smtp['auth'] = $_SESSION['email']['smtp_auth']['var']; $smtp['auth'] = $_SESSION['email']['smtp_auth']['text'];
$smtp['username'] = $_SESSION['email']['smtp_username']['var']; $smtp['username'] = $_SESSION['email']['smtp_username']['text'];
$smtp['password'] = $_SESSION['email']['smtp_password']['var']; $smtp['password'] = $_SESSION['email']['smtp_password']['text'];
if (isset($_SESSION['voicemail']['smtp_from'])) { if (isset($_SESSION['voicemail']['smtp_from'])) {
$smtp['from'] = $_SESSION['voicemail']['smtp_from']['var']; $smtp['from'] = $_SESSION['voicemail']['smtp_from']['text'];
} else { } else {
$smtp['from'] = $_SESSION['email']['smtp_from']['var']; $smtp['from'] = $_SESSION['email']['smtp_from']['text'];
} }
if (isset($_SESSION['voicemail']['smtp_from_name'])) { if (isset($_SESSION['voicemail']['smtp_from_name'])) {
$smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['var']; $smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text'];
} else { } 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 // overwrite with domain-specific smtp server settings, if any
@ -165,7 +164,7 @@
$sql .= "from v_domain_settings "; $sql .= "from v_domain_settings ";
$sql .= "where domain_uuid = '".$headers["X-FusionPBX-Domain-UUID"]."' "; $sql .= "where domain_uuid = '".$headers["X-FusionPBX-Domain-UUID"]."' ";
$sql .= "and (domain_setting_category = 'email' or domain_setting_category = 'voicemail') "; $sql .= "and (domain_setting_category = 'email' or domain_setting_category = 'voicemail') ";
$sql .= "and domain_setting_name = 'var' "; $sql .= "and domain_setting_name = 'text' ";
$sql .= "and domain_setting_enabled = 'true' "; $sql .= "and domain_setting_enabled = 'true' ";
$prep_statement = $db->prepare($sql); $prep_statement = $db->prepare($sql);
if ($prep_statement) { if ($prep_statement) {