Updated

[gosa.git] / plugins / admin / fai / class_faiManagement.inc

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 099905f380034c6620da3a3b0b0e79c3b5ed80d7..d540e03c27b30e0fb2ecc4f49ba777c589bf8470 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -41,9 +41,12 @@ class faiManagement extends plugin
        /* 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, 
+       var $attributes                 = array("lock_type","lock_name","lock_dn");     //      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 $dialog                             = array();      //      This object contains every dialog we have currently opened
@@ -260,7 +263,6 @@ class faiManagement extends plugin
                                $this->dialog= NULL;
 
                                /* Terminal list has changed, reload it. */
-                               $this->reload ();
                        } else {
 
                                /* Normally this shouldn't be reached, send some extra
@@ -329,12 +331,21 @@ class faiManagement extends plugin
           $baseToUse = $_SESSION['faifilter']['branch'];
         }
 
+        $ldap->cd($this->config->current['BASE']);
+        $ldap->create_missing_trees($baseToUse);
         $ldap->cd ("ou=".$name.",".$baseToUse);
         $ldap->recursive_remove();
         
         $ldap->cd ($this->config->current['BASE']);
         $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,"branch",true);
-        
+
+        /* Postcreate */ 
+
+        /* Assign possible attributes */
+        $this->lock_type  = "branch"; 
+        $this->lock_name  = $name; 
+        $this->lock_dn    = "ou=".$name.",".$baseToUse; 
+        $this->postcreate();
         $this->dispNewBranch = false; 
       }
     }
@@ -378,9 +389,20 @@ class faiManagement extends plugin
       $br = $this->getBranches();
 
       if(isset($br[$bb])){
+
+        $name = $br[$bb];
+
         $ldap->cd($bb);
         $ldap->recursive_remove();
         $faifilter['branch'] = "main";
+
+        /* Post remove */
+                
+//        $this->lock_type is set from this->reload
+        $this->lock_name   = $name;
+        $this->lock_dn     = $bb;
+
+        $this->postremove();
       }
     }
 
@@ -422,6 +444,14 @@ class faiManagement extends plugin
         $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,"freeze",true);
         
         $this->dispNewFreeze = false; 
+        
+        /* Postcreate */ 
+
+        /* Assign possible attributes */
+        $this->lock_type  = "branch"; 
+        $this->lock_name  = $name; 
+        $this->lock_dn    = "ou=".$name.",".$baseToUse; 
+        $this->postcreate();
       }
     }
     
@@ -502,9 +532,10 @@ class faiManagement extends plugin
                if((isset($_POST['base']))&&($s_action=="")){
                        $faifilter['base']=$_POST['base'];
                }
-  
 
-    $br = $this->getBranches();
+    $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+
+    $br = $this->getBranches($base);
     if(!isset($br[$faifilter['branch']])){
       $faifilter['branch'] = "main";
     }
@@ -630,7 +661,7 @@ class faiManagement extends plugin
 
                        " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
 
-                       _("Current base")."&nbsp;<select name='base' onChange='mainform.submit()' class='center'>$options</select>".
+                       _("Base")."&nbsp;<select name='base' onChange='mainform.submit()' class='center'>$options</select>".
                        " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
                        
                        "</div>";
@@ -775,14 +806,16 @@ class faiManagement extends plugin
 
                /* Assign all reguired vars to template engine */
 
-    $smarty->assign("branchKeys",array_flip($this->getBranches()));
-    $smarty->assign("branches",$this->getBranches());
+    $branches = $this->getBranches();
+    asort($branches);
+    $smarty->assign("branchKeys",array_flip($branches));
+    $smarty->assign("branches",$branches);
     
                $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("branchimage"           , get_template_path('images/action.png'));
+               $smarty->assign("branchimage"           , get_template_path('images/branch.png'));
                $smarty->assign("launchimage"   , get_template_path('images/launch.png'));
                $smarty->assign("alphabet"              , generate_alphabet());
                $smarty->assign("apply"                 , apply_filter());
@@ -795,7 +828,7 @@ class faiManagement extends plugin
 
   function getBranches($base = false,$prefix = "")
   {
-    $ret = array("main"=>_("main"));
+    $ret = array("main"=>"/");
     $ldap = $this->config->get_ldap_link();
   
     $ldap->cd($this->config->current['BASE']);
@@ -813,7 +846,7 @@ class faiManagement extends plugin
       
       if((isset($attrs['ou']))&&($attrs['dn']!=$base)){
         $ret[$attrs['dn']]= $prefix.$attrs['ou'][0];
-        $ret = array_merge($ret,$this->getBranches($attrs['dn'],$prefix.$attrs['ou'][0]."/"));
+        $ret = array_merge($ret,$this->getBranches($attrs['dn'],"".$prefix.$attrs['ou'][0]."/"));
       }
     }
     return($ret);
@@ -872,6 +905,8 @@ class faiManagement extends plugin
                $res= get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)", 
                                FALSE, $base, array("cn","description","objectClass"),TRUE);
 
+    $str = "";
+
                foreach($res as $objecttypes){
                        $res2 = get_list($this->ui->subtreeACL, "(&(objectClass=*)(cn=".$regex."))",
                                        FALSE, $objecttypes['dn'], array("cn","description","objectClass","FAIclass","FAIstate"),TRUE);
@@ -890,6 +925,11 @@ class faiManagement extends plugin
 
         if(isset($object['FAIstate'])){
           $obj['FAIstate'] = $object['FAIstate'][0];
+
+          /* Append type to this string, to be able to check if the selected 
+           * entry is of type 'freeze' or 'branch'
+           */
+          $str.="|".$obj['FAIstate'];
         }else{
           $obj['FAIstate'] ="";
         }
@@ -915,6 +955,18 @@ class faiManagement extends plugin
  
                        }
                }
+
+    /* Tell class what we have currently opened 
+        'main' has type '' 
+     */
+    if(preg_match("/freeze/",$str)){
+      $this->lock_type = "freeze";
+    }elseif(preg_match("/branch/",$str)){
+      $this->lock_type = "branch";
+    }else{
+      $this->lock_type = "";
+    }
+
                ksort($this->objects);
                reset ($this->objects);