From 17f1c734f9c5a73ab9c7de270fd3614a4e26e1c8 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 2 Feb 2007 07:54:34 +0000
Subject: [PATCH] Added acl fix for departments too.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5680 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/class_plugin.inc                              | 7 ++++---
 plugins/admin/departments/class_departmentGeneric.inc | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 0b50f3fd3..3b8508967 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1514,7 +1514,7 @@ class plugin
    *  $old_dn   specifies the actually used dn
    *  $new_dn   specifies the destiantion dn
    */
-  function update_acls($old_dn,$new_dn)
+  function update_acls($old_dn,$new_dn,$output_changes = FALSE)
   {
     global $config;
 
@@ -1582,8 +1582,9 @@ class plugin
        /* Acls for this object must be adjusted */
         if($found){
 
-          echo "Changing ACL dn from : <br>&nbsp;-&nbsp;<b>&nbsp;to".$old_dn."</b><br>&nbsp;-&nbsp;<b>".$new_dn."</b><br>";
-
+          if($output_changes){
+            echo "<font color='green'>Changing ACL dn from : <br>&nbsp;-&nbsp;<b>&nbsp;to".$old_dn."</b><br>&nbsp;-&nbsp;<b>".$new_dn."</b></font><br>";
+          }
           $update[$attrs['dn']] =array();
           foreach($acls as $acl){
             $update[$attrs['dn']]['gosaAclEntry'][] = $acl;
diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 3efe8f8fd..31713217b 100644
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -541,6 +541,8 @@ class department extends plugin
 
 				echo "<b>"._("Object").":</b> ".@LDAP::fix($src)."<br>";
 
+        $this->update_acls($object, $dst,TRUE);
+
 				if (!$this->copy($src, $dst)){
 					echo "<font color='#FF0000'><br>".sprintf(_("FAILED to copy %s, aborting operation"),@LDAP::fix($src))."</font>";
 					return (FALSE);
-- 
2.30.2