From 69c1b04365c3e2b6418954f8739913753c7ab87f Mon Sep 17 00:00:00 2001
From: gnhb <gnoahb@gmail.com>
Date: Sun, 13 Jun 2010 20:35:11 +0700
Subject: Fix empty data shown in interfaces_ppps when dislaying modem
 interfaces.

Also, clean up interfaces_ppps_configure. For PPtP/L2tP if Local IP field is
left empty, try to get the IP from the physical interface if it has one. If not
just log error and abort.
---
 usr/local/www/interfaces_ppps.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www/interfaces_ppps.php')

diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php
index 180c161..5a6c306 100644
--- a/usr/local/www/interfaces_ppps.php
+++ b/usr/local/www/interfaces_ppps.php
@@ -101,7 +101,7 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                	<td width="20%" class="listhdrr">Type</td>
+                	<td width="20%" class="listhdrr">Interface</td>
                   <td width="20%" class="listhdrr">Interface(s)/Port(s)</td>
                   <td width="40%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
@@ -115,7 +115,7 @@ include("head.inc");
 					<?php
 						$portlist = explode(",", $ppp['ports']);
 						foreach ($portlist as $portid => $port) {
-							if ($port != get_real_interface($port))
+							if ($port != get_real_interface($port) && $ppp['type'] != "ppp")
 								$portlist[$portid] = convert_friendly_interface_to_friendly_descr($port);
 						}
 						echo htmlspecialchars(implode(",", $portlist));
-- 
cgit v1.1