index 7659b66550f646c261934ed480f725cf4f381593..cc94b04f4071943a9524d9954d65d1aaca50b5d9 100644 (file)
var $subClassName = "faiHookEntry";
/* Attributes to initialise for each subObject */
- var $subAttributes = array("cn","description","FAItask","FAIscript");
+ var $subAttributes = array("cn","description","FAItask");
+ var $sub_Load_Later = array("FAIscript");
var $sub64coded = array();
+ var $subBinary = array("FAIscript");
/* Specific attributes */
var $cn = ""; // The class name for this object
$ldap->cd ($this->dn);
$attrs_to_search = $this->subAttributes;
$attrs_to_search[] = "FAIstate";
- $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
+ $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))", array("dn"));
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();
- $this->SubObjects[$object['cn'][0]]['status'] = "edited";
- $this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
+ foreach($attributes as $attrs){
+ if(isset($tmp[$attrs][0])){
+ $var = $tmp[$attrs][0];
- foreach($this->sub64coded as $codeIt){
- $this->SubObjects[$object['cn'][0]][$codeIt]=base64_decode($this->SubObjects[$object['cn'][0]][$codeIt]);
+ /* Check if we must decode some attributes */
+ if(in_array_ics($attrs,$this->sub64coded)){
+ $var = base64_decode($var);
}
- foreach($this->subAttributes as $attrs){
- $this->SubObjects[$object['cn'][0]][$attrs]=addslashes($this->SubObjects[$object['cn'][0]][$attrs]);
+ /* check if this is a binary entry */
+ if(in_array_ics($attrs,$this->subBinary)){
+ $var = $ldap->get_attribute($object['dn'], $attrs,$r_array=0);
}
- $this->SubObjects[$object['cn'][0]]['FAIscript'] = addslashes( $ldap->get_attribute($object['dn'], "FAIscript",$r_array=0));
+
+ /* Fix slashes */
+ $var = addslashes($var);
+ $object[$attrs] = $var;
}
}
+ return($object);
}
+
function getUsedFAItask($cn)
{
$ret = array();
$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;
}
$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]);
$this->is_dialog=true;
}
- if($this->dn != "new"){
- $_SESSION['objectinfo']= $this->dn;
- }
- /* Edit selected Sub Object */
- if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){
- $hook = $_POST['SubObject'][0];
-
- $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$hook]);
- $this->dialog->acl = $this->acl;
- $this->dialog->parent = &$this;
- $_SESSION['objectinfo'] = $this->SubObjects[$hook]['dn'];
- $this->is_dialog=true;
- }
-
- /* Remove Sub object */
- if((isset($_POST['DelSubObject']))&&(isset($_POST['SubObject']))){
- foreach($_POST['SubObject'] as $hook){
- if($this->SubObjects[$hook]['status'] == "edited"){
- $this->SubObjects[$hook]['status']= "delete";
- }else{
- unset($this->SubObjects[$hook]);
- }
- }
- }
/* Save Dialog */
if(isset($_POST['SaveSubObject'])){
$obj = $this->dialog->save();
if(isset($obj['remove'])){
+ $old_stat = $this->SubObjects[$obj['remove']['from']]['status'];
+
/* Depending on status, set new status */
- if($this->SubObjects[$obj['remove']['from']]['status']=="edited"){
+ 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']]);
$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;
if($obj['status'] != "delete"){
if($use_dns){
if((isset($obj['description']))&&(!empty($obj['description']))){
- $a_return[$obj['cn']]['name']= $obj['cn']." [".$obj['description']."]";
+ $a_return[$obj['cn']]['name']= $obj['cn']." [".stripslashes($obj['description'])."]";
}else{
$a_return[$obj['cn']]['name']= $obj['cn'];
}
$a_return[$obj['cn']]['dn']= $obj['dn'];
}else{
if((isset($obj['description']))&&(!empty($obj['description']))){
- $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+ $a_return[$obj['cn']]= $obj['cn']." [".stripslashes($obj['description'])."]";
}else{
$a_return[$obj['cn']]= $obj['cn'];
}
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $this->dn);
if($_SESSION['faifilter']['branch'] == "main"){
$use_dn = $this->dn;
}
prepare_to_save_FAI_object($use_dn,array(),true);
foreach($this->SubObjects as $name => $obj){
- $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $obj['dn']);
if($_SESSION['faifilter']['branch'] == "main"){
$use_dn = $obj['dn'];
}
* 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;
}
$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();
}
$this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
}
}
+
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Hook"),
+ "plDescription" => _("FAI hook"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("fai"),
+ "plProvidedAcls" => array(
+ "cn" => _("Name"),
+ "description" => _("Description"),
+ "FAItast" => _("Task"),
+ "FAIscript" => _("FAI script"))
+ ));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: