Aktuelle Version LDAP-Site-Mngmt Webinterface

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

1 files changed, 11 insertions, 61 deletions

diff --git a/ldap-site-mngmt/webinterface/computers/pxe.php b/ldap-site-mngmt/webinterface/computers/pxe.php
index bbc2e5e1..26712077 100644
--- a/ldap-site-mngmt/webinterface/computers/pxe.php
+++ b/ldap-site-mngmt/webinterface/computers/pxe.php
@@ -29,22 +29,20 @@ createComputersMenu($rollen, $mnr, $auDN, $sbmnr, $mcnr);
 ###################################################################################
 
 $pxeDN = $_GET['dn'];
+# DN, CN des übergeordneten Nodes (Host oder Group)
+$pxednarray = ldap_explode_dn($pxeDN, 0);
+$nodeDN = implode(',',array_slice($pxednarray,2));
+#$nodeDN = $_GET['nodedn'];
+$nodednarray = ldap_explode_dn($nodeDN, 1);
 
 $attributes = array("dn","cn","rbservicedn","filename","timerange","allowoptions","console","default",
 							"display","font","implicit","kbdmap","menumasterpasswd","menutitle",
 							"noescape","onerror","ontimeout","prompt","say","serial","timeout","ldapuri","fileuri");
 $pxe = get_node_data($pxeDN,$attributes);
-#print_r($pxe);
-
-$exp = explode(',',$pxeDN);
-$node = array_slice($exp,1);
-$nodeDN = implode(',',$node);
 
 # RBS Daten
 $rbsDN = $pxe['rbservicedn'];
-$exp = explode(',',$rbsDN);
-$exprbsau = explode('=',$exp[2]); $rbsau = $exprbsau[1];
-$rbsdata = get_node_data($rbsDN,array("cn","nfsserverip","exportpath","tftpserverip","tftppath","tftpclientconfpath"));
+$rbsdata = get_node_data($rbsDN,array("cn","tftpserverip","tftppath","tftpclientconfpath"));
 
 # Timerange Komponenten
 $template->define_dynamic("TRanges", "Webseite");
@@ -90,67 +88,19 @@ $maxpos = count($menuentries)+1;
 $template->assign(array("PXEDN" => $pxeDN,
 								"PXECN" => $pxecn,
 								"TIMERANGE" => $pxe['timerange'],
-           			      "RBS" => $rbsdata['cn'],
-           			      "RBSAU" => $rbsau,
-           			      "NFS" => $rbsdata['nfsserverip'],
-           			      "NFSROOT" => $rbsdata['exportpath'],
            			      "TFTP" => $rbsdata['tftpserverip'],
-           			      "TFTPROOT" => $rbsdata['tftppath'],
            			      "TFTPFILE" => $rbsdata['tftpclientconfpath'],
            		       	#"LDAPURI" => $pxe['ldapuri'],
-           			      "FILEURI" => $pxe['fileuri'],      			      
-           		       	"ALLOW" => $pxe['allowoptions'],          			      
-           		       	"CONSOLE" => $pxe['console'],
-           		       	"DEFAULT" => $pxe['default'], 
-           			      "DISPLAY" => $pxe['display'],          			      
-           		       	"FONT" => $pxe['font'],
-           		       	"IMPLICIT" => $pxe['implicit'],
-           			      "KBDMAP" => $pxe['kbdmap'],          			      
-           		       	"MENMPW" => $pxe['menumasterpasswd'],
-           		       	"MENTIT" => $pxe['menutitle'],                   			      
-           		       	"NOESC" => $pxe['noescape'],
-           		       	"ONERR" => $pxe['onerror'],          			      
-           		       	"ONTIME" => $pxe['ontimeout'],
-           		       	"PROMPT" => $pxe['prompt'],          			      
-           		       	"SAY" => $pxe['say'],
-           		       	"SERIAL" => $pxe['serial'],
-								"TIMEOUT" => $pxe['timeout'],
-           		       	"MAXPOS" => $maxpos,
+           			      "FILEURI" => $pxe['fileuri'],
            		       	"NODEDN" => $nodeDN,
+   	                  "NODE" => $nodednarray[0],
            		       	"DEFDN" => "cn=rbs,".$auDN,
+           		       	"OPTLINK" => "<a href='pxe_globals.php?dn=".$pxeDN."&sbmnr=".$sbmnr."' class='headerlink'>",
+           		       	"BMLINK" => "<a href='pxe_bootmenue.php?dn=".$pxeDN."&sbmnr=".$sbmnr."' class='headerlink'>",
            		       	"MNR" => $mnr,
            		       	"SBMNR" => $sbmnr,
            		       	"MCNR" => $mcnr));
            		       	
-# Alternative RB Dienste holen
-$altrbs = get_rbsoffers($auDN);
-
-# $altrbs = get_rbservices($auDN,array("dn","cn"));
-$subrbs = $altrbs;
-if (count($altrbs) != 0){
-	for ($i=0; $i < count($altrbs); $i++){
-		if ($rbsDN == $altrbs[$i]){
-			array_splice($altrbs, $i, 1);
-		}
-	}
-}
-$template->assign(array("ALTRBSDN" => "",
-   	                  "ALTRBSCN" => "",
-   	                  "ALTRBSAU" => ""));
-if (count($altrbs) != 0){
-$template->define_dynamic("Altrbs", "Webseite");
-	foreach ($altrbs as $item){
-		$rbsdnexp = ldap_explode_dn($item,1);
-		$rbsoffcn = $rbsdnexp[0];
-		$rbsoffau = $rbsdnexp[2];
-		#$altrbsexp = explode(',',$item['dn']);
-		#$altrbsau = explode('=',$altrbsexp[2]);
-		$template->assign(array("ALTRBSDN" => $item,
-   	                        "ALTRBSCN" => $rbsoffcn,
-   	                        "ALTRBSAU" => " &nbsp;&nbsp;[ Abt.: ".$rbsoffau." ]"));
-   	$template->parse("ALTRBS_LIST", ".Altrbs");	
-	} 
-}
 
 # Für Submenü Einträge
 $template->assign(array("SUBRBSDN" => "",
@@ -230,7 +180,7 @@ foreach ($groups_array as $item){
 
 $dnexp = ldap_explode_dn($pxeDN, 1);
 if ($dnexp[2] == "computers"){
-	$nodetyp = "host";
+	$nodetyp = "rbshost";
 }
 if ($dnexp[2] == "groups"){
 	$nodetyp = "group";