From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 11 Jul 2007 10:15:30 +0000 (+0000)
Subject: * Updated Changelog
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=40be45c37e28c01abe03218f2c89bff1b1d76a6e;p=gosa.git

* Updated Changelog
* Fixed multiple saving of "My account" information


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

diff --git a/Changelog b/Changelog
index 8991224ac..42ea8de2e 100644
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,8 @@ GOsa2 changelog
   - Added feedback link to easily report PHP errors
   - Added more content sorting where needed
   - Made gidNumber be the current in posix check hook
+  - Removed inconsistency in gosa/gosa+samba3 schema
+  - Fixed multiple saving of "My account" data
 
 * gosa 2.5.11a
   - Added chinese translation
diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index f3cf40c8c..ec3ae0721 100644
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -71,8 +71,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Write back to session */
-      $_SESSION['connectivity']= $connectivity;
+      /* Remove from session */
+      sess_del ('connectivity');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc
index b65c5fb9a..da1dca9ab 100644
--- a/plugins/personal/environment/main.inc
+++ b/plugins/personal/environment/main.inc
@@ -79,8 +79,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Store object */
-      $_SESSION['environment']= $environment;
+      /* Remove object */
+      sess_del ('environment');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 64b4ca060..81b902290 100644
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -109,6 +109,7 @@ if (!$remove_lock){
 
     $user->acl= "#none#";
     del_lock ($ui->dn);
+    sess_del ('user');
   }
 
   /* save changes to LDAP and disable edit mode */
@@ -126,13 +127,15 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Save object */
-      $_SESSION['user']= $user;
-
       /* Need to reset the password? */
       if($user->password_change_needed()){
+        /* Save object */
+        $_SESSION['user']= $user;
+
         $display.= $smarty->fetch(get_template_path('password.tpl', TRUE));
         return ($display);
+      } else {
+	sess_del ('user');
       }
 
     } else {
diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index 79075eee2..682dc685a 100644
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -79,8 +79,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Store object */
-      $_SESSION['mailAccount']= $mailAccount;
+      /* Remove object */
+      sess_del ('mailAccount');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/nagios/main.inc b/plugins/personal/nagios/main.inc
index c893a5904..9b2614f15 100644
--- a/plugins/personal/nagios/main.inc
+++ b/plugins/personal/nagios/main.inc
@@ -79,8 +79,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Store object */
-      $_SESSION['nagiosAccount']= $nagiosAccount;
+      /* Remove object */
+      sess_del ('nagiosAccount');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/netatalk/main.inc b/plugins/personal/netatalk/main.inc
index 165ace0df..98b887457 100644
--- a/plugins/personal/netatalk/main.inc
+++ b/plugins/personal/netatalk/main.inc
@@ -78,8 +78,8 @@ if (!$remove_lock) {
       del_lock($ui->dn);
       sess_del('edit');
 
-      /* Store object */
-      $_SESSION['netatalk'] = $netatalk;
+      /* Remove object */
+      sess_del('netatalk');
     } else {
       /* Errors found, show message */
       show_errors($message);
diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index af7230205..ef470136b 100644
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -85,8 +85,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Write back to session */
-      $_SESSION['posixAccount']= $posixAccount;
+      /* Remove from session */
+      sess_del ('posixAccount');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc
index c17d7d5c6..6800b2a04 100644
--- a/plugins/personal/samba/main.inc
+++ b/plugins/personal/samba/main.inc
@@ -80,8 +80,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Reload */
-      $_SESSION['sambaAccount']= $sambaAccount;
+      /* Remove from session */
+      sess_del ('sambaAccount');
     } else {
       /* Errors found, show message */
       show_errors ($message);
diff --git a/plugins/personal/scalix/main.inc b/plugins/personal/scalix/main.inc
index c5588e9e0..1397dc59d 100644
--- a/plugins/personal/scalix/main.inc
+++ b/plugins/personal/scalix/main.inc
@@ -79,8 +79,8 @@ if (!$remove_lock){
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Store object */
-      $_SESSION['scalixAccount']= $scalixAccount;
+      /* Remove object */
+      sess_del ('scalixAccount');
     } else {
       /* Errors found, show message */
       show_errors ($message);