--- webmin/net/acl_security.pl	Mon Jul  1 00:00:00 2002
+++ webmin-tpo/net/acl_security.pl	Sun Jul 21 18:13:49 2002
@@ -10,10 +10,14 @@
 	$_[0]->{'ifcs'} == 2 ? "checked" : "";
 printf "<input type=radio name=ifcs value=1 %s> $text{'acl_view'}\n",
 	$_[0]->{'ifcs'} == 1 ? "checked" : "";
-printf "<input type=radio name=ifcs value=0 %s> $text{'no'}</td>\n",
+printf "<input type=radio name=ifcs value=0 %s> $text{'no'}\n",
 	$_[0]->{'ifcs'} ? "" : "checked";
+printf "<input type=radio name=ifcs value=3 %s> $text{'acl_ifcs_only'}\n",
+	$_[0]->{'ifcs'} == 3 ? "checked" : "";
+print "<input name=interfaces size=30 value='".$_[0]->{'interfaces'}."'> ",
+	&interfaces_chooser_button("interfaces", 1),"</td> </tr>\n";
 
-print "<td><b>$text{'acl_routes'}</b></td> <td nowrap>\n";
+print "<tr> <td><b>$text{'acl_routes'}</b></td> <td nowrap>\n";
 printf "<input type=radio name=routes value=2 %s> $text{'yes'}\n",
 	$_[0]->{'routes'} == 2 ? "checked" : "";
 printf "<input type=radio name=routes value=1 %s> $text{'acl_view'}\n",
@@ -26,10 +30,10 @@
 	$_[0]->{'dns'} == 2 ? "checked" : "";
 printf "<input type=radio name=dns value=1 %s> $text{'acl_view'}\n",
 	$_[0]->{'dns'} == 1 ? "checked" : "";
-printf "<input type=radio name=dns value=0 %s> $text{'no'}</td>\n",
+printf "<input type=radio name=dns value=0 %s> $text{'no'}</td> </tr>\n",
 	$_[0]->{'dns'} ? "" : "checked";
 
-print "<td><b>$text{'acl_hosts'}</b></td> <td nowrap>\n";
+print "<tr> <td><b>$text{'acl_hosts'}</b></td> <td nowrap>\n";
 printf "<input type=radio name=hosts value=2 %s> $text{'yes'}\n",
 	$_[0]->{'hosts'} == 2 ? "checked" : "";
 printf "<input type=radio name=hosts value=1 %s> $text{'acl_view'}\n",
@@ -46,5 +50,6 @@
 $_[0]->{'routes'} = $in{'routes'};
 $_[0]->{'dns'} = $in{'dns'};
 $_[0]->{'hosts'} = $in{'hosts'};
+$_[0]->{'interfaces'} = $in{'interfaces'};
 }
 
--- webmin/net/edit_aifc.cgi	Sun Jul 14 00:00:00 2002
+++ webmin-tpo/net/edit_aifc.cgi	Sun Jul 21 18:24:57 2002
@@ -3,15 +3,24 @@
 # Edit or create an active interface
 
 require './net-lib.pl';
-$access{'ifcs'} == 2 || &error($text{'ifcs_ecannot'});
+$access{'ifcs'} == 2 || $access{'ifcs'} == 3 || &error($text{'ifcs_ecannot'});
+
 &ReadParse();
 if ($in{'new'}) {
 	&header($text{'aifc_create'}, "");
 	}
 else {
-	&header($text{'aifc_edit'}, "");
 	@act = &active_interfaces();
 	$a = $act[$in{'idx'}];
+
+	if ($access{'ifcs'} == 3) {
+		map { $can_interfaces{$_}++ } split(/\s+/, $access{'interfaces'});
+		if (! $can_interfaces{$a->{'fullname'}}) {
+			&error($text{'ifcs_ecannot_this'});
+			}
+		}
+	
+	&header($text{'aifc_edit'}, "");
 	}
 print "<hr>\n";
 
--- webmin/net/edit_bifc.cgi	Sun Jul 14 00:00:00 2002
+++ webmin-tpo/net/edit_bifc.cgi	Sun Jul 21 18:33:19 2002
@@ -3,15 +3,23 @@
 # Edit or create a bootup interface
 
 require './net-lib.pl';
-$access{'ifcs'} == 2 || &error($text{'ifcs_ecannot'});
+$access{'ifcs'} == 2 || $access{'ifcs'} == 3 || &error($text{'ifcs_ecannot'});
 &ReadParse();
 if ($in{'new'}) {
 	&header($text{'bifc_create'}, "");
 	}
 else {
-	&header($text{'bifc_edit'}, "");
 	@boot = &boot_interfaces();
 	$b = $boot[$in{'idx'}];
+
+	if ($access{'ifcs'} == 3) {
+		map { $can_interfaces{$_}++ } split(/\s+/, $access{'interfaces'});
+		if (! $can_interfaces{$b->{'fullname'}}) {
+			&error($text{'ifcs_ecannot_this'});
+			}
+		}
+	
+	&header($text{'bifc_edit'}, "");
 	}
 print "<hr>\n";
 
