diff options
| -rw-r--r-- | packages/freeswitch/freeswitch.inc | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch.xml | 18 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_mailto.tmp | 11 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
4 files changed, 22 insertions, 11 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index a171560d..4a20601c 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.9"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.0"; conf_mount_ro(); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index c219ff5c..4f82786c 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.4.9</version> + <version>0.5.0</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> @@ -366,7 +366,7 @@ <field> <fielddescr>SMTP Host</fielddescr> <fieldname>smtphost</fieldname> - <description>Enter the SMTP host address. If you using a different port append it on the end with a semi-colon. e.g. mail.example.com:2525</description> + <description>Enter the SMTP host address. If you using a different port append it on the end with a semi-colon. e.g. smtp.gmail.com:465</description> <type>input</type> </field> <field> @@ -380,12 +380,12 @@ <value></value> </option> <option> - <name>TLS</name> - <value>TLS</value> + <name>tls</name> + <value>tls</value> </option> <option> - <name>SSL</name> - <value>SSL</value> + <name>ssl</name> + <value>ssl</value> </option> </options> </field> @@ -417,6 +417,12 @@ <description>Enter the SMTP authentication password.</description> <type>input</type> </field> + <field> + <fielddescr>SMTP From</fielddescr> + <fieldname>smtpfrom</fieldname> + <description>Enter the SMTP From email address.</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 8ecc773c..3c8dbe1f 100644 --- a/packages/freeswitch/freeswitch_mailto.tmp +++ b/packages/freeswitch/freeswitch_mailto.tmp @@ -36,9 +36,12 @@ global $config; $tmp_smtphost = $config['installedpackages']['freeswitchsettings']['config'][0]['smtphost']; $tmp_smtpsecure = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpsecure']; //options "", "TLS", "SSL" +$tmp_smtpsecure = strtolower($tmp_smtpsecure); $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']; +$tmp_smtpfrom = $config['installedpackages']['freeswitchsettings']['config'][0]['smtpfrom']; + ini_set(max_execution_time,900); //15 minutes @@ -185,7 +188,7 @@ ob_start(); $mail = new PHPMailer(); - $mail->IsSMTP(); // set mailer to use SMTP + $mail->IsSMTP(); // set mailer to use SMTP $mail->SMTPAuth = $tmp_smtpauth; // turn on/off SMTP authentication $mail->Host = $tmp_smtphost; if (strlen($tmp_smtpsecure)>0) { @@ -194,8 +197,10 @@ ob_start(); if ($tmp_smtpauth) { $mail->Username = $tmp_smtpusername; $mail->Password = $tmp_smtppassword; - } - $mail->From = $var['From']; + } + + + $mail->From = $tmp_smtpfrom; $mail->FromName = $var['From']; $mail->Subject = $var['Subject']; $mail->AltBody = $textplain; // optional, comment out and test diff --git a/pkg_config.7.xml b/pkg_config.7.xml index fc9aaacd..6851c8b0 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -66,7 +66,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,11930.0.html</pkginfolink> <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.4.9</version> + <version>0.5.0</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |