Code

Updated FAI template entry.
[gosa.git] / gosa-plugins / fai / admin / fai / class_faiManagement.inc
index 95c2a83084743025a2932626d77d61d96bb8fbf6..e5f1bd8c6a3287afc75c055bbf8754e2bed563e2 100644 (file)
@@ -23,7 +23,8 @@ class faiManagement extends plugin
 {
        /* Definitions */
   var $plHeadline     = "Software deployment";
-  var $plDescription    = "Manage software packages and deployment reciepes";
+  var $plDescription  = "Manage software packages and deployment reciepes";
+  var $plIcon         = "plugins/fai/images/plugin.png";
 
        /* Headpage attributes */
   var $lock_type    = "";    // should be branch/freeze
@@ -47,12 +48,17 @@ class faiManagement extends plugin
 
   /* Allow inserting of new elements if freezed releases 
   */
-  var $allow_freeze_object_attach = FALSE;
+  var $allow_freeze_object_attach = TRUE;
 
   var $no_save;
+  var $acl_base     ="";
   var $fai_base     ="";
   var $fai_release  ="";
 
+  var $acl_module = array("fai");
+
+  var $opsi = NULL;
+
        /* construction/reconstruction 
         */
        function faiManagement (&$config, $ui)
@@ -61,19 +67,38 @@ class faiManagement extends plugin
                $this->dn                       = "";
                $this->config   = $config;
                $this->ui                       = $ui;  
+
+    /* Check if the opsi plugin is installed.
+     */
+    if(class_available("opsi")){
+      $this->opsi = new opsi($this->config);;
+    }
     
     /* Creat dialog object */
     $this->DivListFai = new divListFai($this->config,$this);
 
     /* Copy & Paste handler */
-    if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
       $this->CopyPasteHandler= new CopyPasteHandler($this->config);
     }
 
-    /* Set default release */
-    $this->fai_base = get_ou("faiou").$this->config->current['BASE'];
+    /* Set default release 
+     */
+    $this->acl_base = $this->config->current['BASE'];
+    $this->fai_base = get_ou("faiBaseRDN").$this->config->current['BASE'];
+
     if(!session::is_set("fai_filter")){
-      session::set("fai_filter",array("fai_release" => $this->fai_base));
+
+      /* Set intial release */
+      $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu"));
+      $rels = array_flip($this->getBranches());
+      if(isset($rels[$rel])){
+        $rel = $rels[$rel];
+      }else{
+        $rel = $this->fai_base;
+      }
+
+      session::set("fai_filter",array("fai_release" => $rel));
     }
 
     $fai_filter = session::get("fai_filter");
@@ -85,6 +110,7 @@ class faiManagement extends plugin
     /* Call parent execute */
     plugin::execute();
 
+
     /* Initialise vars and smarty */
                $smarty         = get_smarty();
                $smarty->assign("BranchName","");
@@ -122,24 +148,45 @@ class faiManagement extends plugin
           $s_action = $act;
           $s_entry = ltrim(preg_replace($reg,"",$name),"_");
           $s_entry = preg_replace("/_.*$/","",$s_entry);
+          break;
         }
       }
                        if(preg_match("/^entry_edit_.*/",$name)){
                                $s_entry = preg_replace("/^entry_edit_/","",$name);
                                $s_entry = preg_replace("/_.*$/","",$s_entry);
-                               $s_action = "edit";
-                       }elseif(preg_match("/^entry_freeze_edit_.*/",$name)){
-                               $s_entry = preg_replace("/^entry_freeze_edit_/","",$name);
-                               $s_entry = preg_replace("/_.*$/","",$s_entry);
-                               $s_action = "edit";
+        $s_action = "edit";
+        break;
+      }elseif(preg_match("/^entry_freeze_edit_.*/",$name)){
+        $s_entry = preg_replace("/^entry_freeze_edit_/","",$name);
+        $s_entry = preg_replace("/_.*$/","",$s_entry);
+        $s_action = "edit";
         $no_save = TRUE;
-                       }elseif(preg_match("/^entry_delete_.*/",$name)){
-                               $s_entry = preg_replace("/^entry_delete_/","",$name);
-                               $s_entry = preg_replace("/_.*$/","",$s_entry);
+        break;
+      }elseif(preg_match("/^entry_delete_.*/",$name)){
+        $s_entry = preg_replace("/^entry_delete_/","",$name);
+        $s_entry = preg_replace("/_.*$/","",$s_entry);
         $s_action = "delete";
+        break;
+      }
+
+      /* Get posts from opsi onjects 
+       */  
+      if($this->opsi instanceof opsi && $this->opsi->enabled()){
+        if(preg_match("/^entry_opsi_edit_/",$name)){
+          $s_entry = preg_replace("/^entry_opsi_edit_([0-9]*).*$/","\\1",$name);
+          $s_action = "opsi_edit";
+          break;
+        }
       }
     }
 
