[Commits] r658 - trunk/webinterface/mods/super/vservers

[new-commit at lists.openvcp.org]

Author: cryptronic
Date: 2009-03-10 18:44:29 +0000 (Tue, 10 Mar 2009)
New Revision: 658

Modified:
   trunk/webinterface/mods/super/vservers/ips.php
Log:
little bugfixes


Modified: trunk/webinterface/mods/super/vservers/ips.php
===================================================================
--- trunk/webinterface/mods/super/vservers/ips.php	2009-02-23 15:16:39 UTC (rev 657)
+++ trunk/webinterface/mods/super/vservers/ips.php	2009-03-10 18:44:29 UTC (rev 658)
@@ -57,7 +57,7 @@
 	}
 	else
 	{
-		$DB->insert($DB->table_network, array('id' => '', 'ip' => $_POST['ipsingle'], 'vserverid' => $vserver->getID(), 'nodeid' => $node->getId(), 'used' => 'y', 'netmask' => $_POST['netmask'], 'broadcast' => $_POST['broadcast'], 'reservation' => ''));
+		$DB->insert($DB->table_network, array('id' => '', 'ip' => $_POST['ipsingle'], 'vserverid' => $vserver->getID(), 'nodeid' => $node->getId(), 'used' => 'y', 'netmask' => $_POST['netmask'], 'broadcast' => $_POST['broadcast'], 'reservation' => $vserver->getName()));
 		$ip = $_POST['ipsingle'];
 		$dev = $_POST['interfacesingle'];	
 		$mask = $_POST['netmask'];
@@ -83,7 +83,13 @@
 	else if($dev == "tun" || $dev == "tap")
 	{
 		$tuntap = $dev;
-		$dev = $dev.$alias;
+		$interfaces = $vserver->getNodeObject()->getInterfaces();
+		$i=0;
+		foreach($interfaces as $iface) {
+			if(strstr($iface, $dev))
+				$i++;
+		}
+		$dev = $dev.$i;
 		$alias = "";
 	}	
 	
@@ -159,6 +165,8 @@
 	$ifaceDrop[$interface] = $interface;
 
 }
+$ifaceDrop['create tun'] = "tun";
+$ifaceDrop['create tap'] = "tap";
 $GUI->formAddDropdown($col, "interface", $ifaceDrop);
 $row = $GUI->tableAddRow($table);
 $col = $GUI->br($GUI->tableAddCol($row,""));
@@ -166,8 +174,6 @@
 $GUI->tableAddCol($row, _("custom ip").": ");
 $col = $GUI->tableAddCol($row, "");
 $GUI->formAddInputElement($col, "text", "ipsingle");
-$ifaceDrop['create tun'] = "tun";
-$ifaceDrop['create tap'] = "tap";
 $GUI->formAddDropdown($col, "interfacesingle", $ifaceDrop);
 $row = $GUI->tableAddRow($table);
 $GUI->tableAddCol($row, _("netmask").": ");