Actualised LDAP SiteManagement Webinterface and Perl-Config-Skripts

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1225 95ad53e4-c205-0410-b2fa-d234c58c8868

18 files changed, 411 insertions, 270 deletions

diff --git a/ldap-site-mngmt/webinterface/rbs/gbm.dwt b/ldap-site-mngmt/webinterface/rbs/gbm.dwt
index b2f77800..2c96ceaa 100644
--- a/ldap-site-mngmt/webinterface/rbs/gbm.dwt
+++ b/ldap-site-mngmt/webinterface/rbs/gbm.dwt
@@ -1,4 +1,12 @@
 <table border='0' cellpadding='5' cellspacing='0' width='100%'> 
+  	
+  	<tr>
+  		<td height='20'><h4><a href='gbm_overview.php?rbsdn={RBSDN}&mnr={MNR}&sbmnr={SBMNR}' class='headerlink'><< Zur&uuml;ck zur GBM &Uuml;bersicht</a></h4></td>
+  	</tr>
+  	<tr>
+  		<td height='20'>&nbsp;</td>
+  	</tr>
+  	
   	<tr>
   		<td colspan='2'><h3>Generisches Boot Image &nbsp;<code class='font_object'> {GBMCN} </code> </h3></td>
   	</tr>
@@ -25,9 +33,11 @@
 			
 		</table></td>
 	</tr>
+	
 	<tr>
   		<td height='40'></td>
   	</tr>		
+	
 	<tr>
   		<td colspan='2'><h4>KERNEL und APPEND Parameter:</h4></td>
   	</tr>
@@ -38,42 +48,66 @@
   		<table cellpadding='7' cellspacing='0' border='1' align='left' width='90%' style='border-width: 0 0 0 0;'>
 			
 			<tr>
-				<td width='30%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Attribut</b></td>
-				<td width='25%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Server Pfad</b></td>
-				<td width='15%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Wert</b></td>
-				<td width='30%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Wert</b></td>
+				<td width='20%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Attribut</b></td>
+				<td width='35%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Wert</b></td>
+				<td width='45%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>&nbsp;</b></td>
 			</tr>
 			<tr height='50'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>KERNEL Image: </td>
-				<td align='right' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<font size='+1'>{TFTP}::{TFTPPATH}</font></td>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>KERNEL</td>
 				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<input type='Text' name='attribs[kernel]' value='{KERNEL}' size='45' class='medium_form_field'>
+					<font size='+1'>{TFTPIP}::{TFTPROOT}/{TFTPKERNEL}</font>
+					<input type='Text' name='attribs[kernel]' value='{KERNEL}' size='40' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[kernel]' value='{KERNEL}'> 
 				</td>
 			</tr>
+			<tr>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>APPEND</td>
+				<td align='right' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+					&nbsp;</td>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>&nbsp;
+				</td>
+			</tr>
 			<tr height='50'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>Initialram FS <br>(APPEND initrd=..): </b></td>
-				<td align='right' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<font size='+1'>{TFTP}::{TFTPPATH}</font></td>
-				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<input type='Text' name='attribs[initrd]' value='{INITRD}' size='45' class='medium_form_field'>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>Initialram FS: </b></td>
+				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+					<font size='+1'>initrd={TFTPIP}::{TFTPROOT}/{TFTPKERNEL}</font>
+					<input type='Text' name='attribs[initrd]' value='{INITRD}' size='40' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[initrd]' value='{INITRD}'>
 				</td>
 			</tr>
 			<tr valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>Root Filesystem <br>(APPEND rootfs=..): </b></td>
-				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>					
-						{SELECTOPTIONS}
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>Root Filesystem: </b></td>
+				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>					
+						<font size='+1'>rootfs={ROOTFS}</font>
 					</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<input type='Text' name='attribs[rootfspath]' value='{ROOTFS}' size='30' class='medium_form_field'>
-					<input type='hidden' name='oldattribs[rootfspath]' value='{ROOTFS}'>
+			</tr>
+			<tr valign='top'>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>&nbsp;</td>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>	<b>&Auml;ndern:</b><br>				
+						{FSURISELECT}
+					</td>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+				   bei NFS eventuell um spezifischen Pfad erweitern:<br>
+					<input type='Text' name='rootfssuffix' value='' size='35' class='medium_form_field'>
+				</td>
+			</tr>
+			<tr>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>Debug-Level: </b>&nbsp;</td>
+				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+				   <font size='+1'>debug=</font>
+					<input type='Text' name='attribs[debug]' value='{DEBUG}' size='2' class='medium_form_field'>
+					<input type='hidden' name='oldattribs[debug]' value='{DEBUG}'>
+				</td>
+			</tr>
+			<tr>
+				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>Misc APPEND: </b><br>(wird hinten angef&uuml;gt)&nbsp;</td>
+				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
+					<input type='Text' name='attribs[appendmisc]' value='{MISC}' size='80' class='medium_form_field'>
+					<input type='hidden' name='oldattribs[appendmisc]' value='{MISC}'>
 				</td>
 			</tr>
 			<tr>
 				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>IPAPPEND: </b>&nbsp;</td>
-				<td align='right' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>
 				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
 					<input type='Text' name='attribs[ipappend]' value='{IPAPPEND}' size='2' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[ipappend]' value='{IPAPPEND}'>
@@ -92,6 +126,32 @@
 		</form></td>
 	</tr>
 	
+	<tr>
+  		<td height='50'></td>
+  	</tr>
+	<tr>
+  		<td colspan='2'><h3>Daraus ergibt sich folgender generischer Bootmen&uuml;eintrag</h3></td>
+  	</tr>
+	<tr>
+  		<td colspan='2'>Diesen k&ouml;nnen Nutzer des Dienstes f&uuml;r ihre PXE-Configs verwenden und zu eigenen Men&uuml;eintr&auml;gen erweitern.</td>
+  	</tr>
+  	<tr>
+  		<td>
+  		<table cellpadding='20' cellspacing='0' border='0' align='left' width='80%' style='border-color: black; border-style: solid; border-width: 2 2 2 2;'>
+
+  			<tr>
+  				<td class='tab_d_ohne'>
+  					LABEL ..... <br>
+  					&nbsp;&nbsp;&nbsp; MENU LABEL ...... <br>
+  					&nbsp;&nbsp;&nbsp; KERNEL {TFTPIP}::/{TFTPKERNEL}{KERNEL} <br>
+  					&nbsp;&nbsp;&nbsp; APPEND initrd={TFTPIP}::/{TFTPKERNEL}{INITRD} rootfs={ROOTFS} debug={DEBUG} {MISC}<br>
+  					&nbsp;&nbsp;&nbsp; IPAPPEND {IPAPPEND}
+  				</td>			
+  			</tr>
+  			
+  			
+  		</table></td>
+  	</tr>
 	
 	<tr>
   		<td height='40'></td>
diff --git a/ldap-site-mngmt/webinterface/rbs/gbm.php b/ldap-site-mngmt/webinterface/rbs/gbm.php
index 0efe7922..f0cfbb25 100644
--- a/ldap-site-mngmt/webinterface/rbs/gbm.php
+++ b/ldap-site-mngmt/webinterface/rbs/gbm.php
@@ -27,16 +27,28 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 $gbmDN = $_GET['dn'];
 
+$template->assign(array("TFTPROOT" => "",
+								"TFTPKERNEL" => "",
+								"TFTPPXE" => "",
+                        "TFTPCLIENTCONF" => "",
+								"NFS" => "",
+								"NFSPATH" => "",
+								"NBD" => ""));
+
 # rbservice und pxe daten (voerst nur ein rbs)
 $rbs_array = get_rbservices($auDN,array("dn","cn"));
 $rbsDN = $rbs_array[0]['dn'];
 # RBS Daten 					
