From: hickert Date: Fri, 18 Jul 2008 12:52:34 +0000 (+0000) Subject: Updated Copy & Paste for FAI object.s X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=40175c4513f975e3fd7e125dc2b4290f73025a66;p=gosa.git Updated Copy & Paste for FAI object.s git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11717 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc index 589d67933..9ae982c29 100644 --- a/gosa-plugins/fai/admin/fai/class_faiHook.inc +++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc @@ -532,11 +532,11 @@ class faiHook extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); foreach($res as $obj){ /* Skip not relevant objects */ - if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue; + if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue; $objects = array(); $objects['status'] = "edited"; diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 5fd7530c0..d624dfca5 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -498,11 +498,11 @@ class faiPartitionTable extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))"); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))"); foreach($res as $obj){ /* Skip not relevant objects */ - if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue; + if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue; $objects = array(); $objects['description'] = ""; diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc index a88e5d47b..a76e749eb 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScript.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc @@ -591,11 +591,11 @@ class faiScript extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); foreach($res as $obj){ /* Skip not relevant objects */ - if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue; + if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue; $objects = array(); $objects['status'] = "edited"; diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc index 136ed45c4..acff16199 100644 --- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc +++ b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc @@ -512,11 +512,11 @@ class faiTemplate extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); foreach($res as $obj){ /* Skip not relevant objects */ - if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue; + if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue; $objects = array(); $objects['status'] = "edited"; diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc index 17688c3f6..d9af54f91 100644 --- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc @@ -388,11 +388,11 @@ class faiVariable extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); foreach($res as $obj){ /* Skip not relevant objects */ - if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue; + if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue; $objects = array(); $objects['status'] = "edited";