--- webmin/net/list_ifcs.cgi	Sun Jul 14 00:00:00 2002
+++ webmin-tpo/net/list_ifcs.cgi	Sun Jul 21 18:30:34 2002
@@ -18,12 +18,18 @@
       "<td><b>$text{'ifcs_mask'}</b></td> ",
       "<td><b>$text{'ifcs_status'}</b></td> </tr>\n";
 
+if ($access{'ifcs'} == 3) {
+	map { $can_interfaces{$_}++ } split(/\s+/, $access{'interfaces'});
+	}
+	
 @act = &active_interfaces();
 @act = sort iface_sort @act;
 foreach $a (@act) {
 	print "<tr $cb> <td>";
 	if ($a->{'virtual'} ne "") { print "&nbsp;&nbsp;"; }
-	if ($a->{'edit'} && $access{'ifcs'} == 2) {
+	if ($a->{'edit'} &&
+	    ( ($access{'ifcs'} == 2) ||
+	      ($access{'ifcs'} == 3 && $can_interfaces{$a->{'fullname'}} ))) {
 		print "<a href=\"edit_aifc.cgi?idx=$a->{'index'}\">",
 		      &html_escape($a->{'fullname'}),"</a></td>\n";
 		}
@@ -58,7 +64,9 @@
 foreach $a (@boot) {
 	print "<tr $cb> <td>";
 	if ($a->{'virtual'} ne "") { print "&nbsp;&nbsp;"; }
-	if ($a->{'edit'} && $access{'ifcs'} == 2) {
+	if ($a->{'edit'} &&
+	    ( ($access{'ifcs'} == 2) ||
+	      ($access{'ifcs'} == 3 && $can_interfaces{$a->{'fullname'}} ))) {
 		print "<a href=\"edit_bifc.cgi?idx=$a->{'index'}\">",
 		      &html_escape($a->{'fullname'}),"</a></td>\n";
 		}
--- webmin/net/interface_chooser.cgi	Mon Jul 22 14:09:56 2002
+++ webmin-tpo/net/interface_chooser.cgi	Sun Jul 21 18:41:53 2002
@@ -0,0 +1,128 @@
+#!/usr/bin/perl
+# interface_chooser.cgi
+#
+# Based on user_chooser.cgi by Jamie Cameron
+# (c) Tomas Pospisek <tpo_deb@sourcepole.ch>
+# Licensed under the webmin license
+#
+# made possible by: 
+# 	Sourcepole          http://sourcepole.ch
+# under contract from:
+# 	AO Media Services   http://www.ao-asif.ch/aoi/media/
+# Thanks!
+# 
+# TODO:
+# replace active_interfaces by a merged list from active_* and boot_interfaces
+# 
+# This CGI generated the HTML for choosing an interface or a list of interfaces.
+
+require './../web-lib.pl';
+require './net-lib.pl';
+&init_config();
+&ReadParse();
+%access = &get_module_acl();
+
+if ($in{'multi'}) {
+	# selecting multiple interfaces.
+	if ($in{'frame'} == 0) {
+		# base frame
+		&PrintHeader();
+		print "<script>\n";
+		@il = split(/\s+/, $in{'interface'});
+		$len = @il;
+		print "sel = new Array($len);\n";
+		for($i=0; $i<$len; $i++) {
+			print "sel[$i] = \"$il[$i]\";\n";
+			}
+		print "</script>\n";
+		print "<title>$text{'interfaces_title1'}</title>\n";
+		print "<frameset cols='50%,50%'>\n";
+		print "<frame src=\"/net/interface_chooser.cgi?frame=1&multi=1\">\n";
+		print "<frameset rows='*,50' frameborder=no>\n";
+		print " <frame src=\"/net/interface_chooser.cgi?frame=2&multi=1\">\n";
+		print " <frame src=\"/net/interface_chooser.cgi?frame=3&multi=1\" scrolling=no>\n";
+		print "</frameset>\n";
+		print "</frameset>\n";
+		}
+	elsif ($in{'frame'} == 1) {
+		# list of all interfaces to choose from
+		&header();
+		print "<script>\n";
+		print "function addinterface(i)\n";
+		print "{\n";
+		print "top.sel[top.sel.length] = i\n";
+		print "top.frames[1].location = top.frames[1].location\n";
+		print "return false;\n";
+		print "}\n";
+		print "</script>\n";
+		print "<font size=+1>$text{'interfaces_all'}</font>\n";
+		print "<table width=100%>\n";
+		foreach $if (&active_interfaces()) {
+			if ($in{'interface'} eq $if->{'fullname'}) { print "<tr $cb>\n"; }
+			else { print "<tr>\n"; }
+			print "<td width=20%><a href=\"\" onClick='return addinterface(\"$if->{'fullname'}\")'>$if->{'fullname'}</a></td>\n";
+			}
+		print "</table>\n";
+		}
+	elsif ($in{'frame'} == 2) {
+		# show chosen interfaces
+		&header();
+		print "<font size=+1>$text{'interfaces_sel'}</font>\n";
+		print <<'EOF';
+<table width=100%>
+<script>
+function sub(j)
+{
+  sel2 = new Array();
+  for(k=0,l=0; k<top.sel.length; k++) {
+	if (k != j) {
+		sel2[l] = top.sel[k];
+		l++;
+		}
+	}
+  top.sel = sel2;
+  top.frames[1].location = top.frames[1].location;
+  return false;
+}
+for(i=0; i<top.sel.length; i++) {
+	document.write("<tr>\n");
+	document.write("<td><a href=\"\" onClick='return sub("+i+")'>"+top.sel[i]+"</a></td>\n");
+	}
+</script>
+</table>
+EOF
+		}
+	elsif ($in{'frame'} == 3) {
+		# output OK and Cancel buttons
+		&header();
+		print "<form>\n";
+		print "<input type=button value=\"$text{'interfaces_ok'}\" ",
+		      "onClick='top.ifield.value = top.sel.join(\" \"); ",
+		      "top.close()'>\n";
+		print "<input type=button value=\"$text{'interfaces_cancel'}\" ",
+		      "onClick='top.close()'>\n";
+		print "&nbsp;&nbsp;<input type=button value=\"$text{'interfaces_clear'}\" onClick='top.sel = new Array(); top.selr = new Array(); top.frames[1].location = top.frames[1].location'>\n";
+		print "</form>\n";
+		}
+	}
+else {
+	# selecting just one interface .. display a list of all interfaces to choose from
+	&header();
+	print "<script>\n";
+	print "function select(f)\n";
+	print "{\n";
+	print "ifield.value = f;\n";
+	print "top.close();\n";
+	print "return false;\n";
+	print "}\n";
+	print "</script>\n";
+	print "<title>$text{'interfaces_title2'}</title>\n";
+	print "<table width=100%>\n";
+	foreach $if (&active_interfaces()) {
+		if ($in{'interface'} eq $if->{'fullname'}) { print "<tr $cb>\n"; }
+		else { print "<tr>\n"; }
+		print "<td width=20%><a href=\"\" onClick='return select(\"$if->{'fullname'}\")'>$if->{'fullname'}</a></td></tr>\n";
+		}
+	print "</table>\n";
+	}
+
--- webmin/net/lang/en	Mon Jul  1 00:00:00 2002
+++ webmin-tpo/net/lang/en	Sun Jul 21 18:29:33 2002
@@ -24,6 +24,7 @@
 ifcs_return=network interfaces
 ifcs_unknown=Unknown
 ifcs_ecannot=You are not allowed to edit network interfaces
+ifcs_ecannot_this=You are not allowed to edit this network interface
 
 aifc_create=Create Active Interface
 aifc_edit=Edit Active Interface
@@ -64,7 +65,7 @@
 routes_title=Routing and Gateways
 routes_boot=Routing configuration activated at <i>boot time</i>
 routes_default=Default router
-routes_none=None
+routes_none=None (or from DHCP)
 routes_device=Device
 routes_gateway=Gateway
 routes_forward=Act as router?
@@ -133,4 +134,12 @@
 acl_dns=Can edit DNS client settings?
 acl_hosts=Can edit host addresses?
 acl_view=View only
+acl_ifcs_only=Only interfaces
 
+interfaces_title1=Choose Interfaces...
+interfaces_all=All Interfaces...
+interfaces_sel=Selected Interfaces
+interfaces_ok=OK
+interfaces_cancel=Cancel
+interfaces_clear=Clear
+interfaces_title2=Select User...
--- webmin/web-lib.pl	Mon Jul  1 00:00:00 2002
+++ webmin-tpo/web-lib.pl	Mon Jul 22 14:18:21 2002
@@ -1251,6 +1251,15 @@
 return "<input type=button onClick='ifield = document.forms[$form].$_[0]; chooser = window.open(\"$gconfig{'webprefix'}/user_chooser.cgi?multi=$_[1]&user=\"+escape(ifield.value), \"chooser\", \"toolbar=no,menubar=no,scrollbars=yes,width=$w,height=200\"); chooser.ifield = ifield' value=\"...\">\n";
 }
 
+# interfaces_chooser_button(field, multiple, [form])
+# Returns HTML for a javascript button for choosing an interface or interfaces
+sub interfaces_chooser_button
+{
+  local $form = @_ > 2 ? $_[2] : 0;
+  local $w = $_[1] ? 500 : 300;
+  return "<input type=button onClick='ifield = document.forms[$form].$_[0]; chooser = window.open(\"$gconfig{'webprefix'}/net/interface_chooser.cgi?multi=$_[1]&interface=\"+escape(ifield.value), \"chooser\", \"toolbar=no,menubar=no,scrollbars=yes,width=$w,height=200\"); chooser.ifield = ifield' value=\"...\">\n";
+}
+
 # group_chooser_button(field, multiple, [form])
 # Returns HTML for a javascript button for choosing a Unix group or groups
 sub group_chooser_button