From: hickert Date: Fri, 4 Jun 2010 13:00:05 +0000 (+0000) Subject: Added network card manufacturer string to network template X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=beafec4420b8ed496189d1a30caff78db6ff7aa3;p=gosa.git Added network card manufacturer string to network template git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18849 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc index 7acfd33fb..716027dc7 100644 --- a/gosa-plugins/systems/admin/systems/class_termDNS.inc +++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc @@ -370,6 +370,16 @@ class termDNS extends plugin $smarty->assign("dhcpParentNodes",$this->dhcpParentNodes); $smarty->assign("dhcpParentNodeCnt",count($this->dhcpParentNodes)); + // Assign network card manufacturer string + $smarty->assign("macManufacturer", ""); + if ($this->config->get_cfg_value("core","gosaRpcServer") != ""){ + $rpc = $this->config->getRpcHandle(); + $res = $rpc->getMacManufacturer($this->macAddress); + if($rpc->success()){ + $smarty->assign('macManufacturer',$rpc->getMacManufacturer($this->macAddress)); + } + } + /********** * DNS Handling **********/ @@ -470,7 +480,6 @@ class termDNS extends plugin $smarty->assign("changeStateForRecords",$changeStateForRecords); $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress") && $this->acl_is_writeable("ipHostNumber")?"rw":""); - $display.= $smarty->fetch(get_template_path('network.tpl', TRUE)); } diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl index 97d308b1a..47c99de40 100644 --- a/gosa-plugins/systems/admin/systems/network.tpl +++ b/gosa-plugins/systems/admin/systems/network.tpl @@ -45,9 +45,13 @@ {render acl=$macAddressACL} {/render} + {render acl=$autonetACL} {/render} + {if macManufacturer!=""} +
{$macManufacturer} + {/if}