![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index b231f1ef9394ba670380256709de4f9c6c7f21b3..0c2dca46dd7cb6853f95c1d43ebb397c85784abf 100644 (file)
if($dn != "new"){
$this->dn =$dn;
- /* Get FAIstate
- */
- if(isset($this->attrs['FAIstate'][0])){
- $this->FAIstate = $this->attrs['FAIstate'][0];
- }
-
/* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
*/
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($this->dn);
-
- $attrs_to_search = $this->subAttributes;
- $attrs_to_search[] = "FAIstate";
- $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
-
- $data = array();
- while($object = $ldap->fetch()){
- $data[] = $object;
- }
- foreach($data as $object){
+ $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
+ foreach($res as $obj){
- /* Skip objects, that are tagged as removed */
- if(isset($object['FAIstate'][0])){
- if(preg_match("/removed$/",$object['FAIstate'][0])){
- continue;
- }
- }
+ /* Skip not relevant objects */
+ if(!preg_match("/".preg_quote($this->dn, '/')."$/i",$obj['dn'])) continue;
- /* Set status for save management */
$objects = array();
$objects['status'] = "FreshLoaded";
- $objects['dn'] = $object['dn'];
+ $objects['dn'] = $obj['dn'];
$objects = $this->get_object_attributes($objects,$this->subAttributes);
$this->SubObjects[$objects['cn']] = $objects;
}
}
$this->dialog= new $this->subClassName($this->config,$this->dn,$obj);
$this->dialog->set_acl_base($this->acl_base);
+ $this->dialog->FAIstate = $this->FAIstate;
$this->dialog->set_acl_category("fai");
session::set('objectinfo',$obj['dn']);
$this->is_dialog=true;
}
}
- if(preg_match("/^deletescript_/",$name)&&($once)){
+ if(preg_match("/^deletescript_/",$name)&&($once) && !preg_match("/freeze/",$this->FAIstate)){
$once = false;
$entry = preg_replace("/^deletescript_/","",$name);
$entry = base64_decode(preg_replace("/_.*/","",$entry));
if(isset($_GET['act']) && isset($_GET['id'])){
if($_GET['act'] == "edit" && isset($this->SubObjects[$_GET['id']])){
$obj = $this->SubObjects[$_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;
+ $this->dialog->set_acl_category("fai");
session::set('objectinfo',$obj['dn']);
$this->dialog->parent = &$this;
$this->is_dialog=true;
}
/* Add new sub object */
- if(isset($_POST['AddSubObject'])){
- $acl_dn = "cn=dummy,".$this->acl_base_for_current_object($this->dn);
+ if(isset($_POST['AddSubObject']) && !preg_match("/freeze/",$this->FAIstate)){
+ $acl_dn = $this->acl_base_for_current_object($this->dn);
$acl = $this->ui->get_permissions($acl_dn,"fai/faiTemplateEntry");
if(preg_match("/c/",$acl)){
$this->dialog= new $this->subClassName($this->config,"new");
$this->dialog->set_acl_base($this->acl_base);
+ $this->dialog->FAIstate = $this->FAIstate;
$this->dialog->set_acl_category("fai");
$this->dialog->parent = &$this;
$this->is_dialog=true;
!preg_match("/freeze/",$this->FAIstate));
foreach($this->attributes as $attr){
- $smarty->assign($attr."ACL",$this->getacl($attr));
+ $smarty->assign($attr."ACL",$this->getacl($attr, preg_match("/freeze/",$this->FAIstate)));
}
$display.= $smarty->fetch(get_template_path('faiTemplate.tpl', TRUE));
function acl_base_for_current_object($dn)
{
- if($dn == "new"){
+ if($dn == "new" || $dn == ""){
if($this->dn == "new"){
- $dn = session::get('CurrentMainBase');
+ $dn = $dn= $this->parent->parent->acl_base;
}else{
$dn = $this->dn;
}
$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($this->is_new){
$release = $this->parent->parent->fai_release;
- $new_dn= 'cn='.$this->cn.",".get_ou('faitemplateou').get_ou('faiou').$release;
+ $new_dn= 'cn='.$this->cn.",".get_ou('faiTemplateRDN').get_ou('faiBaseRDN').$release;
$res = faiManagement::check_class_name("FAItemplate",$this->cn,$new_dn);
if(isset($res[$this->cn])){
$message[] = msgPool::duplicated(_("Name"));
* After deletion, we perform add and modify
*/
$Objects = array();
- foreach($this->SubObjects as $name => $obj){
+ $tmp = $this->SubObjects;
+ foreach($tmp as $name => $obj){
if($obj['status'] == "FreshLoaded"){
- unset($this->SubObjects[$name]);
+ unset($tmp[$name]);
}
}
- foreach($this->SubObjects as $name => $obj){
+ foreach($tmp as $name => $obj){
if($obj['status'] == "delete"){
$Objects[$name] = $obj;
}
}
- foreach($this->SubObjects as $name => $obj){
+ foreach($tmp as $name => $obj){
if($obj['status'] != "delete"){
$Objects[$name] = $obj;
}
$tmp = array();
$attributes = array_merge($this->sub_Load_Later,$this->subAttributes);
foreach($attributes as $attrs){
- if(empty($obj[$attrs])){
+ if(!isset($obj[$attrs]) || $obj[$attrs] == ""){
$obj[$attrs] = array();
}
$tmp[$attrs] =($obj[$attrs]);
FAI::prepare_to_save_FAI_object($sub_dn,$tmp);
$this->handle_post_events("add");
}
-
}
}
/* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
*/
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($source['dn']);
+ $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))");
+ foreach($res as $obj){
- $attrs_to_search = $this->subAttributes;
- $attrs_to_search[] = "FAIstate";
- $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
+ /* Skip not relevant objects */
+ if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue;
- while($object = $ldap->fetch()){
-
- /* 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 */
$objects = array();
$objects['status'] = "edited";
- $objects['dn'] = $object['dn'];
+ $objects['dn'] = $obj['dn'];
$objects = $this->get_object_attributes($objects,$this->subAttributes);
$objects = $this->get_object_attributes($objects,$this->sub_Load_Later);
-
$this->SubObjects[$objects['cn']] = $objects;
}
}