X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=4ceb83a1f76507f088b7a39adcbf07711acce1d8;hb=888516587f0cda06601ab943d2851bfaf5b23578;hp=ad94b984d1566d1b6c0d99ad1c4673884062aef2;hpb=305d80845ec719c4e4f7acc8059f26c6c1db61a2;p=gosa.git

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index ad94b984d..4ceb83a1f 100644
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-define("LDAP_DUMP_PATH","/tmp/gosa");
+define("LDAP_DUMP_PATH","/var/cache/gosa/tmp");
 
 class CopyPasteHandler {
 
@@ -63,7 +63,7 @@ class CopyPasteHandler {
    */
   function add_to_queue($dn,$action,$tab_class,$tab_object,$tab_acl_category)
   {
-    if(!class_exists($tab_class)){
+    if(!class_available($tab_class)){
       trigger_error(sprintf("Specified class object '%s' does not exists.",$tab_class));
       return(FALSE);
     }
@@ -291,7 +291,7 @@ class CopyPasteHandler {
       /* Put each queued object in one of the above arrays 
        */
       foreach($this->queue as $key => $entry){
-  
+
         /* Update entries on demand 
          */
         if(!isset($entry['object'])){
@@ -300,10 +300,20 @@ class CopyPasteHandler {
         }
         $entry= $this->_update_vars($entry);
         $msgs = $entry['object']->check();
-        $acl = $ui->get_category_permissions($entry['dn'], $entry['tab_acl_category']);
+
+        /* To copy an object we require full read access to the object category 
+         */
+        $copy_acl = preg_match("/r/",$ui->has_complete_category_acls($entry['dn'], $entry['tab_acl_category']));
+
+        /* In order to copy an object we require read an delete acls 
+         */
+        $cut_acl  = preg_match("/d/",$ui->has_complete_category_acls($entry['dn'], $entry['tab_acl_category']));
+        $cut_acl &= preg_match("/r/",$ui->has_complete_category_acls($entry['dn'], $entry['tab_acl_category']));
 
         /* Check permissions */
-        if(!preg_match("/((c|w)|(w|c))/",$acl)){
+        if($entry['method'] == "copy" && !$copy_acl){
+          $this->disallowed_objects[$key] = $entry;
+        }elseif($entry['method'] == "cut" && !$cut_acl){
           $this->disallowed_objects[$key] = $entry;
         }elseif(!count($msgs)){
           $this->clean_objects[$key]  = $entry;
@@ -311,6 +321,13 @@ class CopyPasteHandler {
           $this->objects_to_fix[$key] = $entry;
         }
       }
+      if(count($this->disallowed_objects)){
+        $dns = array();
+        foreach($this->disallowed_objects as $entry){
+          $dns[] = $entry['dn'];
+        }
+#        msg_dialog::display(_("Permission"),msgPool::permCreate($dns),INFO_DIALOG);
+      }
       $this->require_update = FALSE;
     }