Unified dhcp functions to match class_plugin

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

diff --git a/include/class_dhcpPlugin.inc b/include/class_dhcpPlugin.inc
index a28e3958a2a6b43ece96678c285dadf2f1e921e3..628260522686507e2b88440be4c8795f1c3595b6 100644 (file)
--- a/include/class_dhcpPlugin.inc
+++ b/include/class_dhcpPlugin.inc
@@ -120,7 +120,7 @@ class dhcpPlugin extends plugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
     return $message;

diff --git a/plugins/admin/systems/class_dhcpGroup.inc b/plugins/admin/systems/class_dhcpGroup.inc
index e29ae0332f4430f54ab174067068c95cca908446..cbe987da8c538d95166ff7ea6b967d9084192aa9 100644 (file)
--- a/plugins/admin/systems/class_dhcpGroup.inc
+++ b/plugins/admin/systems/class_dhcpGroup.inc
@@ -79,10 +79,12 @@ class dhcpGroup extends dhcpPlugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
 
+    $cache = $this->parent->dhcpObjectCache;
+
     /* All required fields are set? */
     if ($this->cn == ""){
       $message[]= _("Required field 'Name' is not filled.");

diff --git a/plugins/admin/systems/class_dhcpHost.inc b/plugins/admin/systems/class_dhcpHost.inc
index 13d0024284e1671034b17a35814c7e3cd755fa60..55e1bee64f511252aef8c53fdb68bbcb59404e8c 100644 (file)
--- a/plugins/admin/systems/class_dhcpHost.inc
+++ b/plugins/admin/systems/class_dhcpHost.inc
@@ -123,10 +123,12 @@ class dhcpHost extends dhcpPlugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
 
+    $cache = $this->parent->dhcpObjectCache;
+  
     /* All required fields are set? */
     if ($this->cn == ""){
       $message[]= _("Required field 'Name' is not filled.");

diff --git a/plugins/admin/systems/class_dhcpPool.inc b/plugins/admin/systems/class_dhcpPool.inc
index 57330fe331eaf8498d3028e9460e14ea82565fcb..9e9821e8a6483da3afd8239c28cceacf86ee483a 100644 (file)
--- a/plugins/admin/systems/class_dhcpPool.inc
+++ b/plugins/admin/systems/class_dhcpPool.inc
@@ -95,10 +95,12 @@ class dhcpPool extends dhcpPlugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
 
+       $cache = $this->parent->dhcpObjectCache;
+
     /* All required fields are set? */
     if ($this->cn == ""){
       $message[]= _("Required field 'Name' is not filled.");

diff --git a/plugins/admin/systems/class_dhcpSharedNetwork.inc b/plugins/admin/systems/class_dhcpSharedNetwork.inc
index ae4f0db627ab8b82b47dab071ae81c12f8b1b391..6e55b75d6b7ad9cb7bd11554db66803eb9f7d02f 100644 (file)
--- a/plugins/admin/systems/class_dhcpSharedNetwork.inc
+++ b/plugins/admin/systems/class_dhcpSharedNetwork.inc
@@ -134,10 +134,12 @@ class dhcpSharedNetwork extends dhcpPlugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
 
+       $cache = $this->parent->dhcpObjectCache;
+
     /* All required fields are set? */
     if ($this->cn == ""){
       $message[]= _("Required field 'Name' is not filled.");

diff --git a/plugins/admin/systems/class_dhcpSubnet.inc b/plugins/admin/systems/class_dhcpSubnet.inc
index 82fbad90405cb5c069020478d658626cf00d1c11..8c2da41dea46fbbef28c1e17dcc55ca3c53c0443 100644 (file)
--- a/plugins/admin/systems/class_dhcpSubnet.inc
+++ b/plugins/admin/systems/class_dhcpSubnet.inc
@@ -125,10 +125,12 @@ class dhcpSubnet extends dhcpPlugin
 
 
   /* Check values */
-  function check($cache)
+  function check()
   {
     $message= array();
 
+    $cache = $this->parent->dhcpObjectCache;
+
     /* All required fields are set? */
     if ($this->cn == ""){
       $message[]= _("Required field 'Network address' is not filled.");

diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index 9e0fb015709a3be3ab0a19c023b07d5262b84eac..d631b13853ca6cd0cab596f12c0f1fbfa0d74a60 100644 (file)
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -136,7 +136,7 @@ class servdhcp extends goService
     /* Save changes */
     if (isset($_POST['save_dhcp'])){
       $this->dialog->save_object();
-      $messages= $this->dialog->check($this->dhcpObjectCache);
+      $messages= $this->dialog->check();
       if (count($messages)){
         show_errors($messages);
       } else {