index 651957f2d7f48cc04d2cf830758475f26ae31f94..02fab1345de33a42c7d646468dc58acb8d724c3f 100644 (file)
}
$ldap = $this->config->get_ldap_link();
- /* Set base to release base */
- $base = key(get_previous_releases_of_this_release(get_release_dn($base),false));
-
- $res= get_list("(objectClass=organizationalUnit)", $this->ui->subtreeACL, $base,
- array("cn","description","objectClass"), GL_SIZELIMIT);
- $used = array();
+ $res= get_list("(&(objectClass=organizationalUnit)(!(objectClass=FAIbranch)))", "fai", $base,
+ array("cn","description","objectClass"), GL_SIZELIMIT );
$delete = array();
+ $used = array();
foreach($res as $objecttypes){
- $res2= get_list("(objectClass=*)", $this->ui->subtreeACL, $objecttypes['dn'],
- array("cn","description","objectClass","FAIclass"), GL_SIZELIMIT | GL_CONVERT | GL_SUBSEARCH);
-
+ $res2= get_list("(objectClass=*)", "fai", $objecttypes['dn'],
+ array("cn","description","objectClass","FAIclass","FAIstate"), GL_SIZELIMIT | GL_CONVERT );
foreach($res2 as $object){
+
/* skip class names with this name */
if(in_array($this->objectClass,$object['objectClass'])){
+ if(isset($object['FAIstate'][0]) && preg_match("/removed$/",$object['FAIstate'][0])){
+ continue;
+ }
$delete[] = $object['cn'][0];
}
$smarty->assign("ClassNamesAvailable", "");
$smarty->assign("grey", "");
}
+ ksort($used);
$smarty->assign("ClassNames", $used);
+ $smarty->assign("ClassName", $this->ClassName);
$display.= $smarty->fetch(get_template_path('askClassName.tpl', TRUE));
return($display);
}
/* Call common method to give check the hook */
$message= plugin::check();
+ if($this->ClassName != preg_replace("/ /","",trim($this->ClassName))){
+ $message[] = _("Spaces are not allowed within class names.");
+ }
+
if(empty($this->ClassName)){
$message[]=_("The given class name is empty.");
}