Code

removed unused code
[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc
index 22f60379f9bba5799b6a64b99938740f1a10e14a..b4479d1feb24b6f005fe4070bc5faa26ebfb1cdd 100644 (file)
@@ -25,6 +25,7 @@ class systems extends plugin
   /* Definitions */
   var $plHeadline     = "Systems";
   var $plDescription  = "This does something";
+  var $plIcon         = "plugins/systems/images/plugin.png";
   var $departments    = array();
 
   /* Dialog attributes */
@@ -43,6 +44,9 @@ class systems extends plugin
 
   var $system_activation_object = ""; // The object to activate (NewDevice)
   var $fai_activated  = FALSE;
+  var $si_active      = FALSE;
+
+  var $acl_module = array("incoming","terminal","workstation","server","printer","phone","winworkstation","component");
 
   function systems (&$config, $ui)
   {
@@ -68,6 +72,13 @@ class systems extends plugin
     if($this->config->search("ArpNewDevice","CLASS",array('tabs')) != ""){
       $this->arp_handling_active = TRUE;
     }
+
+    /* Check if we are able to communicate with the GOsa supprot daemon 
+     */
+    if(class_available("gosaSupportDaemon")){
+      $o = new gosaSupportDaemon();
+      $this->si_active = $o->connect() && class_available("DaemonEvent");
+    }
   }
 
 
@@ -317,96 +328,102 @@ class systems extends plugin
         $tabclass = $tabs[$selected_system]["TABCLASS"];
         $acl_cat  = $tabs[$selected_system]["ACL"];
 
-        /* Go through all objects that should be activated */
-        foreach($this->system_activation_object as $key => $dn){
 
-          /* Remove entry from list, to avoid page-reload problems */
-          unset($this->system_activation_object[$key]);
-  
-          /* Load permissions for selected 'dn' and check if
-             we're allowed to create this 'dn' */
-          $this->dn = $dn;
-          $ui       = get_userinfo();
-          $tabacl   = $ui->get_permissions($this->dn,$acl_cat."/".$tabname);
-
-          /* We are allowed to create the requested system type */
-          if(preg_match("/c/",$tabacl)){
-            $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$selected_system);
-            $this->systab->set_acl_base($this->DivListSystem->selectedBase);
-            $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
-            $this->systab->base = $this->DivListSystem->selectedBase;
-
-
-            if($selected_group != "none"){
+        if(!class_available($tabclass)){
+          msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+        }else{
 
-              /*******
-               * Set gotoMode to active if we there was an ogroup selected. 
-               */
-              $found = false;
-              foreach(array("workgeneric"=>"active","servgeneric"=>"active","termgeneric"=>"active") as $tab => $value){
-                if(isset($this->systab->by_object[$tab]->gotoMode)) {
-                  $found = true;
-                  $this->systab->by_object[$tab]->gotoMode = $value;
+          /* Go through all objects that should be activated */
+          foreach($this->system_activation_object as $key => $dn){
+
+            /* Remove entry from list, to avoid page-reload problems */
+            unset($this->system_activation_object[$key]);
+
+            /* Load permissions for selected 'dn' and check if
+               we're allowed to create this 'dn' */
+            $this->dn = $dn;
+            $ui       = get_userinfo();
+            $tabacl   = $ui->get_permissions($this->dn,$acl_cat."/".$tabname);
+
+            /* We are allowed to create the requested system type */
+            if(preg_match("/c/",$tabacl)){
+              $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$selected_system);
+              $this->systab->set_acl_base($this->DivListSystem->selectedBase);
+              $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+              $this->systab->base = $this->DivListSystem->selectedBase;
+
+
+              if($selected_group != "none"){
+
+                /*******
+                 * Set gotoMode to active if we there was an ogroup selected. 
+                 */
+                $found = false;
+                foreach(array("workgeneric"=>"active","servgeneric"=>"active","termgeneric"=>"active") as $tab => $value){
+                  if(isset($this->systab->by_object[$tab]->gotoMode)) {
+                    $found = true;
+                    $this->systab->by_object[$tab]->gotoMode = $value;
+                  }
+                }
+                if(!$found){
+                  msg_dialog::display(_("Internal error"), _("Cannot set mode to 'active'!"), ERROR_DIALOG);
                 }
-              }
-              if(!$found){
-                msg_dialog::display(_("Internal error"), _("Cannot set mode to 'active'!"), ERROR_DIALOG);
-              }
 
-              /*******
-               * Update object group membership
-               */
-              $og = new ogroup($this->config,$selected_group);
-              if($og){
-                $og->AddDelMembership($this->systab->dn);
-                $og->save();
-              }
+                /*******
+                 * Update object group membership
+                 */
+                $og = new ogroup($this->config,$selected_group);
+                if($og){
+                  $og->AddDelMembership($this->systab->dn);
+                  $og->save();
+                }
 
-              /*******
-               * Set default system specific attributes 
-               */
-              foreach (array("workservice", "termservice") as $cls){
-                if (isset($this->systab->by_object[$cls])){
-                  $this->systab->by_object[$cls]->gotoXMouseport= "";
-                  $this->systab->by_object[$cls]->gotoXMouseType= "";
-                  $this->systab->by_object[$cls]->gotoXResolution= "";
-                  $this->systab->by_object[$cls]->gotoXColordepth= "";
+                /*******
+                 * Set default system specific attributes 
+                 */
+                foreach (array("workservice", "termservice") as $cls){
+                  if (isset($this->systab->by_object[$cls])){
+                    $this->systab->by_object[$cls]->gotoXMouseport= "";
+                    $this->systab->by_object[$cls]->gotoXMouseType= "";
+                    $this->systab->by_object[$cls]->gotoXResolution= "";
+                    $this->systab->by_object[$cls]->gotoXColordepth= "";
+                  }
                 }
-              }
 
-              // Enable activation
-              foreach (array("servgeneric", "workgeneric", "termgeneric") as $cls){
-                if (isset($this->systab->by_object[$cls])){
-                  $this->systab->by_object[$cls]->auto_activate= TRUE;
+                // Enable activation
+                foreach (array("servgeneric", "workgeneric", "termgeneric") as $cls){
+                  if (isset($this->systab->by_object[$cls])){
+                    $this->systab->by_object[$cls]->auto_activate= TRUE;
+                  }
                 }
-              }
 
-              // Enable sending of LDAP events
-              if (isset($this->systab->by_object["workstartup"])){
-                $this->systab->by_object["workstartup"]->gotoLdap_inherit= TRUE;
+                // Enable sending of LDAP events
+                if (isset($this->systab->by_object["workstartup"])){
+                  $this->systab->by_object["workstartup"]->gotoLdap_inherit= TRUE;
+                }
               }
-            }
 
-            /* Don't save directly if there is no objectGroup selected.
-               The user will then be able to configure the missing attributes 
-                on his own.
-             */
-            if($selected_group != "none"){
-              $this->systab->save();
-              $this->systab = NULL;
+              /* Don't save directly if there is no objectGroup selected.
+                 The user will then be able to configure the missing attributes 
+                 on his own.
+               */
+              if($selected_group != "none"){
+                $this->systab->save();
+                $this->systab = NULL;
 
-              if(!isset($ldap)){
-                $ldap = $this->config->get_ldap_link();
-              }
-              $ldap->cd ($this->dn);
-              $ldap->cat($this->dn, array('dn'));
-              if(count($ldap->fetch())){
-                $ldap->cd($this->dn);
-                $ldap->rmDir($this->dn);
+                if(!isset($ldap)){
+                  $ldap = $this->config->get_ldap_link();
+                }
+                $ldap->cd ($this->dn);
+                $ldap->cat($this->dn, array('dn'));
+                if(count($ldap->fetch())){
+                  $ldap->cd($this->dn);
+                  $ldap->rmDir($this->dn);
+                }
               }
+            }else{
+              msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
             }
-          }else{
-            msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
           }
         }
       }
@@ -414,7 +431,9 @@ class systems extends plugin
 
 
     if (isset($_POST['create_system'])||$s_action=="newsystem") {
-
+    
+      $this->last_action = "";
+  
       /* If the current entry is an incoming object 
        * $sw = System type as posted in new incoming handling dialog 
        */ 
@@ -444,10 +463,15 @@ class systems extends plugin
         $ui       = get_userinfo();
         $tabacl   = $ui->get_permissions($this->DivListSystem->selectedBase,$acl_cat."/".$tabname);
         if(preg_match("/c/",$tabacl)){
-          $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$sw);
-          $this->systab->set_acl_base($this->DivListSystem->selectedBase);
-          $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
-          $this->systab->base = $this->DivListSystem->selectedBase;
+
+          if(!class_available($tabclass)){
+            msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+          }else{
+            $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$sw);
+            $this->systab->set_acl_base($this->DivListSystem->selectedBase);
+            $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+            $this->systab->base = $this->DivListSystem->selectedBase;
+          }
         }else{
           msg_dialog::display(_("Error"), msgPool::permCreate(), ERROR_DIALOG);
         }
@@ -481,7 +505,7 @@ class systems extends plugin
 
     /* User wants to edit data? */
     if (($s_action == "edit") && (!isset($this->systab->config))){
-
+      $this->last_action = "";
       $this->dn= $this->terminals[$s_entry]['dn'];
 
       /* Check locking, save current plugin in 'back_plugin', so
@@ -509,20 +533,32 @@ class systems extends plugin
 
 
       if($type == "ArpNewDevice"){
-        $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+        if(!class_available("ArpNewDeviceTabs")){
+          msg_dialog::display(_("Error"), msgPool::class_not_found("ArpNewDevice"), ERROR_DIALOG);
+        }else{
+          $this->systab = new ArpNewDeviceTabs($this->config,$this->config->data['TABS']['ARPNEWDEVICETABS'],$this->dn);
+        }
       }elseif($type == "NewDevice"){
-        $this->system_activation_object= array($this->dn);
-        $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+        if(!class_available("SelectDeviceType")){
+          msg_dialog::display(_("Error"), msgPool::class_not_found("SelectDeviceType"), ERROR_DIALOG);
+        }else{
+          $this->system_activation_object= array($this->dn);
+          $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+        }
       }elseif(isset($tabs[$type])){
 
         $class    = $tabs[$type]["CLASS"];
         $acl_cat  = $tabs[$type]["ACL"];
         $tabclass = $tabs[$type]["TABCLASS"];
 
-        $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat);
-        $this->systab->set_acl_base($this->dn);
-        session::set('objectinfo',$this->dn);
-        add_lock ($this->dn, $this->ui->dn);
+        if(!class_available($tabclass)){
+          msg_dialog::display(_("Error"), msgPool::class_not_found($tabclass), ERROR_DIALOG);
+        }else{
+          $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$acl_cat);
+          $this->systab->set_acl_base($this->dn);
+          session::set('objectinfo',$this->dn);
+          add_lock ($this->dn, $this->ui->dn);
+        }
       }else{ 
         msg_dialog::display(_("Error"), _("Editing this type of object is not supported yet!"), ERROR_DIALOG);
         $this->remove_lock();
@@ -701,7 +737,7 @@ class systems extends plugin
       $this->dns = array();
       $ids = $this->list_get_selected_items();
 
-      if(count($ids)){
+      if(count($ids) && class_available("DaemonEvent")){
         $mac= array();
 
         $ldap = $this->config->get_ldap_link();
@@ -752,7 +788,7 @@ class systems extends plugin
     }
 
     /* Insert scheduled events into queue */
-    if($this->systab instanceof DaemonEvent){
+    if(class_available("DaemonEvent") && $this->systab instanceof DaemonEvent){
       $this->systab->save_object();
 
       /* Save event 
@@ -776,9 +812,14 @@ 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 = array(
@@ -919,135 +960,6 @@ class systems extends plugin
    }
 
 
-    /********************
-      Delete system, confirm dialog
-     ********************/
-
-    /* Remove terminal was requested */
-    if ($s_action=="del"){
-
-      /* Get 'dn' from posted termlinst */
-      $this->dn = $this->terminals[$s_entry]['dn'];
-      $attrs    = $this->terminals[$s_entry];
-
-  
-
-      $type= $this->get_system_type($attrs);
-      $ui = get_userinfo();
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
-      /* get object type */
-      $tabtype  = "termtabs";
-      $tabobj   = "TERMTABS";
-      $tabacl   = "";
-      if(isset($tabs[$type])){
-        $tabtype = $tabs[$type]['TABCLASS'];
-        $tabobj  = $tabs[$type]['CLASS'];
-        $tabacl  = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
-      }
-
-      /* Load permissions for selected 'dn' and check if
-         we're allowed to remove this 'dn' */
-      if(preg_match("/d/",$tabacl)){ 
-
-        /* Check locking, save current plugin in 'back_plugin', so
-           the dialog knows where to return. */
-        if (($user= get_lock($this->dn)) != ""){
-          return(gen_locked_message ($user, $this->dn));
-        }
-
-        /* Lock the current entry, so nobody will edit it during deletion */
-        add_lock ($this->dn, $this->ui->dn);
-        $smarty->assign("warning", msgPool::deleteInfo(@LDAP::fix($this->dn)));
-        $smarty->assign("multiple", false);
-        return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
-      } else {
-
-        /* Obviously the user isn't allowed to delete. Show message and
-           clean session. */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
-      }
-    }
-
-
-    /********************
-      Delete system, confirmed
-     ********************/
-    /* Confirmation for deletion has been passed. Terminal should be deleted. */
-    if (isset($_POST['delete_terminal_confirm'])){
-
-      /* Find out more about the object type */
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cat($this->dn, array('objectClass'));
-      $attrs= $ldap->fetch();
-      $type= $this->get_system_type($attrs);
-
-      $ui = get_userinfo();
-
-      $tabs = array(
-          "ArpNewDevice"=> array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "NewDevice"   => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "incoming/systems"),
-          "terminal"    => array("CLASS"=>"TERMTABS",     "TABCLASS" =>"termtabs",      "ACL"=> "terminal/termgeneric"),
-          "workstation" => array("CLASS"=>"WORKTABS",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation/workgeneric"),
-          "server"      => array("CLASS"=>"SERVTABS",     "TABCLASS" =>"servtabs",      "ACL"=> "server/servgeneric"),
-          "printer"     => array("CLASS"=>"PRINTTABS",    "TABCLASS" =>"printtabs",     "ACL"=> "printer/printgeneric"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone/phoneGeneric"),
-          "winstation"  => array("CLASS"=>"WINTABS",      "TABCLASS" =>"wintabs",       "ACL"=> "winworkstation/wingeneric"),
-          "component"   => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
-      /* get object type */
-      $tabtype  = "termtabs";
-      $tabobj   = "TERMTABS";
-      $tabacl   = "";
-      if(isset($tabs[$type])){
-        $tabtype = $tabs[$type]['TABCLASS'];
-        $tabobj  = $tabs[$type]['CLASS'];
-        $tabacl  = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
-      }
-
-      /* Check if we are allowed to remove this object */
-      if(preg_match("/d/",$tabacl)){
-
-        /* Delete request is permitted, perform LDAP action */
-        if(in_array($type,array("ArpNewDevice","NewDevice")) && class_available("termgeneric")){
-          $this->systab= new termgeneric($this->config, $this->dn);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->remove_from_parent();
-        }elseif($tabtype=="phonetabs"){
-          $this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $this->dn,$type);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->by_object['phoneGeneric']->remove_from_parent ();
-        }else{  
-          $this->systab= new $tabtype($this->config,$this->config->data['TABS'][$tabobj], $this->dn,$type);
-          $this->systab->set_acl_base($this->dn);
-          $this->systab->delete();
-        }
-        unset ($this->systab);
-        $this->systab= NULL;
-
-        /* Terminal list has changed, reload it. */
-      } else {
-
-        /* Normally this shouldn't be reached, send some extra
-           logs to notify the administrator */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
-        new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
-      }
-
-      /* Remove lock file after successfull deletion */
-      $this->remove_lock();
-    }
-
-
     /********************
       Edit system type finished, check if everything went ok
      ********************/
@@ -1167,7 +1079,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);
     }
 
@@ -1279,13 +1191,13 @@ class systems extends plugin
 
     /* This array represents the combination between checkboxes and search filters */
     $objs = array( 
-        "ShowServers"        => array("CLASS" => "goServer"        ,"TREE" => get_ou('serverou')),
-        "ShowTerminals"      => array("CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalou')),
-        "ShowPrinters"       => array("CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerou')),
-        "ShowDevices"        => array("CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentou')),
-        "ShowPhones"         => array("CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneou')),
-        "ShowWorkstations"   => array("CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
-        "ShowWinWorkstations"=> array("CLASS" => $samba            ,"TREE" => get_winstations_ou() ));
+        "ShowServers"        => array("TAB" => "servtabs",      "CLASS" => "goServer"        ,"TREE" => get_ou('serverou')),
+        "ShowTerminals"      => array("TAB" => "termtabs",      "CLASS" => "gotoTerminal"    ,"TREE" => get_ou('terminalou')),
+        "ShowPrinters"       => array("TAB" => "printtabs",     "CLASS" => "gotoPrinter"     ,"TREE" => get_ou('printerou')),
+        "ShowDevices"        => array("TAB" => "componenttabs", "CLASS" => "ieee802Device"   ,"TREE" => get_ou('componentou')),
+        "ShowPhones"         => array("TAB" => "phonetabs",     "CLASS" => "goFonHardware"   ,"TREE" => get_ou('phoneou')),
+        "ShowWorkstations"   => array("TAB" => "worktabs",      "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
+        "ShowWinWorkstations"=> array("TAB" => "wintabs",       "CLASS" => $samba            ,"TREE" => get_winstations_ou() ));
 
     /* Include the 'Display Systems of user' attribute */ 
     if ((!empty($this->DivListSystem->UserRegex)) && ($this->DivListSystem->UserRegex!= "*")){
@@ -1304,7 +1216,8 @@ class systems extends plugin
 
     /* Walk through all possible search combinations, and search for some objects if the checkbox is enabled  */
     foreach($objs as $checkBox => $oc){
-      if($this->DivListSystem->$checkBox){
+
+      if($this->DivListSystem->$checkBox && class_available($oc['TAB'])){
         if($this->DivListSystem->SubSearch){
           if($oc['CLASS'] != ""){
             $filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
@@ -1448,9 +1361,12 @@ 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;
+        }
       }
 
       if(count($terminal)){
@@ -1493,6 +1409,7 @@ class systems extends plugin
       return("");
     }
 
+    $ui = get_userinfo();
 
     $tabs = array(
         "terminal"    => array( "CLASS"     =>"TERMTABS",     "TABNAME" =>"termgeneric",     
@@ -1519,12 +1436,13 @@ class systems extends plugin
 
       $tab_o  = $tabs[$type]['CLASS'];
       $tab_c  = $tabs[$type]['TABCLASS'];
+      $acl_c  = $tabs[$type]['TABNAME'];
       $acl    = $tabs[$type]['ACL'];
 
-      if($s_action == "copy" && preg_match("/r/",$ui->has_complete_category_acls($dn,$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" && preg_match("/(r.*d|d.*r)/",$ui->has_complete_category_acls($dn,$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);
       }
     }
@@ -1544,12 +1462,13 @@ class systems extends plugin
         if(isset($tabs[$type])){
           $tab_o  = $tabs[$type]['CLASS'];
           $tab_c  = $tabs[$type]['TABCLASS'];
+          $acl_c  = $tabs[$type]['TABNAME'];
           $acl    = $tabs[$type]['ACL'];
 
-          if($s_action == "copy_multiple" && preg_match("/r/",$ui->has_complete_category_acls($dn,$acl))){
+          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" && preg_match("/(r.*d|d.*r)/",$ui->has_complete_category_acls($dn,$acl))){
+          if($s_action == "cut_multiple" && $ui->is_cutable($dn,$acl,$acl_c)){
             $this->CopyPasteHandler->add_to_queue($dn,"cut",$tab_c,$tab_o,$acl);
           }
         }
@@ -1565,8 +1484,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)){
@@ -1728,10 +1647,6 @@ class systems extends plugin
             
           ));
   }
-
-
-  
-
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: