FreeSWITCH add International option to the Dialplan Expression tool, minor wording changes, hide Outbound Caller ID on the Extensions tab. Effective Caller ID is used by FreeSWITCH.

4 files changed, 9 insertions, 4 deletions

diff --git a/packages/freeswitch/freeswitch_extensions_edit.tmp b/packages/freeswitch/freeswitch_extensions_edit.tmp
index b6719b58..8c02c6c9 100644
--- a/packages/freeswitch/freeswitch_extensions_edit.tmp
+++ b/packages/freeswitch/freeswitch_extensions_edit.tmp
@@ -218,6 +218,7 @@ function show_advanced_config() {
                 <br><span class="vexpl">Enter the effective caller id number here.<br></span>
               </td>
             </tr>
+            <--
 		        <tr>
               <td width="25%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Name</td>
               <td width="75%" class="vtable"> 
@@ -232,6 +233,7 @@ function show_advanced_config() {
                 <br><span class="vexpl">Enter the outbound caller id number here.<br></span>
               </td>
             </tr>
+            -->
 				    <tr>
               <td width="25%" valign="top" class="vncellreq" nowrap>Voicemail Mail To</td>
               <td width="75%" class="vtable"> 
@@ -275,7 +277,7 @@ function show_advanced_config() {
               <td width="25%" valign="top" class="vncellreq">Call Group</td>
               <td width="75%" class="vtable"> 
                 <input name="callgroup" type="text" class="formfld" id="callgroup" size="40" value="<?=htmlspecialchars($pconfig['callgroup']);?>">
-                <br><span class="vexpl">Enter the user call group here. Example: sales<br></span>
+                <br><span class="vexpl">Enter the user call group here. Example: sales, support<br></span>
               </td>
             </tr>            
             </table>
@@ -320,6 +322,8 @@ function show_advanced_config() {
             <tr>
               <td valign="top">&nbsp;</td>
               <td>
+                <input name="outbound_caller_id_name" type="hidden" class="formfld" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>">
+                <input name="outbound_caller_id_number" type="hidden" class="formfld" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>">
                 <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
                 <?php if (isset($id) && $a_extensions[$id]): ?>
                   <input name="id" type="hidden" value="<?=$id;?>">
diff --git a/packages/freeswitch/freeswitch_gateways_edit.tmp b/packages/freeswitch/freeswitch_gateways_edit.tmp
index bf1516a3..5de3dda5 100644
--- a/packages/freeswitch/freeswitch_gateways_edit.tmp
+++ b/packages/freeswitch/freeswitch_gateways_edit.tmp
@@ -517,6 +517,7 @@ function show_advanced_config() {
                 <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>
+                <option value='^011(.*)$'>011 International</option>
                 <option value='^311$'>311 information</option>
                 <option value='^411$'>411 information</option>
                 <option value='^911$'>911 emergency</option>
@@ -524,7 +525,7 @@ function show_advanced_config() {
                 <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>                
+                <option value='^9(\d{11})$'>Dial 9 then 11 digits</option>                                
                 </select>
                 <span class="vexpl">
                 <br />
diff --git a/packages/freeswitch/freeswitch_ivr_edit.tmp b/packages/freeswitch/freeswitch_ivr_edit.tmp
index ed7a69ba..f9d4652d 100644
--- a/packages/freeswitch/freeswitch_ivr_edit.tmp
+++ b/packages/freeswitch/freeswitch_ivr_edit.tmp
@@ -246,7 +246,7 @@ include("head.inc");
               <td width="22%" valign="top" class="vncellreq">Extension</td>
               <td width="78%" class="vtable"> 
                 <input name="ivrextension" type="text" class="formfld" id="ivrextension" size="40" value="<?=htmlspecialchars($pconfig['ivrextension']);?>">
-                <br> <span class="vexpl">e.g. <em>5001</em></span></td>
+                <br> <span class="vexpl">e.g. <em>5002</em></span></td>
             </tr>
             <tr>
               <td width="22%" valign="top" class="vncellreq">IVR Name</td>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 2f5ebcb4..31747224 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.5</version>
+      <version>0.5.8.6</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>