From 057d247f361b6377806ce005108c65b058e13846 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Wed, 17 Dec 2008 18:56:00 +0000
Subject: FreeSWITCH pkg add voicemail to email From Name to settings tab.

---
 packages/freeswitch/freeswitch.inc        |  2 +-
 packages/freeswitch/freeswitch.xml        | 10 ++++++++--
 packages/freeswitch/freeswitch_mailto.tmp |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'packages/freeswitch')

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 4a20601c..5d7a243a 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.5.0";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.1";
 	
 	       
 	conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index 4f82786c..f0221316 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>FreeSWITCH Settings</name>
-	<version>0.5.0</version>
+	<version>0.5.1</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
@@ -422,7 +422,13 @@
 			<fieldname>smtpfrom</fieldname>
 			<description>Enter the SMTP From email address.</description>
 			<type>input</type>
-		</field>			
+		</field>
+		<field>
+			<fielddescr>SMTP From Name</fielddescr>
+			<fieldname>smtpfromname</fieldname>
+			<description>Enter the SMTP From Name.</description>
+			<type>input</type>
+		</field>
 	</fields>	
 	<custom_add_php_command>
 	</custom_add_php_command>
diff --git a/packages/freeswitch/freeswitch_mailto.tmp b/packages/freeswitch/freeswitch_mailto.tmp
index 3c8dbe1f..f24ce26a 100644
--- a/packages/freeswitch/freeswitch_mailto.tmp
+++ b/packages/freeswitch/freeswitch_mailto.tmp
@@ -41,7 +41,7 @@ $tmp_smtpauth = $config['installedpackages']['freeswitchsettings']['config'][0][
 $tmp_smtpusername = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpusername'];
 $tmp_smtppassword = $config['installedpackages']['freeswitchsettings']['config'][0]['smtppassword'];
 $tmp_smtpfrom = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpfrom'];
-
+$tmp_smtpfromname = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpfromname'];
 
       
 ini_set(max_execution_time,900); //15 minutes
@@ -201,7 +201,7 @@ ob_start();
 
            
       $mail->From       = $tmp_smtpfrom;
-      $mail->FromName   = $var['From'];
+      $mail->FromName   = $tmp_smtpfromname;
       $mail->Subject    = $var['Subject'];
       $mail->AltBody    = $textplain;   // optional, comment out and test
       $mail->MsgHTML($texthtml);
-- 
cgit v1.2.3