From c7267b2b5f133974fcb3e55ebcfdbb1d13f6919b Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 30 Aug 2006 11:40:48 +0000 Subject: [PATCH] Added FAIscript fix git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4545 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiScript.inc | 108 ++++++++++++++++---------- 1 file changed, 68 insertions(+), 40 deletions(-) diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 360ed01f3..c308999b2 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -24,8 +24,10 @@ class faiScript extends plugin var $subClassName = "faiScriptEntry"; /* Attributes to initialise for each subObject */ - var $subAttributes = array("cn","description","FAIpriority","FAIscript"); + var $subAttributes = array("cn","description","FAIpriority"); + var $sub_Load_Later = array("FAIscript"); var $sub64coded = array(); + var $subBinary = array("FAIscript"); /* Specific attributes */ var $cn = ""; // The class name for this object @@ -74,39 +76,48 @@ class faiScript extends plugin $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search); while($object = $ldap->fetch()){ + /* Set status for save management */ + $objects = array(); + $objects['status'] = "FreshLoaded"; + $objects['dn'] = $object['dn']; + $objects = $this->get_object_attributes($objects,$this->subAttributes); + $this->SubObjects[$objects['cn']] = $objects; + } + } + } - /* Skip objects, that are tagged as removed */ - if(isset($object['FAIstate'][0])){ - if(preg_match("/removed$/",$object['FAIstate'][0])){ - continue; - } - } - /* Set status for save management */ - foreach($this->subAttributes as $attrs){ - if(!isset($object[$attrs][0])){ - $this->SubObjects[$object['cn'][0]][$attrs]=""; - }else{ - $this->SubObjects[$object['cn'][0]][$attrs]=$object[$attrs][0]; - } - } + /* Reload some attributes */ + function get_object_attributes($object,$attributes) + { + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->cat($object['dn'],$attributes); + $tmp = $ldap->fetch(); - foreach($this->sub64coded as $codeIt){ - $this->SubObjects[$object['cn'][0]][$codeIt]=(base64_decode($this->SubObjects[$object['cn'][0]][$codeIt])); - } + foreach($attributes as $attrs){ + if(isset($tmp[$attrs][0])){ + $var = $tmp[$attrs][0]; - foreach($this->subAttributes as $attrs){ - $this->SubObjects[$object['cn'][0]][$attrs]=addslashes($this->SubObjects[$object['cn'][0]][$attrs]); + /* Check if we must decode some attributes */ + if(in_array_ics($attrs,$this->sub64coded)){ + $var = base64_decode($var); } - $this->SubObjects[$object['cn'][0]]['FAIscript'] = addslashes ($ldap->get_attribute($object['dn'], "FAIscript",$r_array=0)); + /* check if this is a binary entry */ + if(in_array_ics($attrs,$this->subBinary)){ + $var = addslashes( $ldap->get_attribute($object['dn'], $attrs,$r_array=0)); + } - $this->SubObjects[$object['cn'][0]]['status'] = "edited"; - $this->SubObjects[$object['cn'][0]]['dn'] = $object['dn']; + /* Fix slashes */ + $var = addslashes($var); + $object[$attrs] = $var; } } + return($object); } + function execute() { /* Call parent execute */ @@ -133,19 +144,28 @@ class faiScript extends plugin $once = true; foreach($_POST as $name => $value){ if(preg_match("/^editscript_/",$name)&&($once)){ + $once = false; $entry = preg_replace("/^editscript_/","",$name); $entry = base64_decode(preg_replace("/_.*/","",$entry)); - $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$entry]); - $this->dialog->acl = $this->acl; - $_SESSION['objectinfo'] = $this->SubObjects[$entry]['dn']; + + $obj = $this->SubObjects[$entry]; + if($obj['status'] == "FreshLoaded"){ + $obj = $this->get_object_attributes($obj,$this->sub_Load_Later); + } + $this->dialog= new $this->subClassName($this->config,$this->dn,$obj); + + + $_SESSION['objectinfo'] = $obj['dn']; + $this->dialog->parent = &$this; $this->is_dialog=true; } if(preg_match("/^deletescript_/",$name)&&($once)){ $once = false; $entry = preg_replace("/^deletescript_/","",$name); $entry = base64_decode(preg_replace("/_.*/","",$entry)); - if($this->SubObjects[$entry]['status'] == "edited"){ + + if(($this->SubObjects[$entry]['status'] == "edited")||($this->SubObjects[$entry]['status'] == "FreshLoaded")){ $this->SubObjects[$entry]['status']= "delete"; }else{ unset($this->SubObjects[$entry]); @@ -164,17 +184,6 @@ class faiScript extends plugin $this->is_dialog=true; } - /* Remove Sub object */ - if((isset($_POST['DelSubObject']))&&(isset($_POST['SubObject']))){ - - foreach($_POST['SubObject'] as $script){ - if($this->SubObjects[$script]['status'] == "edited"){ - $this->SubObjects[$script]['status']= "delete"; - }else{ - unset($this->SubObjects[$script]); - } - } - } /* Save Dialog */ if(isset($_POST['SaveSubObject'])){ @@ -185,9 +194,14 @@ class faiScript extends plugin print_red($msg); } }else{ + /* Get return object */ $obj = $this->dialog->save(); if(isset($obj['remove'])){ - if($this->SubObjects[$obj['remove']['from']]['status']=="edited"){ + + $old_stat = $this->SubObjects[$obj['remove']['from']]['status']; + + /* Depending on status, set new status */ + if($old_stat == "edited" || $old_stat == "FreshLoaded"){ $this->SubObjects[$obj['remove']['from']]['status'] = "delete"; }elseif($this->SubObjects[$obj['remove']['from']]['status']=="new"){ unset($this->SubObjects[$obj['remove']['from']]); @@ -196,11 +210,15 @@ class faiScript extends plugin $this->SubObjects[$obj['remove']['to']] = $obj; unset($this->SubObjects[$obj['remove']['to']]['remove']); }else{ + if($obj['status'] == "FreshLoaded"){ + $obj['status'] = "edited"; + } $this->SubObjects[$obj['cn']]=$obj; } $this->is_dialog=false; unset($this->dialog); $this->dialog=NULL; + } } @@ -372,6 +390,14 @@ class faiScript extends plugin * After deletion, we perform add and modify */ $Objects = array(); + + /* We do not need to save untouched objects */ + foreach($this->SubObjects as $name => $obj){ + if($obj['status'] == "FreshLoaded"){ + unset($this->SubObjects[$name]); + } + } + foreach($this->SubObjects as $name => $obj){ if($obj['status'] == "delete"){ $Objects[$name] = $obj; @@ -390,7 +416,9 @@ class faiScript extends plugin } $tmp = array(); - foreach($this->subAttributes as $attrs){ + $attributes = array_merge($this->sub_Load_Later,$this->subAttributes); + foreach($attributes as $attrs){ + if(empty($obj[$attrs])){ $obj[$attrs] = array(); } -- 2.30.2