diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index 0b7eddc7ad49930bad8179a7dd3f40d56a400e2e..0c2dca46dd7cb6853f95c1d43ebb397c85784abf 100644 (file)
foreach($res as $obj){
/* Skip not relevant objects */
- if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue;
+ if(!preg_match("/".preg_quote($this->dn, '/')."$/i",$obj['dn'])) continue;
$objects = array();
$objects['status'] = "FreshLoaded";
if(isset($_GET['act']) && isset($_GET['id'])){
if($_GET['act'] == "edit" && isset($this->SubObjects[$_GET['id']])){
$obj = $this->SubObjects[$_GET['id']];
- if($obj['status'] == "FreshLoaded"){
+ if($obj['status'] == "FreshLoaded"){
$obj = $this->get_object_attributes($obj,$this->sub_Load_Later);
}
$this->dialog= new $this->subClassName($this->config,$this->dn,$obj);
$this->dialog->FAIstate = $this->FAIstate;
$this->dialog->acl = $this->acl;
+ $this->dialog->set_acl_category("fai");
session::set('objectinfo',$obj['dn']);
$this->dialog->parent = &$this;
$this->is_dialog=true;
/* 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("/".normalizePreg(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("/".normalizePreg(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("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue;
+ if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue;
$objects = array();
$objects['status'] = "edited";