diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc
index def5b3541c964c7ab0d0cc30f27b341fd1bbab62..e71fc1b855f504c9007428c6ab98c1a7d3a75b1e 100644 (file)
foreach($res as $obj){
/* Skip not relevant objects */
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";
$objects = array();
$objects['status'] = "FreshLoaded";
function acl_base_for_current_object($dn)
{
function acl_base_for_current_object($dn)
{
- if($dn == "new"){
+ if($dn == "new" || $dn == ""){
if($this->dn == "new"){
if($this->dn == "new"){
- $dn = session::get('CurrentMainBase');
+ $dn= $this->parent->parent->acl_base;
}else{
$dn = $this->dn;
}
}else{
$dn = $this->dn;
}
$this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn']));
$this->dialog->set_acl_category("fai");
$this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn']));
$this->dialog->set_acl_category("fai");
- session::set('objectinfo',$obj['dn']);
+ set_object_info($obj['dn']);
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
if(isset($_GET['act']) && isset($_GET['id'])){
if($_GET['act'] == "edit" && isset($this->SubObjects[base64_decode($_GET['id'])])){
$obj = $this->SubObjects[base64_decode($_GET['id'])];
if(isset($_GET['act']) && isset($_GET['id'])){
if($_GET['act'] == "edit" && isset($this->SubObjects[base64_decode($_GET['id'])])){
$obj = $this->SubObjects[base64_decode($_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;
$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;
- session::set('objectinfo',$obj['dn']);
+ $this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn']));
+ $this->dialog->set_acl_category("fai");
+ set_object_info($obj['dn']);
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$release = $this->parent->parent->fai_release;
$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){
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");
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
}
$this->handle_post_events("remove");
{
if((isset($_POST['FAIhook_posted'])) && !preg_match("/^freeze/", $this->FAIstate)){
plugin::save_object();
{
if((isset($_POST['FAIhook_posted'])) && !preg_match("/^freeze/", $this->FAIstate)){
plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
- }
- }
}
}
}
}
$tmp = array();
$attributes = array_merge($this->sub_Load_Later,$this->subAttributes);
foreach($attributes as $attrs){
$tmp = array();
$attributes = array_merge($this->sub_Load_Later,$this->subAttributes);
foreach($attributes as $attrs){
+ if(!isset($obj[$attrs])) continue;
if($obj[$attrs] == ""){
$obj[$attrs] = array();
}
if($obj[$attrs] == ""){
$obj[$attrs] = array();
}
foreach($res as $obj){
/* Skip not relevant objects */
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";
$objects = array();
$objects['status'] = "edited";