From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 9 Nov 2009 14:38:41 +0000 (+0000)
Subject: Included patch from Mathieu Parent to display more information in DHCP service declar... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=02779e3d233eeb1a4472a07a00f687780e12b58f;p=gosa.git

Included patch from Mathieu Parent to display more information in DHCP service declaration. Closes #769


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14804 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
index 9d7fa0021..8fd87ac96 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
@@ -351,21 +351,29 @@ class servdhcp extends goService
    
       $values = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$id."'>".$values."</a>";
 	
-      if (count($tmp->sectionMap[$this->objectType($section)])){
-        if ($this->objectType($section) == "dhcpService"){
+      $objtype = $this->objectType($section);
+      $dhcpObject = new $objtype($this,$this->dhcpObjectCache[$section]);
+      if (count($tmp->sectionMap[$objtype])){
+        if ($objtype == "dhcpService"){
           $DhcpList->AddEntry(array(
               array("string" => $values),
+              array("string" => ''),
+              array("string" => ''),
               array("string" => str_replace("%s",$id,$editImgInsNoDel), "attach" => "style='text-align:right;'")
               ));
         } else {
           $DhcpList->AddEntry(array(
               array("string" => $values),
+              array("string" => $dhcpObject->options->get('routers')),
+              array("string" => ''),
               array("string" => str_replace("%s",$id,$editImgIns), "attach" => "style='text-align:right;'")
               ));
         }
       } else {
         $DhcpList->AddEntry(array(
               array("string" => $values),
+              array("string" => $dhcpObject->statements->get('fixed-address')),
+              array("string" =>  preg_replace('/^[^ ]+ /', '', $dhcpObject->dhcpHWAddress)),
               array("string" => str_replace("%s",$id,$editImg), "attach" => "style='text-align:right;'")
               ));
       }