Push all work on mlppp to the interfaces_ppp_edit and interfaces_ppp pages.

1 files changed, 17 insertions, 16 deletions

diff --git a/usr/local/www/interfaces_ppp.php b/usr/local/www/interfaces_ppp.php
index 0ef20f0..5e9d9f2 100644
--- a/usr/local/www/interfaces_ppp.php
+++ b/usr/local/www/interfaces_ppp.php
@@ -1,13 +1,10 @@
 <?php
+/* $Id$ */
 /*
-	interfaces_lan.php
-	part of pfSense(http://pfsense.org)
+	interfaces_ppp.php
+	part of m0n0wall (http://m0n0.ch/wall)
 
-	Originally written by Adam Lebsack <adam at holonyx dot com>
-	Changes by Chris Buechler <cmb at pfsense dot org> 
-	
-	Copyright (C) 2004-2008 BSD Perimeter LLC.
-	Copyright (C) 2004-2009 Scott Ullrich
+	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -32,14 +29,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_BUILDER_BINARIES:	/bin/kill	/sbin/ifconfig	
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
 	pfSense_MODULE:	interfaces
 */
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-ppp
-##|*NAME=Interfaces: PPP page
-##|*DESCR=Allow access to the 'Interfaces: PPP' page.
+##|*NAME=Interfaces: ppp page
+##|*DESCR=Allow access to the 'Interfaces: ppp' page.
 ##|*MATCH=interfaces_ppp.php*
 ##|-PRIV
 
@@ -63,7 +60,7 @@ function ppp_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (ppp_inuse($_GET['id'])) {
-		$input_errors[] = "This PPP interface cannot be deleted because it is still being used as an interface.";
+		$input_errors[] = "This interface cannot be deleted because it is still being used as an interface.";
 	} else {
 		unset($a_ppps[$_GET['id']]);
 		write_config();
@@ -89,8 +86,8 @@ include("head.inc");
 	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
 	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
 	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
-	$tab_array[5] = array("PPP", true, "interfaces_ppp.php");
-	$tab_array[6] = array("MLPPP", false, "interfaces_mlppp.php");
+	$tab_array[5] = array("PPP", false, "interfaces_ppp.php");
+	$tab_array[6] = array("MLPPP", true, "interfaces_mlppp.php");
 	$tab_array[7] = array("GRE", false, "interfaces_gre.php");
 	$tab_array[8] = array("GIF", false, "interfaces_gif.php");
 	$tab_array[9] = array("Bridges", false, "interfaces_bridge.php");
@@ -103,14 +100,18 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="20%" class="listhdrr">Serial Port</td>
+                	<td width="20%" class="listhdrr">Type</td>
+                  <td width="20%" class="listhdrr">Interface(s)/Port(s)</td>
                   <td width="40%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_ppps as $id => $ppp): ?>
                 <tr  ondblclick="document.location='interfaces_ppp_edit.php?id=<?=$i;?>'">
+                	<td class="listr">
+					<?=htmlspecialchars($ppp['type']);?>
+                  </td>
                   <td class="listr">
-					<?=htmlspecialchars($ppp['port']);?>
+					<?=htmlspecialchars($ppp['ports']);?>
                   </td>
                   <td class="listbg">
                     <?=htmlspecialchars($ppp['descr']);?>&nbsp;
@@ -120,7 +121,7 @@ include("head.inc");
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
-                  <td class="list" colspan="2">&nbsp;</td>
+                  <td class="list" colspan="3">&nbsp;</td>
                   <td class="list"> <a href="interfaces_ppp_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
 				</tr>
               </table>