+    /* Get posts from opsi objects 
+     */ 
+               if($this->opsi instanceof opsi && $this->opsi->enabled() && isset($_GET['edit_opsi_entry'])){
+                       $s_entry = $_GET['edit_opsi_entry'];
+                       $s_action = "opsi_edit";
+               }
+
                if(isset($_GET['edit_entry'])){
                        $s_entry = $_GET['edit_entry'];
                        $s_action = "edit";
@@ -215,6 +262,44 @@ class faiManagement extends plugin
     }
 
 
+    /*******************
+      Opsi extension 
+     *******************/
+
+    if($this->opsi instanceof opsi && $this->opsi->enabled()){
+      if($s_action == "opsi_edit"){
+        $name = $this->objects[$s_entry]['cn'];
+        $cfg = $this->opsi->get_product_properties($name);
+        $this->dialog = new tabs_opsiProdConfig($this->config, $this->config->data['TABS']['OPSIPRODCONFIG'],"","opsi");
+        if(isset($this->dialog->by_object['opsiProperties'])){
+          $this->dialog->by_object['opsiProperties']->set_cfg($cfg);
+          $this->dialog->by_object['opsiProperties']->set_product($name);
+        }else{
+          trigger_error("Unknown tab, please check config.");
+        }
+      }
+      if($this->dialog instanceof tabs_opsiProdConfig && isset($_POST['cancel_properties'])){
+        $this->dialog = NULL;
+      }
+      if($this->dialog instanceof tabs_opsiProdConfig && isset($_POST['save_properties'])){
+        $this->dialog->save_object();
+        $op    = $this->dialog->by_object['opsiProperties'];
+        $name  = $op->get_product();
+        $cfg   = $op->get_cfg();
+        $this->opsi->set_product_properties($name,$cfg); 
+        if($this->opsi->is_error()){
+          msg_dialog::display(_("Error"),msgPool::siError($this->opsi->get_error()),ERROR_DIALOG);
+        }else{
+          $this->dialog = NULL;
+        }
+      }
+      if($this->dialog instanceof tabs_opsiProdConfig){
+        $this->dialog->save_object();
+        return($this->dialog->execute());
+      }
+    }
+
+
     /****************
       Delete confirme dialog 
      ****************/
@@ -236,7 +321,7 @@ class faiManagement extends plugin
 
                                /* Lock the current entry, so nobody will edit it during deletion */
                                add_lock ($this->dn, $this->ui->dn);
-                               $smarty->assign("warning",msgPool::deleteInfo(@LDAP::fix($this->dn),_("FAI object")));
+                               $smarty->assign("warning",msgPool::deleteInfo(LDAP::fix($this->dn),_("FAI object")));
         $smarty->assign("multiple", false);
                                return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
                        } else {
@@ -281,7 +366,7 @@ class faiManagement extends plugin
           $dns_names = array();
           foreach($this->dns as $dn){
             add_lock ($dn, $this->ui->dn);
-            $dns_names[] = @LDAP::fix($dn);
+            $dns_names[] = LDAP::fix($dn);
           }
 
           /* Lock the current entry, so nobody will edit it during deletion */
@@ -333,11 +418,11 @@ class faiManagement extends plugin
           msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
           new log("security","fai/".get_class($this),$dn,array(),"Tried to trick deletion.");
         }
-
-        /* Remove lock file after successfull deletion */
-        del_lock ($dn);
-        unset($this->dns[$key]);
       }
