From 308594f5bc31daf7b9c553acf803ada174b6f2a7 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 21 Nov 2007 10:23:04 +0000 Subject: [PATCH] Added ldap dn fix to displayed ldifs git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7842 594d385d-05f5-0310-b6e9-bd551577e9d8 --- setup/class_setupStep_Migrate.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index 9b0faf1ee..5e1d7e5ee 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -1063,7 +1063,7 @@ class Step_Migrate extends setup_step $dn = base64_decode($b_dn); $d_dn = preg_replace("/,.*$/",",".base64_decode($destination_dep),$dn); if(!$perform){ - $this->outside_winstations[$b_dn]['ldif'] = _("Winstation will be moved from").":
\t".$dn."
"._("to").":
\t".$d_dn; + $this->outside_winstations[$b_dn]['ldif'] = _("Winstation will be moved from").":
\t".($ldap->fix($dn))."
"._("to").":
\t".($ldap->fix($d_dn)); /* Check if there are references to this object */ @@ -1111,8 +1111,8 @@ class Step_Migrate extends setup_step $dn = base64_decode($b_dn); $d_dn = preg_replace("/,.*$/",",".base64_decode($destination_dep),$dn); if(!$perform){ - $this->outside_groups[$b_dn]['ldif'] = _("Group will be moved from").":
\t".$dn."
"._("to").":
\t".$d_dn; + $this->outside_groups[$b_dn]['ldif'] = _("Group will be moved from").":
\t".($ldap->fix($dn))."
"._("to").":
\t".($ldap->fix($d_dn)); /* Check if there are references to this object */ $ldap->search("(&(member=".$dn.")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); @@ -1159,7 +1159,7 @@ class Step_Migrate extends setup_step $dn = base64_decode($b_dn); $d_dn = preg_replace("/,.*$/",",".base64_decode($destination_dep),$dn); if(!$perform){ - $this->outside_users[$b_dn]['ldif'] = _("User will be moved from").":
\t".$dn."
"._("to").":
\t".$d_dn; + $this->outside_users[$b_dn]['ldif'] = _("User will be moved from").":
\t".($ldap->fix($dn))."
"._("to").":
\t".($ldap->fix($d_dn)); /* Check if there are references to this object */ $ldap->search("(&(member=".$dn.")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); -- 2.30.2