nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make fax and email email settings use the settings from default settings.

Browse Source
This commit is contained in:
Mark Crane
2012-08-17 08:52:10 +00:00
parent 77db11d084
commit d29f6e79ac
3 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
secure/v_mailto.php
View File

@@ -24,18 +24,20 @@
Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com>
*/
include "v_config_cli.php";
//set the include path
if(defined('STDIN')) {
if (defined('STDIN')) {
$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
preg_match("/^(.*)\/secure\/.*$/", $document_root, $matches);
$document_root = $matches[1];
set_include_path($document_root);
//require_once "includes/require.php";
$_SERVER["DOCUMENT_ROOT"] = $document_root;
}
//includes
if (!defined('STDIN')) { include "root.php"; }
require_once "includes/require.php";
//set init settings
ini_set('max_execution_time',1800); //30 minutes
ini_set('memory_limit', '128M');
@@ -117,16 +119,19 @@ include "v_config_cli.php";
$mail = new PHPMailer();
$mail->IsSMTP(); // set mailer to use SMTP
if ($v_smtp_auth == "true") {
$mail->SMTPAuth = $v_smtp_auth; // turn on/off SMTP authentication
if ($_SESSION['email']['smtp_auth']['var'] == "true") {
$mail->SMTPAuth = $_SESSION['email']['smtp_auth']['var']; // turn on/off SMTP authentication
}
$mail->Host = $v_smtp_host;
if (strlen($v_smtp_secure)>0) {
$mail->SMTPSecure = $v_smtp_secure;
$mail->Host = $_SESSION['email']['smtp_host']['var'];
if ($_SESSION['email']['smtp_secure']['var'] == "none") {
$_SESSION['email']['smtp_secure']['var'] = '';
}
if ($v_smtp_username) {
$mail->Username = $v_smtp_username;
$mail->Password = $v_smtp_password;
if (strlen($_SESSION['email']['smtp_secure']['var']) > 0) {
$mail->SMTPSecure = $_SESSION['email']['smtp_secure']['var'];
}
if ($_SESSION['email']['smtp_username']['var']) {
$mail->Username = $_SESSION['email']['smtp_username']['var'];
$mail->Password = $_SESSION['email']['smtp_password']['var'];
}
$mail->SMTPDebug = 2;
@@ -139,8 +144,8 @@ include "v_config_cli.php";
//echo "Body: ".$body."\n";
//add to, from, fromname, and subject to the email
$mail->From = $v_smtp_from;
$mail->FromName = $v_smtp_from_name;
$mail->From = $_SESSION['email']['smtp_from']['var'] ;
$mail->FromName = $_SESSION['email']['smtp_from_name']['var'];
$mail->Subject = $subject;
$to = trim($to, "<> ");