X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=4ceb83a1f76507f088b7a39adcbf07711acce1d8;hb=888516587f0cda06601ab943d2851bfaf5b23578;hp=c7367c5b943189692db38463f05e96d298766b19;hpb=be76f0dc781ae6d982e92e39b10fb91ca4c7cf6b;p=gosa.git
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index c7367c5b9..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,18 +291,29 @@ 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'])){
$entry = $this->load_entry_from_queue($entry);
$this->queue[$key] = $entry;
}
+ $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;
@@ -310,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;
}
@@ -342,7 +360,6 @@ class CopyPasteHandler {
/* Load next queue entry */
if(!count($msgs)){
$this->lastdn = $this->current['object']->dn;
- $this->current= $this->_update_vars($this->current);
$this->current['object']->save();
$this->current = FALSE;
}else{
@@ -378,6 +395,7 @@ class CopyPasteHandler {
$key = key($this->objects_to_fix);
if(isset($this->objects_to_fix[$key])){
$this->current = $this->objects_to_fix[$key];
+ $this->current= $this->_update_vars($this->current);
unset($this->objects_to_fix[$key]);
unset($this->queue[$key]);
}
@@ -452,6 +470,10 @@ class CopyPasteHandler {
/* Update all attributes specified with SetVar */
foreach($this->setvar_array as $name => $value){
+
+ /* Do not update parent for plugins, this may break things */
+ if($name == "parent") continue;
+
if(isset($entry['object']->by_object[$key]->$name)){
$entry['object']->by_object[$key]->$name = $value;
}
@@ -479,11 +501,11 @@ class CopyPasteHandler {
{
$Copy_Paste= "
";
if($this->entries_queued()){
- $img= "images/copypaste.png";
+ $img= "images/lists/paste.png";
$Copy_Paste.= " ";
}else{
- $Copy_Paste.= "
";
+ $Copy_Paste.= "
";
}
return ($Copy_Paste);
}