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

1 files changed, 334 insertions, 334 deletions

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>