Code

Updated object movement.
[gosa.git] / plugins / admin / fai / class_faiManagement.inc
index e4679cef4c13b3b20475eca9c2271321699fd116..629b0190d77383bd51a939402e5a36d1b5a42e09 100644 (file)
@@ -17,6 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 require "tabsPartition.inc";
 require "tabsVariable.inc";
 require "tabsHook.inc";
@@ -33,165 +34,123 @@ class faiManagement extends plugin
        var $plDescription              = "Fully Automatic Installation - management";
 
        /* CLI vars */
-       var $cli_summary                = "Handling of FAI entries";
+       var $cli_summary                  = "Handling of FAI entries";
        var $cli_description    = "This plugin represents a management tool\n
                which allows us to manage all needed attributes for fully automatic installations (FAI)";
        var $cli_parameters             = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
 
        /* Headpage attributes */
-       var $departments= array();
-       var $deptabs= NULL;
+  var $lock_type    = "";    // should be branch/freeze
+  var $lock_name    = "";
+  var $lock_dn      = "";  
 
        /* attribute list for save action */
-       var $attributes                 = array();      //      Attributes Managed by this plugin, none, 
-       //      because this is only an overview over all objects already defined in FAI.
-       var $objectclasses              = array();      //      ObjectClasses which the attributes are related to
+       var $attributes         = array("lock_type","lock_name","lock_dn");     //      Attributes Managed by this plugin 
+       var $objectclasses= array();    //      ObjectClasses which the attributes are related to
        var $dialog                             = array();      //      This object contains every dialog we have currently opened
 
        var $objects                    = array();      //      This array contains all available objects shown in divlist
-       var $is_dialog                  = false;
+       var $is_dialog          = false;
+
+  var $dispNewBranch= false;
+  var $dispNewFreeze= false;
+
+  var $DivListFai;
 
        /* construction/reconstruction 
-        * The Filter ($faifilter stored in $_SESSION['faifilter']) defines the last 
-        *  selected department and filter options
-        * If it is not defined already we create a new fresh faifilter.
         */
        function faiManagement ($config, $ui)
        {
-               $this->ui                       = $ui;  
-
-               /* Set current dn to "", */
+               /* Set defaults */
                $this->dn                       = "";
-
-               /* Assign config */
-               $this->config           = $config;
-
-               /* Get global filter config */
-               if (!is_global("faifilter")){
-                       $base   = get_base_from_people($ui->dn);
-                       $faifilter= array("base" => $base,
-                                       "regex" => "*");
-                       $faifilter['ShowProfiles']      = true;
-                       $faifilter['ShowTemplates'] = true;
-                       $faifilter['ShowScripts']       = true;
-                       $faifilter['ShowHooks']         = true;
-                       $faifilter['ShowVariables']     = true;
-                       $faifilter['ShowPackages']      = true;
-                       $faifilter['ShowPartitions']=true;
-                       register_global("faifilter", $faifilter);
-               }
+               $this->config   = $config;
+               $this->ui                       = $ui;  
+    
+    /* Creat dialog object */
+    $this->DivListFai = new divListFai($this->config,$this);
        }
 
        function execute()
        {
-       /* Call parent execute */
-       plugin::execute();
-               $display        = "";
+    /* Call parent execute */
+    plugin::execute();
+
+    /* Initialise vars and smarty */
                $smarty         = get_smarty();
-               $s_action       = "";
+               $smarty->assign("BranchName","");
+    
+               $display        = "";
+    $s_action  = "";
                $s_entry        = "";
-               /* filter management 
-                * Filter will be changed if POST['regex'] or $_GET['search'] isset
-                * New Filter will be stored in session and is used to generate list contents
-                */     
-               $faifilter = $_SESSION['faifilter'];
-
-               /* Filter is posted by apply button 
-                * Check every single chkbox 
-                */
-               if(isset($_POST['regex'])){
-                       $faifilter['regex'] = $_POST['regex']."*";
-                       foreach(array("ShowPartitions","ShowProfiles","ShowTemplates","ShowScripts","ShowHooks","ShowVariables","ShowPackages") as $attrs){
-                               if(isset($_POST[$attrs])){
-                                       $faifilter[$attrs] = true;
-                               }else{
-                                       $faifilter[$attrs] = false;
-                               }
-                       }
-               }
+    
+    /* If an entry was locked, these vars will be stored in a session to allow direct edit */
+    $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/");
+
+
+    /****************
+      Handle posts 
+     ****************/
 
                /* Check ImageButton posts
                 * Create new tab ich new_xx is posted
                 */
-               foreach($_POST as $key => $val){
-                       if(preg_match("/create_partition/i",$key)){
-                               $s_action = "new_partition";
-                       }elseif(preg_match("/create_script/i",$key)){
-                               $s_action = "new_script";
-                       }elseif(preg_match("/create_hook/i",$key)){
-                               $s_action = "new_hook";
-                       }elseif(preg_match("/create_variable/i",$key)){
-                               $s_action = "new_variable";
-                       }elseif(preg_match("/create_template/i",$key)){
-                               $s_action = "new_template";
-                       }elseif(preg_match("/create_package/i",$key)){
-                               $s_action = "new_package";
-                       }elseif(preg_match("/create_profile/i",$key)){
-                               $s_action = "new_profile";
-                       }elseif(preg_match("/edit_continue/",$key)){
-                               $s_action = "select_class_name_finished";
-                       }elseif(preg_match("/^entry_edit_.*/",$key)){
-                               $s_entry = preg_replace("/^entry_edit_/","",$key);
+    $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");
+
+               foreach($_POST as $name => $value){
+      foreach($posts as $reg => $act ){
+        if(preg_match($reg,$name)){
+          $s_action = $act;
+        }
+      }
+                       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_delete_.*/",$key)){
-                               $s_entry = preg_replace("/^entry_delete_/","",$key);
+                       }elseif(preg_match("/^entry_delete_.*/",$name)){
+                               $s_entry = preg_replace("/^entry_delete_/","",$name);
                                $s_entry = preg_replace("/_.*$/","",$s_entry);
-                               $s_action = "delete";
-                       }elseif(preg_match("/dep_back.*/i",$key)){
-                $s_action="back";
-            }elseif(preg_match("/dep_home.*/i",$key)){
-                $s_action="home";
-            }elseif(preg_match("/dep_root.*/i",$key)){
-                $s_action="root";
-                       }
-
-               }
-
-               if($s_action=="root"){
-                       $faifilter['base']=($this->config->current['BASE']);
-               }
-
-               if($s_action=="home"){
-                       $faifilter['base']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
-                       $faifilter['base']=(preg_replace("/^[^,]+,/","",$faifilter['base']));
-               }
-
-               if($s_action=="back"){
-                       $base_back          = preg_replace("/^[^,]+,/","",$faifilter['base']);
-                       $base_back          = convert_department_dn($base_back);
-
-                       if(isset($this->config->departments[trim($base_back)])){
-                               $faifilter['base']= $this->config->departments[trim($base_back)];
-                       }else{
-                               $faifilter['base']= $this->config->departments["/"];
-                       }
-               }
-
-               if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
-            $s_action="open";
-            $s_entry = base64_decode($_GET['dep_id']);
-            $faifilter['base']= $this->config->departments[trim($s_entry)];
-        }
+        $s_action = "delete";
+      }
+    }
 
                if(isset($_GET['edit_entry'])){
                        $s_entry = $_GET['edit_entry'];
                        $s_action = "edit";
                }
