diff options
Diffstat (limited to 'ldap-site-mngmt/webinterface/computers')
11 files changed, 92 insertions, 87 deletions
diff --git a/ldap-site-mngmt/webinterface/computers/computers_menu.php b/ldap-site-mngmt/webinterface/computers/computers_menu.php index 977c8492..564f9b28 100644 --- a/ldap-site-mngmt/webinterface/computers/computers_menu.php +++ b/ldap-site-mngmt/webinterface/computers/computers_menu.php @@ -140,14 +140,14 @@ function createComputersMenu($rollen , $mnr, $auDN, $sbmnr, $mcnr) { } } $htmlcode= " - <tr height='4'> + <tr height='3'> <td></td><td></td><td></td><td></td> </tr> <tr> <td width='8%'> </td> <td width='8%' align='right'>".$zwisch2."</td> - <td width='5%' align='left' style='border-width:1 0 1 1;border-color:#000000;border-style:solid;padding:3;background-color:{FARBE_S}'> </td>
- <td width='69%' align='left' style='border-width:1 1 1 0;border-color:#000000;border-style:solid;padding:3;padding-left:15px;background-color:{FARBE_S}'> + <td width='5%' align='left' style='border-width:1 0 1 1;border-color:#000000;border-style:solid;padding:2;background-color:{FARBE_S}'> </td>
+ <td width='69%' align='left' style='border-width:1 1 1 0;border-color:#000000;border-style:solid;padding:2;padding-left:15px;background-color:{FARBE_S}'> <a href='".$item2['link']."' style='text-decoration:none'><b class='standard_schrift'>".$item2['text']."</b></a></td> <td width='10%'> </td> </tr> diff --git a/ldap-site-mngmt/webinterface/computers/dhcphost.dwt b/ldap-site-mngmt/webinterface/computers/dhcphost.dwt index a9d18707..2f381850 100644 --- a/ldap-site-mngmt/webinterface/computers/dhcphost.dwt +++ b/ldap-site-mngmt/webinterface/computers/dhcphost.dwt @@ -35,9 +35,6 @@ </table></td> </tr> - <tr> - <td height='20'></td> - </tr> <input type='hidden' name='olddhcp' value='{OLDDHCP}'> diff --git a/ldap-site-mngmt/webinterface/computers/dhcphost_change.php b/ldap-site-mngmt/webinterface/computers/dhcphost_change.php index 2a78f109..96bbb715 100644 --- a/ldap-site-mngmt/webinterface/computers/dhcphost_change.php +++ b/ldap-site-mngmt/webinterface/computers/dhcphost_change.php @@ -9,6 +9,7 @@ $olddhcp = $_POST['olddhcp']; $hostip = $_POST['hostip']; $fixedaddress = $_POST['fixadd']; $oldfixedaddress = $_POST['oldfixadd']; +$oldrbs = $_POST['oldrbs']; $hostDN = $_POST['hostdn']; $sbmnr = $_POST['sbmnr']; @@ -72,6 +73,9 @@ if ($dhcp != "none" && $dhcp != $olddhcp){ if ( $oldfixedaddress != "" ){ $entrydhcp ['dhcpoptfixed-address'] = array(); } + #if ( $oldrbs != "" ){ + # $entrydhcp ['hlprbservice'] = array(); + #} echo "DHCP delete "; echo "<br>"; if ($result = ldap_mod_del($ds,$hostDN,$entrydhcp)){ $mesg = "Rechner erfolgreich aus DHCP gelöscht<br><br>"; diff --git a/ldap-site-mngmt/webinterface/computers/hostoverview.dwt b/ldap-site-mngmt/webinterface/computers/hostoverview.dwt index 87ed24a6..51065a56 100644 --- a/ldap-site-mngmt/webinterface/computers/hostoverview.dwt +++ b/ldap-site-mngmt/webinterface/computers/hostoverview.dwt @@ -9,17 +9,17 @@ <table cellpadding='7' cellspacing='0' border='1' align='left' width='90%' style='border-width: 0 0 0 0;'> <tr> <td width='24%' class='tab_h'><b>Rechnername</b></td> - <td width='19%' class='tab_h'><b>MAC Adresse</b></td> <td width='19%' class='tab_h'><b>IP Adresse</b></td> + <td width='19%' class='tab_h'><b>MAC Adresse</b></td> <td width='19%' class='tab_h'><b>DHCP</b></td> <td width='19%' class='tab_h'><b>RBS</b></td> </tr> <!-- BEGIN DYNAMIC BLOCK: Rechner --> <tr valign='top' height='45'> - <td class='tab_d'>{HOSTNAME} </td> - <td class='tab_d'>{HWADDRESS} </td> + <td class='tab_d'><b>{HOSTNAME}</b> </td> <td class='tab_d'>{IPADDRESS} </td> + <td class='tab_d'>{HWADDRESS} </td> <td class='tab_d'>{DHCPCONT} </td> <td class='tab_d'>{RBSCONT} </td> </tr> diff --git a/ldap-site-mngmt/webinterface/computers/menuentry_add.php b/ldap-site-mngmt/webinterface/computers/menuentry_add.php index dd10e7c2..4f02d2a6 100644 --- a/ldap-site-mngmt/webinterface/computers/menuentry_add.php +++ b/ldap-site-mngmt/webinterface/computers/menuentry_add.php @@ -27,7 +27,7 @@ $pxetype = $pxearray[2]; $seconds = 2; $get_mecn = str_replace ( " ", "_", $mecn ); -$url = "pxe.php?dn=".$pxeDN."&mecn=".$get_mecn."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; +$url = "pxe_bootmenue.php?dn=".$pxeDN."&mecn=".$get_mecn."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; echo " <html> @@ -68,7 +68,7 @@ if ($typ == "newme" && $typ != "local" && $typ != "text" && $typ != "leer" && $t if (add_me($meDN,$mecn,$gbmDN,$menpos,$meatts,$pxeDN)){ $mesg .= "<br>Neuen Menü Eintrag erfolgreich angelegt<br>"; - $url = "pxe.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr;; + $url = "pxe_bootmenue.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr;; } else{ $mesg .= "<br>Fehler beim anlegen des Menü Eintrags!<br>"; @@ -134,7 +134,7 @@ elseif ($typ == "local" && $typ != "newme" && $typ != "text" && $typ != "leer" & }else{ $mesg .= "Fehler beim eintragen der Localboot Zeile!"; } - $url = "pxe.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; + $url = "pxe_bootmenue.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; } @@ -191,7 +191,7 @@ elseif ($typ == "text" && $typ != "newme" && $typ != "local" && $typ != "leer" & }else{ $mesg .= "Fehler beim eintragen der Textzeile!"; } - $url = "pxe.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; + $url = "pxe_bootmenue.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; } } @@ -247,7 +247,7 @@ elseif ($typ == "leer" && $typ != "newme" && $typ != "local" && $typ != "text" & }else{ $mesg .= "Fehler beim eintragen der Leerzeile!"; } - $url = "pxe.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; + $url = "pxe_bootmenue.php?dn=".$pxeDN."&mnr=".$mnr."&sbmnr=".$sbmnr."&mcnr=".$mcnr; } diff --git a/ldap-site-mngmt/webinterface/computers/new_menuentry.dwt b/ldap-site-mngmt/webinterface/computers/new_menuentry.dwt index 9ccaa5ff..40baf438 100644 --- a/ldap-site-mngmt/webinterface/computers/new_menuentry.dwt +++ b/ldap-site-mngmt/webinterface/computers/new_menuentry.dwt @@ -1,6 +1,6 @@ <table border='0' cellpadding='5' cellspacing='0' width='100%'> <tr> - <td height='20'><h4>Zurück zu <a href='pxe.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}' class='headerlink'>{PXECN}</a></h4></td> + <td height='20'><h4>Zurück zu <a href='pxe_bootmenue.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}' class='headerlink'>{PXECN}</a></h4></td> </tr> <tr> <td height='20'> </td> diff --git a/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.dwt b/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.dwt index 305baf9f..ac6261b6 100644 --- a/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.dwt +++ b/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.dwt @@ -53,8 +53,8 @@ <input type='hidden' name='name' value='{ANZEIGENAME}'> <input type='hidden' name='pxedn' value='{PXEDN}'> <input type='hidden' name='delurl' value='menuentry_delete.php'> - <input type='hidden' name='successurl' value='pxe.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}'> - <input type='hidden' name='backurl' value='pxe.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}'> + <input type='hidden' name='successurl' value='pxe_bootmenue.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}'> + <input type='hidden' name='backurl' value='pxe_bootmenue.php?dn={PXEDN}&mnr={MNR}&sbmnr={SBMNR}&mcnr={MCNR}'> <input type='Submit' name='apply' value='löschen' class='small_loginform_button'> </tr> diff --git a/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.php b/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.php index c6b62011..3bd34305 100644 --- a/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.php +++ b/ldap-site-mngmt/webinterface/computers/pxe_bootmenue.php @@ -131,7 +131,7 @@ $template->assign(array("MENDN" => "", "BGCDEF" => "", "POSITION" => "")); foreach ($menuentries as $me){ - $anzeige = ""; + $anzeige = ""; $medef = ""; $mepwd = ""; $mehide = ""; if ($me['label'] != "" && $me['menulabel'] == ""){$anzeige .= $me['label'];} if ($me['menulabel'] != ""){$anzeige .= $me['menulabel'];} if ($me['menudefault'] == 1){$medef = "<b>D</b>"; $bgcdef = "background-color:#EEDD82;";} diff --git a/ldap-site-mngmt/webinterface/computers/pxe_wochenplan.php b/ldap-site-mngmt/webinterface/computers/pxe_wochenplan.php index 2e73db85..8296762a 100644 --- a/ldap-site-mngmt/webinterface/computers/pxe_wochenplan.php +++ b/ldap-site-mngmt/webinterface/computers/pxe_wochenplan.php @@ -78,10 +78,10 @@ foreach ($wopldeftranges as $tr){ #print_r($allx); echo "<br>"; $daycode = array("MO" => "A", "DI" => "B", "MI" => "C", "DO" => "D", "FR" => "E", "SA" => "F", "SO" => "G"); -$allxcolors = array("#BEBEBE","A0A0A0","#696969","#EEDFCC","#D8BFD8","#505050"); -$dayxcolors = array("#483D8B","#7B68EE","#191970","#8470FF","#708090","#6A5ACD"); -$timexcolors = array("#CDC673","#A2CD5A","#BDB76B","#8B864E","#6B8E23","#CDBE70"); -$daytimecolors = array("880000","#CD6839","#CC3300","#CC6600","#993300","#8B4C39"); +$daytimexcolors = array("#BEBEBE","A0A0A0","#696969","#EEDFCC","#D8BFD8","#505050"); +$allxcolors = array("#483D8B","#7B68EE","#191970","#8470FF","#708090","#6A5ACD"); +$dayxcolors = array("#CDC673","#A2CD5A","#BDB76B","#8B864E","#6B8E23","#CDBE70"); +$timecolors = array("880000","#CD6839","#CC3300","#CC6600","#993300","#8B4C39"); if (count($allx) != 0){ @@ -242,7 +242,7 @@ if (count($daytime) != 0){ } -$template->assign(array("PXEDESC" => "")); +$template->assign(array("PXEPLANDESC" => "")); #print_r($legend); if (count($legend) != 0){ $template->define_dynamic("Legende", "Webseite"); @@ -252,7 +252,7 @@ if (count($legend) != 0){ $template->assign(array("TR1" => $item[0][0], "TR2" => $item[0][1], "TR3" => $item[0][2], - "PXEDESC" => $item[0][3], + "PXEPLANDESC" => $item[0][3], "COLOR" => $color)); $template->parse("LEGENDE_LIST", ".Legende"); } diff --git a/ldap-site-mngmt/webinterface/computers/rbshost.dwt b/ldap-site-mngmt/webinterface/computers/rbshost.dwt index 6fd774cd..59baf810 100644 --- a/ldap-site-mngmt/webinterface/computers/rbshost.dwt +++ b/ldap-site-mngmt/webinterface/computers/rbshost.dwt @@ -13,6 +13,9 @@ <tr> <td colspan='5'><h3>RBS/PXE Setup - Rechner <code class='font_object'> {HOSTNAME} </code> </h3></td> </tr> + <tr> + <td colspan='4' class='tab_d_ohne'>{NODHCP} </td> + </tr> <tr><td colspan='5'> <table cellpadding='7' cellspacing='0' border='1' align='left' width='90%' style='border-width: 0 0 0 0;'> @@ -370,7 +373,7 @@ <!-- BEGIN DYNAMIC BLOCK: Legende --> <tr> - <td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>{PXEDESC} </td> + <td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'>{PXEPLANDESC} </td> <td style='border-color: black; border-style: solid; border-width: 0 0 0 0;'> </td> <td style='border-color: black; border-style: solid; border-width: 1 1 1 1;background-color:{COLOR};'> </td> </tr> diff --git a/ldap-site-mngmt/webinterface/computers/rbshost.php b/ldap-site-mngmt/webinterface/computers/rbshost.php index 83c2056d..438009ed 100644 --- a/ldap-site-mngmt/webinterface/computers/rbshost.php +++ b/ldap-site-mngmt/webinterface/computers/rbshost.php @@ -43,75 +43,75 @@ $rbs_dhcpopt = ""; $host_dhcpopt = ""; $dhcp_selectbox = ""; +$rbs = ""; +$nodhcptext = ""; -# Falls nicht DHCP Dienst dann kein RBS Setup +# Falls nicht DHCP Dienst dann Erklärung ... if ($dhcphlpcont == ""){ - $rbs = "<td class='tab_d_ohne' colspan='2'> - Sie müssen den Rechner zuerst in einem DHCP Dienst anmelden, bevor Sie ihn - einem Remote Boot Dienst zuordnen können <br>(DHCP Optionen!!).<br></td> - </tr> - <input type='hidden' name='rbs' value='".$rbsDN."'>"; -}else{ - - ########################################################### - # RBS Setup # Nur wenn angezeigt wenn Host in DHCP - $rbs_selectbox = ""; - $rbs_dhcpopt = ""; - $altrbs = alternative_rbservices($rbsDN); - - - $rbs_selectbox .= "<td class='tab_d'> - <select name='rbs' size='4' class='medium_form_selectbox'> - <option selected value='none'>----------</option>"; - if (count($altrbs) != 0){ - foreach ($altrbs as $item){ - $rbs_selectbox .= " - <option value='".$item['dn']."'>".$item['cn']." ".$item['au']."</option>"; - } - } - $rbs_selectbox .= "<option value=''>Kein RBS</option> - </select></td>"; + $nodhcptext .= "Der Rechner ist in keinem DHCP Dienst eingetragen. Dies ist jedoch Voraussetzung, + um einen Remote Boot Dienst nutzen zu können.<br> + D.h. die hier verwalteten RBS-relevanten DHCP Optionen werden bzw. sind für den Client zentral gespeichert, + werden jedoch in keine DHCP Dienst Konfiguration ünernommen. + "; +} +# <input type='hidden' name='rbs' value='".$rbsDN."'> +########################################################### +# RBS Setup +$rbs_selectbox = ""; +$rbs_dhcpopt = ""; +$altrbs = alternative_rbservices($rbsDN); - # RBS Daten - if ($rbsDN == ""){ - - $rbs = "<td class='tab_d_ohne'><b>Remote Boot Dienst: </b> </td> - <td class='tab_d_ohne'> - Rechner ist in keinem Remote Boot Dienst angemeldet<br></td></tr> - <tr valign='top'><td class='tab_d'> - RBS auswählen: <br></td>".$rbs_selectbox; - }else{ - - $rbs = ""; - $rbsdata = get_node_data($rbsDN,array("tftpserverip")); - #print_r($rbsdata); echo "<br>"; - $exp2 = explode(',',$host['hlprbservice']); - $exprbs = explode('=',$exp2[0]); $rbserv = $exprbs[1]; - $exprbsau = explode('=',$exp2[2]); $rbsau = $exprbsau[1]; - $rbs .= "<tr valign='top'> - <td class='tab_d_ohne'><b>Remote Boot Dienst: </b> </td> - <td class='tab_d_ohne'> - Remote Boot Service <b>".$rbserv."</b> / AU <b>".$rbsau."</b></td> - </tr> - <tr> - <td class='tab_d_ohne'>DHCP Option <b>next-server</b> (TFTP Boot Server IP):</td> - <td class='tab_d_ohne'><b>".$host['dhcpoptnext-server']."</b> </td> - </tr> - <tr> - <td class='tab_d'>DHCP Option <b>filename</b> (initiale remote Bootdatei):</td> - <td class='tab_d'><b>".$host['dhcpoptfilename']."</b> </td> - </tr> - <tr valign='top'><td class='tab_d'> - RBS Einbindung ändern: <br></td>".$rbs_selectbox." - </tr>"; - - $rbs_dhcpopt = " - "; + + $rbs_selectbox .= "<td class='tab_d'> + <select name='rbs' size='4' class='medium_form_selectbox'> + <option selected value='none'>----------</option>"; +if (count($altrbs) != 0){ + foreach ($altrbs as $item){ + $rbs_selectbox .= " + <option value='".$item['dn']."'>".$item['cn']." ".$item['au']."</option>"; } +} +$rbs_selectbox .= "<option value=''>Kein RBS</option> + </select></td>"; +# RBS Daten +if ($rbsDN == ""){ + + $rbs .= "<td class='tab_d_ohne'><b>Remote Boot Dienst: </b> </td> + <td class='tab_d_ohne'> + Rechner ist in keinem Remote Boot Dienst angemeldet<br></td></tr> + <tr valign='top'><td class='tab_d'> + RBS auswählen: <br></td>".$rbs_selectbox; +}else{ + + $rbsdata = get_node_data($rbsDN,array("tftpserverip")); + #print_r($rbsdata); echo "<br>"; + $exp2 = explode(',',$host['hlprbservice']); + $exprbs = explode('=',$exp2[0]); $rbserv = $exprbs[1]; + $exprbsau = explode('=',$exp2[2]); $rbsau = $exprbsau[1]; + $rbs .= "<tr valign='top'> + <td class='tab_d_ohne'><b>Remote Boot Dienst: </b> </td> + <td class='tab_d_ohne'> + Remote Boot Service <b>".$rbserv."</b> / AU <b>".$rbsau."</b></td> + </tr> + <tr> + <td class='tab_d_ohne'>DHCP Option <b>next-server</b> (TFTP Boot Server IP):</td> + <td class='tab_d_ohne'><b>".$host['dhcpoptnext-server']."</b> </td> + </tr> + <tr> + <td class='tab_d'>DHCP Option <b>filename</b> (initiale remote Bootdatei):</td> + <td class='tab_d'><b>".$host['dhcpoptfilename']."</b> </td> + </tr> + <tr valign='top'><td class='tab_d'> + RBS Einbindung ändern: <br></td>".$rbs_selectbox." + </tr>"; + + $rbs_dhcpopt = ""; } + + $template->assign(array("HOSTDN" => $hostDN, "HOSTNAME" => $host['hostname'], "DOMAINNAME" => $host['domainname'], @@ -120,6 +120,7 @@ $template->assign(array("HOSTDN" => $hostDN, "DESCRIPTION" => $host['description'], "OLDDHCP" => $objectDN, "OLDFIXADD" => $host['dhcpoptfixed-address'], + "NODHCP" => $nodhcptext, "OLDRBS" => $rbsDN, "RBS" => $rbs, "HOSTLINK" => "<a href='host.php?dn=".$hostDN."&sbmnr=".$sbmnr."' class='headerlink'>", @@ -162,7 +163,7 @@ if (count($hostpxeconfigs) != 0){ } $template->assign(array("PXEDN" => $hostpxeconfigs[$i]['dn'], "PXECN" => $pxelink, - "PXEDESC" => $hostpxeconfigs['description'], + #"PXEDESC" => $hostpxeconfigs['description'], "PXETR" => $trange, )); $template->parse("RECHNERPXES_LIST", ".Rechnerpxes"); |