Updated System Managenemt

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

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 7a7e83ac0e3174490c5237057e27fa4030fe58a7..4f1820dda0384a8e5fd4321cae8794430d8007b3 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -62,11 +62,8 @@ class systems extends plugin
       $this->fai_activated = TRUE;
     }
 
-    /* Creat dialog object */
-    $this->DivListSystem = new divListSystem($this->config,$this);
-
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 
@@ -87,6 +84,9 @@ class systems extends plugin
     if(class_available("opsi")){
       $this->opsi = new opsi($this->config);
     }
+
+    /* Creat dialog object */
+    $this->DivListSystem = new divListSystem($this->config,$this);
   }
 
 
@@ -243,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");
@@ -999,7 +999,7 @@ class systems extends plugin
 
       $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("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->dn));
       if(is_object($this->systab) && !isset($this->systab->by_object)){
         $dialog = TRUE;
         $hide_apply = TRUE;
@@ -1062,14 +1062,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){
@@ -1126,6 +1126,7 @@ class systems extends plugin
     $res              = array();
     $this->terminals  = array();
     $userregex        = "";
+    $opsi_clients     = array();
 
     /* Set base for all searches */
     $base=  $this->DivListSystem->selectedBase;
@@ -1142,12 +1143,12 @@ class systems extends plugin
 
     /* This array represents the combination between checkboxes and search filters */
     $objs = array( 
-        "ShowServers"        => array("TAB" => "servtabs",      "CLASS" => "goServer"        ,"TREE" => get_ou('serverou')),
-        "ShowTerminals"      => array("TAB" => "termtabs",      "CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalou')),
-        "ShowPrinters"       => array("TAB" => "printtabs",     "CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerou')),
-        "ShowDevices"        => array("TAB" => "componenttabs", "CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentou')),
-        "ShowPhones"         => array("TAB" => "phonetabs",     "CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneou')),
-        "ShowWorkstations"   => array("TAB" => "worktabs",      "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
+        "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 */ 
@@ -1187,11 +1188,11 @@ class systems extends plugin
 
     /* Search for incoming objects */ 
     $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
-    $res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT));
+    $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.
      */
-    if($this->opsi != NULL){
+    if($this->opsi instanceof opsi && $this->opsi->enabled() && $this->DivListSystem->ShowOpsiHosts){
       $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);
@@ -1220,7 +1221,7 @@ class systems extends plugin
       }
 
       /* 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'])){
@@ -1540,7 +1541,7 @@ class systems extends plugin
 
     /* Add opsi client to system types */
     if($this->opsi != NULL){
-        $conv["O"] = array("plugins/systems/images/select_default.png",_("Opsi client"));
+        $conv["O"] = array("plugins/systems/images/select_winstation.png",_("Opsi client"));
     }
 
     /* Use locked icons