Code

Updated FAI partition handling
[gosa.git] / gosa-plugins / fai / admin / fai / class_faiManagement.inc
index 7fea76a93cb40e335d20310d9d1be8831a9c403d..0099a68637175dc13b4b3d10156e08a9d27fd054 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,11 +48,13 @@ 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 
         */
@@ -61,19 +64,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");
@@ -91,12 +113,13 @@ class faiManagement extends plugin
     
                $display        = "";
     $s_action  = "";
+    $i_entryID ="";
+    $s_entryType= "";
                $s_entry        = "";
     $no_save = FALSE;   // hide Apply / Save buttons
     
     /* If an entry was locked, these vars will be stored in a session to allow direct edit */
-    session::set('LOCK_VARS_TO_USE',array("/^edit_freeze_entry$/","/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/","/^item_selected/","/^remove_multiple_fai_objects/","/^menu_action/"));
-
+    session::set('LOCK_VARS_TO_USE',array("/^edit_freeze_entry$/","/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/","/^item_selected/","/^remove_multiple_fai_objects/","/^menu_action/","/^faiGroupHandle_apply$/"));
 
     /****************
       Handle posts 
@@ -105,79 +128,56 @@ class faiManagement extends plugin
                /* Check ImageButton posts
                 * Create new tab ich new_xx is posted
                 */