+    
+    if((isset($_POST['CancelBranchName'])) || (isset($_POST['CloseIFrame']))){
+      $this->dispNewBranch = false;
+      $this->dispNewFreeze = false;
+    }
+
+
+    $type_acl_mapping = array(
+        "FAIpartitionTable"  => "faiPartitionTable", 
+        "FAIpackageList"     => "faiPackage",
+        "FAIscript"          => "faiScript",
+        "FAIvariable"        => "faiVariable",
+        "FAIhook"            => "faiHook",
+        "FAIprofile"         => "faiProfile",
+        "FAItemplate"        => "faiTemplate");
+
+    /****************
+      Delete confirme dialog 
+     ****************/
 
-               /* Confirm dialog 
-                * Delte object 
-         */
                if ($s_action=="delete"){
 
-                       /* Get 'dn' from posted termlinst */
-                       $this->dn= $this->objects[$s_entry]['dn'];
+      /* 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=           get_permissions ($this->dn, $this->ui->subtreeACL);
-                       $this->acl= get_module_permission($acl, "FAIclass", $this->dn);
-                       if (chkacl($this->acl, "delete") == ""){
+      $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)) != ""){
@@ -200,7 +159,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", sprintf(_("You're about to delete all information about the FAI class at '%s'."), $this->dn));
+                               $smarty->assign("warning", sprintf(_("You're about to delete all information about the FAI class at '%s'."), @LDAP::fix($this->dn)));
                                return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
                        } else {
 
@@ -210,483 +169,624 @@ class faiManagement extends plugin
                        }
                }
 
+
+    /****************
+      Delete aborted  
+     ****************/
+
                /* Delete canceled? */
                if (isset($_POST['delete_cancel'])){
                        del_lock ($this->dn);
                }
 
 
+    /****************
+      Delete confirmed 
+     ****************/
+
                /* Deltetion was confirmed, so delete this entry
                 */
                if (isset($_POST['delete_terminal_confirm'])){
 
                        /* Some nice guy may send this as POST, so we've to check
                           for the permissions again. */
-                       if (chkacl($this->acl, "delete") == ""){
-
-                               /* Find out more about the object type */
-                               $ldap   = $this->config->get_ldap_link();
-                               $ldap->cat($this->dn);
-                               $attrs  = $ldap->fetch();
-
-                               $type   = $this->get_type($attrs);                      
 
-                               $this->dialog= new $type[0]($this->config,      $this->config->data['TABS'][$type[2]], $this->dn);
-                               $this->dialog->set_acl(array($this->acl));
+      /* Find out more about the object type */
+      $ldap      = $this->config->get_ldap_link();
+      $ldap->cat($this->dn, array('objectClass'));
+      $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->by_object[$type[1]]->remove_from_parent ();
+        unset ($this->dialog);
+        gosa_log ("FAI class '".$this->dn."' has been tagged as removed");
+        $this->dialog= NULL;
+        $to_del = clean_up_releases($this->dn);
+        save_release_changes_now();
+
+        foreach($to_del as $dn){
+          $ldap->rmdir_recursive($dn);
+          gosa_log(sprintf(_("Release cleanup : Removing object (tagged as remvoed) that is no longer in use '%s'."),$dn));
+        }
 
-                               $this->dialog->by_object[$type[1]]->remove_from_parent ();
-                               unset ($this->dialog);
-                               gosa_log ("FAI class '".$this->dn."' has been removed");
-                               $this->dialog= NULL;
+      } else {
 
-                               /* Terminal list has changed, reload it. */
-                               $this->reload ();
-                       } else {
+        /* Normally this shouldn't be reached, send some extra
+           logs to notify the administrator */
+        print_red (_("You are not allowed to delete this component!"));
+        gosa_log ("Warning: '".$this->ui->uid."' tried to trick system ".
+            "deletion.");
+      }
 
-                               /* Normally this shouldn't be reached, send some extra
-                                  logs to notify the administrator */
-                               print_red (_("You are not allowed to delete this component!"));
-                               gosa_log ("Warning: '".$this->ui->uid."' tried to trick system ".
-                                               "deletion.");
-                       }
+      /* Remove lock file after successfull deletion */
+      del_lock ($this->dn);
+    }
 
