diff options
| -rw-r--r-- | packages/freeswitch/freeswitch.inc | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_mailto.tmp | 29 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
4 files changed, 17 insertions, 18 deletions
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 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>FreeSWITCH Settings</name> - <version>0.4.8.3</version> + <version>0.4.8.4</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> 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']; diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 8d154d8d..dbc3b5a9 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.8.3</version> + <version>0.4.8.4</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |