Code

Updated opsi clinet handling.
[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc
index 1f115d806b3c6cf60b50d70b6f477f6a00078615..b85c44626bc3fad728d987d8b746ab082aa5e59b 100644 (file)
@@ -25,6 +25,7 @@ class systems extends plugin
   /* Definitions */
   var $plHeadline     = "Systems";
   var $plDescription  = "This does something";
+  var $plIcon         = "plugins/systems/images/plugin.png";
   var $departments    = array();
 
   /* Dialog attributes */
@@ -43,6 +44,11 @@ class systems extends plugin
 
   var $system_activation_object = ""; // The object to activate (NewDevice)
   var $fai_activated  = FALSE;
+  var $si_active      = FALSE;
+
+  var $acl_module = array("incoming","terminal","workstation","server","printer","phone","winworkstation","component");
+
+  var $opsi = NULL;
 
   function systems (&$config, $ui)
   {
@@ -60,7 +66,7 @@ class systems extends plugin
     $this->DivListSystem = new divListSystem($this->config,$this);
 
     /* Copy & Paste enabled ?*/
-    if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE']))){
+    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 
@@ -68,6 +74,19 @@ class systems extends plugin
     if($this->config->search("ArpNewDevice","CLASS",array('tabs')) != ""){
       $this->arp_handling_active = TRUE;
     }
+
+    /* Check if we are able to communicate with the GOsa supprot daemon 
+     */
+    if(class_available("gosaSupportDaemon")){
+      $o = new gosaSupportDaemon();
+      $this->si_active = $o->connect() && class_available("DaemonEvent");
+    }
+
+    /* Check if we are able to communicate with the GOsa supprot daemon 
+     */
+    if(class_available("opsi")){
+      $this->opsi = new opsi($this->config);
+    }
   }
 
 
@@ -293,13 +312,7 @@ class systems extends plugin
 
       /* Possible destination system types 
        */
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABNAME"=>"termgeneric",     
-            "TABCLASS" =>"termtabs",      "ACL"=> "terminal"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     
-            "TABCLASS" =>"worktabs",      "ACL"=> "workstation"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABNAME"=>"servgeneric",     
-            "TABCLASS" =>"servtabs",      "ACL"=> "server"));
+      $tabs = $this->get_tab_defs();
 
       /* Remember dialog selection.
        */
@@ -315,98 +328,104 @@ class systems extends plugin
         $class    = $tabs[$selected_system]["CLASS"];
         $tabname  = $tabs[$selected_system]["TABNAME"];
         $tabclass = $tabs[$selected_system]["TABCLASS"];
