X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=2a9bea409e341a0e1e699427d260bc18ded8c987;hb=1e99420f077c6595a6098da8b0685a852668852f;hp=244f7c7eec57c054bf97959957bd4775508e42c4;hpb=4d862a32a7f82e1c3338a53cce8c29b7a2addd61;p=gosa.git
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 244f7c7ee..2a9bea409 100644
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -61,20 +61,20 @@ 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)){
- trigger_error(sprintf("Specified class object '%s' does not exists.",$tab_class));
+ if(!class_available($tab_class)){
+ trigger_error(sprintf("Specified class object %s does not exists.", bold($tab_class)));
return(FALSE);
}
if(!isset($this->config->data['TABS'][$tab_object])){
- trigger_error(sprintf("Specified tab object '%s' does not exists.",$tab_object));
+ trigger_error(sprintf("Specified tab object %s does not exists.", bold($tab_object)));
return(FALSE);
}
if(!in_array($action,array("cut","copy"))){
- trigger_error(sprintf("Specified action '%s' does not exists for copy & paste.",$action));
+ trigger_error(sprintf("Specified action %s does not exists for copy & paste.", bold($action)));
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"), bold(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);
@@ -155,7 +156,7 @@ class CopyPasteHandler {
/* Check if given dn is valid and ldap search was succesfull */
if(!$res){
- $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("'%s' is no vaild LDAP object"), LDAP::fix($dn));
+ $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("'%s' is no vaild LDAP object"), bold(LDAP::fix($dn)));
msg_dialog::display(_("Internal error"), $msg, ERROR_DIALOG);
new log("copy","all/all",$dn,array(), $msg);
return(FALSE);
@@ -172,20 +173,12 @@ class CopyPasteHandler {
/* check if we are able to create a new file the given directory */
if(!is_writeable($path)){
- $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("No write permission in '%s'"),LDAP_DUMP_PATH);
+ $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("No write permission in '%s'"), bold(LDAP_DUMP_PATH));
msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG);
new log("copy","all/all",$dn,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);
- }
-
/* 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'"), bold(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"){
@@ -353,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){
@@ -407,7 +415,7 @@ class CopyPasteHandler {
$smarty->assign("AttributesToFix",$this->generateAttributesToFix());
$smarty->assign("SubDialog",$this->current['object']->SubDialog);
$smarty->assign("objectDN",$this->current['source_data']['dn']);
- $smarty->assign("message", sprintf(_("This object will be pasted: %s"), "
".$this->current['source_data']['dn']));
+ $smarty->assign("message", sprintf(_("This object will be pasted: %s"), "
".bold($this->current['source_data']['dn'])));
return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE)));
}
}