From c9a50bba24661d6b6d63404b5ea3cf83c10bf233 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 17 Dec 2008 01:37:08 +0000 Subject: FreeSWITCH package voicemail to email bug fixes. --- packages/freeswitch/freeswitch.inc | 2 +- packages/freeswitch/freeswitch.xml | 2 +- packages/freeswitch/freeswitch_mailto.tmp | 29 ++++++++++++++--------------- 3 files changed, 16 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index cb05f09c..771066b1 100644 --- a/packages/freeswitch/freeswitch.inc +++ b/packages/freeswitch/freeswitch.inc @@ -2028,7 +2028,7 @@ function freeswitch_php_install_command() } $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638."; - $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.8.3"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.8.4"; conf_mount_ro(); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index 48092254..e4c156b9 100644 --- a/packages/freeswitch/freeswitch.xml +++ b/packages/freeswitch/freeswitch.xml @@ -44,7 +44,7 @@ Describe your package requirements here Currently there are no FAQ items provided. FreeSWITCH Settings - 0.4.8.3 + 0.4.8.4 FreeSWITCH: Settings /usr/local/pkg/freeswitch.inc diff --git a/packages/freeswitch/freeswitch_mailto.tmp b/packages/freeswitch/freeswitch_mailto.tmp index c56a8609..8ecc773c 100644 --- a/packages/freeswitch/freeswitch_mailto.tmp +++ b/packages/freeswitch/freeswitch_mailto.tmp @@ -30,16 +30,15 @@ POSSIBILITY OF SUCH DAMAGE. */ -require("guiconfig.inc"); -require("/usr/local/pkg/freeswitch.inc"); - +require_once("config.inc"); +require_once("/usr/local/pkg/freeswitch.inc"); global $config; -$smtphost = $config['installedpackages']['freeswitchmodules']['config'][0]['smtphost']; -$smtpsecure = $config['installedpackages']['freeswitchmodules']['config'][0]['smtpsecure']; //options "", "TLS", "SSL" -$smtpauth = $config['installedpackages']['freeswitchmodules']['config'][0]['smtpauth']; // SMTP authentication: true or false -$smtpusername = $config['installedpackages']['freeswitchmodules']['config'][0]['smtpusername']; -$smtppassword = $config['installedpackages']['freeswitchmodules']['config'][0]['smtppassword']; +$tmp_smtphost = $config['installedpackages']['freeswitchsettings']['config'][0]['smtphost']; +$tmp_smtpsecure = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpsecure']; //options "", "TLS", "SSL" +$tmp_smtpauth = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpauth']; // SMTP authentication: true or false +$tmp_smtpusername = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpusername']; +$tmp_smtppassword = $config['installedpackages']['freeswitchsettings']['config'][0]['smtppassword']; ini_set(max_execution_time,900); //15 minutes @@ -187,14 +186,14 @@ ob_start(); $mail = new PHPMailer(); $mail->IsSMTP(); // set mailer to use SMTP - $mail->SMTPAuth = $smtpauth; // turn on/off SMTP authentication - $mail->Host = $smtphost; - if (strlen($smtpsecure)>0) { - $mail->SMTPSecure = $smtpsecure; + $mail->SMTPAuth = $tmp_smtpauth; // turn on/off SMTP authentication + $mail->Host = $tmp_smtphost; + if (strlen($tmp_smtpsecure)>0) { + $mail->SMTPSecure = $tmp_smtpsecure; } - if ($smtpauth) { - $mail->Username = $smtpusername; - $mail->Password = $smtppassword; + if ($tmp_smtpauth) { + $mail->Username = $tmp_smtpusername; + $mail->Password = $tmp_smtppassword; } $mail->From = $var['From']; $mail->FromName = $var['From']; -- cgit v1.2.3