X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=4d6fb1ddb04928d4e27061661fa2e7dfc6607ba6;hb=78a6813efd2f0b4eb471a688685a2abf1429ebf8;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..4d6fb1ddb 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 {
@@ -61,9 +61,9 @@ class CopyPasteHandler {
* array['tab_class'] - Tab object that should be used to initialize the new object
* array['tab_object'] - Tab object name used to initialize correct object Type like USERTABS
*/
- function add_to_queue($dn,$action,$tab_class,$tab_object,$tab_acl_category)
+ function add_to_queue($dn,$action,$tab_class,$tab_object,$tab_acl_category,&$parent = NULL)
{
- if(!class_exists($tab_class)){
+ if(!class_available($tab_class)){
trigger_error(sprintf("Specified class object '%s' does not exists.",$tab_class));
return(FALSE);
}
@@ -86,6 +86,7 @@ class CopyPasteHandler {
$tmp['tab_class'] = $tab_class;
$tmp['tab_object']= $tab_object;
$tmp['tab_acl_category']= $tab_acl_category;
+ $tmp['parent'] = $parent;
$this->queue[] = $tmp;
$this->require_update = TRUE;
}
@@ -111,19 +112,19 @@ class CopyPasteHandler {
/* Create patch if it doesn't exists */
if(!is_dir(LDAP_DUMP_PATH)){
@mkdir(LDAP_DUMP_PATH);
+
+ /* Update folder permissions */
+ if(!@chmod(LDAP_DUMP_PATH,0700)){
+ $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("Cannot set permission for '%s'")."" ,LDAP_DUMP_PATH);
+ msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
+ new log("copy","all/all","copy & paste, event queue.",array(), $msg);
+ return(FALSE);
+ }
}
-
- /* Update folder permissions */
- if(!@chmod(LDAP_DUMP_PATH,0700)){
- $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("Cannot set permission for '%s'")."" ,LDAP_DUMP_PATH);
- msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
- new log("copy","all/all","copy & paste, event queue.",array(), $msg);
- return(FALSE);
- }
/* check if we are able to create a new file the given directory */
if(!is_writeable(LDAP_DUMP_PATH)){
- $msg= _("Copy and paste failed!")."
"._("Error").": ".msgPool::cannotWrite(LDAP_DUMP_PATH)."";
+ $msg= _("Copy and paste failed!")."
"._("Error").": ".msgPool::cannotWriteFile(LDAP_DUMP_PATH)."";
msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
new log("copy","all/all","copy & paste, event queue.",array(), $msg);
return(FALSE);
@@ -178,14 +179,6 @@ class CopyPasteHandler {
return(FALSE);
}
- /* Update folder permissions */
- if(!@chmod(LDAP_DUMP_PATH,0700)){
- $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("Cannot set permission for '%s'"),LDAP_DUMP_PATH);
- msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
- new log("copy","all/all","copy & paste, event queue.",array(), $msg);
- return(FALSE);
- }
-
/* Create file handle */
$fp = @fopen($path."/".$filename,"w+");
if(!$fp){
@@ -195,6 +188,14 @@ class CopyPasteHandler {
return(FALSE);
}
+ /* Update folder permissions */
+ if(!@chmod($path."/".$filename,0700)){
+ $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("Cannot set permission for '%s'"),LDAP_DUMP_PATH);
+ msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
+ new log("copy","all/all","copy & paste, event queue.",array(), $msg);
+ return(FALSE);
+ }
+
$data = serialize($ldap->fetch());
fwrite($fp,$data,strlen($data));
fclose($fp);
@@ -223,6 +224,7 @@ class CopyPasteHandler {
$tab_c = $entry['tab_class'];
$tab_o = $entry['tab_object'];
$tab_a = $entry['tab_acl_category'];
+ $parent = $entry['parent'];
if($entry['method'] == "copy"){
$entry['object'] = new $tab_c($this->config,$this->config->data['TABS'][$tab_o],"new",$tab_a);
@@ -230,6 +232,9 @@ class CopyPasteHandler {
$entry['object'] = new $tab_c($this->config,$this->config->data['TABS'][$tab_o],$entry['dn'],$tab_a);
}
+ if($parent ){
+ $entry['object']->parent = $parent;
+ }
$entry['source_data'] = $this->load_attributes_from_hdd($entry['file_name']);
if($entry['method'] == "copy"){
@@ -291,7 +296,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 +305,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 +326,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;
}
@@ -336,14 +358,17 @@ class CopyPasteHandler {
/* Save edited entry and force loading new one
*/
- if(isset($_POST['PerformCopyPaste']) && $this->current){
+ if(isset($this->current['object']) && method_exists($this->current['object'],"saveCopyDialog")) {
$this->current['object']->saveCopyDialog();
+ }
+
+ if(isset($_POST['PerformCopyPaste']) && $this->current){
$msgs = $this->check();
/* Load next queue entry */
if(!count($msgs)){
- $this->lastdn = $this->current['object']->dn;
$this->current['object']->save();
+ $this->lastdn = $this->current['object']->dn;
$this->current = FALSE;
}else{
foreach( $msgs as $msg){