-                       /* Remove lock file after successfull deletion */
-                       del_lock ($this->dn);
-               }
 
-               /* Edit Entry */
-               if($s_action == "edit"){
-                       $entry  = $this->objects[$s_entry];
+    /****************
+      Edit entry 
+     ****************/
 
-                       $a_setup = ($this->get_type($entry));
-               
+               if(($s_action == "edit") && (!isset($this->dialog->config))){
+                       $entry    = $this->objects[$s_entry];
+                       $a_setup  = $this->get_type($entry);
                        $this->dn = $entry['dn'];
 
-                       $this->dialog= new $a_setup[0]($this->config,
-                                       $this->config->data['TABS'][$a_setup[2]],$this->dn);
-                       $this->is_dialog = true;
-                       $_SESSION['objectinfo'] = $this->dn;
-               }
-
-
-               /* Dialog handling */
-               if($s_action == "new_partition"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAIpartitionTable");
-               }
+                       /* 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);
 
-               /* Dialog handling */
-               if($s_action == "new_script"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAIscript");
-               }
+                       $this->dialog     = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
+      $this->dialog->set_acl_base($this->dn);
+                       $this->is_dialog  = true;
 
-               /* Dialog handling */
-               if($s_action == "new_hook"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAIhook");
+      if($entry['FAIstate'] == "freeze"){
+        #$this->dialog->set_acl(array("*none*"))  ;    
+        echo "Dawn it is freezed.";
+      }
+                       $_SESSION['objectinfo'] = $this->dn;
                }
 
-               /* Dialog handling */
-               if($s_action == "new_variable"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAIvariable");
-               }
 
-               /* Dialog handling */
-               if($s_action == "new_template"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAItemplate");
-               }
+    /*  Branch handling 
+        09.01.2006
+    */
+
+    /****************
+      Remove branch
+     ****************/
+
+    /* Remove branch 
+     */
+    if($s_action == "remove_branch"){
+      $base= $this->DivListFai->selectedBranch;
+
+      /* Load permissions for selected 'dn' and check if
+         we're allowed to remove this 'dn' */
+      $this->set_acl_base($base);
+      if($this->acl_is_removeable()){
+
+        $smarty->assign("info", sprintf(_("You're about to delete a fai branch / freeze  '%s'."), $this->DivListFai->selectedBranch));
+        return($smarty->fetch(get_template_path('remove_branch.tpl',TRUE)));
+      } else {
+        print_red (_("You are not allowed to delete this release!"));
+      }
+    }
+
+    
+    /****************
+      Remove branch confirmed
+     ****************/
+
+    if(isset($_POST['delete_branch_confirm'])){
+      $bb =  $this->DivListFai->selectedBranch;
+      if(!isset($ldap)){
+        $ldap = $this->config->get_ldap_link();
+      }
+
+      $br = $this->getBranches();
+
+      if(isset($br[$bb]) && $this->acl_is_removeable()){
+        $name = $br[$bb];
+        $ldap->cd($bb);
+        $ldap->recursive_remove();
+        $ldap->cd(preg_replace('/,ou=fai,ou=configs,ou=systems,/', ',ou=apps,', $bb));
+        $ldap->recursive_remove();
+        $this->DivListFai->selectedBranch = "main";
+
+        /* Post remove */
+        $this->lock_name   = $name;
+        $this->lock_dn     = $bb;
+        $this->postremove();
+      }
+    }
+
+
+    /****************
+      Create a new branch "insert Name"
+     ****************/
+
+    if((isset($_POST['UseBranchName']))&&(($this->dispNewBranch)||($this->dispNewFreeze))){
+      $_SESSION['LASTPOST'] = $_POST;
+
+      if($this->dispNewBranch){
+        $type = "branch";
+      }else{
+        $type = "freeze";
+      }
+
+      /* Check branch name */
+      $name = $_POST['BranchName'];
+      $is_ok = true;
+      $smarty->assign("BranchName",$name);
+      $base= "ou=fai,ou=configs,ou=systems,".$this->DivListFai->selectedBase;
+
+      /* Check used characters */
+      if(preg_match("/[^0-9a-z \ö\ä\ü\.-_:,]/i",$name)){
+        if($type == "branch"){
+          print_red(_("Specified branch name is invalid."));
+        }else{
+          print_red(_("Specified freeze name is invalid."));
+        }
+        $is_ok = false;
+      }
+
+      /* Check if this name is already in use */
+      if(!$this->CheckNewBranchName($_POST['BranchName'],$this->DivListFai->selectedBranch)){
+        print_red(_("This name is already in use."));
+        $is_ok = false;
+      }
+
+      if($is_ok){
+        $_SESSION['LASTPOST']['base'] = $base;
+        $_SESSION['LASTPOST']['type'] = $type;
+        $smarty->assign("iframe", true);
+        $smarty->assign("plugID", $_GET['plug']);
+        $display       = $smarty->fetch(get_template_path('faiNewBranch.tpl', TRUE, dirname(__FILE__)));
+        return($display);
+      }
+    }
+
+
+    /****************
+      Create a new branch 
+     ****************/
+
+    if(isset($_GET['PerformBranch'])){
+
+      if(!$this->acl_is_createable()){
+        print_red(_("You are not allowed to create a new branch."));
+      }else{
+
+        /* Create it know */
+        $this->dispNewBranch = false;
+        $this->dispNewFreeze = false;
+        $base = $_SESSION['LASTPOST']['base'];
+        $_POST = $_SESSION['LASTPOST'];      
+        $name = $_POST['BranchName'];
+
+        $type = $_SESSION['LASTPOST']['type'];
+        $ldap = $this->config->get_ldap_link();
+
+        $baseToUse = $base;
+        if($this->DivListFai->selectedBranch != "main" ){
+          $baseToUse = $this->DivListFai->selectedBranch;
+        }
 
-               /* Dialog handling */
-               if($s_action == "new_package"){
-                       $this->dialog = new askClassName($this->config,$this->dn,$this->ui,"FAIpackageList");
-               }
+        /* Create new Release name to be able to set faidebianRelease for FAIpackageList */
+
+        $CurrentReleases  = $this->getBranches();
+        $NewReleaseName   = $name;
+        if(isset($CurrentReleases[$this->DivListFai->selectedBranch])) {
+          if($this->DivListFai->selectedBranch != "main"){
+            $NewReleaseName = $CurrentReleases[$this->DivListFai->selectedBranch]."/".$name;
+            $NewReleaseName = preg_replace("#\/#","/",$NewReleaseName); 
+          }else{
+            $NewReleaseName   = $name;
+          }
+        }
 
-               /* New Profile */
-               if($s_action == "new_profile"){
-                       $this->dn = "new" ;
-                       $a_setup= $this->get_type(array("objectClass"=>array("FAIprofile")));
+        $appsrc = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,",$baseToUse); 
+        $appdst = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,","ou=".$name.",".$baseToUse) ; 
 
-                       $this->dialog = new $a_setup[0]($this->config,
-                                       $this->config->data['TABS'][$a_setup[2]],$this->dn);
-                       $this->is_dialog = true;
+        $mimesrc = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=mime,",$baseToUse); 
+        $mimedst = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=mime,","ou=".$name.",".$baseToUse) ; 
 
-               }
+        /* Print header to have styles included */
+        echo '  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+          <html>
+          <head>
+          <title></title>
+          <style type="text/css">@import url("themes/default/style.css");</style>
+          <script language="javascript" src="include/focus.js" type="text/javascript"></script>
+          </head>
+          <body style="background: none;margin:3px;color:black">
+          ';
 
-               if($s_action == "select_class_name_finished"){
-                       $this->dialog->save_object();
-                       if(count($this->dialog->check())!=0){
-                               foreach($this->dialog->check() as $msg){
-                                       print_red($msg);
-                               }               
-                       }else{
-                               $this->dn = "new" ;
-                               $a_setup= $this->get_type(array("objectClass"=>array($this->dialog->objectClass)));
-                               $name = $this->dialog->save();
 
-                               $this->dialog = new $a_setup[0]($this->config,
-                                               $this->config->data['TABS'][$a_setup[2]],$this->dn,$name);
-                               $this->dialog->by_object[$a_setup[1]]->cn = $name;
-                               $this->is_dialog = true;
-                       }               
-               }       
+        /* Duplicate applications 
+         */
+        $ldap->cat($appsrc,array("dn")) ;
+        if($ldap->count()){
+          $ldap->cd ($appdst);
+          $ldap->recursive_remove();
+          $ldap->cd ($this->config->current['BASE']);
+          $ldap->copy_FAI_resource_recursive($appsrc,$appdst,$NewReleaseName,$type,true);
+        }
 
+        /* Duplicate mime types 
+         */
+        $ldap->cat($mimesrc,array("dn")) ;
+        if($ldap->count()){
+          $ldap->cd ($appdst);
+          $ldap->recursive_remove();
+          $ldap->cd ($this->config->current['BASE']);
+          $ldap->copy_FAI_resource_recursive($mimesrc,$mimedst,$NewReleaseName,$type,true);
+        }
 
-               /* Search is set */
-               if(isset($_GET['search'])){
-                       $faifilter['regex']=$_GET['search']."*";
-               }
+        $attr = array();
+        $attr['objectClass'] = array("organizationalUnit","FAIbranch");
+        $attr['ou']       = $name;
+        $attr['FAIstate'] = $type;
+        $ldap->cd($this->config->current['BASE']);
+        $ldap->cd("ou=".$name.",".$baseToUse);
+        $ldap->cat("ou=".$name.",".$baseToUse);
+        if($ldap->count()){
+          $ldap->modify($attr);
+        }else{
+          $ldap->add($attr);
+        }
 
-               /* remove double asterisks and save new filter */
-               $faifilter['regex'] = preg_replace("/\*\*/","*",$faifilter['regex']);
-               $_SESSION['faifilter']= $faifilter;
+        /* Duplicate fai objects 
+         */
+        //      $ldap->cd ("ou=".$name.",".$baseToUse);
+        //      $ldap->recursive_remove();
+        //      $ldap->cd ($this->config->current['BASE']);
+        //      $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,$NewReleaseName,$type,true);
+
+        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")."'>
+          </form></div>";
+
+        echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
+
+        /* Print footer to have valid html */
+        echo "</body></html>";
+
+        $this->dispNewFreeze = false; 
+
+        /* Postcreate */ 
+
+        /* Assign possible attributes */
+        $this->lock_type  = $type; 
+        $this->lock_name  = $name; 
+        $this->lock_dn    = $baseToUse;
+        $this->postcreate();
+        exit();
+      }
+    }
+
+    /****************
+      Display dialog to enter new Branch name
+     ****************/
+
+    if(($s_action == "branch_branch")||($this->dispNewBranch)){
+      $this->dispNewBranch=true;
+      $smarty->assign("iframe",false);
+                 $display      .= $smarty->fetch(get_template_path('faiNewBranch.tpl', TRUE, dirname(__FILE__)));
+      return($display);
+    }
+   
+    /****************
+      Display dialog to enter new Freeze name
+     ****************/
+
+    if(($s_action == "freeze_branch")||($this->dispNewFreeze)){
+      $this->dispNewFreeze = true;
+      $smarty->assign("iframe",false);
+                 $display      .= $smarty->fetch(get_template_path('faiNewBranch.tpl', TRUE, dirname(__FILE__)));
+      return($display);
+    }
+
+
+    /****************
+      Create a new object 
+     ****************/
+
+    $types = array( "new_partition"     =>  "FAIpartitionTable",
+                    "new_script"        =>  "FAIscript",
+                    "new_hook"          =>  "FAIhook",
+                    "new_variable"      =>  "FAIvariable",
+                    "new_template"      =>  "FAItemplate",
+                    "new_package"       =>  "FAIpackageList");
+
+    if(isset($types[$s_action])){
+      $acl = $this->ui->get_permissions($this->DivListFai->selectedBase,"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]);
+      }else{
+        print_red(sprintf(_("You are not allowed to create a new '%s' object."),$types[$s_action]));
+      }
+    }
+
+    /* New Profile */
+    if($s_action == "new_profile"){
+      $this->dn = "new" ;
+
+      $acl = $this->ui->get_permissions($this->DivListFai->selectedBase,"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");
+        $this->dialog->set_acl_base($_SESSION['CurrentMainBase']);
+
+        $this->is_dialog = false;
+      }else{
+        print_red(sprintf(_("You are not allowed to create a new '%s' object."),"FAIprofile"));
+      }
+    }
+
+
+    /****************
+      Get from ask class name dialog 
+     ****************/
+
+    if($s_action == "select_class_name_finished"){
+      $this->dialog->save_object();
+      if(count($this->dialog->check())!=0){
+        foreach($this->dialog->check() as $msg){
+          print_red($msg);
+        }              
+      }else{
+        $this->dn = "new" ;
+        $a_setup= $this->get_type(array("objectClass"=>array($this->dialog->objectClass)));
+        $name = $this->dialog->save();
+
+        $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
+        $this->dialog->set_acl_base($_SESSION['CurrentMainBase']);
+        $this->dialog->by_object[$a_setup[1]]->cn = $name;
+        $this->is_dialog = true;
+      }                
+    }  
+
+
+    /****************
+     Cancel dialogs 
+     ****************/
 
