diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc
index d9af54f9178dbc7b7ecbc615924e48a07d3109f3..0847d8842c3584d039447498b6a37c63d011f938 100644 (file)
/* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
*/
- $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
+ $res = FAI::get_all_objects_for_given_object($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
foreach($res as $obj){
-
- /* Skip not relevant objects */
- if(!preg_match("/".normalizePreg($this->dn)."$/i",$obj['dn'])) continue;
-
$objects = array();
+ $objects['description'] = "";
$objects['status'] = "FreshLoaded";
$objects['dn'] = $obj['dn'];
$objects = $this->get_object_attributes($objects,$this->subAttributes);
function acl_base_for_current_object($dn)
{
- if($dn == "new"){
+ if($dn == "new" || $dn == ""){
if($this->dn == "new"){
- $dn = session::get('CurrentMainBase');
+ $dn= $this->parent->parent->acl_base;
}else{
$dn = $this->dn;
}
}
if($this->dn != "new"){
- session::set('objectinfo',$this->dn);
+ set_object_info($this->dn);
}
$this->dialog->set_acl_base($c_dn);
$this->dialog->FAIstate = $this->FAIstate;
$this->dialog->parent = &$this;
- session::set('objectinfo',$this->SubObjects[$var]['dn']);
+ set_object_info($this->SubObjects[$var]['dn']);
$this->is_dialog=true;
}
$c_dn = $this->acl_base_for_current_object($this->SubObjects[$var]['dn']);
$acl = $this->ui->get_permissions($c_dn,"fai/faiVariable");
if(preg_match("/d/",$acl)){
- if($this->SubObjects[$var]['status'] == "edited"){
+ if($this->SubObjects[$var]['status'] != "new"){
$this->SubObjects[$var]['status']= "delete";
}else{
unset($this->SubObjects[$var]);
}else{
$obj = $this->dialog->save();
if(isset($obj['remove'])){
- if($this->SubObjects[$obj['remove']['from']]['status']=="edited"){
+ if($this->SubObjects[$obj['remove']['from']]['status'] != "new"){
$this->SubObjects[$obj['remove']['from']]['status'] = "delete";
- }elseif($this->SubObjects[$obj['remove']['from']]['status']=="new"){
+ }else{
unset($this->SubObjects[$obj['remove']['from']]);
}
$obj['status'] = "new";
$this->SubObjects[$obj['remove']['to']] = $obj;
unset($this->SubObjects[$obj['remove']['to']]['remove']);
}else{
+ $obj['status'] = "edited";
$this->SubObjects[$obj['cn']]=$obj;
}
$this->is_dialog=false;
$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");
{
if((isset($_POST['FAIvariable_posted'])) && !preg_match("/freeze/", $this->FAIstate) ){
plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
- }
- }
}
}
*/
if($this->is_new){
$release = $this->parent->parent->fai_release;
- $new_dn= 'cn='.$this->cn.",".get_ou('faivariableou').get_ou('faiou').$release;
+ $new_dn= 'cn='.$this->cn.",".get_ou('faiVariableRDN').get_ou('faiBaseRDN').$release;
$res = faiManagement::check_class_name("FAIvariable",$this->cn,$new_dn);
if(isset($res[$this->cn])){
$message[] = msgPool::duplicated(_("Name"));
* Because we must delete old entries first.
* After deletion, we perform add and modify
*/
- $Objects = array();
- foreach($this->SubObjects as $name => $obj){
- if($obj['status'] == "delete"){
- $Objects[$name] = $obj;
- }
- }
- foreach($this->SubObjects as $name => $obj){
- if($obj['status'] != "delete"){
- $Objects[$name] = $obj;
- }
- }
-
+ $Objects = $this->SubObjects;
foreach($Objects as $name => $obj){
foreach($this->sub64coded as $codeIt){
$tmp = array();
foreach($this->subAttributes as $attrs){
- if(empty($obj[$attrs])){
+ if(!isset($obj[$attrs]) || $obj[$attrs] == ""){
$obj[$attrs] = array();
}
$tmp[$attrs] = $obj[$attrs];
/* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
*/
- $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
+ $res = FAI::get_all_objects_for_given_object($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
foreach($res as $obj){
- /* Skip not relevant objects */
- if(!preg_match("/".normalizePreg($source['dn'])."$/i",$obj['dn'])) continue;
-
$objects = array();
$objects['status'] = "edited";
$objects['dn'] = $obj['dn'];