Code

Updated New Device && opsi host
[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc
index 60f407ae071a37073bbed97fa3918d47b9d05bbe..e6423173c36b632761505afbc960f606f857ac91 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 */
@@ -37,6 +38,17 @@ class systems extends plugin
 
   /* Arp hanlding activated */
   var $arp_handling_active = FALSE;
+  var $last_action = "";
+
+  var $dns = array();
+
+  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)
   {
@@ -44,11 +56,14 @@ class systems extends plugin
     $this->config= $config;
     $this->ui= $ui;
 
-    /* Creat dialog object */
-    $this->DivListSystem = new divListSystem($this->config,$this);
+    /* Add FAIstate to attributes if FAI is activated */
+    $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
+    if(!empty($tmp)){
+      $this->fai_activated = TRUE;
+    }
 
     /* 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("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 
@@ -57,6 +72,21 @@ class systems extends plugin
       $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);
+    }
+
+    /* Creat dialog object */
+    $this->DivListSystem = new divListSystem($this->config,$this);
   }
 
 
@@ -105,19 +135,6 @@ class systems extends plugin
       }
     }
    
-    /* Incoming handling  
-     * If someone made a systemtype and ogroup selection 
-     * Display the new requested entry type ... servtab  in case of server and so on.
-     */
-    if(isset($_POST['SystemTypeChoosen'])){
-      $SelectedSystemType = session::get('SelectedSystemType');
-      $s_action = "SelectedSystemType";
-      $s_entry  = $_POST['SystemType'];
-      $SelectedSystemType['ogroup'] = $_POST['ObjectGroup'];
-      $this->systab = NULL;
-      session::set('SelectedSystemType',$SelectedSystemType);
-    }
-
     /* remove image tags from posted entry  (posts looks like this 'name_x')*/
     $s_entry  = preg_replace("/_.$/","",$s_entry);
 
@@ -165,6 +182,11 @@ class systems extends plugin
            }
     }
 
+    /* Activate multiple machines */
+    if(isset($_POST['menu_action']) && preg_match("/^activate_multiple/",$_POST['menu_action'])){
+      $s_action = "activate_multiple";
+    }
+
     /* Check for exeeded sizelimit */
     if (($message= check_sizelimit()) != ""){
       return($message);
@@ -175,6 +197,13 @@ class systems extends plugin
       return ($smarty->fetch(get_template_path('chooser.tpl', TRUE)));
     }
 
+    /* Incoming handling  
+     * If someone made a systemtype and ogroup selection 
+     * Display the new requested entry type ... servtab  in case of server and so on.
+     */
+    if(isset($_POST['SystemTypeChoosen'])){
+      $s_action = "SelectedSystemType";
+    }
 
     /********************
       Copy & Paste Handling  ...
@@ -192,7 +221,7 @@ class systems extends plugin
      ********************/
     if ($s_action=="gen_cd"){
       $this->dn= $this->terminals[$s_entry]['dn'];
-      session::set('objectinfo',$this->dn);
+      set_object_info($this->dn);
       return ($smarty->fetch(get_template_path('gencd.tpl', TRUE)));
     }
 
@@ -214,7 +243,7 @@ class systems extends plugin
       $dsc             = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));
 
       /* Get and check command */
-      $command= $this->config->search("workgeneric", "ISOCMD",array('tabs'));
+      $command= $this->config->search("workgeneric", "SYSTEMISOHOOK",array('tabs'));
       
       if (check_command($command)){
         @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
@@ -276,112 +305,284 @@ class systems extends plugin
 
 
     /********************
-      Create new system ...   
+      New Device handling  (Ogroup/System select dialog.)
      ********************/
-    /* Create new default terminal 
-     * Or create specified object of selected system type, from given incoming object  
+
+    /*  All objects that have to be activated are listed in 
+          $this->system_activation_object[] = "dn";
+      
+        If there is an object group selected we simply adopt all
+         settings from these group and then directly save the entry again.
+        If no object group was selected, then we keep the "edit" dialog of 
+         the target system opened to allow to edit the objects attributes.
      */
+  
+    if($s_action == "SelectedSystemType"){
+
+      /* Possible destination system types 
+       */
+      $tabs = $this->get_tab_defs();
+
+      /* Remember dialog selection.
+       */
+      $selected_group = $_POST['ObjectGroup'];
+      $selected_system = $_POST['SystemType'];
+
+      $this->systab = NULL;
+
+      /* Check if system type exists. It should! */
+      if(isset($tabs[$selected_system])){
+
+        /* Get tab informations */
+        $class    = $tabs[$selected_system]["CLASS"];
+        $tabname  = $tabs[$selected_system]["TABNAME"];
+        $tabclass = $tabs[$selected_system]["TABCLASS"];
+        $acl_cat  = $tabs[$selected_system]["ACLC"];
+
 
-    $save_object_directly = false;
-    if(($s_action == "SelectedSystemType") && (isset($_POST['ObjectGroup']) && ($_POST['ObjectGroup'] != "none"))){
-      $save_object_directly = true;
+        if(!class_available($tabclass)){
+          msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+        }else{
+
+          /* Go through all objects that should be activated 
+              Contains alls object dns that have to be activated ("New Devices" not unknown)
+            */
+          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;
+
+              /* This will be used when the object is saved, to set FAIstate to 'install'
+                  and to preset maybe other attributes.
+               */
+              $this->systab->was_activated = TRUE;
+
+              /* Assign some default values for opsi hosts 
+               */
+              if($this->systab instanceOf opsi_tabs){
+                $ldap = $this->config->get_ldap_link();
+                $ldap->cat($dn);
+                $source_attrs = $ldap->fetch();
+                foreach(array("macAddress" => "mac" ,"cn" => "hostId","description","description") as $src => $attr){
+                  if(isset($source_attrs[$src][0])){
+                    $this->systab->by_object['opsiGeneric']->$attr = $source_attrs[$src][0];
+                  }
+                }
+              }
+
+              if($selected_group != "none"){
+
+                /*******
+                 * Set gotoMode to active if 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);
+                }
+
+                /*******
+                 * 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= "";
+                  }
+                }
+
+                // 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;
+                }
+              }
+
+              /* 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();
+    
+                /* Post handling for activated new devices 
+                 */
+                $this->activate_new_device($this->systab->dn);
+                $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);
+                }
+              }
+            }else{
+              msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
+            }
+          }
+        }
+      }
     }
 