+
+      /* Remove lock file after successfull deletion */
+      $this->remove_lock();
+      $this->dns = array();
     }
 
 
@@ -347,10 +432,8 @@ class faiManagement extends plugin
 
     /* Remove lock */
     if(isset($_POST['delete_multiple_fai_object_cancel'])){
-      foreach($this->dns as $key => $dn){
-        del_lock ($dn);
-        unset($this->dns[$key]);
-      }
+      $this->dns = array();
+      $this->remove_lock();
     }
 
 
@@ -360,7 +443,7 @@ class faiManagement extends plugin
 
                /* Delete canceled? */
                if (isset($_POST['delete_cancel'])){
-                       del_lock ($this->dn);
+      $this->remove_lock();
                }
 
 
@@ -368,7 +451,7 @@ class faiManagement extends plugin
       Delete confirmed 
      ****************/
 
-               /* Deltetion was confirmed, so delete this entry
+               /* Deletion was confirmed, so delete this entry
      */
     if (isset($_POST['delete_terminal_confirm'])){
 
@@ -409,8 +492,9 @@ class faiManagement extends plugin
       }else{
         msg_dialog::display(_("Error"), sprintf(_("Cannot delete '%s': object does not exist!"), $this->dn) , ERROR_DIALOG);
       }
+
       /* Remove lock file after successfull deletion */
-      del_lock ($this->dn);
+      $this->remove_lock();
     }
 
 
@@ -431,12 +515,9 @@ class faiManagement extends plugin
 
                        $this->dialog     = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
       $this->dialog->parent = &$this;
+      $this->dialog->by_object[$a_setup[1]]->FAIstate = $entry['FAIstate'];
       $this->dialog->set_acl_base($this->dn);
                        $this->is_dialog  = true;
-
-      if(preg_match("/^freeze/", $entry['FAIstate']) || $this->no_save){
-#        $this->dialog->set_acl_base("freezed")  ;    
-      }
                        session::set('objectinfo',$this->dn);
                }
 
