Fixed multiple saving of "My account" data. This closes #96

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

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index 5911fc53a37f06d655c435d481efc021671cb8b6..a418ef40f27bd9f56ad0908859860c85a1672f69 100644 (file)
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -77,8 +77,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 fcca1cb6751fc1d3043d6e0c74e956e521a4c287..ecd19f8d2580a7fd7dfcb3bc9b36d08f70090c0d 100644 (file)
--- a/plugins/personal/environment/main.inc
+++ b/plugins/personal/environment/main.inc
@@ -70,8 +70,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 b54dab2496b965f6c39589bb964966ad52e63f01..fd94caf3db60efdb8b26e2d2388d0efc10b14693 100644 (file)
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -103,6 +103,7 @@ if (!$remove_lock){
     }
 
     del_lock ($ui->dn);
+    sess_del ('user');
   }
 
   /* save changes to LDAP and disable edit mode */
@@ -117,13 +118,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 f79cb140d49d1573e0d866793b4547a32e4c3954..a381598e9ebca0d5a016624393dfe43b286291db 100644 (file)
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -72,8 +72,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 30b1101f65d5be9f4431666499a0c83a69a9bf20..6ad13a128d57ce1e07ac62e72718d360bcb448ae 100644 (file)
--- a/plugins/personal/nagios/main.inc
+++ b/plugins/personal/nagios/main.inc
@@ -73,8 +73,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 aec2b9a49a07f121fd83fd0d2e4ade737b3bf0e5..badd665232b42421485cc8e65f017a5fc65ec781 100644 (file)
--- a/plugins/personal/netatalk/main.inc
+++ b/plugins/personal/netatalk/main.inc
@@ -68,8 +68,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 d9af554e0ee6185708c2b56e1a7d34e2c1e321b1..fffb199d9382fc3b626db5d856889588771b0b85 100644 (file)
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -74,8 +74,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 d1725d1927746773f4cd9cf34d8478a6dc55eec1..8719e50e404e054fb420cf672831597f8f7c42bf 100644 (file)
--- a/plugins/personal/samba/main.inc
+++ b/plugins/personal/samba/main.inc
@@ -73,8 +73,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 c5db32903a86910cbdafaff7fcfac5048defbfaa..a16a3c2d5f346031c6c5582f49b0306fa3edccd3 100644 (file)
--- a/plugins/personal/scalix/main.inc
+++ b/plugins/personal/scalix/main.inc
@@ -73,8 +73,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);