-    if (isset($_POST['create_system'])||$s_action=="newsystem"||$s_action == "SelectedSystemType") {
 
+    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 
        */ 
-      if($s_action == "SelectedSystemType") {
-        $sw         = $s_entry;
+      if(isset($_POST['system'])){
+        $sw = $_POST['system'];
       }else{
-        if(isset($_POST['system'])){
-          $sw = $_POST['system'];
-        }else{
-          $sw = $s_entry;
-        }
-        $this->dn= "new";
+        $sw = $s_entry;
       }
+      $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{
-          print_red(_("You are not allowed to create a new object of this type."));
+          msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
         }
       }
     }
 
+    /********************
+      System activation
+     ********************/
+
+    /* User wants to edit data? */
+    if (($s_action == "activate_multiple") && (!isset($this->systab->config))){
+      $this->system_activation_object = array();
+      foreach($this->list_get_selected_items() as $id) {
+        $obj = $this->terminals[$id];
+        $type= $this->get_system_type($obj);
+        if($type == "NewDevice"){
+          $this->system_activation_object[] = $obj['dn'];
+        }
+      }
+      if(count($this->system_activation_object)){
+        $this->systab = new SelectDeviceType($this->config,$this->system_activation_object) ;
+      }
+    }
+
+
     /********************
       Edit system ...   
      ********************/
 
     /* 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
          the dialog knows where to return. */
       if (($user= get_lock($this->dn)) != ""){
-        return(gen_locked_message ($user, $this->dn));
+        return(gen_locked_message ($user, $this->dn,TRUE));
       }
 
       /* 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{
+          add_lock ($this->dn, $this->ui->dn);
+          $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+        }
       }elseif($type == "NewDevice"){
-        $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+        if(!class_available("SelectDeviceType")){
+          msg_dialog::display(_("Error"), msgPool::class_not_found("SelectDeviceType"), ERROR_DIALOG);
+        }else{
+          add_lock ($this->dn, $this->ui->dn);
+          $this->system_activation_object= array($this->dn);
+          $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+
+          // see condition  -$s_action == "SelectedSystemType"-  for further handling
+        }
       }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{
+          add_lock ($this->dn, $this->ui->dn);
+          $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat);
+          $this->systab->set_acl_base($this->dn);
+          set_object_info($this->dn);
+        }
       }else{ 
-        print_red (_("You can't edit this object type yet!"));
-        del_lock($this->dn);
+        msg_dialog::display(_("Error"), _("Editing this type of object is not supported yet!"), ERROR_DIALOG);
+        $this->remove_lock();
       }
     }
 
@@ -392,23 +593,22 @@ class systems extends plugin
 
     /* Set terminals root password */
     if ($s_action=="change_pw"){
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABNAME"=>"termgeneric",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation"));
+      $tabs = $this->get_tab_defs();
 
+      $dn   = $this->terminals[$s_entry]['dn'];
       $type = $this->get_system_type($this->terminals[$s_entry]);
+
       $class    = $tabs[$type]["CLASS"];
-      $tabname  = $tabs[$type]["TABNAME"];
-      $acl_cat  = $tabs[$type]["ACL"];
+      $acl      = $tabs[$type]["ACL"];
       $tabclass = $tabs[$type]["TABCLASS"];
       $ui       = get_userinfo();
-      $tabacl   = $ui->get_permissions($this->DivListSystem->selectedBase,$acl_cat."/".$tabname,"gotoRootPasswd");
+      $tabacl   = $ui->get_permissions($dn,$acl,"userPassword");
       if(preg_match("/w/",$tabacl)){
         $this->dn= $this->terminals[$s_entry]['dn'];
-        session::set('objectinfo',$this->dn);
+        set_object_info($this->dn);
         return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
       }else{
-        print_red(_("You are not allowed to change the password for this object."));
+        msg_dialog::display(_("Permission error"), _("You have no permission to change this password!"), ERROR_DIALOG);
       }
     }
 
@@ -420,7 +620,7 @@ class systems extends plugin
     /* Correctly specified? */
     if (isset($_POST['password_finish'])){
       if ($_POST['new_password'] != $_POST['repeated_password']){
-        print_red (_("Passwords entered as new and repeated do not match!"));
+        msg_dialog::display(_("Error"), _("The passwords you've entered as 'New password' and 'Repeated password' do not match!"), ERROR_DIALOG);
         return($smarty->fetch(get_template_path('password.tpl', TRUE)));
       }
     }
@@ -434,52 +634,89 @@ class systems extends plugin
         $_POST['new_password'] == $_POST['repeated_password']){
 
       /* Check if user is allowed to set password */
-      $tabs = array(
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABNAME"=>"termgeneric",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation"));
+      $tabs = $this->get_tab_defs();
 
-      /* Detect object type */
       $type = "";
       foreach($this->terminals as $terminal){
         if($terminal['dn'] == $this->dn){
-          $type = $this->get_system_type($terminal);
+          $type  = $this->get_system_type($terminal);
           break;
         } 
       }
 
       /* Type detected */
