Added iud to post events.

Added uid to class members

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 5e15d269b9d2efc1bc03cc3e5c8bb29806cd6bc6..51cda502ce1b6f21b09cc678bd5fb5f8c919cb11 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -81,6 +81,11 @@ class environment extends plugin
   {
     plugin::plugin ($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     /* Check : Are we currently editing a group or user dialog */
     if((isset($this->attrs['cn'][0]))&&(!isset($this->attrs['uid'][0]))){
       $suffix="Group";
@@ -906,7 +911,7 @@ class environment extends plugin
     show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/environment account with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
 
@@ -1157,7 +1162,7 @@ class environment extends plugin
     $this->cleanup();
     $ldap->$mode($this->attrs);
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/environment account with dn '%s' failed."),$this->dn));
-    $this->handle_post_events($mode);
+    $this->handle_post_events($mode,array("uid"=>$this->uid));
   }
 
   /* Generate ListBox frindly output for the defined shares 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 3b4e2037435928ff7ed55a229fd26de6bc5c2f68..b995a384c7505b7677a1023200fd5e84f7168b0c 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -580,7 +580,7 @@ class user extends plugin
     }
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
 
@@ -960,9 +960,9 @@ class user extends plugin
 
     /* Optionally execute a command after we're done */
     if ($mode == "add"){
-      $this->handle_post_events("add");
+      $this->handle_post_events("add", array("uid" => $this->uid));
     } elseif ($this->is_modified){
-      $this->handle_post_events("modify");
+      $this->handle_post_events("modify", array("uid" => $this->uid));
     }
 
     /* Fix tagging if needed */

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 541a31d4dcae964fe031428dc3225872592ee9f1..1161d9173fe434c5f887902fb681f69ab6584193 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -61,7 +61,7 @@ class mailAccount extends plugin
       "gosaMailDeliveryMode", "gosaSpamSortLevel", "gosaSpamMailbox","gosaMailAlternateAddress",
       "gosaVacationMessage", "gosaMailAlternateAddress", "gosaMailForwardingAddress");
   var $objectclasses= array("gosaMailAccount");
-
+  var $uid;
 
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
@@ -70,6 +70,7 @@ class mailAccount extends plugin
     /* Load bases attributes */
     plugin::plugin($config, $dn);
 
+    /* Set uid */
     if(isset($this->attrs['uid'])){
       $this->uid = $this->attrs['uid'][0];
     }
@@ -609,7 +610,7 @@ class mailAccount extends plugin
     }
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
   
@@ -754,10 +755,10 @@ class mailAccount 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/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index 51a522cb2798c72cd13c369d3ca834dade9a69ef..9c679f6e9a2ed4329cce4b02cf745b1605afbe85 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -59,6 +59,8 @@ class nagiosAccount extends plugin
 
   var $objectclasses= array("nagiosContact","nagiosAuth");
 
+  var $uid = "";
+
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
   function nagiosAccount ($config, $dn= NULL)
@@ -68,6 +70,11 @@ class nagiosAccount extends plugin
 
     plugin::plugin ($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     /* Save initial account state */  
     $this->initially_was_account= $this->is_account;
   }
@@ -159,10 +166,10 @@ class nagiosAccount 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));
     }
   }
 
@@ -241,7 +248,7 @@ class nagiosAccount extends plugin
     unset ($this->attrs['uid']);
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+    $this->handle_post_events('remove',array("uid" => $this->uid));
   }
 
 

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 5d82f6e9939ba06961b944e8ca02383fef58f78e..78451c543c11bf96ec34ba3539c0f46f7458a67c 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -70,7 +70,7 @@ class netatalk extends plugin {
   /* Checkboxes */
   var $is_chk_box = array ();
   
-
+  var $uid = "";
   function get_shares()
   {
     $this->shares_loaded= TRUE;
@@ -118,6 +118,11 @@ class netatalk extends plugin {
     $this->config = $config;
     plugin :: plugin($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     /* Copy needed attributes */
     foreach($this->use_save_attributes as $val) {
       if (isset($this->attrs["$val"][0])) {
@@ -265,10 +270,10 @@ class netatalk 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));
     }
   }
 
@@ -326,7 +331,7 @@ class netatalk extends plugin {
     unset ($this->attrs['uid']);
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+    $this->handle_post_events('remove',array("uid" => $this->uid));
   }
 
   

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 4ed5ee14cda2950486f1988ee387d2bdc6d69ef3..b7b03c299a65a772f7f2c3392e98517d3a2b433e 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -77,6 +77,7 @@ class posixAccount extends plugin
 
   var $objectclasses= array("posixAccount", "shadowAccount");
 
+  var $uid= "";
 
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
@@ -88,6 +89,11 @@ class posixAccount extends plugin
     /* Load bases attributes */
     plugin::plugin($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     $ldap= $this->config->get_ldap_link();
 
     if ($dn != NULL){
@@ -628,7 +634,7 @@ class posixAccount extends plugin
     }
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
 
@@ -896,10 +902,10 @@ class posixAccount 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/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index c9c48a1ee812dac2ab9a85ecc7d6d33ecd0db264..017e4d7588f7ccf4d0ddc6968ac10b1e082ef578 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -86,6 +86,8 @@ class sambaAccount extends plugin
   var $ctxattributes= array();
   var $attributes= array();
   var $objectclasses= array();
+  
+  var $uid= "";
 
   var $CopyPasteVars = array("kickoff_time_set","logoff_time_set","logon_time_set","mungedObject","orig_sambaDomainName");
 
@@ -115,6 +117,11 @@ class sambaAccount extends plugin
 
     plugin::plugin ($config, $dn);
 
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
     /* Get samba Domain in case of samba 3 */
     if ($this->samba3 && $this->sambaSID != ""){
       $this->SID= preg_replace ("/-[^-]+$/", "", $this->sambaSID);
@@ -614,7 +621,7 @@ class sambaAccount extends plugin
     show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/samba account with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove", array("uid" => $this->uid));
   }
 
 
@@ -964,10 +971,10 @@ class sambaAccount 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));
     }
 
   }