Fixed logging for connectivity accounts

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

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index d8fc86d85a3a6546a5c23d5aca8da20bd6297f7b..202970f7906a51743b0e1c8ccfe55913f57ad067 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -25,6 +25,8 @@ class intranetAccount extends plugin
 
   var $uid ="";
 
+  var $view_logged = FALSE;
+
   /*! \brief Konstructor  
 
     \param $config     The Config Object used to initialise plugin
@@ -41,11 +43,6 @@ class intranetAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
   /*!
@@ -63,6 +60,12 @@ class intranetAccount extends plugin
     /* Call parent execute */
     // plugin::execute();
 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     $display= "";
 
     $smarty= get_smarty();

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 469bddd17999afde77d4d00e6ec0788c160d0075..9fbb6fb83dc1b70af54e56e734b77e7805813dfc 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -20,7 +20,7 @@ class kolabAccount extends plugin
   var $imapping= array();
   var $mail_Account   = false;
   var $ReadOnly = false;
-
+  var $view_logged = FALSE;
   var $uid = "";
 
   function kolabAccount ($config, $dn= NULL,$parent = NULL)
@@ -68,19 +68,20 @@ class kolabAccount extends plugin
        $this->is_account  = false;
       $this->mail_Account = false;
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
 
   function execute()
   {
-       /* Call parent execute */
+         /* Call parent execute */
        plugin::execute();
 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     /* Show tab dialog headers */
     $display= "";
 

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 7445985a2e1c1575862b75685b4d925ec4fc7cef..847b34311ae51df431954640306527eae2aac552 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -30,6 +30,7 @@ class oxchangeAccount extends plugin
   var $OXTimeZone="GMT";
   var $mailEnabled="OK";
   var $dnModeValue = "";
+  var $view_logged = FALSE;
 
   /* attribute list for save action */
   var $attributes= array("OXAppointmentDays", "OXTaskDays", "OXTimeZone","mailEnabled");
@@ -598,21 +599,20 @@ class oxchangeAccount extends plugin
     if(isset($this->attrs[$this->dnmode][0])){
       $this->dnModeValue = $this->attrs[$this->dnmode][0];
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
-
   }
 
   function execute()
   {
-       /* Call parent execute */
-       //plugin::execute();
-  
+    /* Call parent execute */
+    //plugin::execute();
+
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
 
-       $display="";
+    $display="";
 
     /* Show main page */
     $smarty= get_smarty();

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 4a1745f43b6b0bdbec3451bdd050221f76768971..40ecbbe40ae7434e5d40be6d153c79c532de4fa7 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -16,6 +16,7 @@ class phpgwAccount extends plugin
   var $ReadOnly = false;
 
   var $uid  = "";
+  var $view_logged = FALSE;
 
   function phpgwAccount ($config, $dn= NULL)
   {
@@ -25,18 +26,19 @@ class phpgwAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
-
-
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
   function execute()
   {
        /* Call parent execute */
 //     plugin::execute();
-  
+ 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+ 
     /* Show tab dialog headers */
     $display= "";
 

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 56cd7fc7853994afff3709bc5b5013e7390b4d09..597f254a58d4ac77c7e757b55604c45141cde0be 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -31,18 +31,21 @@ class phpscheduleitAccount extends plugin
   var $attributes= array();
   var $objectclasses= array("phpscheduleitAccount");
   var $ReadOnly =false;
+  var $view_logged = FALSE;
 
   function phpscheduleitAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
-
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
   function execute()
   {
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     /* Show tab dialog headers */
     $display= "";
 

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 3a0e15f60049d9f6c2867665778cda6227f54016..d9f1945deb12b8f9a26eb9515819c5ba9baee2a1 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -31,7 +31,7 @@ class pptpAccount extends plugin
   var $objectclasses= array("pptpServerAccount");
 
   var $ReadOnly = false;
-
+  var $view_logged = FALSE;
   var $uid ="";
 
   function pptpAccount ($config, $dn= NULL)
@@ -42,12 +42,6 @@ class pptpAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
-
   }
 
   function execute()
@@ -55,6 +49,12 @@ class pptpAccount extends plugin
     /* Call parent execute */
     // plugin::execute();
 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     /* Show tab dialog headers */
     $display= "";
 

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index 67d6a8b026b40b8c6a47225c0fb675af20bf0ba9..c11a16c6de4aaa0f53f3264ae745f67de336cd6a 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -21,6 +21,7 @@ class proxyAccount extends plugin
   var $ReadOnly = false;
 
   var $uid = "";
+  var $view_logged = FALSE;
 
   function proxyAccount ($config, $dn= NULL)
   {
@@ -30,11 +31,6 @@ class proxyAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
   function execute()
@@ -42,6 +38,12 @@ class proxyAccount extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     $display= "";
 
     /* Prepare templating */

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index b9abfbf64627ebb253ffcf7975593a4ad09c3476..4b62d10d75f2aa5fa2bda27674717141516cc986 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -24,6 +24,7 @@ class pureftpdAccount extends plugin
       "FTPUploadBandwidth","FTPDownloadBandwidth","FTPStatus","FTPuid","FTPgid");
   var $objectclasses= array("PureFTPdUser");
   var $ReadOnly;
+  var $view_logged = FALSE;
 
   function pureftpdAccount ($config, $dn= NULL, $parent= NULL)
   {
@@ -33,15 +34,16 @@ class pureftpdAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
+  }
 
+  function execute()
+  {
     /* Log view */
-    if($this->is_account){
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
       @log::log("view","users/".get_class($this),$this->dn);
     }
-  }
 
-  function execute()
-  {
     /* Show tab dialog headers */
     $display= "";
 

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index de2202873054b51f862e7a0da7a39eb9e7d34de3..c14eee425a90595d80ecbfd3ebc36578253c8e6a 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -10,7 +10,7 @@ class webdavAccount extends plugin
   var $attributes= array();
   var $objectclasses= array("gosaWebdavAccount");
   var $ReadOnly = false;
-
+  var $view_logged = FALSE;
   var $uid ="";
 
   function webdavAccount ($config, $dn= NULL)
@@ -21,11 +21,6 @@ class webdavAccount extends plugin
     if(isset($this->attrs['uid'][0])){
       $this->uid = $this->attrs['uid'][0];
     }
-
-    /* Log view */
-    if($this->is_account){
-      @log::log("view","users/".get_class($this),$this->dn);
-    }
   }
 
   function execute()
@@ -33,6 +28,12 @@ class webdavAccount extends plugin
        /* Call parent execute */
 //     plugin::execute();
 
+    /* Log view */
+    if($this->is_account && !$this->view_logged){
+      $this->view_logged = TRUE;
+      @log::log("view","users/".get_class($this),$this->dn);
+    }
+
     /* Show tab dialog headers */
     $display= "";