Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

2026-04-24 09:52:58 +02:00 · 2010-09-02 20:05:11 +02:00
parent d9716b067d 4247f58a12
commit cdb4dc9630
5 changed files with 88 additions and 82 deletions
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -727,7 +727,7 @@ END
 ;
 }

-        if ($pppsettings{'TYPE'} eq 'vdsl') {
+        if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
 print <<END
 <tr>
        <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>