Updated fai logging

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6430 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 1fdbd52ff5a253412cbc9f6f8dd6f5c05fb89e6f..e041ac882622d193a28700fd6b3ff44aa2d16679 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -35,7 +35,7 @@ class faiHook extends plugin
   var $is_dialog        = false;    // specifies which buttons will be shown to save or abort
   var $dialog           = NULL;     // a dialog, e.g. new disk dialog
   var $SubObjects       = array();  // All leafobjects of this object
-
+  var $view_logged      = FALSE;
   var $FAIstate         = "";  
   var $ui;
 
@@ -82,8 +82,6 @@ class faiHook extends plugin
       }
     }
     $this->ui = get_userinfo();
-
-    @log::log("view","fai/".get_class($this),$this->dn);
   }
 
 
@@ -150,6 +148,11 @@ class faiHook extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 37b7f128a08f2c919daea22c5ef331ded99703f5..4b00f808841ee0813c361155553acc60cc36d91f 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;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index cb8651c22f4affc24349027df515bf5f589d4274..7825da40d30baf24a70c0fc0d59cec6f4b191e23 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -22,6 +22,8 @@ class faiPartitionTable extends plugin
   var $FAIstate         = "";
   var $ui;
 
+  var $view_logged      = FALSE;
+
   function faiPartitionTable ($config, $dn= NULL)
   {
     /* Load Attributes */
@@ -99,8 +101,6 @@ class faiPartitionTable extends plugin
           $this->disks[$name]['partitions'][$partition['FAIpartitionNr']] = $partition; 
         }  
       }
-  
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
     ksort($this->disks);
   }
@@ -121,8 +121,13 @@ class faiPartitionTable extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
+
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
 
     /* Fill templating stuff */
     $smarty= get_smarty();

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 52d87d9e46b39fad47069c1660e55998b17f9e18..0c8ef80a9ea99b2337b9633d7f5acfb80c861576 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -27,6 +27,7 @@ class faiProfile extends plugin
   var $FAIAllclasses    = array();  // Contains all possible Classnames
   var $ui               ;
   var $FAIstate      = "";
+  var $view_logged      = FALSE;
 
   function faiProfile($config, $dn= NULL)
   {
@@ -100,7 +101,6 @@ class faiProfile extends plugin
 
     if($dn != "new"){
       $this->dn =$dn;
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
     $this->old_cn   = $this->cn;
   }
@@ -205,6 +205,12 @@ class faiProfile extends plugin
   {
     /* Call parent execute */
     plugin::execute();
+
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index edb3a03c8f25c5a2dd521abfc325d9f6559ed1af..58e8aed414304844bb96ebdc4b121daf75771473 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -38,6 +38,7 @@ class faiScript extends plugin
 
   var $FAIstate         ="";
 
+  var $view_logged = FALSE;
   var $ui;
 
   function faiScript ($config, $dn= NULL)
@@ -85,7 +86,6 @@ class faiScript extends plugin
         $this->SubObjects[$objects['cn']] = $objects;
       }
     
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
     $this->ui = get_userinfo();
   }
@@ -141,6 +141,11 @@ class faiScript extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 8de436e3a7a23ad1b1d037305a8b40c6a43ccf8f..e0af9e9fee0c6369bdcd3fed3828f09804e11a91 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -38,6 +38,7 @@ class faiTemplate extends plugin
 
   var $FAIstate         = "";
   var $ui;
+  var $view_logged      = FALSE;
 
   function faiTemplate ($config, $dn= NULL)
   {
@@ -82,8 +83,6 @@ class faiTemplate extends plugin
         $objects                = $this->get_object_attributes($objects,$this->subAttributes);
         $this->SubObjects[$objects['cn']] = $objects;
       }
-  
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
     $this->ui = get_userinfo();
   }
@@ -125,6 +124,11 @@ class faiTemplate extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index fa81784ca939f47f4a092eb89600a363000befab..b31e013177d32be576b2562c5d4d62eaeff39952 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -36,6 +36,7 @@ class faiVariable extends plugin
 
   var $FAIstate         = "";
   var $ui   ;
+  var $view_logged      = FALSE;
 
   function faiVariable ($config, $dn= NULL)
   {
@@ -86,7 +87,6 @@ class faiVariable extends plugin
         $this->SubObjects[$object['cn'][0]]['dn']          = $object['dn'];
       }
 
-      @log::log("view","fai/".get_class($this),$this->dn);
     }
     $this->ui = get_userinfo();
   }
@@ -110,6 +110,11 @@ class faiVariable extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","fai/".get_class($this),$this->dn);
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";