-      if(!empty($type)){
+      $allow_for = array("terminal","workstation","server","component");
+      if(!empty($type) && in_array($type,$allow_for)){
 
         /* Get infos */
-        $class    = $tabs[$type]["CLASS"];
-        $tabname  = $tabs[$type]["TABNAME"];
-        $acl_cat  = $tabs[$type]["ACL"];
+        $plug     = $tabs[$type]["TABNAME"];
+        $acl      = $tabs[$type]["ACL"];
         $tabclass = $tabs[$type]["TABCLASS"];
-    
+   
         /* Get acls */
         $ui       = get_userinfo();
-        $tabacl   = $ui->get_permissions($this->DivListSystem->selectedBase,$acl_cat."/".$tabname,"gotoRootPasswd");
+        $tabacl   = $ui->get_permissions($this->dn,$acl,"userPassword");
 
         /* Check acls */
         if(preg_match("/w/",$tabacl)){
           $ldap = $this->config->get_ldap_link();
           $ldap->cd($this->dn);
+          $ldap->cat($this->dn);
+          $old_attrs = $ldap->fetch();
 
           $attrs= array();
           if ($_POST['new_password'] == ""){
-            $attrs['gotoRootPasswd']= array();
+
+            /* Remove password attribute 
+             */
+            if(in_array("simpleSecurityObject",$old_attrs['objectClass'])){
+              $attrs['objectClass'] = array();
+              for($i = 0 ; $i < $old_attrs['objectClass']['count'] ; $i ++){
+                if(!preg_match("/simpleSecurityObject/i",$old_attrs['objectClass'][$i])){
+                  $attrs['objectClass'][] = $old_attrs['objectClass'][$i];
+                }
+              }
+            }
+            $attrs['userPassword']= array();
           } else {
-            $attrs['gotoRootPasswd']= crypt($_POST['new_password'],substr(session_id(),0,2));
+
+            /* Add/modify password attribute 
+             */
+            if(!in_array("simpleSecurityObject",$old_attrs['objectClass'])){
+              $attrs['objectClass'] = array();
+              for($i = 0 ; $i < $old_attrs['objectClass']['count'] ; $i ++){
+                $attrs['objectClass'][] = $old_attrs['objectClass'][$i];
+              }
+              $attrs['objectClass'][] = "simpleSecurityObject";
+            }
+
+            if(class_available("passwordMethodCrypt")){
+              $pwd_m = new passwordMethodCrypt($this->config);
+              $pwd_m->set_hash("crypt/md5");
+              $attrs['userPassword'] = $pwd_m->generate_hash($_POST['new_password']);
+            }else{
+              msg_dialog::display(_("Password method"),_("Password method crypt is missing. Cannot set system password."));
+              $attrs = array();
+            }
           }
           $ldap->modify($attrs);
+          if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, $type));
+          }else{
+            if(class_available($plug)){ 
+              $p = new $plug($this->config,$this->dn);
+              $p->handle_post_events("modify");
+            }
+          }
+  
           new log("security","systems/".get_class($this),$this->dn,array_keys($attrs),$ldap->get_error());
         }else{
-          print_red(_("You are not allowed to change the password for this object."));
+          msg_dialog::display(_("Permission error"), _("You have no permission to change this password!"), ERROR_DIALOG);
         }
       }else{
-        print_red(_("Can't detect object to change password."));
+        msg_dialog::display(_("Error"), _("Cannot determine object to change password!"), ERROR_DIALOG);
       }
-      session::un_set('objectinfo');
+      set_object_info();
     }
 
 
@@ -489,8 +726,8 @@ class systems extends plugin
 
     /* Delete terminal canceled? */
     if (isset($_POST['delete_cancel']) || isset($_POST['password_cancel'])){
-      del_lock ($this->dn);
-      session::un_set('objectinfo');
+      $this->remove_lock();
+      set_object_info();
     }
 
 
@@ -506,19 +743,58 @@ class systems extends plugin
       $this->dns = array();
       $ids = $this->list_get_selected_items();
 