-    $posts = array( "/remove_branch/"=>"remove_branch",    "/branch_branch/"=>"branch_branch",
-                    "/freeze_branch/"=>"freeze_branch",    "/create_partition/i"=>"new_partition",
-                    "/create_script/i"=>"new_script",      "/create_hook/i"=>"new_hook",
-                    "/create_variable/i"=>"new_variable",  "/create_template/i"=>"new_template",
-                    "/create_package/i"=>"new_package",    "/create_profile/i"=>"new_profile",
-                    "/edit_continue/"=>"select_class_name_finished",
-                    "/^multiple_copy_fai/" => "copy_multiple", 
-                    "/^multiple_cut_fai/" => "cut_multiple", 
-                    "/^copy/" => "copy",
-                    "/^remove_multiple_fai_objects/" => "del_multiple");
-
+    $posts = array( "/^remove_branch/"                =>"remove_branch",    
+                    "/^branch_branch/"                =>"branch_branch",
+                    "/^freeze_branch/"                =>"freeze_branch",   
+                    "/^create_partition/i"            =>"new_partition",
+                    "/^create_script/i"               =>"new_script",      
+                    "/^create_hook/i"                 =>"new_hook",
+                    "/^create_variable/i"             =>"new_variable",  
+                    "/^create_template/i"             =>"new_template",
+                    "/^create_package/i"              =>"new_package",    
+                    "/^create_profile/i"              =>"new_profile",
+
+                    "/^edit_continue$/"               => "select_class_name_finished",
+
+                    "/^group_copy/"                   => "group_copy",
+                    "/^group_cut/"                    => "group_cut",
+                    "/^group_edit/"                   => "group_edit",
+                    "/^group_remove/"                 => "group_remove");
                foreach($_POST as $name => $value){
       foreach($posts as $reg => $act ){
         if(preg_match($reg,$name)){
           $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";
-        $no_save = TRUE;
-                       }elseif(preg_match("/^entry_delete_.*/",$name)){
-                               $s_entry = preg_replace("/^entry_delete_/","",$name);
-                               $s_entry = preg_replace("/_.*$/","",$s_entry);
-        $s_action = "delete";
+      if(preg_match("/^edit_[0-9]*_.*$/",$name)){
+        $i_entryID  = preg_replace("/^edit_([0-9]*)_.*$/i","\\1",$name);
+        $s_entryType= preg_replace("/^edit_[0-9]*_([^_]*)_.*$/i","\\1",$name);
+        $s_action = "edit";
       }
     }
 
-               if(isset($_GET['edit_entry'])){
-                       $s_entry = $_GET['edit_entry'];
-                       $s_action = "edit";
-               }
-
-               if(isset($_GET['edit_freeze_entry'])){
-                       $s_entry = $_GET['edit_freeze_entry'];
-                       $s_action = "edit";
-      $no_save = TRUE;
-               }
-
-    if(isset($_GET['act']) && $_GET['act'] == "freeze_branch"){
-      $s_action = "freeze_branch";
-    }
-    if(isset($_GET['act']) && $_GET['act'] == "branch_branch"){
-      $s_action = "branch_branch";
-    }
-    if(isset($_GET['act']) && $_GET['act'] == "remove_branch"){
-      $s_action = "remove_branch";
-    }
-    
-    if((isset($_POST['CancelBranchName'])) || (isset($_POST['CloseIFrame']))){
-      $this->dispNewBranch = false;
-      $this->dispNewFreeze = false;
+    if(isset($_GET['act']) && $_GET['act'] == "edit" && isset($_GET['id'])){
+      if(isset($this->objects[$_GET['id']])){
+        $s_action = "group_edit";
+        $s_entry = $_GET['id'];
+      }
     }
 
-
-    $type_acl_mapping = array(
-        "FAIpartitionTable"  => "faiPartitionTable", 
-        "FAIpackageList"     => "faiPackage",
-        "FAIscript"          => "faiScript",
-        "FAIvariable"        => "faiVariable",
-        "FAIhook"            => "faiHook",
-        "FAIprofile"         => "faiProfile",
-        "FAItemplate"        => "faiTemplate");
-
-
-    /* handle C&P from layers menu */
+    foreach(array("freeze_branch" => "freeze_branch",
+          "branch_branch" => "branch_branch",
+          "remove_branch" => "remove_branch") as $from => $to){
+      if(isset($_GET['act']) && $_GET['act'] == $from){
+        $s_action = $to;
+      }
+    }
+  
+    /* handle C&P from layer menu */
     if(isset($_POST['menu_action']) && preg_match("/^multiple_copy_systems/",$_POST['menu_action'])){
       $s_action = "copy_multiple";
     }
@@ -188,6 +188,12 @@ class faiManagement extends plugin
       $s_action = "editPaste";
     }
 
+
+    if((isset($_POST['CancelBranchName'])) || (isset($_POST['CloseIFrame']))){
+      $this->dispNewBranch = false;
+      $this->dispNewFreeze = false;
+    }
+
     /* Create options */
     if(isset($_POST['menu_action']) && preg_match("/^Create_/",$_POST['menu_action'])){
       $s_action = "new_".preg_replace("/^Create_/","",$_POST['menu_action']);;
@@ -204,94 +210,123 @@ class faiManagement extends plugin
       $this->no_save = $no_save;
     }
 
-    /********************
-      Copy & Paste
-     ********************/
 
-    /* Display the copy & paste dialog, if it is currently open */
-    $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
-    if($ret){
-      return($ret);
+    /*******************
+      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 
+      Delete a group of FAI objects 
+        (Group = same name & different classes)
      ****************/
 
-               if ($s_action=="delete"){
-
-      /* Get 'dn' from posted termlinst */
-      $this->dn= $this->objects[$s_entry]['dn'];
-
-                       /* Load permissions for selected 'dn' and check if
-                          we're allowed to remove this 'dn' */
-      $acl  = $this->ui->get_permissions($this->dn,"fai/".$type_acl_mapping[$this->objects[$s_entry]['type']]);
-      if(preg_match("/d/",$acl)){
-
-                               /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */
-                               if (($user= get_lock($this->dn)) != ""){
-                                       return(gen_locked_message ($user, $this->dn));
-                               }
-
-                               /* 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("multiple", false);
-                               return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
-                       } else {
-
-                               /* Obviously the user isn't allowed to delete. Show message and clean session. */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(),ERROR_DIALOG);
-                       }
-               }
+    if($s_action == "group_remove"){
+      if(isset($this->objects[$s_entry])){
+        $group = $this->objects[$s_entry];
 
-
-    /********************
-      Delete MULTIPLE entries requested, display confirm dialog
-     ********************/
-
-    if ($s_action=="del_multiple"){
-      $this->dns = array();
-      $ids = $this->list_get_selected_items();
-
-      if(count($ids)){
-
-        $errors = "";
-        foreach($ids as $id){
-          $dn = $this->objects[$id]['dn'];
-          $cn = $this->objects[$id]['cn'];
-          if(!preg_match('/^freeze/', $this->objects[$id]['FAIstate'])){
-            $this->dns[$id] = $dn;
-          }else{
-            $errors .= $cn.", ";
-          }
+        /* Do not allow to remove opsi products */
+        foreach(array("opsi_netboot","opsi_local") as $type){
+          if(isset($group[$type])) unset($group[$type]);
         }
-        if ($user= get_multiple_locks($this->dns)){
-          return(gen_locked_message($user,$this->dns));
+        if(count($group) == 1){
+          $s_action = "remove";
+          $i_entryID = $s_entry;
+          $s_entryType = key($group);
+        }elseif(count($group)){
+          $this->dialog = new faiGroupHandle($group,"remove");
         }
-
-        if($errors != ""){
-          msg_dialog::display(_("Branch locked"),sprintf(_("The following entries are locked, you can't remove them %s."),
-            "<br><br>".trim($errors,", ")),INFO_DIALOG);
+      }
+    }elseif($s_action == "group_edit"){
+      if(isset($this->objects[$s_entry])){
+        $group = $this->objects[$s_entry];
+        if(count($group) == 1){
+          $s_action = "edit";
+          $i_entryID = $s_entry;
+          $s_entryType = key($group);
+        }else{
+          $this->dialog = new faiGroupHandle($group,"edit");
         }
-
-        if(count($this->dns)){
-
-          $dns_names = array();
-          foreach($this->dns as $dn){
-            add_lock ($dn, $this->ui->dn);
-            $dns_names[] = @LDAP::fix($dn);
-          }
-
-          /* Lock the current entry, so nobody will edit it during deletion */
-                                 $smarty->assign("warning",msgPool::deleteInfo($dns_names,_("FAI object")));
-          $smarty->assign("multiple", true);
-          return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
+      }
+    }elseif($s_action == "group_cut"){
+      if(isset($this->objects[$s_entry])){
+        $group = $this->objects[$s_entry];
+        if(count($group) == 1){
+          $s_action = "cut";
+          $i_entryID = $s_entry;
+          $s_entryType = key($group);
+        }else{
+          $this->dialog = new faiGroupHandle($group,"cut");
+        }
+      }
+    }elseif($s_action == "group_copy"){
+      if(isset($this->objects[$s_entry])){
+        $group = $this->objects[$s_entry];
+        if(count($group) == 1){
+          $s_action = "copy";
+          $i_entryID = $s_entry;
+          $s_entryType = key($group);
+        }else{
+          $this->dialog = new faiGroupHandle($group,"copy");
+        }
+      }
+    }
+    if($this->dialog instanceOf faiGroupHandle){
+      $this->dialog->save_object();
+      if($this->dialog->is_open()){
+        return($this->dialog->execute());
+      }elseif($this->dialog->is_canceled() || isset($_POST['cancel_lock'])){
+        $this->dialog = FALSE;
+      }else{
+        if(!count($this->dialog->get_selected())){
+          $this->dialog = FALSE;
         }
       }
     }
 
+    /********************
+      Copy & Paste
+     ********************/
+
+    /* Display the copy & paste dialog, if it is currently open */
+    $ret = $this->copyPasteHandling_from_queue($s_action,$i_entryID,$s_entryType);
+    if($ret){
+      return($ret);
+    }
+
 
     /********************
       Delete MULTIPLE entries confirmed
@@ -305,27 +340,21 @@ class faiManagement extends plugin
 
       /* Remove user by user and check acls before removeing them */
       foreach($this->dns as $key => $dn){
-
         $ldap->cat($dn, array('objectClass'));
         $attrs  = $ldap->fetch();
         $type   = $this->get_type($attrs);
-
         $acl  = $this->ui->get_permissions($dn,"fai/".$type[1]);
         if(preg_match("/d/",$acl)){
-
           $this->dialog = new $type[0]($this->config, $this->config->data['TABS'][$type[2]], $dn,"fai");
           $this->dialog->parent = &$this;
           $this->dialog->set_acl_base($dn);
           $this->dialog->by_object[$type[1]]->remove_from_parent ();
-          unset ($this->dialog);
           $this->dialog= FALSE;
-          $to_del = FAI::clean_up_releases($dn);
           FAI::save_release_changes_now();
-
+          $to_del = FAI::clean_up_releases($dn);
           foreach($to_del as $dn){
             $ldap->rmdir_recursive($dn);
           }
-
         } else {
 
           /* Normally this shouldn't be reached, send some extra
@@ -333,112 +362,139 @@ 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]);
       }
-    }
-
-
-    /********************
-      Delete MULTIPLE entries Canceled
-     ********************/
 
-    /* Remove lock */
-    if(isset($_POST['delete_multiple_fai_object_cancel'])){
-      foreach($this->dns as $key => $dn){
-        del_lock ($dn);
-        unset($this->dns[$key]);
-      }
+      /* Remove lock file after successfull deletion */
+      $this->remove_lock();
+      $this->dns = array();
+      $this->dialog = FALSE;
     }
 
 
     /****************
-      Delete aborted  
+      Delete confirme dialog 
      ****************/
 
-               /* Delete canceled? */
-               if (isset($_POST['delete_cancel'])){
-                       del_lock ($this->dn);
-               }
+    if ($s_action=="del_multiple" || $s_action == "remove" ||  
+        $this->dialog instanceOf faiGroupHandle && $this->dialog->get_mode() == "remove"){
+      /* Collect objects to delete and check if objects are freezed
+       */ 
+      $dns = array();
+      $errors = "";
+      $this->dns = array();
 
+      if($s_action == "remove"){
+        $to_delete =array($entry = $this->objects[$i_entryID][$s_entryType]);
+      }elseif($this->dialog instanceOf faiGroupHandle){
+        $to_delete = $this->dialog->get_selected();
+      }else{
+        $ids = $this->list_get_selected_items();
+        $to_delete = array();
+        foreach($ids as $id){
+          foreach($this->objects[$id] as $obj) { 
+            array_push($to_delete, $obj); 
+          } 
+        }
+      } 
 
-    /****************
-      Delete confirmed 
-     ****************/
+      foreach($to_delete as $obj){
+        if(isset($obj['type']) && in_array($obj['type'],array("opsi_netboot","opsi_local"))){
+          continue;
+        }
+        if(isset($obj['FAIstate']) && preg_match('/^freeze/', $obj['FAIstate'])){
+          $errors .= $obj['cn'].", ";
+        }else{
+          $this->dns[] = $obj['dn'];
+        }
+      }
 
-               /* Deltetion was confirmed, so delete this entry
-     */
-    if (isset($_POST['delete_terminal_confirm'])){
+      if($errors != ""){
+        msg_dialog::display(_("Branch locked"),sprintf(_("The following entries are locked, you can't remove them %s."),
+              "<br><br>".trim($errors,", ")),INFO_DIALOG);
+      }
 
-      /* Some nice guy may send this as POST, so we've to check
-         for the permissions again. */
+      /* Check locking 
+       */
+      if(count($this->dns)){
+        if ($user= get_multiple_locks($this->dns)){
+          return(gen_locked_message($user,$this->dns));
+        }
+        if(count($this->dns)){
+          $dns_names = array();
+          foreach($this->dns as $dn){
+            add_lock ($dn, $this->ui->dn);
+            $dns_names[] = LDAP::fix($dn);
+          }
+                                 $smarty->assign("warning",msgPool::deleteInfo($dns_names,_("FAI object")));
+          $smarty->assign("multiple", true);
+          return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
+        }
+      }
+    }
 
-      /* Find out more about the object type */
-      $ldap      = $this->config->get_ldap_link();
-      $ldap->cat($this->dn, array('objectClass'));
-      if($ldap->count()){
-        $attrs = $ldap->fetch();
-        $type    = $this->get_type($attrs);                    
 
-        $acl  = $this->ui->get_permissions($this->dn,"fai/".$type[1]);
-        if(preg_match("/d/",$acl)){
 
-          $this->dialog = new $type[0]($this->config,  $this->config->data['TABS'][$type[2]], $this->dn,"fai");
-          $this->dialog->set_acl_base($this->dn);
-          $this->dialog->parent = &$this;
-          $this->dialog->by_object[$type[1]]->remove_from_parent ();
-          unset ($this->dialog);
-          $this->dialog= FALSE;
-          $to_del = FAI::clean_up_releases($this->dn);
-          FAI::save_release_changes_now();
+    /********************
+      Delete MULTIPLE entries Canceled
+     ********************/
 
-          foreach($to_del as $dn){
-            $ldap->rmdir_recursive($dn);
-          }
+    /* Remove lock */
+    if(isset($_POST['delete_multiple_fai_object_cancel'])){
+      $this->remove_lock();
+      $this->dns = array();
+    }
 
-        } else {
+    /****************
+      Edit entry 
+     ****************/
 
-          /* Normally this shouldn't be reached, send some extra
-             logs to notify the administrator */
-          msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
-          new log("security","fai/".get_class($this),$dn,array(),"Tried to trick deletion.");
-        }
+               if($s_action == "edit" || $this->dialog instanceOf faiGroupHandle && $this->dialog->get_mode() == "edit"){
 
-      }else{
-        msg_dialog::display(_("Error"), sprintf(_("Cannot delete '%s': object does not exist!"), $this->dn) , ERROR_DIALOG);
+      $entry = array();
+      if($this->dialog instanceOf faiGroupHandle){
+        $entries = $this->dialog->get_selected();
+        $entry = array_pop($entries);
+      }elseif(isset($this->objects[$i_entryID][$s_entryType])){
+        $entry = $this->objects[$i_entryID][$s_entryType];
       }
-      /* Remove lock file after successfull deletion */
-      del_lock ($this->dn);
-    }
 
+      if(count($entry)){
+        $a_setup  = $this->get_type($entry);
 
-    /****************
-      Edit entry 
-     ****************/
+        /* Special handling for opsi products 
+         */
 
-               if(($s_action == "edit") && (!isset($this->dialog->config))){
-                       $entry    = $this->objects[$s_entry];
-                       $a_setup  = $this->get_type($entry);
-                       $this->dn = $entry['dn'];
+        if(in_array($entry['type'],array("opsi_local","opsi_netboot")) && 
+            $this->opsi instanceof opsi && $this->opsi->enabled() ){
 
-                       /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */
-                       if (($user= get_lock($this->dn)) != ""){
-                               return(gen_locked_message ($user, $this->dn));
-                       }
-                       add_lock ($this->dn, $this->ui->dn);
+          $name = $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.");
+          }
+        }elseif(count($a_setup)){
 
-                       $this->dialog     = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
-      $this->dialog->parent = &$this;
-      $this->dialog->set_acl_base($this->dn);
-                       $this->is_dialog  = true;
+          $this->dn = $entry['dn'];
+          /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */
+          if (($user= get_lock($this->dn)) != ""){
+            return(gen_locked_message ($user, $this->dn, TRUE));
+          }
+          add_lock ($this->dn, $this->ui->dn);
 
-      if(preg_match("/^freeze/", $entry['FAIstate']) || $this->no_save){
-#        $this->dialog->set_acl_base("freezed")  ;    
+          $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;
+          set_object_info($this->dn);
+        }
       }
-                       session::set('objectinfo',$this->dn);
-               }
+    }
 
 
     /*  Branch handling 
@@ -460,9 +516,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()){
+        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")));
+          $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);
@@ -483,7 +539,7 @@ class faiManagement extends plugin
       if("" != $this->config->search("faiManagement", "POSTREMOVE",array('menu','tabs'))){
 
         if(!isset($_POST['release_hidden']) || base64_decode($_POST['release_hidden']) != $this->fai_release){
-          msg_dialog::display(_("Warning"),_("Release remove aborted, release name check failed."));
+          msg_dialog::display(_("Warning"),_("Release remove aborted because the release name check failed!"));
         }else{
 
           $bb =  $this->fai_release;
@@ -493,22 +549,62 @@ class faiManagement extends plugin
 
           $br = $this->getBranches();
 
-          if(isset($br[$bb]) && $this->acl_is_removeable()){
+          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('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('applicationou'), $bb));
+            $ldap->cd(preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'/', ','.get_ou('applicationRDN'), $bb));
             $ldap->recursive_remove();
-            $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('mimetypeou'), $bb));
+            $ldap->cd(preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'/', ','.get_ou('mimetypeRDN'), $bb));
             $ldap->recursive_remove();
-            $this->fai_release = $this->fai_base;
+
+            /* 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();
 
+            $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");
           }
         }
@@ -536,8 +632,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;
       }
 
@@ -571,10 +667,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;
@@ -605,11 +706,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){
@@ -676,6 +777,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>" ;
@@ -692,6 +794,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();
       }
     }
@@ -705,8 +829,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);
@@ -726,7 +850,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;
@@ -756,7 +880,17 @@ 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]]);
+
+      $type_acl_mapping = array(
+          "FAIpartitionTable"  => "faiPartitionTable", 
+          "FAIpackageList"     => "faiPackage",
+          "FAIscript"          => "faiScript",
+          "FAIvariable"        => "faiVariable",
+          "FAIhook"            => "faiHook",
+          "FAIprofile"         => "faiProfile",
+          "FAItemplate"        => "faiTemplate");
+
+      $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;
@@ -769,7 +903,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");
@@ -784,7 +918,7 @@ class faiManagement extends plugin
 
 
     /****************
-      Get from ask class name dialog 
+      Get name from ask_class_name dialog 
      ****************/
 
     if($s_action == "select_class_name_finished"){
@@ -814,14 +948,38 @@ 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);
+                       set_object_info();
+      $this->remove_lock();
                }
 
 
+    /****************
+     Handle opsi dialogs  
+     ****************/
+      
+    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());
+    }
+
+
     /****************
       Save sub dialogs 
      ****************/
@@ -841,11 +999,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');
+          set_object_info();
+        }else{
+
+          /* Reinitialize tab */
+          if($this->dialog instanceof tabs){
+            $this->dialog->re_init();
+          }
         }
                        }
                }
@@ -869,7 +1032,11 @@ class faiManagement extends plugin
 
         $obj = $this->dialog->by_object[$this->dialog->current];
 
-        if((isset($obj->is_dialog) && (!$obj->is_dialog)) || (isset($obj->dialog) && (!$obj->dialog))){
+        if(($this->dialog instanceOf tabs || $this->dialog instanceOf plugin) && $this->dialog->read_only == TRUE){
+          $display.= "<p style=\"text-align:right\">
+            <input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">
+            </p>";
+        }elseif((isset($obj->is_dialog) && (!$obj->is_dialog)) || (isset($obj->dialog) && (!$obj->dialog))){
 
           $display.= "<p style=\"text-align:right\">\n";
           if(!$this->no_save){
@@ -905,7 +1072,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);
     }
 
@@ -922,7 +1089,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;
     }
@@ -981,7 +1148,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));
 
@@ -989,13 +1156,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){
@@ -1012,16 +1179,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 */ 
@@ -1046,48 +1203,67 @@ 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;
+          $this->objects[$obj['cn']][$type] = $obj;
+          $this->objects[$obj['cn']][$type]['type']=$type;
         }
                        }
                }
 
