X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fpersonal%2Fenvironment%2Fmain.inc;h=141322066148ee80012083c48efa0193f090d53d;hb=2fad372fadd10bf7636516af03bcac2e3db0c81f;hp=4fb93711fa5d12ac246cc2318164d34f1bfc1e18;hpb=3bf2f41556304a0026112295e2b40acf2512b311;p=gosa.git

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 4fb93711f..141322066 100644
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -17,23 +17,26 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-$lock_msg = "";
-if ( $remove_lock){
+
+/* Remove locks created by this plugin
+*/
+$lock_msg="";
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('environment') && session::is_set('edit')){
-    del_lock ($ui->dn);
+    del_lock($ui->dn);
   }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('environment');
+  session::un_set('edit');
 
 }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('environment') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('environment');
   }