diff options
| author | Mark Crane <mcrane@pfsense.org> | 2009-01-04 07:08:42 +0000 |
|---|---|---|
| committer | Mark Crane <mcrane@pfsense.org> | 2009-01-04 07:08:42 +0000 |
| commit | e5fa0a394b8dd35c63bbc860fa34dbf5a0923347 (patch) | |
| tree | 5169bacfe5e7c1512995dca92678c1dc8a04ebb3 | |
| parent | 5830a3551cf069d6d913154f3421b17800540896 (diff) | |
| download | pfsense-packages-e5fa0a394b8dd35c63bbc860fa34dbf5a0923347.tar.gz pfsense-packages-e5fa0a394b8dd35c63bbc860fa34dbf5a0923347.tar.bz2 pfsense-packages-e5fa0a394b8dd35c63bbc860fa34dbf5a0923347.zip | |
FreeSWITCH package fix 'realm' on Gateways tab so that it saves correctly, adjust wording on extension edit page, and on the gateways edit page.
| -rw-r--r-- | packages/freeswitch/freeswitch.inc | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_extensions_edit.tmp | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_gateways_edit.tmp | 8 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index 91425e84..7e8ff8d2 100644 --- a/packages/freeswitch/freeswitch.inc +++ b/packages/freeswitch/freeswitch.inc @@ -2085,7 +2085,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.8.2"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.8.3"; conf_mount_ro(); config_unlock(); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index e205b80b..9eba7a16 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.8.2</version> + <version>0.5.8.3</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> diff --git a/packages/freeswitch/freeswitch_extensions_edit.tmp b/packages/freeswitch/freeswitch_extensions_edit.tmp index 0d023d4e..8a3f61ad 100644 --- a/packages/freeswitch/freeswitch_extensions_edit.tmp +++ b/packages/freeswitch/freeswitch_extensions_edit.tmp @@ -173,7 +173,7 @@ function show_advanced_config() { <td width="25%" valign="top" class="vncellreq">Extension</td> <td width="75%" class="vtable"> <input name="extension" type="text" class="formfld" id="extension" size="40" value="<?=htmlspecialchars($pconfig['extension']);?>"> - <br><span class="vexpl">Enter the extension here. The default configuration expects extension numbers between 1001 -1019. To use additional numbers for the extensions by adjusting the dialplan. In the in the dialplan under name="Local_Extension" adjust the regular expression="^(10[01][0-9])$".<br></span> + <br><span class="vexpl">Enter the extension here. The default configuration expects extension numbers between 1000 -1019. To use additional 3 digit extensions adjust the dialplan 'default.xml' under name="Local_Extension" change the regular expression="^(10[01][0-9])$" to expression="^9(\d{3})$".<br></span> </td> </tr> <tr> diff --git a/packages/freeswitch/freeswitch_gateways_edit.tmp b/packages/freeswitch/freeswitch_gateways_edit.tmp index c4bb0a87..bf1516a3 100644 --- a/packages/freeswitch/freeswitch_gateways_edit.tmp +++ b/packages/freeswitch/freeswitch_gateways_edit.tmp @@ -49,6 +49,7 @@ if (isset($id) && $a_gateways[$id]) { $pconfig['gateway'] = $a_gateways[$id]['gateway']; $pconfig['username'] = $a_gateways[$id]['username']; $pconfig['password'] = $a_gateways[$id]['password']; + $pconfig['realm'] = $a_gateways[$id]['realm']; $pconfig['from-user'] = $a_gateways[$id]['from-user']; $pconfig['from-domain'] = $a_gateways[$id]['from-domain']; $pconfig['proxy'] = $a_gateways[$id]['proxy']; @@ -512,7 +513,7 @@ function show_advanced_config() { ?> <br> <select name='dialplan_expression_select' id='dialplan_expression_select' onchange="document.getElementById('dialplan_expression').value += document.getElementById('dialplan_expression_select').value + '\n';" class='formfld'> - <option></option> + <option></option> <option value='^(\d{7})$'>7 digits local</option> <option value='^(\d{10})$'>10 digits long distance</option> <option value='^(\d{11})$'>11 digits long distance</option> @@ -520,7 +521,10 @@ function show_advanced_config() { <option value='^411$'>411 information</option> <option value='^911$'>911 emergency</option> <option value='^1?(8(00|55|66|77|88)[2-9]\d{6})$'>toll free</option> - + <option value='^9(\d{3})$'>Dial 9 then 3 digits</option> + <option value='^9(\d{4})$'>Dial 9 then 4 digits</option> + <option value='^9(\d{10})$'>Dial 9 then 10 digits</option> + <option value='^9(\d{11})$'>Dial 9 then 11 digits</option> </select> <span class="vexpl"> <br /> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 843a05e9..5cee04b4 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -66,7 +66,7 @@ <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</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.5.8.2</version> + <version>0.5.8.3</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |