X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiHook.inc;h=68b5926c504018cce50b411efae7be7a7fa5c181;hb=90cb0cbd940168e234d506e42644e52fc7af5c4d;hp=3fba9649cb826bbe96ba91b513e24ebe9ed7b38b;hpb=a69e1845a0384bddccc230376c39ce2abd964eaf;p=gosa.git
diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 3fba9649c..68b5926c5 100644
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -24,8 +24,10 @@ class faiHook extends plugin
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
@@ -35,6 +37,12 @@ class faiHook extends plugin
var $SubObjects = array(); // All leafobjects of this object
var $FAIstate = "";
+ var $base = "";
+ var $release = "";
+ var $copy_paste_mode = false;
+ var $cut_paste_mode = false;
+
+ var $CopyPasteVars = array("SubObjects");
function faiHook ($config, $dn= NULL)
{
@@ -66,34 +74,52 @@ class faiHook extends plugin
*/
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$this->subAttributes);
+ $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",array("dn"));
while($object = $ldap->fetch()){
- /* 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];
- }
- }
+ /* 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;
+ }
+ }
+ }
- $this->SubObjects[$object['cn'][0]]['status'] = "edited";
- $this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
- foreach($this->sub64coded as $codeIt){
- $this->SubObjects[$object['cn'][0]][$codeIt]=base64_decode($this->SubObjects[$object['cn'][0]][$codeIt]);
+ /* 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($attributes as $attrs){
+ if(isset($tmp[$attrs][0])){
+ $var = $tmp[$attrs][0];
+
+ /* 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();
@@ -108,6 +134,7 @@ class faiHook extends plugin
return($ret);
}
+
function execute()
{
/* Call parent execute */
@@ -125,9 +152,15 @@ class faiHook extends plugin
$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]);
+
+ $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);
$this->dialog->acl = $this->acl;
- $_SESSION['objectinfo'] = $this->SubObjects[$entry]['dn'];
+ $_SESSION['objectinfo'] = $obj['dn'];
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
@@ -135,7 +168,9 @@ class faiHook extends plugin
$once = false;
$entry = preg_replace("/^deletescript_/","",$name);
$entry = base64_decode(preg_replace("/_.*/","",$entry));
- if($this->SubObjects[$entry]['status'] == "edited"){
+
+ $status = $this->SubObjects[$entry]['status'];
+ if($status == "edited" || $status == "FreshLoaded"){
$this->SubObjects[$entry]['status']= "delete";
}else{
unset($this->SubObjects[$entry]);
@@ -155,27 +190,6 @@ class faiHook extends plugin
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'])){
@@ -196,9 +210,10 @@ class faiHook extends plugin
/* Get return object */
$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']]);
@@ -207,8 +222,12 @@ class faiHook 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;
@@ -261,7 +280,7 @@ class faiHook extends plugin
if(($this->SubObjects[$key]['status'] == "new") || ($this->SubObjects[$key]['dn'] == "new")){
$down = "";
}else{
- $down = "
+ $down = "
";
}
@@ -304,14 +323,14 @@ class faiHook extends plugin
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'];
}
@@ -329,6 +348,7 @@ class faiHook extends plugin
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$ldap->rmdir_recursive($this->dn);
+ show_ldap_error($ldap->get_error(), _("Removing FAI hook base failed"));
$this->handle_post_events("remove");
}
@@ -354,6 +374,19 @@ class faiHook extends plugin
/* Call common method to give check the hook */
$message= plugin::check();
+ /* If this is a new script, check if a script with this name already exists */
+ if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
+
+ /* Check if current name is already used for fai scripts in selected release */
+ $dn = 'cn='.$this->cn.",ou=hooks,".$this->release;
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cat($dn);
+ if($ldap->count()){
+
+ $r =convert_department_dn($this->release);;
+ $message[] = sprintf(_("Can't insert a fai hook named '%s' in '%s' there is already a hook with the given name."),$this->cn,$r);
+ }
+ }
return ($message);
}
@@ -365,7 +398,12 @@ class faiHook extends plugin
$ldap = $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ /* Copy & Paste : Ensure that FAIstate is copied too */
+ if($this->copy_paste_mode && preg_match("/freeze/",$this->FAIstate)){
+ $this->attrs['FAIstate'] = $this->FAIstate;
+ }
+
+ $ldap->cat($this->dn,array("objectClass"));
if($ldap->count()!=0){
/* Write FAIscript to ldap*/
$ldap->cd($this->dn);
@@ -379,11 +417,10 @@ class faiHook extends plugin
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving FAI hook base failed"));
/* Do object tagging */
$this->handle_object_tagging();
- show_ldap_error($ldap->get_error());
$ldap->cd($this->dn);
@@ -393,25 +430,47 @@ class faiHook 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"){
+ if($this->copy_paste_mode){
+ $this->SubObjects[$name] = $this->get_object_attributes($obj,$this->sub_Load_Later);
+ $this->SubObjects[$name]['status'] = "new";
+ }else{
+ unset($this->SubObjects[$name]);
+ }
+ }
+ }
+
+ /* Add objects that must be removed first.*/
foreach($this->SubObjects as $name => $obj){
if($obj['status'] == "delete"){
$Objects[$name] = $obj;
}
}
+
+ /* Add objects to add/modify */
foreach($this->SubObjects as $name => $obj){
if($obj['status'] != "delete"){
$Objects[$name] = $obj;
}
}
+ /* Walk through list of objects */
foreach($Objects as $name => $obj){
+ /* Encode attribtues if required */
foreach($this->sub64coded as $codeIt){
$obj[$codeIt]=base64_encode(stripslashes($obj[$codeIt]));
}
+ /* Create ldap entry */
$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();
}
@@ -427,9 +486,20 @@ class faiHook extends plugin
$sub_dn = "cn=".$obj['cn'].",".$this->dn;
if($obj['status']=="new"){
- $ldap->cat($sub_dn);
+ $ldap->cat($sub_dn,array("objectClass"));
if($ldap->count()){
- $obj['status']="modify";
+ $obj['status']="edited";
+ }
+ }
+
+ /* Check if gosaAdministrativeUnitTag is required as object class */
+ if($obj['status'] == "edited"){
+ $ldap->cat($sub_dn,array("objectClass"));
+ $attrs = $ldap->fetch();
+ if(isset($attrs['objectClass'])){
+ if(in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass'])){
+ $tmp['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
}
}
@@ -437,12 +507,13 @@ class faiHook extends plugin
$ldap->cd($sub_dn);
$ldap->rmdir_recursive($sub_dn);
$this->handle_post_events("remove");
+ show_ldap_error($ldap->get_error(), _("Removing FAI hook failed"));
}elseif($obj['status'] == "edited"){
$ldap->cd($sub_dn);
$this->cleanup();
$ldap->modify ($tmp);
-
$this->handle_post_events("modify");
+ show_ldap_error($ldap->get_error(), _("Saving FAI hook failed"));
}elseif($obj['status']=="new"){
if($tmp['description']==array()){
unset($tmp['description']);
@@ -452,9 +523,31 @@ class faiHook extends plugin
$ldap->cd($sub_dn);
$ldap->add($tmp);
$this->handle_post_events("add");
+ show_ldap_error($ldap->get_error(), _("Saving FAI hook failed"));
}
$this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
- show_ldap_error($ldap->get_error());
+ }
+ }
+
+ /* return copy & paste dialog
+ */
+ function getCopyDialog()
+ {
+ /* Ask for cn */
+ $smarty = get_smarty();
+ $smarty->assign("cn" ,$this->cn);
+ $str = $smarty->fetch(get_template_path("paste_fai_object.tpl",TRUE));
+ $ret = array();
+ $ret['string'] = $str;
+ $ret['status'] = "";
+ return($ret);
+ }
+
+ /* Get posted cn */
+ function saveCopyDialog()
+ {
+ if(isset($_POST['cn'])){
+ $this->cn = $_POST['cn'];
}
}
}