FreeSWITCH minor changes to tabbing and spacing, other minor changes and deny hosts add rm /usr/local/etc/denyhosts* to package uninstall.

5 files changed, 375 insertions, 370 deletions

diff --git a/config/freeswitch_dev/dialplan.default.xml b/config/freeswitch_dev/dialplan.default.xml
index 3a564ec8..5fe1d4a4 100644
--- a/config/freeswitch_dev/dialplan.default.xml
+++ b/config/freeswitch_dev/dialplan.default.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     NOTICE:
     
@@ -9,6 +8,8 @@
     they can access.  You can also add a user in the directory with the cidr= attribute acl.conf.xml
     will build the domains acl using this value.
 -->
+
+<?xml version="1.0" encoding="utf-8"?>
 <!-- http://wiki.freeswitch.org/wiki/Dialplan_XML -->
 <include>
   <context name="default">
@@ -32,7 +33,7 @@
     <extension name="global-intercept">
       <condition field="destination_number" expression="^\*886$">
 	<action application="answer"/>
-	<action application="intercept" data="${hash(select/${domain_name}-last_dial/global)}"/>
+	<action application="intercept" data="${db(select/${domain_name}-last_dial/global)}"/>
 	<action application="sleep" data="2000"/>
       </condition>
     </extension>
@@ -40,7 +41,7 @@
     <extension name="group-intercept">
       <condition field="destination_number" expression="^\*8$">
 	<action application="answer"/>
-	<action application="intercept" data="${hash(select/${domain_name}-last_dial/${callgroup})}"/>
+	<action application="intercept" data="${db(select/${domain_name}-last_dial/${callgroup})}"/>
 	<action application="sleep" data="2000"/>
       </condition>
     </extension>
@@ -48,14 +49,14 @@
     <extension name="intercept-ext">
       <condition field="destination_number" expression="^\*\*(\d+)$">
 	<action application="answer"/>
-	<action application="intercept" data="${hash(select/${domain_name}-last_dial_ext/$1)}"/>
+	<action application="intercept" data="${db(select/${domain_name}-last_dial_ext/$1)}"/>
 	<action application="sleep" data="2000"/>
       </condition>
     </extension>
 
     <extension name="redial">
       <condition field="destination_number" expression="^\*870$">
-	<action application="transfer" data="${hash(select/${domain_name}-last_dial/${caller_id_number})}"/>
+	<action application="transfer" data="${db(select/${domain_name}-last_dial/${caller_id_number})}"/>
       </condition>
     </extension>
 
@@ -64,6 +65,10 @@
 	<action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/>
 	<anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/>
       </condition>
+      <!-- This will setup some variables if the user isn't authenticated. -->
+      <condition field="${numbering_plan}" expression="^$" break="never">
+	<action application="set_user" data="default@${domain_name}"/>
+      </condition>
       <condition field="${call_debug}" expression="^true$" break="never">
 	<action application="info"/>
       </condition>
@@ -81,11 +86,10 @@
 	<!-- Offer SRTP on outbound legs if we have it on inbound. -->
 	<!-- <action application="export" data="sip_secure_media=true"/> -->
       </condition>
-
       <condition>
-	<action application="hash" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/>
-	<action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
-	<action application="hash" data="insert/${domain_name}-last_dial/global/${uuid}"/>
+	<action application="db" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/>
+	<action application="db" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
+	<action application="db" data="insert/${domain_name}-last_dial/global/${uuid}"/>
       </condition>
     </extension>
 
@@ -121,7 +125,7 @@
     <extension name="eavesdrop">
       <condition field="destination_number" expression="^\*88(.*)$|^\*0(.*)$">
 	<action application="answer"/>
-	<action application="eavesdrop" data="${hash(select/${domain_name}-spymap/$1)}"/>
+	<action application="eavesdrop" data="${db(select/${domain_name}-spymap/$1)}"/>
       </condition>
     </extension>
 
@@ -137,7 +141,7 @@
 
     <extension name="call_return">
       <condition field="destination_number" expression="^\*69$|^869$|^lcr$">
-	<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
+	<action application="transfer" data="${db(select/${domain_name}-call_return/${caller_id_number})}"/>
       </condition>
     </extension>
 
@@ -200,11 +204,11 @@
 	<action application="set" data="hangup_after_bridge=true"/>
 	<!--<action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> -->
 	<action application="set" data="continue_on_fail=true"/>
-	<action application="hash" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
-	<action application="hash" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
+	<action application="db" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
+	<action application="db" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
 	<action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/>
 	<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
-	<action application="hash" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/>
+	<action application="db" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/>
 	<action application="bridge" data="user/${dialed_extension}@${domain_name}"/>
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
@@ -328,14 +332,6 @@
     <extension name="freeswitch_public_conf_via_sip">
       <condition field="destination_number" expression="^\*9(888|1616|3232)$">
 	<action application="export" data="hold_music=silence"/>
-	<!-- 
-	     This will take the SAS from the b-leg and send it to the display on the a-leg phone.
-	     Known working with Polycom and Snom maybe others.
-	-->
-	<!--
-	<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )}  \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
-	<action application="export" data="nolocal:zrtp_secure_media=true"/>
-	-->
 	<action application="bridge" data="sofia/${use_profile}/$1@conference.freeswitch.org"/>
       </condition>
     </extension>
@@ -633,6 +629,14 @@
       </condition>
     </extension>
 
+    <!-- install zrtp_agent.lua into scripts (ZRTP == 9787) -->
+    <extension name="zrtp_enrollement">
+      <condition field="destination_number" expression="^9787$">
+	<action application="answer"/>
+	<action application="lua" data="zrtp_agent.lua"/>
+      </condition>
+    </extension>
+
     <!--
 	You will no longer hear the bong tone.  The wav file is playing stating the call is secure.
 	The file will not play unless you have both TLS and SRTP active.
@@ -644,9 +648,10 @@
 	<action application="answer"/>
 	<action application="execute_extension" data="is_secure XML features"/>
 	<action application="playback" data="$${hold_music}"/>
-	<!-- This really should be an IVR for zrtp enrollment but this is just a demo-->
-	<anti-action application="set" data="zrtp_enrollment=true"/>
+	<anti-action application="set" data="zrtp_secure_media=true"/>
 	<anti-action application="answer"/>
+	<anti-action application="playback" data="silence_stream://2000"/>
+	<anti-action application="execute_extension" data="is_zrtp_secure XML features"/>
 	<anti-action application="playback" data="$${hold_music}"/>
       </condition>
     </extension>
diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml
index 322ebf0b..783b08cc 100644
--- a/config/freeswitch_dev/freeswitch.xml
+++ b/config/freeswitch_dev/freeswitch.xml
@@ -44,7 +44,7 @@
 		<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Settings</name>
-	<version>0.9.7.24</version>
+	<version>0.9.7.25</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/v_config.inc</include_file>
 	<menu>
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index a2c81cde..3208f09a 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -49,7 +49,7 @@ function v_settings()
 	$config['installedpackages']['freeswitchsettings']['config'][0]['tmp_dir'] = '/tmp';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['bin_dir'] = '/usr/local/bin';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_startup_script_dir'] = '/usr/local/etc/rc.d';
-	$config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.24";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.25";
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_version'] = "1.0.4";
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_revision'] = "Release";
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_label'] = 'FreeSWITCH'; //FreeSWITCH (TM) http://www.freeswitch.org/
@@ -3425,7 +3425,7 @@ function v_install_phase_1()
 			pkg_add($pkg_download_path, "libgpg-error-1.7.tbz");
 			pkg_add($pkg_download_path, "libgcrypt-1.4.4.tbz");
 			pkg_add($pkg_download_path, "gnutls-2.6.5.tbz");
-			pkg_add($pkg_download_path, "freeswitch-1.0.4.tbz");		
+			pkg_add($pkg_download_path, "freeswitch-1.0.4.tbz");
 			//pkg_add($pkg_download_path, "p5-gettext-1.05_2.tbz"); //requirement for perl
 			//pkg_add($pkg_download_path, "perl-5.8.9_3.tbz");
 			fwrite($handle, 'packages have been installed');