-        $acl_cat  = $tabs[$selected_system]["ACL"];
-
-        /* Go through all objects that should be activated */
-        foreach($this->system_activation_object as $key => $dn){
+        $acl_cat  = $tabs[$selected_system]["ACLC"];
 
-          /* Remove entry from list, to avoid page-reload problems */
-          unset($this->system_activation_object[$key]);
-  
-          /* Load permissions for selected 'dn' and check if
-             we're allowed to create this 'dn' */
-          $this->dn = $dn;
-          $ui       = get_userinfo();
-          $tabacl   = $ui->get_permissions($this->dn,$acl_cat."/".$tabname);
-
-          /* We are allowed to create the requested system type */
-          if(preg_match("/c/",$tabacl)){
-            $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$selected_system);
-            $this->systab->set_acl_base($this->DivListSystem->selectedBase);
-            $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
-            $this->systab->base = $this->DivListSystem->selectedBase;
 
+        if(!class_available($tabclass)){
+          msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+        }else{
 
-            if($selected_group != "none"){
-
-              /*******
-               * Set gotoMode to active if we there was an ogroup selected. 
-               */
-              $found = false;
-              foreach(array("workgeneric"=>"active","servgeneric"=>"active","termgeneric"=>"active") as $tab => $value){
-                if(isset($this->systab->by_object[$tab]->gotoMode)) {
-                  $found = true;
-                  $this->systab->by_object[$tab]->gotoMode = $value;
+          /* Go through all objects that should be activated */
+          foreach($this->system_activation_object as $key => $dn){
+
+            /* Remove entry from list, to avoid page-reload problems */
+            unset($this->system_activation_object[$key]);
+
+            /* Load permissions for selected 'dn' and check if
+               we're allowed to create this 'dn' */
+            $this->dn = $dn;
+            $ui       = get_userinfo();
+            $tabacl   = $ui->get_permissions($this->dn,$acl_cat."/".$tabname);
+
+            /* We are allowed to create the requested system type */
+            if(preg_match("/c/",$tabacl)){
+              $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$selected_system);
+              $this->systab->set_acl_base($this->DivListSystem->selectedBase);
+              $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+              $this->systab->base = $this->DivListSystem->selectedBase;
+
+
+              if($selected_group != "none"){
+
+                /*******
+                 * Set gotoMode to active if we there was an ogroup selected. 
+                 */
+                $found = false;
+                foreach(array("workgeneric"=>"active","servgeneric"=>"active","termgeneric"=>"active") as $tab => $value){
+                  if(isset($this->systab->by_object[$tab]->gotoMode)) {
+                    $found = true;
+                    $this->systab->by_object[$tab]->gotoMode = $value;
+                  }
+                }
+                if(!$found){
+                  msg_dialog::display(_("Internal error"), _("Cannot set mode to 'active'!"), ERROR_DIALOG);
                 }
-              }
-              if(!$found){
-                msg_dialog::display(_("Internal error"), _("Cannot set mode to 'active'!"), ERROR_DIALOG);
-              }
 
-              /*******
-               * Update object group membership
-               */
-              $og = new ogroup($this->config,$selected_group);
-              if($og){
-                $og->AddDelMembership($this->systab->dn);
-                $og->save();
-              }
+                /*******
+                 * Update object group membership
+                 */
+                $og = new ogroup($this->config,$selected_group);
+                if($og){
+                  $og->AddDelMembership($this->systab->dn);
+                  $og->save();
+                }
 
-              /*******
-               * Set default system specific attributes 
-               */
-              foreach (array("workservice", "termservice") as $cls){
-                if (isset($this->systab->by_object[$cls])){
-                  $this->systab->by_object[$cls]->gotoXMouseport= "";
-                  $this->systab->by_object[$cls]->gotoXMouseType= "";
-                  $this->systab->by_object[$cls]->gotoXResolution= "";
-                  $this->systab->by_object[$cls]->gotoXColordepth= "";
+                /*******
+                 * Set default system specific attributes 
+                 */
+                foreach (array("workservice", "termservice") as $cls){
+                  if (isset($this->systab->by_object[$cls])){
+                    $this->systab->by_object[$cls]->gotoXMouseport= "";
+                    $this->systab->by_object[$cls]->gotoXMouseType= "";
+                    $this->systab->by_object[$cls]->gotoXResolution= "";
+                    $this->systab->by_object[$cls]->gotoXColordepth= "";
+                  }
                 }
-              }
 
-              // Enable activation
-              foreach (array("servgeneric", "workgeneric", "termgeneric") as $cls){
-                if (isset($this->systab->by_object[$cls])){
-                  $this->systab->by_object[$cls]->auto_activate= TRUE;
+                // Enable activation
+                foreach (array("servgeneric", "workgeneric", "termgeneric") as $cls){
+                  if (isset($this->systab->by_object[$cls])){
+                    $this->systab->by_object[$cls]->auto_activate= TRUE;
+                  }
                 }
-              }
 
-              // Enable sending of LDAP events
-              if (isset($this->systab->by_object["workstartup"])){
-                $this->systab->by_object["workstartup"]->gotoLdap_inherit= TRUE;
+                // Enable sending of LDAP events
+                if (isset($this->systab->by_object["workstartup"])){
+                  $this->systab->by_object["workstartup"]->gotoLdap_inherit= TRUE;
+                }
               }
-            }
 
-            /* Don't save directly if there is no objectGroup selected.
-               The user will then be able to configure the missing attributes 
-                on his own.
-             */
-            if($selected_group != "none"){
-              $this->systab->save();
-              $this->systab = NULL;
+              /* Don't save directly if there is no objectGroup selected.
+                 The user will then be able to configure the missing attributes 
+                 on his own.
+               */
+              if($selected_group != "none"){
+                $this->systab->save();
+                $this->systab = NULL;
 
-              if(!isset($ldap)){
-                $ldap = $this->config->get_ldap_link();
-              }
-              $ldap->cd ($this->dn);
-              $ldap->cat($this->dn, array('dn'));
-              if(count($ldap->fetch())){
-                $ldap->cd($this->dn);
-                $ldap->rmDir($this->dn);
+                if(!isset($ldap)){
+                  $ldap = $this->config->get_ldap_link();
+                }
+                $ldap->cd ($this->dn);
+                $ldap->cat($this->dn, array('dn'));
+                if(count($ldap->fetch())){
+                  $ldap->cd($this->dn);
+                  $ldap->rmDir($this->dn);
+                }
               }
+            }else{
+              msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
             }
-          }else{
-            msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
           }
         }
       }
@@ -414,7 +433,9 @@ class systems extends plugin
 
 
     if (isset($_POST['create_system'])||$s_action=="newsystem") {
-
+    
+      $this->last_action = "";
+  
       /* If the current entry is an incoming object 
        * $sw = System type as posted in new incoming handling dialog 
        */ 
@@ -425,36 +446,34 @@ class systems extends plugin
       }
       $this->dn= "new";
 
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABNAME"=>"termgeneric",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABNAME"=>"servgeneric",     "TABCLASS" =>"servtabs",      "ACL"=> "server"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABNAME"=>"printgeneric",    "TABCLASS" =>"printtabs",     "ACL"=> "printer"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABNAME"=>"phoneGeneric",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABNAME"=>"componentGeneric","TABCLASS" =>"componenttabs", "ACL"=> "component"));
-
+      $tabs = $this->get_tab_defs();
+  
       if(isset($tabs[$sw])){
         $class    = $tabs[$sw]["CLASS"];
         $tabname  = $tabs[$sw]["TABNAME"];
         $tabclass = $tabs[$sw]["TABCLASS"];
-        $acl_cat  = $tabs[$sw]["ACL"];
+        $acl_cat  = $tabs[$sw]["ACLC"];
 
         /* Load permissions for selected 'dn' and check if
            we're allowed to remove this 'dn' */
         $ui       = get_userinfo();
         $tabacl   = $ui->get_permissions($this->DivListSystem->selectedBase,$acl_cat."/".$tabname);
         if(preg_match("/c/",$tabacl)){
-          $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$sw);
-          $this->systab->set_acl_base($this->DivListSystem->selectedBase);
-          $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
-          $this->systab->base = $this->DivListSystem->selectedBase;
+
+          if(!class_available($tabclass)){
+            msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+          }else{
+            $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$sw);
+            $this->systab->set_acl_base($this->DivListSystem->selectedBase);
+            $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+            $this->systab->base = $this->DivListSystem->selectedBase;
+          }
         }else{
           msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
         }
       }
     }
 
-
     /********************
       System activation
      ********************/
@@ -481,7 +500,7 @@ class systems extends plugin
 
     /* User wants to edit data? */
     if (($s_action == "edit") && (!isset($this->systab->config))){
-
+      $this->last_action = "";
       $this->dn= $this->terminals[$s_entry]['dn'];
 
       /* Check locking, save current plugin in 'back_plugin', so
@@ -491,38 +510,40 @@ class systems extends plugin
       }
 
       /* Find out more about the object type */
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cat($this->dn, array('objectClass','gotoMode'));
-      $attrs= $ldap->fetch();
+      $attrs = $this->terminals[$s_entry];
       $type= $this->get_system_type($attrs);
-
+     
       /* Lock the current entry, so everyone will get the
          above dialog */
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component"));
-
+      $tabs = $this->get_tab_defs();
 
       if($type == "ArpNewDevice"){
-        $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+        if(!class_available("ArpNewDeviceTabs")){
+          msg_dialog::display(_("Error"), msgPool::class_not_found("ArpNewDevice"), ERROR_DIALOG);
+        }else{
+          $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+        }
       }elseif($type == "NewDevice"){
-        $this->system_activation_object= array($this->dn);
-        $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+        if(!class_available("SelectDeviceType")){
+          msg_dialog::display(_("Error"), msgPool::class_not_found("SelectDeviceType"), ERROR_DIALOG);
+        }else{
+          $this->system_activation_object= array($this->dn);
+          $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+        }
       }elseif(isset($tabs[$type])){
 
         $class    = $tabs[$type]["CLASS"];
-        $acl_cat  = $tabs[$type]["ACL"];
+        $acl_cat  = $tabs[$type]["ACLC"];
         $tabclass = $tabs[$type]["TABCLASS"];
 
-        $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat);
-        $this->systab->set_acl_base($this->dn);
-        session::set('objectinfo',$this->dn);
-        add_lock ($this->dn, $this->ui->dn);
+        if(!class_available($tabclass)){
+          msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+        }else{
+          $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat);
+          $this->systab->set_acl_base($this->dn);
+          session::set('objectinfo',$this->dn);
+          add_lock ($this->dn, $this->ui->dn);
+        }
       }else{ 
         msg_dialog::display(_("Error"), _("Editing this type of object is not supported yet!"), ERROR_DIALOG);
         $this->remove_lock();
@@ -536,16 +557,7 @@ class systems extends plugin
 
     /* Set terminals root password */
     if ($s_action=="change_pw"){
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
+      $tabs = $this->get_tab_defs();
 
       $dn   = $this->terminals[$s_entry]['dn'];
       $type = $this->get_system_type($this->terminals[$s_entry]);
@@ -586,13 +598,8 @@ class systems extends plugin
         $_POST['new_password'] == $_POST['repeated_password']){
 
       /* Check if user is allowed to set password */
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"    ,"PLUG"=>"termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric" ,"PLUG"=>"workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"      ,"PLUG"=>"servgeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric","PLUG"=>"componentGeneric"));
+      $tabs = $this->get_tab_defs();
 
-      /* Detect object type */
       $type = "";
       foreach($this->terminals as $terminal){
         if($terminal['dn'] == $this->dn){
@@ -701,7 +708,7 @@ class systems extends plugin
       $this->dns = array();
       $ids = $this->list_get_selected_items();
 
-      if(count($ids)){
+      if(count($ids) && class_available("DaemonEvent")){
         $mac= array();
 
         $ldap = $this->config->get_ldap_link();
@@ -752,7 +759,7 @@ class systems extends plugin
     }
 
     /* Insert scheduled events into queue */
-    if($this->systab instanceof DaemonEvent){
+    if(class_available("DaemonEvent") && $this->systab instanceof DaemonEvent){
       $this->systab->save_object();
 
       /* Save event 
@@ -776,22 +783,17 @@ class systems extends plugin
       Delete MULTIPLE entries requested, display confirm dialog
      ********************/
 
-    if ($s_action=="del_multiple"){
+    if ($s_action=="del_multiple" || $s_action == "del"){
       $this->dns = array();
-      $ids = $this->list_get_selected_items();
 
-      $ui = get_userinfo();
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
+      if($s_action == "del_multiple"){
+        $ids = $this->list_get_selected_items();
+      }else{
+        $ids = array($s_entry);
+      }
 
+      $ui = get_userinfo();
+      $tabs = $this->get_tab_defs();
 
       if(count($ids)){
 
@@ -843,17 +845,7 @@ class systems extends plugin
     if (isset($_POST['delete_multiple_system_confirm'])){
 
       $ui = get_userinfo();
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
+      $tabs = $this->get_tab_defs();
 
       /* Remove user by user and check acls before removeing them */
       foreach($this->dns as $key => $dn){
@@ -919,135 +911,6 @@ class systems extends plugin
    }
 
 
-    /********************
-      Delete system, confirm dialog
-     ********************/
-
-    /* Remove terminal was requested */
-    if ($s_action=="del"){
-
-      /* Get 'dn' from posted termlinst */
-      $this->dn = $this->terminals[$s_entry]['dn'];
-      $attrs    = $this->terminals[$s_entry];
-
-  
-
-      $type= $this->get_system_type($attrs);
-      $ui = get_userinfo();
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
-      /* get object type */
-      $tabtype  = "termtabs";
-      $tabobj   = "TERMTABS";
-      $tabacl   = "";
-      if(isset($tabs[$type])){
-        $tabtype = $tabs[$type]['TABCLASS'];
-        $tabobj  = $tabs[$type]['CLASS'];
-        $tabacl  = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
-      }
-
-      /* Load permissions for selected 'dn' and check if
-         we're allowed to remove this 'dn' */
-      if(preg_match("/d/",$tabacl)){ 
-
-        /* Check locking, save current plugin in 'back_plugin', so
-           the dialog knows where to return. */
-        if (($user= get_lock($this->dn)) != ""){
-          return(gen_locked_message ($user, $this->dn));
-        }
-
-        /* Lock the current entry, so nobody will edit it during deletion */
-        add_lock ($this->dn, $this->ui->dn);
-        $smarty->assign("warning", msgPool::deleteInfo(@LDAP::fix($this->dn)));
-        $smarty->assign("multiple", false);
-        return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
-      } else {
-
-        /* Obviously the user isn't allowed to delete. Show message and
-           clean session. */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
-      }
-    }
-
-
-    /********************
-      Delete system, confirmed
-     ********************/
-    /* Confirmation for deletion has been passed. Terminal should be deleted. */
-    if (isset($_POST['delete_terminal_confirm'])){
-
-      /* Find out more about the object type */
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cat($this->dn, array('objectClass'));
-      $attrs= $ldap->fetch();
-      $type= $this->get_system_type($attrs);
-
-      $ui = get_userinfo();
-
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
-      /* get object type */
-      $tabtype  = "termtabs";
-      $tabobj   = "TERMTABS";
-      $tabacl   = "";
-      if(isset($tabs[$type])){
-        $tabtype = $tabs[$type]['TABCLASS'];
-        $tabobj  = $tabs[$type]['CLASS'];
-        $tabacl  = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
-      }
-
-      /* Check if we are allowed to remove this object */
-      if(preg_match("/d/",$tabacl)){
-
-        /* Delete request is permitted, perform LDAP action */
-        if(in_array($type,array("ArpNewDevice","NewDevice")) && class_available("termgeneric")){
-          $this->systab= new termgeneric($this->config, $this->dn);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->remove_from_parent();
-        }elseif($tabtype=="phonetabs"){
-          $this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $this->dn,$type);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->by_object['phoneGeneric']->remove_from_parent ();
-        }else{  
-          $this->systab= new $tabtype($this->config,$this->config->data['TABS'][$tabobj], $this->dn,$type);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->delete();
-        }
-        unset ($this->systab);
-        $this->systab= NULL;
-
-        /* Terminal list has changed, reload it. */
-      } else {
-
-        /* Normally this shouldn't be reached, send some extra
-           logs to notify the administrator */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
-        new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
-      }
-
-      /* Remove lock file after successfull deletion */
-      $this->remove_lock();
-    }
-
-
     /********************
       Edit system type finished, check if everything went ok
      ********************/
@@ -1167,7 +1030,7 @@ class systems extends plugin
 
     /* Check if there is a snapshot dialog open */
     $base = $this->DivListSystem->selectedBase;
-    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
+    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases(),$this)){
       return($str);
     }
 
@@ -1270,7 +1133,7 @@ class systems extends plugin
     /* Prepare samba class name */
     $samba  ="";
     if ($this->DivListSystem->ShowWinWorkstations){
-      if ($this->config->current['SAMBAVERSION'] == "3"){
+      if ($this->config->get_cfg_value("sambaversion") == "3"){
         $samba= "sambaSamAccount";
       } else {
         $samba= "sambaAccount";
@@ -1279,13 +1142,13 @@ class systems extends plugin
 
     /* This array represents the combination between checkboxes and search filters */
     $objs = array( 
-        "ShowServers"        => array("CLASS" => "goServer"        ,"TREE" => get_ou('serverou')),
-        "ShowTerminals"      => array("CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalou')),
-        "ShowPrinters"       => array("CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerou')),
-        "ShowDevices"        => array("CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentou')),
-        "ShowPhones"         => array("CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneou')),
-        "ShowWorkstations"   => array("CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
-        "ShowWinWorkstations"=> array("CLASS" => $samba            ,"TREE" => get_winstations_ou() ));
+        "ShowServers"        => array("TAB" => "servtabs",      "CLASS" => "goServer"        ,"TREE" => get_ou('serverou')),
+        "ShowTerminals"      => array("TAB" => "termtabs",      "CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalou')),
+        "ShowPrinters"       => array("TAB" => "printtabs",     "CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerou')),
+        "ShowDevices"        => array("TAB" => "componenttabs", "CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentou')),
+        "ShowPhones"         => array("TAB" => "phonetabs",     "CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneou')),
+        "ShowWorkstations"   => array("TAB" => "worktabs",      "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
+        "ShowWinWorkstations"=> array("TAB" => "wintabs",       "CLASS" => $samba            ,"TREE" => get_winstations_ou() ));
 
     /* Include the 'Display Systems of user' attribute */ 
     if ((!empty($this->DivListSystem->UserRegex)) && ($this->DivListSystem->UserRegex!= "*")){
@@ -1304,7 +1167,8 @@ class systems extends plugin
 
     /* Walk through all possible search combinations, and search for some objects if the checkbox is enabled  */
     foreach($objs as $checkBox => $oc){
-      if($this->DivListSystem->$checkBox){
+
+      if($this->DivListSystem->$checkBox && class_available($oc['TAB'])){
         if($this->DivListSystem->SubSearch){
           if($oc['CLASS'] != ""){
             $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
@@ -1325,7 +1189,18 @@ class systems extends plugin
     $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
     $res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT));
 
+    /* Append opsi systems, the opsi extension have to installed.
+     */
+    if($this->opsi != NULL){
+      $opsi_clients = $this->opsi->get_hosts_for_system_management();
+      if($this->opsi->is_error()){
+        msg_dialog::display(_("Error"),msgPool::siError($this->opsi->get_error()),ERROR_DIALOG);
+      }
+    }
+    
     /* Get all gotoTerminal's */
+    $t_id = 0;
+    $opsi_map  = array();
     foreach ($res as $value){
 
       $tmp= $value['dn'];
@@ -1359,7 +1234,14 @@ class systems extends plugin
 
       /* Detect type of object and create an entry for $this->terminals */
       $terminal = array();
-      if (in_array_ics('gotoTerminal', $value["objectClass"])){
+
+       if (0 && in_array_ics('gosa_opsi_client', $value["objectClass"])){
+
+         /* check acl */
+         $terminal             = $value;
+         $terminal['type']     = "O";
+
+       } elseif (in_array_ics('gotoTerminal', $value["objectClass"])){
 
         /* check acl */
         $acl = $ui->get_permissions($value['dn'],"terminal/termgeneric");
@@ -1448,16 +1330,37 @@ class systems extends plugin
         } else {
           $domain= "";
         }
-        $terminal=$value;
-        $terminal['type']     ="W";
-        $terminal['domain']   = $name.$domain;
+        $acl = $ui->get_permissions($value['dn'],"winworkstation/wingeneric");
+        if($add != "" || preg_match("/r/",$acl)) {
+          $terminal=$value;
+          $terminal['type']     ="W";
+          $terminal['domain']   = $name.$domain;
+        }
       }
 
+      /* Append collected data to the host list.
+       */
       if(count($terminal)){
-        $this->terminals[]=$terminal;
+        $t_id ++ ;
+        $this->terminals[$t_id]=$terminal;
+        $opsi_map[preg_replace('/\$$/',"",$value['cn'][0])] = $t_id;
       }
     }
 
+
+    /* Merge real hosts with opsi hosts.
+       If there is a samba host, then merge it with the opsi host,
+        to avoid duplicate entries.
+     */
+    foreach($opsi_clients as $entry){
+      if(isset($opsi_map[$entry['cn'][0]])){
+        continue;
+      }
+      $terminal             = $entry;
+      $terminal['type']     = "O";
+      $this->terminals[] = $terminal;
+    }
+
     $tmp  =array();
     $tmp2 =array();
     foreach($this->terminals as $tkey => $val ){
@@ -1494,20 +1397,8 @@ class systems extends plugin
     }
 
     $ui = get_userinfo();
-
-    $tabs = array(
-        "terminal"    => array( "CLASS"     =>"TERMTABS",     "TABNAME" =>"termgeneric",     
-          "TABCLASS"  =>"termtabs",     "ACL"     =>"terminal"),
-        "workstation" => array( "CLASS"     =>"WORKTABS",     "TABNAME" =>"workgeneric",     
-          "TABCLASS"  =>"worktabs",     "ACL"     =>"workstation"),
-        "server"      => array( "CLASS"     =>"SERVTABS",     "TABNAME" =>"servgeneric",     
-          "TABCLASS"  =>"servtabs",     "ACL"     =>"server"),
-        "printer"     => array( "CLASS"     =>"PRINTTABS",    "TABNAME" =>"printgeneric",    
-          "TABCLASS"  =>"printtabs",    "ACL"     =>"printer"),
-        "phone"       => array( "CLASS"     =>"PHONETABS",    "TABNAME" =>"phoneGeneric",    
-          "TABCLASS"  =>"phonetabs",    "ACL"     =>"phone"),
-        "component"   => array( "CLASS"     =>"COMPONENTTABS","TABNAME" =>"componentGeneric",
-          "TABCLASS"  =>"componenttabs","ACL"     =>"component"));
+    
+    $tabs = $this->get_tab_defs();
 
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){
@@ -1521,7 +1412,7 @@ class systems extends plugin
       $tab_o  = $tabs[$type]['CLASS'];
       $tab_c  = $tabs[$type]['TABCLASS'];
       $acl_c  = $tabs[$type]['TABNAME'];
-      $acl    = $tabs[$type]['ACL'];
+      $acl    = $tabs[$type]['ACLC'];
 
       if($s_action == "copy" && $ui->is_copyable($dn,$acl,$acl_c)){
         $this->CopyPasteHandler->add_to_queue($dn,$s_action,$tab_c,$tab_o,$acl);
@@ -1547,7 +1438,7 @@ class systems extends plugin
           $tab_o  = $tabs[$type]['CLASS'];
           $tab_c  = $tabs[$type]['TABCLASS'];
           $acl_c  = $tabs[$type]['TABNAME'];
-          $acl    = $tabs[$type]['ACL'];
+          $acl    = $tabs[$type]['ACLC'];
 
           if($s_action == "copy_multiple" && $ui->is_copyable($dn,$acl,$acl_c)){ 
             $this->CopyPasteHandler->add_to_queue($dn,"copy",$tab_c,$tab_o,$acl);
@@ -1590,7 +1481,9 @@ class systems extends plugin
     $classes = $attrs['objectClass'];
 
     $type= "";
-    if (in_array_ics('ieee802Device', $classes)){
+    if (in_array_ics('gosa_opsi_client', $classes)){
+      $type= "opsi_client";
+    }elseif (in_array_ics('ieee802Device', $classes)){
       $type= "component";
     }elseif (in_array_ics('gotoTerminal', $classes)){
       $type= "terminal";
@@ -1619,31 +1512,36 @@ class systems extends plugin
     $temp= "";
 
     $conv= array(
-        "D" => array("select_default.png",_("Template")),
-        "F" => array("select_phone.png",_("Phone")),
-        "C" => array("select_component.png",_("Network device")),
-        "P" => array("select_printer.png",_("Printer")),
+        "D" => array("plugins/systems/images/select_default.png",_("Template")),
+        "F" => array("plugins/systems/images/select_phone.png",_("Phone")),
+        "C" => array("plugins/systems/images/select_component.png",_("Network device")),
+        "P" => array("plugins/systems/images/select_printer.png",_("Printer")),
+
+        "W" => array("plugins/systems/images/select_winstation.png",_("Win workstation")),
 
-        "W" => array("select_winstation.png",_("Win workstation")),
+        "L" => array("plugins/systems/images/select_workstation.png",_("Workstation")),
+        "S" => array("plugins/systems/images/select_server.png",_("Server")),
+        "T" => array("plugins/systems/images/select_terminal.png",_("Terminal")),
 
-        "L" => array("select_workstation.png",_("Workstation")),
-        "S" => array("select_server.png",_("Server")),
-        "T" => array("select_terminal.png",_("Terminal")),
+        "LX" => array("plugins/systems/images/workstation_locked.png",_("Locked workstation")),
+        "SX" => array("plugins/systems/images/server_locked.png",_("Locked server")),
+        "TX" => array("plugins/systems/images/terminal_locked.png",_("Locked terminal")),
 
-        "LX" => array("workstation_locked.png",_("Locked workstation")),
-        "SX" => array("server_locked.png",_("Locked server")),
-        "TX" => array("terminal_locked.png",_("Locked terminal")),
+        "LE" => array("plugins/systems/images/workstation_error.png",_("Workstation error")),
+        "SE" => array("plugins/systems/images/server_error.png",_("Server error")),
+        "TE" => array("plugins/systems/images/terminal_error.png",_("Terminal error")),
 
-        "LE" => array("workstation_error.png",_("Workstation error")),
-        "SE" => array("server_error.png",_("Server error")),
-        "TE" => array("terminal_error.png",_("Terminal error")),
+        "LB" => array("plugins/systems/images/workstation_busy.png",_("Workstation busy")),
+        "SB" => array("plugins/systems/images/server_busy.png",_("Server busy")),
 
-        "LB" => array("workstation_busy.png",_("Workstation busy")),
-        "SB" => array("server_busy.png",_("Server busy")),
+        "NQ" => array("plugins/systems/images/select_newsystem.png",_("New system from incoming")),
+        "NT" => array("plugins/systems/images/select_new_terminal.png",_("New terminal")),
+        "NL" => array("plugins/systems/images/select_new_workstation.png",_("New workstation")));
 
-        "NQ" => array("select_newsystem.png",_("New system from incoming")),
-        "NT"=> array("select_new_terminal.png",_("New terminal")),
-        "NL"=> array("select_new_workstation.png",_("New workstation")));
+    /* Add opsi client to system types */
+    if($this->opsi != NULL){
+        $conv["O"] = array("plugins/systems/images/select_default.png",_("Opsi client"));
+    }
 
     /* Use locked icons 
      */
@@ -1690,10 +1588,10 @@ class systems extends plugin
         if(!preg_match("/".$key[$i]."/",$input['type'])){
           $found = FALSE;
         }
-      }
+     }
 
       if($found){
-        $tmp['img'] ="<img class='center' src='images/".$value[0]."' alt='".$key."' title='".$value['1']."'>";
+        $tmp['img'] ="<img class='center' src='".$value[0]."' alt='".$key."' title='".$value['1']."'>";
         $tmp['class']=$key;
         return $tmp;
       }
@@ -1714,6 +1612,93 @@ class systems extends plugin
   }
 
 
+  public function get_tab_defs()
+  {
+    $tabs = array(
+        "incoming"    => array(
+          "CLASS"     => "",
+          "TABNAME"   => "",
+          "TABCLASS"  => "",
+          "ACLC"      => "incoming",
+          "ACL"       => "incoming/systems"),
+
+        "ArpNewDevice"=> array(
+          "CLASS"     => "TERMTABS",
+          "TABNAME"   => "termgeneric" ,
+          "TABCLASS"  => "termtabs",
+          "ACLC"      => "incoming",
+          "ACL"       => "incoming/systems"),
+
+        "NewDevice"   => array(
+          "CLASS"     => "TERMTABS",
+          "TABNAME"   => "termgeneric",
+          "TABCLASS"  => "termtabs",
+          "ACLC"      => "incoming",
+          "ACL"       => "incoming/systems"),
+
+        "terminal"    => array(
+            "CLASS"     => "TERMTABS",
+            "TABNAME"   => "termgeneric",
+            "TABCLASS"  => "termtabs",
+            "ACLC"      => "terminal",
+            "ACL"       => "terminal/termgeneric"),
+
+        "workstation" =>  array(
+            "CLASS"   => "WORKTABS",
+            "TABNAME" => "workgeneric",
+            "TABCLASS"=> "worktabs",
+            "ACLC"    => "workstation",
+            "ACL"     => "workstation/workgeneric" ),
+
+        "server"      => array(
+            "CLASS"   => "SERVTABS",
+            "TABNAME" => "servgeneric",
+            "TABCLASS"=> "servtabs",
+            "ACLC"    => "server",
+            "ACL"     => "server/servgeneric"),
+
+        "printer"     => array(
+            "CLASS"   => "PRINTTABS",
+            "TABNAME" => "printgeneric",
+            "TABCLASS"=> "printtabs",
+            "ACLC"    => "printer",
+            "ACL"     => "printer/printgeneric"),
+
+        "phone"       => array(
+            "CLASS"   => "PHONETABS",
+            "TABNAME" => "phoneGeneric",
+            "TABCLASS"=> "phonetabs",
+            "ACLC"    => "phone",
+            "ACL"     => "phone/phoneGeneric"),
+
+        "winstation"  => array(
+            "CLASS"   => "WINTABS",
+            "TABNAME" => "wingeneric",
+            "TABCLASS"=> "wintabs",
+            "ACLC"    => "winworkstation",
+            "ACL"     => "winworkstation/wingeneric"),
+
+        "component"   => array(
+            "CLASS"   => "COMPONENTTABS",
+            "TABNAME" => "componentGeneric",
+            "TABCLASS"=> "componenttabs",
+            "ACLC"    => "component",
+            "ACL"     => "component/componentGeneric"));
+
+    if($this->opsi != NULL){
+      $tabs["opsi_client"] = array(
+          "CLASS"   => "OPSITABS",
+          "TABNAME" => "opsigeneric" ,
+          "TABCLASS"=> "opsi_tabs",
+          "ACLC"    => "opsi" ,
+          "ACL"     => "opsi/opsigeneric");
+    }
+
+    return($tabs);
+  }
+
+
+
   /* !! Incoming dummy acls, required to defined acls for incoming objects
    */
   static function plInfo()