* 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 8991224acf0c8ea1ab16504c43d6ca51f369805a..42ea8de2ef50e5af81fbff7b0e938e5082b3da90 100644 (file)
--- 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 f3cf40c8c2dab9950c90655839f06a67b19b4686..ec3ae072138c88ef40a5dd25bc9d1b1a24fb32b0 100644 (file)
--- 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 b65c5fb9a05976f2bcf6ab9574cc9e9d3fa98333..da1dca9abad0d82f34b4362e331a011fe16f5eb8 100644 (file)
--- 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 64b4ca060571dbde513cfd77ee3b19103a707c43..81b90229036d00c9f9598bc995847c40c7154625 100644 (file)
--- 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 79075eee2087f9efafee13e58dec6ea24058d10c..682dc685ad1f08ab6141e7d1d2538979368a9f53 100644 (file)
--- 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 c893a5904eda2a8f7a397123072e08cd397ecc91..9b2614f159e09db438996e270c08bccffab2fc2f 100644 (file)
--- 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 165ace0dfa5062f9de450dd7c0bd9f300af2bb65..98b887457cfb31729605406ed5fd987edb56f866 100644 (file)
--- 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 af72302056084397db3173ed79d6716096a0bffb..ef470136ba10d78c5e473dbcc66fb05f194a84c2 100644 (file)
--- 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 c17d7d5c6ee212db07db59303cba0cada5bf6f63..6800b2a0419ee52c6908a08a3e470255ce12defb 100644 (file)
--- 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 c5588e9e0c8a66490de9e1ff2bafdf946376ae64..1397dc59df3d6cc6aacde398a0a2eb75a3029973 100644 (file)
--- 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);