Updated opsi activation .

[gosa.git] / gosa-plugins / systems / admin / systems / main.inc

diff --git a/gosa-plugins/systems/admin/systems/main.inc b/gosa-plugins/systems/admin/systems/main.inc
index 90bc586dcf42a7a1c070a6bd24d5b94ebe1d7e75..81c52565a625dec2c5c9729b8014042794d53728 100644 (file)
--- a/gosa-plugins/systems/admin/systems/main.inc
+++ b/gosa-plugins/systems/admin/systems/main.inc
@@ -20,21 +20,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Remove classes and variables from session
- */
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('systems')){
+      $macl = session::get('systems');
+      $macl->remove_lock();
+  }
+}
+
+/* Remove this plugin from session
+*/
 if ( $cleanup ){
   session::un_set('systems');
-}
+}else{
 
 
-if ($remove_lock){
-        if(session::is_set('systems')){
-                $systems = session::get('systems');
-                $systems->remove_lock();
-        }
-} else {
        /* Create usermanagement object on demand */
-       if (!session::is_set('systems') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('systems')){
                session::set('systems',new systems($config, $ui));
        }
        $systems = session::get('systems');