Added sorting to FAIscripts

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

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 37b7f128a08f2c919daea22c5ef331ded99703f5..e607b601697f0740f8b156f25cd1f3b5e2aee34d 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -55,6 +55,7 @@ class faiPackage extends plugin
   var $newDialogShown   =false;
 
   var $FAIstate         = "";
+  var $view_logged      = FALSE;
 
   var $FAIinstallMethods  = array( "install", "ninstall", "remove", 
       "dselect-upgrade", "taskinst", "taskrm",
@@ -134,7 +135,6 @@ class faiPackage extends plugin
           $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
         }
       }
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
 
     if (isset($this->attrs['FAIdebianSection']['count'])){
@@ -169,9 +169,13 @@ class faiPackage extends plugin
   function execute()
   {
     /* Call parent execute */
-
     plugin::execute();
 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      new log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";
@@ -254,7 +258,7 @@ class faiPackage extends plugin
     }
 
     /* Configuration dialog open*/
-    if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'])) && $this->acl_is_writeable("FAIdebconfInfo")){
+    if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'][0])) && $this->acl_is_writeable("FAIdebconfInfo")){
       $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
@@ -339,7 +343,7 @@ class faiPackage extends plugin
 
     prepare_to_save_FAI_object($use_dn,array(),true);
 
-    @log::log("remove","fai/".get_class($this),$use_dn,$this->attributes);
+    new log("remove","fai/".get_class($this),$use_dn,$this->attributes);
 
     foreach($this->ConfiguredPackages as $pkgname => $attrs){
       foreach($attrs as $name => $attr){
@@ -479,9 +483,9 @@ class faiPackage extends plugin
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/package list with dn '%s' failed."),$this->dn));
     
     if($this->initially_was_account){
-      @log::log("modify","fai/".get_class($this),$this->dn,$this->attributes);
+      new log("modify","fai/".get_class($this),$this->dn,$this->attributes);
     }else{
-      @log::log("create","fai/".get_class($this),$this->dn,$this->attributes);
+      new log("create","fai/".get_class($this),$this->dn,$this->attributes);
     }
 
     /* Do object tagging */