diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 170fe31..7adeaa8 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -270,7 +270,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { private Processor createMovePacDomainContent(EntityManager em, Domain dom) { Pac pac = dom.getUser().getPac(); - String pacDir = pac.getAdminUser(em).getHomedir(); + String pacDir = "/home/pacs/" + pac.getName(); String domDir = pacDir + "/doms/" + pac.getName() + ".hostsharing.net"; String[] sourceDirs = new String[] { "web", "web-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ; String[] targetDirs = new String[] { "htdocs", "htdocs-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ; diff --git a/hsarback/src/de/hsadmin/remote/EMailAddressRemote.java b/hsarback/src/de/hsadmin/remote/EMailAddressRemote.java index dfa01eb..f41b98c 100644 --- a/hsarback/src/de/hsadmin/remote/EMailAddressRemote.java +++ b/hsarback/src/de/hsadmin/remote/EMailAddressRemote.java @@ -1,7 +1,9 @@ package de.hsadmin.remote; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import de.hsadmin.core.model.AbstractEntity; import de.hsadmin.mods.dom.Domain; @@ -25,7 +27,14 @@ public class EMailAddressRemote extends AbstractRemote { if (assertNotNull(domain)) map.put("domain", domain); if (assertNotNull(admin)) map.put("admin", admin); if (assertNotNull(pac)) map.put("pac", pac); - if (assertNotNull(target)) map.put("target", target); + if (assertNotNull(target)) { + StringTokenizer tokenizer = new StringTokenizer(target, ","); + List tokenList = new ArrayList(); + while (tokenizer.hasMoreTokens()) { + tokenList.add(tokenizer.nextToken().trim()); + } + map.put("target", tokenList); + } if (assertNotNull(localpart)) map.put("localpart", localpart); if (assertNotNull(subdomain)) map.put("subdomain", subdomain); if (assertNotNull(emailaddress)) map.put("emailaddress", emailaddress); diff --git a/hsarback/src/de/hsadmin/remote/EMailAliasRemote.java b/hsarback/src/de/hsadmin/remote/EMailAliasRemote.java index 998c8f7..c047aa6 100644 --- a/hsarback/src/de/hsadmin/remote/EMailAliasRemote.java +++ b/hsarback/src/de/hsadmin/remote/EMailAliasRemote.java @@ -1,7 +1,9 @@ package de.hsadmin.remote; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import de.hsadmin.core.model.AbstractEntity; import de.hsadmin.mods.email.EMailAlias; @@ -18,7 +20,12 @@ public class EMailAliasRemote extends AbstractRemote { map.put("id", id); map.put("name", name); map.put("pac", pac); - map.put("target", target); + StringTokenizer tokenizer = new StringTokenizer(target, ","); + List tokenList = new ArrayList(); + while (tokenizer.hasMoreTokens()) { + tokenList.add(tokenizer.nextToken().trim()); + } + map.put("target", tokenList); } @Override