X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=2a9bea409e341a0e1e699427d260bc18ded8c987;hb=1e99420f077c6595a6098da8b0685a852668852f;hp=6436330550dec8d17e1b0caac0a4da8576389d06;hpb=5c3ec1cce75bc9e50fbcfdc4aa659883f3ef0e17;p=gosa.git
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 643633055..2a9bea409 100644
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -64,17 +64,17 @@ class CopyPasteHandler {
function add_to_queue($dn,$action,$tab_class,$tab_object,$tab_acl_category,&$parent = NULL)
{
if(!class_available($tab_class)){
- trigger_error(sprintf("Specified class object '%s' does not exists.",$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);
}
@@ -115,7 +115,7 @@ class CopyPasteHandler {
/* 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= 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);
@@ -156,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);
@@ -173,7 +173,7 @@ 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);
@@ -190,7 +190,7 @@ class CopyPasteHandler {
/* Update folder permissions */
if(!@chmod($path."/".$filename,0700)){
- $msg= sprintf(_("Copy and paste failed!")."
"._("Error").": "._("Cannot set permission for '%s'"),LDAP_DUMP_PATH);
+ $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);
@@ -358,8 +358,11 @@ 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 */
@@ -412,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)));
}
}