-      if(count($ids)){
+      /* Handle opsi actions */
+      if($s_action == "trigger_event_DaemonEvent_reinstall"){
+        foreach($ids as $key => $id){
+          if($this->terminals[$id]['type'] == "O"){
+            $obj = $this->terminals[$id];
+            $this->opsi->job_opsi_install_client($obj['cn'][0],$obj['macAddress'][0]);
+            unset($ids[$key]);
+          }
+        }
+      }
+
+      if(count($ids) && class_available("DaemonEvent")){
         $mac= array();
 
+        /* Collect target mac addresses */
         $ldap = $this->config->get_ldap_link();
         foreach($ids as $id){
-          $ldap->cat ($this->terminals[$id]['dn'], array("macAddress"));
-          $attrs= $ldap->fetch();
-          if (isset($attrs['macAddress'][0])){
-            $mac[]= $attrs['macAddress'][0];
+          $type = $this->get_system_type($this->terminals[$id]);
+          if(!in_array($type,array("terminal","server","workstation","opsi_client","winstation "))) continue;
+          if(isset($this->terminals[$id]['macAddress'][0])){
+            $mac[] = $this->terminals[$id]['macAddress'][0];
+          }else{
+            $ldap->cat ($this->terminals[$id]['dn'], array("macAddress"));
+            $attrs= $ldap->fetch();
+            if (isset($attrs['macAddress'][0])){
+              $mac[]= $attrs['macAddress'][0];
+            }
           }
         }
         $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
         $type = preg_replace("/^[a-z]*_event_/","",$s_action);
+        $o_queue = new gosaSupportDaemon();
+
+        /* Skip installation or update trigerred events, 
+         *  if this entry is currently processing.
+         */
+        if(preg_match("/trigger_event/",$s_action) && in_array($type,array("DaemonEvent_reinstall","DaemonEvent_update"))){
+          foreach($mac as $key => $mac_address){
+            foreach($o_queue->get_entries_by_mac(array($mac_address)) as $entry){
+
+              $entry['STATUS'] = strtoupper($entry['STATUS']);
+              if($entry['STATUS'] == "PROCESSING" && 
+                  isset($events['QUEUED'][$entry['HEADERTAG']]) && 
+                  in_array($events['QUEUED'][$entry['HEADERTAG']],array("DaemonEvent_reinstall","DaemonEvent_update"))){
+                unset($mac[$key]);
+
+                new log("security","systems/".get_class($this),"",array(),"Skip adding 'DaemonEvent::".$type."' for mac '".$mac_address."', there is already a job in progress.");
+                break;
+              }
+            }
+          }
+        }        
 
         /* Prepare event to be added 
          */
@@ -536,7 +812,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 
@@ -545,8 +821,7 @@ class systems extends plugin
         $o_queue = new gosaSupportDaemon();
         $o_queue->append($this->systab);
         if($o_queue->is_error()){
-          msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                $o_queue->get_error()),ERROR_DIALOG);
+          msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
         }else{
           $this->systab = FALSE;
         }
@@ -561,35 +836,56 @@ 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();
+
+      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)){
 
+        $disallowed = array();
         foreach($ids as $id){
-          $dn = $this->terminals[$id]['dn'];
-          $this->dns[$id] = $dn;
-        }
-        if ($user= get_multiple_locks($this->dns)){
-          return(gen_locked_message($user,$this->dns));
+
+          /* Get 'dn' from posted termlinst */
+          $attrs  = $this->terminals[$id];
+          $type   = $this->get_system_type($attrs);
+          $dn     = $attrs['dn'];
+          $acl = $this->ui->get_permissions($dn, $tabs[$type]['ACL']);
+          if(preg_match("/d/",$acl)){
+            $this->dns[$id] = $dn;
+          }else{
+            $disallowed[] = $dn;
+          }
         }
 
-        $dns_names = "<br><pre>";
-        foreach($this->dns as $dn){
-          add_lock ($dn, $this->ui->dn);
-          $dns_names .= $dn."\n";
+        if(count($disallowed)){
+          msg_dialog::display(_("Permission"),msgPool::permDelete($disallowed),INFO_DIALOG);
         }
-        $dns_names .="</pre>";
 
-        /* Lock the current entry, so nobody will edit it during deletion */
-        if (count($this->dns) == 1){
-          $smarty->assign("warning",     sprintf(_("You're about to delete the following entry %s"), @LDAP::fix($dns_names)));
-        } else {
-          $smarty->assign("warning",     sprintf(_("You're about to delete the following entries %s"), @LDAP::fix($dns_names)));
+        if(count($this->dns)){
+
+          if ($user= get_multiple_locks($this->dns)){
+            return(gen_locked_message($user,$this->dns));
+          }
+
+          $dns_names = array();
+          foreach($this->dns as $dn){
+            add_lock ($dn, $this->ui->dn);
+            $dns_names[] = LDAP::fix($dn);
+          }
+
+          /* Lock the current entry, so nobody will edit it during deletion */
+          $smarty->assign("warning", msgPool::deleteInfo($dns_names));
+          $smarty->assign("multiple", true);
+          return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
         }
-        $smarty->assign("multiple", true);
-        return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       }
     }
 
@@ -602,17 +898,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){
@@ -654,13 +940,14 @@ class systems extends plugin
           } else {
             /* Normally this shouldn't be reached, send some extra
                logs to notify the administrator */
-            print_red (_("You are not allowed to delete this component!"));
+            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 */
-          del_lock ($dn);
-          unset($this->dns[$key]);
         }
+
+        /* Remove lock file after successfull deletion */
+        $this->remove_lock();
+        $this->dns = array();
       }
     }
 
@@ -670,276 +957,83 @@ class systems extends plugin
 
     /* Remove lock */
    if(isset($_POST['delete_multiple_system_cancel'])){
-      foreach($this->dns as $key => $dn){
-        del_lock ($dn);
-        unset($this->dns[$key]);
-      }
-    }
 
-
-    /********************
-      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", sprintf(_("You're about to delete all information about the component at '%s'."), @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. */
-        print_red (_("You are not allowed to delete this component!"));
-      }
-    }
+     /* Remove lock file after successfull deletion */
+     $this->remove_lock();
+     $this->dns = array();
+   }
 
 
     /********************
-      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 */
-        print_red (_("You are not allowed to delete this component!"));
-        new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
-      }
-
-      /* Remove lock file after successfull deletion */
-      del_lock ($this->dn);
-    }
-
-
-
-
-
-
-
-
-
-   /********************
       Edit system type finished, check if everything went ok
      ********************/
     /* Finish user edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->systab->config)) || $save_object_directly){
-
-      /* Check tabs, will feed message array */
-      $message = array();
-      if(!$save_object_directly){
-        $message = $this->systab->check();
-      }else{
-        $found = false;
-
-        /* Set gotoMode to active if we there was an ogroup selected . (save_object_directly) */
-        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){
-          print_red(sprintf(_("Can't set gotoMode to status 'active', the current object couldn't be identified.")));
-        }
 