@@ -460,9 +541,9 @@ class faiManagement extends plugin
       if("" != $this->config->search("faiManagement", "POSTREMOVE",array('menu','tabs'))){
         /* Load permissions for selected 'dn' and check if
            we're allowed to remove this 'dn' */
-        if($this->acl_is_removeable()){
-
-          $smarty->assign("info", msgPool::deleteInfo(@LDAP::fix($this->fai_release),_("FAI branch/freeze")));
+        if(preg_match("/d/",$this->ui->get_permissions($this->acl_base,"fai/faiManagement"))){
+          $smarty->assign("release_hidden",base64_encode($this->fai_release));
+          $smarty->assign("info", msgPool::deleteInfo(LDAP::fix($this->fai_release),_("FAI branch/freeze")));
           return($smarty->fetch(get_template_path('remove_branch.tpl',TRUE)));
         } else {
           msg_dialog::display(_("Permission error"), _("You have no permission to delete this release!"), ERROR_DIALOG);
@@ -482,29 +563,75 @@ class faiManagement extends plugin
        */
       if("" != $this->config->search("faiManagement", "POSTREMOVE",array('menu','tabs'))){
 
-        $bb =  $this->fai_release;
-        if(!isset($ldap)){
-          $ldap = $this->config->get_ldap_link();
-        }
+        if(!isset($_POST['release_hidden']) || base64_decode($_POST['release_hidden']) != $this->fai_release){
+          msg_dialog::display(_("Warning"),_("Release remove aborted because the release name check failed!"));
+        }else{
 
-        $br = $this->getBranches();
+          $bb =  $this->fai_release;
+          if(!isset($ldap)){
+            $ldap = $this->config->get_ldap_link();
+          }
 
-        if(isset($br[$bb]) && $this->acl_is_removeable()){
-          $name = $br[$bb];
-          $ldap->cd($bb);
-          $ldap->recursive_remove();
-          $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('applicationou'), $bb));
-          $ldap->recursive_remove();
-          $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('mimetypeou'), $bb));
-          $ldap->recursive_remove();
-          $this->fai_release = $this->fai_base;
+          $br = $this->getBranches();
+
+          if(isset($br[$bb]) && preg_match("/d/",$this->ui->get_permissions($this->acl_base,"fai/faiManagement"))){
+            $name = $br[$bb];
+
+            $ldap->cd($bb);
+            $ldap->recursive_remove();
+            $ldap->cd(preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'/', ','.get_ou('applicationRDN'), $bb));
+            $ldap->recursive_remove();
+            $ldap->cd(preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'/', ','.get_ou('mimetypeRDN'), $bb));
+            $ldap->recursive_remove();
+
+            /* Search for all groups with configured application menus.
+              - First search all groups, to ensure that we only remove entries form whithin groups. 
+              - The search für menu configuration for the specified release and collect all those dns.
+              - Remove entries
+             */
+            $release_ou = preg_replace("/".preg_quote(get_ou("faiBaseRDN"), '/').".*$/","",$bb);
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->search("(objectClass=posixGroup)",array("dn"));
+          
+            /* Collect all group dns 
+             */
+            $groups = array();
+            while($attrs = $ldap->fetch()){
+              $groups[] = $attrs['dn'];
+            }
+
+            /* Collect all group menu release dns that match the release we have removed 
+             */
+            $dns = array();
+            foreach($groups as $dn){
+              $ldap->cd($dn);
+              $ldap->search("(objectClass=FAIbranch)",array("dn"));
+              while($attrs = $ldap->fetch()){
+                if(preg_match("/^".preg_quote($release_ou, '/')."/",$attrs['dn'])){
+                  $dns[] = $attrs['dn'];
+                }
+              }
+            }
+            
+            /* Finally remove collected release dns 
+             */
+            foreach($dns as $dn){
+              $ldap->cd($dn);
+              $ldap->recursive_remove();
+            }
+
+            /* Post remove */
+            $this->fai_release = $this->fai_base;
+            $this->lock_name   = $name;
+            $this->lock_dn     = $bb;
+            $this->postremove();
 
-          /* Post remove */
-          $this->lock_name   = $name;
-          $this->lock_dn     = $bb;
-          $this->postremove();
+            $fai_filter = session::get("fai_filter");
+            $fai_filter['fai_release'] = $this->fai_release;
+            session::set("fai_filter",$fai_filter);
 
-          new log("remove","fai/".get_class($this),$br[$bb],array(),"Release removed");
+            new log("remove","fai/".get_class($this),$br[$bb],array(),"Release removed");
+          }
         }
       }
     }
@@ -530,8 +657,8 @@ class faiManagement extends plugin
       $base= $this->fai_base;
 
       /* Check used characters */
-      if(!preg_match("/^[0-9a-z \ö\ä\ü\.\-_:,]*$/i",$name)){
-        msg_dialog::display(_("Error"), msgPool::invalid(_("Name"),$name,"/[0-9a-z \ö\ä\ü\.\-_:,]/i"), ERROR_DIALOG);
+      if(!preg_match("/^[0-9a-z\.]*$/",$name)){
+        msg_dialog::display(_("Error"), msgPool::invalid(_("Name"),$name,"/[0-9a-z\.]/"), ERROR_DIALOG);
         $is_ok = false;
       }
 
@@ -565,10 +692,15 @@ class faiManagement extends plugin
 
     if(isset($_GET['PerformBranch'])){
     
-      if(!$this->acl_is_createable()){
+      if(!preg_match("/c/",$this->ui->get_permissions($this->acl_base,"fai/faiManagement"))){
         msg_dialog::display(_("Permission error"), msgPool::permCreate(_("Branch")), ERROR_DIALOG);
       }else{
 
+        /* In order to see error messages we have to reset the error handler.
+            Due to the exit(); 
+         */
+        restore_error_handler();
+
         /* Create it know */
         $this->dispNewBranch = false;
         $this->dispNewFreeze = false;
@@ -599,11 +731,11 @@ class faiManagement extends plugin
           }
         }
 
-        $appsrc = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('applicationou'),$baseToUse); 
-        $appdst = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('applicationou'),"ou=".$name.",".$baseToUse) ; 
+        $appsrc = preg_replace("/".preg_quote(get_ou('faiBaseRDN'), '/')."/",get_ou('applicationRDN'),$baseToUse); 
+        $appdst = preg_replace("/".preg_quote(get_ou('faiBaseRDN'), '/')."/",get_ou('applicationRDN'),"ou=".$name.",".$baseToUse) ; 
 
