X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_CopyPasteHandler.inc;h=f0cb85d7db7e1ea8d8124508195231ee0ac515ac;hb=756a035712ab9baa43653e323a6d482343ba7355;hp=ed01b1cf835d93ac4e943b581eb39d2c8aa59c12;hpb=f2cb1f8f521a0069806e40c4a9bf01042af4aa5e;p=gosa.git
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index ed01b1cf8..f0cb85d7d 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,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!")."