-$rbs_data = get_node_data($rbsDN, array("cn","nfsserverip","exportpath","tftpserverip","tftppath","nbdserverip"));
+$rbs_data = get_node_data($rbsDN, array("cn","tftpserverip","tftproot","tftpkernelpath","tftpclientconfpath",
+                                          "tftppxepath","nfsserverip","exportpath","nbdserverip","fileserveruri"));
 $template->assign(array("RBSCN" => $rbs_data['cn'],
+								"TFTPIP" => $rbs_data['tftpserverip'],
+								"TFTPROOT" => $rbs_data['tftproot'],
+								"TFTPKERNEL" => $rbs_data['tftpkernelpath'],
+								"TFTPPXE" => $rbs_data['tftppxepath'],
+                        "TFTPCLIENTCONF" => $rbs_data['tftpclientconfpath'],
 								"NFS" => $rbs_data['nfsserverip'],
 								"NFSPATH" => $rbs_data['exportpath'],
-								"TFTP" => $rbs_data['tftpserverip'],
-								"TFTPPATH" => $rbs_data['tftppath'],
 								"NBD" => $rbs_data['nbdserverip']));
 								
 
@@ -47,12 +59,25 @@ $template->assign(array("GBMDN" => $gbmDN,
 								"INITRD" => "",
 								"FSTYPE" => "",
 								"ROOTFS" => "",
+								"DEBUG" => "",
+								"MISC" => "",
 								"IPAPPEND" => ""));
 
 # GBM Daten		
-$attributes = array("dn","cn","label","kernel","initrd","rootfstype","rootfspath","ipappend");				
+$attributes = array("dn","cn","label","kernel","initrd","rootfs","rootfstype","rootfspath","debug","appendmisc","ipappend");				
 $gbm = get_node_data($gbmDN, $attributes);
 
