Updated locking for users self editing.

-Do not remove locks if we havn't created any

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

diff --git a/gosa-core/plugins/personal/password/main.inc b/gosa-core/plugins/personal/password/main.inc
index ba7e7b993b0c66bf1a31249a7ce63263265ff841..568aafa40be440a3fcb7925acfedc843bd075d0d 100644 (file)
--- a/gosa-core/plugins/personal/password/main.inc
+++ b/gosa-core/plugins/personal/password/main.inc
@@ -29,7 +29,6 @@ if (!$remove_lock){
   if (isset($_POST['edit_cancel']) ||
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
 
-    del_lock ($ui->dn);
     session::un_set ('edit');
     session::un_set ('password');
   }

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index d04c3db170181c9548b231fc79dcd06575fd9760..ffbd769fbc80e8965b99df9705a761c518e43d35 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -27,7 +27,12 @@ if (!$remove_lock){
 
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) ||  (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    del_lock ($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('posix') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('posixAccount');
   }

diff --git a/gosa-plugins/connectivity/personal/connectivity/main.inc b/gosa-plugins/connectivity/personal/connectivity/main.inc
index d8cac5ab4c666fc24b6336a1ff86c6adc95cb8a0..da38f9d2da2d0d0bdae1b17c7199edbc42f9517a 100644 (file)
--- a/gosa-plugins/connectivity/personal/connectivity/main.inc
+++ b/gosa-plugins/connectivity/personal/connectivity/main.inc
@@ -23,7 +23,11 @@ if (!$remove_lock){
   if (isset($_POST['edit_cancel']) ||
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
 
-    del_lock ($ui->dn);
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('connectivity-') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('connectivity');
   }

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index a7ebfc1adc022af07060a6cf63642051a06e7490..3b55b3285f79d3298e734621b612f93be08df7ff 100644 (file)
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -23,7 +23,12 @@ if (!$remove_lock){
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) || 
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    del_lock ($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('environment') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('environment');
   }

diff --git a/gosa-plugins/mail/personal/mail/main.inc b/gosa-plugins/mail/personal/mail/main.inc
index 4f4573242bc227de7cf190bf6a3ef26f8d6f504f..df0e7495e491f2ffd9d2955d395ef768b5372d48 100644 (file)
--- a/gosa-plugins/mail/personal/mail/main.inc
+++ b/gosa-plugins/mail/personal/mail/main.inc
@@ -24,7 +24,12 @@ if (!$remove_lock){
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) || 
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    del_lock ($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('mailAccount') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('mailAccount');
   }

diff --git a/gosa-plugins/nagios/personal/nagios/main.inc b/gosa-plugins/nagios/personal/nagios/main.inc
index 5130941c0eb23e8c592a514e15cbe8aa67c622fa..de4dcfd452b40933d873aac456a639d783806f74 100644 (file)
--- a/gosa-plugins/nagios/personal/nagios/main.inc
+++ b/gosa-plugins/nagios/personal/nagios/main.inc
@@ -25,7 +25,12 @@ if (!$remove_lock){
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) || 
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    del_lock ($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('nagiosAccount') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('nagiosAccount');
   }

diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc
index 36820497edd422f2aebea1188e6a1aa14c781e31..65e02834d90607e2a4093f335c5401014bf349ab 100644 (file)
--- a/gosa-plugins/netatalk/personal/netatalk/main.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/main.inc
@@ -23,7 +23,12 @@ $lock_msg = "";
 if (!$remove_lock) {
   /* Reset requested? */
   if (isset ($_POST['edit_cancel']) || (isset ($_GET['reset']) && $_GET['reset'] == 1)) {
-    del_lock($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('netatalk') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set('edit');
     session::un_set('netatalk');
   }

diff --git a/gosa-plugins/samba/personal/samba/main.inc b/gosa-plugins/samba/personal/samba/main.inc
index 890e7a0a1c9ae1ee44aff546dfda63e064d673c5..856478df42932a3911bf9f0c6440775d6ace8fae 100644 (file)
--- a/gosa-plugins/samba/personal/samba/main.inc
+++ b/gosa-plugins/samba/personal/samba/main.inc
@@ -25,7 +25,11 @@ if (!$remove_lock){
   if (isset($_POST['edit_cancel']) ||
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
 
-    del_lock ($ui->dn);
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('sambaAccount') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('sambaAccount');
   }

diff --git a/gosa-plugins/scalix/personal/scalix/main.inc b/gosa-plugins/scalix/personal/scalix/main.inc
index a1930f3b0f6345854114128000ec6ec00bea0065..4a6463fa423e52a0728980a6e93664192edd42cc 100644 (file)
--- a/gosa-plugins/scalix/personal/scalix/main.inc
+++ b/gosa-plugins/scalix/personal/scalix/main.inc
@@ -23,7 +23,12 @@ if (!$remove_lock){
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) || 
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    del_lock ($ui->dn);
+
+    /* Only remove lock if object was opened 
+     */
+    if(session::is_set('scalixAccount') && session::is_set('edit')){
+      del_lock ($ui->dn);
+    }
     session::un_set ('edit');
     session::un_set ('scalixAccount');
   }