X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Migrate.inc;h=f60281976eb0db009790ca3cbdc069d6f07a90a9;hb=a82c74ff724fc6f3ca0f71407d8ce1bbaafd1c6b;hp=a979ba25603bd43c61fc5818198d7c5d4210a4df;hpb=972ee10b86c0d014353a5223a74fec0d937c38eb;p=gosa.git diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc index a979ba256..f60281976 100644 --- a/gosa-core/setup/class_setupStep_Migrate.inc +++ b/gosa-core/setup/class_setupStep_Migrate.inc @@ -971,7 +971,7 @@ class Step_Migrate extends setup_step return false; } - if(!is_uid($uid) || empty($uid)){ + if(!tests::is_uid($uid) || empty($uid)){ msg_dialog::display(_("Input error"), _("Specify a valid user ID!"), ERROR_DIALOG); return false; } @@ -1067,7 +1067,7 @@ class Step_Migrate extends setup_step /* Check if there are references to this object */ - $ldap->search("(&(member=".$dn.")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); + $ldap->search("(&(member=".LDAP::prepare4filter($dn).")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); $refs = ""; while($attrs = $ldap->fetch()){ $ref_dn = $attrs['dn']; @@ -1115,7 +1115,7 @@ class Step_Migrate extends setup_step $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')); + $ldap->search("(&(member=".LDAP::prepare4filter($dn).")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); $refs = ""; while($attrs = $ldap->fetch()){ $ref_dn = $attrs['dn']; @@ -1162,7 +1162,7 @@ class Step_Migrate extends setup_step $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')); + $ldap->search("(&(member=".LDAP::prepare4filter($dn).")(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))",array('dn')); $refs = ""; while($attrs = $ldap->fetch()){ $ref_dn = $attrs['dn']; @@ -1891,7 +1891,7 @@ class Step_Migrate extends setup_step /* Update object references in gosaGroupOfNames */ $ogs_to_fix = array(); $ldap->cd($cv['base']); - $ldap->search('(&(objectClass=gosaGroupOfNames)(member='.@LDAP::fix($source).'))', array('cn','member')); + $ldap->search('(&(objectClass=gosaGroupOfNames)(member='.@LDAP::prepare4filter($source).'))', array('cn','member')); while ($attrs= $ldap->fetch()){ $dn = $attrs['dn']; $attrs = $this->cleanup_array($attrs);