-               /* Edit dialog was canceled 
-                * Remove dialog an show management dialog
-                */
                if(isset($_POST['edit_cancel'])){
                        unset($this->dialog);
                        $this->dialog=NULL;
                        $this->is_dialog = false;
                        unset($_SESSION['objectinfo']);
+                       del_lock ($this->dn);
                }
 
+
+    /****************
+      Save sub dialogs 
+     ****************/
+
                /* This check if the given tab could be saved 
                 * If it was possible to save it, remove dialog object. 
                 * If it wasn't possible, show errors and keep dialog.
                 */
-               if(isset($_POST['edit_finish'])){
+               if((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->dialog->config))){
                        $this->dialog->save_object();
-                       if(count($this->dialog->check())!=0){
-                               foreach($this->dialog->check() as $msg){
+      $msgs= $this->dialog->check();
+                       if(count($msgs)!=0){
+                               foreach($msgs as $msg){
                                        print_red($msg);
                                }
                        }else{
                                $this->dialog->save();
-                               unset($this->dialog);
-                               $this->dialog=NULL;
-                               $this->is_dialog=false;
-                               unset($_SESSION['objectinfo']);
+        save_release_changes_now();
+        if (!isset($_POST['edit_apply'])){
+          del_lock ($this->dn);
+          unset($this->dialog);
+          $this->dialog=NULL;
+          $this->is_dialog=false;
+          unset($_SESSION['objectinfo']);
+        }
                        }
                }
 
+
+    /****************
+      Display currently open dialog 
+     ****************/
+
                /* If dialog is set, but $this->is_dialog==false, then 
                 *  only the "abort" button is shown, this are dialogs that must not be saved.  
                 * If is_dialog == true, we are currently editing tab objects.
                 *  Here we need both, save and cancel
                 */ 
 
-               if($this->dialog != NULL){
+               if(($this->dialog != NULL) && (isset($this->dialog->config))){
                        $display .= $this->dialog->execute();
                        /* Don't show buttons if tab dialog requests this */
-                       if (((isset($this->dialog->current))&&($this->dialog->by_object[$this->dialog->current]->is_dialog))){
-                               
-                       }elseif(((isset($this->dialog->current))&&(!$this->dialog->by_object[$this->dialog->current]->is_dialog))){
-                               $display.= "<p style=\"text-align:right\">\n";
-                               $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
-                               $display.= "&nbsp;\n";
-                               $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-                               $display.= "</p>";
-                       }elseif(!isset($this->dialog->current)){
-                               $display.= "<p style=\"text-align:right\">\n";
-                               $display.= "<input type=submit name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
-                               $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-                               $display.= "</p>";
-                       }
-                       return($display);
-               }
-
-               /* Show Management template
-                * The following code will only be reached if no dialog (tabs or dialogs)
-                *  are currently opened.
-                * Assign all reguired vars to template engine
-                */
-
-               /* Prepare departments */
-               $options= "";
-               foreach ($this->config->idepartments as $key => $value){
-                       if ($faifilter['base'] == $key){
-                               $options.= "<option selected value='$key'>$value</option>";
-                       } else {
-                               $options.= "<option value='$key'>$value</option>";
-                       }
-               }
-
-               /* Create listhead, it will be shown on top of the divlist. 
-                * It provides general navigation and object creation
-                */
-               $faihead = 
-                       "<div style='background:#F0F0F9;padding:5px;'>&nbsp;".
-
-                       "<input type='image' src='images/list_up.png' align='middle' 
-                       title='"._("Go up one department")."' name='dep_back' alt='"._("Up"). "'>&nbsp;".
-
-                       "<input type='image' src='images/list_root.png' align='middle' 
-                       title='"._("Go to root department")."' name='dep_root' alt='".      _("Root")."'>&nbsp;".
-
-                       "<input type='image' src='images/list_home.png' align='middle' 
-                       title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'>&nbsp;".
-
-                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
-                       
-                       " <input type='image' src='images/fai_new_profile.png' align='middle' 
-                       title='"._("New profile")."' name='Create_profile' alt='"._("P")."'>&nbsp;".
-                       
-                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
-                               
-                       " <input type='image' src='images/fai_new_partitionTable.png' align='middle' 
-                       title='"._("New partition table")."' name='Create_partition' alt='"._("PT")."'>&nbsp;".
-
-                       " <input type='image' src='images/fai_new_script.png' align='middle' 
-                       title='"._("New scripts")."' name='Create_script' alt='"._("S")."'>&nbsp;".
-
-                       " <input type='image' src='images/fai_new_hook.png' align='middle' 
-                       title='"._("New hooks")."' name='Create_hook' alt='"._("H")."'>&nbsp;".
-
-                       " <input type='image' src='images/fai_new_variable.png' align='middle' 
-                       title='"._("New variables")."' name='Create_variable' alt='"._("V")."'>&nbsp;".
-                       
-                       " <input type='image' src='images/fai_new_template.png' align='middle' 
-                       title='"._("New templates")."' name='Create_template' alt='"._("T")."'>&nbsp;".
-
-                       " <input type='image' src='images/fai_new_packages.png' align='middle' 
-                       title='"._("New package list")."' name='Create_package' alt='"._("PK")."'>&nbsp;".
-
-                       " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-
-                       _("Current base")."&nbsp;<select name='base' onChange='mainform.submit()'>$options</select>".
-                       " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
-                       
-                       "</div>";
-
-               $this->reload();
-
-               /* Create list with objects */
-               $divlist = new divlist("faiManagement"); 
-               $divlist->SetEntriesPerPage(0);
-               $divlist->SetSummary(_("This table displays all systems, in the selected tree."));
-
-               $divlist->SetHeader(array(
-                                       array("string" => "&nbsp;"),
-                                       array("string" => _("Name of FAI class")),
-                                       array("string" => _("Class type")),
-                                       array("string" => _("Actions"), "attach"=>"style='border-right:none;width:40px;'")));
-
-
-               $action  = "<input type='image' src='images/edit.png'   alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
-               $action .= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete class")."'>";
-
-               $editlink ="<a href='?plug=".$_GET['plug']."&edit_entry=%KEY%'>%NAME%</a>";             
-               $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
-
-               foreach($this->departments as $key => $val) {
-                       if(!isset($this->config->departments[trim($key)])){
-                               $this->config->departments[trim($key)]="";
-                       }
-
-                       $non_empty="";
-                       $keys= str_replace("/","\/",$key);
-                       foreach($this->config->departments as $keyd=>$vald ){
-                               if(preg_match("/".$keys."\/.*/",$keyd)){
-                                       $non_empty="full";
-                               }
-                       }
 
+      if(isset($this->dialog->current)){
+
+        $obj = $this->dialog->by_object[$this->dialog->current];
+
+        if((isset($obj->is_dialog) && (!$obj->is_dialog)) || (isset($obj->dialog) && (!$obj->dialog))){
+
+          $display.= "<p style=\"text-align:right\">\n";
+          $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+          $display.= "&nbsp;\n";
+          if ($this->dn != "new"){
+            $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+            $display.= "&nbsp;\n";
+          }
+          $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+          $display.= "</p>";
+        }elseif(!isset($this->dialog->current)){
+          $display.= "<p style=\"text-align:right\">\n";
+          $display.= "<input type=\"submit\" name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
+          $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+          $display.= "</p>";
+        }
+      }else{
+        $display.= "<p style=\"text-align:right\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
+        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+        $display.= "</p>";
 
-                       $title = $this->config->departments[$key];
-                       $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>",                     "attach"=>"style='width:20px;'");
-                       $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "title='".$title."'");
-                       $field2 = array("string" => "");
-                       $field3 = array("string" => "","attach"=>"style='text-align:right;border-right:none;'");
-
-                       $divlist->AddEntry( array($field0,$field1,$field2,$field3));
-
-               }
-
-
-               /* Attach objects */
-               foreach($this->objects as $key => $value){
-                               $info= "";
-                               $img = "";
-                               $type = $value['type'];
-                               $abort=false;
-
-                               switch($type) {
-                                       case "FAIpartitionTable"        : 
-                                               if(!$faifilter['ShowPartitions']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_partitionTable.png' title='"._("Partition table")."' alt='PT'>";
-                                       $info = _("Partition table");
-                                       break;
-                                       case "FAIpackageList"           : 
-                                               if(!$faifilter['ShowPackages']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_packages.png' title='"._("Package list")."' alt='PL'>";
-                                       $info = _("Package list");
-                                       break;
-                                       case "FAIscript"                        : 
-                                               if(!$faifilter['ShowScripts']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
-                                       $info = _("Scripts");
-                                       break;
-                                       case "FAIvariable"                      : 
-                                               if(!$faifilter['ShowVariables']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_variable.png' title='"._("Variables")."' alt='V'>";
-                                       $info = _("Variables");
-                                       break;
-                                       case "FAIhook"                          :
-                                               if(!$faifilter['ShowHooks']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_hook.png' title='"._("Hooks")."' alt='H'>";
-                                       $info = _("Hooks");
-                                       break;
-                                       case "FAIprofile"                       : 
-                                               if(!$faifilter['ShowProfiles']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_profile.png' title='"._("Profile")."' alt='P'>";
-                                       $info = _("Profile");
-                                       break;
-                                       case "FAItemplate"                      : 
-                                               if(!$faifilter['ShowTemplates']){ 
-                                                       $abort = true;
-                                               }
-                                       $img="<img src='images/fai_template.png' title='"._("Templates")."' alt='T'>";
-                                       $info = _("Templates");
-                                       break;
-                                       default                                         : 
-                                       $img="<img src='images/empty.png' alt=''>";$info = "";break;
-
-                               }
-                               
-                               if(!$abort)     {
-                                       if((isset($value['description']))&&(!empty($value['description']))){
-                                               $desc= " [".$value['description']."]";
-                                       }else{
-                                               $desc= "";
-                                       }
-
-                                       $field1 = array("string" => $img , "attach" => "style='height:26px;width=20px;'");
-                                       $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "");
-                                       $field3 = array("string" => $info, "attach" => "");
-                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='text-align:right;border:none'");
-                                       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
-
-                       }
-               }
-
-               foreach($faifilter as $attrs => $value){
-                       if($value){
-                               $smarty->assign($attrs."CHK", " checked ");
-                       }else{
-                               $smarty->assign($attrs."CHK", " ");
-                       }
+      }
+      return($display);
                }
+               
 
-               /* Assign all reguired vars to template engine */
-               $smarty->assign("faihead"               , $faihead);    
-               $smarty->assign("failist"               , $divlist->DrawList());
-               $smarty->assign("regex"                 , $faifilter['regex']); 
-               $smarty->assign("infoimage"             , get_template_path('images/info.png'));
-               $smarty->assign("launchimage"   , get_template_path('images/launch.png'));
-               $smarty->assign("alphabet"              , generate_alphabet());
-               $smarty->assign("apply"                 , apply_filter());
-               $smarty->assign("search_image"  , get_template_path('images/search.png'));
-
-               $display        = $smarty->fetch(get_template_path('headpage.tpl', TRUE, dirname(__FILE__)));
-               return ($display);
+    /****************
+      Dialog display
+     ****************/
+
+    /* Check if there is a snapshot dialog open */
+    $base = $this->DivListFai->selectedBase;
+    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
+      return($str);
+    }
+
+    /* Display dialog with system list */
+    $this->DivListFai->parent = $this;
+    $this->DivListFai->execute();
+    $this->DivListFai->AddDepartments($this->DivListFai->selectedBase,4);
+    $this->reload();
+    $this->DivListFai->setEntries($this->objects);
+    return($this->DivListFai->Draw());
        }
 
 
-       function reload()
-       {
-               /* Create a new list of FAI object 
-                * Object list depends on faifilter['regex']
-                * Generate List of Partitions,Hooks,Scripts,Templates,Profiles ... 
-                */
-               $faifilter= get_global('faifilter');
-               // Added for dirlist function...
-
-               /* Set base for all searches */
-               $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
-               $regex = $faifilter['regex'];   
-
-               /* Array to save objects */
-               $objects = array();
-       
-               $this->objects=array();
-
-               /* NEW LIST MANAGMENT
-                * We also need to search for the departments
-                * So we are able to navigate like in konquerer
-                */
-               $base2 = $faifilter['base'];
-
-               $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
-                               TRUE, $base2, array("ou", "description"), TRUE);
-
-               $this->departments= array();
-               $tmp = array();
-               foreach ($res3 as $value){
-                       $tmp[strtolower($value['dn']).$value['dn']]=$value;
-               }
-               ksort($tmp);
-               foreach($tmp as $value){
-                       if($value["description"][0]!=".."){
-                               $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
-                       }else{
-                               $this->departments[$value['dn']]=$value["description"][0];
+  /* Return departments, that will be included within snapshot detection */
+  function get_used_snapshot_bases()
+  {
+    $tmp = array();
+    $types = array("hooks","scripts","disk","packages","profiles","templates","variables");
+    foreach($types as $type){
+      if($this->DivListFai->selectedBranch == "main"){
+        $tmp[] = "ou=".$type.",ou=fai,ou=configs,ou=systems,".$this->DivListFai->selectedBase;
+      }else{
+        $tmp[] = "ou=".$type.",".$this->DivListFai->selectedBranch;
+      }
+    }
+    return($tmp);
+  }
+
+
+  /* Get available branches for current base */
+  function getBranches($base = false,$prefix = "")
+  {
+    $ret = array("main"=>"/");
+    $ldap = $this->config->get_ldap_link();
+    if(!$base){
+      $base= $_SESSION['CurrentMainBase'];
+    }
+    $tmp = get_all_releases_from_base($base,true);
+    foreach($tmp as $dn => $name){
+      $ret[$dn]=$name;
+    }
+    return ($ret);
+  }
+
+  
+
+  /* reload list of objects */
+  function reload()
+  {
+    /* Variable initialisation */
+    $str            = "";
+    $Regex          = $this->DivListFai->Regex;
+    $this->objects  = array();
+
+    /* Get base */
+    $base = "ou=fai,ou=configs,ou=systems,".$this->DivListFai->selectedBase;
+    if($this->DivListFai->selectedBranch != "main"){
+      $br = $this->getBranches();
+      if(isset($br[$this->DivListFai->selectedBranch])){
+        $base = $this->DivListFai->selectedBranch;
+      }else{
+        $base = "ou=fai,ou=configs,ou=systems,".$this->DivListFai->selectedBase;
+      }
+    }
+
+    $this->lock_type = get_release_tag(get_release_dn($base));
+
+    /* Create a new list of FAI object 
+     * Generate List of Partitions,Hooks,Scripts,Templates,Profiles ... 
+     */
+    $ObjectTypes = array(
+        "FAIpartitionTable"  => array("OU"=>"ou=disk,"        , "CHKBOX"=>"ShowPartitions"  ,"ACL" => "faiPartitionTable"),
+        "FAIpackageList"     => array("OU"=>"ou=packages,"    , "CHKBOX"=>"ShowPackages"    ,"ACL" => "faiPackage"),
+        "FAIscript"          => array("OU"=>"ou=scripts,"     , "CHKBOX"=>"ShowScripts"     ,"ACL" => "faiScript"),
+        "FAIvariable"        => array("OU"=>"ou=variables,"   , "CHKBOX"=>"ShowVariables"   ,"ACL" => "faiVariable"),
+        "FAIhook"            => array("OU"=>"ou=hooks,"       , "CHKBOX"=>"ShowHooks"       ,"ACL" => "faiHook"),
+        "FAIprofile"         => array("OU"=>"ou=profiles,"    , "CHKBOX"=>"ShowProfiles"    ,"ACL" => "faiProfile"),
+        "FAItemplate"        => array("OU"=>"ou=templates,"   , "CHKBOX"=>"ShowTemplates"   ,"ACL" => "faiTemplate"));
+
+    $filter = "";
+    foreach($ObjectTypes as $key => $data){
+      if($this->DivListFai->$data['CHKBOX']){
+        $filter.= "(objectClass=".$key.")";
+      }
+    }
+    $filter = "(&(|".$filter.")(cn=$Regex))";
+    
+    /* Get resolved release dependencies */
+    $tmp = get_all_objects_for_given_base($base,$filter);
+
+    /* Ge listed ldap objects */
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+    foreach($tmp as $entry){
+
+      /* Get some more informations about the object */ 
+      $ldap->cat($entry['dn'], array("cn","description","objectClass","FAIclass","FAIstate","objectClass"));
+      $object  = $ldap->fetch();
+
+      /* Walk through possible types */
+      foreach($ObjectTypes as $type => $rest){  
+
+        $acl = $this->ui->get_permissions($object['dn'],"fai/".$rest ['ACL']);
+
+        if(in_array($type,$object['objectClass']) && preg_match("/r/",$acl)){
+
+          /* Prepare object */
+          unset($object['objectClass']['count']);
+          if(!isset($object['description'][0])){
+            $object['description'][0]="";
+          }
+
+          /* Clean up object informations */
+          $obj                  = array();
+          $obj['cn']                         = $object['cn'][0];
+          $obj['dn']                         = $object['dn'];
+          $obj['acl']                      = $acl;
+          $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]; 
+          }
+
+          $this->objects[strtolower($obj['cn']).$obj['cn'].$type] = $obj;
+          $this->objects[strtolower($obj['cn']).$obj['cn'].$type]['type']=$type;
+        }
                        }
                }
 
-               /* END NEW LIST MANAGMENT
-                */
-
-       
-               $res= get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)", 
-                               FALSE, $base, array("cn","description","objectClass"),TRUE);
-
-               foreach($res as $objecttypes){
-                       $res2 = get_list($this->ui->subtreeACL, "(&(objectClass=*)(cn=".$regex."))",
-                                       FALSE, $objecttypes['dn'], array("cn","description","objectClass","FAIclass"),TRUE);
-                       foreach($res2 as $object){
-                               $type= "";      
-                               unset($object['objectClass']['count']);
-                               if(!isset($object['description'][0])){
-                                       $object['description'][0]="";
-                               }
-                               
-                               /* Clean up object informations */
-                               $obj['cn']                      = $object['cn'][0];
-                               $obj['dn']                      = $object['dn'];
-                               $obj['description'] = $object['description'][0];
-                               $obj['objectClass'] = $object['objectClass'];
-
-                               if(in_array("FAIpartitionTable",$obj['objectClass'])){
-                                       $type = "FAIpartitionTable";
-                               }elseif(in_array("FAIpackageList",$obj['objectClass'])){
-                                       $type = "FAIpackageList";
-                               }elseif(in_array("FAIscript",$obj['objectClass'])){
-                                       $type = "FAIscript";
-                               }elseif(in_array("FAIvariable",$obj['objectClass'])){
-                                       $type = "FAIvariable";
-                               }elseif(in_array("FAIhook",$obj['objectClass'])){
-                                       $type = "FAIhook";
-                               }elseif(in_array("FAIprofile",$obj['objectClass'])){
-                                       $obj['FAIclass']        = $object['FAIclass'][0];
-                                       $type = "FAIprofile";
-                               }elseif(in_array("FAItemplate",$obj['objectClass'])){
-                                       $type = "FAItemplate";
-                               }
-                               $this->objects[strtolower($obj['cn']).$obj['cn'].$type] = $obj;
-                               $this->objects[strtolower($obj['cn']).$obj['cn'].$type]['type']=$type;
-                       }
-               }
                ksort($this->objects);
                reset ($this->objects);
        
@@ -697,7 +797,6 @@ class faiManagement extends plugin
                }
                $this->objects = array();
                $this->objects = $tmp0;
-
        }
 
        function remove_lock()
@@ -732,6 +831,39 @@ class faiManagement extends plugin
                }
        }
 
+  function CheckNewBranchName($name,$base)
+  {
+    $f = $this->DivListFai->selectedBranch;
+    if($name == ""){
+      return(false);
+    }elseif(in_array($name,$this->getBranches($f))) {
+      return(false);
+    }elseif(is_department_name_reserved($name,$base)){
+      return(false);
+    }
+    return(true);
+  }
+
+  function save_object()
+  {
+    $this->DivListFai->save_object();
+  }
+
+
+  /* Return plugin informations for acl handling */ 
+  function plInfo()
+  {
+    return (array( 
+          "plShortName"   => _("FAI releases"),
+          "plDescription" => _("FAI release management"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("administration"),           
+          "plCategory"    => array("fai"=> array("description" => _("FAI"),
+                                                 "objectClass" => "FAIclass")),
+          "plProvidedAcls"=> array()));
+  }
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>