X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fclass_plugin.inc;h=6cbec1b4eddc6cf2a5559cf6b04e21b406a3c27c;hb=e01f7be38eb35478f1f4321edac33986743a05e1;hp=3b8508967df9692daba2b6a74a42363ccfb7b238;hpb=17f1c734f9c5a73ab9c7de270fd3614a4e26e1c8;p=gosa.git
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 3b8508967..6cbec1b4e 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1524,6 +1524,12 @@ class plugin
return;
}
+ /* Update userinfo if necessary */
+ if($_SESSION['ui']->dn == $old_dn){
+ $_SESSION['ui']->dn = $new_dn;
+ gosa_log(_("Updated current user dn from '".$old_dn."' to '".$new_dn."'"));
+ }
+
/* Object was moved, ensure that all acls will be moved too */
if($new_dn != $old_dn && $old_dn != "new"){
@@ -1555,14 +1561,14 @@ class plugin
/* Check if member match current dn */
foreach($members as $key => $member){
-
$member = base64_decode($member);
if($member == $old_dn){
$found = true;
$members[$key] = base64_encode($new_dn);
}
}
-
+
+ /* Create new member string */
$new_members = "";
foreach($members as $member){
$new_members .= $member.",";
@@ -1570,20 +1576,24 @@ class plugin
$new_members = preg_replace("/,$/","",$new_members);
$acl_parts[2] = $new_members;
+ /* Reconstruckt acl entry */
$acl_str ="";
foreach($acl_parts as $t){
- $acl_str .= $t.":";
+ $acl_str .= $t.":";
}
$acl_str = preg_replace("/:$/","",$acl_str);
-
- $acls[] = $acl_str;
-
}
+
/* Acls for this object must be adjusted */
- if($found){
+ if($found){
if($output_changes){
- echo "Changing ACL dn from :
- to".$old_dn."
- ".$new_dn."
";
+ echo "".
+ _("Changing ACL dn")." :
-"._("from")." ".
+ $old_dn.
+ "
-"._("to")." ".
+ $new_dn.
+ "
";
}
$update[$attrs['dn']] =array();
foreach($acls as $acl){