+    /* Dirty workaround - MSG_DIALOG - OK
+      If a message dialog is shown and we press 'OK'
+       then try to save again.
+     */
+    foreach($_POST as $name => $value){
+      if(preg_match("/^MSG_OK/",$name)){
+        $_POST[$this->last_action] = TRUE;
       }
-      /* Save, or display error message? */
-      if (count($message) == 0){
+    }
 
-        /* Incoming behavior; you can select a system type and an ogroup membership.
-         * If this object is an Incoming object, session::get('SelectedSystemType') isset.
-         * Check if we must add the new object to an object group.
-         *
-         * If this is done, delete the old incoming entry... it is still there, because this is a new
-         * entry and not an edited one, so we will delete it.
-         *
-         */
+    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->systab->config))){
 
-        if(session::is_set('SelectedSystemType')){
-          $SelectedSystemType = session::get('SelectedSystemType');
-          if($SelectedSystemType['ogroup'] != "none"){
-            $og = new ogroup($this->config,$SelectedSystemType['ogroup']);
-            if($og){
-              $og->AddDelMembership($this->systab->dn);
-              $og->save();
-            }
-          }
-        }
+      /* If the save routine gets interrupted by a confirm dialog, 
+          store last action so we can trigger it again after 'Ok' was pressed.
+         (This is the case if a system gets modified while it is installing - GOsa si)
+       */
+      $this->last_action = ""; 
+      if(isset($_POST['edit_finish'])){
+        $this->last_action = "edit_finish"; 
+      }elseif(isset($_POST['edit_apply'])){
+        $this->last_action = "edit_apply";
+      }
 
-        /* Save terminal data to ldap */
-        $SelectedSystemType = session::get('SelectedSystemType');
-        if(isset($SelectedSystemType['ogroup']) && $SelectedSystemType['ogroup'] != 'none'){
-          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= "";
-            }
-          }
-        }
+      /* Check tabs, will feed message array */
+      $message = $this->systab->check();
 
+      /* Save, or display error message? */
+      if (count($message) == 0){
         $this->systab->save();
-        /* Get macAddress to be able to an installation event 
-         */ 
-        if($this->systab instanceof ArpNewDeviceTabs || session::is_set('SelectedSystemType')){
-          $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
-         
-          /* Get mac of currently edited entry */ 
-          $mac = "";
-          if($this->systab instanceof ArpNewDeviceTabs){
-            $mac = $this->systab->by_object['ArpNewDevice']->netConfigDNS->macAddress;
-          }else{
-            foreach(array("workgeneric","termgeneric","servgeneric") as $type){
-              if(isset($this->systab->by_object[$type]->netConfigDNS->macAddress)){
-                $mac = $this->systab->by_object[$type]->netConfigDNS->macAddress;
-                break;
-              }
-            } 
-          }
-
-          /* Add installation event
-           */
-          if(!empty($mac) && isset($events['BY_CLASS']['DaemonEvent_reinstall'])){
-            $evt = $events['BY_CLASS']['DaemonEvent_reinstall'];
-            $tmp = new $evt['CLASS_NAME']($this->config);
-            $tmp->add_targets(array($mac));
-            $tmp->set_type(SCHEDULED_EVENT);
-            $o_queue = new gosaSupportDaemon();
-            $o_queue->append($tmp);
-            if($o_queue->is_error()){
-              msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
-                    $o_queue->get_error()),ERROR_DIALOG);
-            }
-          }
-        }
 
-        if(session::is_set('SelectedSystemType')){
-          session::un_set('SelectedSystemType');
-          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);
-          }
+        /* Post handling for activated systems 
+            target opsi -> Remove source.
+            target gosa -> Activate system.
+         */
+        if($this->systab instanceOf opsi_tabs && $this->systab->was_activated){
+          $ldap = $this->config->get_ldap_link();
           $ldap->cd($this->config->current['BASE']);
+          $ldap->rmdir ($this->systab->dn);
+          @DEBUG(DEBUG_LDAP,__LINE__, __FUNCTION__, __FILE__,"Source removed: ".$this->systab->dn,"Opsi host activated.");
+        }elseif(isset($this->systab->was_activated) && $this->systab->was_activated){
+          $this->activate_new_device($this->systab->dn);
         }
 
         /* Terminal has been saved successfully, remove lock from LDAP. */
         if (!isset($_POST['edit_apply'])){
           if ($this->dn != "new"){
-            del_lock ($this->dn);
+            $this->remove_lock();
           }
 
           unset ($this->systab);
           $this->systab= NULL;
-          session::un_set('objectinfo');
+          set_object_info();
+        }else{
+      
+          /* Reinitialize tab */
+          if($this->systab instanceof tabs){
+            $this->systab->re_init();
+          }
         }
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msg_dialog::displayChecks($message);
       }
     }
 
@@ -950,16 +1044,11 @@ class systems extends plugin
     /* Cancel dialogs */
     if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) || isset($_POST['SystemTypeAborted'])){
       if (isset($this->systab)){
-        del_lock ($this->systab->dn);
+        $this->remove_lock();
         unset ($this->systab);
       }
       $this->systab= NULL;
-      session::un_set('objectinfo');
-
-      /* Remove ogroup selection, which was set while editing a new incoming entry */
-      if(session::is_set('SelectedSystemType')){
-        session::un_set('SelectedSystemType');
-      }
+      set_object_info();
     }
 
     /********************
@@ -968,13 +1057,18 @@ class systems extends plugin
 
     /* Show tab dialog if object is present */
     if (isset($this->systab->config)){
+
+      if($this->systab instanceOf plugin && !($this->systab instanceOf tabs)){
+        $this->systab->save_object();
+      }
+
       $display= $this->systab->execute();
 
       /* Don't show buttons if tab dialog requests this */
 
       $dialog     = FALSE;
       $hide_apply = $this->dn == "new";
-      $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->dn));
+      $hide_apply = ($this->dn == "new") || (preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/",$this->dn));
       if(is_object($this->systab) && !isset($this->systab->by_object)){
         $dialog = TRUE;
         $hide_apply = TRUE;
@@ -989,15 +1083,19 @@ class systems extends plugin
         $dialog = TRUE;
       }
 
-      if (!$dialog){
+      if(($this->systab instanceOf tabs || $this->systab instanceOf plugin) && $this->systab->read_only == TRUE){
+        $display.= "<p style=\"text-align:right\">
+          <input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">
+          </p>";
+      }elseif (!$dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
         $display.= "&nbsp;\n";
         if (!$hide_apply){
-          $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+          $display.= "<input type=submit name=\"edit_apply\" value=\"".msgPool::applyButton()."\">\n";
           $display.= "&nbsp;\n";
         }
-        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
         $display.= "</p>";
       }
       return ($display);
@@ -1005,7 +1103,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);
     }
 
