Added uid to post_events.

Added uid to class member variables

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

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index d891007ed67d922127d98e74fdc0c308a6cfc42b..325894392a159e9fa238a4c4f3e0db8f9cc9548e 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -27,6 +27,8 @@ class intranetAccount extends plugin
   /* ObjectClasses list for save action */
   var $objectclasses= array("gosaIntranetAccount");
 
+  var $uid ="";
+
   /*! \brief Konstructor  
                
        \param $config  The Config Object used to initialise plugin
@@ -38,6 +40,11 @@ class intranetAccount extends plugin
   function intranetAccount ($config, $dn= NULL)
   {
        plugin::plugin ($config, $dn);
+       
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
   }
 
   /*!
@@ -102,7 +109,7 @@ class intranetAccount extends plugin
                  show_ldap_error($ldap->get_error(), _("Removing intranet account failed"));
 
                  /* Optionally execute a command after we're done */
-                 $this->postremove();
+                 $this->postremove(array("uid"=>$this->uid));
          }
   }
 
@@ -157,7 +164,7 @@ class intranetAccount extends plugin
                  show_ldap_error($ldap->get_error(), _("Saving intranet account failed"));
 
                  /* Optionally execute a command after we're done */
-                 $this->postcreate();
+                 $this->postcreate(array("uid"=> $this->uid));
          }
   }
 

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 0c3a3a00ff1ddd2830a15c8adfc5eea9a94660d2..34a8fd56c1affcf043b3d51f9129faaff82ac3a0 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -24,11 +24,17 @@ class kolabAccount extends plugin
   /* Helper */
   var $imapping= array();
 
+  var $uid ="";
 
   function kolabAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
-
+ 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+ 
     /* Pull arrays */
     foreach(array("kolabDelegate", "kolabInvitationPolicy") as $attr){
       if (isset($this->attrs["$attr"]["count"])){
@@ -263,7 +269,7 @@ class kolabAccount extends plugin
     $ldap->cd ($this->dn);
     $ldap->modify($this->attrs);
 
-    $this->handle_post_events('remove');
+    $this->handle_post_events('remove',array("uid" => $this->uid));
     show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/kolab account with dn '%s' failed."),$this->dn));
   }
 
@@ -386,10 +392,10 @@ class kolabAccount extends plugin
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
       if ($this->is_modified){
-        $this->handle_post_events("modify");
+        $this->handle_post_events("modify",array("uid" => $this->uid));
       }
     } else {
-      $this->handle_post_events("add");
+      $this->handle_post_events("add",array("uid" => $this->uid));
     }
   }
 

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index 02b075d56e93147b24c9f892f09c76ade1f972dd..a4b817d190e502609647562665853dff6abc32ac 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -36,11 +36,17 @@ class opengwAccount extends plugin
        var $is_account           = false;
        var $initialy_was_account = false;
   var $OGWPassword          = "";
+  var $uid ="";
 
        function opengwAccount ($config, $dn= NULL)
        {
                plugin::plugin ($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
                $this->info=array();
 
                /* is no account and was no account */

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 6104d2574cda31fa7190842f65b4d056536d2da7..482a28c5df8b709189ef0f493ebe47b5d272935a 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -39,6 +39,8 @@ class oxchangeAccount extends plugin
   var $attributes= array("OXAppointmentDays", "OXTaskDays", "OXTimeZone","mailEnabled");
   var $objectclasses= array("OXUserObject");
 
+  var $uid = "";
+
   var $oxconf = array();
   var $timezones=array(
       "Africa/Abidjan",
@@ -592,6 +594,11 @@ class oxchangeAccount extends plugin
       }
     }
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     $this->dnmode= $this->config->current['DNMODE'];
   }
 

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 0b1ed268b366a665e287dd4f5c96d8c8be38c3b5..d9d52b38890db75010fb710c40c9c22618715b00 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -19,9 +19,17 @@ class phpgwAccount extends plugin
   var $attributes= array("phpgwAccountExpires", "phpgwAccountStatus", "phpgwAccountType");
   var $objectclasses= array("phpgwAccount");
 
+  var $uid  = "";
+
   function phpgwAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
+
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
@@ -72,7 +80,7 @@ class phpgwAccount extends plugin
       show_ldap_error($ldap->get_error(), _("Removing PHPgw account failed"));
 
       /* Optionally execute a command after we're done */
-      $this->handle_post_events('remove');
+      $this->handle_post_events('remove',array("uid" => $this->uid));
     }
   }
 
@@ -117,10 +125,10 @@ class phpgwAccount extends plugin
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){
         if ($this->is_modified){
-          $this->handle_post_events("modify");
+          $this->handle_post_events("modify",array("uid" => $this->uid));
         }
       } else {
-        $this->handle_post_events("add");
+        $this->handle_post_events("add",array("uid" => $this->uid));
       }
     }
   }

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 845b8df2c427ce1c35d01faec7a9a5d678f226cd..8a3868a8557de64f2f9bd38fd62dc5676668c993 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -83,7 +83,7 @@ class phpscheduleitAccount extends plugin
     show_ldap_error($ldap->get_error(), _("Removing PHPscheduleit account failed"));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+    $this->handle_post_events('remove',array("uid" => $this->uid));
   }
 
 