+$selectboxmax = count($rbs_data['fileserveruri']) + 1;
+$fsuriselectbox = "<select name='rootfs' size='".$selectboxmax."' class='rootfs_form_selectbox'>
+                  <option value='none'>---------------------------------</option>";
+if ( $rbs_data['fileserveruri'] != "" ){
+   foreach ($rbs_data['fileserveruri'] as $fsuri){
+      $fsuriselectbox .= "<option value='".$fsuri."'>".$fsuri."</option>";
+   }
+}
+$fsuriselectbox .= "</select>
+					   <input type='hidden' name='oldrootfs' value='".$gbm['rootfs']."'>";
+
 if ($gbm['rootfstype'] == 'nfs'){
 	$options = "<select name='rootfstype' size='4' class='rootfs_form_selectbox'>
 					<option value='nfs' selected><b>nfs://".$rbs_data['nfsserverip'].":/".$rbs_data['exportpath']."</b></option>
@@ -96,8 +121,11 @@ $template->assign(array("GBMCN" => $gbm['cn'],
 								"LABEL" => $gbm['label'],
 								"KERNEL" => $gbm['kernel'],
 								"INITRD" => $gbm['initrd'],
+								"FSURISELECT" => $fsuriselectbox,
 								"SELECTOPTIONS" => $options,
-								"ROOTFS" => $gbm['rootfspath'],
+								"ROOTFS" => $gbm['rootfs'],
+								"DEBUG" => $gbm['debug'],
+								"MISC" => $gbm['appendmisc'],
 								"IPAPPEND" => $gbm['ipappend'],
 								"RBSDN" => $rbsDN,
            		       	"MNR" => $mnr,
diff --git a/ldap-site-mngmt/webinterface/rbs/gbm_change.php b/ldap-site-mngmt/webinterface/rbs/gbm_change.php
index 86067acd..ff01865d 100644
--- a/ldap-site-mngmt/webinterface/rbs/gbm_change.php
+++ b/ldap-site-mngmt/webinterface/rbs/gbm_change.php
@@ -9,8 +9,11 @@ $rbsDN = $_POST['rbsdn'];
 $mnr = $_POST['mnr'];
 $sbmnr = $_POST['sbmnr'];
 
-$rootfstype = $_POST['rootfstype'];
-$oldrootfstype = $_POST['oldrootfstype'];
+$rootfs = $_POST['rootfs'];
+#$oldrootfs = $_POST['oldrootfs'];
+$rootfspath = $_POST['rootfspath'];
+$rootfssuffix = $_POST['rootfssuffix'];
+#$oldrootfstype = $_POST['oldrootfstype'];
 
 $attribs = $_POST['attribs'];
 if (count($attribs) != 0){
@@ -92,42 +95,65 @@ if ( $oldgbmcn != "" && $gbmcn == "" ){
 }
 
 ###################################
-# RootFS Type
-
-if ( $oldrootfstype == $rootfstype ){
-	# $mesg = "keine Aenderung<br>";
-}
-
-if ( $oldrootfstype == "" && $rootfstype != "" ){
-	$entryadd ['rootfstype'] = $rootfstype;
-	if(ldap_mod_add($ds,$gbmDN,$entryadd)){
-		$mesg = "Attribute <b>RootfsType</b> erfolgreich eingetragen<br><br>";
-	}else{
-		$mesg = "Fehler beim eintragen der Attribute <b>RootfsType</b><br><br>";
-	}
-}
-
-
-if ( $oldrootfstype != "" && $rootfstype != "" && $oldrootfstype != $rootfstype ){
-	echo "Root FS Type &auml;ndern<br>";
-	$entrymod ['rootfstype'] = $rootfstype;
-	if(ldap_mod_replace($ds,$gbmDN,$entrymod)){
-		$mesg = "Attribute <b>RootfsType</b> erfolgreich geaendert<br><br>";
-	}else{
-		$mesg = "Fehler beim aendern der Attribute <b>RootfsType</b><br><br>";
-	}
+# RootFS
+if ( $rootfs != "" ){
+   if ( $rootfs == "none" ){
+      echo "Root FS l&ouml;schen!<br>";
+	   $entrydel ['rootfs'] = array();
+	   if(ldap_mod_del($ds,$gbmDN,$entrydel)){
+		   $mesg = "Attribut <b>RootFS</b> erfolgreich gel&ouml;scht<br><br>";
+   	}else{
+   		$mesg = "Fehler beim l&ouml;schen des Attributs <b>RootFS</b><br><br>";
+   	}
+   
+   }else{
+      echo "Root FS &auml;ndern!<br>";
+	   $entrymod ['rootfs'] = $rootfs.$rootfssuffix;
+	   if(ldap_mod_replace($ds,$gbmDN,$entrymod)){
+		   $mesg = "Attribut <b>RootFS</b> erfolgreich ge&auml;ndert<br><br>";
+   	}else{
+   		$mesg = "Fehler beim &auml;ndern des Attributs <b>RootFS</b><br><br>";
+   	}
+   }
 }
 
+###################################
+# RootFS Type
 
-if ( $oldrootfstype != "" && $rootfstype == "" ){
-	echo "Root FS Type l&ouml;schen!<br>";
-	$entrydel ['rootfstype'] = array();
-	if(ldap_mod_del($ds,$gbmDN,$entrydel)){
-		$mesg = "Attribute <b>RootfsType</b> erfolgreich geloescht<br><br>";
-	}else{
-		$mesg = "Fehler beim loeschen der Attribute <b>RootfsType</b><br><br>";
-	}
-}
+#if ( $oldrootfstype == $rootfstype ){
+#	# $mesg = "keine Aenderung<br>";
+#}
+ 
+#if ( $oldrootfstype == "" && $rootfstype != "" ){
+#	$entryadd ['rootfstype'] = $rootfstype;
+#	if(ldap_mod_add($ds,$gbmDN,$entryadd)){
+#		$mesg = "Attribute <b>RootfsType</b> erfolgreich eingetragen<br><br>";
+#	}else{
+#		$mesg = "Fehler beim eintragen der Attribute <b>RootfsType</b><br><br>";
+#	}
+#}
+ 
+
+#if ( $oldrootfstype != "" && $rootfstype != "" && $oldrootfstype != $rootfstype ){
+#	echo "Root FS Type &auml;ndern<br>";
+#	$entrymod ['rootfstype'] = $rootfstype;
+#	if(ldap_mod_replace($ds,$gbmDN,$entrymod)){
+#		$mesg = "Attribute <b>RootfsType</b> erfolgreich geaendert<br><br>";
+#	}else{
+#		$mesg = "Fehler beim aendern der Attribute <b>RootfsType</b><br><br>";
+#	}
+#}
+
+
+#if ( $oldrootfstype != "" && $rootfstype == "" ){
+#	echo "Root FS Type l&ouml;schen!<br>";
+#	$entrydel ['rootfstype'] = array();
+#	if(ldap_mod_del($ds,$gbmDN,$entrydel)){
+#		$mesg = "Attribute <b>RootfsType</b> erfolgreich geloescht<br><br>";
+#	}else{
+#		$mesg = "Fehler beim loeschen der Attribute <b>RootfsType</b><br><br>";
+#	}
+#}
 
 
 ###################################
diff --git a/ldap-site-mngmt/webinterface/rbs/gbm_overview.php b/ldap-site-mngmt/webinterface/rbs/gbm_overview.php
index 1158a396..bb0ebb83 100644
--- a/ldap-site-mngmt/webinterface/rbs/gbm_overview.php
+++ b/ldap-site-mngmt/webinterface/rbs/gbm_overview.php
@@ -6,7 +6,7 @@ include('../standard_header.inc.php');
 $titel = "Remote Boot Service Management";
 # 2. Nummer des zugehörigen Hauptmenus (Registerkarte) beginnend bei 0, siehe Dokumentation.doc.
 $mainnr = 4;
-$mnr = 2; 
+$mnr = -1; 
 $sbmnr = -1;
 $mcnr = -1;
 # 3. Dateiname und evtl. Pfad des Templates für die Webseite
@@ -18,33 +18,41 @@ include('rbs_header.inc.php');
 
 ###################################################################################
 
+$mnr = $_GET['mnr'];
+$sbmnr = $_GET['sbmnr'];
+
 # Menuleisten erstellen
 createMainMenu($rollen, $mainnr);
 createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
+$rbsDN = $_GET['rbsdn'];
+
 $template->assign(array("GBMDN" => "",
 								"GBMCN" => "Noch keine Generischen Boot Men&uuml;s angelegt",
 								"KERNEL" => "",
 								"FS" => ""));
 
-# rbservice und pxe daten (voerst nur ein rbs)
-$rbs_array = get_rbservices($auDN,array("dn","cn"));
-$rbsDN = $rbs_array[0]['dn'];
-
 # Generic Bootmenüs
 $generic_bms = get_menuentries($rbsDN,array("dn","cn","label","kernel","nfsroot","nbdroot"));
 
 $template->define_dynamic("Genericbm", "Webseite");
 $template->define_dynamic("Offers", "Webseite");
+
 foreach ($generic_bms as $gbm){
 	if ($gbm['nfsroot'] != ""){$fs = "NFS";}
 	if ($gbm['nbdroot'] != ""){$fs = "NBD";}
+	
+	$gbmname = "<a href='gbm.php?dn=".$gbm['dn']."&mnr=".$mnr."&sbmnr=".$sbmnr."' class='headerlink'>".$gbm['cn']."</a>";
+	
 	$template->assign(array("GBMDN" => $gbm['dn'],
-									"GBMCN" => $gbm['cn'],
+									"GBMCN" => $gbmname,
 	   	        		      "KERNEL" => $gbm['kernel'],
-	   	        			   "FS" => $fs));
+	   	        			   "FS" => $fs,
+	   	        			   "MNR" => $mnr,
+	   	        			   "SBMNR" => $sbmnr,
+	   	        			   "RBSDN" => $rbsDN));
 	$template->parse("GENERICBM_LIST", ".Genericbm");
 }
 
diff --git a/ldap-site-mngmt/webinterface/rbs/new_gbm.dwt b/ldap-site-mngmt/webinterface/rbs/new_gbm.dwt
index b84cf66d..d5d21dc2 100644
--- a/ldap-site-mngmt/webinterface/rbs/new_gbm.dwt
+++ b/ldap-site-mngmt/webinterface/rbs/new_gbm.dwt
@@ -1,6 +1,6 @@
 <table border='0' cellpadding='5' cellspacing='0' width='100%'> 
   	<tr>
-  		<td colspan='2'><h3>Generisches Boot Image &nbsp;<code class='font_object'> {GBMCN} </code> </h3></td>
+  		<td colspan='2'><h3>Neues generisches Boot Image f&uuml;r Dienst &nbsp;<code class='font_object'> {RBSCN} </code>&nbsp; anlegen </h3></td>
   	</tr>
   	<tr>
   		<td height='20'></td>
diff --git a/ldap-site-mngmt/webinterface/rbs/new_gbm.php b/ldap-site-mngmt/webinterface/rbs/new_gbm.php
index 4ece741c..3300ffb0 100644
--- a/ldap-site-mngmt/webinterface/rbs/new_gbm.php
+++ b/ldap-site-mngmt/webinterface/rbs/new_gbm.php
@@ -25,11 +25,9 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
-$gbmcn = str_replace ( "_", " ", $_GET['gbmcn']);
+$rbsDN = $_GET['rbsdn'];
 
-# rbservice und pxe daten (voerst nur ein rbs)
-$rbs_array = get_rbservices($auDN,array("dn","cn"));
-$rbsDN = $rbs_array[0]['dn'];
+$gbmcn = str_replace ( "_", " ", $_GET['gbmcn']);
 
 # RBS Daten 				
 $rbs_data = get_node_data($rbsDN, array("cn","nfsserverip","exportpath","tftpserverip","tftppath","nbdserverip"));
diff --git a/ldap-site-mngmt/webinterface/rbs/new_pxe.dwt b/ldap-site-mngmt/webinterface/rbs/new_pxe.dwt
index c97324b5..3418d674 100644
--- a/ldap-site-mngmt/webinterface/rbs/new_pxe.dwt
+++ b/ldap-site-mngmt/webinterface/rbs/new_pxe.dwt
@@ -1,6 +1,6 @@
 <table border='0' cellpadding='5' cellspacing='0' width='100%'> 
   	<tr>
-  		<td colspan='2'><h3>Neues DEFAULT PXE Boot Men&uuml; anlegen:</h3></td>
+  		<td colspan='2'><h3>Neue PXE Config (DEFAULT) f&uuml;r Dienst &nbsp;<code class='font_object'> {RBSCN} </code>&nbsp; anlegen:</h3></td>
   	</tr>
   	<tr>
   		<td height='10'>&nbsp;</td>
@@ -19,20 +19,6 @@
 				</td>
 			</tr>
 			<tr valign='top'>
-				<td width='30%' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>Remote Boot Dienst <br>
-																																		ausw&auml;hlen: </b>&nbsp;</td>
-				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<select name='rbs' size='5' class='medium_form_selectbox'> 
-						<option selected value='none'>----------</option>
-						
-						<!-- BEGIN DYNAMIC BLOCK: Altrbs -->
-						<option value='{ALTRBSDN}'>{ALTRBSCN} {ALTRBSAU}</option>
-						<!-- END DYNAMIC BLOCK: Altrbs -->
-						
-					</select>
-				</td>
-			</tr>
-			<tr valign='top'>
 				<td width='30%' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>G&uuml;ltigkeitsdauer <br>(Time Range): </b>&nbsp;</td>
 				<td width='40%' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
 					<input type='Text' name='pxeday' value='{PXEDAY}' size='5' maxlength='5' class='medium_form_field'>
@@ -144,6 +130,7 @@
 			</tr>
 			
   			<input type='hidden' name='oldpxecn' value='{PXECN}'>
+  			<input type='hidden' name='rbsdn' value='{RBSDN}'>
 			<input type='hidden' name='mnr' value='{MNR}'>
 			<input type='hidden' name='sbmnr' value='{SBMNR}'>
 			<input type='hidden' name='mcnr' value='{MCNR}'>					
diff --git a/ldap-site-mngmt/webinterface/rbs/new_pxe.php b/ldap-site-mngmt/webinterface/rbs/new_pxe.php
index 9a6afba0..338f5d48 100644
--- a/ldap-site-mngmt/webinterface/rbs/new_pxe.php
+++ b/ldap-site-mngmt/webinterface/rbs/new_pxe.php
@@ -28,6 +28,9 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
+$rbsDN = $_GET['rbsdn'];
+$rbsdnexp = ldap_explode_dn($rbsDN, 1);
+
 $pxecn = str_replace ( "_", " ", $_GET['pxecn']);
 $pxeday = str_replace ( "_", " ", $_GET['pxeday']);
 $pxebeg = str_replace ( "_", " ", $_GET['pxebeg']);
@@ -39,7 +42,8 @@ $template->assign(array("PXECN" => $pxecn,
            			      "PXEEND" => $pxeend,
            		       	"LDAPURI" => "",
            			      "FILEURI" => "",   
-           			      "RBS" => "",
+           			      "RBSDN" => $rbsDN,
+           			      "RBSCN" => $rbsdnexp[0],   
            			      "RBSAU" => "",
            			      "NFS" => "",
            			      "NFSROOT" => "",
@@ -65,28 +69,6 @@ $template->assign(array("PXECN" => $pxecn,
            		        	"MNR" => $mnr,
            		       	"SBMNR" => $sbmnr));
 
-#############################################
-# RB Dienste holen
-$rbsoffers = get_rbsoffers($auDN);
-
-$template->assign(array("ALTRBSDN" => "",
-   	                  "ALTRBSCN" => "",
-   	                  "ALTRBSAU" => ""));
-
-if (count($rbsoffers) != 0){
-$template->define_dynamic("Altrbs", "Webseite");
-	foreach ($rbsoffers as $item){
-		$rbsdnexp = ldap_explode_dn($item,1);
-		$rbsoffcn = $rbsdnexp[0];
-		$rbsoffau = $rbsdnexp[2];
-		#$auexp = explode(',',$item['auDN']);
-		#$altrbsau = explode('=',$auexp[0]);
-		$template->assign(array("ALTRBSDN" => $item,
-   	                        "ALTRBSCN" => $rbsoffcn,
-   	                        "ALTRBSAU" => " &nbsp;&nbsp;[ Abt.:  ".$rbsoffau." ]"));
-   	$template->parse("ALTRBS_LIST", ".Altrbs");	
-	} 
-}
 
 ###################################################################################
 
diff --git a/ldap-site-mngmt/webinterface/rbs/new_rbservice.php b/ldap-site-mngmt/webinterface/rbs/new_rbservice.php
index 020e3254..2882ebda 100644
--- a/ldap-site-mngmt/webinterface/rbs/new_rbservice.php
+++ b/ldap-site-mngmt/webinterface/rbs/new_rbservice.php
@@ -24,15 +24,7 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
-# nochmal zur Sicherheit: falls doch RBS angelegt					
-$rbs_array = get_rbservices($auDN,array("dn","cn"));
-if (count($rbs_array) != 0){
-	$url = "rbservice.php?mnr=1";
-	$seconds = 1;
-	$mesg .= "<br>Sie werden automatisch auf die n&auml;chste Seite geleitet. <br>				
-			Falls nicht, klicken Sie hier <a href=".$url." style='publink'>hier</a>";
-	redirect($seconds, $url, $mesg, $addSessionId = TRUE);
-}
+# nochmal zur Sicherheit: falls doch RBS angelegt
 
 $rbscn = str_replace ( "_", " ", $_GET['rbscn']);
 $template->assign(array("RBSCN" => $rbscn,
diff --git a/ldap-site-mngmt/webinterface/rbs/pxe.dwt b/ldap-site-mngmt/webinterface/rbs/pxe.dwt
index 4b881338..ae1c112a 100644
--- a/ldap-site-mngmt/webinterface/rbs/pxe.dwt
+++ b/ldap-site-mngmt/webinterface/rbs/pxe.dwt
@@ -1,4 +1,12 @@
 <table border='0' cellpadding='5' cellspacing='0' width='100%'> 
+  	
+   <tr>
+  		<td height='20'><h4><a href='pxeconfig_default.php?rbsdn={RBSDN}&mnr={MNR}&sbmnr={SBMNR}' class='headerlink'><< Zur&uuml;ck zur PXE &Uuml;bersicht</a></h4></td>
+  	</tr>
+  	<tr>
+  		<td height='20'>&nbsp;</td>
+  	</tr>
+  	
   	<tr>
   		<td colspan='2'><h3>PXE Boot Men&uuml; &nbsp;<code class='font_object'>  {PXECN} </code> </h3></td>
   	</tr>
diff --git a/ldap-site-mngmt/webinterface/rbs/pxe.php b/ldap-site-mngmt/webinterface/rbs/pxe.php
index f9671d22..11f25875 100644
--- a/ldap-site-mngmt/webinterface/rbs/pxe.php
+++ b/ldap-site-mngmt/webinterface/rbs/pxe.php
@@ -29,6 +29,7 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 ###################################################################################
 
 $pxeDN = $_GET['dn'];
+#$rbsDN = $_GET['rbsdn'];
 
 $attributes = array("dn","cn","rbservicedn","filename","timerange","allowoptions","console","default",
 							"display","font","implicit","kbdmap","menumasterpasswd","menutitle",
@@ -90,6 +91,7 @@ $maxpos = count($menuentries)+1;
 $template->assign(array("PXEDN" => $pxeDN,
 								"PXECN" => $pxecn,
 								"TIMERANGE" => $pxe['timerange'],
+								"RBSDN" => $rbsDN,
            			      "RBS" => $rbsdata['cn'],
            			      "RBSAU" => $rbsau,
            			      "NFS" => $rbsdata['nfsserverip'],
diff --git a/ldap-site-mngmt/webinterface/rbs/pxe_add.php b/ldap-site-mngmt/webinterface/rbs/pxe_add.php
index 4b314ab1..793cb34f 100644
--- a/ldap-site-mngmt/webinterface/rbs/pxe_add.php
+++ b/ldap-site-mngmt/webinterface/rbs/pxe_add.php
@@ -2,7 +2,7 @@
 include('../standard_header.inc.php');
 
 $pxecn = $_POST['pxecn'];  $pxecn = htmlentities($pxecn);
-$rbsDN = $_POST['rbs'];
+$rbsDN = $_POST['rbsdn'];
 #print_r($rbsDN);
 $pxeday = $_POST['pxeday']; $pxeday = htmlentities($pxeday);
 $pxebeg = $_POST['pxebeg']; $pxebeg = htmlentities($pxebeg);
diff --git a/ldap-site-mngmt/webinterface/rbs/pxeconfig_default.php b/ldap-site-mngmt/webinterface/rbs/pxeconfig_default.php
index f9a2b7db..243c647b 100644
--- a/ldap-site-mngmt/webinterface/rbs/pxeconfig_default.php
+++ b/ldap-site-mngmt/webinterface/rbs/pxeconfig_default.php
@@ -6,7 +6,7 @@ include('../standard_header.inc.php');
 $titel = "Remote Boot Service Management";
 # 2. Nummer des zugehörigen Hauptmenus (Registerkarte) beginnend bei 0, siehe Dokumentation.doc.
 $mainnr = 4;
-$mnr = 3; 
+$mnr = -1; 
 $sbmnr = -1;
 $mcnr = -1;
 # 3. Dateiname und evtl. Pfad des Templates für die Webseite
@@ -19,6 +19,7 @@ include('rbs_header.inc.php');
 ###################################################################################
 
 $mnr = $_GET['mnr'];
+$sbmnr = $_GET['sbmnr'];
 
 # Menuleisten erstellen
 createMainMenu($rollen, $mainnr);
@@ -26,15 +27,14 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
+$rbsDN = $_GET['rbsdn'];
+
 $template->assign(array("PXEDN" => "",
 								"PXECN" => "Noch kein Default PXE Boot Men&uuml; angelegt",
 								"TRANGES" => "",
 								"RBS" => "",
 								"CN" => ""));
 
-# rbservice und pxe daten (voerst nur ein rbs)
-$rbs_array = get_rbservices($auDN,array("dn","cn"));
-$rbsDN = $rbs_array[0]['dn'];
 $pxe_array = get_pxeconfigs($rbsDN,array("dn","cn","timerange","rbservicedn"));
 # print_r($pxe_array);
 
@@ -52,17 +52,22 @@ for ($i=0; $i<count($pxe_array); $i++){
 			$trange .= $exptime[0].", von ".$exptime[1].":00 bis ".$exptime[2].":59 /  ";
 		}
 	}else{
-		$exptime = array_merge(explode('_',$pxe_array[$i]['timerange']), $pxe_array[$i]['cn']);
+		$exptime = array_merge(explode('_',$pxe_array[$i]['timerange']), array($pxe_array[$i]['cn']));
 		$timeranges[$i] = $exptime; # Für grafische Wo-Ansicht
 		if ($exptime[0] == "X"){$exptime[0]="t&auml;glich";}
 		# if ($exptime[1] == "X" && $exptime[2] == "X"){$exptime[1] = ""; $exptime[2]= "";}
 		$trange .= $exptime[0].", von ".$exptime[1].":00 bis ".$exptime[2].":59";
 	}
 	
+	$pxename = "<a href='pxe.php?dn=".$pxe_array[$i]['dn']."&mnr=".$mnr."&sbmnr=".$sbmnr."' class='headerlink'>".$pxe_array[$i]['cn']."</a>";
+	
+	
 	$template->assign(array("PXEDN" => $pxe_array[$i]['dn'],
-									"PXECN" => $pxe_array[$i]['cn'],
+									"PXECN" => $pxename,
    	        			      "TRANGES" => $trange,
-   	        			      "RBS" => $pxe_array[$i]['rbservicedn'],
+   	        			      "RBS" => $rbsDN,
+	   	        			   "MNR" => $mnr,
+	   	        			   "SBMNR" => $sbmnr,
    	        		       	"AUDN" => $auDN));
 	$template->parse("PXECONF_LIST", ".Pxeconf");
 }
diff --git a/ldap-site-mngmt/webinterface/rbs/rbs_menu.php b/ldap-site-mngmt/webinterface/rbs/rbs_menu.php
index 76a786c2..814282cf 100644
--- a/ldap-site-mngmt/webinterface/rbs/rbs_menu.php
+++ b/ldap-site-mngmt/webinterface/rbs/rbs_menu.php
@@ -6,66 +6,45 @@ function createRBSMenu($rollen, $mnr, $auDN, $sbmnr) {
  	
  	# rbservices (momentan nur für einen RBS konzipiert)
  	$rbs_array = get_rbservices($auDN,array("dn","cn"));
-   if (count($rbs_array) == 0){
-   	$rbslink = "new_rbservice.php?mnr=1";
-   	$gbmlink = "no_rbservice.php?mnr=2";
-   	$pxelink = "no_rbservice.php?mnr=3";
-   }
-   else {
-   	$rbslink = "rbservice.php?mnr=1";
-   	$gbmlink = "gbm_overview.php?mnr=2";
-   	$pxelink = "pxeconfig_default.php?mnr=3";
-   }
-   $rbsDN = $rbs_array[0]['dn'];
-   
- 	# Struktur der Registerkartenleiste
+
+ 	# Struktur der Registerkartenleiste 	
  	$hauptmenu = array(array("link" => "rbs.php?mnr=0",
             	           	"text" => "&Uuml;bersicht",
-           		            "zugriff" => "alle"),
-           		       array("link" => $rbslink,
-            	           	"text" => "Remote Boot Service",
-           		            "zugriff" => array("MainAdmin","HostAdmin")),
-           		       array("link" => $gbmlink,
-            	           	"text" => "Generische Bootmen&uuml;s",
-           		            "zugriff" => array("MainAdmin","HostAdmin")),
-   						 array("link" => $pxelink,
-                           "text" => "Default PXE",
-                           "zugriff" => array("MainAdmin","HostAdmin")));
-   #print_r($hauptmenu);
- 	
- 	# Generische Bootmenüs
- 	$gbm = array();
- 	if (count($rbs_array) != 0){
-	 	$generic_bms = get_menuentries($rbsDN, array("dn","cn"));
-	  	for ($g=0;$g<count($generic_bms);$g++){
-	  		$gbm[] = array("link" => "gbm.php?dn=".$generic_bms[$g]['dn']."&mnr=2&sbmnr=".$g,
-	  							"text" => $generic_bms[$g]['cn'],
-								"zugriff" => array("MainAdmin","HostAdmin"));
-	  	}
-	  	$gbm [] = array("link" => "new_gbm.php?mnr=2&sbmnr=".$g,
-	                   "text" => "Neues Generisches BM",
-	                   "zugriff" => array("MainAdmin","HostAdmin"));
- 	}
- 	
- 	# default pxe-configs
- 	$pxe = array();
- 	if (count($rbs_array) != 0){
-	   $pxe_array = get_pxeconfigs($rbsDN,array("dn","cn","timerange"));
-	   for($n=0;$n<count($pxe_array);$n++){
-	   	$pxe [] = array("link" => "pxe.php?dn=".$pxe_array[$n]['dn']."&mnr=3&sbmnr=".$n,
-	  							 "text" => $pxe_array[$n]['cn'],
+           		            "zugriff" => "alle"));
+   $submenu = array(array());
+           		            	
+ 	$n = 1;
+   if (count($rbs_array) != 0){
+      for ($i=0;$i<count($rbs_array);$i++){
+         
+         $hauptmenu [] = array("link" => "rbservice.php?rbsdn=".$rbs_array[$i]['dn']."&mnr=".$n,
+	  							 "text" => $rbs_array[$i]['cn'],
 	      	             "zugriff" => array("MainAdmin","HostAdmin"));
-	   }
-	   $pxe [] = array("link" => "new_pxe.php?mnr=3&sbmnr=".$n,
-	                     "text" => "Neues Default PXE",
-	                     "zugriff" => array("MainAdmin","HostAdmin"));
+	      $submenu [] = array(
+	                        array("link" => "gbm_overview.php?rbsdn=".$rbs_array[$i]['dn']."&mnr=".$n."&sbmnr=0",
+           	          	        "text" => "Generische Bootmen&uuml;s",
+           		                    "zugriff" => array("MainAdmin","HostAdmin")),
+           		            array("link" => "pxeconfig_default.php?rbsdn=".$rbs_array[$i]['dn']."&mnr=".$n."&sbmnr=1",
+            	          	        "text" => "Default PXE Configs",
+           		                    "zugriff" => array("MainAdmin","HostAdmin")),
+           		            array("link" => "new_gbm.php?rbsdn=".$rbs_array[$i]['dn']."&mnr=".$n."&sbmnr=2",
+           	          	        "text" => "Neues GBM anlegen",
+           		                    "zugriff" => array("MainAdmin","HostAdmin")),
+           		            array("link" => "new_pxe.php?rbsdn=".$rbs_array[$i]['dn']."&mnr=".$n."&sbmnr=3",
+           	          	        "text" => "Neue PXE Config anlegen",
+           		                    "zugriff" => array("MainAdmin","HostAdmin")), 
+          		             );
+         $n++;
+      }
    }
-   $submenu = array(array(),
-   					  array(),
-    	              $gbm,
-    	              $pxe);
-	 
-	#$rollen = array_keys($roles);
+   $hauptmenu [] = array("link" => "new_rbservice.php?&mnr=".$n,
+	 					 "text" => "Neuen RBS anlegen",
+	      	       "zugriff" => array("MainAdmin","HostAdmin"));
+   
+   $submenu [] = array();   
+   #print_r($hauptmenu); echo "<br><br>";
+   #print_r($submenu);
+
 
   	# Zusammenstellen der Menuleiste
   	$template->define_dynamic("Hauptmenu", "Menu");
diff --git a/ldap-site-mngmt/webinterface/rbs/rbservice.dwt b/ldap-site-mngmt/webinterface/rbs/rbservice.dwt
index 93e70898..601372cd 100644
--- a/ldap-site-mngmt/webinterface/rbs/rbservice.dwt
+++ b/ldap-site-mngmt/webinterface/rbs/rbservice.dwt
@@ -11,25 +11,25 @@
 				<form action='rbservice_change.php' method='post'>
 			
 			<tr>
-				<td width='40%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Attribut</b></td>
-				<td width='60%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Wert</b></td>
+				<td width='40%' class='tab_h'><b>Attribut</b></td>
+				<td width='60%' class='tab_h'><b>Wert</b></td>
 			</tr>
 			
 			<tr height='50'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>Eindeutiger RBS Name (cn):</b><br>(Teil des dn, ohne Leerzeichen eingeben) &nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
+				<td class='tab_d'><b>Eindeutiger RBS Name (cn):</b><br>(Teil des dn, ohne Leerzeichen eingeben) &nbsp;</td>
+				<td class='tab_d'>
 					<font size='+2'><b>RBS_</b></font><input type='Text' name='rbscn' value='{RBSCN}' size='40' class='medium_form_field'>
 					<input type='hidden' name='oldrbscn' value='{RBSCN}'> &nbsp;
 				</td>
 			</tr>
-			<tr height='50'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>Dienst kann momentan genutzt werden von:</b><br></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>Abteilung<b> {RBSOFFERNOW}</b> &nbsp;(und allen Unterabteilungen)
+			<tr>
+				<td class='tab_d_ohne'><b>Dienst kann momentan genutzt werden von:</b><br></td>
+				<td class='tab_d_ohne'>Abteilung<b> {RBSOFFERNOW}</b> &nbsp;(und allen Unterabteilungen)
 				</td>
 			</tr>
 			<tr height='50' valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><b>&Auml;ndern:</b><br>(W&auml;hlen Sie eine andere Abteilung)</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
+				<td class='tab_d'><b>&Auml;ndern:</b><br>(W&auml;hlen Sie eine andere Abteilung)</td>
+				<td class='tab_d'>
 					<select name='rbsoffer' size='5' class='medium_form_selectbox'> 
 						<option selected value='none'>----------</option>
 						
@@ -37,7 +37,7 @@
 						<option value='{RBSOFFER}'>{RBSOFFEROU}</option>
 						<!-- END DYNAMIC BLOCK: Rbsoffers -->
 						
-						<option value='off'>------ ABSCHALTEN ------</option>
+						<option value='off'>------ NIEMAND ------</option>
 						
 					</select>
 					<input type='hidden' name='oldrbsoffer' value='{RBSOFFERNOWDN}'> &nbsp;
@@ -50,104 +50,104 @@
   		<td height='40'></td>
   	</tr>		
 	<tr>
-  		<td colspan='2'><h4>Boot Server System:</h4></td>
-  	</tr>
-  	<tr>
-  		<td height='10'></td>
+  		<td colspan='2'><h4>TFTP Boot Server:</h4></td>
   	</tr>
   	<tr><td>
   		<table cellpadding='7' cellspacing='0' border='1' align='left' width='90%' style='border-width: 0 0 0 0;'>
 			
 			<tr valign='top'>
-				<td width='20%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Server</b></td>
-				<td width='30%' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>IP Adresse<br>(Rechner &auml;ndern)</b></td>
-				<td colspan='2' style='border-color: black; border-style: solid; border-width: 0 0 3 0;'><b>Server Pfade</b></td>
+				<td width='15%' class='tab_h'>&nbsp;</td>
+				<td width='30%' class='tab_h'>&nbsp;</td>
+				<td colspan='2' class='tab_h'>&nbsp;</td>
 			</tr>
 			
 			<tr valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>TFTP Server: &nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+				<td class='tab_d_ohne'><b>TFTP Server: &nbsp;</td>
+				<td class='tab_d_ohne'>
 					<input type='Text' name='tftpserverip' value='{TFTPIP}' size='15' class='medium_form_field'>
 					<input type='hidden' name='oldtftpserverip' value='{TFTPIP}'></td>
-				<td width='15%' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>Init Boot File</td>
-				<td width='35%' style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
-					<input type='Text' name='initbootfile' value='{INITBOOTFILE}' size='25' class='medium_form_field'>
-					<input type='hidden' name='oldinitbootfile' value='{INITBOOTFILE}'></td>
+				<td width='15%' class='tab_d_ohne'>TFTP Root</td>
+				<td width='35%' class='tab_d_ohne'>
+					<input type='Text' name='attribs[tftproot]' value='{TFTPROOT}' size='20' class='medium_form_field'>
+					<input type='hidden' name='oldattribs[tftproot]' value='{TFTPROOT}'></td>
 			</tr>
 			<tr valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><font size='+1'>{TFTP}</font></td>
-				<td rowspan='3' style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
+				<td class='tab_d_ohne'><font size='+1'>{TFTP}</font></td>
+				<td rowspan='2' class='tab_d_ohne'>
 					<select name='tftpserver' size='4' class='small_form_selectbox'> 
 						<option selected value='none'>----------------------------</option>
 						<!-- BEGIN DYNAMIC BLOCK: TftpHosts -->
 						<option value='{HDN}'>{HN}</option>
 						<!-- END DYNAMIC BLOCK: TftpHosts -->
 					</select></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>PXE Path</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
-					<input type='Text' name='attribs[tftppxepath]' value='{TFTPPXE}' size='25' class='medium_form_field'>
+				<td class='tab_d_ohne'>PXE Path</td>
+				<td class='tab_d_ohne'>{TFTPROOT}/
+					<input type='Text' name='attribs[tftppxepath]' value='{TFTPPXE}' size='20' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[tftppxepath]' value='{TFTPPXE}'></td>
 			</tr>
 			<tr valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>Kernel Path</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>	
-					<input type='Text' name='attribs[tftpkernelpath]' value='{TFTPKERNEL}' size='25' class='medium_form_field'>
+				<td class='tab_d_ohne'>&nbsp;</td>
+				<td class='tab_d_ohne'>Kernel Path</td>
+				<td class='tab_d_ohne'>{TFTPROOT}/
+					<input type='Text' name='attribs[tftpkernelpath]' value='{TFTPKERNEL}' size='20' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[tftpkernelpath]' value='{TFTPKERNEL}'></td>
 			</tr>
 			<tr valign='top'>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>Clientconf Path</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>	
-					<input type='Text' name='attribs[tftpclientconfpath]' value='{TFTPCLIENTCONF}' size='25' class='medium_form_field'>
+   			<td class='tab_d'>Initial Boot File</td>
+				<td class='tab_d'>
+				   <input type='Text' name='initbootfile' value='{INITBOOTFILE}' size='25' class='medium_form_field'>
+					<input type='hidden' name='oldinitbootfile' value='{INITBOOTFILE}'></td>
+				<td class='tab_d'>Clientconf Path</td>
+				<td class='tab_d'>{TFTPROOT}/
+					<input type='Text' name='attribs[tftpclientconfpath]' value='{TFTPCLIENTCONF}' size='20' class='medium_form_field'>
 					<input type='hidden' name='oldattribs[tftpclientconfpath]' value='{TFTPCLIENTCONF}'></td>
 					<input type='hidden' name='oldtftpserverdn' value='{TFTPDN}'>
 			</tr>
+		</table></td>
+  	</tr>
+	<tr>
+  		<td height='40'></td>
+  	</tr>		
+	<tr>
+  		<td colspan='2'><h4>File Server URIs:</h4>
+  		   Diese sind in Generischen Boot Images als RootFS verwendbar.</td>
+  	</tr>
+  	<tr><td>
+  		<table cellpadding='7' cellspacing='0' border='1' align='left' width='90%' style='border-width: 0 0 0 0;'>
 			
-			<tr>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>NFS Server: </b></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
-					<input type='Text' name='nfsserverip' value='{NFSIP}' size='15' class='medium_form_field'>
-					<input type='hidden' name='oldnfsserverip' value='{NFSIP}'></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>Export Path</td>	
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
-					<input type='Text' name='attribs[exportpath]' value='{NFSPATH}' size='25' class='medium_form_field'>
-					<input type='hidden' name='oldattribs[exportpath]' value='{NFSPATH}'></td>
-			</tr>
-			<tr>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><font size='+1'>{NFS}</font>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<select name='nfsserver' size='4' class='small_form_selectbox'> 
-						<option selected value='none'>----------------------------</option>
-						<!-- BEGIN DYNAMIC BLOCK: NfsHosts -->
-						<option value='{HDN}'>{HN}</option>
-						<!-- END DYNAMIC BLOCK: NfsHosts -->
-					</select> </td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>
-				<input type='hidden' name='oldnfsserverdn' value='{NFSDN}'>
+			<tr valign='top'>
+				<td width='20%' class='tab_h'>&nbsp;</td>
+				<td width='15%' class='tab_h'>&nbsp;</td>
+				<td width='25%' class='tab_h'>&nbsp;</td>
+				<td width='40%' class='tab_h'>&nbsp;</td>
 			</tr>
 			
-			<tr>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'><b>NBD Server: </b></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
-					<input type='Text' name='nbdserverip' value='{NBDIP}' size='15' class='medium_form_field'>
-					<input type='hidden' name='oldnbdserverip' value='{NBDIP}'></td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>&nbsp;</td>
+			<tr valign='top'>
+				<td class='tab_d'><b>Vorhandene URIs zu Root-Filesystemen: </b><br>(Zum L&ouml;schen einer URI H&auml;kchen setzen)</td>
+				<td colspan='2' class='tab_d'>
+				   <!-- BEGIN DYNAMIC BLOCK: Fsuris -->
+				      <input type='checkbox' name='delfsuri[]' value='{FSURI}' size='10' class='medium_form_field'> &nbsp;&nbsp; <b>{FSURI}</b><br>
+				   <!-- END DYNAMIC BLOCK: Fsuris -->
+				<td class='tab_d'>&nbsp;</td>	
 			</tr>
-			<tr>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'><font size='+1'>{NBD}</font>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>
-					<select name='nbdserver' size='4' class='small_form_selectbox'> 
-						<option selected value='none'>----------------------------</option>
-						<!-- BEGIN DYNAMIC BLOCK: NbdHosts -->
-						<option value='{HDN}'>{HN}</option>
-						<!-- END DYNAMIC BLOCK: NbdHosts -->
-					</select></td>				
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>
-				<td style='border-color: black; border-style: solid; border-width: 0 0 1 0;'>&nbsp;</td>	
-				<input type='hidden' name='oldnbdserverdn' value='{NBDDN}'>
+			<tr valign='top'>
+				<td class='tab_d_ohne'><b>Neue URI anlegen</b></td>
+				<td class='tab_d_ohne'>Filesystemtyp</td>
+				<td class='tab_d_ohne'>Fileserver IP</td>
+				<td class='tab_d_ohne'>NFS Export-Root bzw. (D)NBD &lt;:Port[/Filesystem]&gt;</td>
+			</tr>
+			<tr valign='top'>
+				<td class='tab_d'>&nbsp;</td>
+				<td class='tab_d'>
+					<select name='addfsuri[]' size='5' class='tiny_form_selectbox'> 
+						<option selected value='nfs'>nfs://</option>				
+						<option value='nbd'>nbd://</option>
+						<option value='dnbd'>dnbd://</option>
+						<option value='dnbd2'>dnbd2://</option>
+						<option value='afs'>afs://</option>
+					</select> </td>
+				<td class='tab_d'><input type='Text' name='addfsuri[]' value='' size='15' class='medium_form_field'></td>
+				<td class='tab_d'><input type='Text' name='addfsuri[]' value='' size='25' class='medium_form_field'></td>
 			</tr>
 			
 			<input type='hidden' name='rbsdn' value='{RBSDN}'>
@@ -176,7 +176,7 @@
   		<table cellpadding='20' cellspacing='0' border='0' align='left' width='80%' style='border-color: black; border-style: solid; border-width: 2 2 2 2;'>
 
   			<tr>
-  				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+  				<td class='tab_d_ohne'>
   					$ldaphost= "{PXEGENLDAP}"; <br>
   					$basedn= "{PXEGENBASE}"; <br>
   					$userdn= "{PXEGENUDN}"; <br>
@@ -205,7 +205,7 @@
   			
   			
   			<tr>
-  				<td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>
+  				<td class='tab_d_ohne'>
   					Der Remote Boot Dienst wird komplett gel&ouml;scht, <br>
   					d.h. inklusive aller angelegten Generischen PXE Bootmen&uuml;s und Default PXEs.
   			</tr>
diff --git a/ldap-site-mngmt/webinterface/rbs/rbservice.php b/ldap-site-mngmt/webinterface/rbs/rbservice.php
index 896acbf8..f3c5db7e 100644
--- a/ldap-site-mngmt/webinterface/rbs/rbservice.php
+++ b/ldap-site-mngmt/webinterface/rbs/rbservice.php
@@ -24,14 +24,18 @@ createRBSMenu($rollen, $mnr, $auDN, $sbmnr);
 
 ###################################################################################
 
+$rbsDN = $_GET['rbsdn'];
+
 $template->assign(array("RBSDN" => "",
 								"CN" => "",
 								"TFTP" => "",
 								"TFTPIP" => "",
+								"TFTPROOT" => "",
 								"INITBOOTFILE" => "",
 								"TFTPKERNEL" => "",
 								"TFTPPXE" => "",
 								"TFTPCLIENTCONF" => "",
+								"FSURI" => "",
 								"NFS" => "",
 								"NFSIP" => "",
 								"NFSPATH" => "",
@@ -44,10 +48,8 @@ $template->assign(array("RBSDN" => "",
 								"IP" => ""));
 
 # RBS Daten						
-$rbs_array = get_rbservices($auDN,array("dn","cn"));
-$rbsDN = $rbs_array[0]['dn'];
-$attributes = array("dn","cn","rbsofferdn","tftpserverip","tftpkernelpath","tftpclientconfpath","tftppxepath",
-							"nfsserverip","exportpath","nbdserverip","initbootfile");
+$attributes = array("dn","cn","rbsofferdn","tftpserverip","tftproot","tftpkernelpath","tftpclientconfpath",
+                     "tftppxepath","nfsserverip","exportpath","nbdserverip","initbootfile","fileserveruri");
 $rbs_data = get_node_data($rbsDN, $attributes);
 
 # RBS Anbieten
@@ -82,6 +84,7 @@ $template->assign(array("RBSDN" => $rbs_data['dn'],
 								"TFTP" => $tftpserver['hostname'],
 								"TFTPDN" => $tftpserver['dn'],
 								"TFTPIP" => $rbs_data['tftpserverip'],
+								"TFTPROOT" => $rbs_data['tftproot'],
 								"INITBOOTFILE" => $rbs_data['initbootfile'],
 								"TFTPKERNEL" => $rbs_data['tftpkernelpath'],
 								"TFTPPXE" => $rbs_data['tftppxepath'],
@@ -98,6 +101,7 @@ $template->assign(array("RBSDN" => $rbs_data['dn'],
            		       	"MNR" => $mnr,
            		       	"SBMNR" => $sbmnr));
 
+# RBS Offers
 $template->define_dynamic("Rbsoffers", "Webseite");
 foreach ($rbsoffers as $offer){
 	$template->assign(array("RBSOFFER" => $offer['dn'],
@@ -105,6 +109,19 @@ foreach ($rbsoffers as $offer){
 	$template->parse("RBSOFFERS_LIST", ".Rbsoffers");
 }
 
+
+# Fileserver URIs
+$template->define_dynamic("Fsuris", "Webseite");
+if ( count($rbs_data['fileserveruri']) > 1 ){
+   foreach ($rbs_data['fileserveruri'] as $fsuri){
+   	$template->assign(array("FSURI" => $fsuri));
+   	$template->parse("FSURIS_LIST", ".Fsuris");
+   }
+}else{
+   $template->assign(array("FSURI" => $rbs_data['fileserveruri']));
+	$template->parse("FSURIS_LIST", ".Fsuris");
+}
+
 ### Rechner
 $hostorgroup = $exp[0];
 $hosts_array = get_hosts($auDN,array("dn","hostname","ipaddress"));
diff --git a/ldap-site-mngmt/webinterface/rbs/rbservice_add.php b/ldap-site-mngmt/webinterface/rbs/rbservice_add.php
index 54494999..8c47a076 100644
--- a/ldap-site-mngmt/webinterface/rbs/rbservice_add.php
+++ b/ldap-site-mngmt/webinterface/rbs/rbservice_add.php
@@ -1,5 +1,6 @@
 <?php
 include('../standard_header.inc.php');
+$syntax = new Syntaxcheck;
 
 $rbscn = $_POST['rbscn']; $rbscn = htmlentities($rbscn);
 
diff --git a/ldap-site-mngmt/webinterface/rbs/rbservice_change.php b/ldap-site-mngmt/webinterface/rbs/rbservice_change.php
index a9bc065f..5f82ac26 100644
--- a/ldap-site-mngmt/webinterface/rbs/rbservice_change.php
+++ b/ldap-site-mngmt/webinterface/rbs/rbservice_change.php
@@ -1,5 +1,6 @@
 <?php
 include('../standard_header.inc.php');
+$syntax = new Syntaxcheck;
 
 $rbscn = "RBS_".$_POST['rbscn'];
 $oldrbscn = "RBS_".$_POST['oldrbscn'];
@@ -20,6 +21,13 @@ $oldtftpserverdn = $_POST['oldtftpserverdn'];
 $oldnfsserverdn = $_POST['oldnfsserverdn'];
 $oldnbdserverdn = $_POST['oldnbdserverdn'];
 
+$delfsuri = $_POST['delfsuri'];
+$addfsuri = $_POST['addfsuri'];
+
+$fstype = $_POST['fstype'];
+$fsip = $_POST['fsip'];
+$fspath = $_POST['fspath'];
+
 $initbootfile = $_POST['initbootfile'];
 $oldinitbootfile = $_POST['oldinitbootfile'];
 
@@ -48,9 +56,6 @@ if (count($oldattribs) != 0){
 }
 #print_r($oldatts); echo "<br><br>";
 
-
-$seconds = 2;
-$url = "rbservice.php?&mnr=1";
  
 echo "
 <html>
@@ -130,7 +135,6 @@ if ( $rbsoffer != "none" && $rbsoffer != $oldrbsoffer ){
 #####################################
 # Server ändern über IP Feld
 
-$syntax = new Syntaxcheck;
 
 if ( $tftpserverip != "" && $tftpserverip != $oldtftpserverip ){
 	
@@ -160,6 +164,45 @@ if ( $tftpserverip != "" && $tftpserverip != $oldtftpserverip ){
 	}
 }
 
+#######################################
+# Fileserver URI anlegen
+
+if ( $addfsuri[1] != "" ){
+   # tests: ipsyntax, und spezifische URI-Syntax-Checks...
+   if( $syntax->check_ip_syntax($addfsuri[1]) ){
+      
+      $newfsuri = $addfsuri[0]."://".$addfsuri[1].$addfsuri[2];
+      echo "FS URI <b>".$newfsuri."</b> anlegen<br>";
+      
+      $entryfsadd ['fileserveruri'] = $newfsuri;
+      if(ldap_mod_add($ds,$rbsDN,$entryfsadd)){
+			$mesg = "FS URI erfolgreich eingetragen<br><br>";
+		}else{
+			$mesg = "Fehler beim eintragen der FS URI<br><br>";
+		}
+	}
+	else{echo "Falsche IP Syntax<br><br>";}
+}
+
+#####################################
+# Fileserver URIs löschen
+if ( count($delfsuri) != 0 ){
+	echo "Fileserver URI l&ouml;schen<br>";
+	
+	$i = 0;
+	foreach ($delfsuri as $fsuri){
+		$entry['fileserveruri'][$i] = $fsuri;
+		$i++;
+	}
+	#print_r($entry); echo "<br><br>";
+	
+	if ($result = ldap_mod_del($ds,$rbsDN,$entry)){
+		$mesg = "Zu l&ouml;schende Fileserver URIs erfolgreich gel&ouml;scht<br><br>";
+	}else{
+		$mesg = "Fehler beim l&ouml;schen der Fileserver URIs<br><br>";
+	}
+} 
+
 if ( $nfsserverip != "" && $nfsserverip != $oldnfsserverip ){
 	
 	if ($syntax->check_ip_syntax($nfsserverip)){
@@ -299,6 +342,9 @@ if ( $initbootfile != "" && $initbootfile != $oldinitbootfile ){
 		$mesg = "Fehler beim &auml;ndern des Initial Boot Files!<br><br>";
 	}
 }
+
+
+
  
 #####################################
 # Restliche Attribute
@@ -371,6 +417,8 @@ if (count($entrydel) != 0 ){
 }
 
 
+$url = "rbservice.php?rbsdn=".$rbsDN."&mnr=".$mnr;
+$seconds = 2;
 
 
 $mesg .= "<br>Sie werden automatisch auf die vorherige Seite zur&uuml;ckgeleitet. <br>