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 7866fad1cfb8aed09c808c3ecc427f06685384ab..81c52565a625dec2c5c9729b8014042794d53728 100644 (file)
--- a/gosa-plugins/systems/admin/systems/main.inc
+++ b/gosa-plugins/systems/admin/systems/main.inc
@@ -20,15 +20,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/* Remove locks created by this plugin
+*/
 if ($remove_lock){
-        if(session::is_set('systems')){
-                $systems = session::get('systems');
-                $systems->remove_lock();
-                session::un_set ('systems');
-        }
-} else {
+  if(session::is_set('systems')){
+      $macl = session::get('systems');
+      $macl->remove_lock();
+  }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('systems');
+}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');
@@ -37,15 +46,14 @@ if ($remove_lock){
 
        /* Reset requested? */
        if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               del_lock ($ui->dn);
                session::un_set ('systems');
        }
 
        /* Page header*/
-       if (session::is_set('objectinfo')){
-               $display= print_header(get_template_path('images/system.png'), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+       if (get_object_info() != ""){
+               $display= print_header(get_template_path($systems->plIcon), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
        } else {
-               $display= print_header(get_template_path('images/system.png'), _("System management"));
+               $display= print_header(get_template_path($systems->plIcon), _("System management"));
        }
 
        /* Show and save dialog */