diff options
| author | Mark Crane <mcrane@pfsense.org> | 2008-12-16 22:07:31 +0000 |
|---|---|---|
| committer | Mark Crane <mcrane@pfsense.org> | 2008-12-16 22:07:31 +0000 |
| commit | 844c0d2f870b48150bb8f8e201db99a0c01203ce (patch) | |
| tree | 0b596bb21a6f5002c0184ad3c570323703c85ffd | |
| parent | 127d930c310962ae613446801ea1ca2716fd8bbe (diff) | |
| download | pfsense-packages-844c0d2f870b48150bb8f8e201db99a0c01203ce.tar.gz pfsense-packages-844c0d2f870b48150bb8f8e201db99a0c01203ce.tar.bz2 pfsense-packages-844c0d2f870b48150bb8f8e201db99a0c01203ce.zip | |
FreeSWITCH package mailto add global config, switch.conf.xml adjust read, fix vm attachment true or false will show in freeswitch's xml config
| -rw-r--r-- | packages/freeswitch/freeswitch.inc | 10 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_mailto.tmp | 3 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index 1f272b01..cb05f09c 100644 --- a/packages/freeswitch/freeswitch.inc +++ b/packages/freeswitch/freeswitch.inc @@ -408,7 +408,7 @@ function sync_package_freeswitch_extensions() if (strlen($rowhelper['vm-mailto']) > 0) { $tmpxml .= " <param name=\"vm-email-all-messages\" value=\"true\"/>\n"; - switch ($vm-attach-file) { + switch ($rowhelper['vm-attach-file']) { case "true": $tmpxml .= " <param name=\"vm-attach-file\" value=\"true\"/>\n"; break; @@ -1770,16 +1770,18 @@ function freeswitch_php_install_command() write_config(); //prepare switch.conf.xml for voicemail to email - $handle = fopen("/usr/local/freeswitch/conf/autoload_configs/switch.conf.xml","rb"); + $filename = "/usr/local/freeswitch/conf/autoload_configs/switch.conf.xml"; + $handle = fopen($filename,"rb"); $contents = fread($handle, filesize($filename)); fclose($handle); - $handle = fopen("/usr/local/freeswitch/conf/autoload_configs/switch.conf.xml","w"); + $handle = fopen($filename,"w"); $contents = str_replace("<param name=\"mailer-app\" value=\"sendmail\"/>", "<param name=\"mailer-app\" value=\"/usr/local/bin/php\"/>", $contents); $contents = str_replace("<param name=\"mailer-app-args\" value=\"-t\"/>", "<param name=\"mailer-app-args\" value=\"/usr/local/www/freeswitch/freeswitch_mailto.php\"/>", $contents); fwrite($handle, $contents); unset($contents); fclose($fout); + unset($filename); $fout = fopen("/usr/local/freeswitch/conf/autoload_configs/event_socket.conf.xml","w"); @@ -2026,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.2"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.8.3"; conf_mount_ro(); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index 17f677d3..48092254 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.2</version> + <version>0.4.8.3</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 64208488..c56a8609 100644 --- a/packages/freeswitch/freeswitch_mailto.tmp +++ b/packages/freeswitch/freeswitch_mailto.tmp @@ -33,8 +33,7 @@ require("guiconfig.inc"); require("/usr/local/pkg/freeswitch.inc"); - -$a_settings = &$config['installedpackages']['freeswitchsettings']['config']; +global $config; $smtphost = $config['installedpackages']['freeswitchmodules']['config'][0]['smtphost']; $smtpsecure = $config['installedpackages']['freeswitchmodules']['config'][0]['smtpsecure']; //options "", "TLS", "SSL" diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 71c1b470..8d154d8d 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.2</version> + <version>0.4.8.3</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |