Code

Fixed handling for new systems.
[gosa.git] / plugins / admin / systems / class_systemManagement.inc
index 66ff41e5c5a1ed98a61c6c71655169110a6df1ad..77c6eb364a81306ab70508cbad81cafd843834d2 100644 (file)
@@ -24,6 +24,7 @@ require "tabs_phone.inc";
 require "tabs_server.inc";
 require "tabs_component.inc";
 require "tabs_winstation.inc";
+require "tabs_arpnewdevice.inc";
 
 
 class systems extends plugin
@@ -38,6 +39,7 @@ class systems extends plugin
   var $terminals= array();
   var $ui= NULL;
   var $acl= "";
+  var $DivListSystem;
 
   function systems ($config, $ui)
   {
@@ -45,22 +47,8 @@ class systems extends plugin
     $this->config= $config;
     $this->ui= $ui;
 
-    /* Get global filter config */
-    if (!is_global("terminalfilter")){
-      $ui   = get_userinfo();
-      $base = get_base_from_people($ui->dn);
-      $terminalfilter= array("workstations" => "checked",
-          "thins" => "checked",
-          "winstations" => "checked",
-          "servers" => "checked",
-          "printers" => "checked",
-          "phones" => "checked",
-          "netdev" => "checked",
-          "user" => "*",
-          "depselect" => $base,
-          "regex" => "*");
-      register_global("terminalfilter", $terminalfilter);
-    }
+    /* Creat dialog object */
+    $this->DivListSystem = new divListSystem($this->config,$this);
   }
 
   function execute()
@@ -70,39 +58,6 @@ class systems extends plugin
 
     $_SESSION['LOCK_VARS_TO_USE'] = array("/^user_edit_/i","/^user_del_/","/^act/","/^id/");
 
-    /********************
-      Filter handling, check posted filter options and store them in our Session obejct
-     ********************/
-  
-    /* Save posted filter data */
-    $terminalfilter= get_global("terminalfilter");
-    foreach( array("depselect", "user", "regex") as $type){
-      if (isset($_POST[$type])){
-        $terminalfilter[$type]= $_POST[$type];
-      }
-    }
-
-    /* Check if filter checkboxes are selected */
-    if (isset($_POST['depselect'])){
-      foreach( array("workstations", "thins", "winstations", "printers", "phones", "servers", "netdev") as $type){
-        if (isset($_POST[$type])) {
-          $terminalfilter[$type]= "checked";
-        } else {
-          $terminalfilter[$type]= "";
-        }
-      }
-    }
-
-    /* Check for search post */
-    if (isset($_GET['search'])){
-      $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
-      if ($s == "**"){
-        $s= "*";
-      }
-      $terminalfilter['regex']= $s;
-    }
-
-
     /********************
       Check for functional posts, edit|delete|add|... system devices 
      ********************/
@@ -111,14 +66,6 @@ class systems extends plugin
     $base_back    = "";                       // The Link for Backbutton
     $smarty       = get_smarty();
 
-    /* check if base was changed */
-    if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
-            $s_action="open";
-            $s_entry = base64_decode($_GET['dep_id']);
-            $terminalfilter['depselect']= "".$this->config->departments[trim($s_entry)];
-            $this->reload();
-    }
-
     /* Test Posts */
     foreach($_POST as $key => $val){
       // Post for delete
@@ -130,32 +77,30 @@ class systems extends plugin
         $s_action="edit";
         $s_entry  = preg_replace("/user_".$s_action."_/i","",$key);
         // Post for new
-      }elseif(preg_match("/dep_back.*/i",$key)){
-        $s_action="back";
       }elseif(preg_match("/user_new.*/",$key)){
         $s_action="new";
-      }elseif(preg_match("/dep_home.*/i",$key)){
-        $s_action="home";
       }elseif(preg_match("/user_tplnew.*/i",$key)){
         $s_action="new_tpl";
       }elseif(preg_match("/user_setpwd_.*/i",$key)){
         $s_action="change_pw";
         $s_entry  = preg_replace("/user_setpwd_/i","",$key);
-      }elseif(preg_match("/dep_root.*/i",$key)){
-        $s_action="root";
+      }elseif(preg_match("/gen_cd_.*/i",$key)){
+        $s_action="gen_cd";
+        $s_entry  = preg_replace("/gen_cd_/i","",$key);
       }elseif(preg_match("/newsystem_.*/i",$key)){
         $s_action="newsystem";
         $s_entry  = preg_replace("/newsystem_/i","",$key);
       }
     }
 
-    /* 09.02.2006 : New incoming handling ; hickert
+    /* 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";
       $s_entry  = $_POST['SystemType'];
+      $_SESSION['SelectedSystemType']['ogroup'] = $_POST['ObjectGroup'];
       $this->systab = NULL;
     }
 
@@ -168,38 +113,6 @@ class systems extends plugin
       $s_entry  = $_GET['id'];
     }
 
-    /* Department changed? */
-    if(isset($_POST['depselect']) && $_POST['depselect']){
-      $terminalfilter['depselect']= $_POST['depselect'];
-    }
-
-    /* Homebutton is posted */
-    if($s_action=="home"){
-      $terminalfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
-      $terminalfilter['depselect']=(preg_replace("/^[^,]+,/","",$terminalfilter['depselect']));
-    }
-
-    /* back to the roots ^^ */
-    if($s_action=="root"){
-      $terminalfilter['depselect']=($this->config->current['BASE']);
-    }
-
-    /* If Backbutton is Posted */
-    if($s_action=="back"){
-      $base_back          = preg_replace("/^[^,]+,/","",$terminalfilter['depselect']);
-      $base_back          = convert_department_dn($base_back);
-
-      if(isset($this->config->departments[trim($base_back)])){
-        $terminalfilter['depselect']= $this->config->departments[trim($base_back)];
-      }else{
-        $terminalfilter['depselect']= $this->config->departments["/"];
-      }
-    }
-
-    /* Save Termfilter .... */
-    register_global("terminalfilter", $terminalfilter);
-    $this->reload();
-    
     /* Check for exeeded sizelimit */
     if (($message= check_sizelimit()) != ""){
       return($message);
@@ -211,13 +124,17 @@ class systems extends plugin
     }
 
     /********************
-     Create new system ...   
+      Create new system ...   
      ********************/
     /* Create new default terminal 
-     *
-     * 09.02.2006 ; New incoming handling ; hickert
      * Or create specified object of selected system type, from given incoming object  
      */
+
+    $save_object_directly = false;
+    if(($s_action == "SelectedSystemType") && (isset($_POST['ObjectGroup']) && ($_POST['ObjectGroup'] != "none"))){
+      $save_object_directly = true;
+    }
+    
     if (isset($_POST['create_system'])||$s_action=="newsystem"||$s_action == "SelectedSystemType") {
 
       /* If the current entry is an incoming object 
@@ -225,114 +142,40 @@ class systems extends plugin
        */ 
       if($s_action == "SelectedSystemType") {
         $sw         = $s_entry;
-        $dn_backup  = $this->dn;
       }else{
         if(isset($_POST['system'])){
           $sw = $_POST['system'];
         }else{
           $sw = $s_entry;
         }
+        $this->dn= "new";
       }
-
-      $this->dn= "new";
       $this->acl= array(":all");
+      $tabs = array(
+          "terminal"    => array("CLASS"=>"TERMTABS",     "TABNAME"=>"termgeneric",     "TABCLASS" =>"termtabs"),
+          "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     "TABCLASS" =>"worktabs"),
+          "server"      => array("CLASS"=>"SERVTABS",     "TABNAME"=>"servgeneric",     "TABCLASS" =>"servtabs"),
+          "printer"     => array("CLASS"=>"PRINTTABS",    "TABNAME"=>"printgeneric",    "TABCLASS" =>"printtabs"),
+          "phone"       => array("CLASS"=>"PHONETABS",    "TABNAME"=>"phonegeneric",    "TABCLASS" =>"phonetabs"),
+          "component"   => array("CLASS"=>"COMPONENTTABS","TABNAME"=>"componentgeneric","TABCLASS" =>"componenttabs"));
 
-      switch ($sw){
-        case 'terminal':
-          $this->systab= new termtabs($this->config,
-              $this->config->data['TABS']['TERMTABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['termgeneric']->cn= "default";
-          $this->systab->by_object['termservice']->cn= "default";
-          $this->systab->by_object['termgeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
-
-        case 'workstation':
-          $this->systab= new worktabs($this->config,
-              $this->config->data['TABS']['WORKTABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['workgeneric']->cn= "wdefault";
-          $this->systab->by_object['workservice']->cn= "default";
-          $this->systab->by_object['workgeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
-
-        case 'server':
-          $this->systab= new servtabs($this->config,
-              $this->config->data['TABS']['SERVTABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['servgeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
-
-        case 'printer':
-          $this->systab= new printtabs($this->config,
-              $this->config->data['TABS']['PRINTTABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['printgeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
-
-        case 'phone':
-          $this->systab= new phonetabs($this->config,
-              $this->config->data['TABS']['PHONETABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['phonegeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
-
-        case 'component':
-          $this->systab= new componenttabs($this->config,
-              $this->config->data['TABS']['COMPONENTTABS'], $this->dn);
-          $this->systab->set_acl ($this->acl);
-          $this->systab->by_object['componentgeneric']->base = $_SESSION['terminalfilter']['depselect'];  
-          break;
+      if(isset($tabs[$sw])){
+        $class    = $tabs[$sw]["CLASS"];
+        $tabname  = $tabs[$sw]["TABNAME"];
+        $tabclass = $tabs[$sw]["TABCLASS"];
+        $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn);
+        $this->systab->set_acl ($this->acl);
+        $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+        $this->systab->base = $this->DivListSystem->selectedBase;
       }
-     
-      /* 09.02.2006 ; New incoming handling ; hickert.
-       * We must create a NEW object of given system type (Posted from SelectDeviceType).
-       * But we have to use the same attributes as used in incoming object, thats
-       * what we do here. 
-       */ 
-      if($s_action == "SelectedSystemType"){
-    
-        /* Store some informations, to be able to add this object to 
-         * To specified objectgroup and delete incoming object
-         */
-        $_SESSION['SelectedSystemType']['dn']     = $this->dn;
-        $_SESSION['SelectedSystemType']['server'] = $s_entry;
-        $_SESSION['SelectedSystemType']['ogroup'] = $_POST['ObjectGroup'];
-        
-        /* restore dn */
-        $this->dn = $dn_backup;
-
-        /* Get properties from incoming object */
-        $ldap = $this->config->get_ldap_link();
-        $ldap->cd($this->dn);
-        $ldap->cat($this->dn);
-        $res = $ldap->fetch();
-      
-        /* Unset not needed attributes */
-        unset($res['dn']);
-        unset($res['objectClass']);
-    
-        /* Walk through all tabs and set attributes if available */
-        foreach($this->systab->by_object as $name => $value){
-          foreach($this->systab->by_object[$name]->attributes as $atr){
-            if((isset($value))&&(isset($res[$atr]))){
-              $this->systab->by_object[$name]->$atr = $res[$atr][0];
-            }
-          }
-        }
-      }
-  
-      /* set base ... of current divlist position */
-      $this->systab->base = $_SESSION['terminalfilter']['depselect'];  
     }
 
-
     /********************
-     Edit system ...   
+      Edit system ...   
      ********************/
 
     /* User wants to edit data? */
-    if ($s_action == "edit"){
+    if (($s_action == "edit") && (!isset($this->systab->config))){
 
       $this->dn= $this->terminals[$s_entry]['dn'];
 
@@ -347,91 +190,129 @@ class systems extends plugin
 
       /* Find out more about the object type */
       $ldap= $this->config->get_ldap_link();
-      $ldap->cat($this->dn);
+      $ldap->cat($this->dn, array('objectClass','gotoMode'));
       $attrs= $ldap->fetch();
-      $type= $this->get_system_type($attrs['objectClass']);
+      $type= $this->get_system_type($attrs);
 
       /* Lock the current entry, so everyone will get the
          above dialog */
-
-      switch ($type){
-        case "NewDevice" :
-          $this->systab = new SelectDeviceType($this->config,$this->dn) ;
-        break;
-        case "terminal":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new termtabs($this->config,
-              $this->config->data['TABS']['TERMTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
-
-        case "server":
-
-          /* Register systab to trigger edit dialog */
-          $this->systab= new servtabs($this->config,$this->config->data['TABS']['SERVTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
-
-        case "workstation":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new worktabs($this->config,
-              $this->config->data['TABS']['WORKTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
-
-        case "printer":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new printtabs($this->config,
-              $this->config->data['TABS']['PRINTTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
-
-        case "phone":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new phonetabs($this->config,
-              $this->config->data['TABS']['PHONETABS'], $this->dn);
+      $tabs = array(
+          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs"),
+          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs"),
+          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs"),
+          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs"),
+          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs"),
+          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs"),
+          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs"));
+
+
+      if($type == "ArpNewDevice"){
+        $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+      }elseif($type == "NewDevice"){
+        $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+      }elseif(isset($tabs[$type])){
+
+        $class    = $tabs[$type]["CLASS"];
+        $tabclass = $tabs[$type]["TABCLASS"];
+
+        $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn);
         $this->systab->set_acl($acl);
         $_SESSION['objectinfo']= $this->dn;
         add_lock ($this->dn, $this->ui->dn);
-        break;
+      }else{ 
+        print_red (_("You can't edit this object type yet!"));
+        del_lock($this->dn);
+      }
+    }
 
-        case "component":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new componenttabs($this->config,
-              $this->config->data['TABS']['COMPONENTTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
+    /********************
+      Create FAI CD ...   
+     ********************/
+    if ($s_action=="gen_cd"){
+      $this->dn= $this->terminals[$s_entry]['dn'];
+      $_SESSION['objectinfo']= $this->dn;
+      return ($smarty->fetch(get_template_path('gencd.tpl', TRUE)));
+    }
 
-        case "winstation":
-          /* Register systab to trigger edit dialog */
-          $this->systab= new wintabs($this->config,
-              $this->config->data['TABS']['WINTABS'], $this->dn);
-        $this->systab->set_acl($acl);
-        $_SESSION['objectinfo']= $this->dn;
-        add_lock ($this->dn, $this->ui->dn);
-        break;
+    /* Start CD-Creation */
+    if (isset($_POST["cd_create"])){
+      $smarty->assign("src", "?plug=".$_GET['plug']."&PerformIsoCreation");
+      return ($smarty->fetch(get_template_path('gencd_frame.tpl', TRUE)));
+    }
+  
+    if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){
+
+      $return_button   = "<form method='get' action='main.php' target='_parent'>
+                            <input type='submit' value='"._("Back")."'>
+                            <input type='hidden' name='plug' value='".$_GET['plug']."'/>
+                          </form>";
+
+      $dsc             = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));
+
+      /* Get and check command */
+      $command= search_config($this->config->data['TABS'], "workgeneric", "ISOCMD");
+      if (check_command($command)){
+        @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
+
+        /* Print out html introduction */
+        echo '  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+                <html>
+                  <head>
+                    <title></title>
+                    <style type="text/css">@import url("themes/default/style.css");</style>
+                    <script language="javascript" src="include/focus.js" type="text/javascript"></script>
+                  </head>
+                  <body style="background: none; margin:4px;" id="body" >
+                  <pre>';
+
+        /* Open process handle and check if it is a valid process */
+        $process= proc_open($command." '".$this->dn."'", $dsc, $pipes);
+        if (is_resource($process)) {
+          fclose($pipes[0]);
+
+          /* Print out returned lines && write JS to scroll down each line */
+          while (!feof($pipes[1])){
+            $cur_dat = fgets($pipes[1], 1024);
+            echo $cur_dat;
+            echo '<script language="javascript" type="text/javascript">scrollDown2();</script>' ;
+            flush();
+          }
+        }
+    
+        /* Get error string && close streams */
+        $buffer = "";
+        while (!feof($pipes[2])){
+          $buffer .= fgets($pipes[2],256);
+        }
+      
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        echo "</pre>";
+      
+        /* Check return code */ 
+        $ret= proc_close($process);
+        if ($ret != 0){
+          echo "<h1 style='color:red'>"._("Creating the image failed. Please see the report below.")."</h1>";
+          echo "<pre style='color:red'>$buffer</pre>";
+        }
 
+        echo $return_button."<br>";
 
-        default:
-        print_red (_("You can't edit this object type yet!"));
-        del_lock($this->dn);
-        break;
+      } else {
+        $tmp= "<h1 style='color:red'>".sprintf(_("Command '%s', specified for ISO creation doesn't seem to exist."), $command)."</h1>";
+        echo $tmp;
       }
+
+      /* Scroll down completly */
+      echo '<script language="javascript" type="text/javascript">scrollDown2();</script>' ;
+      echo '</body></html>';
+      flush();
+      exit;
     }
-    
+
 
     /********************
-     Change password ...   
+      Change password ...   
      ********************/
 
     /* Set terminals root password */
@@ -520,7 +401,7 @@ class systems extends plugin
 
         /* 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("warning", sprintf(_("You're about to delete all information about the component at '%s'."), @LDAP::fix($this->dn)));
         return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       } else {
 
@@ -530,7 +411,7 @@ class systems extends plugin
       }
     }
 
-  
+
     /********************
       Delete system, confirmed
      ********************/
@@ -543,56 +424,45 @@ class systems extends plugin
 
         /* Find out more about the object type */
         $ldap= $this->config->get_ldap_link();
-        $ldap->cat($this->dn);
+        $ldap->cat($this->dn, array('objectClass','gotoMode'));
         $attrs= $ldap->fetch();
-        $type= $this->get_system_type($attrs['objectClass']);
-
-        switch ($type){
-          case "terminal":
-            $tabtype  = "termtabs";
-            $tabobj   = "TERMTABS";
-          break;
-
-          case "workstation":
-            $tabtype  = "worktabs";
-            $tabobj   = "WORKTABS";
-          break;
-
-          case "phone":
-            $tabtype  = "phonetabs";
-            $tabobj   = "PHONETABS";
-          break;
-
-          case "server":
-            $tabtype  = "servtabs";
-            $tabobj   = "SERVTABS";
-          break;
-
-          default:
-            $tabtype  = "termtabs";
-            $tabobj   = "TERMTABS";
-          break;
+        $type= $this->get_system_type($attrs);
+
+        $tabs = array(
+            "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs"),
+            "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs"),
+            "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs"),
+            "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs"),
+            "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs"),
+            "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs"),
+            "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs"));
+
+        /* get object type */
+        $tabtype  = "termtabs";
+        $tabobj   = "TERMTABS";
+        if(isset($tabs[$type])){
+          $tabtype = $tabs[$type]['TABCLASS'];
+          $tabobj  = $tabs[$type]['CLASS'];
         }
 
         /* Delete request is permitted, perform LDAP action */
         if($tabtype=="phonetabs"){
           $this->systab= new $tabtype($this->config,
-             $this->config->data['TABS'][$tabobj], $this->dn);
+              $this->config->data['TABS'][$tabobj], $this->dn);
           $this->systab->set_acl(array($this->acl));
           $this->systab->by_object['phonegeneric']->remove_from_parent ();
         }else{  
           $this->systab= new $tabtype($this->config,
-             $this->config->data['TABS'][$tabobj], $this->dn);
+              $this->config->data['TABS'][$tabobj], $this->dn);
           $this->systab->set_acl(array($this->acl));
           $this->systab->delete();
-          #$this->systab->by_object['termgeneric']->remove_from_parent ();
+#$this->systab->by_object['termgeneric']->remove_from_parent ();
         }
         unset ($this->systab);
         gosa_log ("System object'".$this->dn."' has been removed");
         $this->systab= NULL;
 
         /* Terminal list has changed, reload it. */
-        $this->reload ();
       } else {
 
         /* Normally this shouldn't be reached, send some extra
@@ -613,31 +483,38 @@ class systems extends plugin
     /* 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'])){
+    if ((isset($_POST['edit_finish'])) && (isset($this->systab->config)) || $save_object_directly){
 
       /* Check tabs, will feed message array */
-      $message= $this->systab->check();
+      $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"=>"graphic") 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.")));
+        }
 
+      }
       /* Save, or display error message? */
       if (count($message) == 0){
 
-        /* Save terminal data to ldap */
-        gosa_log ("System object'".$this->dn."' has been saved");
-        $this->systab->save();
-
-        /* Terminal has been saved successfully, remove lock from
-           LDAP. */
-
-        /* 09.02.2006 Hickert 
-         * New System incoming behavior; you can select a system type and an ogroup membership. 
+        /* Incoming behavior; you can select a system type and an ogroup membership. 
          * If this object is an Incoming object, $_SESSION['SelectedSystemType'] isset.
          * Check if we must add the new object to an object group.
-         * !! Don't forget to unset the $_SESSION['SelectedSystemType']... else all edited objects 
-         * !! will be added to  the 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.
+         * entry and not an edited one, so we will delete it.
          */
+
         if(isset($_SESSION['SelectedSystemType'])){
           $SelectedSystemType= $_SESSION['SelectedSystemType'];
           unset($_SESSION['SelectedSystemType']);
@@ -645,14 +522,32 @@ class systems extends plugin
             $og = new ogroup($this->config,$SelectedSystemType['ogroup']);
             if($og){
               $og->AddDelMembership($this->systab->dn);
+              $og->save();
             }
-            $og->save();
           }
+        }
+
+        /* Save terminal data to ldap */
+        if(isset($_SESSION['SelectedSystemType']['ogroup']) && $_SESSION['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= "";
+            }
+          }
+        }
+
+        $this->systab->save();
+        gosa_log ("System object'".$this->dn."' has been saved");
+
+        if(isset($_SESSION['SelectedSystemType'])){
           if(!isset($ldap)){
             $ldap = $this->config->get_ldap_link();
           }
           $ldap->cd ($this->dn);
-          $ldap->cat($this->dn);  
+          $ldap->cat($this->dn, array('dn'));  
           if(count($ldap->fetch())){
             $ldap->cd($this->dn);
             $ldap->rmDir($this->dn);
@@ -660,26 +555,23 @@ class systems extends plugin
           $ldap->cd($this->config->current['BASE']);
         }
 
+
+        /* Terminal has been saved successfully, remove lock from
+           LDAP. */
         if ($this->dn != "new"){
           del_lock ($this->dn);
         }
 
-        /* There's no page reload so we have to read new terminals at
-           this point. */
-        $this->reload ();
         unset ($this->systab);
         $this->systab= NULL;
         unset($_SESSION['objectinfo']);
-
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
         show_errors($message);
       }
-
     }
 
-
     /********************
       Edit system was canceled 
      ********************/
@@ -692,29 +584,24 @@ class systems extends plugin
       $this->systab= NULL;
       unset($_SESSION['objectinfo']);
 
-      /* 09.02.2006 ; New incoming handling ; hickert 
-       * remove session object which stores our ogroup selection 
-       * for the new incoming handling
-       */
+      /* Remove ogroup selection, which was set while editing a new incoming entry */
       if(isset($_SESSION['SelectedSystemType'])){
         unset($_SESSION['SelectedSystemType']);
       }
     }
 
-
     /********************
-      Display edit dialog, or some other  
+      Display edit dialog, or some other
      ********************/
 
     /* Show tab dialog if object is present */
-    if ($this->systab){
+    if (isset($this->systab->config)){
       $display= $this->systab->execute();
 
-      
       /* Don't show buttons if tab dialog requests this */
       if ((isset($this->systab->by_object))&&(!$this->systab->by_object[$this->systab->current]->dialog)){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Finish")."\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
         $display.= "&nbsp;\n";
         $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
         $display.= "</p>";
@@ -722,217 +609,20 @@ class systems extends plugin
       return ($display);
     }
 
+    /* Display dialog with system list */
+    $this->DivListSystem->parent = $this;
+    $this->DivListSystem->execute();
 
-    /********************
-      Entry handling finished (edit delete ... )
-      Now the list generation is the next part of this script.
-     ********************/
-    
-    /* Prepare departments, 
-       which are shown in the listbox on top of the listbox 
-     */
-    $options= "";
-    foreach ($this->config->idepartments as $key => $value){
-      if ($terminalfilter['depselect'] == $key){
-        $options.= "<option selected='selected' value='$key'>$value</option>";
-      } else {
-        $options.= "<option value='$key'>$value</option>";
-      }
-    }
-
-
-    /* NEW LIST MANAGMENT */
-
-    /* Create list header
-     */
-    $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-    " <input class='center' type='image' align='middle' src='images/list_back.png' 
-        title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
-    " <input class='center' type='image' src='images/list_root.png' align='middle' 
-        title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
-    " <input class='center' type='image' align='middle' src='images/list_home.png' 
-        title='"._("Go to users department")."' alt='"._("Home")."'                     name='dep_home'>&nbsp;".
-    " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-    " <input class='center' type='image' align='middle' src='images/select_new_terminal.png'   
-        name='newsystem_terminal'    alt='"._("New Terminal template")."' title='"._("New Terminal")."'>".
-    " <input class='center' type='image' align='middle' src='images/select_new_workstation.png' 
-        name='newsystem_workstation' alt='"._("New Workstation template")."' title='"._("New Workstation")."'>".
-    " <input class='center' type='image' align='middle' src='images/select_new_server.png'     name='newsystem_server'      alt='"._("New Server")."' 
-        title='"._("New Server")."'>".
-    " <input class='center' type='image' align='middle' src='images/select_new_printer.png'    name='newsystem_printer'     alt='"._("New Printer")."' 
-        title='"._("New Printer")."'>".
-    " <input class='center' type='image' align='middle' src='images/select_new_phone.png'      name='newsystem_phone'       alt='"._("New Phone")."' 
-        title='"._("New Phone")."'>".
-    " <input class='center' type='image' align='middle' src='images/select_new_component.png'  name='newsystem_component'   alt='"._("New Component")."' 
-        title='"._("New Component")."'>".
-    " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;"._("Base")."&nbsp;".
-    " <select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
-    " <input class='center' type='image' src='images/list_submit.png' align='middle' 
-        title='"._("Submit department")."' name='submit_department' alt='".           _("Submit")."'>&nbsp;".
-    "</div>";
-
-
-    /* Edit delete link for system types 
-     */
-    $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit system")."'>";
-    $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   name='user_del_%KEY%' title='"._("Delete system")."'>";
-    $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
-
-    /* Create new divlist, and add the header elements 
-     */
-    $divlist = new divlist("systemstab");
-    $divlist->SetSummary(_("This table displays all systems, in the selected tree."));
-    $divlist->SetEntriesPerPage(0);
-    $divlist->SetHeader(array(
-          array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
-          array("string" => _("System")." / "._("Department"), "attach" => "style=''"),
-          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
-
-
-    /* Add departments, to be able to switch into them
-     */
-    foreach($this->departments as $key=> $val){
-      
-      /* Add missing entries ... */
-      if(!isset($this->config->departments[trim($key)])){
-        $this->config->departments[trim($key)]="";
-      }
-
-      /* check if this department contains sub-departments 
-         Display different image in this case 
-       */ 
-      $non_empty="";
-      $keys= str_replace("/","\/",$key);
-      foreach($this->config->departments as $keyd=>$vald ){
-        if(preg_match("/".$keys."\/.*/",$keyd)){
-          $non_empty="full";
-        }
-      }
-
-      /* Add to divlist */
-      $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
-      $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
-      $divlist->AddEntry(array($field1,$field2,$field3));
-    }
-
-    // Iamge spacer 
-    $empty    ="&nbsp;";
-
-    // User and Template  Images
-    $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-
-    // Pictures for Extensions
-    $img1  = "<img class='center' src='images/printer.png'            alt='C' title='"._("Cups Server")  ."'>";
-    $img2  = "<img class='center' src='images/scanner.png'            alt='L' title='"._("Log Db") ."'>";
-    $img3  = "<img class='center' src='images/select_terminal.png'    alt='L' title='"._("Syslog Server") ."'>";
-    $img4  = "<img class='center' src='images/mailto.png'             alt='M' title='"._("Mail Server")  ."'>";
-    $img5  = "<img class='center' src='images/select_phone.png'       alt='I' title='"._("Imap Server") ."'>";
-    $img6  = "<img class='center' src='images/fax_small.png'          alt='F' title='"._("Nfs Server")   ."'>";
-    $img7  = "<img class='center' src='images/select_winstation.png'  alt='K' title='"._("Kerberos Server") ."'>";
-    $img8  = "<img class='center' src='images/select_phone.png'       alt='A' title='"._("Asterisk Server") ."'>";
-    $img9  = "<img class='center' src='images/fax_small.png'          alt='F' title='"._("Fax Server") ."'>";
-    $img10 = "<img class='center' src='images/save.png'               alt='L' title='"._("Ldap Server") ."'>";
-
-    // Test Every Entry and generate divlist Array
-    foreach($this->terminals as $key => $val){
-      // Specify Pics for Extensions
-      if(in_array("goLdapServer"    ,$val['objectClass'])){
-        
-      }
-
-      /* Generate picture list, which is currently disabled */     
-      if(in_array("goCupsServer"    ,$val['objectClass'])) $cups    = $img1;   else $cups  =$empty;
-      if(in_array("goLogDBServer"   ,$val['objectClass'])) $logdb   = $img2;   else $logdb =$empty;
-      if(in_array("goSyslogServer"  ,$val['objectClass'])) $syslog  = $img3;   else $syslog=$empty;
-      if(in_array("goImapServer"    ,$val['objectClass'])) $imap    = $img4;   else $imap  =$empty;
-      if(in_array("sambaSamAccount" ,$val['objectClass'])) $samba   = $img5;   else $samba =$empty;
-      if(in_array("goShareServer"   ,$val['objectClass'])) $nfs     = $img6;   else $nfs   =$empty;
-      if(in_array("goKrbServer"     ,$val['objectClass'])) $krb     = $img7;   else $krb   =$empty;
-      if(in_array("goFonServer"     ,$val['objectClass'])) $fon     = $img8;   else $fon   =$empty;
-      if(in_array("goFaxServer"     ,$val['objectClass'])) $fax     = $img9;   else $fax   =$empty;
-      if(in_array("goLdapServer"    ,$val['objectClass'])) $ldap     = $img10;   else $ldap   =$empty;
-      $pics = $cups.$logdb.$syslog.$imap.$samba.$nfs.$krb.$fon.$fax.$ldap;
-      $pics = "";
-    
-      $val['cn'][0]= preg_replace('/\$$/', '', $val['cn'][0]);
-
-      // Generate Array to Add
-      if((isset($val['is_new']))&&(!empty($val['is_new']))){
-        $display= "".$val["cn"][0]." ".$val['is_new'];
-      }else{
-        $display= "".$val["cn"][0]."";
-      }
-
-      if((in_array("gotoTerminal",$val['objectClass']))||(in_array("gotoWorkstation",$val['objectClass']))){
-        $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."'   name='user_setpwd_%KEY%' title='"._("Set root password")."'>";
-      }else{
-        $action2 = "";
-      }
-
-      if(isset($val['message'])){
-        $display.= "  (".$val['message']." '".$this->config->idepartments[$terminalfilter['depselect']]."'  )";
-      }
-
-      $img=$this->convert_list($val);
-
-      $field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'");
-      $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
-      $divlist->AddEntry( array($field1,$field2,$field3));
+    /* Add departments if subsearch is disabled */
+    if(!$this->DivListSystem->SubSearch){
+      $this->DivListSystem->AddDepartments($this->DivListSystem->selectedBase);
     }
-
-    /* Show main page */
-    $smarty->assign("terminalshead", $listhead);
-    $smarty->assign("terminals", $divlist->DrawList());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
-    $smarty->assign("infoimage", get_template_path('images/info.png'));
-    $smarty->assign("launchimage", get_template_path('images/launch.png'));
-    foreach( array("depselect", "user", "regex", "workstations", "thins", "servers",
-          "winstations", "printers", "phones", "netdev") as $type){
-
-      $smarty->assign("$type", $terminalfilter[$type]);
-    }
-    $smarty->assign("deplist", $this->config->idepartments);
-
-    /* Extend if we are not using javascript */
-    $smarty->assign("apply", apply_filter());
-    $smarty->assign("alphabet", generate_alphabet());
-    $smarty->assign("hint", print_sizelimit_warning());
-
-    return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
+    $this->reload();
+    $this->DivListSystem->setEntries($this->terminals);
+    return($this->DivListSystem->Draw());
   }
 
 
-  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")),
-        "F" => array("select_phone.png",_("Phone")),
-        "S" => array("select_server.png",_("Server")),
-        "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")));
-
-   if((isset($input['is_new']))&&(!empty($input['is_new']))){
-     $input['type']="N".$input['type'];
-   }
-   foreach ($conv  as $key => $value){
-      if($input['type']==$key){
-        $tmp['img'] ="<img class='center' src='images/".$value[0]."' alt='".$key."' title='".$value['1']."'>";
-        $tmp['class']=$key;
-        return $tmp;
-      }
-    }
-  }
 
   function remove_from_parent()
   {
@@ -944,6 +634,7 @@ class systems extends plugin
   /* Save data to object */
   function save_object()
   {
+    $this->DivListSystem->save_object();
   }
 
 
@@ -966,194 +657,110 @@ class systems extends plugin
   {
   }
 
-  function show_header($button_text, $text, $disabled= FALSE)
-  {
-  }
-
   function reload()
   {
     /* Load terminal shortcuts */
     $responsible= array();
     foreach ($this->config->departments as $key => $value){
       if (get_module_permission(get_permissions ($value, $this->ui->subtreeACL),
-            "terminal", $value) == "#all#"){
+            "systems", $value) != ""){
         $responsible[$key]= $value;
       }
     }
 
-    /* Get config */
-    $terminalfilter= get_global('terminalfilter');
-    $filter= "";
+    /* some var init */
+    $res              = array();
+    $this->terminals  = array();
+    $userregex        = "";
 
     /* Set base for all searches */
-    $base= $terminalfilter['depselect'];
-
-    /* Regex filter? */
-    if ($terminalfilter['regex'] != ""){
-      $regex= $terminalfilter['regex'];
-    } else {
-      $regex= "*";
-    }
+    $base=  $this->DivListSystem->selectedBase;
 
-    /* Get list of terminals to be shown */
-    if ($terminalfilter['thins'] == "checked"){
-      $termfilter= "(&(objectClass=goHard)(cn=$regex))";
-    } else {
-      $termfilter= "";
-    }
-    if ($terminalfilter['workstations'] == "checked"){
-      $workfilter= "(&(objectClass=gotoWorkstation)(cn=$regex))";
-    } else {
-      $workfilter= "";
-    }
-    if ($terminalfilter['winstations'] == "checked"){
+    /* Prepare samba class name */
+    $samba  ="";
+    if ($this->DivListSystem->ShowWinWorkstations){
       if ($this->config->current['SAMBAVERSION'] == "3"){
         $samba= "sambaSamAccount";
       } else {
         $samba= "sambaAccount";
       }
-      $winfilter= "(&(objectClass=$samba)(cn=$regex\$))";
-    } else {
-      $winfilter= "";
-    }
-    if ($terminalfilter['printers'] == "checked"){
-      $printfilter= "(&(objectClass=gotoPrinter)(cn=$regex))";
-    } else {
-      $printfilter= "";
-    }
-    if ($terminalfilter['phones'] == "checked"){
-      $phonefilter= "(&(objectClass=goFonHardware)(cn=$regex))";
-    } else {
-      $phonefilter= "";
-    }
-    if ($terminalfilter['netdev'] == "checked"){
-      $netfilter= "(&(objectClass=ieee802Device)(cn=$regex))";
-    } else {
-      $netfilter= "";
-    }
-    if ($terminalfilter['servers'] == "checked"){
-      $serverfilter= "(&(objectClass=goServer)(cn=$regex))";
-    } else {
-      $serverfilter= "";
-    }
-
-    /* User filter? */
-    if ($terminalfilter['user'] != "" && $terminalfilter['user'] != "*"){
-      $filter.= "(gotoLastUser=".$terminalfilter['user'].")";
     }
 
-    /* Get all gotoTerminal's */
-    $this->terminals= array();
-
-    $res= get_list($this->ui->subtreeACL, "(|$termfilter)", FALSE, "ou=terminals,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE);
-
-    $res= array_merge($res,get_list($this->ui->subtreeACL, "(|$termfilter)", FALSE, "ou=incoming,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$serverfilter)", FALSE, "ou=servers,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$phonefilter)", FALSE, "ou=phones,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$netfilter)", FALSE, "ou=netdevices,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$printfilter)", FALSE, "ou=printers,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$workfilter)", FALSE, "ou=workstations,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
-
-    $res= array_merge($res,
-          get_list($this->ui->subtreeACL, "(|$winfilter)", FALSE, "ou=winstations,ou=systems,".$base, 
-        array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));
+    /* This array represents the combination between checkboxes and search filters */
+    $objs = array( "ShowServers"        => array("CLASS" => "goServer"        ,"TREE" => "ou=servers,ou=systems," ),
+        "ShowTerminals"      => array("CLASS" => "gotoTerminal"    ,"TREE" => "ou=terminals,ou=systems,"), 
+        "ShowPrinters"       => array("CLASS" => "gotoPrinter"     ,"TREE" => "ou=printers,ou=systems," ),
+        "ShowDevices"        => array("CLASS" => "ieee802Device"   ,"TREE" => "ou=netdevices,ou=systems," ),
+        "ShowPhones"         => array("CLASS" => "goFonHardware"   ,"TREE" => "ou=phones,ou=systems," ),
+        "ShowWorkstations"   => array("CLASS" => "gotoWorkstation" ,"TREE" => "ou=workstations,ou=systems," ),
+        "ShowWinWorkstations"=> array("CLASS" => $samba            ,"TREE" => get_winstations_ou() ));
 
-/* NEW LIST MANAGMENT
-     * We also need to search for the departments
-     * So we are able to navigate like in konquerer
-     */
-
-    $peopleOU = get_people_ou();
-
-    if(empty($peopleOU)){
-      $base2 = $base;
-    }else{
-      $base2 = preg_replace("/".$peopleOU."/i","",$base);
+    /* Include the 'Display Systems of user' attribute */ 
+    if ((!empty($this->DivListSystem->UserRegex)) && ($this->DivListSystem->UserRegex!= "*")){
+      $userregex = "(gotoLastUser=".$this->DivListSystem->UserRegex.")";
     }
 
-
-    $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
-                              TRUE, $base2, array("ou", "description"), TRUE);
-
-    $this->departments= array();
-    $tmp = array();
-    foreach ($res3 as $value){
-      $tmp[strtolower($value['dn']).$value['dn']]=$value;
-    }
-    ksort($tmp);
-    foreach($tmp as $value){
-      if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
-      }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
-      }
+    /* 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->SubSearch){
+          if($oc['CLASS'] != ""){
+            $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
+            $res = array_merge($res,get_list($filter,$this->ui->subtreeACL, $base,
+                  array("cn", "description", "macAddress", "objectClass", "sambaDomainName", "FAIstate","gotoMode"), GL_NONE | GL_SUBSEARCH | GL_SIZELIMIT));
+          }
+        }else{
+          /* User filter? */
+          if($oc['CLASS'] != ""){
+            $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
+            $res = array_merge($res,get_list($filter,$this->ui->subtreeACL, $oc['TREE'].$base,
+                  array("cn", "description", "macAddress", "objectClass", "sambaDomainName", "FAIstate", "gotoMode"), GL_NONE | GL_SIZELIMIT));
+          }
+        }
+      } 
     }
 
-    /* END NEW LIST MANAGMENT
-     */
-
+    /* Search for incoming objects */ 
+    $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
+    $res = array_merge($res,get_list($filter,$this->ui->subtreeACL, "ou=incoming,".$base,
+          array("cn", "description", "macAddress", "objectClass", "sambaDomainName","gotoMode"), GL_NONE | GL_SIZELIMIT));
 
+    /* Get all gotoTerminal's */
     foreach ($res as $value){
 
-      /* Look for new terminals and mark them with '+' */
-      $tmp= "";
-      if (preg_match('/,ou=terminals,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=terminals,ou=systems,/i", "", $value["dn"]);
-      }
-      if (preg_match('/,ou=workstations,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=workstations,ou=systems,/i", "", $value["dn"]);
-      }
-      if (preg_match('/,ou=servers,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=servers,ou=systems,/i", "", $value["dn"]);
-      }
-      if (preg_match('/,'.get_winstations_ou().'/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*".get_winstations_ou()."/i", "", $value["dn"]);
-      }
-      if (preg_match('/,ou=printers,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=printers,ou=systems,/i", "", $value["dn"]);
-      }
-      if (preg_match('/,ou=phones,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=phones,ou=systems,/i", "", $value["dn"]);
-      }
-      if (preg_match('/,ou=netdevices,ou=systems,/i', $value["dn"])){
-        $tmp= preg_replace("/^[^,]+,[^o]*ou=netdevices,ou=systems,/i", "", $value["dn"]);
-      }
-      if ($tmp == ""){
-        $tmp= $value["dn"];
+      $tmp= $value['dn'];
+      $add= "";
+
+      /* Extract base */
+      foreach($objs as $obj){
+        if(preg_match("/,".$obj['TREE']."/i",$value['dn'])){
+          $tmp = trim( preg_replace("/^[^,]+,[^o]*".$obj['TREE']."/i","",$value['dn']));
+        }
       }
+
+      /* check if current object is a new one */
       if (preg_match ("/,ou=incoming,/i", $tmp)){
-         if (in_array('gotoTerminal', $value['objectClass'])){
+        if (in_array_ics('gotoTerminal', $value['objectClass'])){
           $add= "- "._("New terminal");
-        }elseif (in_array('gotoWorkstation', $value['objectClass'])){
+        }elseif (in_array_ics('gotoWorkstation', $value['objectClass'])){
           $add= "- "._("New workstation");
-        }elseif (in_array('GOhard', $value['objectClass'])){
+        }elseif (in_array_ics('GOhard', $value['objectClass']) && !isset($value['gotoMode'])){
+          $add= "- "._("Unknown device");
+        }elseif (in_array_ics('GOhard', $value['objectClass'])){
           $add= "- "._("New Device");
         }
-      } else {
-        $add= "";
-      }
+      } 
 
+      /* Create a string containing the last part of the department. */
+      $dn_name = preg_replace("#^([^/]+/)*#","",convert_department_dn(@LDAP::fix($tmp)));
+      if(empty($dn_name)){
+        $dn_name = "/";
+      }
+      
+      /* Detect type of object and create an entry for $this->terminals */
       $terminal = array();
-  
-      if (in_array ($tmp, $responsible) || $add != ""){
-        if (in_array('gotoTerminal', $value["objectClass"])){
+      if ((in_array ($tmp, $responsible)) || ($add != "")){
+        if (in_array_ics('gotoTerminal', $value["objectClass"])){
           if (isset($value["macAddress"][0]) && $value["macAddress"][0] != "-"){
             $terminal             = $value;
             $terminal['type']     = "T";
@@ -1161,10 +768,10 @@ class systems extends plugin
           } else {
             $terminal             = $value;
             $terminal['type']     = "D";
-            $terminal['message']  = _("Terminal template for");
+            $terminal['message']  = _("Terminal template for")."&nbsp;'".$dn_name."'&nbsp;";
             $terminal['location'] = array_search($tmp, $this->config->departments); 
           }
-        } elseif (in_array('gotoWorkstation', $value["objectClass"])){
+        } elseif (in_array_ics('gotoWorkstation', $value["objectClass"])){
           if (isset($value["macAddress"][0]) &&  $value["macAddress"][0] != "-"){
             $terminal             = $value;
             $terminal['type']     = "L";
@@ -1173,24 +780,30 @@ class systems extends plugin
             $terminal             = $value;
             $terminal['type']     = "D";
             $terminal['location'] = array_search($tmp, $this->config->departments);
-            $terminal['message']  = _("Workstation template for");
+            $terminal['message']  = _("Workstation template for")."&nbsp;'".$dn_name."'&nbsp;";
           }
-        } elseif (in_array('gotoPrinter', $value["objectClass"])){
-            $terminal             = $value;
-            $terminal['type']     = "P";
-        } elseif (in_array('goServer', $value["objectClass"])){
-            $terminal             = $value;
-            $terminal['type']     = "S";
-        } elseif (in_array('goFonHardware', $value["objectClass"])){
-            $terminal             = $value;
-            $terminal['type']     = "F";
-        }elseif (in_array("GOhard",$value['objectClass'])){
+          if (isset($value["FAIstate"][0])){
+            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
+          }
+        } elseif (in_array_ics('gotoPrinter', $value["objectClass"])){
+          $terminal             = $value;
+          $terminal['type']     = "P";
+        } elseif (in_array_ics('goServer', $value["objectClass"])){
+          $terminal             = $value;
+          $terminal['type']     = "S";
+          if (isset($value["FAIstate"][0])){
+            $terminal['type']= $this->getState($terminal['type'], $value["FAIstate"][0]);
+          }
+        } elseif (in_array_ics('goFonHardware', $value["objectClass"])){
+          $terminal             = $value;
+          $terminal['type']     = "F";
+        }elseif (in_array_ics("GOhard",$value['objectClass'])){
           $terminal = $value;
           $terminal['type']   = "Q";
           $terminal['is_new'] = $add;
-        } elseif (in_array('ieee802Device', $value["objectClass"])){
-            $terminal             = $value;
-            $terminal['type']     = "C";
+        } elseif (in_array_ics('ieee802Device', $value["objectClass"])){
+          $terminal             = $value;
+          $terminal['type']     = "C";
         } else{
           $name= preg_replace('/\$$/', '', $value['cn'][0]);
           if (isset($value['sambaDomainName'])){
@@ -1226,35 +839,88 @@ class systems extends plugin
   }
 
 
-  function get_system_type($classes)
+  function get_system_type($attrs)
   {
-    $type= "";
+    $enable_arp_device_handling = preg_match("/ArpNewDevice/i",search_config($this->config->data['TABS'], "ArpNewDevice", "CLASS"));
+    $classes = $attrs['objectClass'];
 
-    if (in_array('ieee802Device', $classes)){
+    $type= "";
+    if (in_array_ics('ieee802Device', $classes)){
       $type= "component";
-    }else
-    if (in_array('gotoTerminal', $classes)){
+    }elseif (in_array_ics('gotoTerminal', $classes)){
       $type= "terminal";
-    }else
-    if (in_array('gotoWorkstation', $classes)){
+    }elseif (in_array_ics('gotoWorkstation', $classes)){
       $type= "workstation";
-    }else
-    if (in_array('gotoPrinter', $classes)){
+    }elseif (in_array_ics('gotoPrinter', $classes)){
       $type= "printer";
-    }else
-    if (in_array('goFonHardware', $classes)){
+    }elseif (in_array_ics('goFonHardware', $classes)){
       $type= "phone";
-    }else
-    if (in_array('goServer', $classes)){
+    }elseif (in_array_ics('goServer', $classes)){
       $type= "server";
-    }else
-    if (in_array('GOhard', $classes)){
+    }elseif (in_array_ics('GOhard', $classes) && !isset($attrs['gotoMode']) && $enable_arp_device_handling){
+      $type= "ArpNewDevice";
+    }elseif (in_array_ics('GOhard', $classes)){
       $type= "NewDevice";
-    }else
-    if (in_array('sambaAccount', $classes) ||
-        in_array('sambaSamAccount', $classes)){
+    }elseif (in_array_ics('sambaAccount', $classes) ||
+        in_array_ics('sambaSamAccount', $classes)){
       $type= "winstation";
     }
+    return ($type);
+  }
+
+
+  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")));
+
+    if((isset($input['is_new']))&&(!empty($input['is_new']))){
+      $input['type']="N".$input['type'];
+    }
+    foreach ($conv  as $key => $value){
+      if($input['type']==$key){
+        $tmp['img'] ="<img class='center' src='images/".$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);
   }