+
-
+
- Rechner und IP Management
+ Client / IP Management
-
+
+
+ {MAINMENU}
+
-
-
-
-
+
+
diff --git a/ldap-site-mngmt/webinterface/computers/computers_menu.php b/ldap-site-mngmt/webinterface/computers/computers_menu.php
index 97ff55fa..1ab98526 100644
--- a/ldap-site-mngmt/webinterface/computers/computers_menu.php
+++ b/ldap-site-mngmt/webinterface/computers/computers_menu.php
@@ -9,16 +9,16 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) {
if ( $mipb_array[0] == "" ){
$iprechnerlink = "no_ip.php?mnr=2";
}else{
- $iprechnerlink = "ip_rechner.php";
+ $iprechnerlink = "ip_rechner.php?sort=ipaddress";
}
# Struktur der Registerkartenleiste
# Hauptmenu
- $hauptmenu = array(array("link" => "computers.php",
- "text" => "Übersicht",
- "zugriff" => array("MainAdmin","HostAdmin","DhcpAdmin")),
- array("link" => "hostoverview.php",
- "text" => "Rechner",
+ $hauptmenu = array( #array("link" => "computers.php",
+ # "text" => "Übersicht",
+ # "zugriff" => array("MainAdmin","HostAdmin","DhcpAdmin")),
+ array("link" => "hostoverview.php?sort=hostname",
+ "text" => "Übersicht Rechner",
"zugriff" => array("MainAdmin","HostAdmin","DhcpAdmin")),
array("link" => $iprechnerlink,
"text" => "IP Adressen Rechner",
@@ -32,9 +32,9 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) {
#array("link" => "new_mcdef.php",
# "text" => "Neue MachineConfig",
# "zugriff" => array("MainAdmin","HostAdmin")),
- array("link" => "new_pxe.php",
- "text" => "Neues PXE Bootmenü",
- "zugriff" => array("MainAdmin")));
+ array("link" => "pxeconfigs.php",
+ "text" => "PXE Configs",
+ "zugriff" => array("MainAdmin","DhcpAdmin")));
# Submenus
/*$computers_array = get_hosts($auDN,array("dn","hostname","ou"));
@@ -69,13 +69,17 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) {
"text" => $mcdef_array[$n]['cn'],
"zugriff" => array("MainAdmin","DhcpAdmin","HostAdmin"));
}
+
+ $newpxe[] = array("link" => "new_pxe.php",
+ "text" => "Neue PXE Config anlegen",
+ "zugriff" => array("MainAdmin","DhcpAdmin"));
- $submenu = array(array(),
+ $submenu = array(#array(),
$comps,
array(),
#$groups,
#$defmc,
- array());
+ $newpxe);
#echo "submenu: ";print_r($submenu);echo " ";
# Zusammenstellen der Menuleiste
@@ -159,9 +163,9 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) {
-
+
- ".$item2['text']."
+
";
@@ -218,7 +222,7 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) {
$farb="#505050";
}
else {
-
+
if(count($submenu[$i][0]) != 0){
if($maxmenu == $i+1){$zwisch="
";}
diff --git a/ldap-site-mngmt/webinterface/computers/dhcphost.dwt b/ldap-site-mngmt/webinterface/computers/dhcphost.dwt
index ba9a8872..3bb5e756 100644
--- a/ldap-site-mngmt/webinterface/computers/dhcphost.dwt
+++ b/ldap-site-mngmt/webinterface/computers/dhcphost.dwt
@@ -4,7 +4,7 @@
{HOSTLINK} Allgemein
DHCP
{RBSLINK} RBS/PXE
- {HWLINK} Hardware
+ {HWLINK} Geo/Hardware
@@ -33,7 +33,7 @@
{HOST_DHCPOPT}
-
+
@@ -56,6 +56,7 @@
+
diff --git a/ldap-site-mngmt/webinterface/computers/dhcphost.php b/ldap-site-mngmt/webinterface/computers/dhcphost.php
index 8a5f67fa..5e64000d 100644
--- a/ldap-site-mngmt/webinterface/computers/dhcphost.php
+++ b/ldap-site-mngmt/webinterface/computers/dhcphost.php
@@ -7,7 +7,7 @@ $webseite = "dhcphost.dwt";
include('computers_header.inc.php');
-$mnr = 1;
+$mnr = 0;
$sbmnr = -1;
$mcnr = -1;
@@ -24,9 +24,9 @@ createComputersMenu($rollen, $mnr, $auDN, $sbmnr, $mcnr);
$hostDN = $_GET['dn'];
# Rechner Daten
-$attributes = array("hostname","domainname","ipaddress","hwaddress","description","hlprbservice",
+$attributes = array("hostname","domainname","ipaddress","hwaddress","hlprbservice",
"dhcphlpcont","dhcpoptfixed-address","dhcpopthardware","dhcpoptfilename",
- "dhcpoptnext-server","dhcpoptmax-lease-time","dhcpoptdefault-lease-time","hw-mouse","hw-graphic","hw-monitor");
+ "dhcpoptnext-server","dhcpoptmax-lease-time","dhcpoptdefault-lease-time");
$host = get_node_data($hostDN,$attributes);
$hostip = explode('_',$host['ipaddress']);
# print_r($hostip); echo " ";
@@ -145,9 +145,9 @@ if ($dhcphlpcont == ""){
- fixed-address:
- ".$fixedaddress."
-
+ fixed-address:
+ ".$fixedaddress."
+
".$fixedaddselopt."
@@ -158,16 +158,15 @@ if ($dhcphlpcont == ""){
$template->assign(array("HOSTDN" => $hostDN,
"HOSTNAME" => $host['hostname'],
- "DOMAINNAME" => $host['domainname'],
+ #"DOMAINNAME" => $host['domainname'],
"HWADDRESS" => $host['hwaddress'],
"IPADDRESS" => $hostip[0],
- "DESCRIPTION" => $host['description'],
"OLDDHCP" => $objectDN,
"OLDFIXADD" => $host['dhcpoptfixed-address'],
- "OLDRBS" => $rbsDN,
+ "OLDRBS" => $rbsDN,
"DHCPCONT" => $dhcp,
- "HOST_DHCPOPT" => $host_dhcpopt,
- "NEXTSERVER" => $host['dhcpoptnext-server'],
+ "HOST_DHCPOPT" => $host_dhcpopt,
+ "NEXTSERVER" => $host['dhcpoptnext-server'],
"FILENAME" => $host['dhcpoptfilename'],
"DEFAULTLEASE" => $dhcpdefaultlease,
"MAXLEASE" => $dhcpmaxlease,
diff --git a/ldap-site-mngmt/webinterface/computers/dhcphost_change.php b/ldap-site-mngmt/webinterface/computers/dhcphost_change.php
index 9cd71f41..cbfa7f9f 100644
--- a/ldap-site-mngmt/webinterface/computers/dhcphost_change.php
+++ b/ldap-site-mngmt/webinterface/computers/dhcphost_change.php
@@ -6,12 +6,13 @@ $syntax = new Syntaxcheck;
$dhcp = $_POST['dhcpcont'];
$olddhcp = $_POST['olddhcp'];
+$hostDN = $_POST['hostdn'];
$hostip = $_POST['hostip'];
+$hostmac = $_POST['hostmac'];
$fixedaddress = $_POST['fixadd'];
$oldfixedaddress = $_POST['oldfixadd'];
$oldrbs = $_POST['oldrbs'];
-$hostDN = $_POST['hostdn'];
$sbmnr = $_POST['sbmnr'];
$dhcp = htmlentities($dhcp);
@@ -55,7 +56,7 @@ echo "
";
##########################################
-# DHCP
+# DHCP Einbindung
if ($dhcp != "none" && $dhcp != $olddhcp){
if ($dhcp != ""){
@@ -73,16 +74,21 @@ if ($dhcp != "none" && $dhcp != $olddhcp){
$mesg = "Fehler beim ändern des DHCP Dienstes zu ".$dhcpcn." ! ";
}
}else{
- if ( $hostip != "" ){
- $entrydhcp ['dhcpoptfixed-address'] = "ip";
- }
- echo "DHCP add "; print_r($entrydhcp); echo " ";
- if ($result = ldap_mod_add($ds,$hostDN,$entrydhcp)){
- update_dhcpmtime(array());
- $mesg = "Rechner erfolgreich in DHCP ".$dhcpcn." [Abt.: ".$dhcpau."] angemeldet ";
- }else{
- $mesg = "Fehler beim ändern des DHCP Dienstes zu ".$dhcpcn." ! ";
- }
+ if ( $hostmac != ""){
+ if ( $hostip != "" ){
+ $entrydhcp ['dhcpoptfixed-address'] = "ip";
+ }
+ echo "DHCP add "; print_r($entrydhcp); echo " ";
+ if ($result = ldap_mod_add($ds,$hostDN,$entrydhcp)){
+ update_dhcpmtime(array());
+ $mesg = "Rechner erfolgreich in DHCP ".$dhcpcn." [Abt.: ".$dhcpau."] angemeldet ";
+ }else{
+ $mesg = "Fehler beim ändern des DHCP Dienstes zu ".$dhcpcn." ! ";
+ }
+ }else{
+ $mesg = "Es ist keine MAC Adresse für den Rechner eingetragen.
+ Dies ist jedoch Voraussetzung für einen DHCP Eintrag. ";
+ }
}
}else{
$entrydhcp ['dhcphlpcont'] = array();
@@ -106,7 +112,10 @@ if ($dhcp == "none"){
echo " DHCP none ";
}
+
+#############################
# DHCP Option fixed-address
+
if ($fixedaddress != "none" && $fixedaddress != $oldfixedaddress){
if ($fixedaddress != ""){
$entryfixadd ['dhcpoptfixed-address'] = $fixedaddress;
@@ -140,78 +149,81 @@ if ($fixedaddress != "none" && $fixedaddress != $oldfixedaddress){
}
#####################################
-# Restliche Attribute (u.a. Description)
-
-$entryadd = array();
-$entrymod = array();
-$entrydel = array();
+# Restliche Attribute ...
-foreach (array_keys($atts) as $key){
+#if (count($atts) != 0){
- if ( $oldatts[$key] == $atts[$key] ){
+ $entryadd = array();
+ $entrymod = array();
+ $entrydel = array();
+ foreach (array_keys($atts) as $key){
+
+ if ( $oldatts[$key] == $atts[$key] ){
+
+ }
+ if ( $oldatts[$key] == "" && $atts[$key] != "" ){
+ # hier noch Syntaxcheck
+ $entryadd[$key] = $atts[$key];
+ }
+ if ( $oldatts[$key] != "" && $atts[$key] != "" && $oldatts[$key] != $atts[$key] ){
+ # hier noch Syntaxcheck
+ $entrymod[$key] = $atts[$key];
+ }
+ if ( $oldatts[$key] != "" && $atts[$key] == "" ){
+ # hier noch Syntaxcheck
+ $entrydel[$key] = $oldatts[$key];
+ }
}
- if ( $oldatts[$key] == "" && $atts[$key] != "" ){
- # hier noch Syntaxcheck
- $entryadd[$key] = $atts[$key];
- }
- if ( $oldatts[$key] != "" && $atts[$key] != "" && $oldatts[$key] != $atts[$key] ){
- # hier noch Syntaxcheck
- $entrymod[$key] = $atts[$key];
- }
- if ( $oldatts[$key] != "" && $atts[$key] == "" ){
- # hier noch Syntaxcheck
- $entrydel[$key] = $oldatts[$key];
- }
-}
-
-#print_r($entryadd); echo " ";
-#print_r($entrymod); echo " ";
-#print_r($entrydel); echo " ";
-
-
-if (count($entryadd) != 0 ){
+
#print_r($entryadd); echo " ";
- #echo "neu anlegen ";
- foreach (array_keys($entryadd) as $key){
- $addatts .= "".$key." ,";
- }
- if(ldap_mod_add($ds,$hostDN,$entryadd)){
- $mesg = "Attribute ".$addatts." erfolgreich eingetragen ";
- update_dhcpmtime(array());
- }else{
- $mesg = "Fehler beim eintragen der Attribute ".$addatts." ";
- }
-}
-
-if (count($entrymod) != 0 ){
#print_r($entrymod); echo " ";
- #echo "ändern ";
- foreach (array_keys($entrymod) as $key){
- $modatts .= "".$key." ,";
- }
- if(ldap_mod_replace($ds,$hostDN,$entrymod)){
- $mesg = "Attribute ".$modatts." erfolgreich geaendert ";
- update_dhcpmtime(array());
- }else{
- $mesg = "Fehler beim aendern der Attribute ".$modatts." ";
- }
-}
-
-if (count($entrydel) != 0 ){
#print_r($entrydel); echo " ";
- #echo "löschen ";
- foreach (array_keys($entrydel) as $key){
- $delatts .= "".$key." ,";
+
+
+ if (count($entryadd) != 0 ){
+ #print_r($entryadd); echo " ";
+ #echo "neu anlegen ";
+ foreach (array_keys($entryadd) as $key){
+ $addatts .= "".$key." ,";
+ }
+ if(ldap_mod_add($ds,$hostDN,$entryadd)){
+ $mesg = "Attribute ".$addatts." erfolgreich eingetragen ";
+ update_dhcpmtime(array());
+ }else{
+ $mesg = "Fehler beim eintragen der Attribute ".$addatts." ";
+ }
}
- if(ldap_mod_del($ds,$hostDN,$entrydel)){
- $mesg = "Attribute ".$delatts." erfolgreich geloescht ";
- update_dhcpmtime(array());
- }else{
- $mesg = "Fehler beim loeschen der Attribute ".$delatts." ";
+
+ if (count($entrymod) != 0 ){
+ #print_r($entrymod); echo " ";
+ #echo "ändern ";
+ foreach (array_keys($entrymod) as $key){
+ $modatts .= "".$key." ,";
+ }
+ if(ldap_mod_replace($ds,$hostDN,$entrymod)){
+ $mesg = "Attribute ".$modatts." erfolgreich geaendert ";
+ update_dhcpmtime(array());
+ }else{
+ $mesg = "Fehler beim aendern der Attribute ".$modatts." ";
+ }
}
-}
-
+
+ if (count($entrydel) != 0 ){
+ #print_r($entrydel); echo " ";
+ #echo "löschen ";
+ foreach (array_keys($entrydel) as $key){
+ $delatts .= "".$key." ,";
+ }
+ if(ldap_mod_del($ds,$hostDN,$entrydel)){
+ $mesg = "Attribute ".$delatts." erfolgreich geloescht ";
+ update_dhcpmtime(array());
+ }else{
+ $mesg = "Fehler beim loeschen der Attribute ".$delatts." ";
+ }
+ }
+
+#}
#####################
diff --git a/ldap-site-mngmt/webinterface/computers/host.dwt b/ldap-site-mngmt/webinterface/computers/host.dwt
index 729e6d64..4b3780a2 100644
--- a/ldap-site-mngmt/webinterface/computers/host.dwt
+++ b/ldap-site-mngmt/webinterface/computers/host.dwt
@@ -4,7 +4,7 @@
Allgemein
{DHCPLINK} DHCP
{RBSLINK} RBS/PXE
- {HWLINK} Hardware
+ {HWLINK} Geo/Hardware
diff --git a/ldap-site-mngmt/webinterface/computers/host.php b/ldap-site-mngmt/webinterface/computers/host.php
index 1778ffbb..454847bb 100644
--- a/ldap-site-mngmt/webinterface/computers/host.php
+++ b/ldap-site-mngmt/webinterface/computers/host.php
@@ -7,7 +7,7 @@ $webseite = "host.dwt";
include('computers_header.inc.php');
-$mnr = 1;
+$mnr = 0;
$sbmnr = -1;
$mcnr = -1;
diff --git a/ldap-site-mngmt/webinterface/computers/host_change.php b/ldap-site-mngmt/webinterface/computers/host_change.php
index f32daef3..63e64f8a 100644
--- a/ldap-site-mngmt/webinterface/computers/host_change.php
+++ b/ldap-site-mngmt/webinterface/computers/host_change.php
@@ -79,34 +79,44 @@ if ( $oldhostname == $hostname ){
}
if ( $oldhostname != "" && $hostname != "" && $oldhostname != $hostname ){
- echo "Hostname aendern ";
- # hier noch Syntaxcheck
- # Formulareingaben anpassen
- $exphn = explode(" ",$hostname);
- foreach ($exphn as $word){$expuc[] = ucfirst($word);}
- $hostname = implode(" ",$expuc);
- $hostname = preg_replace ( '/\s+([0-9A-Z])/', '$1', $hostname);
-
- $newhostDN = "hostname=".$hostname.",cn=computers,".$auDN;
- # print_r($newhostDN); echo " ";
- modify_host_dn($hostDN, $newhostDN);
- $hostDN = $newhostDN;
-
- # newsubmenu holen...hosts neu holen, sortieren, ->position
- #$newhosts = get_hosts($auDN,array("dn"));
- #print_r($newhosts); echo " ";
- #foreach ($newhosts as $item){
- # $newdnarray [] = $item['dn'];
- #}
- #$key = array_search($newhostDN, $newdnarray);
- #print_r($key); echo " ";
-
- $url = 'host.php?dn='.$newhostDN.'&sbmnr='.$sbmnr;
-
+ echo "Hostname ändern ";
+ # Check ob Host schon existiert in AU/Domain
+ $brothers = get_hosts($auDN,array("hostname"),"");
+ if ( check_hostname($hostname) ){
+ $url = "hostoverview.php";
+ $mesg = "Es existiert bereits ein Rechner mit dem Namen $hostname!
+ Bitte geben Sie einen anderen Namen ein, oder löschen
+ Sie zunächst den gleichnamigen Rechner.
+ << Übersicht Rechner ";
+ redirect(4, $url, $mesg, $addSessionId = TRUE);
+ die;
+ }else{
+ # Formulareingaben anpassen
+ $exphn = explode(" ",$hostname);
+ foreach ($exphn as $word){$expuc[] = ucfirst($word);}
+ $hostname = implode(" ",$expuc);
+ $hostname = preg_replace ( '/\s+([0-9A-Z])/', '$1', $hostname);
+
+ $newhostDN = "hostname=".$hostname.",cn=computers,".$auDN;
+ # print_r($newhostDN); echo " ";
+ modify_host_dn($hostDN, $newhostDN);
+ $hostDN = $newhostDN;
+
+ # newsubmenu holen...hosts neu holen, sortieren, ->position
+ #$newhosts = get_hosts($auDN,array("dn"));
+ #print_r($newhosts); echo " ";
+ #foreach ($newhosts as $item){
+ # $newdnarray [] = $item['dn'];
+ #}
+ #$key = array_search($newhostDN, $newdnarray);
+ #print_r($key); echo " ";
+
+ $url = 'host.php?dn='.$newhostDN.'&sbmnr='.$sbmnr;
+ }
}
if ( $oldhostname != "" && $hostname == "" ){
- echo "Hostname loeschen!
+ echo "Hostname löschen! >br>
Dies ist Teil des DN, Sie werden den Rechner komplett löschen ";
echo "Wollen Sie den Rechner ".$oldhostname." mit seinen Hardware-Profilen (MachineConfigs)
und PXE Bootmenüs wirklich löschen?
@@ -214,9 +224,15 @@ if ( $oldmac != "" && $mac == "" ){
}
else{
$entry['hwaddress'] = $oldmac;
+ $dhcptext = "";
+ if ($dhcphlpcont != ""){
+ $entry['dhcphlpcont'] = array();
+ $dhcptext = "Da die MAC-Adresse Voruassetzung für den
+ Eintrag DHCP Dienst ist, wurde der Client dort ausgetragen. ";
+ }
$result = ldap_mod_del($ds,$hostDN,$entry);
if($result){
- $mesg = "MAC erfolgreich geloescht ";
+ $mesg = "MAC erfolgreich geloescht. $dhcptext ";
}else{
$mesg = "Fehler beim loeschen der MAC ";
}
diff --git a/ldap-site-mngmt/webinterface/computers/hostoverview.dwt b/ldap-site-mngmt/webinterface/computers/hostoverview.dwt
index 50694f46..2771ff76 100644
--- a/ldap-site-mngmt/webinterface/computers/hostoverview.dwt
+++ b/ldap-site-mngmt/webinterface/computers/hostoverview.dwt
@@ -1,20 +1,26 @@
- Rechner {AU}
+
+ Rechner {AU}
+ Übersicht der in AU {AU} angelegten Rechnerobjekte und Informationen zu diesen:
+ Rechnername, IP/MAC Adresse, Status und Art der Einbindung in die zentralen Dienste DHCP / PXE-Remote-Boot (RBS) und eine Beschreibung.
+ Zur Verwaltungsmaske eines bestimmten Rechners gelangen Sie durch klicken auf entsprechenden Rechnernamen.
+ Die Eingabemaske für einen neuen Rechner erreichen Sie über den Menüpunkt links: "Neuen Rechner anlegen".
+
+
-
+
- Rechnername
- IP Adresse
- MAC Adresse
- DHCP
-
- RBS
-
+
+
+ MAC Adresse
+ DHCP
+ RBS
+ Beschreibung des Rechners
@@ -22,23 +28,13 @@
{HOSTNAME}
{IPADDRESS}
{HWADDRESS}
- {DHCPCONT}
{FIXADD}
{RBSCONT}
- {NXTSRV}
+ {DESC}
-
-
-
-
-
- Zum Verwalten eines bestimmten Rechners, wählen Sie links entsprechenden Submenü-Eintrag.
- Um einen neuen Rechner anzulegen wählen Sie links "Neuer Rechner"
-
-
-
+
\ No newline at end of file
diff --git a/ldap-site-mngmt/webinterface/computers/hostoverview.php b/ldap-site-mngmt/webinterface/computers/hostoverview.php
index b59dbea6..b1728002 100644
--- a/ldap-site-mngmt/webinterface/computers/hostoverview.php
+++ b/ldap-site-mngmt/webinterface/computers/hostoverview.php
@@ -7,7 +7,7 @@ $webseite = "hostoverview.dwt";
include('computers_header.inc.php');
-$mnr = 1;
+$mnr = 0;
$sbmnr = -1;
$mcnr = -1;
@@ -19,18 +19,26 @@ createComputersMenu($rollen, $mnr, $auDN, $sbmnr, $mcnr);
###################################################################################
+$sort = "hostname";
+$sort = $_GET['sort'];
+
$template->assign(array("DN" => "",
"HOSTNAME" => "Noch keine Rechner angelegt",
"DOMAINNAME" => "",
"HWADDRESS" => "",
- "IPADDRESS" => "",
+ "IPADDRESS" => "",
"DHCPCONT" => "",
"FIXADD" => "",
- "RBSCONT" => "",
- "NXTSRV" => ""));
+ "DESC" => "",
+ "RBSCONT" => ""));
+
+$attributes = array("dn","hostname","domainname","hwaddress","ipaddress","description","dhcphlpcont","dhcpoptfixed-address","hlprbservice","dhcpoptnext-server");
+$host_array = get_hosts($auDN,$attributes,$sort);
+#print_r($host_array);
-$attributes = array("dn","hostname","domainname","hwaddress","ipaddress","dhcphlpcont","dhcpoptfixed-address","hlprbservice","dhcpoptnext-server");
-$host_array = get_hosts($auDN,$attributes);
+if ($sort == "ipaddress"){
+ $host_array = array_natsort($host_array, "ipaddress", "ipaddress");
+}
$template->define_dynamic("Rechner", "Webseite");
@@ -41,7 +49,7 @@ foreach ($host_array as $host){
$hostip = explode('_',$host['ipaddress']);
$dhcpcont = "";
- $dhcpfixadd = "";
+ $dhcpfixadd = "-";
if ( count($host['dhcphlpcont']) != 0 ){
$dhcpexpdn = ldap_explode_dn($host['dhcphlpcont'],1);
$dhcpcn = $dhcpexpdn[0];
@@ -62,25 +70,25 @@ foreach ($host_array as $host){
}
-
- $rbscont = "";
+ $rbscont = "-";
$dhcpnxtsrv = "";
if ( count($host['hlprbservice']) != 0 ){
$rbsexpdn = ldap_explode_dn($host['hlprbservice'],1);
- $rbscont = $rbsexpdn[0]." [".$rbsexpdn[2]."]";
+ $dhcpnxtsrv = $host['dhcpoptnext-server'];
+ $rbscont = $rbsexpdn[0]." [".$dhcpnxtsrv."]";
+
- $dhcpnxtsrv = $host['dhcpoptnext-server'];
}
$template->assign(array("DN" => $host['dn'],
"HOSTNAME" => $hostname,
"DOMAINNAME" => $host['domainname'],
"HWADDRESS" => $host['hwaddress'],
- "IPADDRESS" => $hostip[0],
+ "IPADDRESS" => $hostip[0],
"DHCPCONT" => $dhcpcont,
"FIXADD" => $dhcpfixadd,
"RBSCONT" => $rbscont,
- "NXTSRV" => $dhcpnxtsrv,
+ "DESC" => $host['description'],
"AUDN" => $auDN ));
$template->parse("RECHNER_LIST", ".Rechner");
diff --git a/ldap-site-mngmt/webinterface/computers/hwhost.dwt b/ldap-site-mngmt/webinterface/computers/hwhost.dwt
index c32c70c4..48c2cd1c 100644
--- a/ldap-site-mngmt/webinterface/computers/hwhost.dwt
+++ b/ldap-site-mngmt/webinterface/computers/hwhost.dwt
@@ -4,14 +4,14 @@
{HOSTLINK} Allgemein
{DHCPLINK} DHCP
{RBSLINK} RBS/PXE
- Hardware
+ Geo/Hardware
- Hardware Optionen - Rechner {HOSTNAME}
+ Geo / Hardware Optionen - Rechner {HOSTNAME}
@@ -20,10 +20,24 @@