diff --git a/config/freeswitch_dev/v_extensions.tmp b/config/freeswitch_dev/v_extensions.tmp
index 0eb61d95..2eb5a554 100644
--- a/config/freeswitch_dev/v_extensions.tmp
+++ b/config/freeswitch_dev/v_extensions.tmp
@@ -92,15 +92,15 @@ if ($config_change == 1) {
 //endif;
 
 ?>
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-      <tr>
-        <td><p><span class="vexpl"><span class="red"><strong>Extensions<br>
-            </strong></span>
-            Use this to configure your SIP extensions.
-            </p></td>
-      </tr>
-    </table>
-    <br />
+	<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	  <tr>
+		<td><p><span class="vexpl"><span class="red"><strong>Extensions<br>
+			</strong></span>
+			Use this to configure your SIP extensions.
+			</p></td>
+	  </tr>
+	</table>
+	<br />
 		
     <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
diff --git a/config/freeswitch_dev/v_gateways_edit.tmp b/config/freeswitch_dev/v_gateways_edit.tmp
index 07953673..5444d7e8 100644
--- a/config/freeswitch_dev/v_gateways_edit.tmp
+++ b/config/freeswitch_dev/v_gateways_edit.tmp
@@ -339,358 +339,358 @@ if ($input_errors) print_input_errors($input_errors);
 <?php
 
 build_menu();
- 	
+
 ?>
 </td></tr>
 </table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-     <td class="tabcont" >
+	<tr>
+	 <td class="tabcont" >
 
 
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-      <tr>
-        <td><p><span class="vexpl"><span class="red"><strong>Gateway Setup<br>
-            </strong></span>
+	<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	  <tr>
+		<td><p><span class="vexpl"><span class="red"><strong>Gateway Setup<br>
+			</strong></span>
 			<?php
 			if ($v_path_show) {
 				echo "The 'SIP Provider Examples' from the FreeSWITCH wiki can be used as reference to get started. <br />\n";
 				echo "<a href='http://wiki.freeswitch.org/wiki/SIP_Provider_Examples' target='_blank'>http://wiki.freeswitch.org/wiki/SIP_Provider_Examples</a>\n";
-            }
+			}
 			?>
 			</p></td>
