Added template adaption for mail domain parts. Closes #776

[gosa.git] / gosa-plugins / mail / personal / mail / main.inc

diff --git a/gosa-plugins/mail/personal/mail/main.inc b/gosa-plugins/mail/personal/mail/main.inc
index b8fe96a5d055f4d022e1f619236c9b65015bcdb0..db39f469b2f85621da5f9f849dd96a12cbcd9872 100644 (file)
--- a/gosa-plugins/mail/personal/mail/main.inc
+++ b/gosa-plugins/mail/personal/mail/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('mailAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -36,16 +36,8 @@ if ( $cleanup ){
 
 }else{
 
-
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('mailAccount') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){  
     session::un_set ('edit');
     session::un_set ('mailAccount');
   }