@@ -1015,7 +1113,13 @@ class systems extends plugin
 
     /* Add departments if subsearch is disabled */
     if(!$this->DivListSystem->SubSearch){
-      $this->DivListSystem->AddDepartments($this->DivListSystem->selectedBase,3,1);
+
+      /* Add FAIstate to attributes if FAI is activated */
+      if($this->fai_activated){
+        $this->DivListSystem->AddDepartments($this->DivListSystem->selectedBase,4,1);
+      }else{
+        $this->DivListSystem->AddDepartments($this->DivListSystem->selectedBase,3,1);
+      }
     }
     $this->reload();
     $this->DivListSystem->setEntries($this->terminals);
@@ -1031,14 +1135,14 @@ class systems extends plugin
     /* Check acls, if we are not allowed to create and write each plugin tab, skip this object */
 
     $tabs = array(
-        "terminal"        => get_ou('terminalou'),
-        "workstation"     => get_ou('workstationou'),
-        "incoming"        => get_ou('incomingou'),
-        "server"          => get_ou('serverou'),
-        "printer"         => get_ou('printerou'),
-        "phone"           => get_ou('phoneou'),
+        "terminal"        => get_ou('terminalRDN'),
+        "workstation"     => get_ou('workstationRDN'),
+        "incoming"        => get_ou('systemIncomingRDN'),
+        "server"          => get_ou('serverRDN'),
+        "printer"         => get_ou('printerRDN'),
+        "phone"           => get_ou('phoneRDN'),
         "winworkstation"  => get_winstations_ou(),
-        "component"       => get_ou('componentou')
+        "component"       => get_ou('componentRDN')
         ); 
 
     foreach($tabs as $acl_cat => $dn){
@@ -1063,6 +1167,9 @@ class systems extends plugin
   function save_object()
   {
     $this->DivListSystem->save_object();
+    if(is_object($this->CopyPasteHandler)){
+      $this->CopyPasteHandler->save_object();
+    }
   }
 
 
@@ -1077,7 +1184,7 @@ class systems extends plugin
   {
   }
 
-  function adapt_from_template($dn)
+  function adapt_from_template($dn, $skip= array())
   {
   }
 
@@ -1092,6 +1199,7 @@ class systems extends plugin
     $res              = array();
     $this->terminals  = array();
     $userregex        = "";
+    $opsi_clients     = array();
 
     /* Set base for all searches */
     $base=  $this->DivListSystem->selectedBase;
@@ -1099,7 +1207,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";
@@ -1108,13 +1216,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('serverRDN')),
+        "ShowTerminals"      => array("TAB" => "termtabs",      "CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalRDN')),
+        "ShowPrinters"       => array("TAB" => "printtabs",     "CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerRDN')),
+        "ShowDevices"        => array("TAB" => "componenttabs", "CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentRDN')),
+        "ShowPhones"         => array("TAB" => "phonetabs",     "CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneRDN')),
+        "ShowWorkstations"   => array("TAB" => "worktabs",      "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationRDN')),
+        "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!= "*")){
@@ -1122,8 +1230,8 @@ class systems extends plugin
     }
 
     /* Attributes to fetch */
-    $sys_attrs        = array("cn", "description", "macAddress", "objectClass", "sambaDomainName","gotoMode");
-    $sys_categories   = array("terminal", "workstation", "server", "phone" ,"printer","incoming");
+    $sys_attrs        = array("cn", "description", "macAddress", "objectClass", "sambaDomainName","gotoMode","FAIclass");
+    $sys_categories   = array("terminal", "workstation", "server", "phone" ,"printer","incoming","winworkstation","component");
 
     /* Add FAIstate to attributes if FAI is activated */
     $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
@@ -1132,17 +1240,19 @@ class systems extends plugin
     }    
 
     /* Walk through all possible search combinations, and search for some objects if the checkbox is enabled  */
-    $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
     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."))";
             $new_res = get_sub_list($filter, $sys_categories ,$oc['TREE'], $base,$sys_attrs, GL_SUBSEARCH | GL_SIZELIMIT);
             $res = array_merge($res,$new_res);
           }
         }else{
           /* User filter? */
           if($oc['CLASS'] != ""){
+            $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
             $res = array_merge($res,get_list($filter,$sys_categories,$oc['TREE'].$base, $sys_attrs,  GL_SIZELIMIT));
           }
         }
@@ -1150,9 +1260,25 @@ class systems extends plugin
     }
 
     /* Search for incoming objects */ 
-    $res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT));
+    $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
+    $res = array_merge($res,get_list($filter,$sys_categories, get_ou('systemIncomingRDN').$base,$sys_attrs, GL_SIZELIMIT));
 