@@ -126,10 +126,10 @@ class phpscheduleitAccount extends plugin
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
       if ($this->is_modified){
-        $this->handle_post_events("modify");
+        $this->handle_post_events("modify",array("uid" => $this->uid));
       }
     } else {
-      $this->handle_post_events("add");
+      $this->handle_post_events("add",array("uid" => $this->uid));
     }
 
   }

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 02418d9ff05f259419e8388a62fb64cf5f8dd25f..85b1e6f6c2fd2050d13f0d89f9575ff5fee7cef0 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -35,9 +35,17 @@ class pptpAccount extends plugin
   var $attributes= array();
   var $objectclasses= array("pptpServerAccount");
 
+  var $uid ="";
+
   function pptpAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
+    
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
@@ -84,7 +92,7 @@ class pptpAccount extends plugin
       show_ldap_error($ldap->get_error(), _("Removing PPTP account failed"));
 
       /* Optionally execute a command after we're done */
-      $this->handle_post_events('remove');
+      $this->handle_post_events('remove',array("uid" => $this->uid));
     }
   }
 
@@ -129,10 +137,10 @@ class pptpAccount extends plugin
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){
         if ($this->is_modified){
-          $this->handle_post_events("modify");
+          $this->handle_post_events("modify",array("uid" => $this->uid));
         }
       } else {
-        $this->handle_post_events("add");
+        $this->handle_post_events("add",array("uid" => $this->uid));
       }
     }
   }

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index 267e36b0263f505c3464b25f5cc44293132b7050..1f6fefff75a1b99647743920709528b6c2f204bd 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -23,9 +23,17 @@ class proxyAccount extends plugin
       "gosaProxyWorkingStop", "gosaProxyQuota", "gosaProxyQuotaPeriod");
   var $objectclasses= array("gosaProxyAccount");
 
+  var $uid = "";
+
   function proxyAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
+    
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
@@ -156,7 +164,7 @@ class proxyAccount extends plugin
     show_ldap_error($ldap->get_error(), _("Removing proxy account failed"));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
   /* Check values */
@@ -264,10 +272,10 @@ class proxyAccount extends plugin
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
       if ($this->is_modified){
-        $this->handle_post_events("modify");
+        $this->handle_post_events("modify",array("uid" => $this->uid));
       }
     } else {
-      $this->handle_post_events("add");
+      $this->handle_post_events("add",array("uid" => $this->uid));
     }
 
   }

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 6103460aabddb064be8468b757597659f07d4ebd..549bbf56cbc8fc06c68c6faf2e291c45ec6756e9 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -22,6 +22,8 @@ class pureftpdAccount extends plugin
   var $FTPuid = "";
   var $FTPgid = "";
 
+  var $uid = "";
+
   /* attribute list for save action */
   var $attributes= array("FTPQuotaFiles","FTPQuotaMBytes","FTPUploadRatio","FTPDownloadRatio",
       "FTPUploadBandwidth","FTPDownloadBandwidth","FTPStatus","FTPuid","FTPgid");
@@ -30,6 +32,12 @@ class pureftpdAccount extends plugin
   function pureftpdAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
+    
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
@@ -96,7 +104,7 @@ class pureftpdAccount extends plugin
     show_ldap_error($ldap->get_error(), _("Removing pureftpd account failed"));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+    $this->handle_post_events('remove',array("uid" => $this->uid));
   }
 
 
@@ -177,10 +185,10 @@ class pureftpdAccount extends plugin
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
       if ($this->is_modified){
-        $this->handle_post_events("modify");
+        $this->handle_post_events("modify",array("uid" => $this->uid));
       }
     } else {
-      $this->handle_post_events("add");
+      $this->handle_post_events("add",array("uid" => $this->uid));
     }
 
   }

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index 78aaab6fdc9f0d4dc85208cc6c964cd40c972c51..c87b4d9de641c9a1c6c8363574e8c8c237759688 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -15,9 +15,17 @@ class webdavAccount extends plugin
   var $attributes= array();
   var $objectclasses= array("gosaWebdavAccount");
 
+  var $uid ="";
+
   function webdavAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
+    
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
@@ -68,7 +76,7 @@ class webdavAccount extends plugin
       show_ldap_error($ldap->get_error(), _("Removing webDAV account failed"));
 
       /* Optionally execute a command after we're done */
-      $this->handle_post_events('remove');
+      $this->handle_post_events('remove',array("uid" => $this->uid));
     }
   }
 
@@ -113,10 +121,10 @@ class webdavAccount extends plugin
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){
         if ($this->is_modified){
-          $this->handle_post_events("modify");
+          $this->handle_post_events("modify",array("uid" => $this->uid));
         }
       } else {
-        $this->handle_post_events("add");
+        $this->handle_post_events("add",array("uid" => $this->uid));
       }
     }
   }