-               ksort($this->objects);
+    /*  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);
+        }
+      }
+    }
+    uksort($this->objects, 'strnatcasecmp');
                reset ($this->objects);
-       
-               /* use numeric index, thats a bit more secure */        
-               $tmp0 = array();
-               foreach($this->objects as $obj){
-                       $tmp0[]= $obj;
-               }
-               $this->objects = array();
-               $this->objects = $tmp0;
+               $this->objects = array_values($this->objects);
        }
 
        function remove_lock()
        {
-               if (isset($this->dn)){
+               if (isset($this->dn) && !empty($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){
+    if(!isset($array['objectClass'])) return(array());
                if(in_array("FAIpartitionTable",$array['objectClass'])){
                        return(array("tabsPartition","faiPartitionTable","FAIPARTITIONTABS"));
                }
@@ -1110,6 +1286,7 @@ class faiManagement extends plugin
                if(in_array("FAIpackageList",$array['objectClass'])){
                        return(array("tabsPackage","faiPackage","FAIPACKAGETABS"));
                }
+    return(array());
        }
 
   function CheckNewBranchName($name,$base)
@@ -1155,23 +1332,54 @@ class faiManagement extends plugin
   }
 
 
-  function copyPasteHandling_from_queue($s_action,$s_entry)
+  function copyPasteHandling_from_queue($s_action,$i_entryID,$s_entryType)
   {
     /* Check if Copy & Paste is disabled */
     if(!is_object($this->CopyPasteHandler)){
       return("");
     }
 
+    $ui = get_userinfo();
 
-    /* Add a single entry to queue */
+    // Copy a single entry
     if($s_action == "copy"){
+      $entry = $this->objects[$i_entryID][$s_entryType];
+      $this->CopyPasteHandler->cleanup_queue();
+      $a_setup  = $this->get_type($entry);
+      $dn = $entry['dn'];
+      if($ui->is_copyable($dn,"fai",$a_setup[1])){
+        $this->CopyPasteHandler->add_to_queue($dn,"copy",$a_setup[0],$a_setup[2],"fai");
+      }
+    }
 
-      /* Cleanup object queue */
+    // cut a single entry
+    if($s_action == "cut"){
+      $entry = $this->objects[$i_entryID][$s_entryType];
       $this->CopyPasteHandler->cleanup_queue();
-      $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,"cut",$a_setup[0],$a_setup[2],"fai");
+      }
+    }
+
+    /* Add a entries from the group selection to queue */
+    if($this->dialog instanceOf faiGroupHandle && !$this->dialog->is_open()){
+
+      if(in_array($this->dialog->get_mode(),array("copy"))){      
+
+        /* Cleanup object queue */
+        $this->CopyPasteHandler->cleanup_queue();
+        $group = $this->dialog->get_selected();
+        foreach($group as $entry){
+          $a_setup  = $this->get_type($entry);
+          $dn = $entry['dn'];
+          if($ui->is_copyable($dn,"fai",$a_setup[1])){
+            $this->CopyPasteHandler->add_to_queue($dn,$this->dialog->get_mode(),$a_setup[0],$a_setup[2],"fai");//$a_setup[1]);
+          }
+        }
+        $this->dialog = FALSE;
+      }
     }
 
     /* Add entries to queue */
@@ -1182,15 +1390,14 @@ class faiManagement extends plugin
 
       /* Add new entries to CP queue */
       foreach($this->list_get_selected_items() as $id){
+        $group    = $this->objects[$id];
+        foreach($group as $entry){
+          $a_setup  = $this->get_type($entry);
+          $dn = $entry['dn'];
 
-        /* Cleanup object queue */
-        $entry    = $this->objects[$id];
-        $a_setup  = $this->get_type($entry);
-        $dn = $entry['dn'];
-
-
-        if($s_action == "copy_multiple"){
-          $this->CopyPasteHandler->add_to_queue($dn,"copy",$a_setup[0],$a_setup[2],"fai");//$a_setup[1]);
+          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]);
+          }
         }
       }
     }
@@ -1228,7 +1435,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){