diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index 3bc50dd4a261643d3c366fc79f28387f1a383e12..0c2dca46dd7cb6853f95c1d43ebb397c85784abf 100644 (file)
foreach($res as $obj){
/* Skip not relevant objects */
- if(!preg_match("/".preg_quote($this->dn)."$/i",$obj['dn'])) continue;
+ if(!preg_match("/".preg_quote($this->dn, '/')."$/i",$obj['dn'])) continue;
$objects = array();
$objects['status'] = "FreshLoaded";
/* Add new sub object */
if(isset($_POST['AddSubObject']) && !preg_match("/freeze/",$this->FAIstate)){
- $acl_dn = "cn=dummy,".$this->acl_base_for_current_object($this->dn);
+ $acl_dn = $this->acl_base_for_current_object($this->dn);
$acl = $this->ui->get_permissions($acl_dn,"fai/faiTemplateEntry");
if(preg_match("/c/",$acl)){
{
if($dn == "new" || $dn == ""){
if($this->dn == "new"){
- $dn = session::get('CurrentMainBase');
+ $dn = $dn= $this->parent->parent->acl_base;
}else{
$dn = $this->dn;
}
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$release = $this->parent->parent->fai_release;
- $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn))."/i", $release, $this->dn);
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn, '/'))."/i", $release, $this->dn);
new log("remove","fai/".get_class($this),$use_dn,$this->attributes);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
foreach($this->SubObjects as $name => $obj){
- $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn))."/i", $release, $obj['dn']);
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $obj['dn']);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
}
$this->handle_post_events("remove");
foreach($res as $obj){
/* Skip not relevant objects */
- if(!preg_match("/".preg_quote($source['dn'])."$/i",$obj['dn'])) continue;
+ if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue;
$objects = array();
$objects['status'] = "edited";