-        $mimesrc = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('mimetypeou'),$baseToUse); 
-        $mimedst = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('mimetypeou'),"ou=".$name.",".$baseToUse) ; 
+        $mimesrc = preg_replace("/".preg_quote(get_ou('faiBaseRDN'), '/')."/",get_ou('mimetypeRDN'),$baseToUse); 
+        $mimedst = preg_replace("/".preg_quote(get_ou('faiBaseRDN'), '/')."/",get_ou('mimetypeRDN'),"ou=".$name.",".$baseToUse) ; 
 
         /* Check if source depeartments exist */
         foreach(array($baseToUse,$appsrc,$mimesrc) as $dep){
@@ -670,6 +802,7 @@ class faiManagement extends plugin
 
         echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
           <br><input type='submit' name='CloseIFrame' value='"._("Continue")."'>
+          <input type='hidden' name='php_c_check' value='1'>
           </form></div>";
 
         echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
@@ -686,6 +819,28 @@ class faiManagement extends plugin
         $this->lock_name  = $name; 
         $this->lock_dn    = $baseToUse;
         $this->postcreate();
+
+
+        /* Send daemon event to reload the fai release database 
+         */
+        if(class_available("DaemonEvent") && class_available("gosaSupportDaemon")){
+          $events = DaemonEvent::get_event_types(SYSTEM_EVENT | HIDDEN_EVENT);
+          if(isset($events['TRIGGERED']['DaemonEvent_recreate_fai_release_db'])){
+            $evt = $events['TRIGGERED']['DaemonEvent_recreate_fai_release_db'];
+            $tmp = new $evt['CLASS_NAME']($this->config);
+            $tmp->set_type(TRIGGERED_EVENT);
+            $tmp->add_targets(array("GOSA"));
+            $o_queue = new gosaSupportDaemon();
+            if(!$o_queue->append($tmp)){
+              msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
+            }
+          }
+        }else{  
+          trigger_error("Unknown class DaemonEvent / gosaSupportDaemon");
+          msg_dialog::display(_("Fatal error"),
+              "Daemon events called but classes where not accessible, DaemonEvent gosaSupportDaemon",
+              FATAL_ERROR_DIALOG);
+        }
         exit();
       }
     }
@@ -699,8 +854,8 @@ class faiManagement extends plugin
      */
     if("" != $this->config->search("faiManagement", "POSTCREATE",array('menu','tabs'))){
       if(($s_action == "branch_branch")||($this->dispNewBranch)){
-        if(!$this->acl_is_createable()){
-        msg_dialog::display(_("Permission error"), msgPool::permCreate(_("Branch")), ERROR_DIALOG);
+        if(!preg_match("/c/",$this->ui->get_permissions($this->acl_base,"fai/faiManagement"))){
+          msg_dialog::display(_("Permission error"), msgPool::permCreate(_("Branch")), ERROR_DIALOG);
         }else{
           $this->dispNewBranch=true;
           $smarty->assign("iframe",false);
@@ -720,7 +875,7 @@ class faiManagement extends plugin
      */
     if("" != $this->config->search("faiManagement", "POSTCREATE",array('menu','tabs'))){
       if(($s_action == "freeze_branch")||($this->dispNewFreeze)){
-        if(!$this->acl_is_createable()){
+        if(!preg_match("/c/",$this->ui->get_permissions($this->acl_base,"fai/faiManagement"))){
           msg_dialog::display(_("Permission error"), msgPool::permCreate(_("Branch")), ERROR_DIALOG);
         }else{
           $this->dispNewFreeze = true;
@@ -750,7 +905,7 @@ class faiManagement extends plugin
                     "new_package"       =>  _("package list"));
 
     if(isset($types[$s_action])){
-      $acl = $this->ui->get_permissions($this->fai_base,"fai/".$type_acl_mapping[$types[$s_action]]);
+      $acl = $this->ui->get_permissions($this->acl_base,"fai/".$type_acl_mapping[$types[$s_action]]);
       if(preg_match("/c/",$acl)){
         $this->dialog = new askClassName($this->config,$this->dn,$this->ui,$types[$s_action]);
         $this->dialog->parent = &$this;
@@ -763,7 +918,7 @@ class faiManagement extends plugin
     if($s_action == "new_profile"){
       $this->dn = "new" ;
 
-      $acl = $this->ui->get_permissions($this->fai_base,"fai/faiProfile");
+      $acl = $this->ui->get_permissions($this->acl_base,"fai/faiProfile");
       if(preg_match("/c/",$acl)){
         $a_setup= $this->get_type(array("objectClass"=>array("FAIprofile")));
         $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
@@ -808,11 +963,10 @@ class faiManagement extends plugin
      ****************/
 
                if(isset($_POST['edit_cancel'])){
-                       unset($this->dialog);
                        $this->dialog=FALSE;
                        $this->is_dialog = false;
                        session::un_set('objectinfo');
-                       del_lock ($this->dn);
+      $this->remove_lock();
                }
 
 
@@ -835,11 +989,16 @@ class faiManagement extends plugin
                                $this->dialog->save();
         FAI::save_release_changes_now();
         if (!isset($_POST['edit_apply'])){
-          del_lock ($this->dn);
-          unset($this->dialog);
+          $this->remove_lock();
           $this->dialog=FALSE;
           $this->is_dialog=false;
           session::un_set('objectinfo');
+        }else{
+
+          /* Reinitialize tab */
+          if($this->dialog instanceof tabs){
+            $this->dialog->re_init();
+          }
         }
                        }
                }
@@ -899,7 +1058,7 @@ class faiManagement extends plugin
 
     /* Check if there is a snapshot dialog open */
     $base = $this->fai_base;
-    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
+    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases(),$this)){
       return($str);
     }
 
@@ -916,7 +1075,7 @@ class faiManagement extends plugin
   function get_used_snapshot_bases()
   {
     $tmp = array();
-    $types = array("faipartitionou","faiscriptou","faitemplateou","faihookou","faiprofileou","faivariableou","faipackageou");
+    $types = array("faiPartitionRDN","faiScriptRDN","faiTemplateRDN","faiHookRDN","faiProfileRDN","faiVariableRDN","faiPackageRDN");
     foreach($types as $type){
       $tmp[] = get_ou($type).$this->fai_release;
     }
@@ -939,11 +1098,6 @@ class faiManagement extends plugin
     ksort($ret);
     $ret = array_flip($ret);
 
-    /* Ensure that we have a valid release selected */
-    if(!isset($ret[$this->fai_release])){
-      $this->fai_release = $this->fai_base;
-    }
-
     return ($ret);
   }
   
@@ -980,7 +1134,7 @@ class faiManagement extends plugin
       }
     }
     $this->base = $base;
-    $this->set_acl_base($this->base);
+    $this->set_acl_base($this->acl_base);
 
     $this->lock_type = FAI::get_release_tag(FAI::get_release_dn($base));
 
@@ -988,13 +1142,13 @@ class faiManagement extends plugin
      * Generate List of Partitions,Hooks,Scripts,Templates,Profiles ... 
      */
     $ObjectTypes = array(
-        "FAIpartitionTable"  => array("OU"=> get_ou('faipartitionou') , "CHKBOX"=>"ShowPartitions"  ,"ACL" => "faiPartitionTable"),
-        "FAIpackageList"     => array("OU"=> get_ou('faipackageou')   , "CHKBOX"=>"ShowPackages"    ,"ACL" => "faiPackage"),
-        "FAIscript"          => array("OU"=> get_ou('faiscriptou')    , "CHKBOX"=>"ShowScripts"     ,"ACL" => "faiScript"),
-        "FAIvariable"        => array("OU"=> get_ou('faivariableou')  , "CHKBOX"=>"ShowVariables"   ,"ACL" => "faiVariable"),
-        "FAIhook"            => array("OU"=> get_ou('faihookou')      , "CHKBOX"=>"ShowHooks"       ,"ACL" => "faiHook"),
-        "FAIprofile"         => array("OU"=> get_ou('faiprofileou')   , "CHKBOX"=>"ShowProfiles"    ,"ACL" => "faiProfile"),
-        "FAItemplate"        => array("OU"=> get_ou('faitemplateou')  , "CHKBOX"=>"ShowTemplates"   ,"ACL" => "faiTemplate"));
+        "FAIpartitionTable"  => array("OU"=> get_ou('faiPartitionRDN') , "CHKBOX"=>"ShowPartitions"  ,"ACL" => "faiPartitionTable"),
+        "FAIpackageList"     => array("OU"=> get_ou('faiPackageRDN')   , "CHKBOX"=>"ShowPackages"    ,"ACL" => "faiPackage"),
+        "FAIscript"          => array("OU"=> get_ou('faiScriptRDN')    , "CHKBOX"=>"ShowScripts"     ,"ACL" => "faiScript"),
+        "FAIvariable"        => array("OU"=> get_ou('faiVariableRDN')  , "CHKBOX"=>"ShowVariables"   ,"ACL" => "faiVariable"),
+        "FAIhook"            => array("OU"=> get_ou('faiHookRDN')      , "CHKBOX"=>"ShowHooks"       ,"ACL" => "faiHook"),
+        "FAIprofile"         => array("OU"=> get_ou('faiProfileRDN')   , "CHKBOX"=>"ShowProfiles"    ,"ACL" => "faiProfile"),
+        "FAItemplate"        => array("OU"=> get_ou('faiTemplateRDN')  , "CHKBOX"=>"ShowTemplates"   ,"ACL" => "faiTemplate"));
 
     $filter = "";
     foreach($ObjectTypes as $key => $data){
@@ -1011,16 +1165,6 @@ class faiManagement extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
 
-    /* Get release tag 
-       If current release is freezed, all objects are freezed to.
-     */
-    $ldap->cat($base);
-    $release_attrs = $ldap->fetch();
-    $force_freezed = FALSE;
-    if(isset($release_attrs['FAIstate'][0]) && preg_match("/freeze/i",$release_attrs['FAIstate'][0])){
-      $force_freezed = TRUE;
-    }
-
     foreach($tmp as $entry){
 
       /* Get some more informations about the object */ 
@@ -1045,28 +1189,49 @@ class faiManagement extends plugin
           $obj['cn']                         = $object['cn'][0];
           $obj['dn']                         = $object['dn'];
           $obj['acl']                      = $acl;
+          $obj['class']                          = $rest ['ACL'];
+          $obj['FAIstate']      = $entry['FAIstate'];
           $obj['description']   = $object['description'][0];
           $obj['objectClass']   = $object['objectClass'];
 
-          /* Append type to this string, to be able to check if the selected 
-           * entry is of type 'freeze' or 'branch'
-           */
-          if(!isset($object['FAIstate'])){
-            $obj['FAIstate'] = $this->lock_type;
-          }else{
-            $obj['FAIstate'] = $object['FAIstate'][0]; 
-          }
-
-          if($force_freezed){
-            $obj['FAIstate'] = "freeze";
-          }
-
           $this->objects[strtolower($obj['cn']).$obj['cn'].$type] = $obj;
           $this->objects[strtolower($obj['cn']).$obj['cn'].$type]['type']=$type;
         }
                        }
                }
 
+    /*  Append opsi objects, if opsi is available and if we are on the fai_base
+     */
+    if($this->opsi instanceof opsi && $this->opsi->enabled()){  
+      $opsi_acl = $this->ui->get_permissions($base,"opsi/opsiProperties");
+      if(preg_match("/r/",$opsi_acl)){
+        $err = FALSE;
+        if(!$err && $this->DivListFai->ShowOpsiNetboot){
+          $n_pro = $this->opsi->get_netboot_products();
+          $err |= $this->opsi->is_error();
+          foreach($n_pro as $name => $data){
+            $entry = array("cn" => $name,
+                "description" => $data['DESC'],
+                "type" => "opsi_netboot");
+            $this->objects[$name."_opsi_netboot"] = $entry;
+          }  
+        }
+        if(!$err && $this->DivListFai->ShowOpsiLocal){
+          $l_pro = $this->opsi->get_local_products();
+          $err |= $this->opsi->is_error();
+          foreach($l_pro as $name => $data){
+            $entry = array("cn" => $name,
+                "description" => $data['DESC'],
+                "type" => "opsi_local");
+            $this->objects[$name."_opsi_local"] = $entry;
+          }  
+        }  
+        if($err){
+          msg_dialog::display(_("Error"),msgPool::siError($this->opsi->get_error()),ERROR_DIALOG);
+        }
+      }
+    }
+
                ksort($this->objects);
                reset ($this->objects);
        
@@ -1084,6 +1249,9 @@ class faiManagement extends plugin
                if (isset($this->dn)){
                        del_lock ($this->dn);
                }
+    if(isset($this->dns) && is_array($this->dns) && count($this->dns)){
+      del_lock ($this->dns);
+    }
        }
 
        function get_type($array){
@@ -1131,7 +1299,17 @@ class faiManagement extends plugin
     /* Get posted release */
     $r_releases = array_flip($this->getBranches());
     if(isset($_POST['fai_release']) && isset($r_releases[get_post('fai_release')])){
-      $this->fai_release = $r_releases[get_post('fai_release')];
+
+      /* Ensure that we have a valid release selected */
+      if(!isset($r_releases[get_post('fai_release')])){
+        msg_dialog::display(_("Warning"),_("The selected release is not available anymore. All triggered actions are skipped."));
+        $_POST = array();
+        $plug =$_GET['plug'];
+        $_GET  = array("plug" => $plug);
+        $this->fai_release = $this->fai_base;
+      }else{
+        $this->fai_release = $r_releases[get_post('fai_release')];
+      }
 
       $fai_filter = session::get("fai_filter");
       $fai_filter['fai_release'] = $this->fai_release;
@@ -1151,6 +1329,7 @@ class faiManagement extends plugin
       return("");
     }
 
+    $ui = get_userinfo();
 
     /* Add a single entry to queue */
     if($s_action == "copy"){
@@ -1160,7 +1339,10 @@ class faiManagement extends plugin
       $entry    = $this->objects[$s_entry];
       $a_setup  = $this->get_type($entry);
       $dn = $entry['dn'];
-      $this->CopyPasteHandler->add_to_queue($dn,$s_action,$a_setup[0],$a_setup[2],"fai");//$a_setup[1]);
+
+      if($ui->is_copyable($dn,"fai",$a_setup[1])){
+        $this->CopyPasteHandler->add_to_queue($dn,$s_action,$a_setup[0],$a_setup[2],"fai");//$a_setup[1]);
+      }
     }
 
     /* Add entries to queue */
@@ -1177,8 +1359,7 @@ class faiManagement extends plugin
         $a_setup  = $this->get_type($entry);
         $dn = $entry['dn'];
 
-
-        if($s_action == "copy_multiple"){
+        if($s_action == "copy_multiple" && $ui->is_copyable($dn,"fai",$a_setup[1])){
           $this->CopyPasteHandler->add_to_queue($dn,"copy",$a_setup[0],$a_setup[2],"fai");//$a_setup[1]);
         }
       }
@@ -1217,7 +1398,17 @@ class faiManagement extends plugin
   static function check_class_name($oc,$name,$dn)
   {
     $base = FAI::get_release_dn($dn);
-    $res  = FAI::get_all_objects_for_given_base($base,"(objectClass=".$oc.")",TRUE);
+
+    if($oc == "FAIprofile"){
+      $f = "";
+      $ocs = array("FAIprofile","FAItemplate","FAIhook","FAIpartitionTable","FAIpackageList","FAIscript","FAIvariable");
+      foreach($ocs as $oc){
+        $f .= "(objectClass=".$oc.")";
+      } 
+      $res  = FAI::get_all_objects_for_given_base($base,"(|".$f.")",TRUE);    
+    }else{
+      $res  = FAI::get_all_objects_for_given_base($base,"(objectClass=".$oc.")",TRUE);
+    }
     $delete = array();
     $used   = array();
     foreach($res as $object){