+    /* Append opsi systems, the opsi extension have to installed.
+        (Only, if we are allowed to view opsi hosts)
+     */
+    if($this->opsi instanceof opsi && $this->opsi->enabled() && $this->DivListSystem->ShowOpsiHosts){
+      $o_acl = $this->ui->get_permissions($base,"opsi/opsiGeneric","");
+      if(preg_match("/r/",$o_acl)){
+        $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'];
@@ -1166,13 +1292,13 @@ class systems extends plugin
       }
 
       /* Create a string containing the last part of the department. */
-      $dn_name = preg_replace("#^([^/]+/)*#","",convert_department_dn(@LDAP::fix($tmp)));
+      $dn_name = preg_replace("#^([^/]+/)*#","",convert_department_dn(LDAP::fix($tmp)));
       if(empty($dn_name)){
         $dn_name = "/";
       }
 
       /* check if current object is a new one */
-      if (preg_match ("/,".get_ou('incomingou')."/i", $tmp)){
+      if (preg_match ("/,".get_ou('systemIncomingRDN')."/i", $tmp)){
         if (in_array_ics('gotoTerminal', $value['objectClass'])){
           $add= "- "._("New terminal");
         }elseif (in_array_ics('gotoWorkstation', $value['objectClass'])){
@@ -1186,7 +1312,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");
@@ -1216,9 +1349,9 @@ class systems extends plugin
             $terminal['location'] = array_search($tmp, $this->config->departments);
             $terminal['message']  = _("Workstation template for")."&nbsp;'".$dn_name."'&nbsp;";
           }
-          if (isset($value["FAIstate"][0])){
-            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
-          }
+#          if (isset($value["FAIstate"][0])){
+#            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
+#          }
         }
       } elseif (in_array_ics('gotoPrinter', $value["objectClass"])){
        
@@ -1236,9 +1369,9 @@ class systems extends plugin
 
           $terminal             = $value;
           $terminal['type']     = "S";
-          if (isset($value["FAIstate"][0])){
-            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
-          }
+#          if (isset($value["FAIstate"][0])){
+#            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
+#          }
         }
       } elseif (in_array_ics('goFonHardware', $value["objectClass"])){
 
@@ -1259,8 +1392,9 @@ class systems extends plugin
           $terminal['type']   = "Q";
           $terminal['is_new'] = $add;
         }
-      } elseif (in_array_ics('ieee802Device', $value["objectClass"])){
-
+      } elseif (in_array_ics('ieee802Device', $value["objectClass"]) && 
+        !( in_array_ics('sambaAccount', $value["objectClass"]) || in_array_ics('sambaSamAccount', $value["objectClass"]))){
+        $type= "winstation";
         $acl = $ui->get_permissions($value['dn'],"component/componentGeneric");
         if($add != "" || preg_match("/r/",$acl)) {
 
@@ -1275,16 +1409,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 ){
@@ -1303,6 +1458,11 @@ class systems extends plugin
   {
     if (isset($this->systab->dn)){
       del_lock ($this->systab->dn);
+    }elseif(isset($this->dn) && !empty($this->dn) && $this->dn != "new"){
+      del_lock($this->dn);
+    }
+    if(isset($this->dns) && is_array($this->dns) && count($this->dns)){
+      del_lock($this->dns);
     }
   }
 
@@ -1314,20 +1474,9 @@ class systems extends plugin
       return("");
     }
 
-
-    $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"));
+    $ui = get_userinfo();
+    
+    $tabs = $this->get_tab_defs();
 
     /* Add a single entry to queue */
     if($s_action == "cut" || $s_action == "copy"){
@@ -1340,9 +1489,15 @@ class systems extends plugin
 
       $tab_o  = $tabs[$type]['CLASS'];
       $tab_c  = $tabs[$type]['TABCLASS'];
-      $acl    = $tabs[$type]['ACL'];
+      $acl_c  = $tabs[$type]['TABNAME'];
+      $acl    = $tabs[$type]['ACLC'];
 
-      $this->CopyPasteHandler->add_to_queue($dn,$s_action,$tab_c,$tab_o,$acl);
+      if($s_action == "copy" && $ui->is_copyable($dn,$acl,$acl_c)){
+        $this->CopyPasteHandler->add_to_queue($dn,$s_action,$tab_c,$tab_o,$acl);
+      }
+      if($s_action == "cut" && $ui->is_cutable($dn,$acl,$acl_c)){
+        $this->CopyPasteHandler->add_to_queue($dn,$s_action,$tab_c,$tab_o,$acl);
+      }
     }
 
     /* Add entries to queue */
@@ -1360,12 +1515,13 @@ class systems extends plugin
         if(isset($tabs[$type])){
           $tab_o  = $tabs[$type]['CLASS'];
           $tab_c  = $tabs[$type]['TABCLASS'];
-          $acl    = $tabs[$type]['ACL'];
+          $acl_c  = $tabs[$type]['TABNAME'];
+          $acl    = $tabs[$type]['ACLC'];
 
-          if($s_action == "copy_multiple"){
+          if($s_action == "copy_multiple" && $ui->is_copyable($dn,$acl,$acl_c)){ 
             $this->CopyPasteHandler->add_to_queue($dn,"copy",$tab_c,$tab_o,$acl);
           }
-          if($s_action == "cut_multiple"){
+          if($s_action == "cut_multiple" && $ui->is_cutable($dn,$acl,$acl_c)){
             $this->CopyPasteHandler->add_to_queue($dn,"cut",$tab_c,$tab_o,$acl);
           }
         }
@@ -1381,8 +1537,8 @@ class systems extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListSystem->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){
@@ -1403,7 +1559,12 @@ 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('sambaAccount', $classes) ||
+        in_array_ics('sambaSamAccount', $classes)){
+      $type= "winstation";
+    }elseif (in_array_ics('ieee802Device', $classes)){
       $type= "component";
     }elseif (in_array_ics('gotoTerminal', $classes)){
       $type= "terminal";
@@ -1419,9 +1580,6 @@ class systems extends plugin
       $type= "ArpNewDevice";
     }elseif (in_array_ics('GOhard', $classes)){
       $type= "NewDevice";
-    }elseif (in_array_ics('sambaAccount', $classes) ||
-        in_array_ics('sambaSamAccount', $classes)){
-      $type= "winstation";
     }
     return ($type);
   }
@@ -1430,59 +1588,94 @@ class systems extends plugin
   function convert_list($input)
   {
     $temp= "";
-    $conv= array(      
-        "NQ" => array("select_newsystem.png",_("New System from incoming")),
-        "D" => array("select_default.png",_("Template")),
-        "T" => array("select_terminal.png",_("Terminal")),
-        "L" => array("select_workstation.png",_("Workstation")),
-        "GL" => array("select_workstation_green.png",_("Workstation is installing")),
-        "YL" => array("select_workstation_yellow.png",_("Workstation is waiting for action")),
-        "RL" => array("select_workstation_red.png",_("Workstation installation failed")),
-        "F" => array("select_phone.png",_("Phone")),
-        "S" => array("select_server.png",_("Server")),
-        "GS" => array("select_server_green.png",_("Server is installing")),
-        "YS" => array("select_server_yellow.png",_("Server is waiting for action")),
-        "RS" => array("select_server_red.png",_("Server installation failed")),
-        "W" => array("select_winstation.png",_("Winstation")),
-        "C" => array("select_component.png",_("Network Device")),
-        "NT"=> array("select_new_terminal.png",_("New Terminal")),
-        "NL"=> array("select_new_workstation.png",_("New Workstation")),
-        "P" => array("select_printer.png",_("Printer")));
 
+    $conv= array(
+        "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",_("Windows 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")),
+
+        "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")),
+
+        "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")),
+
+        "LB" => array("plugins/systems/images/workstation_busy.png",_("Workstation busy")),
+        "SB" => array("plugins/systems/images/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")));
+
+    /* Add opsi client to system types */
+    if($this->opsi != NULL){
+        $conv["O"] = array("plugins/systems/images/select_winstation.png",_("Opsi client"));
+    }
+
+    /* Use locked icons 
+     */
+    if( in_array($input['type'],array("S","T","L")) && 
+        isset($input['gotoMode'][0]) && 
+        preg_match("/locked/",$input['gotoMode'][0])){
+      $input['type'].="X";
+    } elseif(in_array($input['type'],array("S","L")) &&
+        isset($input['FAIstate'][0])){
+
+    /* Add FAI state icons 
+     */
+      $type= "";
+      switch (preg_replace('/:.*$/', '', $input['FAIstate'][0])) {
+        case 'error':
+          $type= 'E';
+          break;
+        case 'installing':
+        case 'install':
+        case 'sysinfo':
+        case 'softupdate':
+        case 'scheduledupdate':
+          $type= 'B';
+          break;
+      }
+
+      $input['type'].= $type;
+    }   
+
+    /* Use new images if object is from incoming 
+     */
     if((isset($input['is_new']))&&(!empty($input['is_new']))){
       $input['type']="N".$input['type'];
     }
