From 8e17b573832faeba2949b51f6090cff986340acc Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 13 Sep 2010 13:39:23 +0000 Subject: [PATCH] fixed plugin handling in case of GET_[reset] git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19641 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/gofon/gofon/macro/main.inc | 41 +++++++++++++------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gosa-plugins/gofon/gofon/macro/main.inc b/gosa-plugins/gofon/gofon/macro/main.inc index 9cd2f4ab3..ee3603808 100644 --- a/gosa-plugins/gofon/gofon/macro/main.inc +++ b/gosa-plugins/gofon/gofon/macro/main.inc @@ -21,35 +21,36 @@ */ /* Remove locks created by this plugin -*/ + */ if ($remove_lock){ - if(session::is_set('goFonMacro')){ - $macl = session::get('goFonMacro'); - $macl->remove_lock(); - } + if(session::is_set('goFonMacro')){ + $macl = session::get('goFonMacro'); + $macl->remove_lock(); + session::un_set('goFonMacro'); + } } /* Remove this plugin from session -*/ + */ if ( $cleanup ){ - session::un_set('goFonMacro'); + session::un_set('goFonMacro'); }else{ - /* Create goFonMacro object on demand */ - if (!session::is_set('goFonMacro')){ - $goFonMacro= new goFonMacro ($config, $ui); - session::set('goFonMacro',$goFonMacro); - } - $goFonMacro = session::get('goFonMacro'); - $display= $goFonMacro->execute(); + /* Create goFonMacro object on demand */ + if (!session::is_set('goFonMacro')){ + $goFonMacro= new goFonMacro ($config, $ui); + session::set('goFonMacro',$goFonMacro); + } + $goFonMacro = session::get('goFonMacro'); + $display= $goFonMacro->execute(); - /* Reset requested? */ - if (isset($_GET['reset']) && $_GET['reset'] == 1){ - session::un_set ('goFonMacro'); - } + /* Reset requested? */ + if (isset($_GET['reset']) && $_GET['reset'] == 1){ + session::un_set ('goFonMacro'); + } - /* Show and save dialog */ - session::set('goFonMacro',$goFonMacro); + /* Show and save dialog */ + session::set('goFonMacro',$goFonMacro); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -- 2.30.2