-      </tr>
-    </table>
-    <br />
-
-        <form action="v_gateways_edit.php" method="post" name="iform" id="iform">
-            <table width="100%" border="0" cellpadding="6" cellspacing="0">
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Gateway</td>
-              <td width="78%" class="vtable">
-                <input name="gateway" type="text" class="formfld" id="gateway" size="40" value="<?=htmlspecialchars($pconfig['gateway']);?>">
-                <br><span class="vexpl">Enter the gateway name here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Username</td>
-              <td width="78%" class="vtable">
-                <input name="username" type="text" class="formfld" id="username" size="40" value="<?=htmlspecialchars($pconfig['username']);?>">
-                <br><span class="vexpl">Enter the username here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Password</td>
-              <td width="78%" class="vtable">
-                <input name="password" type="password" class="formfld" id="password" size="40" value="<?=htmlspecialchars($pconfig['password']);?>">
-                <br><span class="vexpl">Enter the password here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">From-user</td>
-              <td width="78%" class="vtable">
-                <input name="from-user" type="text" class="formfld" id="from-user" size="40" value="<?=htmlspecialchars($pconfig['from-user']);?>">
-                <br><span class="vexpl">Enter the from-user here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">From-domain</td>
-              <td width="78%" class="vtable">
-                <input name="from-domain" type="text" class="formfld" id="from-domain" size="40" value="<?=htmlspecialchars($pconfig['from-domain']);?>">
-                <br><span class="vexpl">Enter the from-domain here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Proxy</td>
-              <td width="78%" class="vtable">
-                <input name="proxy" type="text" class="formfld" id="proxy" size="40" value="<?=htmlspecialchars($pconfig['proxy']);?>">
-                <br><span class="vexpl">Enter the proxy here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Realm</td>
-              <td width="78%" class="vtable">
-                <input name="realm" type="text" class="formfld" id="realm" size="40" value="<?=htmlspecialchars($pconfig['realm']);?>">
-                <br><span class="vexpl">Enter the realm here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Expire-seconds</td>
-              <td width="78%" class="vtable">
-                <input name="expire-seconds" type="text" class="formfld" id="expire-seconds" size="40" value="<?=htmlspecialchars($pconfig['expire-seconds']);?>">
-                <br><span class="vexpl">Enter the expire-seconds here. Example: 600<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Register</td>
-              <td width="78%" class="vtable">
-                <?php
-                echo "              <select name='register' class='formfld'>\n";
-                echo "                <option></option>\n";
-                switch (htmlspecialchars($pconfig['register'])) {
-                case "true":
-                    echo "              <option value='true' selected='yes'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                    break;
-                case "false":
-                    echo "              <option value='true'>true</option>\n";
-                    echo "              <option value='false' selected='yes'>false</option>\n";
-
-                    break;
-                default:
-                    echo "              <option value='true' selected='yes'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                }
-                echo "              </select>\n";
-                ?>
-                Choose whether to register.
-              </td>
-            </tr>				
-
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Retry-seconds</td>
-              <td width="78%" class="vtable">
-                <input name="retry-seconds" type="text" class="formfld" id="retry-seconds" size="40" value="<?=htmlspecialchars($pconfig['retry-seconds']);?>">
-                <br> <span class="vexpl">Enter the retry_seconds here. Example: 30<br></span>
-              </td>
-            </tr>
-
-            <tr>
-              <td width="22%" valign="top" class="vncell">Effective Caller ID Name</td>
-              <td width="78%" class="vtable">
-                <input name="effective_caller_id_name" type="text" class="formfld" id="effective_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_name']);?>">
-                <br> <span class="vexpl">Enter the effective caller ID name here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncell">Effective Caller ID Number</td>
-              <td width="78%" class="vtable">
-                <input name="effective_caller_id_number" type="text" class="formfld" id="effective_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_number']);?>">
-                <br> <span class="vexpl">Enter the effective caller ID number here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncell">Outbound Caller ID Name</td>
-              <td width="78%" class="vtable">
-                <input name="outbound_caller_id_name" type="text" class="formfld" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>">
-                <br> <span class="vexpl">Enter the outbound	caller ID name here.<br></span>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncell">Outbound Caller ID Number</td>
-              <td width="78%" class="vtable">
-                <input name="outbound_caller_id_number" type="text" class="formfld" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>">
-                <br> <span class="vexpl">Enter the outbound caller ID number here.<br></span>
-              </td>
-            </tr>
+	  </tr>
+	</table>
+	<br />
+
+		<form action="v_gateways_edit.php" method="post" name="iform" id="iform">
+			<table width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Gateway</td>
+			  <td width="78%" class="vtable">
+				<input name="gateway" type="text" class="formfld" id="gateway" size="40" value="<?=htmlspecialchars($pconfig['gateway']);?>">
+				<br><span class="vexpl">Enter the gateway name here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Username</td>
+			  <td width="78%" class="vtable">
+				<input name="username" type="text" class="formfld" id="username" size="40" value="<?=htmlspecialchars($pconfig['username']);?>">
+				<br><span class="vexpl">Enter the username here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Password</td>
+			  <td width="78%" class="vtable">
+				<input name="password" type="password" class="formfld" id="password" size="40" value="<?=htmlspecialchars($pconfig['password']);?>">
+				<br><span class="vexpl">Enter the password here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">From-user</td>
+			  <td width="78%" class="vtable">
+				<input name="from-user" type="text" class="formfld" id="from-user" size="40" value="<?=htmlspecialchars($pconfig['from-user']);?>">
+				<br><span class="vexpl">Enter the from-user here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">From-domain</td>
+			  <td width="78%" class="vtable">
+				<input name="from-domain" type="text" class="formfld" id="from-domain" size="40" value="<?=htmlspecialchars($pconfig['from-domain']);?>">
+				<br><span class="vexpl">Enter the from-domain here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Proxy</td>
+			  <td width="78%" class="vtable">
+				<input name="proxy" type="text" class="formfld" id="proxy" size="40" value="<?=htmlspecialchars($pconfig['proxy']);?>">
+				<br><span class="vexpl">Enter the proxy here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Realm</td>
+			  <td width="78%" class="vtable">
+				<input name="realm" type="text" class="formfld" id="realm" size="40" value="<?=htmlspecialchars($pconfig['realm']);?>">
+				<br><span class="vexpl">Enter the realm here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Expire-seconds</td>
+			  <td width="78%" class="vtable">
+				<input name="expire-seconds" type="text" class="formfld" id="expire-seconds" size="40" value="<?=htmlspecialchars($pconfig['expire-seconds']);?>">
+				<br><span class="vexpl">Enter the expire-seconds here. Example: 600<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Register</td>
+			  <td width="78%" class="vtable">
+				<?php
+				echo "              <select name='register' class='formfld'>\n";
+				echo "                <option></option>\n";
+				switch (htmlspecialchars($pconfig['register'])) {
+				case "true":
+					echo "              <option value='true' selected='yes'>true</option>\n";
+					echo "              <option value='false'>false</option>\n";
+					break;
+				case "false":
+					echo "              <option value='true'>true</option>\n";
+					echo "              <option value='false' selected='yes'>false</option>\n";
+
+					break;
+				default:
+					echo "              <option value='true' selected='yes'>true</option>\n";
+					echo "              <option value='false'>false</option>\n";
+				}
+				echo "              </select>\n";
+				?>
+				Choose whether to register.
+			  </td>
+			</tr>				
+
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Retry-seconds</td>
+			  <td width="78%" class="vtable">
+				<input name="retry-seconds" type="text" class="formfld" id="retry-seconds" size="40" value="<?=htmlspecialchars($pconfig['retry-seconds']);?>">
+				<br> <span class="vexpl">Enter the retry_seconds here. Example: 30<br></span>
+			  </td>
+			</tr>
+
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Effective Caller ID Name</td>
+			  <td width="78%" class="vtable">
+				<input name="effective_caller_id_name" type="text" class="formfld" id="effective_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_name']);?>">
+				<br> <span class="vexpl">Enter the effective caller ID name here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Effective Caller ID Number</td>
+			  <td width="78%" class="vtable">
+				<input name="effective_caller_id_number" type="text" class="formfld" id="effective_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_number']);?>">
+				<br> <span class="vexpl">Enter the effective caller ID number here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Outbound Caller ID Name</td>
+			  <td width="78%" class="vtable">
+				<input name="outbound_caller_id_name" type="text" class="formfld" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>">
+				<br> <span class="vexpl">Enter the outbound	caller ID name here.<br></span>
+			  </td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Outbound Caller ID Number</td>
+			  <td width="78%" class="vtable">
+				<input name="outbound_caller_id_number" type="text" class="formfld" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>">
+				<br> <span class="vexpl">Enter the outbound caller ID number here.<br></span>
+			  </td>
+			</tr>
 			
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Context</td>
-              <td width="78%" class="vtable">
-                <input name="context" type="text" class="formfld" id="context" size="40" value="<?=htmlspecialchars($pconfig['context']);?>">
-                <br> <span class="vexpl">Enter the context here. Example: public<br></span>
-              </td>
-            </tr>
-            </table>
-      			<div id="showadvancedbox">
-      			      <table width="100%" border="0" cellpadding="6" cellspacing="0">
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Show Advanced</td>
-                    <td width="78%" class="vtable">
-                      <input type="button" onClick="show_advanced_config()" value="Advanced"></input></a>
-                    </td>
-                  </tr>
-                  </table>
-      			</div>
-      			<div id="showadvanced" style="display:none">
-                  <table width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Context</td>
+			  <td width="78%" class="vtable">
+				<input name="context" type="text" class="formfld" id="context" size="40" value="<?=htmlspecialchars($pconfig['context']);?>">
+				<br> <span class="vexpl">Enter the context here. Example: public<br></span>
+			  </td>
+			</tr>
+			</table>
+			<div id="showadvancedbox">
+				<table width="100%" border="0" cellpadding="6" cellspacing="0">
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Show Advanced</td>
+					<td width="78%" class="vtable">
+					  <input type="button" onClick="show_advanced_config()" value="Advanced"></input></a>
+					</td>
+				  </tr>
+				  </table>
+				</div>
+				<div id="showadvanced" style="display:none">
+				  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				  <tr>
-                    <td width="22%" valign="top" class="vncell">Auth-username</td>
-                    <td width="78%" class="vtable">
-                      <input name="auth-username" type="text" class="formfld" id="auth-username" size="40" value="<?=htmlspecialchars($pconfig['auth-username']);?>">
-                      <br> <span class="vexpl">Enter the auth-username here.<br></span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Register-transport</td>
-                    <td width="78%" class="vtable">
-                      <?php
-                      echo "              <select name='register-transport' class='formfld'>\n";
-                      echo "                <option></option>\n";
-                      switch (htmlspecialchars($pconfig['register-transport'])) {
-                      case "udp":
-                          echo "              <option value='udp' selected='yes'>udp</option>\n";
-                          echo "              <option value='tcp'>tcp</option>\n";
+					<td width="22%" valign="top" class="vncell">Auth-username</td>
+					<td width="78%" class="vtable">
+					  <input name="auth-username" type="text" class="formfld" id="auth-username" size="40" value="<?=htmlspecialchars($pconfig['auth-username']);?>">
+					  <br> <span class="vexpl">Enter the auth-username here.<br></span>
+					</td>
+				  </tr>
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Register-transport</td>
+					<td width="78%" class="vtable">
+					  <?php
+					  echo "              <select name='register-transport' class='formfld'>\n";
+					  echo "                <option></option>\n";
+					  switch (htmlspecialchars($pconfig['register-transport'])) {
+					  case "udp":
+						  echo "              <option value='udp' selected='yes'>udp</option>\n";
+						  echo "              <option value='tcp'>tcp</option>\n";
 						  echo "              <option value='tls'>tls</option>\n";						  
-                          break;
-                      case "tcp":
-                          echo "              <option value='udp'>udp</option>\n";
-                          echo "              <option value='tcp' selected='yes'>tcp</option>\n";
+						  break;
+					  case "tcp":
+						  echo "              <option value='udp'>udp</option>\n";
+						  echo "              <option value='tcp' selected='yes'>tcp</option>\n";
 						  echo "              <option value='tls'>tls</option>\n";						  
-                      case "tls":
-                          echo "              <option value='udp'>udp</option>\n";
-                          echo "              <option value='tcp'>tcp</option>\n";
+					  case "tls":
+						  echo "              <option value='udp'>udp</option>\n";
+						  echo "              <option value='tcp'>tcp</option>\n";
 						  echo "              <option value='tls' selected='yes'>tls</option>\n";
-                          break;
-                      default:
-                          echo "              <option value='udp'>udp</option>\n";
-                          echo "              <option value='tcp'>tcp</option>\n";
+						  break;
+					  default:
+						  echo "              <option value='udp'>udp</option>\n";
+						  echo "              <option value='tcp'>tcp</option>\n";
 						  echo "              <option value='tls'>tls</option>\n";
-                      }
-                      echo "              </select>\n";
-                      ?>
-                      Choose whether to register-transport.
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Extension</td>
-                    <td width="78%" 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.<br></span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Ping</td>
-                    <td width="78%" class="vtable">
-                      <input name="ping" type="text" class="formfld" id="ping" size="40" value="<?=htmlspecialchars($pconfig['ping']);?>">
-                      <br> <span class="vexpl">Enter the ping interval here in seconds.<br></span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Caller-id-in-from</td>
-                    <td width="78%" class="vtable">
-                      <?php
-                      echo "              <select name='caller-id-in-from' class='formfld'>\n";
-                      echo "                <option></option>\n";
-                      switch (htmlspecialchars($pconfig['caller-id-in-from'])) {
-                      case "true":
-                          echo "              <option value='true' selected='yes'>true</option>\n";
-                          echo "              <option value='false'>false</option>\n";
-                          break;
-                      case "false":
-                          echo "              <option value='true'>true</option>\n";
-                          echo "              <option value='false' selected='yes'>false</option>\n";
-
-                          break;
-                      default:
-                          echo "              <option value='true'>true</option>\n";
-                          echo "              <option value='false'>false</option>\n";
-                      }
-                      echo "              </select>\n";
-                      ?>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td width="22%" valign="top" class="vncell">Supress-cng</td>
-                    <td width="78%" class="vtable">
-                      <?php
-                      echo "              <select name='supress-cng' class='formfld'>\n";
-                      echo "                <option></option>\n";
-                      switch (htmlspecialchars($pconfig['supress-cng'])) {
-                      case "true":
-                          echo "              <option value='true' selected='yes'>true</option>\n";
-                          echo "              <option value='false'>false</option>\n";
-                          break;
-                      case "false":
-                          echo "              <option value='true'>true</option>\n";
-                          echo "              <option value='false' selected='yes'>false</option>\n";
-
-                          break;
-                      default:
-                          echo "              <option value='true'>true</option>\n";
-                          echo "              <option value='false'>false</option>\n";
-                      }
-                      echo "              </select>\n";
-                      ?>
-                    </td>
-                  </tr>
-                  </table>
-
-      			</div>
-
-            <table width="100%" border="0" cellpadding="6" cellspacing="0">
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Enabled</td>
-              <td width="78%" class="vtable">
-                <?php
-                echo "              <select name='enabled' class='formfld'>\n";
-                echo "                <option></option>\n";
-                switch (htmlspecialchars($pconfig['enabled'])) {
-                case "true":
-                    echo "              <option value='true' selected='yes'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                    break;
-                case "false":
-                    echo "              <option value='true'>true</option>\n";
-                    echo "              <option value='false' selected='yes'>false</option>\n";
-
-                    break;
-                default:
-                    echo "              <option value='true' selected='yes'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                }
-                echo "              </select>\n";
-                ?>
-              </td>
-            </tr>
-
-            <tr>
-              <td width="22%" valign="top" class="vncell">Dialplan Expression</td>
-              <td width="78%" class="vtable">
-              <?php
-                echo "<textarea name=\"dialplan_expression\" id=\"dialplan_expression\" cols=\"30\" rows=\"4\" wrap=\"off\"></textarea>\n";
-              ?>
-                <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 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>
-                <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{7})$'>Dial 9 then 7 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 />
-                Shortcut to create the outbound dialplan entries for this Gateway. The entries are saved to and edited from the 'Dialplan' tab.
-                </span></td>
-            </tr>
-
-            <tr>
-              <td width="22%" valign="top" class="vncell">Gateway Description</td>
-              <td width="78%" class="vtable">
-                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
-                <br> <span class="vexpl">Enter the description of the gateway here.</span></td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top">&nbsp;</td>
-              <td width="78%">
-                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
-                <?php if (isset($id) && $a_gateways[$id]): ?>
-                  <input name="id" type="hidden" value="<?=$id;?>">
-                  <input name="gatewayid" type="hidden" value="<?=htmlspecialchars($pconfig['gatewayid']);?>">
-                <?php endif; ?>
-              </td>
-            </tr>
-            </table>
-        </form>
-
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-
-     </td>
-   </tr>
+					  }
+					  echo "              </select>\n";
+					  ?>
+					  Choose whether to register-transport.
+					</td>
+				  </tr>
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Extension</td>
+					<td width="78%" 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.<br></span>
+					</td>
+				  </tr>
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Ping</td>
+					<td width="78%" class="vtable">
+					  <input name="ping" type="text" class="formfld" id="ping" size="40" value="<?=htmlspecialchars($pconfig['ping']);?>">
+					  <br> <span class="vexpl">Enter the ping interval here in seconds.<br></span>
+					</td>
+				  </tr>
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Caller-id-in-from</td>
+					<td width="78%" class="vtable">
+					  <?php
+					  echo "              <select name='caller-id-in-from' class='formfld'>\n";
+					  echo "                <option></option>\n";
+					  switch (htmlspecialchars($pconfig['caller-id-in-from'])) {
+					  case "true":
+						  echo "              <option value='true' selected='yes'>true</option>\n";
+						  echo "              <option value='false'>false</option>\n";
+						  break;
+					  case "false":
+						  echo "              <option value='true'>true</option>\n";
+						  echo "              <option value='false' selected='yes'>false</option>\n";
+
+						  break;
+					  default:
+						  echo "              <option value='true'>true</option>\n";
+						  echo "              <option value='false'>false</option>\n";
+					  }
+					  echo "              </select>\n";
+					  ?>
+					</td>
+				  </tr>
+				  <tr>
+					<td width="22%" valign="top" class="vncell">Supress-cng</td>
+					<td width="78%" class="vtable">
+					  <?php
+					  echo "              <select name='supress-cng' class='formfld'>\n";
+					  echo "                <option></option>\n";
+					  switch (htmlspecialchars($pconfig['supress-cng'])) {
+					  case "true":
+						  echo "              <option value='true' selected='yes'>true</option>\n";
+						  echo "              <option value='false'>false</option>\n";
+						  break;
+					  case "false":
+						  echo "              <option value='true'>true</option>\n";
+						  echo "              <option value='false' selected='yes'>false</option>\n";
+
+						  break;
+					  default:
+						  echo "              <option value='true'>true</option>\n";
+						  echo "              <option value='false'>false</option>\n";
+					  }
+					  echo "              </select>\n";
+					  ?>
+					</td>
+				  </tr>
+				  </table>
+
+				</div>
+
+			<table width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+			  <td width="22%" valign="top" class="vncellreq">Enabled</td>
+			  <td width="78%" class="vtable">
+				<?php
+				echo "              <select name='enabled' class='formfld'>\n";
+				echo "                <option></option>\n";
+				switch (htmlspecialchars($pconfig['enabled'])) {
+				case "true":
+					echo "              <option value='true' selected='yes'>true</option>\n";
+					echo "              <option value='false'>false</option>\n";
+					break;
+				case "false":
+					echo "              <option value='true'>true</option>\n";
+					echo "              <option value='false' selected='yes'>false</option>\n";
+
+					break;
+				default:
+					echo "              <option value='true' selected='yes'>true</option>\n";
+					echo "              <option value='false'>false</option>\n";
+				}
+				echo "              </select>\n";
+				?>
+			  </td>
+			</tr>
+
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Dialplan Expression</td>
+			  <td width="78%" class="vtable">
+			  <?php
+				echo "<textarea name=\"dialplan_expression\" id=\"dialplan_expression\" cols=\"30\" rows=\"4\" wrap=\"off\"></textarea>\n";
+			  ?>
+				<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 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>
+				<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{7})$'>Dial 9 then 7 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 />
+				Shortcut to create the outbound dialplan entries for this Gateway. The entries are saved to and edited from the 'Dialplan' tab.
+				</span></td>
+			</tr>
+
+			<tr>
+			  <td width="22%" valign="top" class="vncell">Gateway Description</td>
+			  <td width="78%" class="vtable">
+				<input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
+				<br> <span class="vexpl">Enter the description of the gateway here.</span></td>
+			</tr>
+			<tr>
+			  <td width="22%" valign="top">&nbsp;</td>
+			  <td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
+				<?php if (isset($id) && $a_gateways[$id]): ?>
+				  <input name="id" type="hidden" value="<?=$id;?>">
+				  <input name="gatewayid" type="hidden" value="<?=htmlspecialchars($pconfig['gatewayid']);?>">
+				<?php endif; ?>
+			  </td>
+			</tr>
+			</table>
+		</form>
+
+	  <br>
+	  <br>
+	  <br>
+	  <br>
+	  <br>
+	  <br>
+
+	 </td>
+	</tr>
 </table>
 
 </div>