Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / pppsetup.cgi

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 4c7bb8c77240c52fc38209deb5a8cea842e0af63..f6b29e199bd5ac8b0c840dba6c8dda178e62ecb4 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -748,7 +748,7 @@ END
         if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
 print <<END
 <tr>
-        <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>
+        <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV/VLAN:</b></td>
 </tr>
 END
 ;
@@ -778,6 +778,15 @@ END
        }
        else {
        print "<tr><td colspan='4' width='100%'>No IPTV possible install addon igmpproxy</td></tr>";
+               if ($pppsettings{'TYPE'} eq 'vdsl') {
+print <<END
+                       <tr>
+                               <td>INET_VLAN</td>
+                               <td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td>
+                       </tr>
+END
+;
+               }
        }
 }