+
+    /* Check which flags this objects uses 
+     */
     foreach ($conv  as $key => $value){
-      if($input['type']==$key){
-        $tmp['img'] ="<img class='center' src='images/".$value[0]."' alt='".$key."' title='".$value['1']."'>";
+      $found = TRUE;
+      if(strlen($key) != strlen($input['type'])) {
+        $found = FALSE;
+      }
+      for($i = 0 ; $i < strlen($key) ; $i++){
+        if(!preg_match("/".$key[$i]."/",$input['type'])){
+          $found = FALSE;
+        }
+     }
+
+      if($found){
+        $tmp['img'] ="<img class='center' src='".$value[0]."' alt='".$key."' title='".$value['1']."'>";
         $tmp['class']=$key;
         return $tmp;
       }
     }
   }
 
-  
-  function getState($type, $state)
-  {
-    switch (preg_replace('/:.*$/', '', $state)) {
-      case 'installing':
-                $type= 'G'.$type;
-                break;
-      case 'error':
-                $type= 'R'.$type;
-                break;
-      case 'install':
-      case 'sysinfo':
-      case 'softupdate':
-      case 'scheduledupdate':
-                $type= 'Y'.$type;
-                break;
-    }
-
-
-    return ($type);
-  }
-
 
   function list_get_selected_items()
   {
@@ -1497,6 +1690,129 @@ 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);
+  }
+
+
+  /*! \brief  Sets FAIstate to "install" for "New Devices".
+              This function is some kind of "Post handler" for activated systems,
+               it is called directly after the object (workstabs,servtabs) gets saved.  
+      @param  String  $dn   The dn of the newly activated object.
+      @return Boolean TRUE if activated else FALSE
+   */
+  function activate_new_device($dn)
+  {
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+    $ldap->cat($dn);
+    if($ldap->count()){
+      $attrs = $ldap->fetch();
+      $type  = $this->get_system_type($attrs);
+      if(!in_array($type,array("workstation","server"))) {
+        $ocs = $attrs['objectClass'];
+        unset($ocs['count']);
+        $new_attrs = array();
+        if(!in_array("FAIobject",$ocs)){
+          $ocs[] = "FAIobject";
+          $new_attrs['objectClass'] = $ocs;
+        }
+        $new_attrs['FAIstate'] = "install";
+        $ldap->cd($dn);
+        $ldap->modify($new_attrs);
+        if (!$ldap->success()){
+          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 
+                LDAP_MOD, "activate_new_device($dn)"));
+        }else{
+          return(TRUE);
+        }
+      }
+    }
+    return(FALSE);
+  }
+
+
   /* !! Incoming dummy acls, required to defined acls for incoming objects
    */
   static function plInfo()
@@ -1514,10 +1830,6 @@ class systems extends plugin
             
           ));
   }
-
-
-  
-
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: