sql/5.5.1/openemm.sql sql/5.5.1/update.sql src/c/xmlback/preview.c src/c/xmlback/rblock.c src/java/org/agnitas/backend/BC.java src/java/org/agnitas/beans/impl/DynaBeanPaginatedListImpl.java src/java/org/agnitas/dao/BounceDao.java src/java/org/agnitas/dao/impl/BounceDaoImpl.java src/java/org/agnitas/preview/Cache.java src/java/org/agnitas/preview/Preview.java src/java/org/agnitas/service/CampaignQueryWorker.java src/java/org/agnitas/service/MailingsQueryWorker.java src/java/org/agnitas/service/RecipientQueryBuilder.java src/java/org/agnitas/service/RecipientQueryWorker.java src/java/org/agnitas/util/SubCheck.java src/java/org/agnitas/web/filter/OpenSessionInViewFilter.java src/java/org/agnitas/web/filter/SerializeRequestFilter.java src/java/org/agnitas/web/forms/AdminForm.java src/java/org/agnitas/web/forms/CampaignForm.java src/java/org/agnitas/web/forms/EmmActionForm.java src/java/org/agnitas/web/forms/StrutsFormBase.java src/jsp/WEB-INF/ajaxanywhere.tld src/jsp/images/emm/warning.gif src/jsp/importwizard/verifymissingfields.jsp src/jsp/js/aa.js src/jsp/mailing/loading.jsp src/jsp/recipient/loading.jsp @@ -1,18 +1,10 @@ # Sample ResourceBundle properties file -oracle.home=/home/oracle/Oracle9/software +jdk.execute=/opt/jdk1.5.0_11 -profiler.home=/home/openemm/netbeans-4.1/profiler1/modules +jdk.compile=/opt/jdk1.5.0_11 -jdk.execute=/home/openemm/jdk1.5.0_04 - -jdk.compile=/opt/sun-jdk-1.4.2.04 - -#jdk.instdir=/home/openemm/nb-profiler-server/profiler-ea-vm - -#jdk.instdir=/home/openemm/jdk1.6.0 - -resin.home=/opt/resin-1.2.10 +resin.home=/opt/resin-3.0.17 appname=/OpenEMM EMMBuild.properties.default @@ -131,7 +131,103 @@ </object> </void> <void method="add"> - <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <object id="SubsystemNode0" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedAfferentsCollection"> + <void method="add"> + <object id="SubsystemNode1" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedEfferentsCollection"> + <void method="add"> + <object id="SubsystemNode2" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedAfferentsCollection"> + <void method="add"> + <object idref="SubsystemNode1"/> + </void> + </void> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.agnitas.web</string> + </void> + </void> + <void property="name"> + <string>Struts-Actions</string> + </void> + </object> + </void> + <void method="add"> + <object id="SubsystemNode3" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedAfferentsCollection"> + <void method="add"> + <object idref="SubsystemNode1"/> + </void> + </void> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.agnitas.actions.ops</string> + </void> + <void method="add"> + <string>org.agnitas.beans.impl</string> + </void> + </void> + <void property="name"> + <string>BeansImpl</string> + </void> + </object> + </void> + <void method="add"> + <object idref="SubsystemNode0"/> + </void> + <void method="add"> + <object id="SubsystemNode4" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedAfferentsCollection"> + <void method="add"> + <object idref="SubsystemNode1"/> + </void> + <void method="add"> + <object id="SubsystemNode5" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="disallowedEfferentsCollection"> + <void method="add"> + <object idref="SubsystemNode0"/> + </void> + <void method="add"> + <object idref="SubsystemNode4"/> + </void> + </void> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.agnitas.taglib</string> + </void> + </void> + <void property="name"> + <string>Taglibs</string> + </void> + </object> + </void> + </void> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.hibernate**</string> + </void> + </void> + <void property="name"> + <string>hibernate</string> + </void> + </object> + </void> + </void> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>_jsp**</string> + </void> + </void> + <void property="name"> + <string>JSP</string> + </void> + </object> + </void> + <void method="add"> + <object idref="SubsystemNode5"/> + </void> + </void> <void property="includePackagePatternsCollection"> <void method="add"> <string>java.sql</string> @@ -139,9 +235,18 @@ <void method="add"> <string>javax.sql</string> </void> + <void method="add"> + <string>org.springframework.jdbc.**</string> + </void> + <void method="add"> + <string>org.springframework.orm.hibernate3**</string> + </void> + <void method="add"> + <string>com.mysql.jdbc</string> + </void> </void> <void property="name"> - <string>sql-support</string> + <string>db-support</string> </void> </object> </void> @@ -193,6 +298,114 @@ </void> </object> </void> + <void method="add"> + <object idref="SubsystemNode4"/> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>java.awt**</string> + </void> + <void method="add"> + <string>org.springframework.orm.hibernate3</string> + </void> + </void> + <void property="name"> + <string>awt</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.springframework.context**</string> + </void> + <void method="add"> + <string>org.springframework.web.context**</string> + </void> + <void method="add"> + <string>org.springframework.web.struts</string> + </void> + <void method="add"> + <string>org.springframework.dao</string> + </void> + </void> + <void property="name"> + <string>spring</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.springframework.remoting.jaxrpc</string> + </void> + <void method="add"> + <string>java.rmi</string> + </void> + </void> + <void property="name"> + <string>remoting</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>org.ajaxtags.tags</string> + </void> + <void method="add"> + <string>org.displaytag.tags</string> + </void> + <void method="add"> + <string>org.displaytag.util</string> + </void> + </void> + <void property="name"> + <string>ui</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>java.security</string> + </void> + </void> + <void property="name"> + <string>security</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>bsh</string> + </void> + </void> + <void property="name"> + <string>bsh</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> + <void method="add"> + <string>com.ibm.icu.text</string> + </void> + </void> + <void property="name"> + <string>backend</string> + </void> + </object> + </void> </void> <void property="description"> <string>Contains all external components</string> @@ -235,53 +448,68 @@ </void> <void property="childrenCollection"> <void method="add"> - <object id="SubsystemNode0" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> - <void property="disallowedEfferentsCollection"> - <void method="add"> - <object id="SubsystemNode1" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> - <void property="disallowedAfferentsCollection"> - <void method="add"> - <object idref="SubsystemNode0"/> - </void> - </void> - <void property="includePackagePatternsCollection"> - <void method="add"> - <string>org.agnitas.web</string> - </void> - </void> - <void property="name"> - <string>Struts-Actions</string> - </void> - </object> - </void> + <object idref="SubsystemNode1"/> + </void> + </void> + <void property="index"> + <int>-1</int> + </void> + <void property="name"> + <string>JSP</string> + </void> + <void property="x"> + <int>619</int> + </void> + <void property="y"> + <int>6</int> + </void> + </object> + </void> + </void> + <void property="allowedEfferentsCollection"> + <void method="add"> + <object idref="LayerNode2"/> + </void> + <void method="add"> + <object idref="LayerNode3"/> + </void> + <void method="add"> + <object id="LayerNode6" class="com.hello2morrow.sonar.core.architecturedescription.LayerNode"> + <void property="allowedAfferentsCollection"> + <void method="add"> + <object idref="LayerNode4"/> + </void> + </void> + <void property="allowedEfferentsCollection"> + <void method="add"> + <object idref="LayerNode3"/> + </void> + <void method="add"> + <object idref="LayerNode2"/> + </void> + </void> + <void property="childrenCollection"> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> + <void property="includePackagePatternsCollection"> <void method="add"> - <object id="SubsystemNode2" class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> - <void property="disallowedAfferentsCollection"> - <void method="add"> - <object idref="SubsystemNode0"/> - </void> - </void> - <void property="includePackagePatternsCollection"> - <void method="add"> - <string>org.agnitas.actions.ops</string> - </void> - <void method="add"> - <string>org.agnitas.beans.impl</string> - </void> - </void> - <void property="name"> - <string>BeansImpl</string> - </void> - </object> + <string>org.agnitas.service.impl</string> </void> </void> + <void property="name"> + <string>serviceImpl</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> <void property="includePackagePatternsCollection"> <void method="add"> - <string>_jsp**</string> + <string>org.agnitas.service</string> </void> </void> <void property="name"> - <string>JSP</string> + <string>service</string> </void> </object> </void> @@ -290,25 +518,17 @@ <int>-1</int> </void> <void property="name"> - <string>JSP</string> + <string>service</string> </void> <void property="x"> - <int>488</int> + <int>371</int> </void> <void property="y"> - <int>3</int> + <int>144</int> </void> </object> </void> </void> - <void property="allowedEfferentsCollection"> - <void method="add"> - <object idref="LayerNode2"/> - </void> - <void method="add"> - <object idref="LayerNode3"/> - </void> - </void> <void property="childrenCollection"> <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> @@ -335,47 +555,79 @@ </object> </void> <void method="add"> + <object idref="SubsystemNode5"/> + </void> + <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> <void property="includePackagePatternsCollection"> <void method="add"> - <string>org.agnitas.taglib</string> + <string>org.agnitas.webservice</string> </void> </void> <void property="name"> - <string>Taglibs</string> + <string>Webservices</string> </void> </object> </void> <void method="add"> + <object idref="SubsystemNode2"/> + </void> + </void> + <void property="index"> + <int>-1</int> + </void> + <void property="name"> + <string>UserInterface</string> + </void> + <void property="x"> + <int>418</int> + </void> + <void property="y"> + <int>55</int> + </void> + </object> + </void> + <void method="add"> + <object id="LayerNode7" class="com.hello2morrow.sonar.core.architecturedescription.LayerNode"> + <void property="allowedEfferentsCollection"> + <void method="add"> + <object idref="LayerNode3"/> + </void> + <void method="add"> + <object idref="LayerNode2"/> + </void> + </void> + <void property="childrenCollection"> + <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.SubsystemNode"> <void property="includePackagePatternsCollection"> <void method="add"> - <string>org.agnitas.webservice</string> + <string>org.agnitas.backend</string> </void> </void> <void property="name"> - <string>Webservices</string> + <string>backend</string> </void> </object> </void> - <void method="add"> - <object idref="SubsystemNode1"/> - </void> </void> <void property="index"> <int>-1</int> </void> <void property="name"> - <string>UserInterface</string> + <string>backend</string> </void> <void property="x"> - <int>276</int> + <int>32</int> </void> <void property="y"> - <int>126</int> + <int>77</int> </void> </object> </void> + <void method="add"> + <object idref="LayerNode6"/> + </void> </void> <void property="allowedEfferentsCollection"> <void method="add"> @@ -415,10 +667,10 @@ <string>Dao</string> </void> <void property="x"> - <int>65</int> + <int>69</int> </void> <void property="y"> - <int>202</int> + <int>225</int> </void> </object> </void> @@ -428,6 +680,12 @@ <void method="add"> <object idref="LayerNode5"/> </void> + <void method="add"> + <object idref="LayerNode7"/> + </void> + <void method="add"> + <object idref="LayerNode6"/> + </void> </void> <void property="childrenCollection"> <void method="add"> @@ -455,7 +713,7 @@ </object> </void> <void method="add"> - <object idref="SubsystemNode2"/> + <object idref="SubsystemNode3"/> </void> </void> <void property="index"> @@ -468,10 +726,10 @@ <string>Beans</string> </void> <void property="x"> - <int>267</int> + <int>488</int> </void> <void property="y"> - <int>323</int> + <int>316</int> </void> </object> </void> @@ -487,6 +745,12 @@ <void method="add"> <object idref="LayerNode5"/> </void> + <void method="add"> + <object idref="LayerNode7"/> + </void> + <void method="add"> + <object idref="LayerNode6"/> + </void> </void> <void property="moveCompilationUnitsCollection"> <void method="add"> @@ -534,7 +798,7 @@ <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.MoveCompilationUnitNode"> <void property="compilationUnit"> - <string>org/agnitas/web/AdminForm.java</string> + <string>org/agnitas/web/forms/AdminForm.java</string> </void> <void property="date"> <object class="java.util.Date"> @@ -549,7 +813,7 @@ <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.MoveCompilationUnitNode"> <void property="compilationUnit"> - <string>org/agnitas/web/CampaignForm.java</string> + <string>org/agnitas/web/forms/CampaignForm.java</string> </void> <void property="date"> <object class="java.util.Date"> @@ -864,7 +1128,7 @@ <void method="add"> <object class="com.hello2morrow.sonar.core.architecturedescription.MoveCompilationUnitNode"> <void property="compilationUnit"> - <string>org/agnitas/web/StrutsFormBase.java</string> + <string>org/agnitas/web/forms/StrutsFormBase.java</string> </void> <void property="date"> <object class="java.util.Date"> @@ -969,9 +1233,165 @@ </void> </object> </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetNodeDate</string> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetNode</string> + </void> + </object> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetNodeString</string> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetNode</string> + </void> + </object> + </void> + <void method="add"> + <object id="CutTypeDependencyNode0" class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="childInRefactoringChain"> + <object id="CutTypeDependencyNode1" class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetRepresentationImpl</string> + </void> + <void property="parentInRefactoringChain"> + <object idref="CutTypeDependencyNode0"/> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetRepresentation</string> + </void> + </object> + </void> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetRepresentationImpl</string> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetNode</string> + </void> + </object> + </void> + <void method="add"> + <object idref="CutTypeDependencyNode1"/> + </void> + <void method="add"> + <object id="CutTypeDependencyNode2" class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="childInRefactoringChain"> + <object id="CutTypeDependencyNode3" class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="childInRefactoringChain"> + <object id="CutTypeDependencyNode4" class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetImpl</string> + </void> + <void property="parentInRefactoringChain"> + <object idref="CutTypeDependencyNode3"/> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetRepresentation</string> + </void> + </object> + </void> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetImpl</string> + </void> + <void property="parentInRefactoringChain"> + <object idref="CutTypeDependencyNode2"/> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetNode</string> + </void> + </object> + </void> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetImpl</string> + </void> + <void property="toType"> + <string>org.agnitas.target.Target</string> + </void> + </object> + </void> + <void method="add"> + <object idref="CutTypeDependencyNode3"/> + </void> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.CutTypeDependencyNode"> + <void property="date"> + <object class="java.util.Date"> + <long>1213803703132</long> + </object> + </void> + <void property="fromType"> + <string>org.agnitas.target.impl.TargetNodeNumeric</string> + </void> + <void property="toType"> + <string>org.agnitas.target.TargetNode</string> + </void> + </object> + </void> + <void method="add"> + <object idref="CutTypeDependencyNode4"/> + </void> </void> <void property="name"> <string>architecture-template</string> </void> + <void property="thresholdsCollection"> + <void method="add"> + <object class="com.hello2morrow.sonar.core.architecturedescription.ThresholdNode"> + <void property="attribute"> + <string>lines of code</string> + </void> + <void property="element"> + <string>compilation-unit</string> + </void> + <void property="typeName"> + <string>upper</string> + </void> + <void property="value"> + <string>700</string> + </void> + </object> + </void> + </void> </object> </java> architecture.xml @@ -25,11 +25,13 @@ CFLAGS = -I. SRCS = atob.c \ buffer.c \ csig.c \ + hash.c \ lock.c \ log.c \ + map.c \ net.c \ node.c \ - map.c \ + set.c \ skip.c \ str.c \ tzdiff.c \ src/c/lib/GNUmakefile @@ -283,6 +283,10 @@ extern bool_t buffer_appends (buffer_t *b, const char *str); extern bool_t buffer_appendch (buffer_t *b, char ch); extern bool_t buffer_appendnl (buffer_t *b); extern bool_t buffer_appendcrlf (buffer_t *b); +extern bool_t buffer_insert (buffer_t *b, int pos, const byte_t *data, int dlen); +extern bool_t buffer_insertbuf (buffer_t *b, int pos, buffer_t *data); +extern bool_t buffer_insertsn (buffer_t *b, int pos, const char *str, int len); +extern bool_t buffer_inserts (buffer_t *b, int pos, const char *str); extern bool_t buffer_stiff (buffer_t *b, const byte_t *data, int dlen); extern bool_t buffer_stiffb (buffer_t *b, byte_t data); extern bool_t buffer_stiffsn (buffer_t *b, const char *str, int len); src/c/lib/agn.h @@ -258,6 +258,47 @@ buffer_appendcrlf (buffer_t *b) /*{{{*/ { return buffer_append (b, (byte_t *) "\r\n", 2); }/*}}}*/ +/** Insert data at given position + * @param b the buffer to use + * @param pos the position to insert data + * @param data the content + * @param dlen length of content + * @return true if content could be inserted, false otherwise + */ +bool_t +buffer_insert (buffer_t *b, int pos, const byte_t *data, int dlen) /*{{{*/ +{ + bool_t st; + + st = false; + if ((b -> length + dlen <= b -> size) || buffer_size (b, b -> length + dlen)) { + if (pos < 0) + pos = 0; + if (pos < b -> length) + memmove (b -> buffer + pos + dlen, b -> buffer + pos, b -> length - pos); + if (dlen > 0) { + memcpy (b -> buffer + pos, data, dlen); + b -> length += dlen; + } + st = true; + } + return st; +}/*}}}*/ +bool_t +buffer_insertbuf (buffer_t *b, int pos, buffer_t *data) /*{{{*/ +{ + return data ? buffer_insert (b, pos, data -> buffer, data -> length) : true; +}/*}}}*/ +bool_t +buffer_insertsn (buffer_t *b, int pos, const char *str, int len) /*{{{*/ +{ + return buffer_insert (b, pos, (byte_t *) str, len); +}/*}}}*/ +bool_t +buffer_inserts (buffer_t *b, int pos, const char *str) /*{{{*/ +{ + return buffer_insert (b, pos, (byte_t *) str, strlen (str)); +}/*}}}*/ /** Stiff (append) byte array to buffer. * This is like <i>buffer_append</i>, but more buffer is allocated * than currently required. These class of functions are useful when src/c/lib/buffer.c @@ -1,3 +1,3 @@ @echo off rem -*- no -*- -cl /DWIN32 /I. /Iwin "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c atob.c buffer.c lock.c log.c node.c map.c skip.c str.c tzdiff.c var.c compat.c +cl /DWIN32 /I. /Iwin "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c atob.c buffer.c hash.c lock.c log.c node.c map.c skip.c str.c tzdiff.c var.c compat.c src/c/lib/build.bat @@ -49,6 +49,8 @@ SRCS = append.c \ parse.c \ plugin.c \ postfix.c \ + preview.c \ + rblock.c \ receiver.c \ replace.c \ sqllike.c \ src/c/xmlback/GNUmakefile @@ -126,12 +126,14 @@ blockmail_alloc (const char *fname, bool_t syncfile, log_t *lg) /*{{{*/ b -> eval = NULL; b -> usecrlf = false; + b -> raw = false; b -> output = NULL; b -> outputdata = NULL; b -> counter = NULL; b -> active = false; b -> head = NULL; b -> body = NULL; + b -> rblocks = NULL; b -> company_id = -1; b -> mailinglist_id = -1; @@ -227,6 +229,8 @@ blockmail_free (blockmail_t *b) /*{{{*/ buffer_free (b -> head); if (b -> body) buffer_free (b -> body); + if (b -> rblocks) + rblock_free_all (b -> rblocks); if (b -> mtbuf[0]) xmlBufferFree (b -> mtbuf[0]); if (b -> mtbuf[1]) src/c/xmlback/blockmail.c @@ -60,7 +60,7 @@ <!ELEMENT maildrop EMPTY> <!ATTLIST maildrop status_id %numeric; #REQUIRED> <!ELEMENT status EMPTY> - <!ATTLIST status field (A | T | E | R | W) #REQUIRED> + <!ATTLIST status field (A | T | E | R | W | D | P) #REQUIRED> <!ELEMENT general (subject, from_email, profile_url, unsubscribe_url, auto_url, onepixel_url, password, total_subscribers)> <!ELEMENT subject (#PCDATA)> src/c/xmlback/blockmail.dtd @@ -1,6 +1,6 @@ @echo off rem -*- no -*- -rem cl /DWIN32 /Dinline= /I. /I..\lib /I..\lib\win "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c append.c block.c blockmail.c blockspec.c codec.c convert.c count.c counter.c create.c data.c dcache.c dyn.c eval.c field.c fix.c generate.c links.c mailtype.c media.c misc.c modify.c none.c parse.c plugin.c postfix.c receiver.c replace.c sqllike.c tag.c tagpos.c url.c xmlback.c dtd.c -cl /DWIN32 /Dinline= /I. /I..\lib /I..\lib\win "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c tag.c +cl /DWIN32 /Dinline= /I. /I..\lib /I..\lib\win "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c append.c block.c blockmail.c blockspec.c codec.c convert.c count.c counter.c create.c data.c dcache.c dyn.c eval.c field.c fix.c generate.c links.c mailtype.c media.c misc.c modify.c none.c parse.c plugin.c postfix.c receiver.c replace.c sqllike.c tag.c tagpos.c url.c xmlback.c dtd.c preview.c rblock.c +rem cl /DWIN32 /Dinline= /I. /I..\lib /I..\lib\win "/IC:\Programme\Microsoft Visual Studio 8\VC\include" /c tag.c cl *.obj grammer\transform.obj grammer\parse.obj ..\lib\*.obj /link /OUT:xmlback.exe /LIBPATH:..\lib\win /DEFAULTLIB:libxml2.lib /DEFAULTLIB:zlib.lib /DEFAULTLIB:iconv.lib /DEFAULTLIB:libslang.lib "/LIBPATH:C:\Programme\Microsoft Visual Studio 8\VC\lib" copy /y xmlback.exe C:\OpenEMM\bin src/c/xmlback/build.bat @@ -118,6 +118,7 @@ create_mail (blockmail_t *blockmail, receiver_t *rec) /*{{{*/ mailtype_t *mtyp; blockspec_t *bspec; block_t *block; + rblock_t *rbprev, *rbhead; bool_t changed; mtyp = NULL; @@ -231,6 +232,8 @@ create_mail (blockmail_t *blockmail, receiver_t *rec) /*{{{*/ /* * 3. Stage: create the output */ + rbprev = NULL; + rbhead = NULL; for (n = 0; st && (n <= mtyp -> blockspec_count); ++n) { if (n < mtyp -> blockspec_count) { bspec = mtyp -> blockspec[n]; @@ -239,51 +242,73 @@ create_mail (blockmail_t *blockmail, receiver_t *rec) /*{{{*/ bspec = NULL; block = NULL; } - if (postfixes) { - postfix_t *run, *prv; + if (blockmail -> raw) { - for (run = postfixes, prv = NULL; st && run; run = run -> stack) - if ((! block) || (run -> after < block -> nr)) { - dest = (run -> ref -> block -> tid == TID_EMail_Head ? blockmail -> head : blockmail -> body); - if (! append_cooked (dest, (attcount ? run -> c -> acont : run -> c -> cont), run -> ref -> block -> charset, Enc8bit)) { - log_out (blockmail -> lg, LV_ERROR, "Unable to append postfix for block %d for %d", run -> ref -> block -> nr, rec -> customer_id); - st = false; - } - if (prv) - prv -> stack = run -> stack; + if (st && block && block -> inuse) { + const char *name; + rblock_t *rbtmp; + + switch (block -> tid) { + default: name = block -> cid; break; + case TID_EMail_Head: name = "__head__"; break; + case TID_EMail_Text: name = "__text__"; break; + case TID_EMail_HTML: name = "__html__"; break; + } + if (rbtmp = rblock_alloc (block -> tid, name, block -> out)) { + if (rbprev) + rbprev -> next = rbtmp; else - postfixes = run -> stack; - } else - prv = run; - } - if (st && block && block -> inuse) { - dest = (block -> tid == TID_EMail_Head ? blockmail -> head : blockmail -> body); - if (! append_cooked (dest, (attcount ? bspec -> prefix -> acont : bspec -> prefix -> cont), block -> charset, Enc8bit)) { - log_out (blockmail -> lg, LV_ERROR, "Unable to append prefix for block %d for %d", block -> nr, rec -> customer_id); - st = false; + blockmail -> rblocks = rbtmp; + rbprev = rbtmp; + if ((! rbhead) && (block -> tid == TID_EMail_Head)) { + rbhead = rbtmp; + append_cooked (blockmail -> head, rbhead -> content, block -> charset, block -> method); + } + } } - if (st) { - if (! block -> binary) { - if (! append_cooked (dest, block -> out, block -> charset, block -> method)) - st = false; - } else { - if (! append_raw (dest, block -> bout)) - st = false; + } else { + if (postfixes) { + postfix_t *run, *prv; + + for (run = postfixes, prv = NULL; st && run; run = run -> stack) + if ((! block) || (run -> after < block -> nr)) { + dest = (run -> ref -> block -> tid == TID_EMail_Head ? blockmail -> head : blockmail -> body); + if (! append_cooked (dest, (attcount ? run -> c -> acont : run -> c -> cont), run -> ref -> block -> charset, Enc8bit)) { + log_out (blockmail -> lg, LV_ERROR, "Unable to append postfix for block %d for %d", run -> ref -> block -> nr, rec -> customer_id); + st = false; + } + if (prv) + prv -> stack = run -> stack; + else + postfixes = run -> stack; + } else + prv = run; + } + if (st && block && block -> inuse) { + dest = (block -> tid == TID_EMail_Head ? blockmail -> head : blockmail -> body); + if (! append_cooked (dest, (attcount ? bspec -> prefix -> acont : bspec -> prefix -> cont), block -> charset, Enc8bit)) { + log_out (blockmail -> lg, LV_ERROR, "Unable to append prefix for block %d for %d", block -> nr, rec -> customer_id); + st = false; + } + if (st) { + if (! block -> binary) { + if (! append_cooked (dest, block -> out, block -> charset, block -> method)) + st = false; + } else { + if (! append_raw (dest, block -> bout)) + st = false; + } + if (! st) + log_out (blockmail -> lg, LV_ERROR, "Unable to append content of block %d for %d", block -> nr, rec -> customer_id); } - if (! st) - log_out (blockmail -> lg, LV_ERROR, "Unable to append content of block %d for %d", block -> nr, rec -> customer_id); } } } /* * 4. clear up empty lines in header */ cleanup_header (blockmail); -# ifdef CSS - /* - * 5. optional sign mail */ - if (blockmail -> dkim) - sign_mail (blockmail); -# endif /* CSS */ + if (rbhead) + rblock_retreive_content (rbhead, blockmail -> head); return st; }/*}}}*/ @@ -299,6 +324,8 @@ create_output (blockmail_t *blockmail, receiver_t *rec) /*{{{*/ blockmail -> active = true; blockmail -> head -> length = 0; blockmail -> body -> length = 0; + if (blockmail -> raw && blockmail -> rblocks) + blockmail -> rblocks = rblock_free_all (blockmail -> rblocks); if (rec -> mediatypes) { char *copy, *cur, *ptr; mtype_t type; src/c/xmlback/create.c @@ -35,6 +35,8 @@ static output_t output_table[] = { /*{{{*/ generate_oinit, generate_odeinit, generate_owrite }, { "count", false, count_oinit, count_odeinit, count_owrite + }, { "preview", false, + preview_oinit, preview_odeinit, preview_owrite } /*}}}*/ }; @@ -151,6 +153,7 @@ main (int argc, char **argv) /*{{{*/ bool_t quiet; const char *error_file; bool_t usecrlf; + bool_t raw; output_t *out; const char *outparm; const char *level; @@ -163,6 +166,7 @@ main (int argc, char **argv) /*{{{*/ quiet = false; error_file = NULL; usecrlf = true; + raw = false; out = & output_table[1]; outparm = NULL; level = NULL; @@ -170,7 +174,7 @@ main (int argc, char **argv) /*{{{*/ xmlInitParser (); xmlInitializePredefinedEntities (); xmlInitCharEncodingHandlers (); - while ((n = getopt (argc, argv, "VDvpqE:lo:L:")) != -1) + while ((n = getopt (argc, argv, "VDvpqE:lro:L:")) != -1) switch (n) { case 'V': printf ("%s\n", XML_VERSION); @@ -193,6 +197,9 @@ main (int argc, char **argv) /*{{{*/ case 'l': usecrlf = false; break; + case 'r': + raw = true; + break; case 'o': if (ptr = strchr (optarg, ':')) { len = ptr - optarg; @@ -255,6 +262,7 @@ main (int argc, char **argv) /*{{{*/ log_out (lg, LV_ERROR, "Unable to setup blockmail"); else { blockmail -> usecrlf = usecrlf; + blockmail -> raw = raw; blockmail -> output = out; blockmail -> outputdata = NULL; log_idset (lg, "init"); src/c/xmlback/xmlback.c @@ -304,6 +304,13 @@ typedef struct counter { /*{{{*/ struct counter *next; /*}}}*/ } counter_t; +typedef struct rblock { /*{{{*/ + tid_t tid; /* type ID */ + char *bname; /* name of this block */ + xmlBufferPtr content; /* content of the block */ + struct rblock *next; + /*}}}*/ +} rblock_t; typedef struct { /*{{{*/ /* internal used only data */ const char *fname; /* current filename */ @@ -317,12 +324,14 @@ typedef struct { /*{{{*/ eval_t *eval; /* to interpret dynamic content */ /* output related data */ bool_t usecrlf; /* use CRLF or LF on output */ + bool_t raw; /* just generate raw output */ output_t *output; /* output information */ void *outputdata; /* output related private data */ counter_t *counter; /* counter for created mails */ bool_t active; /* if user is active */ buffer_t *head; /* the created head .. */ buffer_t *body; /* .. and body */ + rblock_t *rblocks; /* the raw blocks */ /* * from here, the data is from the input file or from dynamic enviroment @@ -491,6 +500,12 @@ extern mailtype_t *mailtype_free (mailtype_t *m); extern counter_t *counter_alloc (const char *mediatype, const char *subtype); extern counter_t *counter_free (counter_t *c); extern counter_t *counter_free_all (counter_t *c); +extern rblock_t *rblock_alloc (tid_t tid, const char *bname, xmlBufferPtr content); +extern rblock_t *rblock_free (rblock_t *r); +extern rblock_t *rblock_free_all (rblock_t *r); +extern bool_t rblock_set_name (rblock_t *r, const char *bname); +extern bool_t rblock_set_content (rblock_t *r, xmlBufferPtr content); +extern bool_t rblock_retreive_content (rblock_t *r, buffer_t *content); extern blockmail_t *blockmail_alloc (const char *fname, bool_t syncfile, log_t *lg); extern blockmail_t *blockmail_free (blockmail_t *b); extern bool_t blockmail_count (blockmail_t *b, const char *mediatype, const char *subtype, long bytes); @@ -576,6 +591,9 @@ extern bool_t generate_owrite (void *data, blockmail_t *blockmail, receiver_t * extern void *count_oinit (blockmail_t *blockmail, var_t *opts); extern bool_t count_odeinit (void *data, blockmail_t *blockmail, bool_t success); extern bool_t count_owrite (void *data, blockmail_t *blockmail, receiver_t *rec); +extern void *preview_oinit (blockmail_t *blockmail, var_t *opts); +extern bool_t preview_odeinit (void *data, blockmail_t *blockmail, bool_t success); +extern bool_t preview_owrite (void *data, blockmail_t *blockmail, receiver_t *rec); /* * plugin handling src/c/xmlback/xmlback.h @@ -97,7 +97,7 @@ public class BlockCollection { tg.initialize (data); return tg; } - + /** * Constructor for this class */ @@ -328,6 +328,12 @@ public class BlockCollection { public String mailingClause () { return "mailing_id = " + data.mailing_id; } + + public String reduceClause () { + if (data.isPreviewMailing ()) + return " AND comptype IN (0, 4)"; + return ""; + } public String componentFields () { return "comptype, url_id, compname, mtype, target_id, emmblock, binblock"; @@ -344,7 +350,7 @@ public class BlockCollection { query = "SELECT " + componentFields () + " " + "FROM component_tbl " + - "WHERE company_id = " + data.company_id + " AND (" + mailingClause () + ") " + + "WHERE company_id = " + data.company_id + " AND (" + mailingClause () + ") " + reduceClause () + "ORDER BY component_id"; try { Vector collect; src/java/org/agnitas/backend/BlockCollection.java @@ -50,26 +50,6 @@ public class Data { final static long serialVersionUID = 0x055da1a; /** the file to read the configuration from */ final static String INI_FILE = "Mailgun.ini"; - /** Available output file formats */ - final static String[] OUT_MODES = { - "meta" - }; - /** Output file format constant: META */ - final static int OUT_META = 0; - /** default output file format */ - final static int DEFAULT_OUT_MODE = OUT_META; - /** Available modes for output format meta */ - final static String[] META_MODES = { - "xml", - "xml/gz" - }; - /** Mode for output format meta XML */ - final static int OUT_META_XML = 0; - /** Mode for output format meta XML gzip'd */ - final static int OUT_META_XMLGZ = 1; - /** default mode for output format meta */ - final static int DEFAULT_META_MODE = OUT_META_XML; - /** default value for domain entry */ final static String DEF_DOMAIN = "openemm.org"; /** default value for boundary entry */ @@ -77,7 +57,7 @@ public class Data { /** default value for EOL coding */ final static String DEF_EOL = "\r\n"; /** default value for X-Mailer: header */ - final static String DEF_MAILER = "OpenEMM/Agnitas AG V5.1.1"; + final static String DEF_MAILER = "OpenEMM/Agnitas AG V5.5.1"; /** Constant for onepixellog: no automatic insertion */ final public static int OPL_NONE = 0; @@ -114,21 +94,9 @@ public class Data { private String sampleEmails = null; /** write a DB record after creating that number of receiver */ private int mailLogNumber = 0; - /** flag wether we need to update the mailing status */ - private boolean setMailingStatus = false; - /** flag if we should write the end message */ - private boolean writeEndMessage = true; - /** freetext start messages */ - private String startMessage = "generating in progress"; - /** freetext end message */ - private String endMessage = "generating successfully ended"; /** path to accounting logfile */ private String accLogfile = "log/account.log"; - /** the used output format */ - public int outMode = DEFAULT_OUT_MODE; - /** the used meta output format */ - public int metaMode = DEFAULT_META_MODE; /** the user_status for this query */ public long defaultUserStatus = BindingEntry.USER_STATUS_ACTIVE; /** in case of campaing mailing, send mail only to this customer */ @@ -137,6 +105,10 @@ public class Data { public long campaignTransactionID = 0; /** for campaign mailings, use this user status in the binding table */ public long campaignUserStatus = BindingEntry.USER_STATUS_ACTIVE; + /** for preview mailings use this for matching the customer ID */ + public long previewCustomerID = 0; + /** for preview mailings store output */ + public Hashtable previewOutput = null; /** a counter to enforce uniqueness on compaign mails */ public long pass = 0; /** alternative campaign mailing selection */ @@ -239,7 +211,9 @@ public class Data { /** Bitfield of available media types in mailing */ public long availableMedias = 0; /** number of all subscriber of a mailing */ - public long totalSubscribers = -1; + public long totalSubscribers = -1; + /** number of all subscriber of a mailing */ + private BC bigClause = null; /** all URLs from rdir_url_tbl */ public Vector URLlist = null; /** number of entries in URLlist */ @@ -258,8 +232,6 @@ public class Data { public String company_name = null; /** name of mailtracking table */ public String mailtracking_table = null; - /** optional information to append to end message */ - public String extraEndMessage = null; /** for housekeeping of created files */ private Vector toRemove = null; @@ -274,6 +246,10 @@ public class Data { return new DBase ((Data) me, conn); } + public Object mkBigClause () { + return new BC (); + } + /** * setup database connection and retreive a list of all available * tables @@ -452,22 +428,6 @@ public class Data { } /** - * Get query part for user_status - * @param full include table shortcut - * @return the where clause part for the user status - */ - public String clauseForUserStatus (boolean full) { - String st; - - if (isCampaignMailing () && (defaultUserStatus != campaignUserStatus)) { - st = "user_status IN (" + defaultUserStatus + ", " + campaignUserStatus + ")"; - } else { - st = "user_status = " + defaultUserStatus; - } - return (full ? "bind." : "") + st; - } - - /** * query all basic information about this mailing * @param status_id the reference to the mailing */ @@ -478,38 +438,47 @@ public class Data { checkDatabase (); try { - maildrop_status_id = Long.parseLong (status_id); - - // get the first information block from maildrop_status_tbl - rset = dbase.simpleQuery ("SELECT company_id, mailing_id, status_field, senddate, step, blocksize, genstatus " + - "FROM maildrop_status_tbl " + - "WHERE status_id = " + maildrop_status_id); - company_id = rset.getLong (1); - mailing_id = rset.getLong (2); - status_field = dbase.getValidString (rset, 3); - sendtimestamp = rset.getTimestamp (4); - st = rset.getInt (5); - bs = rset.getInt (6); - genstat = rset.getInt (7); - rset.close (); - if (status_field.equals ("C")) - status_field = "E"; - if (bs > 0) - setBlockSize (bs); - setStepping (st); - if (genstat != 1) - throw new Exception ("Generation state is not 1, but " + genstat); - if (isAdminMailing () || isTestMailing () || isWorldMailing () || isRuleMailing () || isOnDemandMailing ()) { - int rowcount = 0; - - try { - rowcount = dbase.execUpdate ("UPDATE maildrop_status_tbl SET genchange = " + dbase.sysdate + ", genstatus = 2 " + + if (status_id.startsWith ("preview:")) { + mailing_id = Long.parseLong (status_id.substring (status_id.indexOf (':') + 1)); + rset = dbase.simpleQuery ("SELECT company_id FROM mailing_tbl WHERE mailing_id = " + mailing_id); + company_id = rset.getLong (1); + rset.close (); + status_field = "P"; + sendtimestamp = null; + } else { + maildrop_status_id = Long.parseLong (status_id); + + // get the first information block from maildrop_status_tbl + rset = dbase.simpleQuery ("SELECT company_id, mailing_id, status_field, senddate, step, blocksize, genstatus " + + "FROM maildrop_status_tbl " + + "WHERE status_id = " + maildrop_status_id); + company_id = rset.getLong (1); + mailing_id = rset.getLong (2); + status_field = dbase.getValidString (rset, 3); + sendtimestamp = rset.getTimestamp (4); + st = rset.getInt (5); + bs = rset.getInt (6); + genstat = rset.getInt (7); + rset.close (); + if (status_field.equals ("C")) + status_field = "E"; + if (bs > 0) + setBlockSize (bs); + setStepping (st); + if (genstat != 1) + throw new Exception ("Generation state is not 1, but " + genstat); + if (isAdminMailing () || isTestMailing () || isWorldMailing () || isRuleMailing () || isOnDemandMailing ()) { + int rowcount = 0; + + try { + rowcount = dbase.execUpdate ("UPDATE maildrop_status_tbl SET genchange = " + dbase.sysdate + ", genstatus = 2 " + "WHERE status_id = " + maildrop_status_id + " AND genstatus = 1"); - } catch (Exception e) { - throw new Exception ("Unable to update generation state to 2: " + e.toString ()); + } catch (Exception e) { + throw new Exception ("Unable to update generation state to 2: " + e.toString ()); + } + if (rowcount != 1) + throw new Exception ("Update of maildrop_status_tbl affects " + rowcount + " rows, not exactly one"); } - if (rowcount != 1) - throw new Exception ("Update of maildrop_status_tbl affects " + rowcount + " rows, not exactly one"); } retreiveMailingInformation (); @@ -626,15 +595,15 @@ public class Data { rset = dbase.execQuery ("SELECT col_name, shortname FROM customer_field_tbl WHERE company_id = " + company_id); while (rset.next ()) { String column = rset.getString (1).toLowerCase (); - + if (column != null) { Column c = (Column) cmap.get (column); - + if (c != null) c.setAlias (rset.getString (2)); } } - rset.close (); + rset.close (); retreiveCompanyInfo (); if (rdirDomain != null) { @@ -647,43 +616,6 @@ public class Data { if (onePixelURL == null) onePixelURL = rdirDomain + onePixelTag; } - - // - // now count the total number of subscribers - if (isCampaignMailing () && (campaignTransactionID == 0)) { - totalSubscribers = 1; - } else { - String query, med, ref; - - if ((! isCampaignMailing ()) && (subselect == null)) { - query = "SELECT count(distinct(customer_id)) FROM customer_" + company_id + "_binding_tbl bind " + - "WHERE " + - "mailinglist_id = " + mailinglist_id + " AND " + clauseForUserStatus (false); - } else { - query = "SELECT count(distinct(cust.customer_id)) FROM "+ - "customer_" + company_id + "_tbl cust, " + - "customer_" + company_id + "_binding_tbl bind " + - "WHERE " + - "bind.customer_id = cust.customer_id AND " + - "bind.mailinglist_id = " + mailinglist_id + " AND " + - clauseForUserStatus (true) + " AND " + - "(" + subselect + ")"; - if (isCampaignMailing ()) { - query += " AND cust.transaction_id = " + campaignTransactionID; - } - } - med = getMediaSubselect (); - if (med != null) { - query += " AND (" + med + ")"; - } - ref = getReferenceSubselect (); - if (ref != null) { - query += " AND (" + ref + ")"; - } - rset = dbase.simpleQuery (query); - totalSubscribers = rset.getLong (1); - rset.close (); - } } catch (SQLException e) { logging (Log.ERROR, "init", "SQLError in quering initial data: " + e); throw new Exception ("Data error/initial query: " + e); @@ -710,45 +642,6 @@ public class Data { step = newStep; } - - /** - * Remove an existing old entry for mailing status and - * write a new record - */ - private void setupMailingStatus () throws Exception { - setMailingStatus = false; - checkDatabase (); - try { - // delete old mailing id entry first - dbase.execUpdate ("DELETE FROM mailing_status_tbl " + - "WHERE mailing_id=" + mailing_id); - // insert new status text for mailing id - dbase.execUpdate ("INSERT INTO mailing_status_tbl (mailing_id, status_text) " + - "VALUES ( " + mailing_id + " , '" + startMessage + "' )"); - setMailingStatus = true; - } catch (Exception e) { - logging (Log.ERROR, "init", "Error in setup mailing status: " + e); - throw new Exception ("Unable to setup mailing status: " + e); - } - } - - /** - * Change the mailing status to a new status - * @param msg the new status - */ - private void changeMailingStatus (String msg) throws Exception { - if (setMailingStatus) { - checkDatabase (); - try { - dbase.execUpdate ("UPDATE mailing_status_tbl SET status_text = '" + msg + "' " + - "WHERE mailing_id=" + mailing_id); - } catch (Exception e) { - logging (Log.ERROR, "data", "Error in changing mailing status: " + e); - throw new Exception ("Unable to change mailing status: " + e); - } - } - } - /** * Validate all set variables and make a sanity check * on the database to avoid double triggering of a @@ -776,7 +669,7 @@ public class Data { ++cnt; msg += "\tunable to requery my status_id: " + e.toString () + "\n"; } - if (maildrop_status_id <= 0) { + if ((! isPreviewMailing ()) && (maildrop_status_id <= 0)) { ++cnt; msg += "\tmaildrop_status_id is less than 1 (" + maildrop_status_id + ")\n"; } @@ -796,29 +689,13 @@ public class Data { (! isTestMailing ()) && (! isCampaignMailing ()) && (! isRuleMailing ()) && - (! isOnDemandMailing ()) && - (! isWorldMailing ())) { + (! isOnDemandMailing ()) && + (! isWorldMailing ()) && + (! isPreviewMailing ())) { ++cnt; - msg += "\tstatus_field must be one of A, T, E, R, D or W (" + status_field + ")\n"; + msg += "\tstatus_field must be one of A, T, E, R, D, W or P (" + status_field + ")\n"; } - // - // on admin/test mailing, generate the most - // user readable format according to outMode - if ((! isCampaignMailing ()) && - (! isRuleMailing ()) && - (! isOnDemandMailing ()) && - (! isWorldMailing ())) - switch (outMode) { - case OUT_META: - metaMode = OUT_META_XML; - break; - default: - outMode = OUT_META; - metaMode = OUT_META_XML; - break; - } - long now = System.currentTimeMillis () / 1000; if (sendtimestamp != null) sendSeconds = sendtimestamp.getTime () / 1000; @@ -867,16 +744,12 @@ public class Data { ++cnt; msg += "\tlinelength is less than zero\n"; } - if (totalSubscribers <= 0) { -// ++cnt; - msg += "\ttotal number of subscribers is less than 1 (" + totalSubscribers + ")\n"; - } if (cnt > 0) { logging (Log.ERROR, "init", "Error configuration report:\n" + msg); throw new Exception (msg); } if (msg.length () > 0) - logging (Log.WARNING, "init", "Configuration report:\n" + msg); + logging (Log.INFO, "init", "Configuration report:\n" + msg); } /** Setup logging interface @@ -908,8 +781,6 @@ public class Data { logging (Log.DEBUG, "init", "\txmlValidate = " + xmlValidate); logging (Log.DEBUG, "init", "\tsampleEmails = " + sampleEmails); logging (Log.DEBUG, "init", "\tmailLogNumber = " + mailLogNumber); - logging (Log.DEBUG, "init", "\tstartMessage = " + startMessage); - logging (Log.DEBUG, "init", "\tendMessage = " + endMessage); logging (Log.DEBUG, "init", "\taccLogfile = " + accLogfile); logging (Log.DEBUG, "init", "\tdefaultUserStatus = " + defaultUserStatus); logging (Log.DEBUG, "init", "\tdbase = " + dbase); @@ -953,7 +824,7 @@ public class Data { logging (Log.DEBUG, "init", "\tonepixlog = " + onepixlog); logging (Log.DEBUG, "init", "\tpassword = " + password); logging (Log.DEBUG, "init", "\trdirDomain = " + rdirDomain); - logging (Log.DEBUG, "init", "\ttotalSubscribers = " + totalSubscribers); +// logging (Log.DEBUG, "init", "\ttotalSubscribers = " + totalSubscribers); } /* @@ -996,8 +867,6 @@ public class Data { } mailer = cfg.cget ("MAILER", mailer); mailLogNumber = cfg.cget ("MAIL_LOG_NUMBER", mailLogNumber); - startMessage = cfg.cget ("START_MESSAGE", startMessage); - endMessage = cfg.cget ("END_MESSAGE", endMessage); accLogfile = cfg.cget ("ACCOUNT_LOGFILE", accLogfile); } @@ -1042,48 +911,11 @@ public class Data { int n; - logging (Log.DEBUG, "init", "Data read from " + cfg.getSource () + " for " + status_id + ":" + (option == null ? "default" : option)); - outMode = DEFAULT_OUT_MODE; - if ((n = option.indexOf (':')) != -1) { - String omode; - - omode = option.substring (0, n); - option = option.substring (n + 1); - outMode = -1; - for (n = 0; n < OUT_MODES.length; ++n) - if (omode.equals (OUT_MODES[n])) { - outMode = n; - break; - } - if (outMode == -1) { - logging (Log.ERROR, "init", "Unknown output mode " + omode); - throw new Exception ("Unknown output mode " + omode + " specified"); - } - logging (Log.DEBUG, "init", "Using output mode " + outModeDescription ()); - } - metaMode = -1; - switch (outMode) { - case OUT_META: - for (n = 0; n < META_MODES.length; ++n) - if (option.equals (META_MODES[n])) { - metaMode = n; - break; - } - if (metaMode == -1) { - logging (Log.ERROR, "init", "Unknown meta output type " + option); - throw new Exception ("Unknwon metaoutput option type " + option + " specified"); - } - logging (Log.DEBUG, "init", "Using meta output mode " + metaModeDescription ()); - break; - default: - logging (Log.ERROR, "init", "Unknown output mode " + outMode); - throw new Exception ("Unkown output Mode " + outMode + " found"); - } + logging (Log.DEBUG, "init", "Data read from " + cfg.getSource () + " for " + status_id); setupDatabase (conn); logging (Log.DEBUG, "init", "Initial database connection established"); try { queryMailingInformations (status_id); - setupMailingStatus (); } catch (Exception e) { throw new Exception ("Database failure: " + e); } @@ -1118,7 +950,7 @@ public class Data { // if ((conn != null) && (dbase != null)) // dbase.done (); - if (isCampaignMailing ()) + if (isCampaignMailing () || isPreviewMailing ()) closeDatabase (); } @@ -1130,7 +962,7 @@ public class Data { // if ((conn != null) && (dbase != null)) // dbase.setConnection (conn); - if (isCampaignMailing ()) + if (isCampaignMailing () || isPreviewMailing ()) if (dbase == null) { setupDatabase (conn); } @@ -1145,18 +977,9 @@ public class Data { cnt = 0; msg = ""; - if (setMailingStatus && writeEndMessage) { - logging (Log.DEBUG, "deinit", "Writing final report"); - try { - String emsg = endMessage; - - if ((extraEndMessage != null) && (extraEndMessage.length () > 0)) - emsg += " " + extraEndMessage; - changeMailingStatus (emsg); - } catch (Exception e) { - ++cnt; - msg += "\tFailed in final report: " + e + "\n"; - } + if (bigClause != null) { + bigClause.done (); + bigClause = null; } if (dbase != null) { logging (Log.DEBUG, "deinit", "Shuting down database connection"); @@ -1194,29 +1017,43 @@ public class Data { * mailing */ public void sanityCheck () throws Exception { - ResultSet rset; + if (! isPreviewMailing ()) { + ResultSet rset; - try { - long cid, del; + try { + long cid, del; - rset = dbase.simpleQuery ("SELECT company_id, deleted FROM mailing_tbl WHERE mailing_id = " + mailing_id); - cid = rset.getLong (1); - del = rset.getLong (2); - rset.close (); - if (cid != company_id) - throw new Exception ("Original companyID " + company_id + " for mailing " + mailing_id + " does not match current company_id " + cid); - if (del != 0) { - dbase.execUpdate ("UPDATE maildrop_status_tbl SET genchange = " + dbase.sysdate + ", genstatus = 4 " + - "WHERE status_id = " + maildrop_status_id); - throw new Exception ("Mailing " + mailing_id + " marked as deleted"); + rset = dbase.simpleQuery ("SELECT company_id, deleted FROM mailing_tbl WHERE mailing_id = " + mailing_id); + cid = rset.getLong (1); + del = rset.getLong (2); + rset.close (); + if (cid != company_id) + throw new Exception ("Original companyID " + company_id + " for mailing " + mailing_id + " does not match current company_id " + cid); + if (del != 0) { + dbase.execUpdate ("UPDATE maildrop_status_tbl SET genchange = " + dbase.sysdate + ", genstatus = 4 " + + "WHERE status_id = " + maildrop_status_id); + throw new Exception ("Mailing " + mailing_id + " marked as deleted"); + } + } catch (Exception e) { + logging (Log.ERROR, "sanity", "Error in quering mailing_tbl: " + e); + throw new Exception ("Unable to find entry in mailing_tbl for " + mailing_id + ": " + e); } - } catch (Exception e) { - logging (Log.ERROR, "sanity", "Error in quering mailing_tbl: " + e); - throw new Exception ("Unable to find entry in mailing_tbl for " + mailing_id + ": " + e); } } /** + * Executed at start of mail generation + */ + public void startExecution () throws Exception { + bigClause = (BC) mkBigClause (); + bigClause.setData (this); + if (! bigClause.prepareClause ()) { + throw new Exception ("Failed to setup main clause"); + } + totalSubscribers = bigClause.subscriber (); + } + + /** * Change generation state for the current mailing */ public void updateGenerationState () { @@ -1238,7 +1075,28 @@ public class Data { } } } - + + /** + * Called when main generation starts + */ + public Vector generationClauses () { + return bigClause.createClauses (); + } + + /** + * Save receivers to mailtracking table + */ + public void toMailtrack () { + if (mailtracking_table != null) { + String query = bigClause.mailtrackStatement (mailtracking_table); + try { + dbase.execUpdate (query); + } catch (Exception e) { + logging (Log.ERROR, "execute", "Unable to add mailtrack information using \"" + query + "\": " + e.toString ()); + } + } + } + /** * Convert a given object to an integer * @param o the input object @@ -1328,6 +1186,10 @@ public class Data { tmp = opts.get ("user-status"); if (tmp != null) campaignUserStatus = obj2int (tmp, "user-status"); + tmp = opts.get ("preview-for"); + if (tmp != null) + previewCustomerID = obj2long (tmp, "preview-for"); + previewOutput = (Hashtable) opts.get ("preview-output"); tmp = opts.get ("send-date"); if (tmp != null) { currentSendDate = obj2date (tmp, "send-date"); @@ -1450,41 +1312,6 @@ public class Data { } /** - * Write a mailing status to the database, open the database - * temp., if not yet opened - * @param msg the new mailing status - */ - public void report (String msg) throws Exception { - logging (Log.DEBUG, "data", "Write report: " + msg); - try { - boolean tempOpened; - - if (dbase == null) { - setupDatabase (null); - setMailingStatus = true; - tempOpened = true; - } else - tempOpened = false; - if (dbase != null) { - changeMailingStatus (msg); - writeEndMessage = false; - if (tempOpened == true) - closeDatabase (); - } - } catch (Exception e) { - throw new Exception ("Unable to report to MailingStatus: " + e); - } - } - - /** - * Write an error as mailing status - * @param msg the error message - */ - public void error (String msg) throws Exception { - report ("Error: " + msg); - } - - /** * Check for existance of a database table * @param table the table name * @return true, if the table exists @@ -1649,20 +1476,6 @@ public class Data { return mailer; } - /** returns textual representation of output mode - * @return output mode as string - */ - public String outModeDescription () { - return ((outMode >= 0) && (outMode < OUT_MODES.length)) ? OUT_MODES[outMode] : null; - } - - /** returns textual representation of meta file format - * @return file format as string - */ - public String metaModeDescription () { - return ((metaMode >= 0) && (metaMode < META_MODES.length)) ? META_MODES[metaMode] : null; - } - /** if this is a admin mail * @return true, if admin mail */ @@ -1708,16 +1521,11 @@ public class Data { return status_field.equals ("W"); } - /** - * Add a message to the mailing status end message - * @param msg the message to add + /** if this is a preview + * @return true, if preview */ - public void addToEndMessage (String msg) { - if ((msg != null) && (msg.length () > 0)) - if (extraEndMessage != null) - extraEndMessage += " " + msg; - else - extraEndMessage = msg; + public boolean isPreviewMailing () { + return status_field.equals ("P"); } /** @@ -1768,7 +1576,7 @@ public class Data { if (sanity != lusecount) logging (Log.ERROR, "layout", "Sanity check failed in setUsedFieldsInLayout"); } - + /** find a column by its alias * @param alias * @return the column on success, null otherwise @@ -1776,13 +1584,13 @@ public class Data { public Column columnByAlias (String alias) { for (int n = 0; n < lcount; ++n) { Column c = (Column) layout.elementAt (n); - + if ((c.alias != null) && c.alias.equalsIgnoreCase (alias)) return c; } return null; } - + /** find a column by its name * @param name * @return the column on success, null otherwise @@ -1790,7 +1598,7 @@ public class Data { public Column columnByName (String name) { for (int n = 0; n < lcount; ++n) { Column c = (Column) layout.elementAt (n); - + if (c.name.equalsIgnoreCase (name)) return c; } @@ -1854,24 +1662,6 @@ public class Data { return ((Column) layout.elementAt (col)).inUse (); } - /** get the default output option - * @return the option string - */ - public static String defaultOption () { - String opt; - - opt = OUT_MODES[DEFAULT_OUT_MODE] + ":"; - switch (DEFAULT_OUT_MODE) { - case OUT_META: - opt += META_MODES[DEFAULT_META_MODE]; - break; - default: - opt += "???"; - break; - } - return opt; - } - /** create a RFC compatible Date: line * @param ts the input time * @return the RFC representation src/java/org/agnitas/backend/Data.java @@ -592,57 +592,7 @@ public class EMMTag implements Sub.CB { } break; case TI_SUBSCRIBERCOUNT: - { - long cnt = data.totalSubscribers; - String format = null; - String str; - - if (((format = (String) mTagParameters.get ("format")) == null) && - ((str = (String) mTagParameters.get ("type")) != null)) { - str = str.toLowerCase (); - if (str.equals ("us")) - format = "#,###,###"; - else if (str.equals ("de")) - format = "#.###.###"; - } - if ((str = (String) mTagParameters.get ("round")) != null) { - try { - int round = Integer.parseInt (str); - - if (round > 0) - cnt = (cnt + round - 1) / round; - } catch (NumberFormatException e) { - ; - } - } - if (format != null) { - int len = format.length (); - boolean first = true; - int last = -1; - mTagValue = ""; - - for (int n = len - 1; n >= 0; --n) - if (format.charAt (n) == '#') - last = n; - for (int n = len - 1; n >= 0; --n) - if (format.charAt (n) == '#') { - if (first || (cnt != 0)) { - if (n == last) { - str = Long.toString (cnt); - cnt = 0; - } else { - str = Long.toString (cnt % 10); - cnt /= 10; - } - mTagValue = str + mTagValue; - first = false; - } - } else if ((n < last) || (cnt != 0)) - mTagValue = format.substring (n, n + 1) + mTagValue; - } else - mTagValue = Long.toString (cnt); - } - fixedValue = true; + globalValue = true; break; case TI_DATE: { @@ -794,7 +744,58 @@ public class EMMTag implements Sub.CB { break; case TI_MESSAGEID: // is set before in MailWriter.writeMail() case TI_UID: // is set before in MailWriter.writeMail() - case TI_SUBSCRIBERCOUNT: // is set here in initializeInternalTag () from check_tags + break; + case TI_SUBSCRIBERCOUNT: + { + long cnt = data.totalSubscribers; + String format = null; + String str; + + if (((format = (String) mTagParameters.get ("format")) == null) && + ((str = (String) mTagParameters.get ("type")) != null)) { + str = str.toLowerCase (); + if (str.equals ("us")) + format = "#,###,###"; + else if (str.equals ("de")) + format = "#.###.###"; + } + if ((str = (String) mTagParameters.get ("round")) != null) { + try { + int round = Integer.parseInt (str); + + if (round > 0) + cnt = (cnt + round - 1) / round; + } catch (NumberFormatException e) { + ; + } + } + if (format != null) { + int len = format.length (); + boolean first = true; + int last = -1; + mTagValue = ""; + + for (int n = len - 1; n >= 0; --n) + if (format.charAt (n) == '#') + last = n; + for (int n = len - 1; n >= 0; --n) + if (format.charAt (n) == '#') { + if (first || (cnt != 0)) { + if (n == last) { + str = Long.toString (cnt); + cnt = 0; + } else { + str = Long.toString (cnt % 10); + cnt /= 10; + } + mTagValue = str + mTagValue; + first = false; + } + } else if ((n < last) || (cnt != 0)) + mTagValue = format.substring (n, n + 1) + mTagValue; + } else + mTagValue = Long.toString (cnt); + } break; case TI_DATE: // is prepared here in initializeInternalTag () from check_tags mTagValue = dateFormat.format (data.currentSendDate); src/java/org/agnitas/backend/EMMTag.java @@ -195,7 +195,7 @@ abstract public class MailWriter { if (data.isCampaignMailing ()) unique = Long.toString (data.pass) + "C" + StringOps.format_number (Long.toString(data.campaignTransactionID > 0 ? data.campaignTransactionID : data.campaignCustomerID), 8); - else if (data.isAdminMailing () || data.isTestMailing ()) + else if (data.isAdminMailing () || data.isTestMailing () || data.isPreviewMailing ()) unique = getUniqueNr (timestamp); else unique = StringOps.format_number (Long.toString (blockCount), 3); src/java/org/agnitas/backend/MailWriter.java @@ -10,14 +10,14 @@ * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for * the specific language governing rights and limitations under the License. - * + * * The Original Code is OpenEMM. * The Original Developer is the Initial Developer. * The Initial Developer of the Original Code is AGNITAS AG. All portions of * the code written by AGNITAS AG are Copyright (c) 2007 AGNITAS AG. All Rights * Reserved. - * - * Contributor(s): AGNITAS AG. + * + * Contributor(s): AGNITAS AG. ********************************************************************************/ package org.agnitas.backend; @@ -31,7 +31,13 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; import java.util.zip.GZIPOutputStream; - +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.DocumentBuilder; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.w3c.dom.Node; +import org.w3c.dom.NamedNodeMap; import org.agnitas.util.Log; /** Implements writing of mailing information to @@ -189,10 +195,10 @@ public class MailWriterMeta extends MailWriter { * @param output detailed output description * @param filename pathname to the XML file */ - private void startXMLBack (String output, String filename) throws Exception { + private void startXMLBack (String options, String output, String filename) throws Exception { File efile = File.createTempFile ("error", null); String eol = data.eol.equals ("\n") ? "l" : ""; - String cmd = data.xmlBack () + " -vq" + eol + " -E " + efile.getAbsolutePath () + " -o " + output + " " + filename; + String cmd = data.xmlBack () + (options == null ? "" : " " + options) + " -vq" + eol + " -E " + efile.getAbsolutePath () + " -o " + output + " " + filename; int rc; data.markToRemove (efile); @@ -249,7 +255,7 @@ public class MailWriterMeta extends MailWriter { pathname = null; out = null; buf = new StringBuffer (); - if (data.isAdminMailing () || data.isTestMailing () || data.isCampaignMailing ()) + if (data.isAdminMailing () || data.isTestMailing () || data.isCampaignMailing () || data.isPreviewMailing ()) blockSize = 0; else blockSize = data.blockSize (); @@ -264,6 +270,9 @@ public class MailWriterMeta extends MailWriter { public String generateOptions () { return "generate:temporary=true;syslog=false;account-logfile=" + data.accLogfile () + ";media=email;path=" + data.mailDir (); } + public String previewOptions (String output) { + return "preview:path=" + output; + } /** Cleanup */ @@ -277,13 +286,58 @@ public class MailWriterMeta extends MailWriter { String gen = generateOptions (); - startXMLBack (gen, pathname); + startXMLBack (null, gen, pathname); if (! keepATmails) { if ((new File (pathname)).delete ()) { data.unmarkToRemove (pathname); } } } + } else if (data.isPreviewMailing ()) { + if (pathname != null) { + File output = File.createTempFile ("preview", ".xml"); + String path = output.getAbsolutePath (); + String opts = previewOptions (path); + String error = null; + + data.markToRemove (pathname); + data.markToRemove (path); + try { + startXMLBack ("-r", opts, pathname); + } catch (Exception e) { + error = e.toString (); + } + if (data.previewOutput != null) { + try { + DocumentBuilderFactory + docBuilderFactory = DocumentBuilderFactory.newInstance (); + DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder (); + Document doc = docBuilder.parse (output); + Element root = doc.getDocumentElement (); + NodeList nlist = root.getElementsByTagName ("content"); + int ncount = nlist.getLength (); + + for (int n = 0; n < ncount; ++n) { + Node node = nlist.item (n); + NamedNodeMap attr = node.getAttributes (); + Node name = attr.getNamedItem ("name"); + + if (name != null) { + Node text = node.getFirstChild (); + + data.previewOutput.put (name.getNodeValue (), (text == null ? "" : text.getNodeValue ())); + } + } + } catch (Exception e) { + if (error != null) + error += "\n" + e.toString (); + else + error = e.toString (); + } + if (error != null) + data.previewOutput.put ("__error__", error); + } + } } else if (fname != null) try { FileOutputStream temp; @@ -466,17 +520,12 @@ public class MailWriterMeta extends MailWriter { public void startBlock () throws Exception { super.startBlock (); fname = data.metaDir () + dirSeparator + filenamePattern; - switch (data.metaMode) { - case Data.OUT_META_XML: + if (data.isAdminMailing () || data.isTestMailing ()) { pathname = fname + ".xml"; out = new FileOutputStream (pathname); - break; - case Data.OUT_META_XMLGZ: + } else { pathname = fname + ".xml.gz"; out = new GZIPOutputStream (new FileOutputStream (pathname)); - break; - default: - throw new Exception ("Unknown output mode " + data.metaMode + " specified"); } buf.append ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!DOCTYPE blockmail SYSTEM \"blockmail.dtd\">\n"); @@ -881,12 +930,12 @@ public class MailWriterMeta extends MailWriter { if (data.xmlValidate ()) { data.logging (Log.INFO, "writer/meta", "Validating XML output"); - startXMLBack ("none", pathname); + startXMLBack (null, "none", pathname); data.logging (Log.INFO, "writer/meta", "Validation done"); } else data.logging (Log.INFO, "writer/meta", "Skip validation of XML document"); - if (! (data.isAdminMailing () || data.isTestMailing ())) + if (! (data.isAdminMailing () || data.isTestMailing () || data.isPreviewMailing ())) try { FileOutputStream temp; String msg; src/java/org/agnitas/backend/MailWriterMeta.java @@ -46,13 +46,6 @@ public interface Mailgun { void initializeMailgun (String status_id, Connection conn) throws Exception; /** - * Change report in database - * - * @param msg the new message in the DB report - */ - void dbReport(String msg) throws Exception; - - /** * Execute an already setup mailgun * * @param conn optional open database connection src/java/org/agnitas/backend/Mailgun.java @@ -38,7 +38,7 @@ import org.agnitas.util.Log; */ public class MailgunImpl implements Mailgun { /** the status id for the maildrop_status_tbl */ - public int statusID; +// public long statusID; /** Reference to configuration */ private Data data; /** All content blocks */ @@ -58,7 +58,7 @@ public class MailgunImpl implements Mailgun { * must be followed by initializeMailung () */ public MailgunImpl () { - statusID = -1; +// statusID = -1; data = null; } @@ -83,7 +83,6 @@ public class MailgunImpl implements Mailgun { * @param conn optional open database connection */ public void initializeMailgun (String status_id, Connection conn) throws Exception { - statusID = Integer.parseInt (status_id); data = null; try { mkData (status_id, conn); @@ -91,6 +90,7 @@ public class MailgunImpl implements Mailgun { done (); throw new Exception ("Error reading ini file: " + e); } +// statusID = data.maildrop_status_id; data.suspend (conn); } @@ -144,18 +144,6 @@ public class MailgunImpl implements Mailgun { } } - /** Change report in database - * @param msg the new message in the DB report - */ - public void dbReport (String msg) throws Exception { - if (data != null) - try { - data.report (msg); - } catch (Exception e) { - throw new Exception (e.toString ()); - } - } - /** Retreive blacklist from database */ public void retreiveBlacklist () throws Exception { @@ -176,15 +164,17 @@ public class MailgunImpl implements Mailgun { */ private void readBlacklist () throws Exception { blist = new Blacklist (); - try { - retreiveBlacklist (); - } catch (Exception e) { - data.logging (Log.FATAL, "readblist", "Unable to get blacklist: " + e.toString ()); - throw new Exception ("Unable to get blacklist: " + e.toString ()); - } + if (! data.isPreviewMailing ()) { + try { + retreiveBlacklist (); + } catch (Exception e) { + data.logging (Log.FATAL, "readblist", "Unable to get blacklist: " + e.toString ()); + throw new Exception ("Unable to get blacklist: " + e.toString ()); + } - data.logging (Log.INFO, "readblist", "Found " + blist.globalCount () + " entr" + Log.exty (blist.globalCount ()) + " in global blacklist, " + - blist.localCount () + " entr" + Log.exty (blist.localCount ()) + " in local blacklist"); + data.logging (Log.INFO, "readblist", "Found " + blist.globalCount () + " entr" + Log.exty (blist.globalCount ()) + " in global blacklist, " + + blist.localCount () + " entr" + Log.exty (blist.localCount ()) + " in local blacklist"); + } } /** Check the sample email receiver if they should receive @@ -314,30 +304,7 @@ public class MailgunImpl implements Mailgun { /** Write final data to database */ public void finalizeMailingToDatabase (MailWriter mailer) throws Exception { - String table = "mailing_creation_tbl"; - String query; - - if (data.tableExists (table)) { - query = "INSERT INTO " + table + - " (mailing_id, company_id, status_field, block_count, block_size, start_time, end_time) VALUES (" + - data.mailing_id + ", " + data.company_id + ", '" + data.status_field + "', " + mailer.blockCount + ", " + mailer.blockSize + ", " + - StringOps.sqlDate (mailer.startExecutionTime) + ", " + StringOps.sqlDate (mailer.endExecutionTime) + ")"; - try { - data.dbase.execUpdate (query); - } catch (Exception e) { - data.logging (Log.ERROR, "execute", "Unable to add mailcreation information using \"" + query + "\": " + e.toString ()); - } - } - query = "INSERT INTO " + data.mailtracking_table + - " (company_id, status_id, mailing_id, customer_id)" + - " SELECT " + data.company_id + ", " + data.maildrop_status_id + ", " + data.mailing_id + ", cust.customer_id " + - getFromclause () + " WHERE " + - getWhereclause (true); - try { - data.dbase.execUpdate (query); - } catch (Exception e) { - data.logging (Log.ERROR, "execute", "Unable to add mailtrack information using \"" + query + "\": " + e.toString ()); - } + data.toMailtrack (); } /** Execute a prepared mailgun @@ -348,10 +315,10 @@ public class MailgunImpl implements Mailgun { data.resume (conn); data.options (opts, 2); data.sanityCheck (); - data.pass++; // get constructed selectvalue based on tag names in Hashtable + data.startExecution (); selectQuery = getSelectvalue (tagNames, allBlocks, false); wSelectQuery = getSelectvalue (tagNames, allBlocks, true); @@ -365,7 +332,6 @@ public class MailgunImpl implements Mailgun { rset.close (); if (count > 0) { data.logging (Log.FATAL, "mailgun", "Pure textmailing: " + count + " receiver has invalid mailtype (!= 0)"); - dbReport ("Pure textmailing violation"); throw new Exception ("Mailtype check failed for " + count + " customer" + Log.exts (count)); } } catch (Exception e) { @@ -374,17 +340,7 @@ public class MailgunImpl implements Mailgun { data.logging (Log.DEBUG, "execute", "No invalid mailtype detected"); } - // instantiate new MailWriter. This creates filenames, boundaries and - // message ids - MailWriter mailer; - - switch (data.outMode) { - case Data.OUT_META: - mailer = (MailWriter) mkMailWriterMeta (data, allBlocks, tagNames); - break; - default: - throw new Exception ("Output mode " + data.outModeDescription () + " not supported"); - } + MailWriter mailer = (MailWriter) mkMailWriterMeta (data, allBlocks, tagNames); int columnCount = 0; Vector email_tags = new Vector (); @@ -420,29 +376,16 @@ public class MailgunImpl implements Mailgun { try { data.logging (Log.INFO, "execute", "Start creation of mails"); - boolean needSamples = data.isWorldMailing () && (data.sampleEmails () != null) && ((data.availableMedias & (1 << Media.TYPE_EMAIL)) != 0); - - HashSet seen = prepareCollection (); + boolean needSamples = data.isWorldMailing () && (data.sampleEmails () != null) && ((data.availableMedias & (1 << Media.TYPE_EMAIL)) != 0); + Vector clist = data.generationClauses (); + HashSet seen = prepareCollection (); - for (int state = 0; state < 2; ++state) { - String query; - - if (data.isWorldMailing ()) { - if (state == 0) { - query = selectQuery + " AND bind.user_type IN ('A', 'T')"; - } else { - query = wSelectQuery + " AND bind.user_type = 'W'"; - } - } else { - if (state == 0) { - query = selectQuery; - } else { - query = null; - } - } - if (query == null) + for (int state = 0; state < clist.size (); ++state) { + String clause = (String) clist.get (state); + if (clause == null) continue; - query += ")" + getAdditionalClause (state + 1) + ")" + getOrder (state + 1); + + String query = (state == 0 ? selectQuery : wSelectQuery) + " " + clause; if ((mailer.blockSize > 0) && (mailer.inBlockCount > 0)) mailer.checkBlock (true); @@ -575,31 +518,33 @@ public class MailgunImpl implements Mailgun { etag.mTagValue = cinfo.email; } - boolean isblisted = false; + if (! data.isPreviewMailing ()) { + boolean isblisted = false; - for (int blstate = 0; blstate < cinfo.checkForBlacklist; ++blstate) { - String check = cinfo.blacklistValue (blstate); - String what = cinfo.blacklistName (blstate); + for (int blstate = 0; blstate < cinfo.checkForBlacklist; ++blstate) { + String check = cinfo.blacklistValue (blstate); + String what = cinfo.blacklistName (blstate); - if (check == null) - continue; + if (check == null) + continue; - Blackdata bl = blist.isBlackListed (check); - if (bl != null) { - String where; + Blackdata bl = blist.isBlackListed (check); + if (bl != null) { + String where; - if (bl.isGlobal ()) { - where = "global"; - } else { - where = "local"; + if (bl.isGlobal ()) { + where = "global"; + } else { + where = "local"; + } + data.logging (Log.WARNING, "mailgun", "Found " + what + ": " + check + " (" + cid + ") in " + where + " blacklist, ignored"); + blist.writeBounce (data.mailing_id, cid); + isblisted = true; } - data.logging (Log.WARNING, "mailgun", "Found " + what + ": " + check + " (" + cid + ") in " + where + " blacklist, ignored"); - blist.writeBounce (data.mailing_id, cid); - isblisted = true; } + if (isblisted) + continue; } - if (isblisted) - continue; String mediatypes = getMediaTypes (cid); if (mediatypes == null) @@ -640,9 +585,10 @@ public class MailgunImpl implements Mailgun { throw new Exception("Error during main query or mail generation:" + e); } - // do reporting and finalizing -- not to be omitted mailer.done (); - finalizeMailingToDatabase (mailer); + if (! data.isPreviewMailing ()) { + finalizeMailingToDatabase (mailer); + } data.updateGenerationState (); data.logging (Log.DEBUG, "execute", "Successful end"); @@ -671,7 +617,7 @@ public class MailgunImpl implements Mailgun { doExecute (null, opts); str = "Success: Mailgun fired."; } catch (Exception e) { - dbReport ("Creation failed, please consult administrativa"); + data.logging (Log.ERROR, "mailgun", "Creation failed: " + e.toString ()); if ((data != null) && (data.mailing_id > 0)) { Destroyer d = (Destroyer) mkDestroyer ((int) data.mailing_id); @@ -695,29 +641,6 @@ public class MailgunImpl implements Mailgun { return str; } - /** Build the from part for the big query - * @return the FROM part - */ - public String getFromclause () { - return "FROM customer_" + data.company_id + "_tbl cust, customer_" + data.company_id + "_binding_tbl bind"; - } - - /** Additional clause for main query - * @param state the query to build - * @return the additional clause or empty string - */ - public String getAdditionalClause (int state) { - return ""; - } - - /** Statement extension to optional order output - * @param state the query to build - * @return the order part for the statement - */ - public String getOrder (int state) { - return ""; - } - /** Optional add database hint * @return the hint */ @@ -725,66 +648,12 @@ public class MailgunImpl implements Mailgun { return ""; } - /** Build the where clause for the big query - * @param complete if we want to build the complete query - * @return the WHERE clause - */ - public String getWhereclause (boolean complete) throws Exception { - String where = "bind.customer_id = cust.customer_id AND (" + - "bind.mailinglist_id = " + data.mailinglist_id + " AND (" + - data.clauseForUserStatus (true); - - String extra; - - if (data.isAdminMailing ()) - extra = "bind.user_type = 'A'"; - else if (data.isTestMailing ()) - extra = "bind.user_type IN ('A', 'T')"; - else if (data.isCampaignMailing ()) { - if (data.campaignTransactionID > 0) - extra = "cust.transaction_id = " + data.campaignTransactionID; - else { - if (data.campaignCustomerID <= 0) - throw new Exception ("Campaign mailing without customer-ID initiated"); - extra = "cust.customer_id = " + data.campaignCustomerID; - } - } else { - if ((data.campaignCustomerID > 0) || (data.campaignTransactionID > 0)) - throw new Exception ("World mailing with set customer-ID or transaction-ID"); - extra = null; - } - - if ((extra != null) && (extra.length () > 0)) - where += " AND " + extra; - if ((! data.isAdminMailing ()) && (! data.isTestMailing ())) { - if (data.subselect != null) - where += " AND (" + data.subselect + ")"; - } - String tmp = data.getCampaignSubselect (); - if (tmp != null) - where += " AND (" + tmp + ")"; - if (data.isWorldMailing () || data.isRuleMailing () || data.isOnDemandMailing ()) { - tmp = data.getReferenceSubselect (); - if (tmp != null) - where += " AND (" + tmp + ")"; - } - tmp = data.getMediaSubselect (); - if (tmp != null) - where += " AND (" + tmp + ")"; - - if (complete) - where += ")" + getAdditionalClause (0) + ")" + getOrder (0); - - return where; - } - /** Build the complete big query * @param tagNames the tags * @param allBlocks all content information * @return the created query */ - private String getSelectvalue (Hashtable tagNames, BlockCollection allBlocks, - boolean hint) throws Exception { + private String getSelectvalue (Hashtable tagNames, BlockCollection allBlocks, boolean hint) throws Exception { StringBuffer select_string = new StringBuffer(); select_string.append("SELECT "); @@ -813,11 +682,8 @@ public class MailgunImpl implements Mailgun { select_string.append (",cust." + data.columnName (n)); // remove last comma // select_string.deleteCharAt(select_string.length() - 1); - } else - select_string.append ("count(distinct(cust.customer_id))"); - - select_string.append (" " + getFromclause () + - " WHERE " + getWhereclause (false)); + } else + select_string.append ("count(distinct customer_id)"); // turn stringbuffer into string String result = select_string.toString(); src/java/org/agnitas/backend/MailgunImpl.java @@ -139,6 +139,8 @@ public interface Admin extends Serializable { * @return the date of last password change. */ java.util.Date getLastPasswordChange(); + + public String getPassword(); /** * Getter for property passwordHash. src/java/org/agnitas/beans/Admin.java @@ -37,7 +37,6 @@ public interface Mailing extends java.io.Serializable { int INPUT_TYPE_TEXT = 0; int INPUT_TYPE_HTML = 1; - int TARGET_MODE_AND = 1; int TARGET_MODE_OR = 0; src/java/org/agnitas/beans/Mailing.java @@ -30,7 +30,17 @@ import java.util.Map; * @author mhe */ public interface Recipient extends org.springframework.context.ApplicationContextAware { - /** + + + public final static int MAILTYPE_TEXT = 0; + public final static int MAILTYPE_HTML = 1; + public final static int MAILTYPE_HTML_OFFLINE = 2; + + public final static int GENDER_FEMALE = 1; + public final static int GENDER_MALE = 0; + public final static int GENDER_UNKNOWN = 2; + + /** * Checks if E-Mail-Adress given in customerData-Map is valid. * * @return true if E-Mail-Adress is valid src/java/org/agnitas/beans/Recipient.java @@ -27,12 +27,14 @@ import java.io.StringReader; import java.sql.Connection; import java.util.Collection; import java.util.Comparator; +import java.util.Date; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedList; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -72,11 +74,13 @@ import org.apache.commons.lang.StringUtils; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.datasource.DataSourceUtils; +import com.ibm.icu.text.SimpleDateFormat; + import bsh.Interpreter; /** * - * @author Martin Helff + * @author Martin Helff, Nicole Serek */ public class MailingImpl implements Mailing { @@ -532,7 +536,6 @@ public class MailingImpl implements Mailing { return addComps; } - public Vector scanForLinks(String aText1, ApplicationContext con) { String aLink = null; int start = 0; @@ -1061,11 +1064,36 @@ public class MailingImpl implements Mailing { if(tagName.equals("agnONEPIXEL")) { return new String(""); // return empty value in preview } + + if(tagName.equals("agnDATE")) { + String lang = (String)allValues.get("language"); + if(lang == null) { + lang = "de"; + } + + String country = (String)allValues.get("country"); + if(country == null) { + country = "DE"; + } + + // look for "type" in tag. Default to 0 if no tag is found. + int type = 0; + if (allValues.get("type") != null) { + // if we found a "type" Attribute, take it. + type = Integer.parseInt((String)allValues.get("type")); + } + MailingDao dao = (MailingDao) con.getBean("MailingDao"); + String format = dao.getFormat(type); + + SimpleDateFormat sdf = new SimpleDateFormat(format, new Locale(lang, country)); + String date = sdf.format(new Date()); + return date; + } if (!aDetail.getTagName().equals("agnTITLE") && !aDetail.getTagName().equals("agnTITLEFULL") && !aDetail.getTagName().equals("agnTITLEFIRST")) { - MailingDao dao = (MailingDao) con.getBean("MailingDao"); + MailingDao dao = (MailingDao) con.getBean("MailingDao"); String[] values = dao.getTag(aDetail.getTagName(), companyID); if (values != null) { src/java/org/agnitas/beans/impl/MailingImpl.java @@ -43,5 +43,5 @@ public interface CampaignDao extends ApplicationContextAware { */ Campaign getCampaign(int campaignID, int companyID); - public Stats getStats(boolean useMailtracking, Locale aLocale, LinkedList mailingIDs, Campaign campaign, ApplicationContext con); + public Stats getStats(boolean useMailtracking, Locale aLocale, LinkedList mailingIDs, Campaign campaign, ApplicationContext con, String mailingSelection); } src/java/org/agnitas/dao/CampaignDao.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.Map; import org.agnitas.beans.Mailing; +import org.displaytag.pagination.PaginatedList; import org.springframework.context.ApplicationContextAware; - /** * * @author mhe @@ -60,10 +60,13 @@ public interface MailingDao extends ApplicationContextAware { int findLastNewsletter(int customerID, int companyID); - String[] getTag(String name, int companyID); + String[] getTag(String name, int companyID); boolean deleteContentFromMailing(Mailing mailing, int contentID); - String getAutoURL(int mailingID); + String getAutoURL(int mailingID); String getAutoURL(int mailingID, int companyID); - + + public PaginatedList getMailingList(int companyID, String types, boolean isTemplate, String sort, String direction, int page, int rownums); + + public String getFormat(int type); } src/java/org/agnitas/dao/MailingDao.java @@ -28,6 +28,7 @@ import java.util.Map; import org.agnitas.beans.Recipient; import org.agnitas.beans.CustomerImportStatus; import org.agnitas.web.ImportWizardForm; +import org.displaytag.pagination.PaginatedList; import org.springframework.context.ApplicationContextAware; @@ -162,4 +163,16 @@ public interface RecipientDao extends ApplicationContextAware { int sumOfRecipients(int companyID, String target); boolean deleteRecipients(int companyID, String target); + + /** + * Select's only a certain page of recipients, used for paging in list views + * @param sqlStatement - the sql statement + * @param sort - column which is the sort criterion + * @param direction - asc / desc + * @param page - the page + * @param rownums - number of rows a page has + * @return a list of recipients + */ + public PaginatedList getRecipientList(String sqlStatement, String sort, String direction , int page, int rownums, int previousFullListSize) throws IllegalAccessException, InstantiationException; + } src/java/org/agnitas/dao/RecipientDao.java @@ -57,10 +57,10 @@ public class AdminDaoImpl implements AdminDao { AgnUtils.logger().error("fatal: "+e); return null; } - if ( AgnUtils.isOracleDB() ) { - return (Admin) AgnUtils.getFirstResult(tmpl.find("from Admin where username=? and password=?", new Object [] { name, password })); + if (AgnUtils.isOracleDB()) { + return (Admin) AgnUtils.getFirstResult(tmpl.find("from Admin where username=? and password=?", new Object[] {name, password})); } else { - return (Admin) AgnUtils.getFirstResult(tmpl.find("from Admin where username=? and pwd_hash=?", new Object [] { name, pwdHash })); + return (Admin) AgnUtils.getFirstResult(tmpl.find("from Admin where username=? and pwd_hash=?", new Object[] {name, pwdHash})); } } @@ -69,7 +69,6 @@ public class AdminDaoImpl implements AdminDao { tmpl.saveOrUpdate("Admin", admin); } - /** * Holds value of property applicationContext. @@ -84,4 +83,4 @@ public class AdminDaoImpl implements AdminDao { this.applicationContext = applicationContext; } -} +} \ No newline at end of file src/java/org/agnitas/dao/impl/AdminDaoImpl.java @@ -52,15 +52,15 @@ import org.springframework.orm.hibernate3.HibernateTemplate; */ public class CampaignDaoImpl implements CampaignDao { - private String mailingSelection = null; + // private String mailingSelection = null; - protected String getMailingSelection() { - return mailingSelection; - } + //protected String getMailingSelection() { + // return mailingSelection; + //} - protected void setMailingSelection(String mailingSelection) { - this.mailingSelection = mailingSelection; - } +// protected void setMailingSelection(String mailingSelection) { +// this.mailingSelection = mailingSelection; +// } public Campaign getCampaign(int campaignID, int companyID) { HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); @@ -72,7 +72,7 @@ public class CampaignDaoImpl implements CampaignDao { return (Campaign) AgnUtils.getFirstResult(tmpl.find("from Campaign where id = ? and companyID = ?", new Object [] {new Integer(campaignID), new Integer(companyID)} )); } - public Stats getStats(boolean useMailtracking, Locale aLocale, LinkedList mailingIDs, Campaign campaign, ApplicationContext con) { + public Stats getStats(boolean useMailtracking, Locale aLocale, LinkedList mailingIDs, Campaign campaign, ApplicationContext con, String mailingSelection) { CampaignImpl.StatsImpl stats = new CampaignImpl.StatsImpl(); String uniqueStr = ""; // boolean useMailtracking = req.getSession().getAttribute("use_mailtracking").equals("1"); @@ -85,6 +85,11 @@ public class CampaignDaoImpl implements CampaignDao { csv = "\"" + SafeString.getLocaleString("CampaignStats", aLocale) + "\"\r\n\r\n"; + // if we dont have the mailingIDs as parameter, we need to get them. + if (mailingIDs == null) { + mailingIDs = getMailingIDs(campaign.getCompanyID(), campaign.getId()); + } + if(mailingIDs != null) { Iterator aIt = mailingIDs.iterator(); Integer tmpInt = null; @@ -100,10 +105,15 @@ public class CampaignDaoImpl implements CampaignDao { mailIDs.append(", " + tmpInt.intValue()); } } + } else { + } if(mailIDs != null) { - setMailingSelection(new String(mailIDs.toString())); +// setMailingSelection(new String(mailIDs.toString())); + mailingSelection = mailIDs.toString(); + } else { + mailingSelection= null; } // * * * * * * * * * * * * @@ -128,10 +138,10 @@ public class CampaignDaoImpl implements CampaignDao { csv += "\"" + SafeString.getLocaleString("Unique_Clicks", aLocale) + "\"\r\n\r\n"; } - stats = loadMailingNames(stats, campaign); - stats = loadClicks(stats, uniqueStr); - stats = loadOpenedMails(stats, campaign, aTarget, useMailtracking); - stats = loadOptout(stats, campaign, aTarget, useMailtracking); + stats = loadMailingNames(stats, campaign, mailingSelection); + stats = loadClicks(stats, uniqueStr, mailingSelection); + stats = loadOpenedMails(stats, campaign, aTarget, useMailtracking, mailingSelection); + stats = loadOptout(stats, campaign, aTarget, useMailtracking, mailingSelection); // get mailing_id's from Hashtable Enumeration keys = stats.getMailingData().keys(); @@ -181,13 +191,13 @@ public class CampaignDaoImpl implements CampaignDao { return stats; } - private CampaignImpl.StatsImpl loadMailingNames (CampaignImpl.StatsImpl stats, Campaign campaign) { + private CampaignImpl.StatsImpl loadMailingNames (CampaignImpl.StatsImpl stats, Campaign campaign, String mailingSelection) { JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); CampaignStatEntry aktEntry = null; StringBuffer mailIDs = null; String sql = "select mailing_id, shortname, description from mailing_tbl where company_id=" + campaign.getCompanyID() + " and campaign_id=" + campaign.getId() + " and deleted<>1 and is_template=0 order by mailing_id desc"; - if(getMailingSelection() != null) { - sql="select mailing_id, shortname, description from mailing_tbl where company_id="+campaign.getCompanyID()+" AND MAILING_ID IN ("+getMailingSelection()+") order by mailing_id desc"; + if(mailingSelection != null) { + sql="select mailing_id, shortname, description from mailing_tbl where company_id="+campaign.getCompanyID()+" AND MAILING_ID IN ("+mailingSelection+") order by mailing_id desc"; } AgnUtils.logger().info("MailingNameQuery: " + sql); @@ -223,16 +233,17 @@ public class CampaignDaoImpl implements CampaignDao { AgnUtils.logger().error("MailingNameQuery error1: " + e); } - if(getMailingSelection() == null) { - setMailingSelection(new String(mailIDs.toString())); + // TODO was passiert mit mailingSelection an dieser Stelle? + if(mailingSelection == null) { + mailingSelection = new String(mailIDs.toString() ); } return stats; } - private CampaignImpl.StatsImpl loadClicks (CampaignImpl.StatsImpl stats, String uniqueStr) { + private CampaignImpl.StatsImpl loadClicks (CampaignImpl.StatsImpl stats, String uniqueStr, String mailingSelection) { JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); CampaignStatEntry aktEntry = null; - String sql = "select rdir.mailing_id as mailing_id, count(" + uniqueStr + " rdir.customer_id) as amount from rdir_log_tbl rdir, rdir_url_tbl url where rdir.mailing_id in (" + getMailingSelection() + ") and rdir.url_id=url.url_id"; + String sql = "select rdir.mailing_id as mailing_id, count(" + uniqueStr + " rdir.customer_id) as amount from rdir_log_tbl rdir, rdir_url_tbl url where rdir.mailing_id in (" + mailingSelection + ") and rdir.url_id=url.url_id"; sql += " and url.relevance=0 group by rdir.mailing_id"; AgnUtils.logger().info("TotalClicksQuery: " + sql); @@ -266,14 +277,14 @@ public class CampaignDaoImpl implements CampaignDao { return stats; } - private CampaignImpl.StatsImpl loadOpenedMails (CampaignImpl.StatsImpl stats, Campaign campaign, Target aTarget, boolean useMailtracking) { + private CampaignImpl.StatsImpl loadOpenedMails (CampaignImpl.StatsImpl stats, Campaign campaign, Target aTarget, boolean useMailtracking, String mailingSelection) { JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); CampaignStatEntry aktEntry = null; String sql = "select onepix.mailing_id as mailing_id, count(onepix.customer_id) as amount from onepixel_log_tbl onepix"; if(useMailtracking && campaign.getTargetID() != 0) sql += ", customer_" + campaign.getCompanyID() + "_tbl cust"; - sql += " where onepix.mailing_id in (" + getMailingSelection() + ")"; + sql += " where onepix.mailing_id in (" + mailingSelection + ")"; if(useMailtracking && campaign.getTargetID() != 0) sql += " and ((" + aTarget.getTargetSQL() + ") and cust.customer_id=onepix.customer_id)"; sql += " group by onepix.mailing_id"; @@ -308,13 +319,13 @@ public class CampaignDaoImpl implements CampaignDao { return stats; } - private CampaignImpl.StatsImpl loadOptout (CampaignImpl.StatsImpl stats, Campaign campaign, Target aTarget, boolean useMailtracking) { + private CampaignImpl.StatsImpl loadOptout (CampaignImpl.StatsImpl stats, Campaign campaign, Target aTarget, boolean useMailtracking, String mailingSelection) { JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); CampaignStatEntry aktEntry = null; String sql = "select bind.exit_mailing_id as mailing_id, count(bind.customer_id) as amount from customer_" + campaign.getCompanyID() + "_binding_tbl bind"; if(useMailtracking && campaign.getTargetID() != 0) sql += ", customer_" + campaign.getCompanyID() + "_tbl cust"; - sql += " where bind.exit_mailing_id in ("+getMailingSelection()+")"; + sql += " where bind.exit_mailing_id in ("+mailingSelection+")"; if(useMailtracking && campaign.getTargetID() != 0) sql += " and ((" + aTarget.getTargetSQL() + ") and cust.customer_id=bind.customer_id)"; sql += " and bind.user_status in (" + BindingEntry.USER_STATUS_ADMINOUT + ", " + BindingEntry.USER_STATUS_OPTOUT + ") group by bind.exit_mailing_id"; @@ -498,4 +509,33 @@ public class CampaignDaoImpl implements CampaignDao { this.applicationContext = applicationContext; } + // this helper method returns the mailing-IDs from a Campaign. + + private LinkedList getMailingIDs(int compID, int campID) { + LinkedList mailingIDs = new LinkedList<Integer>(); + // get jdbc-Template + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + // StringBuffer mailIDs = null; + + String sql = "select mailing_id, shortname, description from mailing_tbl where company_id=" + compID + " and campaign_id=" + campID + " and deleted<>1 and is_template=0 order by mailing_id desc"; + + AgnUtils.logger().info("MailingNameQuery: " + sql); + try { + List list = jdbc.queryForList(sql); + Iterator i = list.iterator(); + + // mailIDs = new StringBuffer(); + Map map = null; + while(i.hasNext()) { + map = (Map) i.next(); + Integer id = new Integer(((Number) map.get("mailing_id")).intValue()); + mailingIDs.add(id); + } + } catch (Exception e) { + AgnUtils.sendExceptionMail("sql:" + sql, e); + AgnUtils.logger().error("MailingNameQuery error1: " + e); + } + return mailingIDs; + } + } src/java/org/agnitas/dao/impl/CampaignDaoImpl.java @@ -22,6 +22,9 @@ package org.agnitas.dao.impl; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -33,52 +36,53 @@ import org.agnitas.beans.Mailing; import org.agnitas.beans.MailingComponent; import org.agnitas.beans.Mediatype; import org.agnitas.beans.TrackableLink; +import org.agnitas.beans.impl.DynaBeanPaginatedListImpl; import org.agnitas.dao.MailingDao; import org.agnitas.dao.TrackableLinkDao; import org.agnitas.util.AgnUtils; +import org.apache.commons.beanutils.BasicDynaClass; +import org.apache.commons.beanutils.DynaBean; +import org.apache.commons.beanutils.DynaProperty; +import org.displaytag.pagination.PaginatedList; import org.hibernate.SessionFactory; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.orm.hibernate3.HibernateTemplate; - - - /** * - * @author mhe + * @author mhe, Nicole Serek */ public class MailingDaoImpl implements MailingDao { public Mailing getMailing(int mailingID, int companyID) { - Mailing mailing=null; - HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); - + Mailing mailing = null; + HibernateTemplate tmpl = new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); - mailing=(Mailing)AgnUtils.getFirstResult(tmpl.find("from Mailing where id = ? and companyID = ? and deleted <> 1", new Object [] {new Integer(mailingID), new Integer(companyID)} )); + mailing = (Mailing)AgnUtils.getFirstResult(tmpl.find("from Mailing where id = ? and companyID = ? and deleted <> 1", new Object [] {new Integer(mailingID), new Integer(companyID)} )); if(mailing != null) { - Map map=mailing.getMediatypes(); - Iterator it=map.keySet().iterator(); + Map map = mailing.getMediatypes(); + Iterator it = map.keySet().iterator(); while(it.hasNext()) { - Integer key=(Integer) it.next(); + Integer key = (Integer) it.next(); if(map.get(key) instanceof org.agnitas.beans.impl.MediatypeImpl) { - Mediatype mt=null; - Mediatype src=(Mediatype) map.get(key); + Mediatype mt = null; + Mediatype src = (Mediatype) map.get(key); switch(key.intValue()) { - case 0: mt=(Mediatype) this.applicationContext.getBean("MediatypeEmail"); + case 0: mt = (Mediatype) this.applicationContext.getBean("MediatypeEmail"); break; - case 1: mt=(Mediatype) this.applicationContext.getBean("MediatypeFax"); + case 1: mt = (Mediatype) this.applicationContext.getBean("MediatypeFax"); break; - case 2: mt=(Mediatype) this.applicationContext.getBean("MediatypePrint"); + case 2: mt = (Mediatype) this.applicationContext.getBean("MediatypePrint"); break; - case 3: mt=(Mediatype) this.applicationContext.getBean("MediatypeMMS"); + case 3: mt = (Mediatype) this.applicationContext.getBean("MediatypeMMS"); break; - case 4: mt=(Mediatype) this.applicationContext.getBean("MediatypeSMS"); + case 4: mt = (Mediatype) this.applicationContext.getBean("MediatypeSMS"); break; - default: mt=(Mediatype) this.applicationContext.getBean("Mediatype"); + default: mt = (Mediatype) this.applicationContext.getBean("Mediatype"); } mt.setPriority(src.getPriority()); mt.setStatus(src.getStatus()); @@ -97,27 +101,27 @@ public class MailingDaoImpl implements MailingDao { } public int saveMailing(Mailing mailing) { - int result=0; + int result = 0; - Mailing tmpMailing=null; - HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); + Mailing tmpMailing = null; + HibernateTemplate tmpl = new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); if(mailing.getId()!=0) { System.err.println("Clearing mailing"); - tmpMailing=(Mailing)AgnUtils.getFirstResult(tmpl.find("from Mailing where id = ? and companyID = ? and deleted <> 1", new Object [] {new Integer(mailing.getId()), new Integer(mailing.getCompanyID())} )); - if(tmpMailing==null) { + tmpMailing = (Mailing) AgnUtils.getFirstResult(tmpl.find("from Mailing where id = ? and companyID = ? and deleted <> 1", new Object [] {new Integer(mailing.getId()), new Integer(mailing.getCompanyID())} )); + if(tmpMailing == null) { mailing.setId(0); } } - Map map=mailing.getMediatypes(); - Map dst=new HashMap(); - Iterator i=map.keySet().iterator(); + Map map = mailing.getMediatypes(); + Map dst = new HashMap(); + Iterator i = map.keySet().iterator(); while(i.hasNext()) { - Integer idx=(Integer) i.next(); - Mediatype mt=(Mediatype) map.get(idx); - Mediatype tgt=(Mediatype) this.applicationContext.getBean("Mediatype"); + Integer idx = (Integer) i.next(); + Mediatype mt = (Mediatype) map.get(idx); + Mediatype tgt = (Mediatype) this.applicationContext.getBean("Mediatype"); try { tgt.setPriority(mt.getPriority()); @@ -166,11 +170,11 @@ public class MailingDaoImpl implements MailingDao { } public boolean deleteMailing(int mailingID, int companyID) { - Mailing tmpMailing=null; - HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); + Mailing tmpMailing = null; + HibernateTemplate tmpl = new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); - tmpMailing=this.getMailing(mailingID, companyID); - if(tmpMailing==null) { + tmpMailing = this.getMailing(mailingID, companyID); + if(tmpMailing == null) { return false; } @@ -181,15 +185,13 @@ public class MailingDaoImpl implements MailingDao { } public List getMailingsForMLID(int companyID, int mailinglistID) { - HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); - + HibernateTemplate tmpl = new HibernateTemplate((SessionFactory)this.applicationContext.getBean("sessionFactory")); return tmpl.find("from Mailing where companyID = ? and mailinglistID = ? and deleted = 0", new Object [] {new Integer(companyID), new Integer(mailinglistID)} ); - } public Map<String, String> loadAction(int mailingID, int companyID) { Map<String, String> actions = new HashMap<String, String>(); - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); String stmt = "select action_id, shortname, full_url from rdir_url_tbl where mailing_id = ? and company_id = ?"; try { @@ -215,14 +217,11 @@ public class MailingDaoImpl implements MailingDao { System.err.println(e.getMessage()); System.err.println(AgnUtils.getStackTrace(e)); } - return actions; } public boolean deleteContentFromMailing(Mailing mailing, int contentID){ - JdbcTemplate jdbcTemplate = AgnUtils.getJdbcTemplate(this.applicationContext); - String deleteContentSQL = "DELETE from dyn_content_tbl " + "WHERE " + " dyn_content_id = ? AND" + @@ -249,15 +248,15 @@ public class MailingDaoImpl implements MailingDao { * @param jdbc Template for SQL queries. * @return the resulting where clause. */ - static String getSQLExpression(String targetExpression, JdbcTemplate jdbc) { - StringBuffer buf = new StringBuffer (); + static String getSQLExpression(String targetExpression, JdbcTemplate jdbc) { + StringBuffer buf = new StringBuffer (); int tlen = targetExpression.length (); if (targetExpression == null) { return null; } for (int n = 0; n < tlen; ++n) { - char ch = targetExpression.charAt (n); + char ch = targetExpression.charAt (n); if ((ch == '(') || (ch == ')')) { buf.append (ch); @@ -271,17 +270,17 @@ public class MailingDaoImpl implements MailingDao { } else if (ch == '!') { buf.append (" NOT"); } else if (Character.isDigit(ch)) { - String temp=""; + String temp = ""; int first = n; - int tid=(-1); + int tid = (-1); while(n < tlen && Character.isDigit(ch)) { n++; } tid=Integer.parseInt(targetExpression.substring(first, n)); - temp=(String) jdbc.queryForObject("select target_sql from dyn_target_tbl where target_id = ?", new Object[] {new Integer(tid)}, temp.getClass()); + temp = (String) jdbc.queryForObject("select target_sql from dyn_target_tbl where target_id = ?", new Object[] {new Integer(tid)}, temp.getClass()); if (temp != null && temp.trim().length() > 2) - buf.append (" (" + temp + ")"); + buf.append(" (" + temp + ")"); } } if (buf.length () >= 3) @@ -298,7 +297,7 @@ public class MailingDaoImpl implements MailingDao { * sent to this recipient. */ public int findLastNewsletter(int customerID, int companyID) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); String sql="select m.mailing_id, m.target_expression, a."+AgnUtils.changeDateName()+" from mailing_tbl m left join mailing_account_tbl a ON a.mailing_id=m.mailing_id where m.company_id=? and m.deleted<>1 and m.is_template=0 and a.status_field='W' order by a."+AgnUtils.changeDateName()+" desc, m.mailing_id desc"; try { @@ -326,28 +325,28 @@ System.err.println("SQL: "+sql); } public String[] getTag(String name, int companyID) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); - String sql="select selectvalue, type from tag_tbl where tagname=? and (company_id=0 or company_id=?)"; - String[] result=null; + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + String sql = "select selectvalue, type from tag_tbl where tagname=? and (company_id=0 or company_id=?)"; + String[] result = null; try { List list=jdbc.queryForList(sql, new Object[]{name, new Integer(companyID)}); if(list.size() > 0) { - Map map=(Map) list.get(0); + Map map = (Map) list.get(0); - result=new String[]{ (String) map.get("selectvalue"), (String) map.get("type") }; + result = new String[]{ (String) map.get("selectvalue"), (String) map.get("type") }; } } catch (Exception e) { AgnUtils.sendExceptionMail("sql:" + sql + ", "+ name + ", " + companyID, e); AgnUtils.logger().error("processTag: "+e.getMessage()); - result=null; + result = null; } return result; } public String getAutoURL(int mailingID) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); String sql="select auto_url from mailing_tbl where mailing_id=?"; try { @@ -359,7 +358,7 @@ System.err.println("SQL: "+sql); } public String getAutoURL(int mailingID, int companyID) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); String rdirdomain = null; String rdir_mailinglistquery = "select ml.RDIR_DOMAIN FROM MAILINGLIST_TBL ml JOIN MAILING_TBL m ON ( ml.MAILINGLIST_ID = m.MAILINGLIST_ID) WHERE m.MAILING_ID=?"; rdirdomain = (String) jdbc.queryForObject(rdir_mailinglistquery, new Object[]{new Integer(mailingID)}, String.class ); @@ -369,13 +368,8 @@ System.err.println("SQL: "+sql); String rdir_companyquery = "select RDIR_DOMAIN FROM COMPANY_TBL where company_id=?"; rdirdomain = (String) jdbc.queryForObject(rdir_companyquery, new Object[]{new Integer(companyID)}, String.class ); return rdirdomain; - } - - - - /** * Holds value of property applicationContext. */ @@ -390,5 +384,96 @@ System.err.println("SQL: "+sql); this.applicationContext = applicationContext; } + public PaginatedList getMailingList( int companyID, String types, + boolean isTemplate, String sort, String direction, int page, int rownums) { + + JdbcTemplate aTemplate = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + List<String> charColumns = Arrays.asList(new String[]{"shortname","description","mailinglist" }); + + int offset = ( page - 1) * rownums; + + String mailingTypes = " AND mailing_type in ("+ types +") "; + if(isTemplate) { + mailingTypes = " "; + } + + String orderby = null; + String defaultorder = " send_null ASC, senddate DESC, mailing_id DESC "; + if( sort != null && ! "".equals(sort.trim())) { + orderby = getUpperSort(charColumns, sort); + orderby = orderby + " " +direction; + } + else { + orderby = defaultorder; + } + + String sqlStatement = + " SELECT *, case when senddate is null then 0 else 1 end as send_null " + + " FROM ( SELECT a.mailing_id , a.shortname , a.description , min(c." + AgnUtils.changeDateName() + ") senddate, m.shortname mailinglist " + + " FROM (mailing_tbl a LEFT JOIN mailing_account_tbl c ON (a.mailing_id=c.mailing_id AND c.status_field='W')) " + " LEFT JOIN mailinglist_tbl m ON ( a.mailinglist_id=m.mailinglist_id AND a.company_id=m.company_id) " + + " WHERE a.company_id = " + companyID + " AND a.deleted<>1 AND a.is_template=" + (isTemplate?1:0) + + mailingTypes + " GROUP BY a.mailing_id, a.shortname, a.description, m.shortname ) openemm ORDER BY " + orderby; + + + int totalsize = aTemplate.queryForInt("select count(*) from ( " +sqlStatement + ") agn"); + + sqlStatement = sqlStatement + " LIMIT " + offset + " , " + rownums; + + List<Map> tmpList = aTemplate.queryForList(sqlStatement); + + DynaProperty[] properties = new DynaProperty[] { + new DynaProperty("mailingid", Long.class), + new DynaProperty("shortname", String.class), + new DynaProperty("description", String.class), + new DynaProperty("mailinglist", String.class), + new DynaProperty("senddate",Timestamp.class) + }; + BasicDynaClass dynaClass = new BasicDynaClass("mailing", null, properties); + + List<DynaBean> result = new ArrayList<DynaBean>(); + for(Map row:tmpList) { + DynaBean newBean; + try { + newBean = dynaClass.newInstance(); + + newBean.set("mailingid", row.get("MAILING_ID")); + newBean.set("shortname", row.get("SHORTNAME")); + newBean.set("description", row.get("DESCRIPTION")); + newBean.set("mailinglist", row.get("MAILINGLIST")); + newBean.set("senddate",row.get("SENDDATE")); + result.add(newBean); + } catch (IllegalAccessException e) { + AgnUtils.logger().error("IllegalAccessException: "+e); + AgnUtils.logger().error(AgnUtils.getStackTrace(e)); + + } catch (InstantiationException e) { + AgnUtils.logger().error("InstantiationException: "+e); + AgnUtils.logger().error(AgnUtils.getStackTrace(e)); + } + } + + DynaBeanPaginatedListImpl paginatedList = new DynaBeanPaginatedListImpl(result, totalsize, rownums, page, sort, direction); + + return paginatedList; + } + protected String getUpperSort(List<String> charColumns, String sort) { + String upperSort = sort; + if (charColumns.contains( sort )) { + upperSort = "upper( " +sort + " )"; + } + return upperSort; + } + + public String getFormat(int type) { + String format = "d.M.yyyy"; + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + try { + String sql = "SELECT format FROM date_tbl WHERE type = ?"; + format = (String) jdbc.queryForObject(sql, new Object[] {new Integer(type)}, String.class); + } catch (Exception e) { + AgnUtils.logger().error("Query failed for data_tbl: " + e); + } + return format; + } } src/java/org/agnitas/dao/impl/MailingDaoImpl.java @@ -80,6 +80,7 @@ public class MailinglistDaoImpl implements MailinglistDao { } tmpl.saveOrUpdate("Mailinglist", list); + tmpl.flush(); result=list.getId(); return result; src/java/org/agnitas/dao/impl/MailinglistDaoImpl.java @@ -22,6 +22,7 @@ package org.agnitas.dao.impl; +import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -29,43 +30,49 @@ import java.sql.Statement; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; import java.util.GregorianCalendar; +import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; -import java.util.Enumeration; +import java.util.ListIterator; import java.util.Map; -import java.util.HashMap; -import java.util.LinkedList; import java.util.Vector; -import java.util.ListIterator; -import java.util.ArrayList; import javax.sql.DataSource; -import org.agnitas.util.CsvColInfo; -import org.agnitas.web.ImportWizardForm; +import org.agnitas.beans.BindingEntry; +import org.agnitas.beans.CustomerImportStatus; +import org.agnitas.beans.DatasourceDescription; +import org.agnitas.beans.Recipient; +import org.agnitas.beans.impl.DynaBeanPaginatedListImpl; +import org.agnitas.dao.RecipientDao; import org.agnitas.util.AgnUtils; +import org.agnitas.util.CsvColInfo; import org.agnitas.util.SafeString; -import org.agnitas.beans.DatasourceDescription; +import org.agnitas.web.ImportWizardForm; +import org.apache.commons.beanutils.BasicDynaClass; +import org.apache.commons.beanutils.DynaBean; +import org.apache.commons.beanutils.DynaProperty; +import org.apache.commons.collections.map.CaseInsensitiveMap; +import org.apache.commons.lang.StringUtils; +import org.displaytag.pagination.PaginatedList; import org.hibernate.SessionFactory; import org.hibernate.dialect.Dialect; import org.springframework.context.ApplicationContext; -import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.jdbc.object.SqlUpdate; import org.springframework.jdbc.support.GeneratedKeyHolder; -import org.agnitas.beans.BindingEntry; -import org.agnitas.beans.CustomerImportStatus; -import org.agnitas.beans.Recipient; -import org.agnitas.dao.RecipientDao; -import org.apache.commons.collections.map.CaseInsensitiveMap; -import org.apache.commons.lang.StringUtils; +import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate3.HibernateTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; -import org.springframework.orm.hibernate3.HibernateTransactionManager; /** * @@ -78,7 +85,7 @@ public class RecipientDaoImpl implements RecipientDao { if(maxRecipient == null) { synchronized(this) { if(maxRecipient == null) { - maxRecipient=new Integer(AgnUtils.getDefaultIntValue("recipient.maxRows")); + maxRecipient = new Integer(AgnUtils.getDefaultIntValue("recipient.maxRows")); } } } @@ -88,25 +95,25 @@ public class RecipientDaoImpl implements RecipientDao { return maxRecipient.intValue(); } - public boolean mayAdd(int companyID, int count) { - JdbcTemplate jdbc = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); - String sql = "select count(customer_id) from customer_" + companyID + "_tbl"; - int current=jdbc.queryForInt(sql); - int max=getMaxRecipient(); + public boolean mayAdd(int companyID, int count) { + JdbcTemplate jdbc = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); + String sql = "select count(customer_id) from customer_" + companyID + "_tbl"; + int current = jdbc.queryForInt(sql); + int max = getMaxRecipient(); - if(max == 0 || current+count < max) { + if(max == 0 || current+count <= max) { return true; } return false; } public boolean isNearLimit(int companyID, int count) { - JdbcTemplate jdbc = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); - String sql = "select count(customer_id) from customer_" + companyID + "_tbl"; + JdbcTemplate jdbc = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); + String sql = "select count(customer_id) from customer_" + companyID + "_tbl"; int current=jdbc.queryForInt(sql); int max=(int) (getMaxRecipient()*0.9); - if(max == 0 || current+count < max) { + if(max == 0 || current+count <= max) { return false; } return true; @@ -120,15 +127,14 @@ public class RecipientDaoImpl implements RecipientDao { public int getNewCustomerID(int companyID) { String sqlStatement = null; int customerID = 0; - Dialect dialect = AgnUtils.getHibernateDialect(); - if(companyID == 0) { - return customerID; - } - if(mayAdd(companyID, 1) == false) { - return customerID; - } + if(companyID == 0) { + return customerID; + } + if(mayAdd(companyID, 1) == false) { + return customerID; + } try { if(dialect.supportsSequences()) { JdbcTemplate tmpl = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); @@ -147,9 +153,7 @@ public class RecipientDaoImpl implements RecipientDao { System.err.println("Exception:" + e); System.err.println(AgnUtils.getStackTrace(e)); } - AgnUtils.logger().debug("new customerID: "+ customerID); - return customerID; } @@ -166,7 +170,7 @@ public class RecipientDaoImpl implements RecipientDao { String ColType = null; int intValue = 0; int day, month, year, hour, minute, second=0; - StringBuffer insertCust=new StringBuffer("INSERT INTO customer_" + cust.getCompanyID() + "_tbl "); + StringBuffer insertCust = new StringBuffer("INSERT INTO customer_" + cust.getCompanyID() + "_tbl "); boolean exitNow = false; boolean appendIt = false; boolean hasDefault = false; @@ -175,17 +179,17 @@ public class RecipientDaoImpl implements RecipientDao { NumberFormat aFormat1 = null; NumberFormat aFormat2 = null; - if(mayAdd(cust.getCompanyID(), 1) == false) { - return 0; - } + if(mayAdd(cust.getCompanyID(), 1) == false) { + return 0; + } if(cust.getCustDBStructure() == null) { - cust.loadCustDBStructure(); + cust.loadCustDBStructure(); } int customerID = getNewCustomerID(cust.getCompanyID()); if(customerID == 0) { - return 0; + return 0; } else { cust.setCustomerID(customerID); } @@ -228,7 +232,6 @@ public class RecipientDaoImpl implements RecipientDao { Map tmp = (Map) cust.getCustDBProfileStructure().get(aColumn); if (tmp != null) { String defaultValue = (String)tmp.get("default"); - if (!isBlank(defaultValue)) { appendValue = "'" + defaultValue + "'"; hasDefault = true; @@ -369,11 +372,10 @@ public class RecipientDaoImpl implements RecipientDao { if(cust.getCustomerID() == 0) { AgnUtils.logger().info("updateInDB: creating new customer"); if(this.insertNewCust(cust) == 0) { - result=false; + result = false; } } else { if(cust.isChangeFlag()) { // only if something has changed - Iterator<String> i = cust.getCustDBStructure().keySet().iterator(); while(i.hasNext()) { aColumn = i.next(); @@ -391,9 +393,9 @@ public class RecipientDaoImpl implements RecipientDao { aFormat2 = new DecimalFormat("0000"); try { if(!((String) cust.getCustParameters().get(aColumn + "_DAY_DATE")).trim().equals("")) { - day = Integer.parseInt((String) cust.getCustParameters().get(aColumn+"_DAY_DATE")); - month = Integer.parseInt((String) cust.getCustParameters().get(aColumn+"_MONTH_DATE")); - year = Integer.parseInt((String) cust.getCustParameters().get(aColumn+"_YEAR_DATE")); + day = Integer.parseInt((String) cust.getCustParameters().get(aColumn + "_DAY_DATE")); + month = Integer.parseInt((String) cust.getCustParameters().get(aColumn + "_MONTH_DATE")); + year = Integer.parseInt((String) cust.getCustParameters().get(aColumn + "_YEAR_DATE")); if (AgnUtils.isOracleDB()) { appendValue = new String(aColumn.toLowerCase() + "=to_date('" + aFormat1.format(day) + "-" + aFormat1.format(month) + "-" + aFormat2.format(year) + "', 'DD-MM-YYYY')"); } else { @@ -405,14 +407,14 @@ public class RecipientDaoImpl implements RecipientDao { if (tmp != null) { String defaultValue = (String)tmp.get("default"); if (!isBlank(defaultValue) && !defaultValue.equals("null")) { - appendValue = aColumn.toLowerCase()+"='" + defaultValue + "'"; + appendValue = aColumn.toLowerCase() + "='" + defaultValue + "'"; hasDefault = true; } } if (!hasDefault) { - appendValue=new String(aColumn.toLowerCase()+"=null"); + appendValue = new String(aColumn.toLowerCase()+"=null"); } - appendIt=true; + appendIt = true; } } catch (Exception e1) { AgnUtils.logger().error("updateInDB: Could not parse Date "+aColumn + " because of "+e1.getMessage()); @@ -432,27 +434,25 @@ public class RecipientDaoImpl implements RecipientDao { appendIt = true; } else { Map tmp = (Map) cust.getCustDBProfileStructure().get( aColumn ); - if ( tmp != null ) { + if (tmp != null) { String defaultValue = (String)tmp.get( "default" ); if (!isBlank(defaultValue)) { appendValue = aColumn.toLowerCase()+"=" + defaultValue; hasDefault = true; } } - if ( !hasDefault ) { - appendValue=new String(aColumn.toLowerCase() + "=null"); + if (!hasDefault) { + appendValue = new String(aColumn.toLowerCase() + "=null"); } - appendIt=true; + appendIt = true; } - } else if(colType.equalsIgnoreCase("DOUBLE")) { double dValue; - aParameter = (String) cust.getCustParameters(aColumn); if(!StringUtils.isEmpty(aParameter)){ try { dValue = Double.parseDouble(aParameter); - } catch (Exception e1) { + } catch(Exception e1) { dValue = 0; } appendValue = new String(aColumn.toLowerCase() + "=" + dValue); @@ -471,7 +471,6 @@ public class RecipientDaoImpl implements RecipientDao { } appendIt = true; } - } else /* if(colType.equalsIgnoreCase("VARCHAR") || colType.equalsIgnoreCase("CHAR"))*/ { aParameter = (String) cust.getCustParameters(aColumn); if(!StringUtils.isEmpty(aParameter)) { @@ -479,20 +478,19 @@ public class RecipientDaoImpl implements RecipientDao { appendIt = true; } else { Map tmp = (Map) cust.getCustDBProfileStructure().get(aColumn); - if ( tmp != null ) { + if(tmp != null) { String defaultValue = (String)tmp.get( "default" ); - if (!isBlank(defaultValue)) { + if(!isBlank(defaultValue)) { appendValue = aColumn.toLowerCase()+"='" + defaultValue + "'"; hasDefault = true; } } - if ( !hasDefault ) { + if(!hasDefault) { appendValue = new String(aColumn.toLowerCase() + "=null"); } appendIt = true; } } - if(appendIt) { updateCust.append(", "); updateCust.append(appendValue); @@ -502,7 +500,7 @@ public class RecipientDaoImpl implements RecipientDao { updateCust.append(" WHERE customer_id=" + cust.getCustomerID()); try { - JdbcTemplate tmpl=new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); + JdbcTemplate tmpl = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); AgnUtils.logger().info("updateInDB: " + updateCust.toString()); tmpl.execute(updateCust.toString()); @@ -511,27 +509,25 @@ public class RecipientDaoImpl implements RecipientDao { List list = tmpl.queryForList(sql, new Object[] {new Integer(cust.getCompanyID())}); Iterator id = list.iterator(); if(!id.hasNext()) { - aParameter=(String) cust.getCustParameters("DATASOURCE_ID"); + aParameter = (String) cust.getCustParameters("DATASOURCE_ID"); if(!StringUtils.isEmpty(aParameter)){ try { - intValue=Integer.parseInt(aParameter); + intValue = Integer.parseInt(aParameter); sql = "update customer_" + cust.getCompanyID() + "_tbl set datasource_id = " + intValue + " where customer_id = " + cust.getCustomerID(); tmpl.execute(sql); } catch (Exception e1) {} } } } - } catch (Exception e3) { + } catch(Exception e3) { // Util.SQLExceptionHelper(e3,dbConn); AgnUtils.logger().error("updateInDB: " + e3.getMessage()); result = false; } - } else { AgnUtils.logger().info("updateInDB: nothing changed"); } } - return result; } @@ -576,8 +572,7 @@ public class RecipientDaoImpl implements RecipientDao { // cannot use queryForInt, because of possible existing doublettes List<Map<String,Integer>> custList = (List<Map<String,Integer>>) tmpl.queryForList(getCust); if(custList.size() > 0) { - Map map=new CaseInsensitiveMap(custList.get(0)); - + Map map = new CaseInsensitiveMap(custList.get(0)); cust.setCustomerID(((Number) map.get("customer_id")).intValue()); } else { cust.setCustomerID(0); @@ -589,7 +584,6 @@ public class RecipientDaoImpl implements RecipientDao { System.err.println(AgnUtils.getStackTrace(e)); cust.setCustomerID(0); } - return cust.getCustomerID(); } @@ -641,14 +635,14 @@ public class RecipientDaoImpl implements RecipientDao { * @param passValue Value for Password */ public int findByUserPassword(int companyID, String userCol, String userValue, String passCol, String passValue) { - String getCust=null; + String getCust = null; int customerID = 0; if(userCol.toLowerCase().equals("email")) { - userValue=userValue.toLowerCase(); + userValue = userValue.toLowerCase(); } - getCust="SELECT customer_id FROM customer_" + companyID + "_tbl cust WHERE cust."+SafeString.getSQLSafeString(userCol, 30)+"='"+SafeString.getSQLSafeString(userValue)+"' AND cust."+SafeString.getSQLSafeString(passCol, 30)+"='"+SafeString.getSQLSafeString(passValue)+"'"; + getCust = "SELECT customer_id FROM customer_" + companyID + "_tbl cust WHERE cust."+SafeString.getSQLSafeString(userCol, 30)+"='"+SafeString.getSQLSafeString(userValue)+"' AND cust."+SafeString.getSQLSafeString(passCol, 30)+"='"+SafeString.getSQLSafeString(passValue)+"'"; try { JdbcTemplate tmpl = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); @@ -657,7 +651,6 @@ public class RecipientDaoImpl implements RecipientDao { customerID = 0; AgnUtils.logger().error("findByUserPassword: " + e.getMessage()); } - return customerID; } @@ -701,11 +694,11 @@ public class RecipientDaoImpl implements RecipientDao { case java.sql.Types.TIMESTAMP: case java.sql.Types.TIME: case java.sql.Types.DATE: - try { - aTime = rset.getTimestamp(a); - } catch(Exception e) { - aTime=null; - } + try { + aTime = rset.getTimestamp(a); + } catch(Exception e) { + aTime = null; + } if(aTime == null) { cust.getCustParameters().put(aName + "_DAY_DATE", new String("")); cust.getCustParameters().put(aName + "_MONTH_DATE", new String("")); @@ -718,7 +711,7 @@ public class RecipientDaoImpl implements RecipientDao { GregorianCalendar aCal = new GregorianCalendar(); aCal.setTime(aTime); cust.getCustParameters().put(aName + "_DAY_DATE", Integer.toString(aCal.get(GregorianCalendar.DAY_OF_MONTH))); - cust.getCustParameters().put(aName + "_MONTH_DATE", Integer.toString(aCal.get(GregorianCalendar.MONTH)+1)); + cust.getCustParameters().put(aName + "_MONTH_DATE", Integer.toString(aCal.get(GregorianCalendar.MONTH) + 1)); cust.getCustParameters().put(aName + "_YEAR_DATE", Integer.toString(aCal.get(GregorianCalendar.YEAR))); cust.getCustParameters().put(aName + "_HOUR_DATE", Integer.toString(aCal.get(GregorianCalendar.HOUR_OF_DAY))); cust.getCustParameters().put(aName + "_MINUTE_DATE", Integer.toString(aCal.get(GregorianCalendar.MINUTE))); @@ -746,9 +739,7 @@ public class RecipientDaoImpl implements RecipientDao { AgnUtils.logger().error("getCustomerDataFromDb: "+e.getMessage()); } DataSourceUtils.releaseConnection(con, ds); - cust.setChangeFlag(false); - return cust.getCustParameters(); } @@ -784,7 +775,6 @@ public class RecipientDaoImpl implements RecipientDao { Hashtable mTable = new Hashtable(); // Media_ID as key, contains rest of data (user type, status etc.) String sqlGetLists = null; BindingEntry aEntry = null; - int tmpMLID = 0; try { @@ -799,7 +789,7 @@ public class RecipientDaoImpl implements RecipientDao { int listID = ((Number) map.get("mailinglist_id")).intValue(); Integer mediaType = new Integer(((Number) map.get("mediatype")).intValue()); - aEntry=(BindingEntry) applicationContext.getBean("BindingEntry"); + aEntry = (BindingEntry) applicationContext.getBean("BindingEntry"); aEntry.setCustomerID(customerID); aEntry.setMailinglistID(listID); aEntry.setUserType((String) map.get("user_type")); @@ -822,15 +812,12 @@ public class RecipientDaoImpl implements RecipientDao { mTable.put(mediaType.toString(), aEntry); } } - cust.getListBindings().put(new Integer(tmpMLID).toString() , mTable); - } catch (Exception e) { AgnUtils.sendExceptionMail("sql:" + sqlGetLists, e); - AgnUtils.logger().error("loadAllListBindings: "+e.getMessage()); + AgnUtils.logger().error("loadAllListBindings: " + e.getMessage()); return null; } - return cust.getListBindings(); } @@ -840,7 +827,7 @@ public class RecipientDaoImpl implements RecipientDao { * @return true if E-Mail-Adress is blacklisted */ public boolean blacklistCheck(String email) { - boolean returnValue=false; + boolean returnValue = false; String sqlSelect = null; try { @@ -865,7 +852,6 @@ public class RecipientDaoImpl implements RecipientDao { return returnValue; } - private boolean isBlank(String s) { if(StringUtils.isEmpty(s)) { return true; @@ -891,17 +877,16 @@ public class RecipientDaoImpl implements RecipientDao { } } - public String getField(String selectVal, int recipientID, int companyID) { + public String getField(String selectVal, int recipientID, int companyID) { JdbcTemplate jdbc = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); - String sql="SELECT "+selectVal+" value FROM customer_"+companyID+"_tbl cust WHERE cust.customer_id=?"; + String sql = "SELECT " + selectVal + " value FROM customer_" + companyID + "_tbl cust WHERE cust.customer_id=?"; try { - List list=jdbc.queryForList(sql, new Object[]{ new Integer(recipientID)}); + List list = jdbc.queryForList(sql, new Object[]{ new Integer(recipientID)}); if(list.size() > 0) { - Map map=(Map) list.get(0); + Map map = (Map) list.get(0); Object temp = map.get("value"); - if(temp != null) { return temp.toString(); } @@ -914,29 +899,29 @@ public class RecipientDaoImpl implements RecipientDao { return ""; } - public Map<Integer, Map> getAllMailingLists(int customerID, int companyID) { - Map<Integer, Map> result=new HashMap(); - String sql="SELECT mailinglist_id, user_type, user_status, user_remark, "+AgnUtils.changeDateName()+", mediatype FROM customer_" + companyID + "_binding_tbl WHERE customer_id=? ORDER BY mailinglist_id, mediatype"; - JdbcTemplate jdbc=new JdbcTemplate((DataSource) this.applicationContext.getBean("dataSource")); - AgnUtils.logger().info("getAllMailingLists: "+sql); + public Map<Integer, Map> getAllMailingLists(int customerID, int companyID) { + Map<Integer, Map> result = new HashMap(); + String sql = "SELECT mailinglist_id, user_type, user_status, user_remark, " + AgnUtils.changeDateName()+", mediatype FROM customer_" + companyID + "_binding_tbl WHERE customer_id=? ORDER BY mailinglist_id, mediatype"; + JdbcTemplate jdbc = new JdbcTemplate((DataSource) this.applicationContext.getBean("dataSource")); + AgnUtils.logger().info("getAllMailingLists: " + sql); try { - List list=jdbc.queryForList(sql, new Object[]{new Integer(customerID)}); - Iterator i=list.iterator(); - BindingEntry entry=null; + List list = jdbc.queryForList(sql, new Object[]{new Integer(customerID)}); + Iterator i = list.iterator(); + BindingEntry entry = null; while(i.hasNext()) { - Map map=(Map) i.next(); - int listID=((Number) map.get("mailinglist_id")).intValue(); - int mediaType=((Number) map.get("mediatype")).intValue(); - Map sub=(Map) result.get(new Integer(listID)); + Map map = (Map) i.next(); + int listID = ((Number) map.get("mailinglist_id")).intValue(); + int mediaType = ((Number) map.get("mediatype")).intValue(); + Map sub = (Map) result.get(new Integer(listID)); if(sub == null) { - sub=new HashMap(); + sub = new HashMap(); } - entry=(BindingEntry) applicationContext.getBean("BindingEntry"); + entry = (BindingEntry) applicationContext.getBean("BindingEntry"); entry.setCustomerID(customerID); - entry.setMailinglistID(listID); + entry.setMailinglistID(listID); entry.setUserType((String) map.get("user_type")); entry.setUserStatus(((Number) map.get("user_status")).intValue()); entry.setUserRemark((String) map.get("user_remark")); @@ -947,37 +932,37 @@ public class RecipientDaoImpl implements RecipientDao { } } catch(Exception e) { AgnUtils.sendExceptionMail("sql:" + sql + ", " + customerID, e); - AgnUtils.logger().error("getAllMailingLists: "+e.getMessage()); + AgnUtils.logger().error("getAllMailingLists: " + e.getMessage()); } return result; } public boolean createImportTables(int companyID, int datasourceID, CustomerImportStatus status) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); String prefix = "cust_" + companyID + "_tmp"; String tabName = prefix+datasourceID+"_tbl"; String keyIdx = prefix+datasourceID+"$KEYCOL$IDX"; String custIdx = prefix+datasourceID+"$CUSTID$IDX"; - String sql=null; + String sql = null; try { - sql="create temporary table "+tabName+" as (select * from customer_" + companyID + "_tbl where 1=0)"; + sql = "create temporary table " + tabName + " as (select * from customer_" + companyID + "_tbl where 1=0)"; jdbc.execute(sql); - sql="alter table "+tabName+" modify change_date timestamp null default null"; + sql = "alter table " + tabName + " modify change_date timestamp null default null"; jdbc.execute(sql); - sql="alter table "+tabName+" modify creation_date timestamp null default current_timestamp"; + sql = "alter table " + tabName + " modify creation_date timestamp null default current_timestamp"; jdbc.execute(sql); - sql="create index " + keyIdx + " on "+tabName+" ("+SafeString.getSQLSafeString(status.getKeycolumn())+")"; + sql = "create index " + keyIdx + " on " + tabName + " (" + SafeString.getSQLSafeString(status.getKeycolumn()) + ")"; jdbc.execute(sql); - sql="create index " + custIdx +" on "+tabName+" (customer_id)"; + sql = "create index " + custIdx +" on " + tabName + " (customer_id)"; jdbc.execute(sql); } catch (Exception e) { - AgnUtils.logger().error("createTemporaryTables: "+e.getMessage()); - AgnUtils.logger().error("Statement: "+sql); + AgnUtils.logger().error("createTemporaryTables: " + e.getMessage()); + AgnUtils.logger().error("Statement: " + sql); e.printStackTrace(); return false; } @@ -985,15 +970,15 @@ public class RecipientDaoImpl implements RecipientDao { } public boolean deleteImportTables(int companyID, int datasourceID) { - JdbcTemplate jdbc=new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); - String tabName = "cust_" + companyID + "_tmp"+datasourceID+"_tbl"; + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + String tabName = "cust_" + companyID + "_tmp" + datasourceID + "_tbl"; if(AgnUtils.isOracleDB()) { try { jdbc.execute("drop table "+tabName); } catch (Exception e) { - AgnUtils.logger().error("deleteTemporaryTables: "+e.getMessage()); - AgnUtils.logger().error("Table: "+tabName); + AgnUtils.logger().error("deleteTemporaryTables: " + e.getMessage()); + AgnUtils.logger().error("Table: " + tabName); e.printStackTrace(); return false; } @@ -1008,7 +993,7 @@ public class RecipientDaoImpl implements RecipientDao { * @param aContext */ private DatasourceDescription getNewDatasourceDescription(int companyID, String description) { - HibernateTemplate tmpl=new HibernateTemplate((SessionFactory)applicationContext.getBean("sessionFactory")); + HibernateTemplate tmpl = new HibernateTemplate((SessionFactory)applicationContext.getBean("sessionFactory")); DatasourceDescription dsDescription=(DatasourceDescription) applicationContext.getBean("DatasourceDescription"); dsDescription.setId(0); @@ -1036,77 +1021,76 @@ public class RecipientDaoImpl implements RecipientDao { * @param req The HttpServletRequest that caused this action */ public void writeContent(ImportWizardForm aForm, int companyID) { - JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); - HibernateTransactionManager tm=(HibernateTransactionManager) (applicationContext.getBean("transactionManager")); - String currentTimestamp=AgnUtils.getHibernateDialect().getCurrentTimestampSQLFunctionName(); - StringBuffer usedColumnsString=new StringBuffer(); - StringBuffer copyColumnsString=new StringBuffer(); - DefaultTransactionDefinition tdef=new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED); - TransactionStatus ts=null; - ListIterator aIt=null; - CsvColInfo aInfo=null; - DatasourceDescription dsDescription=getNewDatasourceDescription(companyID, aForm.getCsvFile().getFileName()); - + JdbcTemplate jdbc = new JdbcTemplate((DataSource) applicationContext.getBean("dataSource")); + HibernateTransactionManager tm = (HibernateTransactionManager) (applicationContext.getBean("transactionManager")); + String currentTimestamp = AgnUtils.getHibernateDialect().getCurrentTimestampSQLFunctionName(); + StringBuffer usedColumnsString = new StringBuffer(); + StringBuffer copyColumnsString = new StringBuffer(); + DefaultTransactionDefinition tdef = new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED); + TransactionStatus ts = null; + ListIterator aIt = null; + CsvColInfo aInfo = null; + DatasourceDescription dsDescription = getNewDatasourceDescription(companyID, aForm.getCsvFile().getFileName()); + aForm.getStatus().setDatasourceID(dsDescription.getId()); - tm.setDataSource(jdbc.getDataSource()); AgnUtils.logger().info("Starting transaction"); - ts=tm.getTransaction(tdef); + ts = tm.getTransaction(tdef); try { this.createTemporaryTables(aForm, companyID); - int errorsOnInsert=0; - StringBuffer errorLines=new StringBuffer(); + int errorsOnInsert = 0; + StringBuffer errorLines = new StringBuffer(); // CUSTOMER_XX_TBL inserts: - String customer_body = "INSERT INTO cust_" + companyID + "_tmp"+dsDescription.getId()+"_tbl ( datasource_id, change_date, creation_date"; + String customer_body = "INSERT INTO cust_" + companyID + "_tmp" + dsDescription.getId()+"_tbl ( datasource_id, change_date, creation_date"; - ArrayList usedColumns=new ArrayList(); - aIt=aForm.getCsvAllColumns().listIterator(); - int numFields=0; + ArrayList usedColumns = new ArrayList(); + aIt = aForm.getCsvAllColumns().listIterator(); + int numFields = 0; while (aIt.hasNext()) { - aInfo=(CsvColInfo)aIt.next(); + aInfo = (CsvColInfo)aIt.next(); if(aForm.getColumnMapping().containsKey(aInfo.getName())) { - String curCol=((CsvColInfo)aForm.getColumnMapping().get(aInfo.getName())).getName(); + String curCol = ((CsvColInfo)aForm.getColumnMapping().get(aInfo.getName())).getName(); customer_body += ", " + curCol; numFields++; usedColumns.add(aInfo); - usedColumnsString.append(curCol+", "); + usedColumnsString.append(curCol + ", "); copyColumnsString.append("cust." + curCol + "=temp." + curCol + ", "); } } - customer_body += " ) VALUES " + "(" + aForm.getDatasourceID() + ", "+currentTimestamp+ ", "+currentTimestamp; - for(int a=1; a<=numFields; a++) { - customer_body+=", ?"; + customer_body += " ) VALUES " + "(" + aForm.getDatasourceID() + ", " + currentTimestamp + ", "+ currentTimestamp; + for(int a = 1; a <= numFields; a++) { + customer_body += ", ?"; } - customer_body+=")"; + customer_body += ")"; // values: - int x=0; - Object aVal=null; + int x = 0; + Object aVal = null; try { - ListIterator contentIterator=aForm.getParsedContent().listIterator(); - LinkedList aLine=null; + ListIterator contentIterator = aForm.getParsedContent().listIterator(); + LinkedList aLine = null; while(contentIterator.hasNext()) { try { - Vector params=new Vector(); + Vector params = new Vector(); - aLine=(LinkedList)contentIterator.next(); - for(int a=0; a<numFields; a++) { - aInfo=(CsvColInfo)usedColumns.get(a); - aVal=aLine.get(a); - if(aInfo.getType()==CsvColInfo.TYPE_CHAR) { + aLine = (LinkedList)contentIterator.next(); + for(int a = 0; a < numFields; a++) { + aInfo = (CsvColInfo)usedColumns.get(a); + aVal = aLine.get(a); + if(aInfo.getType() == CsvColInfo.TYPE_CHAR) { params.add((String)aVal); - } else if(aInfo.getType()==CsvColInfo.TYPE_NUMERIC) { - if(aVal!=null) { + } else if(aInfo.getType() == CsvColInfo.TYPE_NUMERIC) { + if(aVal != null) { params.add(new Double(((Double)aVal).doubleValue())); } else { params.add(new Integer(0)); } - } else if(aInfo.getType()==CsvColInfo.TYPE_DATE) { - if(aVal!=null) { + } else if(aInfo.getType() == CsvColInfo.TYPE_DATE) { + if(aVal != null) { params.add((java.util.Date)aVal); } else { params.add(new Integer(0)); @@ -1116,14 +1100,14 @@ public class RecipientDaoImpl implements RecipientDao { jdbc.update(customer_body, params.toArray()); } catch (Exception e1) { errorsOnInsert++; - AgnUtils.logger().error("writeContent: "+e1); + AgnUtils.logger().error("writeContent: " + e1); e1.printStackTrace(); } aForm.setDbInsertStatus((int)((((double)x)/aForm.getLinesOK())*100.0)); x++; } } catch (Exception e) { - AgnUtils.logger().error("writeContent: "+e); + AgnUtils.logger().error("writeContent: " + e); e.printStackTrace(); } @@ -1131,13 +1115,13 @@ public class RecipientDaoImpl implements RecipientDao { tm.commit(ts); } catch (Exception e) { tm.rollback(ts); - AgnUtils.logger().error("writeContent: "+e); + AgnUtils.logger().error("writeContent: " + e); e.printStackTrace(); } - ts=tm.getTransaction(tdef); + ts = tm.getTransaction(tdef); try { - String sql=null; + String sql = null; if(aForm.getStatus().getDoubleCheck() == CustomerImportStatus.DOUBLECHECK_FULL) { try { @@ -1147,8 +1131,8 @@ public class RecipientDaoImpl implements RecipientDao { jdbc.execute(sql); } catch (Exception e) { - AgnUtils.logger().error("writeContent: "+e); - AgnUtils.logger().error("Statement: "+sql); + AgnUtils.logger().error("writeContent: " + e); + AgnUtils.logger().error("Statement: " + sql); e.printStackTrace(); } @@ -1420,6 +1404,75 @@ public class RecipientDaoImpl implements RecipientDao { } return returnValue; } + + public PaginatedList getRecipientList( String sqlStatement, String sort, String direction , int page, int rownums, int previousFullListSize ) throws IllegalAccessException, InstantiationException { + + List<String> charColumns = Arrays.asList(new String[]{"firstname","lastname","email" }); + String[] columns = new String[] {"","firstname","lastname","email","" }; + String upperSort = getUpperSort(charColumns, sort); + + // TODO use RecipientQueryBuilder inside DAO + JdbcTemplate aTemplate = new JdbcTemplate((DataSource)this.applicationContext.getBean("dataSource")); + int totalRows = aTemplate.queryForInt("SELECT count(*) FROM ( " + sqlStatement + " ) agn" ); + if( previousFullListSize == 0 || previousFullListSize != totalRows ) { + page = 1; + } + + + int offset = ( page - 1) * rownums; + + if ( AgnUtils.isMySQLDB()) { + sqlStatement = sqlStatement + " LIMIT " + offset + " , " + rownums; + } + + if ( AgnUtils.isOracleDB()) { + sqlStatement = "SELECT * from ( select customer_id, gender, firstname,lastname, email ,rownum r from ( " + sqlStatement + " ) where 1=1 ) where r between " + offset + " and " + ( offset+ rownums ); + } + + List<Map> tmpList = aTemplate.queryForList(sqlStatement); + DynaProperty[] properties = new DynaProperty[] { + new DynaProperty("customerid", Integer.class), + new DynaProperty("gender", Integer.class), + new DynaProperty("firstname", String.class), + new DynaProperty("lastname", String.class), + new DynaProperty("email",String.class) + }; + + if( AgnUtils.isOracleDB()) { + properties = new DynaProperty[] { + new DynaProperty("customerid", BigDecimal.class), + new DynaProperty("gender",BigDecimal.class), + new DynaProperty("firstname", String.class), + new DynaProperty("lastname", String.class), + new DynaProperty("email",String.class) + }; + } + + BasicDynaClass dynaClass = new BasicDynaClass("recipient", null, properties); + List<DynaBean> result = new ArrayList<DynaBean>(); + for(Map row:tmpList) { + DynaBean newBean = dynaClass.newInstance(); + newBean.set("customerid", row.get("CUSTOMER_ID")); + newBean.set("gender", row.get("GENDER")); + newBean.set("firstname", row.get("FIRSTNAME")); + newBean.set("lastname", row.get("LASTNAME")); + newBean.set("email",row.get("EMAIL")); + result.add(newBean); + } + + DynaBeanPaginatedListImpl paginatedList = new DynaBeanPaginatedListImpl(result, totalRows, rownums, page, sort, direction ); + return paginatedList; + } + + private String getUpperSort(List<String> charColumns, String sort) { + String upperSort = sort; + if (charColumns.contains( sort )) { + upperSort = "upper( " +sort + " )"; + } + return upperSort; + } + + /** * Holds value of property applicationContext. src/java/org/agnitas/dao/impl/RecipientDaoImpl.java @@ -95,8 +95,6 @@ public class MailingStatImpl implements MailingStat { protected LinkedList clickedUrls; protected LinkedList notRelevantUrls; - protected double revenue; - /** * Holds value of property maxNRblue. */ @@ -1387,7 +1385,7 @@ public boolean getOpenTimeStatFromDB(ApplicationContext con, javax.servlet.http. startDate=aCal.getTime(); // * BUILD PROCEDURE: * - String sqlQuery = "select " + AgnUtils.sqlDateString("change_date", "%h") + "as time, count(customer_id) as total from onepixel_log_tbl where company_id=" + companyID + " and mailing_id=" + mailingID + " and " + AgnUtils.sqlDateString("change_date", "yyyymmdd") + " = '" + formatter.format(startDate) + "' group by " + AgnUtils.sqlDateString("change_date", "%h"); + String sqlQuery = "select " + AgnUtils.sqlDateString("change_date", "%H") + "as time, count(customer_id) as total from onepixel_log_tbl where company_id=" + companyID + " and mailing_id=" + mailingID + " and " + AgnUtils.sqlDateString("change_date", "yyyymmdd") + " = '" + formatter.format(startDate) + "' group by " + AgnUtils.sqlDateString("change_date", "%h"); // CALL PROCEDURE: // don't bother about zero clicks on a particular day: checking is performed in JSP src/java/org/agnitas/stat/impl/MailingStatImpl.java @@ -56,22 +56,18 @@ public class DBColumnAlias extends BodyBase { * lists shortnames */ public int doStartTag() throws JspTagException { - ApplicationContext aContext=WebApplicationContextUtils.getWebApplicationContext(this.pageContext.getServletContext()); JdbcTemplate jdbc=AgnUtils.getJdbcTemplate(aContext); String result=new String(this.column); String sql="SELECT shortname FROM customer_field_tbl WHERE company_id="+this.getCompanyID()+" AND col_name=? AND (admin_id=? OR admin_id=0) ORDER BY admin_id DESC"; try { - - List l=jdbc.queryForList(sql, new Object[] {this.column, new Integer(((Admin)this.pageContext.getAttribute("emm.admin", PageContext.SESSION_SCOPE)).getAdminID())}, String.class); + List l=jdbc.queryForList(sql, new Object[] {this.column, new Integer(((Admin)this.pageContext.getAttribute("emm.admin", PageContext.SESSION_SCOPE)).getAdminID())}); if(l !=null && l.size() > 0) { Map row=(Map)l.get(0); - result=(String) row.get("shortname"); } - } catch (Exception e) { AgnUtils.sendExceptionMail("sql:" + sql + ", " + column + ", " + ((Admin)this.pageContext.getAttribute("emm.admin", PageContext.SESSION_SCOPE)).getAdminID(), e); AgnUtils.logger().error("doStartTag: "+e.getMessage()); @@ -83,7 +79,6 @@ public class DBColumnAlias extends BodyBase { return SKIP_BODY; } private void writeResult( String result ) { - try { JspWriter out=null; out=pageContext.getOut(); src/java/org/agnitas/taglib/DBColumnAlias.java @@ -177,6 +177,7 @@ public class ShowSubscriberStat extends BodyBase { break; case BindingEntry.USER_STATUS_OPTOUT: + case BindingEntry.USER_STATUS_ADMINOUT: tmpValue=rset.getInt(3); this.allOptouts.put(rset.getString(1), new Integer(tmpValue)); if(this.maxOptout<tmpValue) src/java/org/agnitas/taglib/ShowSubscriberStat.java @@ -113,7 +113,8 @@ public class TargetNodeDate extends TargetNode implements Serializable { if(this.primaryValue.startsWith(AgnUtils.getSQLCurrentTimestampName())) { tmpSQL.append(" " + AgnUtils.sqlDateString(this.primaryValue, this.dateFormat)); } else { - tmpSQL.append(" " + AgnUtils.sqlDateString(this.primaryValue, this.dateFormat)); + //tmpSQL.append(" " + AgnUtils.sqlDateString(this.primaryValue, this.dateFormat)); + tmpSQL.append("'"+this.primaryValue+"' "); } } src/java/org/agnitas/target/impl/TargetNodeDate.java @@ -143,7 +143,11 @@ public class TargetNodeString extends TargetNode implements Serializable { tmpBsh.append("AgnUtils.match(AgnUtils.toLowerCase(\""); tmpBsh.append(this.primaryValue); tmpBsh.append("\"), AgnUtils.toLowerCase("); - tmpBsh.append(this.primaryField); + if( AgnUtils.isOracleDB() ) { + tmpBsh.append(this.primaryField.toUpperCase()); + } else { + tmpBsh.append(this.primaryField); + } tmpBsh.append("))"); break; src/java/org/agnitas/target/impl/TargetNodeString.java @@ -88,7 +88,7 @@ public class AgnUtils { * @return version the current version */ public static String getCurrentVersion() { - return isOracleDB() ? "6.0" : "5.5.0"; + return isOracleDB() ? "6.1" : "5.5.1"; } /** src/java/org/agnitas/util/AgnUtils.java @@ -15,14 +15,14 @@ import org.displaytag.tags.TableTagParameters; import org.displaytag.util.ParamEncoder; import org.springframework.context.ApplicationContext; +import bsh.commands.dir; + /** * Helper-class for building the sql-query in /recipient/list.jsp * @author ms * */ - public class RecipientQueryBuilder { - /** * construct a sql query from all the provided parameters * @param request @@ -30,34 +30,33 @@ public class RecipientQueryBuilder { * @return */ public static String getSQLStatement(HttpServletRequest request, ApplicationContext context, RecipientForm aForm) { - // helps displaytag-sorting List<Integer> charColumns = Arrays.asList(new Integer[]{1,2,3 }); - String[] columns = new String[] {"","cust.firstname","cust.lastname","cust.email","" }; - - int sortcolumnindex = 3; - if( request.getParameter(new ParamEncoder("recipient").encodeParameterName(TableTagParameters.PARAMETER_SORT)) != null ) { - sortcolumnindex = Integer.parseInt(request.getParameter(new ParamEncoder("recipient").encodeParameterName(TableTagParameters.PARAMETER_SORT))); - } - - String sort = columns[sortcolumnindex]; - if (charColumns.contains(sortcolumnindex)) { - sort = "upper( " +sort + " )"; - } - - int order = 1; - if( request.getParameter(new ParamEncoder("recipient").encodeParameterName(TableTagParameters.PARAMETER_ORDER)) != null ) { - order = new Integer(request.getParameter(new ParamEncoder("recipient").encodeParameterName(TableTagParameters.PARAMETER_ORDER))); - } - + String[] columns = new String[] {"","firstname","lastname","email","" }; + + String sort = request.getParameter("sort"); + if(sort == null) { + sort = aForm.getSort(); + } + + String upperSort = sort; + if(charColumns.contains(sort)) { + upperSort = "upper( " +sort + " )"; + } + + String direction = request.getParameter("dir"); + if(direction == null) { + direction = aForm.getOrder(); + } + // stuff from JSP <%...%> int mailingListID = 0; int targetID; String user_type = null; int user_status = 0; - if( request.getParameter("listID") != null) { - aForm.setListID( Integer.parseInt(request.getParameter("listID"))); + if(request.getParameter("listID") != null) { + aForm.setListID( Integer.parseInt(request.getParameter("listID"))); } mailingListID = aForm.getListID(); @@ -66,28 +65,28 @@ public class RecipientQueryBuilder { } targetID = aForm.getTargetID(); - if(request.getParameter("user_type")!=null){ + if(request.getParameter("user_type")!=null) { aForm.setUser_type(request.getParameter("user_type")); } user_type = aForm.getUser_type(); - if(request.getParameter("user_status")!=null){ + if(request.getParameter("user_status")!=null) { aForm.setUser_status(Integer.parseInt(request.getParameter("user_status"))); } user_status = aForm.getUser_status(); RecipientForm rec = (RecipientForm) request.getSession().getAttribute("recipientForm"); - TargetRepresentation targetRep=rec.getTarget(); - Vector condition=new Vector(); + TargetRepresentation targetRep = rec.getTarget(); + Vector condition = new Vector(); String userType = (String)(request.getParameter("user_type")); if((userType != null) && (userType.compareTo("E") != 0 )) { - condition.add("bind.USER_TYPE ='"+userType+"'"); + condition.add("bind.USER_TYPE ='" + userType + "'"); } int userStatus = 0; userType = (String)(request.getParameter("user_status")); - if (userType != null) { + if(userType != null) { try { userStatus = Integer.parseInt(userType); } catch (Exception e) { @@ -100,14 +99,13 @@ public class RecipientQueryBuilder { if(targetID != 0) { TargetDao dao = (TargetDao) context.getBean("TargetDao"); - Target target = dao.getTarget(targetID, - AgnUtils.getCompanyID(request)); + Target target = dao.getTarget(targetID, AgnUtils.getCompanyID(request)); condition.add(target.getTargetSQL()); } if(mailingListID != 0) { - condition.add("bind.mailinglist_id=" + mailingListID); + condition.add("bind.mailinglist_id="+mailingListID); } if(targetRep.generateSQL().length() > 0 && targetRep.checkBracketBalance()) { @@ -117,17 +115,17 @@ public class RecipientQueryBuilder { String sql="select cust.customer_id, cust.gender, cust.firstname, cust.lastname, cust.email FROM customer_" + AgnUtils.getCompanyID(request) + "_tbl cust"; if(condition.size() > 0) { - Iterator i=condition.iterator(); + Iterator i = condition.iterator(); String custWhere = ""; String bindWhere = ""; while(i.hasNext()) { - String s=(String) i.next(); + String s = (String) i.next(); - if(s.indexOf("bind.")!=-1) { - bindWhere += " and "+ s; + if(s.indexOf("bind.") != -1) { + bindWhere += " and " + s; } else { - custWhere += " and "+ s; + custWhere += " and " + s; } } sql += " where "; @@ -142,21 +140,15 @@ public class RecipientQueryBuilder { sql += bindWhere.substring(5); sql += ")"; } - } String sqlStatement = sql; - sqlStatement = sqlStatement.replaceAll("cust[.]bind", "bind"); - - sqlStatement += " ORDER BY " + sort + " " + (order == 1 ?"ASC":"DESC"); - - // TODO limit rows for Oracle and MySQL - if( AgnUtils.isOracleDB()) { - + sqlStatement = sqlStatement.replaceAll("cust[.]bind", "bind"); + + if(sort != null && !"".equals(sort.trim())) { + sqlStatement += " ORDER BY " + upperSort + " " + direction; } return sqlStatement; - } - } src/java/org/agnitas/util/RecipientQueryBuilder.java @@ -35,6 +35,7 @@ import org.agnitas.dao.AdminDao; import org.agnitas.dao.AdminGroupDao; import org.agnitas.dao.CompanyDao; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.AdminForm; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -49,7 +50,7 @@ import org.springframework.orm.hibernate3.HibernateTemplate; * @author Andreas Rehak, Martin Helff */ -public final class AdminAction extends StrutsActionBase { +public class AdminAction extends StrutsActionBase { public static final int ACTION_VIEW_RIGHTS = ACTION_LAST+1; public static final int ACTION_SAVE_RIGHTS = ACTION_LAST+2; @@ -78,23 +79,23 @@ public final class AdminAction extends StrutsActionBase { HttpServletResponse res) throws IOException, ServletException { - ApplicationContext aContext=this.getWebApplicationContext(); - AdminForm aForm=null; + ApplicationContext aContext = this.getWebApplicationContext(); + AdminForm aForm = null; ActionMessages errors = new ActionMessages(); - ActionForward destination=null; + ActionForward destination = null; if(!this.checkLogon(req)) { return mapping.findForward("logon"); } - if(form!=null) { - aForm=(AdminForm)form; + if(form != null) { + aForm = (AdminForm)form; } else { - aForm=new AdminForm(); + aForm = new AdminForm(); } - AgnUtils.logger().info("Action: "+aForm.getAction()); - if(req.getParameter("delete.x")!=null) { + AgnUtils.logger().info("Action: " + aForm.getAction()); + if(req.getParameter("delete.x") != null) { aForm.setAction(ACTION_CONFIRM_DELETE); } @@ -102,7 +103,7 @@ public final class AdminAction extends StrutsActionBase { switch(aForm.getAction()) { case AdminAction.ACTION_LIST: if(allowed("admin.show", req)) { - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } @@ -110,14 +111,13 @@ public final class AdminAction extends StrutsActionBase { case AdminAction.ACTION_VIEW: if(allowed("admin.show", req)) { - if(aForm.getAdminID()!=0) { - + if(aForm.getAdminID() != 0) { aForm.setAction(AdminAction.ACTION_SAVE); loadAdmin(aForm, aContext, req); } else { aForm.setAction(AdminAction.ACTION_NEW); } - destination=mapping.findForward("view"); + destination = mapping.findForward("view"); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } @@ -125,26 +125,26 @@ public final class AdminAction extends StrutsActionBase { case AdminAction.ACTION_SAVE: if(allowed("admin.change", req)) { - if(req.getParameter("save.x")!=null) { + if(req.getParameter("save.x") != null) { saveAdmin(aForm, aContext, req); } } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } - destination=mapping.findForward("view"); + destination = mapping.findForward("view"); break; case AdminAction.ACTION_VIEW_RIGHTS: loadAdmin(aForm, aContext, req); aForm.setAction(AdminAction.ACTION_SAVE_RIGHTS); - destination=mapping.findForward("rights"); + destination = mapping.findForward("rights"); break; case AdminAction.ACTION_SAVE_RIGHTS: saveAdminRights(aForm, aContext, req); loadAdmin(aForm, aContext, req); aForm.setAction(AdminAction.ACTION_SAVE_RIGHTS); - destination=mapping.findForward("rights"); + destination = mapping.findForward("rights"); break; case AdminAction.ACTION_NEW: @@ -157,7 +157,7 @@ public final class AdminAction extends StrutsActionBase { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.admin.save")); } aForm.setAction(AdminAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); @@ -167,29 +167,27 @@ public final class AdminAction extends StrutsActionBase { case AdminAction.ACTION_CONFIRM_DELETE: loadAdmin(aForm, aContext, req); aForm.setAction(AdminAction.ACTION_DELETE); - destination=mapping.findForward("delete"); + destination = mapping.findForward("delete"); break; case AdminAction.ACTION_DELETE: - if(req.getParameter("kill.x")!=null) { + if(req.getParameter("kill.x") != null) { if(allowed("admin.delete", req)) { deleteAdmin(aForm, aContext, req); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } aForm.setAction(AdminAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } break; default: aForm.setAction(AdminAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } - - } catch (Exception e) { - AgnUtils.logger().error("execute: "+e+"\n"+AgnUtils.getStackTrace(e)); + AgnUtils.logger().error("execute: " + e + "\n" + AgnUtils.getStackTrace(e)); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); throw new ServletException(e); } @@ -211,10 +209,10 @@ public final class AdminAction extends StrutsActionBase { * @param req the Servlet Request (needed to get the company id) */ protected void loadAdmin(AdminForm aForm, ApplicationContext aContext, HttpServletRequest req) { - int adminID=aForm.getAdminID(); + int adminID = aForm.getAdminID(); int compID = getCompanyID(req); AdminDao adminDao=(AdminDao) getBean("AdminDao"); - Admin admin=adminDao.getAdmin(adminID, compID); + Admin admin = adminDao.getAdmin(adminID, compID); if(admin != null) { aForm.setUsername(admin.getUsername()); @@ -228,12 +226,12 @@ public final class AdminAction extends StrutsActionBase { aForm.setGroupID(admin.getGroup().getGroupID()); aForm.setUserRights(admin.getAdminPermissions()); aForm.setGroupRights(admin.getGroup().getGroupPermissions()); - aForm.setNumberofRows( admin.getPreferredListSize()); - AgnUtils.logger().info("loadAdmin: admin "+aForm.getAdminID()+" loaded"); + aForm.setNumberofRows(admin.getPreferredListSize()); + AgnUtils.logger().info("loadAdmin: admin " + aForm.getAdminID() + " loaded"); } else { aForm.setAdminID(0); aForm.setCompanyID(this.getCompanyID(req)); - AgnUtils.logger().warn("loadAdmin: admin "+aForm.getAdminID()+" could not be loaded"); + AgnUtils.logger().warn("loadAdmin: admin " + aForm.getAdminID() + " could not be loaded"); } } @@ -246,33 +244,31 @@ public final class AdminAction extends StrutsActionBase { * @param req the Servlet Request (needed to get the company id) */ protected void saveAdmin(AdminForm aForm, ApplicationContext aContext, HttpServletRequest req) { - HibernateTemplate tmpl=getHibernateTemplate(); + HibernateTemplate tmpl = getHibernateTemplate(); int adminID = aForm.getAdminID(); int compID = aForm.getCompanyID(); int groupID = aForm.getGroupID(); - AdminDao adminDao=(AdminDao) getBean("AdminDao"); - Admin admin=adminDao.getAdmin(adminID, compID); + AdminDao adminDao = (AdminDao) getBean("AdminDao"); + Admin admin = adminDao.getAdmin(adminID, compID); -System.err.println("Saving to Companyid: "+compID); if(admin == null) { - CompanyDao companyDao=(CompanyDao) getBean("CompanyDao"); + CompanyDao companyDao = (CompanyDao) getBean("CompanyDao"); - admin=(Admin) getBean("Admin"); + admin = (Admin) getBean("Admin"); admin.setCompanyID(compID); admin.setCompany(companyDao.getCompany(compID)); admin.setLayoutID(0); - } - AdminGroupDao groupDao=(AdminGroupDao) getBean("AdminGroupDao"); - AdminGroup group=(AdminGroup) groupDao.getAdminGroup(groupID); + AdminGroupDao groupDao = (AdminGroupDao) getBean("AdminGroupDao"); + AdminGroup group = (AdminGroup) groupDao.getAdminGroup(groupID); admin.setAdminID(aForm.getAdminID()); admin.setUsername(aForm.getUsername()); - if(aForm.getPassword()!=null && aForm.getPassword().trim().length()!=0) { + if(aForm.getPassword() != null && aForm.getPassword().trim().length() != 0) { admin.setPassword(aForm.getPassword()); } - AgnUtils.logger().error("Username: "+aForm.getUsername()+" Password: "+aForm.getPassword()); + AgnUtils.logger().error("Username: " + aForm.getUsername() + " Password: " + aForm.getPassword()); admin.setFullname(aForm.getFullname()); admin.setAdminCountry(aForm.getAdminLocale().getCountry()); @@ -283,7 +279,7 @@ System.err.println("Saving to Companyid: "+compID); tmpl.saveOrUpdate("Admin", admin); tmpl.flush(); - AgnUtils.logger().info("saveAdmin: admin "+aForm.getAdminID()); + AgnUtils.logger().info("saveAdmin: admin " + aForm.getAdminID()); } /** @@ -298,8 +294,8 @@ System.err.println("Saving to Companyid: "+compID); protected void saveAdminRights(AdminForm aForm, ApplicationContext aContext, HttpServletRequest req) { int adminID = aForm.getAdminID(); int compID = getCompanyID(req); - AdminDao adminDao=(AdminDao) getBean("AdminDao"); - Admin admin=adminDao.getAdmin(adminID, compID); + AdminDao adminDao = (AdminDao) getBean("AdminDao"); + Admin admin = adminDao.getAdmin(adminID, compID); admin.setAdminPermissions(aForm.getUserRights()); getHibernateTemplate().saveOrUpdate("Admin", admin); @@ -316,8 +312,8 @@ System.err.println("Saving to Companyid: "+compID); protected void deleteAdmin(AdminForm aForm, ApplicationContext aContext, HttpServletRequest req) { int adminID = aForm.getAdminID(); int compID = getCompanyID(req); - AdminDao adminDao=(AdminDao) getBean("AdminDao"); - Admin admin=adminDao.getAdmin(adminID, compID); + AdminDao adminDao = (AdminDao) getBean("AdminDao"); + Admin admin = adminDao.getAdmin(adminID, compID); if(admin != null) { getHibernateTemplate().delete(admin); src/java/org/agnitas/web/AdminAction.java @@ -26,9 +26,18 @@ import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -38,9 +47,15 @@ import javax.sql.DataSource; import org.agnitas.beans.Campaign; import org.agnitas.beans.Company; +import org.agnitas.beans.MaildropEntry; +import org.agnitas.beans.Mailing; import org.agnitas.dao.CampaignDao; import org.agnitas.dao.CompanyDao; +import org.agnitas.dao.MailingDao; +import org.agnitas.service.CampaignQueryWorker; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.CampaignForm; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaProperty; @@ -55,7 +70,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; -public class CampaignAction extends StrutsActionBase { +public class CampaignAction extends StrutsActionBase { public static final int ACTION_STAT = ACTION_LAST+1; public static final int ACTION_SPLASH = ACTION_LAST+2; @@ -82,24 +97,22 @@ public class CampaignAction extends StrutsActionBase { HttpServletResponse res) throws IOException, ServletException { - // Validate the request parameters specified by the user - + ApplicationContext aContext = this.getWebApplicationContext(); // our application Context + + // Validate the request parameters specified by the user CampaignForm aForm=null; ActionMessages errors = new ActionMessages(); - ActionForward destination=null; - //System.err.println( req.getParameter( "action" ) ); - + ActionForward destination=null; if(!this.checkLogon(req)) { return mapping.findForward("logon"); - } - + } if(form!=null) { aForm=(CampaignForm)form; } else { aForm=new CampaignForm(); - } - + } + AgnUtils.logger().info("Action: "+aForm.getAction()); if(req.getParameter("delete.x")!=null) { @@ -111,13 +124,16 @@ public class CampaignAction extends StrutsActionBase { case CampaignAction.ACTION_LIST: if(allowed("campaign.show", req)) { destination=mapping.findForward("list"); + aForm.reset(mapping, req); + aForm.setAction(CampaignAction.ACTION_LIST); // reset Action! } break; case CampaignAction.ACTION_VIEW: if(allowed("campaign.show", req)) { + aForm.reset(mapping, req); loadCampaign(aForm, req); - aForm.setAction(CampaignAction.ACTION_SAVE); + aForm.setAction(CampaignAction.ACTION_SAVE); destination=mapping.findForward("view"); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); @@ -164,42 +180,59 @@ public class CampaignAction extends StrutsActionBase { break; case CampaignAction.ACTION_STAT: - loadCampaign(aForm, req); - if(aForm.isStatInProgress()==false) { - if(aForm.isStatReady()) { - destination=mapping.findForward("stat"); - aForm.setStatReady(false); - break; - } else { - // display splash in browser - RequestDispatcher dp=req.getRequestDispatcher(mapping.findForward("splash").getPath()); - dp.forward(req, res); - res.flushBuffer(); - destination=null; - // get stats - aForm.setStatInProgress(true); - loadCampaignStats(aForm, req); - aForm.setStatInProgress(false); - aForm.setStatReady(true); - break; - } - } + destination = mapping.findForward("splash"); // default is splash-screen. + aForm.setAction(CampaignAction.ACTION_SPLASH); + setNumberOfRows(req,(StrutsFormBase)form); // could change till next call on this variable is done. + loadCampaign(aForm, req); + try { + // look if we have a Future, if not, get one. + if (aForm.getCurrentFuture() == null) { + + aForm.setCurrentFuture(getCampaignListFuture(req, aContext, aForm)); + } + // look if we are already done. + if (aForm.getCurrentFuture().isDone() ) {// + Campaign.Stats stat = (Campaign.Stats) aForm.getCurrentFuture().get(); // get the results. + if(stat != null) { + setFormStat(aForm, stat); + } + setSortedMailingList(stat, req, aForm); + aForm.setStatReady(true); + aForm.setAction(CampaignAction.ACTION_STAT); + destination = mapping.findForward("stat"); // set destination to Statistic-page. + aForm.setCurrentFuture(null); // reset Future because we are already done. + aForm.setRefreshMillis(RecipientForm.DEFAULT_REFRESH_MILLIS); // set refresh-time to default. +// } + } else { + // increment Refresh-Rate. if it is a very long request, + // we dont have to refresh every 250ms, then 1 second is enough. + if( aForm.getRefreshMillis() < 1000 ) { // raise the refresh time + aForm.setRefreshMillis( aForm.getRefreshMillis() + 50 ); + } + + } + } catch (NullPointerException e) { + AgnUtils.logger().error("getCampaignList: "+e+"\n"+AgnUtils.getStackTrace(e)); + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); + } + + break; case CampaignAction.ACTION_SPLASH: - loadCampaign(aForm, req); - if(aForm.isStatReady()) { - aForm.setAction(CampaignAction.ACTION_STAT); - destination=mapping.findForward("stat"); - break; - } - // just display splash - destination=mapping.findForward("splash"); - break; + + if (aForm.getCurrentFuture() != null && aForm.getCurrentFuture().isDone()) { + aForm.setAction(CampaignAction.ACTION_STAT); + destination=mapping.findForward("stat"); + } else { + loadCampaign(aForm, req); + aForm.setAction(CampaignAction.ACTION_SPLASH); + destination=mapping.findForward("splash"); + } + break; default: aForm.setAction(CampaignAction.ACTION_LIST); - destination=mapping.findForward("list"); - + destination=mapping.findForward("list"); } } catch (Exception e) { @@ -216,8 +249,7 @@ public class CampaignAction extends StrutsActionBase { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); } } - - + // Report any errors we have discovered back to the original form if (!errors.isEmpty()) { saveErrors(req, errors); @@ -226,7 +258,79 @@ public class CampaignAction extends StrutsActionBase { return destination; } + + /* + * this method sets the Form-Stats. It would be good, if stat is not null + */ + private void setFormStat(CampaignForm aForm, Campaign.Stats stat) { + if (stat != null) { + aForm.setOpened(stat.getOpened()); + aForm.setOptouts(stat.getOptouts()); + aForm.setBounces(stat.getBounces()); + aForm.setSubscribers(stat.getSubscribers()); + aForm.setClicks(stat.getClicks()); + aForm.setMaxClicks(stat.getMaxClicks()); + aForm.setMaxOpened(stat.getMaxOpened()); + aForm.setMaxOptouts(stat.getMaxOptouts()); + aForm.setMaxSubscribers(stat.getMaxSubscribers()); + aForm.setMaxBounces(stat.getMaxBounces()); + aForm.setMailingData(stat.getMailingData()); + } + } + /* + * this method creates a List with all Mailing-IDs in a sorted order an writes it into the + * CampaignForm. + */ + private void setSortedMailingList(Campaign.Stats stat, HttpServletRequest req, CampaignForm aForm) { + LinkedList<Number> resultList = new LinkedList<Number>(); + MailingDao mailDao = (MailingDao) getBean("MailingDao"); + + // this hashmap contains the mapping from a Date back to the Mail-ID. + HashMap<Date, Number> tmpDate2MailIDMapping = new HashMap<Date, Number>(); + LinkedList<Date> sortedMailingList = new LinkedList<Date>(); + + Hashtable map = stat.getMailingData(); // holds the complete mailing Data + map.keySet(); // all keys for the mailingData (mailIDs) + + Number tmpMailID = null; + MaildropEntry tmpEntry = null; + Mailing tmpMailing = null; + + // loop over all keys. + Iterator it = map.keySet().iterator(); + while (it.hasNext()) { + LinkedList<Date> sortDates = new LinkedList<Date>(); + tmpMailID = (Number)it.next(); // get the mailID + // get one Mailing with tmpMailID + tmpMailing = (Mailing)mailDao.getMailing(tmpMailID.intValue(), getCompanyID(req)); + // check if it is a World-Mailing. We have testmailings and dont care about them! + if (tmpMailing.isWorldMailingSend() == true) { + // loop over all tmpMailingdropStatus. + // we look over all mails and take the first send mailing Time. + // unfortunately is the set not sorted, so we have to sort it ourself. + Iterator it2 = tmpMailing.getMaildropStatus().iterator(); + while(it2.hasNext()) { + tmpEntry=(MaildropEntry)it2.next(); + sortDates.add(tmpEntry.getSendDate()); + } + // check if sortDates has entries and put the one into the Hashmap. + if (sortDates.size() != 0) { + Collections.sort(sortDates); + tmpDate2MailIDMapping.put(sortDates.get(0), tmpMailID); + sortedMailingList.add(sortDates.get(0)); + } + } + } + // at this point, we have a Hashmap with all Dates and Mailing ID's and a List with all Date's. + // now we sort this List and put the result into the Form (sort with reverse Order ;-) ). + Collections.sort(sortedMailingList, Collections.reverseOrder()); + // loop over the List and put the corresponding MailID into the List. + for (int i=0; i < sortedMailingList.size(); i++) { + resultList.add(tmpDate2MailIDMapping.get(sortedMailingList.get(i))); + } + aForm.setSortedKeys(resultList); + } /** * Loads campaign. @@ -246,46 +350,6 @@ public class CampaignAction extends StrutsActionBase { } /** - * Loads campaign statistics. - */ - protected void loadCampaignStats(CampaignForm aForm, HttpServletRequest req) { - int campaignID=aForm.getCampaignID(); - int companyID = getCompanyID(req); - CampaignDao campaignDao = (CampaignDao) getBean("CampaignDao"); - Campaign campaign = campaignDao.getCampaign(campaignID, companyID); - - CompanyDao compDao = (CompanyDao) getBean("CompanyDao"); - Company comp = (Company) compDao.getCompany(companyID); - int mailtracking = comp.getMailtracking(); - boolean useMailtracking = false; - // TODO: fix in EMM - if(mailtracking == 1) { - useMailtracking = true; - } - Locale aLoc = (Locale) req.getSession().getAttribute(org.apache.struts.Globals.LOCALE_KEY); - campaign.setTargetID( aForm.getTargetID() ); - campaign.setNetto( aForm.isNetto() ); - Campaign.Stats stat = campaignDao.getStats(useMailtracking, aLoc, null, campaign, getWebApplicationContext()); - - - if(stat != null) { - aForm.setOpened(stat.getOpened()); - aForm.setOptouts(stat.getOptouts()); - aForm.setBounces(stat.getBounces()); - aForm.setSubscribers(stat.getSubscribers()); - aForm.setClicks(stat.getClicks()); - aForm.setMailingData(stat.getMailingData()); - aForm.setMaxClicks(stat.getMaxClicks()); - aForm.setMaxOpened(stat.getMaxOpened()); - aForm.setMaxOptouts(stat.getMaxOptouts()); - aForm.setMaxSubscribers(stat.getMaxSubscribers()); - aForm.setMaxBounces(stat.getMaxBounces()); - } - - System.out.println("campaign stats loaded."); - } - - /** * Saves campaign. */ protected void saveCampaign(CampaignForm aForm, HttpServletRequest req) { @@ -385,7 +449,31 @@ public class CampaignAction extends StrutsActionBase { result.add(newBean); } - return result; + return result; + } + + /* + * returns a Future for asynchronous computation of the CampaignStats. + */ + public Future getCampaignListFuture( HttpServletRequest req, ApplicationContext aContext, CampaignForm aForm ) throws NumberFormatException, IllegalAccessException, InstantiationException, InterruptedException, ExecutionException { + CampaignDao campaignDao = (CampaignDao) aContext.getBean("CampaignDao"); + CompanyDao compDao = (CompanyDao) getBean("CompanyDao"); + Company comp = (Company) compDao.getCompany(AgnUtils.getCompanyID(req)); + Locale aLoc = (Locale) req.getSession().getAttribute(org.apache.struts.Globals.LOCALE_KEY); + boolean mailtracking; + // i dont know why mailtracking returns an int here, but i use boolean though its not handsome but it works (hopefully). + if (comp.getMailtracking() == 0) { + mailtracking = false; + } else { + mailtracking = true; + } + + // now we start get the data. But we start that as background job. + // the result is available via future.get(). + ExecutorService service = (ExecutorService) aContext.getBean("workerExecutorService"); + Future future = service.submit( new CampaignQueryWorker(campaignDao, aLoc, aForm, req, mailtracking, aContext)); + + return future; } } src/java/org/agnitas/web/CampaignAction.java @@ -38,7 +38,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; -public final class CompareMailingForm extends ActionForm { +public class CompareMailingForm extends ActionForm { private static final long serialVersionUID = 8456061813681855065L; private int targetID; @@ -49,9 +49,10 @@ public final class CompareMailingForm extends ActionForm { private int biggestOpened; // biggest value from opened[] - for the correct graphical representation in the JSP private int biggestRecipients; // biggest value from recipients[] - for the correct graphical representation in the JSP private int biggestClicks; // biggest value from clicks[] - for the correct graphical representation in the JSP - + private String cvsfile; + /** * Holds value of property numOpen. */ @@ -60,7 +61,7 @@ public final class CompareMailingForm extends ActionForm { /** * Holds value of property mailings. */ - private LinkedList mailings; + protected LinkedList mailings; /** * Holds value of property numBounce. @@ -92,6 +93,7 @@ public final class CompareMailingForm extends ActionForm { */ private Hashtable mailingDescription; + /** * Reset all properties to their default values. * @@ -101,16 +103,20 @@ public final class CompareMailingForm extends ActionForm { public void reset(ActionMapping mapping, HttpServletRequest request) { if(mailings==null) { - mailings=new LinkedList(); - mailingDescription=new Hashtable(); - mailingName=new Hashtable(); - numBounce=new Hashtable(); - numClicks=new Hashtable(); - numOpen=new Hashtable(); - numOptout=new Hashtable(); - numRecipients=new Hashtable(); + resetHashTables(); } } + + protected void resetHashTables() { + mailings=new LinkedList(); + mailingDescription=new Hashtable(); + mailingName=new Hashtable(); + numBounce=new Hashtable(); + numClicks=new Hashtable(); + numOpen=new Hashtable(); + numOptout=new Hashtable(); + numRecipients=new Hashtable(); + } /** * Validate the properties that have been set from this HTTP request, @@ -132,22 +138,19 @@ public final class CompareMailingForm extends ActionForm { Integer tmpInt=null; boolean isFirst=true; + // get all Parameters from Form. Enumeration params = request.getParameterNames(); while(params.hasMoreElements() ) { curr=(String)params.nextElement(); - if(curr.startsWith("MailCompID_") ) { + if(curr.startsWith("MailCompID_") ) { // Form uses "MailCompID_" for storing properties. if(isFirst) { // if selection done, reset lists first this.mailings=null; this.reset(mapping, request); isFirst=false; } tmpInt=new Integer(curr.substring(11, curr.length())); - this.mailings.add(tmpInt); - this.numBounce.put(tmpInt, new Integer(0)); - this.numClicks.put(tmpInt, new Integer(0)); - this.numOpen.put(tmpInt, new Integer(0)); - this.numOptout.put(tmpInt, new Integer(0)); - this.numRecipients.put(tmpInt, new Integer(0)); + validateCleanUp(tmpInt); + } } @@ -161,28 +164,46 @@ public final class CompareMailingForm extends ActionForm { return errors; } + protected void validateCleanUp(Integer tmpInt) { + this.mailings.add(tmpInt); + this.numBounce.put(tmpInt, new Integer(0)); + this.numClicks.put(tmpInt, new Integer(0)); + this.numOpen.put(tmpInt, new Integer(0)); + this.numOptout.put(tmpInt, new Integer(0)); + this.numRecipients.put(tmpInt, new Integer(0)); + } + /** * Clear results from previous run. */ - public void resetResults() { - + public void resetResults() { Iterator aIt=this.mailings.iterator(); while(aIt.hasNext()) { Integer id=(Integer) aIt.next(); - - numBounce.put(id, new Integer(0)); - numClicks.put(id, new Integer(0)); - numOpen.put(id, new Integer(0)); - numOptout.put(id, new Integer(0)); - numRecipients.put(id, new Integer(0)); + resetNumResults(id); } - biggestBounce=0; + + resetBiggestResults(); + } + + protected void resetBiggestResults() { + biggestBounce=0; biggestClicks=0; biggestOpened=0; biggestOptouts=0; biggestRecipients=0; - } + } + + protected void resetNumResults(Integer id) { + numBounce.put(id, new Integer(0)); + numClicks.put(id, new Integer(0)); + numOpen.put(id, new Integer(0)); + numOptout.put(id, new Integer(0)); + numRecipients.put(id, new Integer(0)); + } + + /** * Getter for property targetID. @@ -472,6 +493,8 @@ public final class CompareMailingForm extends ActionForm { this.mailingDescription = mailingDescription; } + + private class CompareDescending implements Comparator { public int compare(Object o1, Object o2) { Integer a,b; @@ -483,5 +506,5 @@ public final class CompareMailingForm extends ActionForm { return (b.intValue()-a.intValue()); } - } + } } src/java/org/agnitas/web/CompareMailingForm.java @@ -39,7 +39,7 @@ import org.apache.struts.action.ActionMessages; import org.springframework.web.context.WebApplicationContext; -public final class DomainStatAction extends StrutsActionBase { +public class DomainStatAction extends StrutsActionBase { public static final int ACTION_STAT = 1; public static final int ACTION_SPLASH = 2; src/java/org/agnitas/web/DomainStatAction.java @@ -26,11 +26,12 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; -public final class DomainStatForm extends StrutsFormBase { +public class DomainStatForm extends StrutsFormBase { private static final long serialVersionUID = 7400928630109355568L; private int listID; @@ -97,10 +98,6 @@ public final class DomainStatForm extends StrutsFormBase { return errors; } - - - - /** * Setter for property listID. * src/java/org/agnitas/web/DomainStatForm.java @@ -24,7 +24,6 @@ package org.agnitas.web; import java.io.IOException; import java.math.BigDecimal; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -40,6 +39,7 @@ import org.agnitas.actions.ActionOperation; import org.agnitas.actions.EmmAction; import org.agnitas.dao.EmmActionDao; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.EmmActionForm; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaProperty; @@ -62,22 +62,15 @@ import org.springframework.jdbc.core.JdbcTemplate; public class EmmActionAction extends StrutsActionBase { public static final int ACTION_LIST = 1; - public static final int ACTION_VIEW = 2; - public static final int ACTION_SAVE = 4; - public static final int ACTION_NEW = 6; - public static final int ACTION_DELETE = 7; - public static final int ACTION_CONFIRM_DELETE = 8; - public static final int ACTION_ADD_MODULE = 9; // --------------------------------------------------------- Public Methods - /** * Process the specified HTTP request, and create the corresponding HTTP * response (or forward to another web component that will create it). @@ -121,7 +114,6 @@ public class EmmActionAction extends StrutsActionBase { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } break; - case EmmActionAction.ACTION_VIEW: if(allowed("actions.show", req)) { if(aForm.getActionID()!=0) { @@ -136,7 +128,6 @@ public class EmmActionAction extends StrutsActionBase { destination=mapping.findForward("list"); } break; - case EmmActionAction.ACTION_SAVE: if(allowed("actions.change", req)) { saveAction(aForm, req); @@ -145,13 +136,11 @@ public class EmmActionAction extends StrutsActionBase { } destination=mapping.findForward("success"); break; - case EmmActionAction.ACTION_CONFIRM_DELETE: loadAction(aForm, req); destination=mapping.findForward("delete"); aForm.setAction(EmmActionAction.ACTION_DELETE); break; - case EmmActionAction.ACTION_DELETE: if(allowed("actions.delete", req)) { deleteAction(aForm, req); @@ -161,7 +150,6 @@ public class EmmActionAction extends StrutsActionBase { aForm.setAction(EmmActionAction.ACTION_LIST); destination=mapping.findForward("list"); break; - case EmmActionAction.ACTION_ADD_MODULE: ActionOperation aMod=(ActionOperation) getBean(aForm.getNewModule()); ArrayList actions=aForm.getActions(); @@ -173,12 +161,10 @@ public class EmmActionAction extends StrutsActionBase { aForm.setAction(EmmActionAction.ACTION_SAVE); destination=mapping.findForward("success"); break; - default: destination=mapping.findForward("list"); break; } - } catch (Exception e) { AgnUtils.logger().error("execute: "+e+"\n"+AgnUtils.getStackTrace(e)); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); @@ -191,7 +177,6 @@ public class EmmActionAction extends StrutsActionBase { } catch (Exception e) { AgnUtils.logger().error("getActionList: "+e+"\n"+AgnUtils.getStackTrace(e)); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); - } } @@ -201,16 +186,13 @@ public class EmmActionAction extends StrutsActionBase { saveErrors(req, errors); return (new ActionForward(mapping.getInput())); } - return destination; - } /** * Loads an action. */ protected void loadAction(EmmActionForm aForm, HttpServletRequest req) throws Exception { - EmmActionDao dao=(EmmActionDao) getBean("EmmActionDao"); EmmAction aAction=dao.getEmmAction(aForm.getActionID(), getCompanyID(req)); @@ -229,7 +211,6 @@ public class EmmActionAction extends StrutsActionBase { * Saves an action. */ protected void saveAction(EmmActionForm aForm, HttpServletRequest req) throws Exception { - EmmAction aAction=(EmmAction) getBean("EmmAction"); EmmActionDao dao=(EmmActionDao) getBean("EmmActionDao"); @@ -269,7 +250,6 @@ public class EmmActionAction extends StrutsActionBase { ops.put(key, name); } } - return ops; } @@ -283,7 +263,6 @@ public class EmmActionAction extends StrutsActionBase { */ protected void loadActionUsed(EmmActionForm aForm, HttpServletRequest req) throws Exception { - EmmActionDao dao=(EmmActionDao) getBean("EmmActionDao"); Map used = dao.loadUsed(this.getCompanyID(req)); aForm.setUsed(used); @@ -296,20 +275,19 @@ public class EmmActionAction extends StrutsActionBase { String[] columns = new String[] { "r.shortname","r.description","", "" }; int sortcolumnindex = 0; - if( request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_SORT)) != null ) { - sortcolumnindex = Integer.parseInt(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_SORT))); - } + if(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_SORT)) != null ) { + sortcolumnindex = Integer.parseInt(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_SORT))); + } - String sort = columns[sortcolumnindex]; - if (charColumns.contains(sortcolumnindex)) { - sort = "upper( " +sort + " )"; - } + String sort = columns[sortcolumnindex]; + if(charColumns.contains(sortcolumnindex)) { + sort = "upper( " +sort + " )"; + } - int order = 1; - if( request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_ORDER)) != null ) { - order = new Integer(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_ORDER))); - } - + int order = 1; + if(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_ORDER)) != null ) { + order = new Integer(request.getParameter(new ParamEncoder("emmaction").encodeParameterName(TableTagParameters.PARAMETER_ORDER))); + } String sqlStatement = "SELECT r.action_id, r.shortname, r.description, count(u.form_id) used " + " FROM rdir_action_tbl r LEFT JOIN userform_tbl u ON (u.startaction_id = r.action_id or u.endaction_id = r.action_id) " + @@ -344,11 +322,7 @@ public class EmmActionAction extends StrutsActionBase { newBean.set("description", row.get("DESCRIPTION")); newBean.set("used", row.get("USED")); result.add(newBean); - } - return result; - } - -} +} \ No newline at end of file src/java/org/agnitas/web/EmmActionAction.java @@ -27,6 +27,7 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/ExportWizardForm.java @@ -26,6 +26,7 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; src/java/org/agnitas/web/IPStatForm.java @@ -24,9 +24,12 @@ package org.agnitas.web; import java.io.BufferedWriter; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; +import java.io.LineNumberReader; +import java.io.StringReader; import java.io.Writer; import java.util.ArrayList; import java.util.Enumeration; @@ -34,6 +37,7 @@ import java.util.Hashtable; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; +import java.util.Locale; import java.util.Map; import java.util.TimeZone; import java.util.Vector; @@ -54,12 +58,12 @@ import org.agnitas.util.AgnUtils; import org.agnitas.util.CsvColInfo; import org.agnitas.util.EmmCalendar; import org.agnitas.util.SafeString; -import org.apache.struts.upload.FormFile; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.apache.struts.upload.FormFile; import org.hibernate.SessionFactory; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; @@ -117,6 +121,8 @@ public class ImportWizardAction extends StrutsActionBase { public static final int ACTION_GET_ERROR_BLACKLIST = 19; + public static final int ACTION_CHECK_FIELDS = 20; + // --------------------------------------------------------- Public Methods @@ -141,7 +147,8 @@ public class ImportWizardAction extends StrutsActionBase { HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { - + + // Validate the request parameters specified by the user ImportWizardForm aForm=null; ActionMessages errors = new ActionMessages(); @@ -181,12 +188,24 @@ public class ImportWizardAction extends StrutsActionBase { break; case ImportWizardAction.ACTION_CSV: - aForm.setAction(ImportWizardAction.ACTION_PARSE); - destination=mapping.findForward("mapping"); + aForm.setAction(ImportWizardAction.ACTION_CHECK_FIELDS); + destination=mapping.findForward("mapping"); break; + case ImportWizardAction.ACTION_CHECK_FIELDS: + aForm.setAction(ImportWizardAction.ACTION_PRESCAN); + aForm.doParse( req ); + destination=mapping.findForward("verify"); + if( aForm.getMode() == ImportWizardForm.MODE_ADD || aForm.getMode() == ImportWizardForm.MODE_ADD_UPDATE || aForm.getMode() == ImportWizardForm.MODE_ONLY_UPDATE ) { + if( aForm.isGenderMissing() || aForm.isMailingTypeMissing() ) { + destination=mapping.findForward("verifymissingfields"); + aForm.setAction(ImportWizardAction.ACTION_PARSE); + } + } + break; + case ImportWizardAction.ACTION_PARSE: - aForm.setAction(ImportWizardAction.ACTION_PRESCAN); + aForm.setAction(ImportWizardAction.ACTION_PRESCAN); destination=mapping.findForward("verify"); break; @@ -199,6 +218,9 @@ public class ImportWizardAction extends StrutsActionBase { case ImportWizardAction.ACTION_PRESCAN: aForm.setAction(ImportWizardAction.ACTION_MLISTS); destination=mapping.findForward("prescan"); + aForm.setMailingTypeMissing(false); + aForm.setGenderMissing(false); + aForm.setLinesOK(aForm.getLinesOKFromFile(req)); break; case ImportWizardAction.ACTION_MLISTS: @@ -413,9 +435,7 @@ public class ImportWizardAction extends StrutsActionBase { String fileName=new String(this.getCompanyID(req)+"-"+System.currentTimeMillis()); tmpFile=File.createTempFile(fileName, ".csv", new File(AgnUtils.getDefaultValue("system.upload_archive"))); - FileOutputStream aOut=new FileOutputStream(tmpFile); - aOut.write(aForm.getCsvFile().getFileData()); - aOut.close(); + writeToTmpFile(aForm, tmpFile); } catch (Exception e) { AgnUtils.logger().error("writeContent: "+e); e.printStackTrace(); @@ -447,7 +467,10 @@ public class ImportWizardAction extends StrutsActionBase { String customer_body = "INSERT INTO cust_" + companyID + "_tmp"+dsDescription.getId()+"_tbl ( datasource_id, change_date, creation_date"; ArrayList usedColumns=new ArrayList(); - aIt=aForm.getCsvAllColumns().listIterator(); + ArrayList csvAllColumns = aForm.getCsvAllColumns(); + + aIt= csvAllColumns.listIterator(); + int numFields=0; while (aIt.hasNext()) { aInfo=(CsvColInfo)aIt.next(); @@ -467,51 +490,54 @@ public class ImportWizardAction extends StrutsActionBase { customer_body+=", ?"; } customer_body+=")"; + // values: - int x=0; - Object aVal=null; - try { - ListIterator contentIterator=aForm.getParsedContent().listIterator(); - LinkedList aLine=null; - - while(contentIterator.hasNext()) { - try { - Vector params=new Vector(); - - aLine=(LinkedList)contentIterator.next(); - for(int a=0; a<numFields; a++) { - aInfo=(CsvColInfo)usedColumns.get(a); - aVal=aLine.get(a); - if(aInfo.getType()==CsvColInfo.TYPE_CHAR) { - params.add((String)aVal); - } else if(aInfo.getType()==CsvColInfo.TYPE_NUMERIC) { - if(aVal!=null) { - params.add(new Double(((Double)aVal).doubleValue())); - } else { - params.add(new Integer(0)); - } - } else if(aInfo.getType()==CsvColInfo.TYPE_DATE) { - if(aVal!=null) { - params.add((java.util.Date)aVal); - } else { - params.add(new Integer(0)); - } - } - } - jdbc.update(customer_body, params.toArray()); - } catch (Exception e1) { - errorsOnInsert++; - AgnUtils.logger().error("writeContent: "+e1); - e1.printStackTrace(); - } - aForm.setDbInsertStatus((int)((((double)x)/aForm.getLinesOK())*100.0)); - x++; - } - } catch (Exception e) { - AgnUtils.logger().error("writeContent: "+e); - e.printStackTrace(); + // write the first block which has been already read in the parsecontent() call of the form to the database + writeParsedContent(aForm, jdbc, errorsOnInsert, customer_body,usedColumns, numFields); + writeToTmpFile(aForm, tmpFile); + clearBlocks(aForm); + + // 'fast forward' to the last read line + + String csvString = new String(aForm.getCsvFile().getFileData(), aForm.getStatus() + .getCharset()); + LineNumberReader aReader = new LineNumberReader(new StringReader( + csvString)); + int i=0; + while( aReader.readLine() != null && i < aForm.getReadlines()) { + i++; + // do nothing } + String myline = ""; + LinkedList aLineContent = null; + + aForm.getUniqueValues().clear(); + + while ((myline = aReader.readLine()) != null ) { + if (myline.trim().length() > 0) { + aLineContent = aForm.parseLine(myline, (Locale) req + .getSession().getAttribute( + org.apache.struts.Globals.LOCALE_KEY)); + if (aLineContent != null) { + aForm.getParsedContent().add(aLineContent); + aForm.getParsedData().append(myline + "\n"); + } + } + if ( aForm.getParsedContent().size() % ImportWizardForm.BLOCK_SIZE == 0 ) { + writeParsedContent(aForm, jdbc, errorsOnInsert, customer_body, + usedColumns, numFields); + writeToTmpFile(aForm, tmpFile); + clearBlocks(aForm); + } + } + aReader.close(); + // if the last block is smaller than the the BLOCK_SIZE the modulo division wouldn't match + if( aForm.getParsedContent().size() > 0 ) { + writeParsedContent(aForm, jdbc, errorsOnInsert, customer_body, usedColumns, numFields); + writeToTmpFile(aForm, tmpFile); + } + aForm.setError(ImportWizardForm.DBINSERT_ERROR, errorLines.toString()); tm.commit(ts); } catch (Exception e) { @@ -568,9 +594,16 @@ public class ImportWizardAction extends StrutsActionBase { if(aForm.getStatus().getIgnoreNull()==ImportWizardForm.MODE_DONT_IGNORE_NULL_VALUES) { try { String tempSubTabName = "cust_" + companyID + "_tmp2_sub" + aForm.getDatasourceID() + "_tbl"; + sql="CREATE TEMPORARY TABLE "+tempSubTabName+" AS (SELECT * from cust_" + companyID + "_tmp"+aForm.getDatasourceID()+"_tbl tmp WHERE tmp.datasource_id=0)"; jdbc.execute(sql); - + // reset bounces when email has been changed and customer_id is key column +// if( !"email".equalsIgnoreCase(aForm.getStatus().getKeycolumn())) { +// sql = "UPDATE customer_"+ companyID +"_binding_tbl SET user_status = 1, user_remark = 'reaktivierung durch import ', change_date = now() " + +// " WHERE user_status = 2 AND customer_id IN (SELECT cust.customer_id FROM "+ tempSubTabName +" tmp join customer_"+ companyID + "_tbl cust on (tmp.customer_id = cust.customer_id ) where cust.email != tmp.email ) AND user_type ='W' "; +// jdbc.execute(sql); +// } + // sql = "UPDATE " + "customer_" + companyID + "_tbl cust, " + "cust_" + companyID + "_tmp"+aForm.getDatasourceID()+"_tbl temp " + @@ -775,6 +808,71 @@ public class ImportWizardAction extends StrutsActionBase { tmpl.saveOrUpdate("CustomerImportStatus", aForm.getStatus()); } + + private void clearBlocks(ImportWizardForm aForm) { + aForm.setParsedData( new StringBuffer() ); + aForm.getParsedContent().clear(); // reset the block + } + + private void writeToTmpFile(ImportWizardForm aForm, File tmpFile) + throws FileNotFoundException, IOException { + FileOutputStream aOut=new FileOutputStream(tmpFile); + aOut.write(aForm.getCsvFile().getFileData()); + aOut.close(); + } + + private void writeParsedContent(ImportWizardForm aForm, JdbcTemplate jdbc, + int errorsOnInsert, String customer_body, ArrayList usedColumns, + int numFields) { + CsvColInfo aInfo; + int x=0; + Object aVal=null; + try { + ListIterator contentIterator=aForm.getParsedContent().listIterator(); + LinkedList aLine=null; + + while(contentIterator.hasNext()) { + try { + Vector params=new Vector(); + + aLine=(LinkedList)contentIterator.next(); + for(int a=0; a<numFields; a++) { + aInfo=(CsvColInfo)usedColumns.get(a); + aVal=aLine.get(a); + boolean continueProcessing = true; + + if(continueProcessing ) { + if(aInfo.getType()==CsvColInfo.TYPE_CHAR) { + params.add((String)aVal); + } else if(aInfo.getType()==CsvColInfo.TYPE_NUMERIC) { + if(aVal!=null) { + params.add(new Double(((Double)aVal).doubleValue())); + } else { + params.add(new Integer(0)); + } + } else if(aInfo.getType()==CsvColInfo.TYPE_DATE) { + if(aVal!=null) { + params.add((java.util.Date)aVal); + } else { + params.add(new Integer(0)); + } + } + } + } + jdbc.update(customer_body, params.toArray()); + } catch (Exception e1) { + errorsOnInsert++; + AgnUtils.logger().error("writeContent: "+e1); + e1.printStackTrace(); + } + aForm.setDbInsertStatus((int)((((double)x)/aForm.getLinesOK())*100.0)); + x++; + } + } catch (Exception e) { + AgnUtils.logger().error("writeContent: "+e); + e.printStackTrace(); + } + } /** * Retrieves new Datasource-ID for newly imported Subscribers @@ -838,4 +936,8 @@ public class ImportWizardAction extends StrutsActionBase { return data; } + + + + } src/java/org/agnitas/web/ImportWizardAction.java @@ -22,6 +22,7 @@ package org.agnitas.web; +import java.io.IOException; import java.io.LineNumberReader; import java.io.StringReader; import java.sql.Connection; @@ -45,10 +46,12 @@ import javax.servlet.http.HttpServletRequest; import javax.sql.DataSource; import org.agnitas.beans.CustomerImportStatus; +import org.agnitas.beans.Recipient; import org.agnitas.util.AgnUtils; import org.agnitas.util.CsvColInfo; import org.agnitas.util.CsvTokenizer; import org.agnitas.util.SafeString; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.commons.collections.map.CaseInsensitiveMap; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; @@ -65,6 +68,15 @@ import org.springframework.jdbc.support.rowset.SqlRowSet; */ public class ImportWizardForm extends StrutsFormBase { + + public static final int BLOCK_SIZE = 1000; + + public static final String MAILTYPE_KEY = "mailtype"; + + public static final String GENDER_KEY = "gender"; + + public static final String PARSE_ERRORS = "parseErrors"; + private static final long serialVersionUID = 7563170467003097523L; private CustomerImportStatus status = null; @@ -128,9 +140,9 @@ public class ImportWizardForm extends StrutsFormBase { public static final String EMAILDOUBLE_ERROR = "emailDouble"; - public static final String GENDER_ERROR = "gender"; + public static final String GENDER_ERROR = GENDER_KEY; - public static final String MAILTYPE_ERROR = "mailtype"; + public static final String MAILTYPE_ERROR = MAILTYPE_KEY; public static final String NUMERIC_ERROR = "numeric"; @@ -168,6 +180,12 @@ public class ImportWizardForm extends StrutsFormBase { * Holds value of property linesOK. */ private int linesOK; + + /** + * number of read lines + */ + private int readlines; + /** * Holds value of property dbInsertStatus. @@ -214,7 +232,18 @@ public class ImportWizardForm extends StrutsFormBase { * Holds value of property previewOffset. */ private int previewOffset; + + + /** + * user may choose a default mailing-type in case of no column for mailing-type has been assigned + */ + private String manualAssignedMailingType = Integer.toString(Recipient.MAILTYPE_HTML); + private String manualAssignedGender = Integer.toString(Recipient.GENDER_UNKNOWN); + + private boolean mailingTypeMissing = false; + private boolean genderMissing = false; + /** * Validate the properties that have been set from this HTTP request, and * return an <code>ActionMessages</code> object that encapsulates any @@ -233,9 +262,9 @@ public class ImportWizardForm extends StrutsFormBase { HttpServletRequest request) { ApplicationContext aContext = this.getWebApplicationContext(); ActionErrors errors = new ActionErrors(); - + AgnUtils.logger().info("validate: " + this.action); - + switch (this.action) { case ImportWizardAction.ACTION_START: @@ -246,29 +275,29 @@ public class ImportWizardForm extends StrutsFormBase { if (request.getParameter("mode_back.x") != null) { this.action = ImportWizardAction.ACTION_START; } else { + errors = parseFirstline(request); + } break; + + case ImportWizardAction.ACTION_CHECK_FIELDS: + mapColumns(request); // map columns + break; case ImportWizardAction.ACTION_PARSE: try { if (request.getParameter("mapping_back.x") != null) { this.action = ImportWizardAction.ACTION_MODE; } else { - // do column mapping: - mapColumns(request); - // start at the top of the csv file: - this.previewOffset = 0; - // change this to process the column name mapping from - // previous action: - errors = this.parseContent(request); - // we have too many rows: - if (this.linesOK > Integer.parseInt(AgnUtils + doParse(request); + setLinesOK(getLinesOKFromFile(request)); + if (getLinesOK() > Integer.parseInt(AgnUtils .getDefaultValue("import.maxrows"))) { errors.add("global", new ActionMessage( - "error.import.too_many_records")); + "error.import.too_many_records" , AgnUtils.getDefaultValue("import.maxrows"))); this.action = ImportWizardAction.ACTION_MODE; - } + } } } catch (Exception e) { System.err.println("Exception caught: " + e); @@ -323,11 +352,18 @@ public class ImportWizardForm extends StrutsFormBase { this.previewOffset = 0; } break; - } return errors; } + public void doParse(HttpServletRequest request) { + // start at the top of the csv file: + this.previewOffset = 0; + // change this to process the column name mapping from + // previous action: + this.parseContent(request); + } + private void initStatus(ApplicationContext aContext) { status = (CustomerImportStatus) aContext .getBean("CustomerImportStatus"); @@ -653,7 +689,7 @@ public class ImportWizardForm extends StrutsFormBase { * csv column information Checks email / email adress / email adress on * blacklist. */ - protected LinkedList parseLine(String input, Locale locale) { + public LinkedList parseLine(String input, Locale locale) { // EnhStringTokenizer aLine = null; CsvTokenizer aLine = null; int j = 0; @@ -671,7 +707,10 @@ public class ImportWizardForm extends StrutsFormBase { aLine = new CsvTokenizer(input, status.getSeparator(), status .getDelimiter()); + try { + boolean addedGenderDummyValue = false; + boolean addedMailtypeDummyValue = false; while ((aValue = aLine.nextToken()) != null) { aCsvInfo = (CsvColInfo) this.csvAllColumns.get(j); @@ -723,14 +762,14 @@ public class ImportWizardForm extends StrutsFormBase { AgnUtils.logger().error("Blacklisted: " + input); return null; } - } else if (aInfo.getName().equalsIgnoreCase("mailtype")) { + } else if (aInfo.getName().equalsIgnoreCase(MAILTYPE_KEY)) { try { tmp = Integer.parseInt(aValue); if (tmp < 0 || tmp > 2) { throw new Exception("Invalid mailtype"); } } catch (Exception e) { - if (aInfo.getName().equalsIgnoreCase("mailtype")) { + if (aInfo.getName().equalsIgnoreCase(MAILTYPE_KEY)) { if (!aValue.equalsIgnoreCase("text") && !aValue.equalsIgnoreCase("txt") && !aValue.equalsIgnoreCase("html") @@ -742,14 +781,14 @@ public class ImportWizardForm extends StrutsFormBase { } } } - } else if (aInfo.getName().equalsIgnoreCase("gender")) { + } else if (aInfo.getName().equalsIgnoreCase(GENDER_KEY)) { try { tmp = Integer.parseInt(aValue); if (tmp < 0 || tmp > 5) { throw new Exception("Invalid gender"); } } catch (Exception e) { - if (aInfo.getName().equalsIgnoreCase("gender")) { + if (aInfo.getName().equalsIgnoreCase(GENDER_KEY)) { if (!aValue.equalsIgnoreCase("Herr") && !aValue.equalsIgnoreCase("Herrn") && !aValue.equalsIgnoreCase("m") @@ -786,7 +825,7 @@ public class ImportWizardForm extends StrutsFormBase { valueList.add(Double.valueOf(aValue)); } catch (Exception e) { if (aInfo.getName().equalsIgnoreCase( - "gender")) { + GENDER_KEY) && !columnMapping.containsKey(GENDER_KEY+"_dummy")) { if (aValue.equalsIgnoreCase("Herr") || aValue .equalsIgnoreCase("Herrn") @@ -796,11 +835,12 @@ public class ImportWizardForm extends StrutsFormBase { .equalsIgnoreCase("Frau") || aValue.equalsIgnoreCase("w")) { valueList.add(Double.valueOf(1)); - } else { + } + else { valueList.add(Double.valueOf(2)); } } else if (aInfo.getName().equalsIgnoreCase( - "mailtype")) { + MAILTYPE_KEY) && ! columnMapping.containsKey(MAILTYPE_KEY+"_dummy")) { if (aValue.equalsIgnoreCase("text") || aValue .equalsIgnoreCase("txt")) { @@ -811,7 +851,7 @@ public class ImportWizardForm extends StrutsFormBase { } else if (aValue .equalsIgnoreCase("offline")) { valueList.add(Double.valueOf(2)); - } + } } else { setError( NUMERIC_ERROR, @@ -848,12 +888,26 @@ public class ImportWizardForm extends StrutsFormBase { } } } + + + j++; } + if (this.getColumnMapping().containsKey(GENDER_KEY+"_dummy" ) && ! addedGenderDummyValue ) { + valueList.add(getManualAssignedGender()); + addedGenderDummyValue = true; + } + if (this.getColumnMapping().containsKey(MAILTYPE_KEY+"_dummy" ) && ! addedMailtypeDummyValue ) { + valueList.add(getManualAssignedMailingType()); + addedMailtypeDummyValue = true; + } + + } catch (Exception e) { setError(STRUCTURE_ERROR, input + "\n"); AgnUtils.logger().error("parseLine: " + e); return null; + } if (this.csvMaxUsedColumn != j) { @@ -870,7 +924,6 @@ public class ImportWizardForm extends StrutsFormBase { * Maps columns from database. */ protected void mapColumns(HttpServletRequest req) { - int i = 1; CsvColInfo aCol = null; @@ -901,6 +954,45 @@ public class ImportWizardForm extends StrutsFormBase { } } } + + if ( ! columnIsMapped(GENDER_KEY) ) { + CsvColInfo genderCol = new CsvColInfo(); + genderCol.setName(GENDER_KEY); + genderCol.setType(CsvColInfo.TYPE_CHAR); + columnMapping.put(GENDER_KEY+"_dummy", genderCol ); + setGenderMissing(true); + } + + if ( ! columnIsMapped(MAILTYPE_KEY) ) { + CsvColInfo mailtypeCol = new CsvColInfo(); + mailtypeCol.setName(MAILTYPE_KEY); + mailtypeCol.setType(CsvColInfo.TYPE_CHAR); + columnMapping.put(MAILTYPE_KEY+"_dummy", mailtypeCol ); + setMailingTypeMissing(true); + } + + // check if the mailtype/ gender is allready in columnmapping , if we find only a dummy -> add a dummy to csvAllColumns too + if( getColumnMapping().containsKey(GENDER_KEY+"_dummy")) { + CsvColInfo mailtypeDummy = new CsvColInfo(); + mailtypeDummy.setName(GENDER_KEY+"_dummy"); + mailtypeDummy.setActive(true); + mailtypeDummy.setType(CsvColInfo.TYPE_CHAR); + csvAllColumns.add(mailtypeDummy); + } + + + if( getColumnMapping().containsKey(MAILTYPE_KEY+"_dummy")) { + CsvColInfo mailtypeDummy = new CsvColInfo(); + mailtypeDummy.setName(MAILTYPE_KEY+"_dummy"); + mailtypeDummy.setActive(true); + mailtypeDummy.setType(CsvColInfo.TYPE_CHAR); + csvAllColumns.add(mailtypeDummy); + } + + + + + } /** @@ -935,9 +1027,12 @@ public class ImportWizardForm extends StrutsFormBase { LineNumberReader aReader = new LineNumberReader(new StringReader( csvString)); + try { // read first line: if ((firstline = aReader.readLine()) != null) { + aReader.close(); // + // split line into tokens: CsvTokenizer st = new CsvTokenizer(firstline, status .getSeparator(), status.getDelimiter()); @@ -966,7 +1061,7 @@ public class ImportWizardForm extends StrutsFormBase { this.csvMaxUsedColumn = colNum; } } - + } catch (Exception e) { AgnUtils.logger().error("parseFirstline: " + e); } @@ -1024,16 +1119,21 @@ public class ImportWizardForm extends StrutsFormBase { // and eventually for gender and mailtype: String aKey = ""; CsvColInfo aCol = null; + + + Enumeration aMapEnu = this.columnMapping.keys(); + while (aMapEnu.hasMoreElements()) { aKey = (String) aMapEnu.nextElement(); aCol = (CsvColInfo) this.columnMapping.get(aKey); - if (aCol.getName().equalsIgnoreCase("gender")) { + + if (aCol.getName().equalsIgnoreCase(GENDER_KEY) ) { hasGENDER = true; } - if (aCol.getName().equalsIgnoreCase("mailtype")) { + if (aCol.getName().equalsIgnoreCase(MAILTYPE_KEY)) { hasMAILTYPE = true; } @@ -1082,7 +1182,10 @@ public class ImportWizardForm extends StrutsFormBase { // StringTokenizer file = new StringTokenizer(csvString, "\n"); if (errors.isEmpty()) { - while ((myline = aReader.readLine()) != null) { + readlines = 0; + int maxrows = BLOCK_SIZE; + this.linesOK = 0; + while ((myline = aReader.readLine()) != null && this.linesOK < maxrows) { // Bug-Fix just read the first 1000 lines to avoid trouble with heap space if (myline.trim().length() > 0) { aLineContent = parseLine(myline, (Locale) req .getSession().getAttribute( @@ -1091,9 +1194,12 @@ public class ImportWizardForm extends StrutsFormBase { parsedContent.add(aLineContent); this.parsedData.append(myline + "\n"); this.linesOK++; - } + } } + readlines++; } + + aReader.close(); } } catch (Exception e) { AgnUtils.logger().error("parseContent: " + e); @@ -1101,6 +1207,17 @@ public class ImportWizardForm extends StrutsFormBase { return errors; } + private boolean columnIsMapped( String key ) { + Enumeration<CsvColInfo> elements = columnMapping.elements(); + while( elements.hasMoreElements()) { + CsvColInfo colInfo = elements.nextElement(); + if(key.equalsIgnoreCase(colInfo.getName())) { + return true; + } + } + return false; + } + /** * Gets mailing lists from request. */ @@ -1342,4 +1459,66 @@ public class ImportWizardForm extends StrutsFormBase { public void setErrorId(String errorId) { this.errorId = errorId; } + + public String getManualAssignedMailingType() { + return manualAssignedMailingType; + } + + public void setManualAssignedMailingType(String manualAssignedMailingType) { + this.manualAssignedMailingType = manualAssignedMailingType; + } + + public String getManualAssignedGender() { + return manualAssignedGender; + } + + public void setManualAssignedGender(String manualAssignedGender) { + this.manualAssignedGender = manualAssignedGender; + } + + public boolean isMailingTypeMissing() { + return mailingTypeMissing; + } + + public void setMailingTypeMissing(boolean mailingTypeMissing) { + this.mailingTypeMissing = mailingTypeMissing; + } + + public boolean isGenderMissing() { + return genderMissing; + } + + public void setGenderMissing(boolean genderMissing) { + this.genderMissing = genderMissing; + } + + public int getReadlines() { + return readlines; + } + + /** + * read all lines of the file + * @param aForm + * @param req + * @return + * @throws IOException + */ + public int getLinesOKFromFile( HttpServletRequest req ) throws IOException { + String csvString = new String(this.getCsvFile().getFileData(), this.getStatus().getCharset()); + LineNumberReader aReader = new LineNumberReader(new StringReader(csvString)); + String myline = ""; + int linesOK = 0; + this.getUniqueValues().clear(); + aReader.readLine(); // skip header + while ((myline = aReader.readLine()) != null ) { + if (myline.trim().length() > 0) { + if( this.parseLine(myline, (Locale) req.getSession().getAttribute(org.apache.struts.Globals.LOCALE_KEY)) != null) { + linesOK++; + } + } + } + aReader.close(); + return linesOK; + } + } src/java/org/agnitas/web/ImportWizardForm.java @@ -55,7 +55,7 @@ import org.apache.struts.action.ActionMessages; * @author Martin Helff */ -public final class LogonAction extends StrutsActionBase { +public class LogonAction extends StrutsActionBase { public static final int ACTION_LOGON = 1; public static final int ACTION_LOGOFF = 2; @@ -200,7 +200,7 @@ public final class LogonAction extends StrutsActionBase { return true; } - private String checkPassword(HttpServletRequest req) { + protected String checkPassword(HttpServletRequest req) { HttpSession session=req.getSession(); Admin admin=(Admin) session.getAttribute("emm.admin"); Date lastChange=admin.getLastPasswordChange(); src/java/org/agnitas/web/LogonAction.java @@ -26,6 +26,7 @@ package org.agnitas.web; import javax.servlet.http.HttpServletRequest; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/LogonForm.java @@ -26,6 +26,7 @@ package org.agnitas.web; import javax.servlet.http.HttpServletRequest; import org.agnitas.dao.TargetDao; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.upload.FormFile; src/java/org/agnitas/web/MailingAttachmentsForm.java @@ -27,12 +27,15 @@ import java.math.BigDecimal; import java.sql.SQLException; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.mail.internet.InternetAddress; import javax.servlet.ServletException; @@ -44,11 +47,14 @@ import org.agnitas.beans.Admin; import org.agnitas.beans.Mailing; import org.agnitas.beans.MailingComponent; import org.agnitas.beans.MediatypeEmail; +import org.agnitas.beans.impl.DynaBeanPaginatedListImpl; import org.agnitas.dao.AdminDao; import org.agnitas.dao.MailingDao; import org.agnitas.dao.MailinglistDao; +import org.agnitas.service.MailingsQueryWorker; import org.agnitas.util.AgnUtils; import org.agnitas.util.SafeString; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaProperty; @@ -58,6 +64,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.displaytag.pagination.PaginatedList; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; @@ -264,17 +271,34 @@ public class MailingBaseAction extends StrutsActionBase { if(destination != null && "list".equals(destination.getName())) { try { - req.setAttribute("mailinglist",getMailingList(req, aForm.getTypes(), aForm.isIsTemplate())); - setNumberOfRows(req,(StrutsFormBase)form); - } catch (Exception e) { - AgnUtils.logger().error("getMailingList: "+e+"\n"+AgnUtils.getStackTrace(e)); - errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); - } + setNumberOfRows(req, aForm); + destination = mapping.findForward("loading"); + + if( aForm.getCurrentFuture() == null ) { + aForm.setCurrentFuture(getMailingListFuture(req,aForm.getTypes(), aForm.isIsTemplate(), aForm )); + } + + if ( aForm.getCurrentFuture() != null && aForm.getCurrentFuture().isDone()) { + + req.setAttribute("mailinglist", aForm.getCurrentFuture().get()); + destination = mapping.findForward("list"); + aForm.setCurrentFuture(null); + aForm.setRefreshMillis(RecipientForm.DEFAULT_REFRESH_MILLIS); + } + else { + if( aForm.getRefreshMillis() < 1000 ) { // raise the refresh time + aForm.setRefreshMillis( aForm.getRefreshMillis() + 50 ); + } + aForm.setError(false); + } + + } catch (Exception e) { + AgnUtils.logger().error("getMailingList: "+e+"\n"+AgnUtils.getStackTrace(e)); + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); + aForm.setError(true); // do not refresh when an error has been occurred + } } - - - // Report any errors we have discovered back to the original form if (!errors.isEmpty()) { saveErrors(req, errors); @@ -391,7 +415,8 @@ public class MailingBaseAction extends StrutsActionBase { aForm.setTargetMode(aTemplate.getTargetMode()); aForm.setTargetGroups(aTemplate.getTargetGroups()); aForm.setMediatypes(aTemplate.getMediatypes()); - aForm.setArchived( aTemplate.getArchived() != 0 ); + aForm.setArchived(aTemplate.getArchived() != 0); + aForm.setCampaignID(aTemplate.getCampaignID()); // load template for this mailing if((tmpComp=aTemplate.getHtmlTemplate())!=null) { @@ -503,59 +528,54 @@ public class MailingBaseAction extends StrutsActionBase { /** * load the data for the list view */ - public List<DynaBean> getMailingList(HttpServletRequest req , String types, boolean isTemplate ) throws IllegalAccessException, InstantiationException { - ApplicationContext aContext= getWebApplicationContext(); - JdbcTemplate aTemplate=new JdbcTemplate( (DataSource)aContext.getBean("dataSource")); - - // Optimize: Limit number of rows , deliver only a special page -// String sqlStatement = -// "select *, case when senddate is null then 0 else 1 end as send_null " + -// "from ( SELECT a.mailing_id, a.shortname, a.description, a.mailinglist_id," + -// " ( SELECT min( c."+AgnUtils.changeDateName()+" ) FROM mailing_account_tbl c WHERE a.mailing_id =c.mailing_id AND c.status_field = 'W' ) AS senddate," + -// " ( SELECT shortname FROM mailinglist_tbl m WHERE a.mailinglist_id=m.mailinglist_id AND a.company_id=m.company_id ) AS mailinglist " + -// "FROM mailing_tbl a WHERE a.company_id = "+AgnUtils.getCompanyID(req)+" AND a.deleted <> 1 AND a.is_template = "+isTemplate+" and mailing_type in (" + types + "))" + -// " te ORDER BY send_null ASC, senddate DESC, mailing_id DESC"; -// - - - String mailingTypes = " AND mailing_type in ("+ types +") "; - if(isTemplate) { - mailingTypes = " "; - } - - String sqlStatement = - " SELECT *, case when senddate is null then 0 else 1 end as send_null " + - " FROM ( SELECT a.mailing_id , a.shortname , a.description , min(c." + AgnUtils.changeDateName() + ") senddate, m.shortname mailinglist " + - " FROM (mailing_tbl a LEFT JOIN mailing_account_tbl c ON (a.mailing_id=c.mailing_id AND c.status_field='W')) " + " LEFT JOIN mailinglist_tbl m ON ( a.mailinglist_id=m.mailinglist_id AND a.company_id=m.company_id) " + - " WHERE a.company_id = " + AgnUtils.getCompanyID(req) + " AND a.deleted<>1 AND a.is_template=" + (isTemplate?1:0) - + mailingTypes + " GROUP BY a.mailing_id, a.shortname, a.description, m.shortname ) openemm " + " ORDER BY send_null ASC, senddate DESC, mailing_id DESC "; - - List<Map> tmpList = aTemplate.queryForList(sqlStatement); - DynaProperty[] properties = new DynaProperty[] { - new DynaProperty("mailingid", Long.class), - new DynaProperty("shortname", String.class), - new DynaProperty("description", String.class), - new DynaProperty("mailinglist", String.class), - new DynaProperty("senddate",Timestamp.class) - }; - BasicDynaClass dynaClass = new BasicDynaClass("mailing", null, properties); - - List<DynaBean> result = new ArrayList<DynaBean>(); - for(Map row:tmpList) { - DynaBean newBean = dynaClass.newInstance(); - newBean.set("mailingid", row.get("MAILING_ID")); - newBean.set("shortname", row.get("SHORTNAME")); - newBean.set("description", row.get("DESCRIPTION")); - newBean.set("mailinglist", row.get("MAILINGLIST")); - newBean.set("senddate",row.get("SENDDATE")); - result.add(newBean); - - } - - return result; + public Future getMailingListFuture(HttpServletRequest req , String types, boolean isTemplate, MailingBaseForm mailingBaseForm ) throws IllegalAccessException, InstantiationException { + + String sort = getSort(req, mailingBaseForm); + + String direction = req.getParameter("dir"); + if( direction == null ) { + direction = mailingBaseForm.getOrder(); + } else { + mailingBaseForm.setOrder(direction); + } + + String pageStr = req.getParameter("page"); + if ( pageStr == null || "".equals(pageStr.trim()) ) { + if ( mailingBaseForm.getPage() == null || "".equals(mailingBaseForm.getPage().trim())) { + mailingBaseForm.setPage("1"); + } + pageStr = mailingBaseForm.getPage(); + + } + else { + mailingBaseForm.setPage(pageStr); + } + + if( mailingBaseForm.isNumberOfRowsChanged() ) { + mailingBaseForm.setPage("1"); + mailingBaseForm.setNumberOfRowsChanged(false); + pageStr = "1"; + } + + int page = Integer.parseInt(pageStr); + + int rownums = mailingBaseForm.getNumberofRows(); + MailingDao mDao=(MailingDao) getBean("MailingDao"); + ExecutorService service = (ExecutorService) getWebApplicationContext().getBean("workerExecutorService"); + Future future = service.submit(new MailingsQueryWorker(mDao, AgnUtils.getCompanyID(req), types, isTemplate, sort, direction, page, rownums )); + return future; + + } + + protected String getSort(HttpServletRequest request, MailingBaseForm aForm) { + String sort = request.getParameter("sort"); + if( sort == null ) { + sort = aForm.getSort(); + } else { + aForm.setSort(sort); + } + return sort; } - - } src/java/org/agnitas/web/MailingBaseAction.java @@ -35,13 +35,14 @@ import org.agnitas.beans.Mailing; import org.agnitas.beans.Mediatype; import org.agnitas.beans.MediatypeEmail; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; /** * - * @author mhe + * @author mhe, Nicole Serek */ public class MailingBaseForm extends StrutsFormBase { @@ -60,7 +61,7 @@ public class MailingBaseForm extends StrutsFormBase { /** * Holds value of property shortname. */ - protected String shortname=""; + protected String shortname = ""; /** * Holds value of property description. @@ -154,9 +155,6 @@ public class MailingBaseForm extends StrutsFormBase { protected Map<String, String> actions; - - - /** * Creates a new instance of TemplateForm */ @@ -167,31 +165,31 @@ public class MailingBaseForm extends StrutsFormBase { * Initialization. */ public void clearData(int companyID, int defaultMediaType) throws Exception { + this.targetID = 0; + this.mailinglistID = 0; + this.templateID = 0; + this.campaignID = 0; + this.mailingType = Mailing.TYPE_NORMAL; - this.targetID=0; - this.mailinglistID=0; - this.templateID=0; - this.mailingType=Mailing.TYPE_NORMAL; - - this.shortname=new String(""); - this.description=new String(""); + this.shortname = new String(""); + this.description = new String(""); - mediatypes=new HashMap(); - Mediatype mt=(Mediatype) getWebApplicationContext().getBean("MediatypeEmail"); + mediatypes = new HashMap(); + Mediatype mt = (Mediatype) getWebApplicationContext().getBean("MediatypeEmail"); mt.setStatus(Mediatype.STATUS_ACTIVE); mediatypes.put(new Integer(0), mt); - this.emailReplytoEmail=""; - this.emailReplytoFullname=""; - this.emailCharset="UTF-8"; - this.emailLinefeed=72; + this.emailReplytoEmail = ""; + this.emailReplytoFullname = ""; + this.emailCharset = "UTF-8"; + this.emailLinefeed = 72; - this.worldMailingSend=false; - this.targetGroups=null; - this.showTemplate=false; - this.copyFlag=false; - this.archived=false; - this.needsTarget=false; - this.targetMode=Mailing.TARGET_MODE_OR; + this.worldMailingSend = false; + this.targetGroups = null; + this.showTemplate = false; + this.copyFlag = false; + this.archived = false; + this.needsTarget = false; + this.targetMode = Mailing.TARGET_MODE_OR; } @Override @@ -200,7 +198,6 @@ public class MailingBaseForm extends StrutsFormBase { super.reset(map, request); } - /** * Validate the properties that have been set from this HTTP request, * and return an <code>ActionErrors</code> object that encapsulates any @@ -216,48 +213,44 @@ public class MailingBaseForm extends StrutsFormBase { HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - - Mailing aMailing=null; + Mailing aMailing = null; - if(action==MailingBaseAction.ACTION_SAVE) { - - if(this.mailinglistID==0) { + if(action == MailingBaseAction.ACTION_SAVE) { + if(this.mailinglistID == 0) { errors.add("global", new ActionMessage("error.mailing.noMailinglist")); } - - if(request.getParameter("addtarget.x")!=null) { + if(request.getParameter("addtarget.x") != null) { //this.action=MailingBaseAction.ACTION_VIEW_WITHOUT_LOAD; - if(this.targetID!=0) { - if(this.targetGroups==null) { - this.targetGroups=new HashSet(); + if(this.targetID != 0) { + if(this.targetGroups == null) { + this.targetGroups = new HashSet(); } this.targetGroups.add(new Integer(this.targetID)); } } - Enumeration allNames=request.getParameterNames(); - String aName=null; - int tmpTarget=0; + Enumeration allNames = request.getParameterNames(); + String aName = null; + int tmpTarget = 0; while(allNames.hasMoreElements()) { - aName=(String)allNames.nextElement(); + aName = (String)allNames.nextElement(); if(aName.startsWith("removetarget")) { try { - tmpTarget=Integer.parseInt(aName.substring(12, aName.indexOf('.'))); + tmpTarget = Integer.parseInt(aName.substring(12, aName.indexOf('.'))); } catch (Exception e) { AgnUtils.logger().error("validate: "+e.getMessage()); } } } - if(tmpTarget!=0) { - this.targetID=tmpTarget; - this.action=MailingBaseAction.ACTION_REMOVE_TARGET; + if(tmpTarget != 0) { + this.targetID = tmpTarget; + this.action = MailingBaseAction.ACTION_REMOVE_TARGET; } } - if(action==MailingBaseAction.ACTION_SAVE) { - - if((this.isIsTemplate()==false) && this.isNeedsTarget() && this.targetGroups==null) { + if(action == MailingBaseAction.ACTION_SAVE) { + if((this.isIsTemplate() == false) && this.isNeedsTarget() && this.targetGroups == null) { errors.add("global", new ActionMessage("error.mailing.rulebased_without_target")); } @@ -265,57 +258,42 @@ public class MailingBaseForm extends StrutsFormBase { errors.add("shortname", new ActionMessage("error.nameToShort")); } - // NEW CODE (to be inserted): - if(this.emailReplytoFullname!=null && this.emailReplytoFullname.length()>255) { + if(this.emailReplytoFullname != null && this.emailReplytoFullname.length() > 255) { errors.add("replyFullname", new ActionMessage("error.reply_fullname_too_long")); } - if(getSenderFullname()!=null && getSenderFullname().length()>255) { + if(getSenderFullname() != null && getSenderFullname().length() > 255) { errors.add("senderFullname", new ActionMessage("error.sender_fullname_too_long")); } - if(this.emailReplytoFullname!=null && this.emailReplytoFullname.trim().length()==0) { - this.emailReplytoFullname=getSenderFullname(); + if(this.emailReplytoFullname != null && this.emailReplytoFullname.trim().length() == 0) { + this.emailReplytoFullname = getSenderFullname(); } - - - if(this.targetGroups==null && this.mailingType==Mailing.TYPE_DATEBASED) { + if(this.targetGroups == null && this.mailingType == Mailing.TYPE_DATEBASED) { errors.add("global", new ActionMessage("error.mailing.rulebased_without_target")); } - // NEW CODE (to be inserted): - if(getMediaEmail().getFromEmail().length()<3) + if(getMediaEmail().getFromEmail().length() < 3) errors.add("shortname", new ActionMessage("error.invalid.email")); - if(getEmailSubject().length()<2) { + if(getEmailSubject().length() < 2) { errors.add("subject", new ActionMessage("error.mailing.subject.too_short")); } - -/* - if(this.textTemplate.trim().length()==0) { - errors.add("template", new ActionMessage("error.mailing.no_text_template")); - } - - if(this.htmlTemplate.trim().length()==0) { - errors.add("template", new ActionMessage("error.mailing.no_html_template")); - } -*/ - try { - InternetAddress adr=new InternetAddress(getMediaEmail().getFromEmail()); - if(adr.getAddress().indexOf("@")==-1) { + InternetAddress adr = new InternetAddress(getMediaEmail().getFromEmail()); + if(adr.getAddress().indexOf("@") == -1) { errors.add("sender", new ActionMessage("error.mailing.sender_adress")); } } catch (Exception e) { - if(getMediaEmail().getFromEmail().indexOf("[agn")==-1) { + if(getMediaEmail().getFromEmail().indexOf("[agn") == -1) { errors.add("sender", new ActionMessage("error.mailing.sender_adress")); } } try { - aMailing=(Mailing) getWebApplicationContext().getBean("Mailing"); + aMailing = (Mailing) getWebApplicationContext().getBean("Mailing"); aMailing.setCompanyID(this.getCompanyID(request)); aMailing.findDynTagsInTemplates(new String(this.getEmailSubject()), this.getWebApplicationContext()); aMailing.findDynTagsInTemplates(new String(this.getSenderFullname()), this.getWebApplicationContext()); @@ -325,7 +303,7 @@ public class MailingBaseForm extends StrutsFormBase { } try { - aMailing=(Mailing) getWebApplicationContext().getBean("Mailing"); + aMailing = (Mailing) getWebApplicationContext().getBean("Mailing"); aMailing.setCompanyID(this.getCompanyID(request)); aMailing.personalizeText(new String(this.getEmailSubject()), 0, this.getWebApplicationContext()); aMailing.personalizeText(new String(this.getSenderFullname()), 0, this.getWebApplicationContext()); @@ -333,9 +311,9 @@ public class MailingBaseForm extends StrutsFormBase { errors.add("subject", new ActionMessage("error.personalization_tag")); } - if(getTextTemplate().length()!=0) { + if(getTextTemplate().length() != 0) { // Just a syntax-check, no MailingID required - aMailing=(Mailing) getWebApplicationContext().getBean("Mailing"); + aMailing = (Mailing) getWebApplicationContext().getBean("Mailing"); aMailing.setCompanyID(this.getCompanyID(request)); try { @@ -352,9 +330,9 @@ public class MailingBaseForm extends StrutsFormBase { } - if(getHtmlTemplate().length()!=0) { + if(getHtmlTemplate().length() != 0) { // Just a syntax-check, no MailingID required - aMailing=(Mailing) getWebApplicationContext().getBean("Mailing"); + aMailing = (Mailing) getWebApplicationContext().getBean("Mailing"); aMailing.setCompanyID(this.getCompanyID(request)); try { @@ -370,13 +348,10 @@ public class MailingBaseForm extends StrutsFormBase { errors.add("texttemplate", new ActionMessage("error.template.dyntags")); } } - } - return errors; } - /** * Getter for property templateID. * @@ -1027,5 +1002,4 @@ public class MailingBaseForm extends StrutsFormBase { } return types; } - } src/java/org/agnitas/web/MailingBaseForm.java @@ -26,6 +26,7 @@ import java.net.URLEncoder; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/MailingComponentsForm.java @@ -25,6 +25,7 @@ package org.agnitas.web; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; src/java/org/agnitas/web/MailingContentForm.java @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import org.agnitas.beans.Mailing; import org.agnitas.stat.DeliveryStat; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; src/java/org/agnitas/web/MailingSendForm.java @@ -28,6 +28,7 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; @@ -573,7 +574,8 @@ public class MailingStatForm extends StrutsFormBase { /** * Getter for property statInProgress. - * + * This Method checks, if the statistic is generated at the moment. + * If true, you will have to wait until its ready. * @return Value of property statInProgress. */ public boolean isStatInProgress() { src/java/org/agnitas/web/MailingStatForm.java @@ -54,7 +54,7 @@ import org.apache.struts.action.ActionMessages; * @author Martin Helff, Nicole Serek, Andreas Rehak */ -public final class MailingWizardAction extends StrutsDispatchActionBase { +public class MailingWizardAction extends StrutsDispatchActionBase { public static final String ACTION_START = "start"; @@ -164,34 +164,6 @@ public final class MailingWizardAction extends StrutsDispatchActionBase { Mailing mailing = aForm.getMailing(); if (aForm.getMailing().getMailTemplateID() == 0) { -/* - Mailing newMailing = (Mailing) getBean("Mailing"); - - newMailing.init(getCompanyID(req), getWebApplicationContext()); - newMailing.setShortname(mailing.getShortname()); - newMailing.setDescription(mailing.getDescription()); - newMailing.setIsTemplate(false); - newMailing.setCompanyID(aForm.getCompanyID(req)); - - Map mediatypes = newMailing.getMediatypes(); - - Mediatype type = (Mediatype) mediatypes.get(0); - if (type != null) { - type.setStatus(Mediatype.STATUS_ACTIVE); - } else { - // should not happen - MediatypeEmail paramEmail = newMailing - .getEmailParam(getWebApplicationContext()); - - paramEmail.setCharset("iso-8859-1"); - paramEmail.setMailFormat(1); - paramEmail.setLinefeed(0); - paramEmail.setPriority(1); - paramEmail.setStatus(Mediatype.STATUS_ACTIVE); - mediatypes.put(0, paramEmail); - } - aForm.setMailing(newMailing); -*/ mailing.setIsTemplate(false); Map mediatypes = mailing.getMediatypes(); @@ -212,9 +184,7 @@ public final class MailingWizardAction extends StrutsDispatchActionBase { mediatypes.put(0, paramEmail); } } else { - Mailing template = mDao.getMailing( - aForm.getMailing().getMailTemplateID(), - getCompanyID(req)); + Mailing template = mDao.getMailing(aForm.getMailing().getMailTemplateID(), getCompanyID(req)); if (template != null) { Mailing newMailing = (Mailing) template @@ -229,7 +199,8 @@ public final class MailingWizardAction extends StrutsDispatchActionBase { newMailing.setMediatypes(template.getMediatypes()); newMailing.setMailTemplateID(template.getId()); newMailing.setCompanyID(aForm.getCompanyID(req)); - newMailing.setArchived( template.getArchived() ); + newMailing.setMailinglistID(template.getMailinglistID()); + newMailing.setArchived(template.getArchived()); Map mediatypes = newMailing.getMediatypes(); src/java/org/agnitas/web/MailingWizardAction.java @@ -31,6 +31,7 @@ import org.agnitas.beans.TrackableLink; import org.agnitas.beans.DynamicTag; import org.agnitas.beans.DynamicTagContent; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; @@ -65,8 +66,8 @@ public class MailingWizardForm extends StrutsFormBase { HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - if( mailing != null && ( MailingWizardAction.ACTION_TARGET.equalsIgnoreCase(action) || MailingWizardAction.ACTION_FINISH.equalsIgnoreCase(action)) ) { - if( (mailing.getTargetGroups()==null || mailing.getTargetGroups().isEmpty() ) && getTargetID()== 0 && mailing.getMailingType()==Mailing.TYPE_DATEBASED ) { + if(mailing != null && (MailingWizardAction.ACTION_TARGET.equalsIgnoreCase(action) || MailingWizardAction.ACTION_FINISH.equalsIgnoreCase(action))) { + if((mailing.getTargetGroups()==null || mailing.getTargetGroups().isEmpty() ) && getTargetID()== 0 && mailing.getMailingType()==Mailing.TYPE_DATEBASED) { errors.add("global", new ActionMessage("error.mailing.rulebased_without_target")); } } src/java/org/agnitas/web/MailingWizardForm.java @@ -42,6 +42,7 @@ import org.agnitas.dao.TargetDao; import org.agnitas.target.Target; import org.agnitas.dao.BindingEntryDao; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaProperty; @@ -147,7 +148,7 @@ public final class MailinglistAction extends StrutsActionBase { if(req.getParameter("save.x")!=null) { if(saveMailinglist(aForm, req)) { - req.setAttribute("mailinglistList", getMailinglist(req)); + //req.setAttribute("mailinglistList", getMailinglist(req)); //list(aForm, req); destination=mapping.findForward("list"); } else { src/java/org/agnitas/web/MailinglistAction.java @@ -26,6 +26,7 @@ import java.util.Locale; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/MailinglistForm.java @@ -27,6 +27,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/MailloopForm.java @@ -90,13 +90,24 @@ public class OnePixelCount extends HttpServlet { AgnUtils.logger().warn("uid invalid: "+param); return; } - if(pixelDao.writePixel((int) uid.getCompanyID(), (int) uid.getCustomerID(), (int) uid.getMailingID(), req.getRemoteAddr())) { - AgnUtils.logger().info("Onepixel: cust: "+uid.getCustomerID()+" mi: "+uid.getMailingID()+" ci: "+uid.getCompanyID()); - } + persistLog(req, pixelDao, uid); + } catch (Exception e) { AgnUtils.logger().error(e.getMessage()); AgnUtils.logger().error(AgnUtils.getStackTrace(e)); return; } } + + protected void persistLog(HttpServletRequest req, OnepixelDao pixelDao, + UID uid) { + if(writePixelLogToDB(req, pixelDao, uid)) { + AgnUtils.logger().info("Onepixel: cust: "+uid.getCustomerID()+" mi: "+uid.getMailingID()+" ci: "+uid.getCompanyID()); + } + } + + protected boolean writePixelLogToDB(HttpServletRequest req, + OnepixelDao pixelDao, UID uid) { + return pixelDao.writePixel((int) uid.getCompanyID(), (int) uid.getCustomerID(), (int) uid.getMailingID(), req.getRemoteAddr()); + } } src/java/org/agnitas/web/OnePixelCount.java @@ -28,6 +28,7 @@ import java.net.URLEncoder; import javax.servlet.http.HttpServletRequest; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/ProfileFieldForm.java @@ -23,34 +23,31 @@ package org.agnitas.web; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.sql.DataSource; import org.agnitas.beans.BindingEntry; import org.agnitas.beans.Recipient; import org.agnitas.dao.RecipientDao; +import org.agnitas.service.RecipientQueryBuilder; +import org.agnitas.service.RecipientQueryWorker; import org.agnitas.target.TargetRepresentation; import org.agnitas.util.AgnUtils; -import org.agnitas.util.RecipientQueryBuilder; -import org.apache.commons.beanutils.BasicDynaClass; -import org.apache.commons.beanutils.DynaBean; -import org.apache.commons.beanutils.DynaProperty; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.displaytag.pagination.PaginatedList; import org.springframework.context.ApplicationContext; -import org.springframework.jdbc.core.JdbcTemplate; /** * Handles all actions on profile fields. @@ -81,23 +78,24 @@ public class RecipientAction extends StrutsActionBase { HttpServletResponse res) throws IOException, ServletException { + // Validate the request parameters specified by the user - RecipientForm aForm=null; + RecipientForm aForm = null; ActionMessages errors = new ActionErrors(); - ActionForward destination=null; - ApplicationContext aContext=this.getWebApplicationContext(); - + ActionForward destination = null; + ApplicationContext aContext = this.getWebApplicationContext(); + if(!this.checkLogon(req)) { return mapping.findForward("logon"); } - if(form!=null) { - aForm=(RecipientForm)form; + if(form != null) { + aForm = (RecipientForm)form; } else { - aForm=new RecipientForm(); + aForm = new RecipientForm(); } - if(req.getParameter("delete.x")!=null) { + if(req.getParameter("delete.x") != null) { aForm.setAction(ACTION_CONFIRM_DELETE); } @@ -105,8 +103,8 @@ public class RecipientAction extends StrutsActionBase { switch(aForm.getAction()) { case ACTION_LIST: if(allowed("recipient.show", req)) { - TargetRepresentation targetRep=aForm.getTarget(); - destination=mapping.findForward("list"); + TargetRepresentation targetRep = aForm.getTarget(); + destination = mapping.findForward("list"); if(!targetRep.checkBracketBalance()) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.target.bracketbalance")); } @@ -117,14 +115,14 @@ public class RecipientAction extends StrutsActionBase { case ACTION_VIEW: if(allowed("recipient.show", req)) { - if(req.getParameter("recipientID")!=null) { + if(req.getParameter("recipientID") != null) { loadRecipient(aContext, aForm, req); aForm.setAction(RecipientAction.ACTION_SAVE); } else { loadDefaults(aContext, aForm, req); aForm.setAction(RecipientAction.ACTION_NEW); } - destination=mapping.findForward("view"); + destination = mapping.findForward("view"); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } @@ -132,10 +130,10 @@ public class RecipientAction extends StrutsActionBase { case ACTION_SAVE: if(allowed("recipient.change", req)) { - if(req.getParameter("save.x")!=null) { + if(req.getParameter("save.x") != null) { saveRecipient(aContext, aForm, req); aForm.setAction(RecipientAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); @@ -144,15 +142,15 @@ public class RecipientAction extends StrutsActionBase { case ACTION_NEW: if(allowed("recipient.new", req)) { - if(req.getParameter("save.x")!=null) { + if(req.getParameter("save.x") != null) { aForm.setRecipientID(0); if(saveRecipient(aContext, aForm, req)){ aForm.setAction(RecipientAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } else { errors.add("NewRecipient", new ActionMessage("error.subscriber.insert_in_db_error")); aForm.setAction(RecipientAction.ACTION_VIEW); - destination=mapping.findForward("view"); + destination = mapping.findForward("view"); } } } else { @@ -163,7 +161,7 @@ public class RecipientAction extends StrutsActionBase { case ACTION_CONFIRM_DELETE: if(allowed("recipient.delete", req)) { loadRecipient(aContext, aForm, req); - destination=mapping.findForward("delete"); + destination = mapping.findForward("delete"); } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); } @@ -171,10 +169,10 @@ public class RecipientAction extends StrutsActionBase { case ACTION_DELETE: if(allowed("recipient.delete", req)) { - if(req.getParameter("kill.x")!=null) { + if(req.getParameter("kill.x") != null) { deleteRecipient(aContext, aForm, req); aForm.setAction(RecipientAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } } else { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.permissionDenied")); @@ -183,32 +181,49 @@ public class RecipientAction extends StrutsActionBase { default: aForm.setAction(RecipientAction.ACTION_LIST); - destination=mapping.findForward("list"); + destination = mapping.findForward("list"); } } catch (Exception e) { - AgnUtils.logger().error("execute: "+e+"\n"+AgnUtils.getStackTrace(e)); + AgnUtils.logger().error("execute: " + e + "\n" + AgnUtils.getStackTrace(e)); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); } if( "list".equals(destination.getName())) { try { - req.setAttribute("recipientList", getRecipientList(req, getWebApplicationContext(),aForm )); - setNumberOfRows(req, aForm); + setNumberOfRows(req, aForm); + destination = mapping.findForward("loading"); + + if( aForm.getCurrentFuture() == null ) { + aForm.setCurrentFuture(getRecipientListFuture(req , aContext, aForm)); + } + + if ( aForm.getCurrentFuture() != null && aForm.getCurrentFuture().isDone()) { + req.setAttribute("recipientList", aForm.getCurrentFuture().get()); + destination = mapping.findForward("list"); + aForm.setAll(((PaginatedList)aForm.getCurrentFuture().get()).getFullListSize()); + aForm.setCurrentFuture(null); + aForm.setRefreshMillis(RecipientForm.DEFAULT_REFRESH_MILLIS); + } + else { + if( aForm.getRefreshMillis() < 1000 ) { // raise the refresh time + aForm.setRefreshMillis( aForm.getRefreshMillis() + 50 ); + } + aForm.setError(false); + } + } catch (Exception e) { - AgnUtils.logger().error("recipientList: "+e+"\n"+AgnUtils.getStackTrace(e)); + AgnUtils.logger().error("recipientList: " + e + "\n" + AgnUtils.getStackTrace(e)); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.exception")); + aForm.setError(true); // do not refresh when an error has been occurred } } - - // Report any errors we have discovered back to the original form if (!errors.isEmpty()) { saveErrors(req, errors); // return new ActionForward(mapping.getForward()); } - return destination; } @@ -216,18 +231,17 @@ public class RecipientAction extends StrutsActionBase { * Loads recipient. */ protected void loadRecipient(ApplicationContext aContext, RecipientForm aForm, HttpServletRequest req) { - Recipient cust=(Recipient) aContext.getBean("Recipient"); + Recipient cust = (Recipient) aContext.getBean("Recipient"); RecipientDao dao = (RecipientDao) aContext.getBean("RecipientDao"); - Map data=null; - Iterator i=null; + Map data = null; + Iterator i = null; cust.setCompanyID(this.getCompanyID(req)); cust.setCustomerID(aForm.getRecipientID()); - data=dao.getCustomerDataFromDb(cust.getCompanyID(), cust.getCustomerID()); - i=data.keySet().iterator(); + data = dao.getCustomerDataFromDb(cust.getCompanyID(), cust.getCustomerID()); + i = data.keySet().iterator(); while(i.hasNext()) { String key=(String) i.next(); - if(key.equals("gender")) { try { aForm.setGender(Integer.parseInt((String) data.get("gender"))); @@ -258,16 +272,15 @@ public class RecipientAction extends StrutsActionBase { * Loads recipient. */ protected void loadDefaults(ApplicationContext aContext, RecipientForm aForm, HttpServletRequest req) { - Map tmp=null; + Map tmp = null; try { Map tmp2 = org.agnitas.taglib.ShowColumnInfoTag.getColumnInfo(aContext, this.getCompanyID(req), "%"); - Iterator it=tmp2.values().iterator(); + Iterator it = tmp2.values().iterator(); while(it.hasNext()) { - tmp=(Map)it.next(); - String column=(String) tmp.get("column"); - + tmp = (Map) it.next(); + String column = (String) tmp.get("column"); aForm.setColumn(column, tmp.get("default")); } } catch (Exception e) { } @@ -316,7 +329,7 @@ public class RecipientAction extends StrutsActionBase { Map data = null; Map column = null; Iterator i = null; - int companyID=aForm.getCompanyID(req); + int companyID = aForm.getCompanyID(req); cust.setCompanyID(this.getCompanyID(req)); if(aForm.getRecipientID() != 0) { @@ -328,7 +341,6 @@ public class RecipientAction extends StrutsActionBase { while(i.hasNext()) { String key = (String) i.next(); String value = (String) column.get(key); - data.put(key, value); } data.put("gender", new Integer(aForm.getGender()).toString()); @@ -340,9 +352,9 @@ public class RecipientAction extends StrutsActionBase { cust.setCustParameters(data); dao.updateInDB(cust); } else { - if(dao.mayAdd(companyID, 1) == false) { - return false; - } + if(dao.mayAdd(companyID, 1) == false) { + return false; + } data = dao.getCustomerDataFromDb(companyID, aForm.getRecipientID()); column = aForm.getColumnMap(); @@ -374,50 +386,49 @@ public class RecipientAction extends StrutsActionBase { * Updates customer bindings. */ public boolean updateCustBindingsFromAdminReq(Recipient cust, ApplicationContext aContext, HttpServletRequest req) { - - String aKey=null; - String newKey=null; - String aParam=null; + String aKey = null; + String newKey = null; + String aParam = null; int aMailinglistID; int oldSubStatus, newSubStatus; - String tmpUT=null; - String tmpOrgUT=null; - Iterator aEnum=req.getParameterMap().keySet().iterator(); - BindingEntry aEntry=(BindingEntry) aContext.getBean("BindingEntry"); + String tmpUT = null; + String tmpOrgUT = null; + Iterator aEnum = req.getParameterMap().keySet().iterator(); + BindingEntry aEntry = (BindingEntry) aContext.getBean("BindingEntry"); while(aEnum.hasNext()) { - aKey=(String)aEnum.next(); + aKey = (String)aEnum.next(); if(aKey.startsWith("AGN_0_ORG_MT")) { oldSubStatus = Integer.parseInt((String) req.getParameter(aKey)); - aMailinglistID=Integer.parseInt(aKey.substring(12)); - newKey=new String("AGN_0_MTYPE" + aMailinglistID); - aParam=(String) req.getParameter(newKey); - if(aParam!=null) { - newSubStatus=1; + aMailinglistID = Integer.parseInt(aKey.substring(12)); + newKey = new String("AGN_0_MTYPE" + aMailinglistID); + aParam = (String) req.getParameter(newKey); + if(aParam != null) { + newSubStatus = 1; } else { - newSubStatus=0; + newSubStatus = 0; } - newKey=new String("AGN_0_MLUT" + aMailinglistID); - tmpUT=(String) req.getParameter(newKey); - newKey=new String("AGN_0_ORG_UT" + aMailinglistID); - tmpOrgUT=(String) req.getParameter(newKey); + newKey = new String("AGN_0_MLUT" + aMailinglistID); + tmpUT = (String) req.getParameter(newKey); + newKey = new String("AGN_0_ORG_UT" + aMailinglistID); + tmpOrgUT = (String) req.getParameter(newKey); - if((newSubStatus!=oldSubStatus) || (tmpUT.compareTo(tmpOrgUT)!=0)) { + if((newSubStatus != oldSubStatus) || (tmpUT.compareTo(tmpOrgUT) != 0)) { aEntry.setMediaType(0); aEntry.setCustomerID(cust.getCustomerID()); aEntry.setMailinglistID(aMailinglistID); aEntry.setUserType(tmpUT); - if(newSubStatus==0) { // Opt-Out + if(newSubStatus == 0) { // Opt-Out aEntry.setUserStatus(BindingEntry.USER_STATUS_ADMINOUT); // aEntry.setUserRemark("Opt-Out by ADMIN"); } else { // Opt-In aEntry.setUserStatus(BindingEntry.USER_STATUS_ACTIVE); // aEntry.setUserRemark("Opt-In by ADMIN"); } - if(aEntry.updateBindingInDB(cust.getCompanyID())==false) { + if(aEntry.updateBindingInDB(cust.getCompanyID()) == false) { // aEntry.setUserType(BindingEntry.USER_TYPE_WORLD); // Bei Neu-Eintrag durch User entsprechenden Typ setzen - if(newSubStatus==1) { + if(newSubStatus == 1) { aEntry.insertNewBindingInDB(cust.getCompanyID()); } } @@ -431,7 +442,7 @@ public class RecipientAction extends StrutsActionBase { * Removes recipient. */ protected void deleteRecipient(ApplicationContext aContext, RecipientForm aForm, HttpServletRequest req) { - Recipient cust=(Recipient) aContext.getBean("Recipient"); + Recipient cust = (Recipient) aContext.getBean("Recipient"); RecipientDao dao = (RecipientDao) aContext.getBean("RecipientDao"); cust.setCompanyID(this.getCompanyID(req)); @@ -440,47 +451,70 @@ public class RecipientAction extends StrutsActionBase { } /** + * * Get a list of recipients according to your filters - * @throws InstantiationException - * @throws IllegalAccessException + * @param request + * @param aContext + * @param aForm + * @return + * @throws NumberFormatException + * @throws IllegalAccessException + * @throws InstantiationException + * @throws ExecutionException + * @throws InterruptedException */ - public List<DynaBean> getRecipientList(HttpServletRequest request, ApplicationContext aContext, RecipientForm aForm) throws IllegalAccessException, InstantiationException { - String sqlStatement = RecipientQueryBuilder.getSQLStatement(request, aContext, aForm); - JdbcTemplate aTemplate=new JdbcTemplate( (DataSource)aContext.getBean("dataSource")); - List<Map> tmpList = aTemplate.queryForList(sqlStatement); - DynaProperty[] properties = new DynaProperty[] { - new DynaProperty("customerid", Integer.class), - new DynaProperty("gender", Integer.class), - new DynaProperty("firstname", String.class), - new DynaProperty("lastname", String.class), - new DynaProperty("email",String.class) - }; - - if( AgnUtils.isOracleDB()) { - properties = new DynaProperty[] { - new DynaProperty("customerid", BigDecimal.class), - new DynaProperty("gender",BigDecimal.class), - new DynaProperty("firstname", String.class), - new DynaProperty("lastname", String.class), - new DynaProperty("email",String.class) - }; - } - - BasicDynaClass dynaClass = new BasicDynaClass("recipient", null, properties); - List<DynaBean> result = new ArrayList<DynaBean>(); - for(Map row:tmpList) { - DynaBean newBean = dynaClass.newInstance(); - newBean.set("customerid", row.get("CUSTOMER_ID")); - newBean.set("gender", row.get("GENDER")); - newBean.set("firstname", row.get("FIRSTNAME")); - newBean.set("lastname", row.get("LASTNAME")); - newBean.set("email",row.get("EMAIL")); - result.add(newBean); - } - return result; - - - } + + public Future getRecipientListFuture( HttpServletRequest request, ApplicationContext aContext, RecipientForm aForm ) throws NumberFormatException, IllegalAccessException, InstantiationException, InterruptedException, ExecutionException { + + RecipientDao recipientDao = (RecipientDao) aContext.getBean("RecipientDao"); + String sqlStatement = RecipientQueryBuilder.getSQLStatement(request, aContext, aForm ); + String sort = getSort(request, aForm); + String direction = request.getParameter("dir"); + + int rownums = aForm.getNumberofRows(); + if( direction == null ) { + direction = aForm.getOrder(); + } else { + aForm.setOrder(direction); + } + + String pageStr = request.getParameter("page"); + if ( pageStr == null || "".equals(pageStr.trim()) ) { + if ( aForm.getPage() == null || "".equals(aForm.getPage().trim())) { + aForm.setPage("1"); + } + pageStr = aForm.getPage(); + } + else { + aForm.setPage(pageStr); + } + + if( aForm.isNumberOfRowsChanged() ) { + aForm.setPage("1"); + aForm.setNumberOfRowsChanged(false); + pageStr = "1"; + } + + ExecutorService service = (ExecutorService) aContext.getBean("workerExecutorService"); + Future future = service.submit(new RecipientQueryWorker(recipientDao,sqlStatement, sort, direction, Integer.parseInt(pageStr), rownums, aForm.getAll() )); + + return future; + + } + + + protected String getSort(HttpServletRequest request, RecipientForm aForm) { + String sort = request.getParameter("sort"); + if( sort == null ) { + sort = aForm.getSort(); + } else { + aForm.setSort(sort); + } + return sort; + } + + + } src/java/org/agnitas/web/RecipientAction.java @@ -25,6 +25,7 @@ package org.agnitas.web; import java.util.HashMap; import java.util.Map; import java.util.List; +import java.util.concurrent.Future; import javax.servlet.http.HttpServletRequest; @@ -34,6 +35,7 @@ import org.agnitas.target.TargetRepresentation; import org.agnitas.target.impl.TargetNodeDate; import org.agnitas.target.impl.TargetNodeNumeric; import org.agnitas.target.impl.TargetNodeString; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.commons.collections.map.CaseInsensitiveMap; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMessage; @@ -42,24 +44,25 @@ import org.apache.struts.action.ActionMapping; public class RecipientForm extends StrutsFormBase { private static final long serialVersionUID = 3876045401212665105L; private int action; - private int recipientID=0; + private int recipientID = 0; private int gender; private int mailtype; private int user_status; private int listID; - private String title=new String(""); - private String firstname=new String(""); - private String lastname=new String(""); - private String email=new String(""); - private String user_type=new String("E"); - private Map column=new CaseInsensitiveMap(); - private TargetRepresentation target=null; - protected Map mailing=new HashMap(); + private int all; + + private String title = new String(""); + private String firstname = new String(""); + private String lastname = new String(""); + private String email = new String(""); + private String user_type = new String("E"); + + private Map column = new CaseInsensitiveMap(); + private TargetRepresentation target =null; + protected Map mailing = new HashMap(); private int targetID; - - /** * Validate the properties that have been set from this HTTP request, * and return an <code>ActionErrors</code> object that encapsulates any @@ -74,85 +77,92 @@ public class RecipientForm extends StrutsFormBase { public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - TargetNode aNode=null; - int index=1; - String name=null; - String type=null; - String colAndType=null; - - if(request.getParameter("trgt_clear")!=null) { - this.target=null; + TargetNode aNode = null; + int index = 1; + String name = null; + String type = null; + String colAndType = null; + + if(request.getParameter("trgt_clear") != null) { + this.target = null; setRecipientID(0); + if( getCurrentFuture() == null ){ // reset filter fields only if there is no future running + setUser_status(0); + setUser_type("E"); + setTargetID(0); + setListID(0); + } } + if(this.target == null) { - this.target=(TargetRepresentation) getWebApplicationContext().getBean("TargetRepresentation"); + this.target = (TargetRepresentation) getWebApplicationContext().getBean("TargetRepresentation"); if(action == RecipientAction.ACTION_VIEW && getRecipientID() == 0) { - this.column=new CaseInsensitiveMap(); - gender=0; - mailtype=1; - user_status=0; - listID=0; - title=new String(""); - firstname=new String(""); - lastname=new String(""); - email=new String(""); + this.column = new CaseInsensitiveMap(); + gender = 0; + mailtype = 1; + user_status = 0; + listID = 0; + title = new String(""); + firstname = new String(""); + lastname = new String(""); + email = new String(""); } } - while(index!=-1) { - name=new String("trgt_column"+index); - if((colAndType=request.getParameter(name))!=null) { - type=colAndType.substring(colAndType.indexOf('#')+1); - if(index>0 && request.getParameter("trgt_remove"+index+".x")!=null) { + while(index != -1) { + name = new String("trgt_column"+index); + if((colAndType = request.getParameter(name))!=null) { + type = colAndType.substring(colAndType.indexOf('#')+1); + if(index>0 && request.getParameter("trgt_remove"+index+".x") != null) { target.deleteNode(index-1); - } else if(index==0 && request.getParameter("trgt_add.x")!=null) { + } else if(index == 0 && request.getParameter("trgt_add.x") != null) { if(type.equalsIgnoreCase("VARCHAR") || type.equalsIgnoreCase("CHAR")) { - aNode=createStringNode(request, index, errors); + aNode = createStringNode(request, index, errors); } if(type.equalsIgnoreCase("INTEGER") || type.equalsIgnoreCase("DOUBLE")) { - aNode=createNumericNode(request, index, errors); + aNode = createNumericNode(request, index, errors); } if(type.equalsIgnoreCase("DATE")) { - aNode=createDateNode(request, index, errors); + aNode = createDateNode(request, index, errors); } target.addNode(aNode); } index++; - if(index==1) { - index=-1; + if(index == 1) { + index = -1; } } else { - if(index>0) { - index=0; + if(index > 0) { + index = 0; } else { - index=-1; + index = -1; } } } - if(request.getParameter("trgt_save.x")!=null) { + if(request.getParameter("trgt_save.x") != null) { System.err.println("In save"); if(!this.target.checkBracketBalance()) { errors.add("brackets", new ActionMessage("error.target.bracketbalance")); } - List list=this.target.getAllNodes(); + List list = this.target.getAllNodes(); if(list == null || list.isEmpty()) { errors.add("norule", new ActionMessage("error.target.norule")); } else { - for(index=1; index <= list.size(); index++) { - name=new String("trgt_column"+index); - if((colAndType=request.getParameter(name))!=null) { - type=colAndType.substring(colAndType.indexOf('#')+1); + for(index = 1; index <= list.size(); index++) { + name = new String("trgt_column"+index); + if((colAndType = request.getParameter(name)) != null) { + type = colAndType.substring(colAndType.indexOf('#') + 1); if(type.equalsIgnoreCase("VARCHAR") || type.equalsIgnoreCase("CHAR")) { - aNode=createStringNode(request, index, errors); + aNode = createStringNode(request, index, errors); } if(type.equalsIgnoreCase("INTEGER") || type.equalsIgnoreCase("DOUBLE")) { - aNode=createNumericNode(request, index, errors); + aNode = createNumericNode(request, index, errors); } if(type.equalsIgnoreCase("DATE")) { - aNode=createDateNode(request, index, errors); + aNode = createDateNode(request, index, errors); } list.set(index-1, aNode); } @@ -166,7 +176,7 @@ System.err.println("In save"); * Creates nodes (String) */ TargetNode createStringNode(HttpServletRequest req, int index, ActionErrors errors) { - TargetNodeString aNode=(TargetNodeString) getWebApplicationContext().getBean("TargetNodeString"); + TargetNodeString aNode = (TargetNodeString) getWebApplicationContext().getBean("TargetNodeString"); aNode.setChainOperator(Integer.parseInt(req.getParameter("trgt_chainop"+index))); aNode.setOpenBracketBefore(req.getParameter("trgt_bracketopen"+index).equals("1")); @@ -183,7 +193,7 @@ System.err.println("In save"); * Creates nodes (numeric) */ TargetNode createNumericNode(HttpServletRequest req, int index, ActionErrors errors) { - TargetNodeNumeric aNode=(TargetNodeNumeric) getWebApplicationContext().getBean("TargetNodeNumeric"); + TargetNodeNumeric aNode = (TargetNodeNumeric) getWebApplicationContext().getBean("TargetNodeNumeric"); aNode.setChainOperator(Integer.parseInt(req.getParameter("trgt_chainop"+index))); aNode.setOpenBracketBefore(req.getParameter("trgt_bracketopen"+index).equals("1")); @@ -192,7 +202,7 @@ System.err.println("In save"); aNode.setPrimaryOperator(Integer.parseInt(req.getParameter("trgt_operator"+index))); aNode.setPrimaryValue(req.getParameter("trgt_value"+index)); aNode.setCloseBracketAfter(req.getParameter("trgt_bracketclose"+index).equals("1")); - if(aNode.getPrimaryOperator()==TargetNode.OPERATOR_MOD) { + if(aNode.getPrimaryOperator() == TargetNode.OPERATOR_MOD) { try { aNode.setSecondaryOperator(Integer.parseInt(req.getParameter("trgt_sec_operator"+index))); } catch (Exception e) { @@ -204,7 +214,6 @@ System.err.println("In save"); aNode.setSecondaryValue(0); } } - return aNode; } @@ -532,4 +541,12 @@ System.err.println("In save"); public void setTargetID(int targetID) { this.targetID = targetID; } + + public int getAll() { + return all; + } + + public void setAll(int all) { + this.all = all; + } } src/java/org/agnitas/web/RecipientForm.java @@ -197,9 +197,6 @@ public final class RecipientStatAction extends StrutsActionBase { break; case BindingEntry.USER_STATUS_OPTOUT: - numOptOut += rset.getInt(1); - break; - case BindingEntry.USER_STATUS_ADMINOUT: numOptOut += rset.getInt(1); break; src/java/org/agnitas/web/RecipientStatAction.java @@ -32,6 +32,7 @@ import javax.sql.DataSource; import org.agnitas.beans.Admin; import org.agnitas.util.AgnUtils; +import org.agnitas.web.forms.StrutsFormBase; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.springframework.orm.hibernate3.HibernateTemplate; src/java/org/agnitas/web/StrutsActionBase.java @@ -35,7 +35,6 @@ import org.agnitas.dao.RecipientDao; import org.agnitas.target.Target; import org.agnitas.util.AgnUtils; import org.agnitas.util.SafeString; -import org.apache.commons.beanutils.DynaBean; import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -46,7 +45,7 @@ import org.apache.struts.action.ActionMessages; /** * Implementation of <strong>Action</strong> that handles Targets * - * @author Martin Helff + * @author Martin Helff, Nicole Serek */ public class TargetAction extends StrutsActionBase { @@ -58,7 +57,9 @@ public class TargetAction extends StrutsActionBase { public static final int ACTION_DELETE_RECIPIENTS_CONFIRM = ACTION_LAST + 3; public static final int ACTION_DELETE_RECIPIENTS = ACTION_LAST + 4; - + + public static final int ACTION_BACK_TO_MAILINGWIZARD = ACTION_LAST + 5; + // --------------------------------------------------------- Public Methods /** @@ -179,6 +180,10 @@ public class TargetAction extends StrutsActionBase { destination = mapping.findForward("list"); break; + case ACTION_BACK_TO_MAILINGWIZARD: + destination = mapping.findForward("back_mailingwizard"); + break; + default: destination = mapping.findForward("list"); break; src/java/org/agnitas/web/TargetAction.java @@ -32,6 +32,7 @@ import org.agnitas.target.TargetRepresentation; import org.agnitas.target.impl.TargetNodeDate; import org.agnitas.target.impl.TargetNodeNumeric; import org.agnitas.target.impl.TargetNodeString; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; src/java/org/agnitas/web/TargetForm.java @@ -44,11 +44,18 @@ public class TextFileDownload extends HttpServlet { throws IOException, ServletException { response.setContentType("text/plain"); - Hashtable map = (Hashtable)(req.getSession().getAttribute("map")); - String outfile = (String)map.get(req.getParameter("key")); - - response.setHeader("Content-Disposition", "attachment; filename=\"" + req.getParameter("key") + ".csv\";"); + Hashtable map; + map = (Hashtable)(req.getSession().getAttribute("map")); + + String outFileName = ""; // contains the Filename, build from the timestamp + String outFile = ""; // contains the actual data. + + outFileName = (String) req.getParameter("key"); + outFile = (String)map.get(req.getParameter("key")); // get the key from the Hashmap. + + // build filepath (timestamp + .csv) and return it. + response.setHeader("Content-Disposition", "attachment; filename=\"" + outFileName + ".csv\";"); ServletOutputStream ostream = response.getOutputStream(); - ostream.print(outfile); + ostream.print(outFile); } } src/java/org/agnitas/web/TextFileDownload.java @@ -27,6 +27,7 @@ import java.util.Collection; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; src/java/org/agnitas/web/TrackableLinkForm.java @@ -25,6 +25,7 @@ package org.agnitas.web; import javax.servlet.http.HttpServletRequest; +import org.agnitas.web.forms.StrutsFormBase; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; src/java/org/agnitas/web/UserFormEditForm.java @@ -97,8 +97,14 @@ public class rdir extends HttpServlet { return; } - // send redirect - res.sendRedirect(fullUrl); + if(AgnUtils.getDefaultValue("redirection.status") == null || AgnUtils.getDefaultIntValue("redirection.status") == 302) { + res.sendRedirect(fullUrl); + //res.sendRedirect(aLink.getFullUrl()); + } else { + res.setStatus(AgnUtils.getDefaultIntValue("redirection.status")); + res.setHeader("Location", fullUrl); + res.flushBuffer(); + } // log click in db if(aLink.logClickInDB((int)uid.getCustomerID(), req.getRemoteAddr(), con)==false) { src/java/org/agnitas/web/rdir.java @@ -36,6 +36,7 @@ import org.agnitas.beans.*; import org.agnitas.dao.*; import org.agnitas.util.*; import org.apache.axis.MessageContext; +import org.apache.commons.collections.map.CaseInsensitiveMap; import org.hibernate.*; import org.springframework.context.ApplicationContext; import org.springframework.orm.hibernate3.*; @@ -407,7 +408,7 @@ public class EmmWebservice extends WebServiceBase implements EmmWebService_Port */ public int addSubscriber(java.lang.String username, java.lang.String password, boolean doubleCheck, java.lang.String keyColumn, boolean overwrite, StringArrayType paramNames, StringArrayType paramValues) { ApplicationContext con = getWebApplicationContext(); - Hashtable allParams = new Hashtable(); + CaseInsensitiveMap allParams=new CaseInsensitiveMap(); int returnValue = 0; int tmpCustID = 0; MessageContext msct = MessageContext.getCurrentContext(); @@ -512,12 +513,14 @@ public class EmmWebservice extends WebServiceBase implements EmmWebService_Port * @return CustomerID of the first matching record */ public int findSubscriber(java.lang.String username, java.lang.String password, java.lang.String keyColumn, java.lang.String value) { - ApplicationContext con = getWebApplicationContext(); + System.out.println("soap prob find subscriber:..."); + ApplicationContext con = getWebApplicationContext(); int returnValue = 0; MessageContext msct = MessageContext.getCurrentContext(); if(!authenticateUser(msct, username, password, 1)) { - return returnValue; + System.out.println("soap prob find subscriber: wrong credentials " +username + " " +password); + return returnValue; } try { @@ -529,8 +532,7 @@ public class EmmWebservice extends WebServiceBase implements EmmWebService_Port System.out.println("soap prob find subscriber: "+e); returnValue = 0; } - - + return returnValue; } src/java/org/agnitas/webservice/EmmWebservice.java @@ -254,39 +254,9 @@ <bean id="SendMailing" class="org.agnitas.actions.ops.SendMailing" singleton="false"/> <!-- Scheduler for Date-Based Mailings --> - <bean id="Ruler" class="org.agnitas.backend.RulerImpl"> + + + <bean id="workerExecutorService" class="java.util.concurrent.ScheduledThreadPoolExecutor" > + <constructor-arg value="10" type="int"/> </bean> - - <bean id="dateBasedMailingsJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> - <property name="targetObject" ref="Ruler"/> - <property name="targetMethod" value="kickOffSimple"/> - <property name="concurrent" value="false"/> - </bean> - - <bean id="delayedMailingsJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> - <property name="targetObject" ref="Ruler"/> - <property name="targetMethod" value="kickOffDelayed"/> - <property name="concurrent" value="false"/> - </bean> - - - <bean id="dateBasedMailingsCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> - <property name="jobDetail" ref="dateBasedMailingsJob"/> - <property name="cronExpression" value="${dateBasedMailings.cronExpression}"/> - </bean> - - <bean id="delayedMailingsCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> - <property name="jobDetail" ref="delayedMailingsJob"/> - <property name="cronExpression" value="${delayedMailings.cronExpression}"/> - </bean> - - <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> - <property name="triggers"> - <list> - <ref bean="dateBasedMailingsCronTrigger"/> - <ref bean="delayedMailingsCronTrigger"/> - </list> - </property> - </bean> - </beans> src/jsp/WEB-INF/applicationContext.xml @@ -4,6 +4,7 @@ paging.banner.placement=bottom export.types=csv excel xml pdf export.decorated=false paging.banner.placement=both +paging.banner.onepage=<span class="pagelinks">&nbsp;</span> paging.banner.full=<div class="pagelinks" align="center"><a href={1}><img src="images/displaytag/first.gif" border="0"></a><a href={2}><img src="images/displaytag/prev.gif" border="0"></a>{0}<a href={3}><img src="images/displaytag/next.gif" border="0"></a><a href={4}><img src="images/displaytag/last.gif" border="0"></a></div> paging.banner.first=<div class="pagelinks" align="center"><a href={1}><img src="images/displaytag/first.gif" border="0"></a><a href={2}><img src="images/displaytag/prev.gif"border="0"></a> {0} <a href={3}><img src="images/displaytag/next.gif" border="0"></a><a href={4}><img src="images/displaytag/last.gif" border="0"></a></div> paging.banner.last=<div class="pagelinks" align="center"><a href={1}><img src="images/displaytag/first.gif" border="0"></a><a href={2}><img src="images/displaytag/prev.gif" border="0"></a> {0} <a href={3}><img src="images/displaytag/next.gif" border="0"></a><a href={4}><img src="images/displaytag/last.gif" border="0"></a></div> \ No newline at end of file src/jsp/WEB-INF/conf/displaytag.properties @@ -66,6 +66,10 @@ dateBasedMailings.cronExpression=0 0 * * * ? archive.maxCache=200 archive.maxCacheTimeMillis=300000 +bounce.maxRemain=90 + +deleteBounce.cronExpression=0 0 4 * * ? + ################################################################################ # LOG4J settings ################################################################################ @@ -128,4 +132,4 @@ mailgun.ini.xmlvalidate=False mailgun.ini.domain=openemm.invalid mailgun.ini.mail_log_number=400 mailgun.ini.eol=LF -mailgun.ini.mailer=OpenEMM V5.5.0 +mailgun.ini.mailer=OpenEMM V5.5.1 src/jsp/WEB-INF/conf/emm.properties.default @@ -139,6 +139,7 @@ IPStats=IP statistics Import=Import ImportWizStep_1_of_7=Step 1 of 7 ImportWizStep_2_of_7=Step 2 of 7 +ImportWizStep_3_fields_of_7=Step 3 of 7 fields are missing ImportWizStep_3_of_7=Step 3 of 7 ImportWizStep_4_of_7=Step 4 of 7 ImportWizStep_5_of_7=Step 5 of 7 @@ -563,11 +564,12 @@ error.import.exception=Error during import. error.import.maxCount=The maximum number of records was reached. error.import.no_file=The file was empty or not found! error.import.no_gender_mapping=No mapping to required column "GENDER"! +error.import.no_gender_mapping.solution="GENDER" will be set to 'unkown' error.import.no_keycolumn_mapping=No mapping to key column! error.import.no_mailinglist=Please choose a mailinglist. error.import.no_mailtype_mapping=No mapping to required column "MAILTYPE"! error.import.sql_failed=Could not update data.<br>Error: -error.import.too_many_records=Too many records for import, maximum 60000! +error.import.too_many_records=Too many records for import, maximum {0}! error.invalid.email=E-Mail address is not valid<br> error.login=Wrong username/password<br> error.mailing.hosted_image_filename=Filename invalid: Please use only characters 'a' through 'z', 'A' through 'Z', '0' through '9', and ".", "-", "*", "_"!<br> @@ -702,9 +704,11 @@ import.update_status=Updating mailing list informations insecure=insecure iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=loading... +loading.stopped=loading ... stopped logon.login=Login logon.password=Password -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Username mailing.activate_event_explain=Your mailing is now ready for sending.<br>You may test it with the following<br>two links or activate it. mailing.activate_rule_explain=Your mailing is now ready for sending.<br>You may test it with the following<br>two links or activate it to start daily delivery <br>of the mailing to the selected target group. @@ -741,6 +745,10 @@ password=Password process=Process profile.hint=0 for numeric fields means default length of 32 bit - not changeable recipient.confirm_delete=Do you really want to delete this recipient? +recipient.mailingtype=recipients mailing type +recipient.mailingtype.html=html +recipient.mailingtype.htmloffline=offline-html +recipient.mailingtype.text=Text recipient.search=Search for recipient report.single_mailing=Single Mailing secure=secure src/jsp/WEB-INF/conf/messages.properties @@ -139,6 +139,7 @@ IPStats=IP-Statistik Import=Import ImportWizStep_1_of_7=Schritt 1 von 7 ImportWizStep_2_of_7=Schritt 2 von 7 +ImportWizStep_3_fields_of_7=Schritt 3 von 7 fehlende Felder ImportWizStep_3_of_7=Schritt 3 von 7 ImportWizStep_4_of_7=Schritt 4 von 7 ImportWizStep_5_of_7=Schritt 5 von 7 @@ -563,11 +564,12 @@ error.import.exception=Fehler beim Import. error.import.maxCount=Die maximale Anzahl erlaubter Datens\u00E4tze wurde erreicht. error.import.no_file=Die Datei ist leer oder wurde nicht gefunden! error.import.no_gender_mapping=Systemspalte "GENDER" nicht zugewiesen! +error.import.no_gender_mapping.solution="GENDER" wird auf 'unbekannt' gesetzt error.import.no_keycolumn_mapping=Schl\u00FCsselspalte nicht zugewiesen! error.import.no_mailinglist=Bitte w\u00E4hlen Sie die Mailingliste aus. error.import.no_mailtype_mapping=Systemspalte "MAILTYPE" nicht zugewiesen! error.import.sql_failed=Daten konnten nicht aktualisiert werden.<br>Fehler: -error.import.too_many_records=Zuviele Empf\u00E4nger zum importieren, maximal 60000! +error.import.too_many_records=Zuviele Empf\u00E4nger zum importieren, maximal {0}! error.invalid.email=E-Mail-Adresse ist ung\u00FCltig<br> error.login=Falscher Benutzername/Passwort<br> error.mailing.hosted_image_filename=Dateiname ung\u00FCltig: Bitte verwenden Sie nur die Zeichen 'a' bis 'z', 'A' bis 'Z', '0' bis '9', und ".", "-", "*", "_"!<br> @@ -702,9 +704,11 @@ import.update_status=Aktualisiere Mailinglisten insecure=Unsicher iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=Seite wird geladen... +loading.stopped=Laden der Seite wurde abgebrochen logon.login=Anmelden logon.password=Passwort -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Benutzer-Name mailing.activate_event_explain=Ihr Mailing ist bereit zum Versand.<br>Sie k\u00F6nnen das Mailing nun mit dem beiden<br>folgenden Links testen oder das Mailing aktivieren. mailing.activate_rule_explain=Ihr Mailing ist bereit zum Versand.<br>Sie k\u00F6nnen das Mailing nun mit dem beiden<br>folgenden Links testen oder das Mailing aktivieren<br>um den t\u00E4glichen Versand an die eingestellte Zielgruppe zu starten. @@ -741,6 +745,10 @@ password=Passwort process=Einlesen profile.hint=0 f\u00FCr numerische Felder bedeutet die Standardl\u00E4nge von 32 Bit - nicht \u00E4nderbar recipient.confirm_delete=Wollen Sie diesen Empf\u00E4nger wirklich l\u00F6schen? +recipient.mailingtype=Mail-Typ des Empf\u00E4ngers +recipient.mailingtype.html=Html +recipient.mailingtype.htmloffline=Offline-Html +recipient.mailingtype.text=Text recipient.search=Empf\u00E4nger suchen report.single_mailing=Mailing-Statistik secure=Sicher src/jsp/WEB-INF/conf/messages_de.properties @@ -36,7 +36,7 @@ Change=Change Characters=Characters Charset=Charset Charsets=Charsets -ChooseTemplateMsg=You can choose a predefined mailing template<br>for your mailing\: +ChooseTemplateMsg=You can choose a predefined mailing template<br>for your mailing: ChooseThenPressSave=Please choose your settings and confirm<br>by pressing the "Save" button ClickFinishMsg=Please click the "Finish" button<br>to exit to the mailing page Clicks=Clicks @@ -139,6 +139,7 @@ IPStats=IP statistics Import=Import ImportWizStep_1_of_7=Step 1 of 7 ImportWizStep_2_of_7=Step 2 of 7 +ImportWizStep_3_fields_of_7=Step 3 of 7 missing fields ImportWizStep_3_of_7=Step 3 of 7 ImportWizStep_4_of_7=Step 4 of 7 ImportWizStep_5_of_7=Step 5 of 7 @@ -168,7 +169,7 @@ MWizardStep_7_of_11=Step 7 of 11 MWizardStep_8_of_11=Step 8 of 11 MWizardStep_9_of_11=Step 9 of 11 MailStat=Mailing statistics -MailTypeMessage=Please choose a format for the mailing\: +MailTypeMessage=Please choose a format for the mailing: Mailing=Mailing MailingActivate=Activate mailing MailingDeactivate=Deactivate mailing @@ -217,7 +218,7 @@ Mime_Type=MIME type MissShort=Miss MissesShort=Mrs. MisterShort=Mr. -MlistTargetMsg=Please choose a mailinglist, the target group(s) and<br>optionally a campaign for your mailing\: +MlistTargetMsg=Please choose a mailinglist, the target group(s) and<br>optionally a campaign for your mailing: Mode=Mode MonthlyStat=Monthly overview More_Profile_Data=More profile data @@ -278,7 +279,7 @@ PleaseEnterShortnameMsg=Please enter a name and a short description (optional)<b Portugues=Portuguese Preview=Preview Proceed=Proceed -ProfileFieldErrorMsg=Profile field cannot be deleted because there are target groups depending from it. The target groups affected are\: +ProfileFieldErrorMsg=Profile field cannot be deleted because there are target groups depending from it. The target groups affected are: Profile_DB=Edit profile fields Profile_Database=Profile database RdirLinkDecode=Decode link @@ -561,37 +562,38 @@ error.import.charset=Could not convert file to selected charset!<br> error.import.column=Import error.<br>One column could not be imported twice. error.import.exception=Error during import. error.import.maxCount=The maximum number of records was reached. -error.import.no_file=The file was empty or not found\! -error.import.no_gender_mapping=No mapping to required column "GENDER"\! -error.import.no_keycolumn_mapping=No mapping to key column\! +error.import.no_file=The file was empty or not found! +error.import.no_gender_mapping=No mapping to required column "GENDER"! +error.import.no_gender_mapping.solution="GENDER" will be set to 'unkown'. +error.import.no_keycolumn_mapping=No mapping to key column! error.import.no_mailinglist=Please choose a mailinglist. -error.import.no_mailtype_mapping=No mapping to required column "MAILTYPE"\! +error.import.no_mailtype_mapping=No mapping to required column "MAILTYPE"! error.import.sql_failed=Could not update data.<br>Error: -error.import.too_many_records=Too many records for import, maximum 60000\! +error.import.too_many_records=Too many records for import, maximum {0}! error.invalid.email=Email address is not valid<br> error.login=Wrong username/password<br> -error.mailing.hosted_image_filename=Filename invalid\: Please use only characters 'a' through 'z', 'A' through 'Z', '0' through '9', and ".", "-", "*", "_"\!<br> +error.mailing.hosted_image_filename=Filename invalid: Please use only characters 'a' through 'z', 'A' through 'Z', '0' through '9', and ".", "-", "*", "_"!<br> error.mailing.noMailinglist=No mailinglist existent. Please create a mailinglist first! -error.mailing.no_html_template=Error\: No HTML-template present<br> -error.mailing.no_html_version=Error\: No HTML-version available\!<br> -error.mailing.no_subscribers=Number of recipients is zero\!<br> -error.mailing.no_text_template=Error\: No Text-template present -error.mailing.no_text_version=Error\: No Plain-text-version available\!<br> -error.mailing.rulebased_without_target=You have to choose a target-group\!<br> +error.mailing.no_html_template=Error: No HTML-template present<br> +error.mailing.no_html_version=Error: No HTML-version available!<br> +error.mailing.no_subscribers=Number of recipients is zero!<br> +error.mailing.no_text_template=Error: No Text-template present +error.mailing.no_text_version=Error: No Plain-text-version available!<br> +error.mailing.rulebased_without_target=You have to choose a target-group!<br> error.mailing.sender_adress=Error in sender address!<br> error.mailing.subject.too_short=Subject line is too short!<br> error.mailinglist.cannot_delete=You can't delete this mailinglist!<br>There are mailings or templates depending from it.<br>Please alter mailings or templates first. error.nameToShort=Name is too short<br> -error.old_password_required=Please enter your old password\! +error.old_password_required=Please enter your old password! error.password.mismatch=Passwords don't match!<br> error.password.required=Please enter your password!<br> error.password.tooShort=Password too short!<br> -error.password_must_differ=The new password must differ from the old one\! +error.password_must_differ=The new password must differ from the old one! error.permissionDenied=You don't have the required permissions for this action. error.personalization_tag=Error in personalization tag, please check!<br> error.personalization_tag_parameter=Error in personalization tag parameter, please check!<br> error.profiledb.exists=This field already exists. -error.profiledb.fieldname=Fieldname in db invalid. Please use only characters 'A' through 'Z', '0' through '9', and ".", "-", "*", "_"\!<br> +error.profiledb.fieldname=Fieldname in db invalid. Please use only characters 'A' through 'Z', '0' through '9', and ".", "-", "*", "_"!<br> error.profiledb.fieldname_too_short=Fieldname in db should be at least 3 characters long. error.profiledb.insert_in_db_error=The field could not be created. Please check the values you entered. error.profiledb.shortname_too_short=Fieldname should be at least 3 characters long. @@ -600,7 +602,7 @@ error.sender_fullname_too_long=Sender fullname must not be longer than 50 charac error.subscriber.insert_in_db_error=An error occured while saving the recipient. error.target.bracketbalance=Brackets are not balanced, please check!<br> error.target.norule=No rule defined, please define at least on rule for target-selection<br> -error.template.dyntags=Error in dyn tags\!<br> +error.template.dyntags=Error in dyn tags!<br> error.username.required=Please enter your username!<br> errors.footer=</font> errors.header=<font color="red"> @@ -702,9 +704,11 @@ import.update_status=Updating mailing list informations insecure=insecure iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=loading... +loading.stopped=loading ... stopped logon.login=Login logon.password=Password -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Username mailing.activate_event_explain=Your mailing is now ready for sending.<br>You may test it with the following<br>two links or activate it. mailing.activate_rule_explain=Your mailing is now ready for sending.<br>You may test it with the following<br>two links or activate it to start daily delivery <br>of the mailing to the selected target group. @@ -741,6 +745,10 @@ password=Password process=Process profile.hint=0 for numeric fields means default length of 32 bit - not changeable recipient.confirm_delete=Do you really want to delete this recipient? +recipient.mailingtype=recipients mailing type +recipient.mailingtype.html=html +recipient.mailingtype.htmloffline=offline-html +recipient.mailingtype.text=Text recipient.search=Search for recipient report.single_mailing=Single mailing secure=secure src/jsp/WEB-INF/conf/messages_en.properties @@ -139,6 +139,7 @@ IPStats=Estad\u00EDsticas IP Import=Importar ImportWizStep_1_of_7=Etapa 1 de 7 ImportWizStep_2_of_7=Etapa 2 de 7 +ImportWizStep_3_fields_of_7=Etapa 3 de 7 ImportWizStep_3_of_7=Etapa 3 de 7 ImportWizStep_4_of_7=Etapa 4 de 7 ImportWizStep_5_of_7=Etapa 5 de 7 @@ -263,6 +264,7 @@ OK=OK OfflineHTML=Offline HTML Only_HTML_Version=S\u00F3lo versi\u00F3n HTML Only_Text_Version=S\u00F3lo versi\u00F3n texto +OpenTime=Open rate over time Opened_Mails=E-mails abertos OptOutAdmin=Out-Out por administrador OptOutUser=Opt-Out por destinatario @@ -557,13 +559,16 @@ error.export.file_not_ready=Ning\u00FAn archivo disponible para descargar! error.export.no_columns_selected=Seleccione por los menos una columna base para la exportaci\u00F3n! error.import.charset=No fue posible convertir el archivo para los caracteres seleccionados! <br> error.import.column=Error al importar. <br> Una coluna no puede ser importada dos vezes. +error.import.exception=Error during import. +error.import.maxCount=The maximum number of records was reached. error.import.no_file=El archivo est\u00E1 vacio o no fue encontrado ! error.import.no_gender_mapping=En el mapeo es exigido la columna "G\u00C9NERO/GENDER" ! +error.import.no_gender_mapping.solution="GENDER" will be set to 'unkown' error.import.no_keycolumn_mapping=Mapeo para la columna clave ! error.import.no_mailinglist=Escoja una lista. error.import.no_mailtype_mapping=Columna "TIPO DE E-MAIL/MAILTYPE" exigida para el mapeo ! error.import.sql_failed=No foi posible actualizar los datos. <br> Error: -error.import.too_many_records=Muchos registros para la importaci\u00F3n, m\u00E1ximo 60000! +error.import.too_many_records=Muchos registros para la importaci\u00F3n, m\u00E1ximo {0}! error.invalid.email=Direcci\u00F3n de e-mail inv\u00E1lido<br> error.login=Nombre de usuario o password inv\u00E1lido<br> error.mailing.hosted_image_filename=Archivo inv\u00E1lido: Por favor, use s\u00F3lo los siguientes caracteres 'a' - 'z', 'A' - 'Z', '0' - '9', y ".", "-", "*", "_"!<br> @@ -698,9 +703,11 @@ import.update_status=Atualizando informaciones de la lista de e-mails insecure=Inseguro iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=loading... +loading.stopped=loading ... stopped logon.login=Login logon.password=Clave -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Nombre de Usuario mailing.activate_event_explain=Sus e-mails ahora est\u00E1n listos para ser enviados. <br> Usted puede testarlo con los siguientes <br> dos links. mailing.activate_rule_explain=Sus e-mails ahora est\u00E1n listos para ser enviados. <br> Usted pode test\u00E1-lo con los siguientes <br> dos links o activarlos para iniciar la distribuici\u00F3n diaria <br> del mailing seleccionado para el grupo-seleccionado. @@ -737,6 +744,10 @@ password=Password process=Procesar profile.hint=0 para la longitud a voluntad recipient.confirm_delete=Usted realmente desea excluir este destinatario? +recipient.mailingtype=recipients mailing type +recipient.mailingtype.html=html +recipient.mailingtype.htmloffline=offline-html +recipient.mailingtype.text=Text recipient.search=Buscar destinatario report.single_mailing=Single Mailing secure=Seguro src/jsp/WEB-INF/conf/messages_es.properties @@ -138,6 +138,7 @@ IPStats=Statistiques IP Import=Import ImportWizStep_1_of_7=Etape 1 de 7 ImportWizStep_2_of_7=Etape 2 de 7 +ImportWizStep_3_fields_of_7=Etape 3 de 7 ImportWizStep_3_of_7=Etape 3 de 7 ImportWizStep_4_of_7=Etape 4 de 7 ImportWizStep_5_of_7=Etape 5 de 7 @@ -262,6 +263,7 @@ OK=OK OfflineHTML=HTML hors connexion Only_HTML_Version=version HTML seulement Only_Text_Version=version texte seulement +OpenTime=Open rate over time Opened_Mails=Mails ouverts OptOutAdmin=D\u00E9sabonn\u00E9 par l'administrateur OptOutUser=D\u00E9sabonn\u00E9 par l'abonn\u00E9 @@ -557,13 +559,16 @@ error.export.file_not_ready=Aucun fichier disponible pour le t\u00E9l\u00E9charg error.export.no_columns_selected=S\u00E9lectionnez au moins une colonne de la base de donn\u00E9e pour l'export error.import.charset=le ficheir ne peux pas etre converti dans ce charset<br> error.import.column=Import error.<br>One column could not be imported twice. +error.import.exception=Error during import. +error.import.maxCount=The maximum number of records was reached. error.import.no_file=Le fichier \u00E9tait vide ou n'a pas \u00E9t\u00E9 trouv\u00E9! error.import.no_gender_mapping=Aucune correspondance pour la colonne obligatoire "SEXE"! +error.import.no_gender_mapping.solution="GENDER" will be set to 'unkown' error.import.no_keycolumn_mapping=Aucune correspondance pour la colonne primaire! error.import.no_mailinglist=Choissisez une liste de diffusion. error.import.no_mailtype_mapping=Aucune correspondance pour la colonne obligatoire "MAILTYPE"! error.import.sql_failed=N' actualiser par les donn\u00E9es.<br>Erreur: -error.import.too_many_records=Trop de lignes \u00E0 importer, maximum 60000! +error.import.too_many_records=Trop de lignes \u00E0 importer, maximum {0}! error.invalid.email=l'adresse email n'est pas valide<br> error.login=Erreur dans l'utisateur / mot de passe<br> error.mailing.hosted_image_filename=Nom de fichier invalide: Utilisez seulement les caract\u00E8res 'a' \u00E0 'z', 'A' \u00E0 'Z', '0' \u00E0 '9', et ".", "-", "*", "_"!<br> @@ -697,9 +702,11 @@ import.update_status=Information de la liste de diffusion mise \u00E0 jour insecure=insecure iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=loading... +loading.stopped=loading ... stopped logon.login=Connexion logon.password=Mot de passe -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Nom utilisateur mailing.activate_event_explain=Votre mailing est pret \u00E0 \u00E9tre envoy\u00E9.<br>vous pouvez le tester avec les liens suivants<br>ou bien l'activer. mailing.activate_rule_explain=Votre mailing est pret \u00E0 \u00E9tre envoy\u00E9.<br>vous pouvez le tester avec les liens suivants<br>ou bien l'activer quotidiennement <br>pour le sous groupe dynamique. @@ -736,6 +743,10 @@ password=Mot de passe process=En cours profile.hint=0 pour long au choix recipient.confirm_delete=Voulez vous vraiment supprimer ce abonn\u00E9? +recipient.mailingtype=recipients mailing type +recipient.mailingtype.html=html +recipient.mailingtype.htmloffline=offline-html +recipient.mailingtype.text=Text recipient.search=Rechercher le abonn\u00E9 report.single_mailing=Mailing seul secure=secure src/jsp/WEB-INF/conf/messages_fr.properties @@ -139,6 +139,7 @@ IPStats=Estat\u00EDsticas IP Import=Importar ImportWizStep_1_of_7=Etapa 1 de 7 ImportWizStep_2_of_7=Etapa 2 de 7 +ImportWizStep_3_fields_of_7=Etapa 3 de 7 ImportWizStep_3_of_7=Etapa 3 de 7 ImportWizStep_4_of_7=Etapa 4 de 7 ImportWizStep_5_of_7=Etapa 5 de 7 @@ -263,6 +264,7 @@ OK=OK OfflineHTML=Offline HTML Only_HTML_Version=S\u00F3 vers\u00E3o HTML Only_Text_Version=S\u00F3 vers\u00E3o texto +OpenTime=Open rate over time Opened_Mails=E-mails abertos OptOutAdmin=Out-Out por administrador OptOutUser=Opt-Out por destinat\u00E1rio @@ -557,13 +559,16 @@ error.export.file_not_ready=Nenhum arquivo dispon\u00EDvel para download! error.export.no_columns_selected=Selecione pelo menos uma coluna base para exporta\u00E7\u00E3o! error.import.charset=N\u00E3o foi poss\u00EDvel converter arquivo para os caracteres seleccionados! <br> error.import.column=Erro ao importar. <br> Uma coluna n\u00E3o poderia ser importada duas vezes. +error.import.exception=Error during import. +error.import.maxCount=The maximum number of records was reached. error.import.no_file=O arquivo esta vazio ou n\u00E3o foi encontrado ! error.import.no_gender_mapping=No mapeamento \u00E9 exigido a coluna "GENDER" ! +error.import.no_gender_mapping.solution="GENDER" will be set to 'unkown' error.import.no_keycolumn_mapping=Mapeamento para a coluna chave ! error.import.no_mailinglist=Escolha uma lista. error.import.no_mailtype_mapping=Coluna "MAILTYPE" exigida para mapeamento ! error.import.sql_failed=N\u00E3o foi poss\u00EDvel atualizar os dados. <br> Erro: -error.import.too_many_records=Muitos registros para importa\u00E7\u00E3o, m\u00E1ximo 60000! +error.import.too_many_records=Muitos registros para importa\u00E7\u00E3o, m\u00E1ximo {0}! error.invalid.email=Endere\u00E7o de e-mail inv\u00E1lido<br> error.login=Nome de usu\u00E1rio ou password inv\u00E1lido<br> error.mailing.hosted_image_filename=Arquivo invalido: Por favor, use s\u00F3 os seguintes caracteres 'a' - 'z', 'A' - 'Z', '0' - '9', y ".", "-", "*", "_"!<br> @@ -697,9 +702,11 @@ import.update_status=Atualizando informa\u00E7\u00F5es da lista de e-mails insecure=nseguro iso-8859-1=ISO 8859-1 iso-8859-15=ISO 8859-15 +loading=loading... +loading.stopped=loading ... stopped logon.login=Login logon.password=Senha -logon.title=AGNITAS OpenEMM 5.5.0 +logon.title=AGNITAS OpenEMM 5.5.1 logon.username=Username mailing.activate_event_explain=Seu e-mails agora est\u00E1 pronto para envio. <br> Voc\u00EA pode test\u00E1-lo com os seguintes <br> dois links. mailing.activate_rule_explain=Seu e-mails agora est\u00E1 pronto para envio. <br> Voc\u00EA pode test\u00E1-lo com os seguintes <br> dois links ou activ\u00E1-lo para iniciar a distribui\u00E7\u00E3o di\u00E1ria <br> do mailing selecionado para o grupo-alvo. @@ -736,6 +743,10 @@ password=Password process=Processar profile.hint=0 para la longitud a voluntad recipient.confirm_delete=Voc\u00EA realmente deseja excluir este destinat\u00E1rio? +recipient.mailingtype=recipients mailing type +recipient.mailingtype.html=html +recipient.mailingtype.htmloffline=offline-html +recipient.mailingtype.text=Text recipient.search=Buscar destinat\u00E1rio report.single_mailing=Single Mailing secure=Seguro src/jsp/WEB-INF/conf/messages_pt.properties @@ -1,7 +1,4 @@ # Sample ResourceBundle properties file -href_1=/mailinglist.do?action=1 -href_2=/mailinglist.do?action=2&mailinglistID=0 -token_2=mailinglist.new +href_1=/mailinglist.do?action\=1 token_1=mailinglist.show -msg_2=NewMailinglist -msg_1=Mailinglists +msg_1=Mailinglist src/jsp/WEB-INF/conf/navigation/mailinglists.properties @@ -64,6 +64,14 @@ <property name="concurrent" value="false"/> </bean> + <bean id="Bounce" class="org.agnitas.dao.impl.BounceDaoImpl"> + </bean> + + <bean id="deleteBounceJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> + <property name="targetObject" ref="Bounce"/> + <property name="targetMethod" value="cleanup"/> + <property name="concurrent" value="false"/> + </bean> <bean id="dateBasedMailingsCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> <property name="jobDetail" ref="dateBasedMailingsJob"/> @@ -75,11 +83,17 @@ <property name="cronExpression" value="${delayedMailings.cronExpression}"/> </bean> + <bean id="deleteBounceCronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> + <property name="jobDetail" ref="deleteBounceJob"/> + <property name="cronExpression" value="${deleteBounce.cronExpression}"/> + </bean> + <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> <property name="triggers"> <list> <ref bean="dateBasedMailingsCronTrigger"/> <ref bean="delayedMailingsCronTrigger"/> + <ref bean="deleteBounceCronTrigger"/> </list> </property> </bean> src/jsp/WEB-INF/cronContext.xml @@ -3,369 +3,516 @@ "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> <struts-config> - <!-- ========== Form Bean Definitions =================================== --> - <form-beans type="org.apache.struts.action.ActionFormBean"> - - <form-bean name="logonForm" type="org.agnitas.web.LogonForm" /> - - <form-bean name="updateForm" type="org.agnitas.web.UpdateForm" /> - - <form-bean name="campaignForm" type="org.agnitas.web.CampaignForm" /> - - <form-bean name="profileFieldForm" type="org.agnitas.web.ProfileFieldForm" /> - - <form-bean name="recipientForm" type="org.agnitas.web.RecipientForm" /> - - <form-bean name="salutationForm" type="org.agnitas.web.SalutationForm" /> - - <form-bean name="adminForm" type="org.agnitas.web.AdminForm" /> - - <form-bean name="targetForm" type="org.agnitas.web.TargetForm" /> - - <form-bean name="ipStatForm" type="org.agnitas.web.IPStatForm" /> - - <form-bean name="domainStatForm" type="org.agnitas.web.DomainStatForm" /> - - <form-bean name="mailingBaseForm" type="org.agnitas.web.MailingBaseForm" /> - - <form-bean name="mailingContentForm" type="org.agnitas.web.MailingContentForm" /> - - <form-bean name="emmActionForm" type="org.agnitas.web.EmmActionForm" /> - - <form-bean name="mailinglistForm" type="org.agnitas.web.MailinglistForm" /> - - <form-bean name="mailingStatForm" type="org.agnitas.web.MailingStatForm" /> - - <form-bean name="mailingComponentsForm" type="org.agnitas.web.MailingComponentsForm" /> - - <form-bean name="mailingAttachmentsForm" type="org.agnitas.web.MailingAttachmentsForm" /> - - <form-bean name="mailingSendForm" type="org.agnitas.web.MailingSendForm" /> - - <form-bean name="mailloopForm" type="org.agnitas.web.MailloopForm" /> - - <form-bean name="mailingWizardForm" type="org.agnitas.web.MailingWizardForm" /> - - <form-bean name="compareMailingForm" type="org.agnitas.web.CompareMailingForm" /> - - <form-bean name="trackableLinkForm" type="org.agnitas.web.TrackableLinkForm" /> - - <form-bean name="userFormEditForm" type="org.agnitas.web.UserFormEditForm" /> - <form-bean name="userFormExecuteForm" type="org.agnitas.web.UserFormExecuteForm" /> - - <form-bean name="importWizardForm" type="org.agnitas.web.ImportWizardForm" /> - - <form-bean name="exportWizardForm" type="org.agnitas.web.ExportWizardForm" /> - <form-bean name="recipientStatForm" type="org.agnitas.web.RecipientStatForm" /> - - </form-beans> - - <!-- ========== Global Forward Definitions ============================== --> - <global-forwards type="org.apache.struts.action.ActionForward"> - <forward name="logoff" path="/logon.do?action=2" /> - <forward name="logon" path="/logon.do?action=0" /> - <forward name="success" path="/start.jsp" /> - </global-forwards> - - <!-- ========== Action Mapping Definitions ============================== --> - <action-mappings type="org.apache.struts.action.ActionMapping"> - - <!-- Process a user logon --> - <action path="/logon" type="org.agnitas.web.LogonAction" name="logonForm" scope="request" input="/logon.jsp"> - <forward name="start_page" path="/start.jsp" /> - <forward name="view_logon" path="/logon.jsp" /> - <forward name="change_pwd_info" path="/change_pwd_info.jsp" /> - </action> - - <!-- Process a update --> - <action path="/update" type="org.agnitas.web.UpdateAction" name="updateForm" scope="request" input="/start.jsp"> - <forward name="success" path="/update/update.jsp" /> - <forward name="question" path="/update/update_question.jsp" /> - <forward name="error" path="/update/update_error.jsp" /> - <forward name="list" path="/splash_settings.jsp" /> - </action> - - <!-- Process a campaign --> - <action path="/campaign" type="org.agnitas.web.CampaignAction" name="campaignForm" scope="session" input="/campaign/list.jsp"> - <forward name="list" path="/campaign/list.jsp"/> - <forward name="view" path="/campaign/view.jsp" /> - <forward name="delete" path="/campaign/delete.jsp" /> - <forward name="new" path="/campaign/new.jsp" /> - <forward name="stat" path="/campaign/stat.jsp" /> - <forward name="splash" path="/campaign/splash.jsp" /> - </action> - - <!-- Process an admin --> - <action path="/admin" type="org.agnitas.web.AdminAction" name="adminForm" scope="request" input="/settings/admin/view.jsp"> - <forward name="failure" path="/settings/admin/view.jsp" /> - <forward name="view" path="/settings/admin/view.jsp" /> - <forward name="list" path="/settings/admin/list.jsp" /> - <forward name="delete" path="/settings/admin/delete.jsp" /> - <forward name="rights" path="/settings/admin/rights.jsp" /> - </action> - - <!-- Process a salutation --> - <action path="/salutation" type="org.agnitas.web.SalutationAction" name="salutationForm" scope="request" input="/settings/salutation/view.jsp"> - <forward name="view" path="/settings/salutation/view.jsp" /> - <forward name="list" path="/settings/salutation/list.jsp" /> - <forward name="delete" path="/settings/salutation/delete.jsp" /> - </action> - - <!-- Process a blacklist --> - <action path="/blacklist" type="org.agnitas.web.BlacklistAction" name="blacklistForm" scope="request" input="/settings/blacklist/list.jsp"> - <forward name="list" path="/settings/blacklist/list.jsp" /> - <forward name="delete" path="/settings/blacklist/delete.jsp" /> - </action> - - <!-- Process profile_db fields --> - <action path="/profiledb" type="org.agnitas.web.ProfileFieldAction" name="profileFieldForm" scope="request" input="/settings/profile_field/view.jsp"> - <forward name="view" path="/settings/profile_field/view.jsp" /> - <forward name="list" path="/settings/profile_field/list.jsp" /> - <forward name="delete" path="/settings/profile_field/delete.jsp" /> - <forward name="delete_error" path="/settings/profile_field/delete_error.jsp" /> - </action> - - <!-- Process recipients --> - <action path="/recipient" type="org.agnitas.web.RecipientAction" name="recipientForm" scope="session" input="/recipient/list.jsp"> - <forward name="list" path="/recipient/list.jsp" /> - <forward name="view" path="/recipient/view.jsp" /> - <forward name="delete" path="/recipient/delete.jsp" /> - </action> - - <!-- Process target groups --> - <action path="/target" type="org.agnitas.web.TargetAction" name="targetForm" scope="request" input="/targets/view.jsp"> - <forward name="failure" path="/targets/view.jsp" /> - <forward name="success" path="/targets/view.jsp" /> - <forward name="list" path="/targets/list.jsp" /> - <forward name="delete" path="/targets/delete.jsp" /> - <forward name="create_ml" path="/targets/new_ml.jsp" /> - <forward name="delete_recipients" path="/targets/delete_recipients.jsp" /> - </action> - - <!-- Display Recipient Statistics --> - <action path="/recipient_stats" type="org.agnitas.web.RecipientStatAction" name="recipientStatForm" scope="request" input="/stats/recipient/select.jsp"> - <forward name="select" path="/stats/recipient/select.jsp" /> - <forward name="display" path="/stats/recipient/display.jsp" /> - </action> - - <!-- compare two up to n mailing response statistics --> - <action path="/mailing_compare" type="org.agnitas.web.CompareMailingAction" name="compareMailingForm" input="/stats/mailing_comp/select.jsp" scope="session"> - <forward name="list" path="/stats/mailing_comp/select.jsp" /> - <forward name="compare" path="/stats/mailing_comp/view.jsp" /> - </action> - - <!-- process Subscriber IP Statistics --> - <action path="/ip_stats" type="org.agnitas.web.IPStatAction" name="ipStatForm" scope="session" input="/stats/ip_stats.jsp"> - <forward name="stat" path="/stats/ip_stats.jsp" /> - <forward name="splash" path="/stats/ip_splash.jsp" /> - </action> - - <!-- pisplay Subscriber Domain Statistics --> - <action path="/domain_stats" type="org.agnitas.web.DomainStatAction" name="domainStatForm" scope="session" input="/stats/domain_stats.jsp"> - <forward name="stat" path="/stats/domain_stats.jsp" /> - <forward name="splash" path="/stats/domain_splash.jsp" /> - </action> - - <!-- Process a mailing base information --> - <action path="/mailingbase" type="org.agnitas.web.MailingBaseAction" name="mailingBaseForm" scope="session" input="/mailing/view_base.jsp"> - <forward name="failure" path="/mailing/view_base.jsp" /> - <forward name="view" path="/mailing/view_base.jsp" /> - <forward name="list" path="/mailing/list.jsp" /> - <forward name="delete" path="/mailing/delete.jsp" /> - <forward name="action" path="/mailing/action.jsp" /> - </action> - - <!-- Process a mailing content request --> - <action path="/mailingcontent" type="org.agnitas.web.MailingContentAction" name="mailingContentForm" scope="session" input="/mailing/content_list.jsp"> - <forward name="list" path="/mailing/content_list.jsp" /> - <forward name="view" path="/mailing/content_view.jsp" /> - </action> - - <!-- Process a mailing attachment request --> - <action path="/mailingattachments" type="org.agnitas.web.MailingAttachmentsAction" name="mailingAttachmentsForm" scope="request" input="/mailing/attachments.jsp"> - <forward name="list" path="/mailing/attachments.jsp" /> - </action> - - <!-- Process a mailing send/preview request --> - <action path="/mailingsend" type="org.agnitas.web.MailingSendAction" name="mailingSendForm" scope="request" input="/mailing/send.jsp"> - <forward name="send" path="/mailing/send.jsp" /> - <forward name="send2" path="/mailing/send2.jsp" /> - <forward name="send_confirm" path="/mailing/send_confirm.jsp" /> - <forward name="preview_select" path="/mailing/preview_select.jsp" /> - <forward name="preview_header" path="/mailing/preview_header.jsp" /> - <forward name="preview.0" path="/mailing/preview_text.jsp" /> - <forward name="preview.1" path="/mailing/preview_html.jsp" /> - <forward name="cancel_generation_question" path="/mailing/cancel_generation_question.jsp" /> - <forward name="cancel_generation_deny" path="/mailing/cancel_generation_deny.jsp" /> - <forward name="view_delstatbox" path="/mailing/delivery_stat.jsp" /> - </action> - - <!-- Process a mailing statistics request --> - <action path="/mailing_stat" type="org.agnitas.web.MailingStatAction" name="mailingStatForm" scope="session" input="/stats/mailing_stats.jsp"> - <forward name="list" path="/stats/mailing_stats.jsp" /> - <forward name="mailing_stat" path="/stats/mailing_stat.jsp" /> - <forward name="week_stat" path="/stats/mailing_stat_week.jsp" /> - <forward name="day_stat" path="/stats/mailing_stat_day.jsp" /> - <forward name="clean_question" path="/stats/stat_clean_question.jsp" /> - <forward name="splash" path="/stats/mailstat_splash.jsp" /> - <forward name="opened_stat" path="/stats/mailing_stat_opened.jsp" /> - <forward name="bounce_stat" path="/stats/mailing_stat_bounce.jsp" /> - <forward name="bounce" path="/stats/mailing_bounce.jsp" /> - <forward name="open_week" path="/stats/mailing_open_week.jsp" /> - <forward name="open_day" path="/stats/mailing_open_day.jsp" /> - </action> - - <!-- Process actions --> - <action path="/action" type="org.agnitas.web.EmmActionAction" name="emmActionForm" scope="session" input="/actions/view.jsp"> - <forward name="failure" path="/actions/view.jsp" /> - <forward name="success" path="/actions/view.jsp" /> - <forward name="list" path="/actions/list.jsp" /> - <forward name="delete" path="/actions/delete.jsp" /> - </action> - - <!-- Process a mailinglist --> - <action path="/mailinglist" type="org.agnitas.web.MailinglistAction" name="mailinglistForm" scope="request" input="/mailinglists/view.jsp"> - <forward name="failure" path="/mailinglists/view.jsp" /> - <forward name="view" path="/mailinglists/view.jsp" /> - <forward name="list" path="/mailinglists/list.jsp" /> - <forward name="delete" path="/mailinglists/delete.jsp" /> - </action> - - <!-- Process a userform --> - <action path="/userform" type="org.agnitas.web.UserFormEditAction" name="userFormEditForm" scope="request" input="/userform/view.jsp"> - <forward name="view" path="/userform/view.jsp" /> - <forward name="list" path="/userform/list.jsp" /> - <forward name="delete" path="/userform/delete.jsp" /> - </action> - - <!-- Process MailingComponents --> - <action path="/mcomponents" type="org.agnitas.web.MailingComponentsAction" name="mailingComponentsForm" scope="request" input="/mailing/components.jsp"> - <forward name="list" path="/mailing/components.jsp" /> - <forward name="component_edit" path="/mailing/component_upload.jsp" /> - </action> - - <!-- Process a userform (execute) --> - <action path="/form" type="org.agnitas.web.UserFormExecuteAction" name="userFormExecuteForm" scope="request"> - </action> - - <!-- Process a trackable link --> - <action path="/tracklink" type="org.agnitas.web.TrackableLinkAction" name="trackableLinkForm" scope="request"> - <forward name="view" path="/mailing/trackablelink_view.jsp"/> - <forward name="list" path="/mailing/trackablelink_list.jsp"/> - </action> - - <!-- Process an import wizard --> - <action path="/importwizard" type="org.agnitas.web.ImportWizardAction" name="importWizardForm" scope="session" input="/importwizard/start.jsp"> - <forward name="start" path="/importwizard/start.jsp"/> - <forward name="mode" path="/importwizard/mode.jsp" /> - <forward name="mapping" path="/importwizard/mapping.jsp" /> - <forward name="verify" path="/importwizard/verify.jsp" /> - <forward name="prescan" path="/importwizard/prescan.jsp" /> - <forward name="mlists" path="/importwizard/mlists.jsp" /> - <forward name="view_status" path="/importwizard/upload_status.jsp" /> - <forward name="view_status_window" path="/importwizard/upload_window.jsp" /> - </action> - - <!-- Process a export through a wizard--> - <action path="/exportwizard" type="org.agnitas.web.ExportWizardAction" name="exportWizardForm" scope="session" input="/exportwizard/query.jsp"> - <forward name="list" path="/exportwizard/list.jsp"/> - <forward name="query" path="/exportwizard/query.jsp"/> - <forward name="view" path="/exportwizard/view.jsp" /> - <forward name="view_status" path="/exportwizard/view_window.jsp" /> - <forward name="savemask" path="/exportwizard/savemask.jsp" /> - <forward name="delete_question" path="/exportwizard/delete.jsp" /> - </action> - - <!-- Process a mailloop --> - <action path="/mailloop" type="org.agnitas.web.MailloopAction" name="mailloopForm" scope="request" input="/settings/mailloop/view.jsp"> - <forward name="list" path="/settings/mailloop/list.jsp"/> - <forward name="view" path="/settings/mailloop/view.jsp"/> - <forward name="delete" path="/settings/mailloop/delete.jsp"/> - </action> - - <!-- Mailing-Wizard mappings --> - <action path="/mwStart" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/start.jsp"> - <forward name="next" path="/mailing/wizard/name.jsp"/> - </action> - - <action path="/mwName" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/name.jsp"> - <forward name="previous" path="/mailing/wizard/start.jsp"/> - <forward name="next" path="/mailing/wizard/template.jsp"/> - </action> - - <action path="/mwTemplate" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/template.jsp"> - <forward name="previous" path="/mailing/wizard/name.jsp"/> - <forward name="next" path="/mailing/wizard/type.jsp"/> - </action> - - <action path="/mwType" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/type.jsp"> - <forward name="previous" path="/mailing/wizard/template.jsp"/> - <forward name="next" path="/mailing/wizard/sendaddress.jsp"/> - </action> - - <action path="/mwSendaddress" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/sendaddress.jsp"> - <forward name="previous" path="/mailing/wizard/type.jsp"/> - <forward name="next" path="/mailing/wizard/mailtype.jsp"/> - </action> - - <action path="/mwMailtype" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/mailtype.jsp"> - <forward name="previous" path="/mailing/wizard/sendaddress.jsp"/> - <forward name="next" path="/mailing/wizard/subject.jsp"/> - </action> - - <action path="/mwSubject" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/subject.jsp"> - <forward name="previous" path="/mailing/wizard/mailtype.jsp"/> - <forward name="next" path="/mailing/wizard/target.jsp"/> - </action> - - <action path="/mwTarget" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/target.jsp"> - <forward name="previous" path="/mailing/wizard/subject.jsp"/> - <forward name="next" path="/mailing/wizard/textmodules.jsp"/> - <forward name="finish" path="/mailing/wizard/finish.jsp"/> - </action> - - <action path="/mwTextmodules" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/textmodules.jsp"> - <forward name="previous" path="/mailing/wizard/target.jsp"/> - <forward name="next" path="/mailing/wizard/textmodule.jsp"/> - <forward name="skip" path="/mailing/wizard/links.jsp"/> - <forward name="finish" path="/mailing/wizard/finish.jsp"/> - </action> - - <action path="/mwTextmodule" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/textmodule.jsp"> - <forward name="add" path="/mailing/wizard/textmodule.jsp"/> - <forward name="previous" path="/mailing/wizard/textmodules.jsp"/> - <forward name="next" path="/mailing/wizard/textmodule.jsp"/> - <forward name="skip" path="/mailing/wizard/links.jsp"/> - <forward name="finish" path="/mailing/wizard/finish.jsp"/> - </action> - - <action path="/mwLinks" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/links.jsp"> - <forward name="previous" path="/mailing/wizard/textmodules.jsp"/> - <forward name="next" path="/mailing/wizard/link.jsp"/> - <forward name="skip" path="/mailing/wizard/attachment.jsp"/> - <forward name="finish" path="/mailing/wizard/finish.jsp"/> - </action> - - <action path="/mwLink" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/link.jsp"> - <forward name="previous" path="/mailing/wizard/links.jsp"/> - <forward name="next" path="/mailing/wizard/link.jsp"/> - <forward name="skip" path="/mailing/wizard/attachment.jsp"/> - </action> - - <action path="/mwAttachment" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/attachment.jsp"> - <forward name="previous" path="/mailing/wizard/links.jsp"/> - <forward name="save" path="/mailing/wizard/attachment.jsp"/> - <forward name="next" path="/mailing/wizard/attachment.jsp"/> - <forward name="finish" path="/mailing/wizard/finish.jsp"/> - </action> - - <action path="/mwFinish" type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" scope="session" parameter="action" input="/mailing/wizard/finish.jsp"> - <forward name="previous" path="/mailing/wizard/attachment.jsp"/> - <forward name="next" path="/mailing/wizard/finish.jsp"/> - </action> - - </action-mappings> - - <message-resources parameter="messages" /> + <!-- ========== Form Bean Definitions =================================== --> + <form-beans type="org.apache.struts.action.ActionFormBean"> + + <form-bean name="logonForm" type="org.agnitas.web.LogonForm" /> + + <form-bean name="updateForm" type="org.agnitas.web.UpdateForm" /> + + <form-bean name="campaignForm" + type="org.agnitas.web.forms.CampaignForm" /> + + <form-bean name="profileFieldForm" + type="org.agnitas.web.ProfileFieldForm" /> + + <form-bean name="recipientForm" + type="org.agnitas.web.RecipientForm" /> + + <form-bean name="salutationForm" + type="org.agnitas.web.SalutationForm" /> + + <form-bean name="adminForm" + type="org.agnitas.web.forms.AdminForm" /> + + <form-bean name="targetForm" type="org.agnitas.web.TargetForm" /> + + <form-bean name="ipStatForm" type="org.agnitas.web.IPStatForm" /> + + <form-bean name="domainStatForm" + type="org.agnitas.web.DomainStatForm" /> + + <form-bean name="mailingBaseForm" + type="org.agnitas.web.MailingBaseForm" /> + + <form-bean name="mailingContentForm" + type="org.agnitas.web.MailingContentForm" /> + + <form-bean name="emmActionForm" + type="org.agnitas.web.forms.EmmActionForm" /> + + <form-bean name="mailinglistForm" + type="org.agnitas.web.MailinglistForm" /> + + <form-bean name="mailingStatForm" + type="org.agnitas.web.MailingStatForm" /> + + <form-bean name="mailingComponentsForm" + type="org.agnitas.web.MailingComponentsForm" /> + + <form-bean name="mailingAttachmentsForm" + type="org.agnitas.web.MailingAttachmentsForm" /> + + <form-bean name="mailingSendForm" + type="org.agnitas.web.MailingSendForm" /> + + <form-bean name="mailloopForm" + type="org.agnitas.web.MailloopForm" /> + + <form-bean name="mailingWizardForm" + type="org.agnitas.web.MailingWizardForm" /> + + <form-bean name="compareMailingForm" + type="org.agnitas.web.CompareMailingForm" /> + + <form-bean name="trackableLinkForm" + type="org.agnitas.web.TrackableLinkForm" /> + + <form-bean name="userFormEditForm" + type="org.agnitas.web.UserFormEditForm" /> + <form-bean name="userFormExecuteForm" + type="org.agnitas.web.UserFormExecuteForm" /> + + <form-bean name="importWizardForm" + type="org.agnitas.web.ImportWizardForm" /> + + <form-bean name="exportWizardForm" + type="org.agnitas.web.ExportWizardForm" /> + <form-bean name="recipientStatForm" + type="org.agnitas.web.RecipientStatForm" /> + + </form-beans> + + <!-- ========== Global Forward Definitions ============================== --> + <global-forwards type="org.apache.struts.action.ActionForward"> + <forward name="logoff" path="/logon.do?action=2" /> + <forward name="logon" path="/logon.do?action=0" /> + <forward name="success" path="/start.jsp" /> + </global-forwards> + + <!-- ========== Action Mapping Definitions ============================== --> + <action-mappings type="org.apache.struts.action.ActionMapping"> + + <!-- Process a user logon --> + <action path="/logon" type="org.agnitas.web.LogonAction" + name="logonForm" scope="request" input="/logon.jsp"> + <forward name="start_page" path="/start.jsp" /> + <forward name="view_logon" path="/logon.jsp" /> + <forward name="change_pwd_info" path="/change_pwd_info.jsp" /> + </action> + + <!-- Process a update --> + <action path="/update" type="org.agnitas.web.UpdateAction" + name="updateForm" scope="request" input="/start.jsp"> + <forward name="success" path="/update/update.jsp" /> + <forward name="question" path="/update/update_question.jsp" /> + <forward name="error" path="/update/update_error.jsp" /> + <forward name="list" path="/splash_settings.jsp" /> + </action> + + <!-- Process a campaign --> + <action path="/campaign" type="org.agnitas.web.CampaignAction" + name="campaignForm" scope="session" input="/campaign/list.jsp"> + <forward name="list" path="/campaign/list.jsp" /> + <forward name="view" path="/campaign/view.jsp" /> + <forward name="delete" path="/campaign/delete.jsp" /> + <forward name="new" path="/campaign/new.jsp" /> + <forward name="stat" path="/campaign/stat.jsp" /> + <forward name="splash" path="/campaign/splash.jsp" /> + </action> + + <!-- Process an admin --> + <action path="/admin" type="org.agnitas.web.AdminAction" + name="adminForm" scope="request" input="/settings/admin/view.jsp"> + <forward name="failure" path="/settings/admin/view.jsp" /> + <forward name="view" path="/settings/admin/view.jsp" /> + <forward name="list" path="/settings/admin/list.jsp" /> + <forward name="delete" path="/settings/admin/delete.jsp" /> + <forward name="rights" path="/settings/admin/rights.jsp" /> + </action> + + <!-- Process a salutation --> + <action path="/salutation" + type="org.agnitas.web.SalutationAction" name="salutationForm" + scope="request" input="/settings/salutation/view.jsp"> + <forward name="view" path="/settings/salutation/view.jsp" /> + <forward name="list" path="/settings/salutation/list.jsp" /> + <forward name="delete" + path="/settings/salutation/delete.jsp" /> + </action> + + <!-- Process a blacklist --> + <action path="/blacklist" type="org.agnitas.web.BlacklistAction" + name="blacklistForm" scope="request" + input="/settings/blacklist/list.jsp"> + <forward name="list" path="/settings/blacklist/list.jsp" /> + <forward name="delete" + path="/settings/blacklist/delete.jsp" /> + </action> + + <!-- Process profile_db fields --> + <action path="/profiledb" + type="org.agnitas.web.ProfileFieldAction" name="profileFieldForm" + scope="request" input="/settings/profile_field/view.jsp"> + <forward name="view" + path="/settings/profile_field/view.jsp" /> + <forward name="list" + path="/settings/profile_field/list.jsp" /> + <forward name="delete" + path="/settings/profile_field/delete.jsp" /> + <forward name="delete_error" + path="/settings/profile_field/delete_error.jsp" /> + </action> + + <!-- Process recipients --> + <action path="/recipient" type="org.agnitas.web.RecipientAction" + name="recipientForm" scope="session" input="/recipient/list.jsp"> + <forward name="list" path="/recipient/list.jsp" /> + <forward name="view" path="/recipient/view.jsp" /> + <forward name="delete" path="/recipient/delete.jsp" /> + <forward name="loading" path="/recipient/loading.jsp" /> + </action> + + <!-- Process target groups --> + <action path="/target" type="org.agnitas.web.TargetAction" + name="targetForm" scope="request" input="/targets/view.jsp"> + <forward name="failure" path="/targets/view.jsp" /> + <forward name="success" path="/targets/view.jsp" /> + <forward name="list" path="/targets/list.jsp" /> + <forward name="delete" path="/targets/delete.jsp" /> + <forward name="create_ml" path="/targets/new_ml.jsp" /> + <forward name="delete_recipients" + path="/targets/delete_recipients.jsp" /> + </action> + + <!-- Display Recipient Statistics --> + <action path="/recipient_stats" + type="org.agnitas.web.RecipientStatAction" name="recipientStatForm" + scope="request" input="/stats/recipient/select.jsp"> + <forward name="select" path="/stats/recipient/select.jsp" /> + <forward name="display" path="/stats/recipient/display.jsp" /> + </action> + + <!-- compare two up to n mailing response statistics --> + <action path="/mailing_compare" + type="org.agnitas.web.CompareMailingAction" name="compareMailingForm" + input="/stats/mailing_comp/select.jsp" scope="session"> + <forward name="list" path="/stats/mailing_comp/select.jsp" /> + <forward name="compare" path="/stats/mailing_comp/view.jsp" /> + </action> + + <!-- process Subscriber IP Statistics --> + <action path="/ip_stats" type="org.agnitas.web.IPStatAction" + name="ipStatForm" scope="session" input="/stats/ip_stats.jsp"> + <forward name="stat" path="/stats/ip_stats.jsp" /> + <forward name="splash" path="/stats/ip_splash.jsp" /> + </action> + + <!-- pisplay Subscriber Domain Statistics --> + <action path="/domain_stats" + type="org.agnitas.web.DomainStatAction" name="domainStatForm" + scope="session" input="/stats/domain_stats.jsp"> + <forward name="stat" path="/stats/domain_stats.jsp" /> + <forward name="splash" path="/stats/domain_splash.jsp" /> + </action> + + <!-- Process a mailing base information --> + <action path="/mailingbase" + type="org.agnitas.web.MailingBaseAction" name="mailingBaseForm" + scope="session" input="/mailing/view_base.jsp"> + <forward name="failure" path="/mailing/view_base.jsp" /> + <forward name="view" path="/mailing/view_base.jsp" /> + <forward name="list" path="/mailing/list.jsp" /> + <forward name="delete" path="/mailing/delete.jsp" /> + <forward name="action" path="/mailing/action.jsp" /> + <forward name="loading" path="/mailing/loading.jsp" /> + </action> + + <!-- Process a mailing content request --> + <action path="/mailingcontent" + type="org.agnitas.web.MailingContentAction" name="mailingContentForm" + scope="session" input="/mailing/content_list.jsp"> + <forward name="list" path="/mailing/content_list.jsp" /> + <forward name="view" path="/mailing/content_view.jsp" /> + </action> + + <!-- Process a mailing attachment request --> + <action path="/mailingattachments" + type="org.agnitas.web.MailingAttachmentsAction" + name="mailingAttachmentsForm" scope="request" + input="/mailing/attachments.jsp"> + <forward name="list" path="/mailing/attachments.jsp" /> + </action> + + <!-- Process a mailing send/preview request --> + <action path="/mailingsend" + type="org.agnitas.web.MailingSendAction" name="mailingSendForm" + scope="request" input="/mailing/send.jsp"> + <forward name="send" path="/mailing/send.jsp" /> + <forward name="send2" path="/mailing/send2.jsp" /> + <forward name="send_confirm" + path="/mailing/send_confirm.jsp" /> + <forward name="preview_select" + path="/mailing/preview_select.jsp" /> + <forward name="preview_header" + path="/mailing/preview_header.jsp" /> + <forward name="preview.0" path="/mailing/preview_text.jsp" /> + <forward name="preview.1" path="/mailing/preview_html.jsp" /> + <forward name="cancel_generation_question" + path="/mailing/cancel_generation_question.jsp" /> + <forward name="cancel_generation_deny" + path="/mailing/cancel_generation_deny.jsp" /> + <forward name="view_delstatbox" + path="/mailing/delivery_stat.jsp" /> + </action> + + <!-- Process a mailing statistics request --> + <action path="/mailing_stat" + type="org.agnitas.web.MailingStatAction" name="mailingStatForm" + scope="session" input="/stats/mailing_stats.jsp"> + <forward name="list" path="/stats/mailing_stats.jsp" /> + <forward name="mailing_stat" path="/stats/mailing_stat.jsp" /> + <forward name="week_stat" + path="/stats/mailing_stat_week.jsp" /> + <forward name="day_stat" path="/stats/mailing_stat_day.jsp" /> + <forward name="clean_question" + path="/stats/stat_clean_question.jsp" /> + <forward name="splash" path="/stats/mailstat_splash.jsp" /> + <forward name="opened_stat" + path="/stats/mailing_stat_opened.jsp" /> + <forward name="bounce_stat" + path="/stats/mailing_stat_bounce.jsp" /> + <forward name="bounce" path="/stats/mailing_bounce.jsp" /> + <forward name="open_week" + path="/stats/mailing_open_week.jsp" /> + <forward name="open_day" path="/stats/mailing_open_day.jsp" /> + </action> + + <!-- Process actions --> + <action path="/action" type="org.agnitas.web.EmmActionAction" + name="emmActionForm" scope="session" input="/actions/view.jsp"> + <forward name="failure" path="/actions/view.jsp" /> + <forward name="success" path="/actions/view.jsp" /> + <forward name="list" path="/actions/list.jsp" /> + <forward name="delete" path="/actions/delete.jsp" /> + </action> + + <!-- Process a mailinglist --> + <action path="/mailinglist" + type="org.agnitas.web.MailinglistAction" name="mailinglistForm" + scope="request" input="/mailinglists/view.jsp"> + <forward name="failure" path="/mailinglists/view.jsp" /> + <forward name="view" path="/mailinglists/view.jsp" /> + <forward name="list" path="/mailinglists/list.jsp" /> + <forward name="delete" path="/mailinglists/delete.jsp" /> + </action> + + <!-- Process a userform --> + <action path="/userform" + type="org.agnitas.web.UserFormEditAction" name="userFormEditForm" + scope="request" input="/userform/view.jsp"> + <forward name="view" path="/userform/view.jsp" /> + <forward name="list" path="/userform/list.jsp" /> + <forward name="delete" path="/userform/delete.jsp" /> + </action> + + <!-- Process MailingComponents --> + <action path="/mcomponents" + type="org.agnitas.web.MailingComponentsAction" + name="mailingComponentsForm" scope="request" + input="/mailing/components.jsp"> + <forward name="list" path="/mailing/components.jsp" /> + <forward name="component_edit" + path="/mailing/component_upload.jsp" /> + </action> + + <!-- Process a userform (execute) --> + <action path="/form" + type="org.agnitas.web.UserFormExecuteAction" + name="userFormExecuteForm" scope="request"> + </action> + + <!-- Process a trackable link --> + <action path="/tracklink" + type="org.agnitas.web.TrackableLinkAction" name="trackableLinkForm" + scope="request"> + <forward name="view" path="/mailing/trackablelink_view.jsp" /> + <forward name="list" path="/mailing/trackablelink_list.jsp" /> + </action> + + <!-- Process an import wizard --> + <action path="/importwizard" + type="org.agnitas.web.ImportWizardAction" name="importWizardForm" + scope="session" input="/importwizard/start.jsp"> + <forward name="start" path="/importwizard/start.jsp" /> + <forward name="mode" path="/importwizard/mode.jsp" /> + <forward name="mapping" path="/importwizard/mapping.jsp" /> + <forward name="verifymissingfields" + path="/importwizard/verifymissingfields.jsp" /> + <forward name="verify" path="/importwizard/verify.jsp" /> + <forward name="prescan" path="/importwizard/prescan.jsp" /> + <forward name="mlists" path="/importwizard/mlists.jsp" /> + <forward name="view_status" + path="/importwizard/upload_status.jsp" /> + <forward name="view_status_window" + path="/importwizard/upload_window.jsp" /> + </action> + + <!-- Process a export through a wizard--> + <action path="/exportwizard" + type="org.agnitas.web.ExportWizardAction" name="exportWizardForm" + scope="session" input="/exportwizard/query.jsp"> + <forward name="list" path="/exportwizard/list.jsp" /> + <forward name="query" path="/exportwizard/query.jsp" /> + <forward name="view" path="/exportwizard/view.jsp" /> + <forward name="view_status" + path="/exportwizard/view_window.jsp" /> + <forward name="savemask" path="/exportwizard/savemask.jsp" /> + <forward name="delete_question" + path="/exportwizard/delete.jsp" /> + </action> + + + <!-- Process a mailloop --> + <action path="/mailloop" type="org.agnitas.web.MailloopAction" + name="mailloopForm" scope="request" + input="/settings/mailloop/view.jsp"> + <forward name="list" path="/settings/mailloop/list.jsp" /> + <forward name="view" path="/settings/mailloop/view.jsp" /> + <forward name="delete" path="/settings/mailloop/delete.jsp" /> + </action> + + <!-- Mailing-Wizard mappings --> + <action path="/mwStart" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/start.jsp"> + <forward name="next" path="/mailing/wizard/name.jsp" /> + </action> + + <action path="/mwName" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/name.jsp"> + <forward name="previous" path="/mailing/wizard/start.jsp" /> + <forward name="next" path="/mailing/wizard/template.jsp" /> + </action> + + <action path="/mwTemplate" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/template.jsp"> + <forward name="previous" path="/mailing/wizard/name.jsp" /> + <forward name="next" path="/mailing/wizard/type.jsp" /> + </action> + + <action path="/mwType" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/type.jsp"> + <forward name="previous" + path="/mailing/wizard/template.jsp" /> + <forward name="next" path="/mailing/wizard/sendaddress.jsp" /> + </action> + + <action path="/mwSendaddress" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/sendaddress.jsp"> + <forward name="previous" path="/mailing/wizard/type.jsp" /> + <forward name="next" path="/mailing/wizard/mailtype.jsp" /> + </action> + + <action path="/mwMailtype" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/mailtype.jsp"> + <forward name="previous" + path="/mailing/wizard/sendaddress.jsp" /> + <forward name="next" path="/mailing/wizard/subject.jsp" /> + </action> + + <action path="/mwSubject" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/subject.jsp"> + <forward name="previous" + path="/mailing/wizard/mailtype.jsp" /> + <forward name="next" path="/mailing/wizard/target.jsp" /> + </action> + + <action path="/mwTarget" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/target.jsp"> + <forward name="previous" path="/mailing/wizard/subject.jsp" /> + <forward name="next" path="/mailing/wizard/textmodules.jsp" /> + <forward name="finish" path="/mailing/wizard/finish.jsp" /> + </action> + + <action path="/mwTextmodules" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/textmodules.jsp"> + <forward name="previous" path="/mailing/wizard/target.jsp" /> + <forward name="next" path="/mailing/wizard/textmodule.jsp" /> + <forward name="skip" path="/mailing/wizard/links.jsp" /> + <forward name="finish" path="/mailing/wizard/finish.jsp" /> + </action> + + <action path="/mwTextmodule" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/textmodule.jsp"> + <forward name="add" path="/mailing/wizard/textmodule.jsp" /> + <forward name="previous" + path="/mailing/wizard/textmodules.jsp" /> + <forward name="next" path="/mailing/wizard/textmodule.jsp" /> + <forward name="skip" path="/mailing/wizard/links.jsp" /> + <forward name="finish" path="/mailing/wizard/finish.jsp" /> + </action> + + <action path="/mwLinks" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/links.jsp"> + <forward name="previous" + path="/mailing/wizard/textmodules.jsp" /> + <forward name="next" path="/mailing/wizard/link.jsp" /> + <forward name="skip" path="/mailing/wizard/attachment.jsp" /> + <forward name="finish" path="/mailing/wizard/finish.jsp" /> + </action> + + <action path="/mwLink" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/link.jsp"> + <forward name="previous" path="/mailing/wizard/links.jsp" /> + <forward name="next" path="/mailing/wizard/link.jsp" /> + <forward name="skip" path="/mailing/wizard/attachment.jsp" /> + </action> + + <action path="/mwAttachment" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/attachment.jsp"> + <forward name="previous" path="/mailing/wizard/links.jsp" /> + <forward name="save" path="/mailing/wizard/attachment.jsp" /> + <forward name="next" path="/mailing/wizard/attachment.jsp" /> + <forward name="finish" path="/mailing/wizard/finish.jsp" /> + </action> + + <action path="/mwFinish" + type="org.agnitas.web.MailingWizardAction" name="mailingWizardForm" + scope="session" parameter="action" + input="/mailing/wizard/finish.jsp"> + <forward name="previous" + path="/mailing/wizard/attachment.jsp" /> + <forward name="next" path="/mailing/wizard/finish.jsp" /> + </action> + + </action-mappings> + + <message-resources parameter="messages" /> </struts-config> src/jsp/WEB-INF/struts-config.xml @@ -20,6 +20,15 @@ <param-value>/WEB-INF/applicationContext.xml /WEB-INF/dataAccessContext.xml /WEB-INF/cronContext.xml</param-value> <description>spring context</description> </context-param> + <!-- + <listener> + <listener-class>com.caucho.jsp.JspPrecompileListener</listener-class> + <init> + <extension>jsp</extension> + </init> + </listener> + --> + <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> @@ -40,18 +49,36 @@ <filter> <filter-name>SerializeRequestFilter</filter-name> - <filter-class>org.agnitas.dao.impl.SerializeRequestFilter</filter-class> + <filter-class>org.agnitas.web.filter.SerializeRequestFilter</filter-class> </filter> <filter-mapping> <filter-name>SerializeRequestFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + <filter> + <filter-name>AjaxAnywhere</filter-name> + <filter-class>org.ajaxanywhere.AAFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>AjaxAnywhere</filter-name> + <url-pattern>*.jsp</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>AjaxAnywhere</filter-name> + <url-pattern>*.do</url-pattern> <!-- default Struts mapping --> + </filter-mapping> + <filter-mapping> + <filter-name>AjaxAnywhere</filter-name> + <url-pattern>*.htm</url-pattern> <!-- other framewords mapping--> + </filter-mapping> + <filter> <filter-name>OpenSessionInView</filter-name> - <filter-class>org.agnitas.dao.impl.OpenSessionInViewFilter</filter-class> + <filter-class>org.agnitas.web.filter.OpenSessionInViewFilter</filter-class> </filter> <filter-mapping> @@ -225,6 +252,12 @@ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> </taglib> + <!-- ajax-anywhere --> + <taglib> + <taglib-uri>/WEB-INF/ajaxanywhere.tld</taglib-uri> + <taglib-location>/WEB-INF/ajaxanywhere.tld</taglib-location> + </taglib> + <mime-mapping> <extension>xsd</extension> <mime-type>text/xml</mime-type> src/jsp/WEB-INF/web.xml @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -29,7 +29,7 @@ <agn:Permission token="actions.delete"/> -<% +<% int tmpActionID=0; String tmpShortname=new String(""); src/jsp/actions/delete.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*, java.util.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*, java.util.*, org.agnitas.web.forms.*" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -42,11 +42,12 @@ <%@include file="/header.jsp"%> -<% EmmActionForm aForm = null; +<% + EmmActionForm aForm = null; if(session.getAttribute("emmActionForm")!=null) { aForm = (EmmActionForm) session.getAttribute("emmActionForm"); - } - %> + } +%> <table border="0" cellspacing="0" cellpadding="0" width="100%"> <tr> src/jsp/actions/list.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.actions.*, java.util.*, org.springframework.web.context.support.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.actions.*, java.util.*, org.springframework.web.context.support.*, org.agnitas.web.forms.*" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -29,15 +29,15 @@ <agn:Permission token="actions.change"/> -<% -int tmpActionID=0; -String tmpShortname=new String(""); +<% + int tmpActionID=0; + String tmpShortname=new String(""); -if(session.getAttribute("emmActionForm")!=null) { - tmpActionID=((EmmActionForm)session.getAttribute("emmActionForm")).getActionID(); - tmpShortname=((EmmActionForm)session.getAttribute("emmActionForm")).getShortname(); -} -%> + if(session.getAttribute("emmActionForm")!=null) { + tmpActionID=((EmmActionForm)session.getAttribute("emmActionForm")).getActionID(); + tmpShortname=((EmmActionForm)session.getAttribute("emmActionForm")).getShortname(); + } + %> <% pageContext.setAttribute("sidemenu_active", new String("Actions")); %> <% pageContext.setAttribute("sidemenu_sub_active", new String("New_Action")); %> src/jsp/actions/view.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.*" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -31,9 +31,9 @@ <% int tmpCampaignID=0; String tmpShortname=new String(""); - if(session.getAttribute("campaignForm")!=null) { - tmpCampaignID=((CampaignForm)session.getAttribute("campaignForm")).getCampaignID(); - tmpShortname=((CampaignForm)session.getAttribute("campaignForm")).getShortname(); + if(request.getAttribute("campaignForm")!=null) { + tmpCampaignID=((CampaignForm)request.getAttribute("campaignForm")).getCampaignID(); + tmpShortname=((CampaignForm)request.getAttribute("campaignForm")).getShortname(); } %> src/jsp/campaign/delete.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.*" %> <%@page import="org.apache.commons.beanutils.DynaBean"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> @@ -47,13 +47,9 @@ <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="http://ajaxtags.org/tags/ajax" prefix="ajax" %> - <%@include file="/header.jsp"%> <html:errors/> - - <table border="0" cellspacing="0" cellpadding="0"> - <tr> <td> <html:form action="/campaign"> @@ -62,16 +58,11 @@ <td><bean:message key="Admin.numberofrows"/></td> <td> <html:select property="numberofRows"> - <% - String[] sizes={"20","50","100"}; + <% String[] sizes={"20","50","100"}; for( int i=0;i< sizes.length; i++ ) - { - %> + { %> <html:option value="<%= sizes[i] %>"><%= sizes[i] %></html:option> - <% - } - %> - + <% } %> </html:select> </td> </tr> @@ -85,7 +76,7 @@ </td> </tr> <tr><td> - <ajax:displayTag id="campaignTable" ajaxFlag="displayAjax" tableClass="dataTable" > + <ajax:displayTag id="campaignTable" ajaxFlag="displayAjax"> <display:table class="dataTable" id="campaign" name="campaignlist" pagesize="${campaignForm.numberofRows}" requestURI="/campaign.do?action=${ACTION_LIST}" excludedParams="*" sort="external"> <display:column headerClass="head_name" class="name" titleKey="Campaign" maxLength="20" property="shortname" sortable="true" paramId="campaignID" paramProperty="campaignId" url="/campaign.do?action=${ACTION_VIEW}" /> <display:column headerClass="head_description" class="description" titleKey="Description" maxLength="20" property="description" sortable="true" paramId="campaignID" paramProperty="campaignId" url="/campaign.do?action=${ACTION_VIEW}" /> @@ -96,12 +87,9 @@ <agn:ShowByPermission token="campaign.change"> <html:link page="/campaign.do?action=${ACTION_VIEW}&campaignID=${campaign.campaignId}"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>bearbeiten.gif" alt="<bean:message key="Edit"/>" border="0"></html:link> </agn:ShowByPermission> - </display:column> </display:table> </ajax:displayTag> </td></tr> - </table> - -<%@include file="/footer.jsp"%> +<%@include file="/footer.jsp"%> \ No newline at end of file src/jsp/campaign/list.jsp @@ -20,11 +20,15 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*,java.util.*"%> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, java.util.*"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/ajaxanywhere.tld" prefix="aa" %> + + + <agn:CheckLogon/> @@ -32,33 +36,80 @@ <% int tmpCampaignID=0; String tmpShortname=new String(""); - if(session.getAttribute("campaignForm")!=null) { - tmpCampaignID=((CampaignForm)session.getAttribute("campaignForm")).getCampaignID(); - tmpShortname=((CampaignForm)session.getAttribute("campaignForm")).getShortname(); - } -%> + + if(session.getAttribute("campaignForm")!=null) { + CampaignForm campaignForm = (CampaignForm) session.getAttribute("campaignForm"); + tmpCampaignID = campaignForm.getCampaignID(); + tmpShortname = campaignForm.getShortname(); + campaignForm.setAction(CampaignAction.ACTION_STAT); + + +// tmpCampaignID=((CampaignForm)request.getAttribute("campaignForm")).getCampaignID(); +// tmpShortname=((CampaignForm)request.getAttribute("campaignForm")).getShortname(); +// tmpIsReady=((CampaignForm)request.getAttribute("campaignForm")).isStatReady(); +} -<% pageContext.setAttribute("agnSubtitleKey", new String("Campaign")); pageContext.setAttribute("agnSubtitleValue", tmpShortname); pageContext.setAttribute("agnNavigationKey", new String("Campaign")); pageContext.setAttribute("agnHighlightKey", new String("Campaign")); pageContext.setAttribute("sidemenu_sub_active", new String("NewCampaign")); - %> -<% pageContext.setAttribute("sidemenu_active", new String("Campaigns")); %> -<% pageContext.setAttribute("agnTitleKey", new String("Campaigns")); %> -<% pageContext.setAttribute("agnNavHrefAppend", new String("&campaignID="+tmpCampaignID)); %> -<% pageContext.setAttribute("agnRefresh", new String("2")); %> + pageContext.setAttribute("sidemenu_active", new String("Campaigns")); + + pageContext.setAttribute("agnTitleKey", new String("Campaigns")); + pageContext.setAttribute("agnNavHrefAppend", new String("&campaignID="+tmpCampaignID)); + %> +<%-- pageContext.setAttribute("agnRefresh", new String("2")); --%> + + <%@include file="/header.jsp"%> -<html:errors/> +<!-- The following part is for reloading the page and as soon as possible move +on to the Result-Page of the Database request. --> +<script> + /* calls the submit-procedure */ + function go() { + document.getElementsByName('campaignForm')[0].submit(); + } + + /* this method returns the zones which shall be reloaded. */ + ajaxAnywhere.getZonesToReload = function () { + return "loading" + }; - <html:form action="/campaign.do"> + /* this method is our starting-point */ + ajaxAnywhere.onAfterResponseProcessing = function () { + if(! ${campaignForm.error } ) { + window.setTimeout("go();", ${campaignForm.refreshMillis}); + } else { + System.err.println("Fehler: " + campaignForm.error); + } + } + + /* We do not have any loading message */ + ajaxAnywhere.showLoadingMessage = function(){}; + + /* call it.*/ + ajaxAnywhere.onAfterResponseProcessing(); +</script> + +<aa:zone name="loading" > <!-- all within these tags will be reloaded, nothing more --> +<html:errors/> + <html:form action="/campaign"> <html:hidden property="action"/> <html:hidden property="campaignID"/> + <html:hidden property="error"/> + +<% +// CampaignForm campaignForm = null; +// if ((CampaignForm)session.getAttribute("campaignForm") != null) { +// campaignForm=(CampaignForm)session.getAttribute("campaignForm"); +// campaignForm.setAction(CampaignAction.ACTION_STAT); +// } +%> <table border="0" cellspacing="0" cellpadding="0" width="400"> <tr> @@ -67,7 +118,7 @@ </td> </tr> <tr> - <td> + <td> <img border="0" width="44" height="48" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>wait.gif"/> </td> </tr> @@ -80,16 +131,16 @@ <td> <b><bean:message key="StatSplashMessage"/><b> </td> - </tr> - <tr> + </tr> + <tr> <td> <b>&nbsp;<b> - </td> + </td> </tr> </table> </html:form> - +</aa:zone> <%@include file="/footer.jsp"%> src/jsp/campaign/splash.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*, org.agnitas.stat.*, java.util.*, org.springframework.context.*, org.springframework.web.context.support.WebApplicationContextUtils" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.*, org.agnitas.stat.*, java.util.*, org.springframework.context.*, org.springframework.web.context.support.WebApplicationContextUtils" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -32,10 +32,10 @@ <% int tmpCampaignID=0; String tmpShortname=new String(""); - int tmpTargetID=0; + int tmpTargetID=0; if(session.getAttribute("campaignForm")!=null) { tmpCampaignID=((CampaignForm)session.getAttribute("campaignForm")).getCampaignID(); - tmpShortname=((CampaignForm)session.getAttribute("campaignForm")).getShortname(); + tmpShortname=((CampaignForm)session.getAttribute("campaignForm")).getShortname(); // tmpTargetID=((CampaignForm)session.getAttribute("campaignForm")).getTargetID(); } String file = ""; @@ -57,25 +57,37 @@ pageContext.setAttribute("agnTitleKey", new String("Campaigns")); pageContext.setAttribute("agnNavHrefAppend", new String("&campaignID="+tmpCampaignID)); - // csv download stuff: + + // csv download stuff: + org.agnitas.util.EmmCalendar my_calendar = new EmmCalendar(java.util.TimeZone.getDefault()); TimeZone zone=TimeZone.getTimeZone(((Admin)session.getAttribute("emm.admin")).getAdminTimezone()); my_calendar.changeTimeWithZone(zone); java.util.Date my_time = my_calendar.getTime(); String Datum = my_time.toString(); + timekey = Long.toString(my_time.getTime()); pageContext.setAttribute("time_key", timekey); my_map = null; - if(pageContext.getSession().getAttribute("map") == null) + + if(pageContext.getSession().getAttribute("map") == null) // original line { my_map = new java.util.Hashtable(); pageContext.getSession().setAttribute("map",my_map); + // pageContext.setAttribute("map",my_map); } else { + // my_map = (java.util.Hashtable)(pageContext.getAttribute("map")); my_map = (java.util.Hashtable)(pageContext.getSession().getAttribute("map")); } file = ((CampaignForm)session.getAttribute("campaignForm")).getCsvfile(); + +// put csv file in pagecontext: + // my_map.put(timekey, file); + // pageContext.setAttribute("map", my_map); + //request.setAttribute("map", my_map); + } %> <% pageContext.setAttribute("sidemenu_active", new String("Campaigns")); %> @@ -100,7 +112,8 @@ <html:select property="targetID"> <html:option value="0"><bean:message key="All_Subscribers"/></html:option> <agn:ShowTable id="agntbl3" sqlStatement="<%= new String("SELECT target_id, target_shortname FROM dyn_target_tbl WHERE company_id="+AgnUtils.getCompanyID(request)) %>" maxRows="500"> - <html:option value="<%= (String)(pageContext.getAttribute("_agntbl3_target_id")) %>"><%= pageContext.getAttribute("_agntbl3_target_shortname") %></html:option> + <html:option value="<%= (String)(session.getAttribute("_agntbl3_target_id")) %>"><%= session.getAttribute("_agntbl3_target_shortname") %></html:option> + </agn:ShowTable> </html:select><br><br> </td> @@ -123,13 +136,13 @@ <table border="0" cellspacing="0" cellpadding="0"> <tr><td colspan="11">&nbsp;</td></tr> -<% - file += "\"" + SafeString.getLocaleString("Mailing", (Locale)session.getAttribute("messages_lang")) + "\";"; - file += "\"" + SafeString.getLocaleString("Opened_Mails", (Locale)session.getAttribute("messages_lang")) + "\";"; - file += "\"" + SafeString.getLocaleString("Opt_Outs", (Locale)session.getAttribute("messages_lang")) + "\";"; - file += "\"" + SafeString.getLocaleString("Bounces", (Locale)session.getAttribute("messages_lang")) + "\";"; - file += "\"" + SafeString.getLocaleString("Recipients", (Locale)session.getAttribute("messages_lang")) + "\";"; - file += "\"" + SafeString.getLocaleString("Clicks", (Locale)session.getAttribute("messages_lang")) + "\""; +<% + file = "\"" + SafeString.getLocaleString("Mailing", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; + file += "\"" + SafeString.getLocaleString("Opened_Mails", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; + file += "\"" + SafeString.getLocaleString("Opt_Outs", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; + file += "\"" + SafeString.getLocaleString("Bounces", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; + file += "\"" + SafeString.getLocaleString("Recipients", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; + file += "\"" + SafeString.getLocaleString("Clicks", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\""; file += "\r\n"; %> @@ -149,18 +162,24 @@ <tr><td colspan="11"><hr></td></tr> -<% Hashtable mailingData = ((CampaignForm)session.getAttribute("campaignForm")).getMailingData(); +<% CampaignForm aForm = (CampaignForm)session.getAttribute("campaignForm"); + // Hashtable mailingData = ((CampaignForm)session.getAttribute("campaignForm")).getMailingData(); + Hashtable mailingData = aForm.getMailingData(); if(mailingData == null) { mailingData=new Hashtable(); } - Enumeration keys = mailingData.keys(); + // Enumeration keys = mailingData.keys(); + Iterator<Number> keys = aForm.getSortedKeys().iterator(); ApplicationContext aContext=WebApplicationContextUtils.getWebApplicationContext(application); - CampaignStatEntry aktEntry = (CampaignStatEntry) aContext.getBean("CampaignStatEntry"); + // CampaignStatEntry aktEntry = (CampaignStatEntry) aContext.getBean("CampaignStatEntry"); + CampaignStatEntry aktEntry = null; + int aktKey = 0; - while(keys.hasMoreElements()) { - aktKey = ((Number)(keys.nextElement())).intValue(); + while(keys.hasNext()) { + aktKey = (keys.next()).intValue(); aktEntry = (CampaignStatEntry)(mailingData.get(new Integer(aktKey))); + %> <tr> <td><html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_MAILINGSTAT + "&mailingID=" + aktKey) %>"><b><nobr><% if(aktEntry.getShortname().length() > 25) { %><%= aktEntry.getShortname().substring(0,24) %><% } else { %><%= aktEntry.getShortname() %><% } %>&nbsp;</nobr></b></html:link></td> @@ -197,7 +216,7 @@ <tr> <td><b><bean:message key="Total"/></b></td> - <% file += "\"" + SafeString.getLocaleString("Total", (Locale)session.getAttribute("messages_lang")) + "\";"; %> + <% file += "\"" + SafeString.getLocaleString("Total", (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)) + "\";"; %> <td background="<bean:write name="emm.layout" property="baseUrl" scope="session"/>border_06.gif"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>one_pixel.gif" width="10" height="10" border="0"></td> <td align="right"> <b><%= ((CampaignForm)session.getAttribute("campaignForm")).getOpened() %>&nbsp;</b> @@ -236,9 +255,10 @@ </table> <% } %> -<% // put csv file in session: +<% // put csv file in request-Context. my_map.put(timekey, file); pageContext.getSession().setAttribute("map", my_map); + // pageContext.getSession().setAttribute("map", timekey); %> </html:form> src/jsp/campaign/stat.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*, java.text.*, java.util.*" %> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.forms.*, org.agnitas.web.*, org.agnitas.beans.*, java.text.*, java.util.*" %> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -30,15 +30,15 @@ <agn:Permission token="campaign.show"/> -<% int tmpCampaignID=0; - String tmpShortname=new String(""); - if(session.getAttribute("campaignForm")!=null) { - tmpCampaignID=((CampaignForm)session.getAttribute("campaignForm")).getCampaignID(); - tmpShortname=((CampaignForm)session.getAttribute("campaignForm")).getShortname(); - } -%> +<% int tmpCampaignID = 0; + String tmpShortname = new String(""); + if(session.getAttribute("campaignForm")!=null) { + tmpCampaignID = ((CampaignForm)session.getAttribute("campaignForm")).getCampaignID(); + tmpShortname = ((CampaignForm)session.getAttribute("campaignForm")).getShortname(); + } + %> -<% if(tmpCampaignID!=0) { +<% if(tmpCampaignID != 0) { pageContext.setAttribute("agnSubtitleKey", new String("Campaign")); pageContext.setAttribute("agnSubtitleValue", tmpShortname); pageContext.setAttribute("agnNavigationKey", new String("Campaign")); @@ -47,28 +47,25 @@ pageContext.setAttribute("agnSubtitleKey", new String("NewCampaign")); pageContext.setAttribute("agnNavigationKey", new String("CampaignNew")); pageContext.setAttribute("agnHighlightKey", new String("NewCampaign")); -}pageContext.setAttribute("sidemenu_sub_active", new String("NewCampaign")); +} +pageContext.setAttribute("sidemenu_sub_active", new String("NewCampaign")); %> <% pageContext.setAttribute("sidemenu_active", new String("Campaigns")); %> - <% pageContext.setAttribute("agnTitleKey", new String("Campaigns")); %> -<% pageContext.setAttribute("agnNavHrefAppend", new String("&campaignID="+tmpCampaignID)); %> +<% pageContext.setAttribute("agnNavHrefAppend", new String("&campaignID=" + tmpCampaignID)); %> <% SimpleDateFormat parsedate=new SimpleDateFormat("yyyyMMdd"); - DateFormat showdate=DateFormat.getDateInstance(DateFormat.MEDIUM, (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)); - String aDate=new String(""); - Date tmpDate=null; + DateFormat showdate = DateFormat.getDateInstance(DateFormat.MEDIUM, (Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)); + String aDate = new String(""); + Date tmpDate = null; %> <%@include file="/header.jsp"%> <html:errors/> - <html:form action="/campaign.do"> <html:hidden property="action"/> <html:hidden property="campaignID"/> - - <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><bean:message key="Name"/>:&nbsp;</td> @@ -76,53 +73,38 @@ <html:text property="shortname" maxlength="99" size="42"/> </td> </tr> - <tr> <td><bean:message key="Description_opt"/>:&nbsp;</td> <td> <html:textarea property="description" rows="5" cols="32"/> </td> </tr> - <tr> <td colspan=2>&nbsp;</td> </tr> - <tr> <td colspan=2> - <agn:ShowByPermission token="campaign.change"> <html:image src="button?msg=Save" border="0" property="save" value="save"/>&nbsp; </agn:ShowByPermission> - <logic:notEqual name="campaignForm" property="campaignID" value="0"> <agn:ShowByPermission token="campaign.delete"> - <html:link page="<%= new String("/campaign.do?action=" + CampaignAction.ACTION_CONFIRM_DELETE) %>"><html:img src="button?msg=Delete" border="0"/></html:link> + <html:link page="<%= new String("/campaign.do?action=" + CampaignAction.ACTION_CONFIRM_DELETE + "&campaignID=" + tmpCampaignID ) %>"><html:img src="button?msg=Delete" border="0"/></html:link> </agn:ShowByPermission> </logic:notEqual> - - </td> </tr> - </table> - - - -<% if(tmpCampaignID!=0) { %> +<% if(tmpCampaignID != 0) { %> <br><br> - <span class="head3"><bean:message key="Mailings"/>:</span> - <!-- MailingBaseAction.ACTION_VIEW --> + <!-- MailingBaseAction.ACTION_VIEW --> <agn:ShowByPermission token="mailing.new"> - <br><br><html:link page="<%= new String("/mailingbase.do?action=" + MailingBaseAction.ACTION_NEW+"&mailingID=0&campaignID="+tmpCampaignID) %>"><bean:message key="New_Mailing"/>...</html:link> + <br><br><html:link page="<%= new String("/mailingbase.do?action=" + MailingBaseAction.ACTION_NEW + "&mailingID=0&campaignID=" + tmpCampaignID) %>"><bean:message key="New_Mailing"/>...</html:link> </agn:ShowByPermission> <table border="0" cellspacing="0" cellpadding="0"> - - <tr><td colspan="4">&nbsp;</td></tr> - <tr> <td><b><bean:message key="Mailing"/>&nbsp;&nbsp;</b></td> <td><b><bean:message key="Description"/>&nbsp;&nbsp;</b></td> @@ -132,18 +114,16 @@ </tr> <tr><td colspan="5"><hr></td></tr> <% int rows = 0; %> - - <agn:ShowTable id="agnTbl" sqlStatement="<%= new String("SELECT a.mailing_id, a.shortname, a.description, b.shortname AS listname, (SELECT "+AgnUtils.sqlDateString("min(c."+AgnUtils.changeDateName()+")", "yyyymmdd")+" FROM mailing_account_tbl c WHERE a.mailing_id=c.mailing_id AND c.status_field='W') AS senddate FROM mailing_tbl a, mailinglist_tbl b WHERE a.company_id="+AgnUtils.getCompanyID(request)+ " AND a.campaign_id=" + tmpCampaignID + " AND a.deleted<>1 AND a.is_template=0 AND a.mailinglist_id=b.mailinglist_id ORDER BY senddate DESC, mailing_id DESC")%>" startOffset="<%= request.getParameter("startWith") %>" maxRows="50" encodeHtml="0"> <tr> <!-- MailingBaseAction.ACTION_VIEW --> <td><html:link page="<%= new String("/mailingbase.do?action=" + MailingBaseAction.ACTION_VIEW + "&mailingID=" + pageContext.getAttribute("_agnTbl_mailing_id")) %>"><b><%= pageContext.getAttribute("_agnTbl_shortname") %></b></html:link>&nbsp;&nbsp;</td> <td><html:link page="<%= new String("/mailingbase.do?action=" + MailingBaseAction.ACTION_VIEW + "&mailingID=" + pageContext.getAttribute("_agnTbl_mailing_id")) %>"><%= SafeString.cutLength((String)pageContext.getAttribute("_agnTbl_description"), 40) %></html:link>&nbsp;&nbsp;</td> <td><%= pageContext.getAttribute("_agnTbl_listname") %>&nbsp;&nbsp;</td> <% try{ - tmpDate=parsedate.parse((String)pageContext.getAttribute("_agnTbl_senddate")); - aDate=showdate.format(tmpDate); + tmpDate = parsedate.parse((String)pageContext.getAttribute("_agnTbl_senddate")); + aDate = showdate.format(tmpDate); } catch (Exception e) { - aDate=new String(""); + aDate = new String(""); } %> <td><%= aDate %>&nbsp;&nbsp;&nbsp;&nbsp;</td> @@ -156,7 +136,7 @@ </tr> <% rows++; %> </agn:ShowTable> - <% if(rows==0) { %> + <% if(rows == 0) { %> <tr><td colspan="5"><b><bean:message key="NoMailingsInCampaign"/>&nbsp;&nbsp;</b></td></tr> <% } %> @@ -176,9 +156,5 @@ </table> <% } %> - - - - </html:form> -<%@include file="/footer.jsp"%> +<%@include file="/footer.jsp"%> \ No newline at end of file src/jsp/campaign/view.jsp @@ -23,7 +23,7 @@ --%><%@ page language="java" import="org.agnitas.util.*, java.util.*, org.agnitas.web.*" contentType="text/javascript; charset=utf-8" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<% int tmpMailingID=Integer.parseInt(request.getParameter("mailingID")); %> +<% int tmpMailingID=Integer.parseInt(request.getParameter("mailingID"));%> /* * FCKeditor - The text editor for internet @@ -43,7 +43,6 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ - FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; FCKConfig.DocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' ; @@ -153,7 +152,7 @@ FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all FCKConfig.LinkUploadDeniedExtensions = ".(php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi)$" ; // empty for no one FCKConfig.ImageUpload = true ; -FCKConfig.ImageUploadURL = '<html:rewrite page="<%= "/mcomponents.do?action=12&mailingID="+tmpMailingID %>"/>' ; +FCKConfig.ImageUploadURL = '<html:rewrite page="<%= "/mcomponents.do?action="+ MailingComponentsAction.ACTION_SAVE_COMPONENTS + "&mailingID="+tmpMailingID %>"/>' ; // PHP // FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/php/upload.php?Type=Image' ; FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png)$" ; // empty for all FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one @@ -169,6 +168,9 @@ FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif',' FCKConfig.SmileyColumns = 8 ; FCKConfig.SmileyWindowWidth = 320 ; FCKConfig.SmileyWindowHeight = 240 ; -FCKConfig.ProtectedSource.Add(/<img[\s\S]*?>/gi); +FCKConfig.ProtectedSource.Add( /<img[^>]*src="\[agn[^>]*>/gi ); + + + if( window.console ) window.console.log( 'Config is loaded!' ) ; // @Packager.Compactor.RemoveLine \ No newline at end of file src/jsp/fckeditor2.5/emmconfig.jsp @@ -51,6 +51,7 @@ <script type="text/javascript" src="<%=request.getContextPath()%>/js/ajax/ajaxtags.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/js/ajax/ajaxtags_controls.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/js/ajax/ajaxtags_parser.js"></script> +<script type="text/javascript" src="<%=request.getContextPath()%>/js/aa.js"></script> <body> <table border="0" cellspacing="0" cellpadding="0" height="100%" width="100%"> <tr align="left" valign="top"> src/jsp/header.jsp @@ -91,7 +91,7 @@ <br><b><bean:message key="import.keycolumn"/>:</b><br> <html:select property="status.keycolumn" size="1"> <agn:ShowColumnInfo id="agnTbl" table="<%= AgnUtils.getCompanyID(request) %>"> - <html:option value="<%= (String) pageContext.getAttribute("_agnTbl_shortname") %>"></html:option> + <html:option value="<%= (String) pageContext.getAttribute("_agnTbl_column_name") %>"><%= (String) pageContext.getAttribute("_agnTbl_shortname") %></html:option> </agn:ShowColumnInfo> </html:select> </td> src/jsp/importwizard/mode.jsp @@ -2,13 +2,13 @@ <html> <head> - <title>Welcome to OpenEMM 5.5.0</title> + <title>Welcome to OpenEMM 5.5.1</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> </head> <body bgcolor="#FFFFFF" text="#000000" link="#2A5682" vlink="#2A5682" alink="#96B9DC" style="font-family:Tahoma, Arial, Helvetica, sans-serif"> <img src="images/emm/logo_ul.gif" border="0" style="margin:10px"> - <h1 style="color:#3974AF">OpenEMM 5.5.0</h1> + <h1 style="color:#3974AF">OpenEMM 5.5.1</h1> <hr style="border:1px solid #3974AF"> <p><b>Welcome to OpenEMM! This server is now running OpenEMM and ready for the launch of your email campaigns.</b> <br> src/jsp/index.html @@ -92,22 +92,16 @@ <html:hidden property="contentID"/> <table border="0" cellspacing="0" cellpadding="0"> <tr><td colspan="3"><span class="head3"><bean:message key="Text_Module"/>:&nbsp;<%= aForm.getDynName() %></span></td></tr> - <% String prepareSave = " "; %> + <logic:iterate id="dyncontent" name="mailingContentForm" property="content"> <% Map.Entry ent2=(Map.Entry)pageContext.getAttribute("dyncontent"); tagContent=(DynamicTagContent)ent2.getValue(); index=(String)ent2.getKey(); - prepareSave += "\n// If the textarea isn't visible update the content from the editor.\n "+ - "if ( document.getElementById( 'Textarea"+tagContent.getId()+"' ).style.display == 'none' ){\n " + - " var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor"+tagContent.getId()+"' ) ;\n" + - " document.getElementById( 'content_"+index+"_.dynContent' ).value = oEditor.GetXHTML() ;\n" + - " } \n "; - %> + %> <script type="text/javascript"> - // have a look @ sample13.html from the fckeditor docs - - var isFCKEditorActive<%= tagContent.getId() %> = false; + // have a look @ sample13.html from the fckeditor docs + var isFCKEditorActive<%= tagContent.getId() %> = false; function Toggle<%= tagContent.getId() %>() { @@ -188,11 +182,10 @@ // editor instance is completely loaded and available for API interactions. function FCKeditor_OnComplete( editorInstance ) { - // Switch Image ?? } function save<%= tagContent.getId() %>() { - if(isFCKEditorActive<%= tagContent.getId() %>== true) { + if(isFCKEditorActive<%= tagContent.getId() %>== true || document.getElementById( 'Textarea"+tagContent.getId()+"' ).style.display == 'none' ) { var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor<%= tagContent.getId() %>' ) ; document.getElementById('content_<%= index %>_.dynContent').value = oEditor.GetXHTML() ; } @@ -315,26 +308,8 @@ } - - // The FCKeditor_OnComplete function is a special function called everytime an - // editor instance is completely loaded and available for API interactions. - function FCKeditor_OnComplete( editorInstance ) - { - // Switch Image ?? - } - - function PrepareSave() - { - // If the textarea isn't visible update the content from the editor. - if ( document.getElementById( 'Textarea' ).style.display == 'none' ) - { - var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; - document.getElementById( 'newContent' ).value = oEditor.GetXHTML() ; - } - <%= prepareSave %> - } - function save() { - if(isFCKEditorActive== true) { + function save() { + if(isFCKEditorActive== true || document.getElementById( 'Textarea' ).style.display == 'none') { var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; document.getElementById('newContent').value = oEditor.GetXHTML() ; } src/jsp/mailing/content_view.jsp @@ -68,8 +68,16 @@ <% } %> <%@include file="/header.jsp"%> +<script type="text/javascript"> +<!-- + function parametersChanged(){ + document.getElementsByName('mailingBaseForm')[0].numberOfRowsChanged.value = true; + } +//--> +</script> <html:errors/> <html:form action="/mailingbase"> + <html:hidden property="numberOfRowsChanged" /> <% if(isTemplate==0) { %> <table> <tr> @@ -77,14 +85,14 @@ <html:hidden property="__STRUTS_CHECKBOX_mailingTypeNormal" value="false"/> <html:hidden property="__STRUTS_CHECKBOX_mailingTypeEvent" value="false"/> <html:hidden property="__STRUTS_CHECKBOX_mailingTypeDate" value="false"/> - <html:checkbox property="mailingTypeNormal"><bean:message key="Mailing_normal_show"/></html:checkbox>&nbsp;&nbsp;&nbsp; - <html:checkbox property="mailingTypeEvent"><bean:message key="Mailing_event_show"/></html:checkbox>&nbsp;&nbsp;&nbsp; - <html:checkbox property="mailingTypeDate"><bean:message key="Mailing_date_show"/></html:checkbox>&nbsp; + <html:checkbox property="mailingTypeNormal" onchange="parametersChanged()"><bean:message key="Mailing_normal_show"/></html:checkbox>&nbsp;&nbsp;&nbsp; + <html:checkbox property="mailingTypeEvent" onchange="parametersChanged()"><bean:message key="Mailing_event_show"/></html:checkbox>&nbsp;&nbsp;&nbsp; + <html:checkbox property="mailingTypeDate" onchange="parametersChanged()"><bean:message key="Mailing_date_show"/></html:checkbox>&nbsp; </td> </tr> <tr> <td><bean:message key="Admin.numberofrows"/>&nbsp; - <html:select property="numberofRows"> + <html:select property="numberofRows" onchange="parametersChanged()"> <% String[] sizes={"20","50","100"}; for( int i=0;i< sizes.length; i++ ) @@ -140,9 +148,7 @@ %> <tr> <td> - <ajax:displayTag id="mailingTable" ajaxFlag="displayAjax"> - - <display:table class="dataTable" id="mailing" name="mailinglist" pagesize="${mailingBaseForm.numberofRows}" requestURI="/mailingbase.do?action=${mailingBaseForm.action}&isTemplate=${mailingBaseForm.isTemplate}" excludedParams="*"> + <display:table class="dataTable" id="mailing" name="mailinglist" pagesize="${mailingBaseForm.numberofRows}" requestURI="/mailingbase.do?action=${mailingBaseForm.action}&isTemplate=${mailingBaseForm.isTemplate}" excludedParams="*" partialList="true" size="${mailinglist.fullListSize}" sort="external"> <logic:equal name="mailingBaseForm" property="isTemplate" value="false"> <display:column headerClass="head_action" class="action"> <html:link page="/mailingbase.do?action=${ACTION_USED_ACTIONS}&mailingID=${mailing.mailingid}"><img border="0" title="<bean:message key="action_link" />" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>extlink.gif"></html:link>&nbsp;&nbsp; @@ -164,23 +170,13 @@ <display:column headerClass="head_mailinglist" class="mailinglist" titleKey="Mailinglist" property="mailinglist" sortable="true"/> <display:column class="edit"> <agn:ShowByPermission token="mailing.delete"> - <html:link page="/mailingbase.do?action=${ACTION_CONFIRM_DELETE}&mailingID=${mailing.mailingid}"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>delete.gif" alt="<bean:message key="Delete"/>" border="0"></html:link> - </agn:ShowByPermission> + <html:link page="/mailingbase.do?action=6&mailingID=${mailing.mailingid}"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>delete.gif" alt="<bean:message key="Delete"/>" border="0"></html:link> + </agn:ShowByPermission> <html:link page="/mailingbase.do?action=${ACTION_VIEW}&mailingID=${mailing.mailingid}"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>bearbeiten.gif" alt="<bean:message key="Edit"/>" border="0"></html:link> </display:column> - - - </logic:equal> - - + </logic:equal> </display:table> - </ajax:displayTag> - </td> + </td> </tr> - - - </table> - - - + </table> <%@include file="/footer.jsp"%> src/jsp/mailing/list.jsp @@ -268,28 +268,112 @@ </td> </tr> <script type="text/javascript"> - <!-- - var oFCKeditorHtml=null; - function editHtmlHtml() { - if(oFCKeditorHtml==null) { - oFCKeditorHtml = new FCKeditor( 'htmlTemplate' ) ; - oFCKeditorHtml.Config[ "AutoDetectLanguage" ] = false ; - oFCKeditorHtml.Config[ "DefaultLanguage" ] = "<%= aLocale.getLanguage() %>" ; - oFCKeditorHtml.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; - oFCKeditorHtml.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID="+tmpMailingID) %>"/>" ; - oFCKeditorHtml.ToolbarSet = "emm" ; - oFCKeditorHtml.BasePath = baseUrl+"/fckeditor2.5/" ; - oFCKeditorHtml.Height = "400" ; // 400 pixels - oFCKeditorHtml.Width = 650 ; // 400 pixels - oFCKeditorHtml.ReplaceTextarea(); - } - return true; - } - //--> - </script> + + var isFCKEditorActive=false; + function Toggle() + { + // Try to get the FCKeditor instance, if available. + var oEditor ; + if ( typeof( FCKeditorAPI ) != 'undefined' ) + oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + + // Get the _Textarea and _FCKeditor DIVs. + var eTextareaDiv = document.getElementById( 'Textarea' ) ; + var eFCKeditorDiv = document.getElementById( 'FCKeditor' ) ; + + // If the _Textarea DIV is visible, switch to FCKeditor. + if ( eTextareaDiv.style.display != 'none' ) + { + // If it is the first time, create the editor. + if ( !oEditor ) + { + CreateEditor() ; + } + else + { + // Set the current text in the textarea to the editor. + oEditor.SetData( document.getElementById('newContent').value ) ; + } + + // Switch the DIVs display. + eTextareaDiv.style.display = 'none' ; + eFCKeditorDiv.style.display = '' ; + + // This is a hack for Gecko 1.0.x ... it stops editing when the editor is hidden. + if ( oEditor && !document.all ) + { + if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG ) + oEditor.MakeEditable() ; + } + isFCKEditorActive=true; + } + else + { + // Set the textarea value to the editor value. + document.getElementById('newContent').value = oEditor.GetXHTML() ; + + // Switch the DIVs display. + eTextareaDiv.style.display = '' ; + eFCKeditorDiv.style.display = 'none' ; + isFCKEditorActive=false; + } + } + + function CreateEditor() + { + // Copy the value of the current textarea, to the textarea that will be used by the editor. + document.getElementById('DataFCKeditor').value = document.getElementById('newContent').value ; + + // Automatically calculates the editor base path based on the _samples directory. + // This is usefull only for these samples. A real application should use something like this: + // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. + + // Create an instance of FCKeditor (using the target textarea as the name). + + oFCKeditorNew = new FCKeditor( 'DataFCKeditor' ) ; + oFCKeditorNew.Config[ "AutoDetectLanguage" ] = false ; + oFCKeditorNew.Config[ "DefaultLanguage" ] = "<%= ((Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)).getLanguage() %>" ; + oFCKeditorNew.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID="+tmpMailingID) %>"/>" ; + oFCKeditorNew.ToolbarSet = "emm" ; + oFCKeditorNew.BasePath = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Height = "400" ; // 400 pixels + oFCKeditorNew.Width = "650" ; + oFCKeditorNew.ReplaceTextarea(); + } + + // The FCKeditor_OnComplete function is a special function called everytime an + // editor instance is completely loaded and available for API interactions. + function FCKeditor_OnComplete( editorInstance ) + { + // Switch Image ?? + } + + function PrepareSave() + { + // If the textarea isn't visible update the content from the editor. + if ( document.getElementById( 'Textarea' ).style.display == 'none' ) + { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById( 'newContent' ).value = oEditor.GetXHTML() ; + } + + } + function save() { + if(isFCKEditorActive== true) { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById('newContent').value = oEditor.GetXHTML() ; + } + } + </script> <tr> - <td colspan="2"><br><b><bean:message key="HTML_Version"/>:</b>&nbsp;<img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="editHtmlHtml();" alt="<bean:message key="htmled.title"/>"><br> - <html:textarea property="htmlTemplate" rows="14" cols="75"/> + <td colspan="2"><br><b><bean:message key="HTML_Version"/>:</b>&nbsp;<img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="Toggle();" alt="<bean:message key="htmled.title"/>"><br> + <div id="Textarea"> + <html:textarea property="htmlTemplate" styleId="newContent" rows="14" cols="75"/>&nbsp; + </div> + <div id="FCKeditor" style="display: none"> + <textarea id="DataFCKeditor" rows="14" cols="75"></textarea> + </div> </td> </tr> <% } %> @@ -317,7 +401,7 @@ permToken="mailing.change"; } %> <agn:ShowByPermission token="<%= permToken %>"> - <html:image src="button?msg=Save" border="0" property="save" value="save"/> + <html:image src="button?msg=Save" border="0" property="save" value="save" onclick="save();"/> </agn:ShowByPermission> <% if(tmpMailingID!=0) { %> src/jsp/mailing/view_base.jsp @@ -81,27 +81,7 @@ <% Map.Entry ent2=(Map.Entry)pageContext.getAttribute("dyncontent"); tagContent=(DynamicTagContent)ent2.getValue(); index=(String)ent2.getKey(); %> - <script type="text/javascript"> - <!-- - var oFCKeditor<%= tagContent.getId() %>=null; - function editHtml<%= tagContent.getId() %>() { - if(oFCKeditor<%= tagContent.getId() %>==null) { - oFCKeditor<%= tagContent.getId() %> = new FCKeditor( 'content(<%= index %>).dynContent' ) ; - oFCKeditor<%= tagContent.getId() %>.Config[ "AutoDetectLanguage" ] = false ; - oFCKeditor<%= tagContent.getId() %>.Config[ "DefaultLanguage" ] = "<%= ((Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)).getLanguage() %>" ; - oFCKeditor<%= tagContent.getId() %>.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; - oFCKeditor<%= tagContent.getId() %>.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID="+mailing.getId()) %>"/>" ; - oFCKeditor<%= tagContent.getId() %>.ToolbarSet = "emm" ; - oFCKeditor<%= tagContent.getId() %>.BasePath = baseUrl+"/fckeditor2.5/" ; - oFCKeditor<%= tagContent.getId() %>.Height = "400" ; // 400 pixels - oFCKeditor<%= tagContent.getId() %>.Width = 650 ; // 400 pixels - oFCKeditor<%= tagContent.getId() %>.ReplaceTextarea(); - } - return true; - } - //--> - </script> - + <tr><td colspan="3"><a name="${dyncontent.getId()}"><hr size="1"></td></tr> <tr><td><bean:message key="Content"/>:&nbsp;<img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="editHtml<%= tagContent.getId() %>();" alt="<bean:message key="htmled.title"/>"></td> @@ -134,29 +114,120 @@ <html:image src="button?msg=Delete" border="0" property="delete" onclick="<%= "document.getElementById('contentform').action.value="+MailingContentAction.ACTION_DELETE_TEXTBLOCK +";document.getElementById('contentform').contentID.value="+tagContent.getId() %>"/> </logic:iterate> <tr><td colspan="3"><a name="0"><hr size="1"><span class="head3"><bean:message key="New_Content"/></span></a><br></td></tr> - <script type="text/javascript"> - <!-- - var oFCKeditorNew=null; - function editHtmlNew() { - if(oFCKeditorNew==null) { - oFCKeditorNew = new FCKeditor( 'new_dyn_content' ) ; - oFCKeditorNew.Config[ "AutoDetectLanguage" ] = false ; - oFCKeditorNew.Config[ "DefaultLanguage" ] = "<%= ((Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)).getLanguage() %>" ; - oFCKeditorNew.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; - oFCKeditorNew.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID="+mailing.getId()) %>"/>" ; - oFCKeditorNew.ToolbarSet = "emm" ; - oFCKeditorNew.BasePath = baseUrl+"/fckeditor2.5/" ; - oFCKeditorNew.Height = "400" ; // 400 pixels - oFCKeditorNew.Width = "650" ; - oFCKeditorNew.ReplaceTextarea(); - } - return true; - } - //--> + <script type="text/javascript"> + var isFCKEditorActive=false; + function Toggle() + { + // Try to get the FCKeditor instance, if available. + var oEditor ; + if ( typeof( FCKeditorAPI ) != 'undefined' ) + oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + + // Get the _Textarea and _FCKeditor DIVs. + var eTextareaDiv = document.getElementById( 'Textarea' ) ; + var eFCKeditorDiv = document.getElementById( 'FCKeditor' ) ; + + // If the _Textarea DIV is visible, switch to FCKeditor. + if ( eTextareaDiv.style.display != 'none' ) + { + // If it is the first time, create the editor. + if ( !oEditor ) + { + CreateEditor() ; + } + else + { + // Set the current text in the textarea to the editor. + oEditor.SetData( document.getElementById('newContent').value ) ; + } + + // Switch the DIVs display. + eTextareaDiv.style.display = 'none' ; + eFCKeditorDiv.style.display = '' ; + + // This is a hack for Gecko 1.0.x ... it stops editing when the editor is hidden. + if ( oEditor && !document.all ) + { + if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG ) + oEditor.MakeEditable() ; + } + isFCKEditorActive=true; + } + else + { + // Set the textarea value to the editor value. + document.getElementById('newContent').value = oEditor.GetXHTML() ; + + // Switch the DIVs display. + eTextareaDiv.style.display = '' ; + eFCKeditorDiv.style.display = 'none' ; + isFCKEditorActive=false; + } + } + + function CreateEditor() + { + // Copy the value of the current textarea, to the textarea that will be used by the editor. + document.getElementById('DataFCKeditor').value = document.getElementById('newContent').value ; + + // Automatically calculates the editor base path based on the _samples directory. + // This is usefull only for these samples. A real application should use something like this: + // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. + + // Create an instance of FCKeditor (using the target textarea as the name). + + oFCKeditorNew = new FCKeditor( 'DataFCKeditor' ) ; + oFCKeditorNew.Config[ "AutoDetectLanguage" ] = false ; + oFCKeditorNew.Config[ "DefaultLanguage" ] = "<%= ((Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)).getLanguage() %>" ; + oFCKeditorNew.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID="+mailing.getId()) %>"/>" ; + oFCKeditorNew.ToolbarSet = "emm" ; + oFCKeditorNew.BasePath = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Height = "400" ; // 400 pixels + oFCKeditorNew.Width = "650" ; + oFCKeditorNew.ReplaceTextarea(); + + + } + + // The FCKeditor_OnComplete function is a special function called everytime an + // editor instance is completely loaded and available for API interactions. + function FCKeditor_OnComplete( editorInstance ) + { + // Switch Image ?? + } + + function PrepareSave() + { + // If the textarea isn't visible update the content from the editor. + if ( document.getElementById( 'Textarea' ).style.display == 'none' ) + { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById( 'newContent' ).value = oEditor.GetXHTML() ; + } + + } + function save() { + if(isFCKEditorActive== true) { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById('newContent').value = oEditor.GetXHTML() ; + } + } + + </script> - <tr><td><bean:message key="Content"/>:&nbsp;<img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="editHtmlNew();" alt="<bean:message key="htmled.title"/>"></td> + + + + + <tr><td><bean:message key="Content"/>:&nbsp;<img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="Toggle();" alt="<bean:message key="htmled.title"/>"></td> <td> - <html:textarea property="newContent" rows="20" cols="85"/>&nbsp; + <div id="Textarea"> + <html:textarea property="newContent" styleId="newContent" rows="20" cols="85"/>&nbsp; + </div> + <div id="FCKeditor" style="display: none"> + <textarea id="DataFCKeditor" rows="20" cols="85"></textarea> + </div> </td> <td><br></td></tr> <tr><td colspan="3"><br></td></tr> @@ -168,7 +239,7 @@ </logic:iterate> </html:select></td></tr> <tr><td colspan="3"><br><br></td></tr> - <tr><td colspan="3"><html:image src="button?msg=Add" border="0" property="insert" onclick="<%= "document.mailingWizardForm.action.value='" + MailingWizardAction.ACTION_TEXTMODULE_ADD + "'" %>"/> + <tr><td colspan="3"><html:image src="button?msg=Add" border="0" property="insert" onclick="<%= "save();document.mailingWizardForm.action.value='" + MailingWizardAction.ACTION_TEXTMODULE_ADD + "'" %>"/> </table> <br> src/jsp/mailing/wizard/textmodule.jsp @@ -43,7 +43,7 @@ <% pageContext.setAttribute("agnTitleKey", new String("Mailinglist")); %> <% pageContext.setAttribute("agnSubtitleKey", new String("Mailinglist")); %> <% pageContext.setAttribute("agnSubtitleValue", tmpShortname); %> -<% pageContext.setAttribute("agnNavigationKey", new String("show_mailinglist")); %> +<% pageContext.setAttribute("agnNavigationKey", new String("mailinglists")); %> <% pageContext.setAttribute("agnHighlightKey", new String("Mailinglist")); %> <% pageContext.setAttribute("agnNavHrefAppend", new String("&mailinglistID="+tmpMailinglistID)); %> <%@include file="/header.jsp"%> src/jsp/mailinglists/delete.jsp @@ -41,7 +41,7 @@ <% pageContext.setAttribute("sidemenu_active", new String("Mailinglists")); %> <% if(tmpMailinglistID!=0) { pageContext.setAttribute("sidemenu_sub_active", new String("none")); - pageContext.setAttribute("agnNavigationKey", new String("show_mailinglist")); + pageContext.setAttribute("agnNavigationKey", new String("mailinglists")); pageContext.setAttribute("agnHighlightKey", new String("Mailinglist")); pageContext.setAttribute("agnTitleKey", new String("Mailinglist")); pageContext.setAttribute("agnSubtitleKey", new String("Mailinglist")); src/jsp/mailinglists/view.jsp @@ -42,76 +42,60 @@ <% pageContext.setAttribute("ACTION_VIEW", RecipientAction.ACTION_VIEW ); %> <%@include file="/header.jsp"%> +<script type="text/javascript"> +<!-- + function parametersChanged(){ + document.getElementsByName('recipientForm')[0].numberOfRowsChanged.value = true; + } +//--> +</script> <html:errors/> <% - EmmLayout aLayout=(EmmLayout)session.getAttribute("emm.layout"); + EmmLayout aLayout = (EmmLayout)session.getAttribute("emm.layout"); int mailingListID; int targetID; - String user_type=null; - int user_status=0; - - try { - mailingListID=Integer.parseInt(request.getParameter("listID")); - } catch (Exception e) { - mailingListID=0; - } - - try { - targetID=Integer.parseInt(request.getParameter("targetID")); - } catch(Exception e) { - targetID=0; - } - - - - if(request.getParameter("user_type")==null){ - user_type=new String("E"); - } else { - user_type=new String(request.getParameter("user_type")); - } - if(request.getParameter("user_status")==null){ - user_status=0; - } else { - try { - user_status=Integer.parseInt(request.getParameter("user_status")); - } catch (Exception e) { - user_status=0; - } - } - int index=0; - boolean isFirst=true; - RecipientForm rec=(RecipientForm) session.getAttribute("recipientForm"); - TargetRepresentation targetRep=rec.getTarget(); + String user_type = null; + int user_status = 0; + + RecipientForm aForm = (RecipientForm) session.getAttribute("recipientForm"); + mailingListID =aForm.getListID(); + targetID = aForm.getTargetID(); + user_type = aForm.getUser_type(); + user_status = aForm.getUser_status(); + int index = 0; + boolean isFirst = true; + TargetRepresentation targetRep = aForm.getTarget(); %> <agn:ShowColumnInfo id="colsel" table="<%= AgnUtils.getCompanyID(request) %>"/> <table border="0" cellspacing="0"> <html:form action="<%= new String("/recipient.do?action="+RecipientAction.ACTION_LIST) %>"> + <html:hidden property="numberOfRowsChanged" /> <tr><td colspan="5"><b><bean:message key="recipient.search"/>:</b></td></tr> <tr><td colspan="5"> <table border="0" cellspacing="2" cellpadding="0"> <logic:iterate id="aNode1" name="recipientForm" property="target.allNodes"> - <% TargetNode aNode=(TargetNode)pageContext.getAttribute("aNode1"); - String className=aNode.getClass().getName(); + <% TargetNode aNode = (TargetNode)pageContext.getAttribute("aNode1"); + String className = aNode.getClass().getName(); index++; %> <tr> <!-- AND/OR --> <td> <% if(!isFirst) { %> - <select name="trgt_chainop<%= index %>" size="1" > - <option value="1" <% if(aNode.getChainOperator()==1) { %>selected<% } %>><bean:message key="and"/></option> - <option value="2" <% if(aNode.getChainOperator()==2) { %>selected<% } %>><bean:message key="or"/></option> + <select name="trgt_chainop<%= index %>" size="1" onchange="parametersChanged()"> + <option value="1" <% if(aNode.getChainOperator() == 1) { %>selected<% } %>><bean:message key="and"/></option> + <option value="2" <% if(aNode.getChainOperator() == 2) { %>selected<% } %>><bean:message key="or"/></option> </select> <% } else { %> &nbsp;<input type="hidden" name="trgt_chainop<%= index %>" value="0"> - <% isFirst=false; } %> + <% isFirst = false; } %> </td> <!-- Bracket-Open Y/N --> <td> - <select name="trgt_bracketopen<%= index %>" size="1"> + <select name="trgt_bracketopen<%= index %>" size="1" onchange="parametersChanged()" > <option value="0" <% if(!aNode.isOpenBracketBefore()) { %>selected<% } %>>&nbsp;</option> <option value="1" <% if(aNode.isOpenBracketBefore()) { %>selected<% } %>>(</option> </select> @@ -124,7 +108,7 @@ <% } else if(aNode.getPrimaryField().equals("bind.change_date")) { %> ml.change_date <% } else { - TreeMap tm=(TreeMap) pageContext.getAttribute("__colsel_colmap"); + TreeMap tm = (TreeMap) pageContext.getAttribute("__colsel_colmap"); if(tm != null && tm.get(aNode.getPrimaryField()) != null) { %> <%= ((Map) tm.get(aNode.getPrimaryField())).get("shortname") %> <% } @@ -132,7 +116,7 @@ </td> <!-- Operator-Select --> <td> - <select name="trgt_operator<%= index %>" style="width:100%"> size="1"> + <select name="trgt_operator<%= index %>" style="width:100%" size="1" onchange="parametersChanged()"> <% int idx=1; String aOp=null; @@ -155,7 +139,7 @@ <td> <% if(className.equals("org.agnitas.target.impl.TargetNodeDate") && (aNode.getPrimaryOperator()!=TargetNode.OPERATOR_IS)) { %> <nobr><input type="text" style="width:53%" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>"> - <select name="trgt_dateformat<%= index %>" style="width:45%" size="1"> + <select name="trgt_dateformat<%= index %>" style="width:45%" size="1" onchange="parametersChanged()"> <option value="yyyymmdd"<% if(((TargetNodeDate)aNode).getDateFormat().equals("yyyymmdd")){%> selected<%}%>><bean:message key="date.format.YYYYMMDD"/></option> <option value="mmdd"<% if(((TargetNodeDate)aNode).getDateFormat().equals("mmdd")){%> selected<%}%>><bean:message key="date.format.MMDD"/></option> <option value="yyyymm"<% if(((TargetNodeDate)aNode).getDateFormat().equals("yyyymm")){%> selected<%}%>><bean:message key="date.format.YYYYMM"/></option> @@ -166,14 +150,14 @@ <% } if(className.equals("org.agnitas.target.impl.TargetNodeNumeric") && (aNode.getPrimaryOperator()!=TargetNode.OPERATOR_MOD) && (aNode.getPrimaryOperator()!=TargetNode.OPERATOR_IS)) { if(aNode.getPrimaryField().equalsIgnoreCase("MAILTYPE")) { %> - <select name="trgt_value<%= index %>" size="1" style="width:100%"> + <select name="trgt_value<%= index %>" size="1" style="width:100%" onchange="parametersChanged()"> <option value="0"<% if(aNode.getPrimaryValue().equals("0")){%> selected<%}%>><bean:message key="Text"/></option> <option value="1"<% if(aNode.getPrimaryValue().equals("1")){%> selected<%}%>><bean:message key="HTML"/></option> <option value="2"<% if(aNode.getPrimaryValue().equals("2")){%> selected<%}%>><bean:message key="OfflineHTML"/></option> </select> <% } else { if(aNode.getPrimaryField().equalsIgnoreCase("GENDER")) { %> - <select name="trgt_value<%= index %>" size="1" style="width:100%"> + <select name="trgt_value<%= index %>" size="1" style="width:100%" onchange="parametersChanged()"> <option value="0" <% if(aNode.getPrimaryValue().equals("0")) { %> selected <% } %>><bean:message key="gender.0.short"/></option> <option value="1" <% if(aNode.getPrimaryValue().equals("1")) { %> selected <% } %>><bean:message key="gender.1.short"/></option> <agn:ShowByPermission token="use_extended_gender"> @@ -184,13 +168,13 @@ <option value="2" <% if(aNode.getPrimaryValue().equals("2")) { %> selected <% } %>><bean:message key="gender.2.short"/></option> </select> <% } else { %> - <input type="text" style="width:100%" size="60" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>"> + <input type="text" style="width:100%" size="60" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>" onchange="parametersChanged()"> <% } } } %> <% if(className.equals("org.agnitas.target.impl.TargetNodeNumeric") && (aNode.getPrimaryOperator()==TargetNode.OPERATOR_MOD)) { %> <input type="text" style="width:38%" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>"> - <select style="width:20%" name="trgt_sec_operator<%= index %>"> + <select style="width:20%" name="trgt_sec_operator<%= index %>" onchange="parametersChanged()"> <% String aOp2=null; Iterator aIt2=(Arrays.asList(TargetNode.ALL_OPERATORS)).iterator(); for(int b=1; b<=4; b++) { @@ -202,13 +186,13 @@ <% } } %> </select> - <input style="width:38%" type="text" name="trgt_sec_value<%= index %>" value="<%= ((TargetNodeNumeric)aNode).getSecondaryValue() %>"> + <input style="width:38%" type="text" name="trgt_sec_value<%= index %>" value="<%= ((TargetNodeNumeric)aNode).getSecondaryValue() %>" onchange="parametersChanged()"> <% } if(className.equals("org.agnitas.target.impl.TargetNodeString") && (aNode.getPrimaryOperator()!=TargetNode.OPERATOR_IS)) { %> - <input type="text" style="width:100%" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>"> + <input type="text" style="width:100%" name="trgt_value<%= index %>" value="<%= aNode.getPrimaryValue() %>" onchange="parametersChanged()"> <% } %> <% if(aNode.getPrimaryOperator()==TargetNode.OPERATOR_IS) { %> - <select name="trgt_value<%= index %>" size="1" style="width:100%"> + <select name="trgt_value<%= index %>" size="1" style="width:100%" onchange="parametersChanged()"> <option value="null" <% if(aNode.getPrimaryValue().equals("null")){ %>selected<%}%>>null</option> <option value="not null" <% if(aNode.getPrimaryValue().equals("not null")){ %>selected<%}%>>not null</option> </select> @@ -216,7 +200,7 @@ </td> <!-- Bracket-Close Y/N --> <td> - <select name="trgt_bracketclose<%= index %>" size="1"> + <select name="trgt_bracketclose<%= index %>" size="1" onchange="parametersChanged()"> <option value="0" <% if(!aNode.isCloseBracketAfter()) { %>selected<% } %>>&nbsp;</option> <option value="1" <% if(aNode.isCloseBracketAfter()) { %>selected<% } %>>)</option> </select> @@ -231,7 +215,7 @@ <!-- AND/OR --> <td> <% if(!isFirst) { %> - <select name="trgt_chainop0" size="1"> + <select name="trgt_chainop0" size="1" onchange="parametersChanged()"> <option value="1" selected><bean:message key="and"/></option> <option value="2"><bean:message key="or"/></option> </select> @@ -241,14 +225,14 @@ </td> <!-- Bracket-Open Y/N --> <td> - <select name="trgt_bracketopen0" size="1"> + <select name="trgt_bracketopen0" size="1" onchange="parametersChanged()"> <option value="0" selected>&nbsp;</option> <option value="1">(</option> </select> </td> <!-- Column-Select --> <td> - <select name="trgt_column0" size="1"> + <select name="trgt_column0" size="1" onchange="parametersChanged()"> <agn:ShowColumnInfo id="colsel" table="<%= AgnUtils.getCompanyID(request) %>"> <% if(pageContext.getAttribute("_colsel_shortname").equals("email")) { %> <option value="<%= pageContext.getAttribute("_colsel_column_name") %>#<%= pageContext.getAttribute("_colsel_data_type") %>" selected><%= pageContext.getAttribute("_colsel_shortname") %></option> @@ -262,7 +246,7 @@ </td> <!-- Operator-Select --> <td> - <select name="trgt_operator0" size="1"> + <select name="trgt_operator0" size="1" onchange="parametersChanged()"> <% int idx=1; String aOp=null; @@ -280,11 +264,11 @@ </td> <!-- Value-Input --> <td> - <input type="text" style="width:200px" name="trgt_value0" value=""> + <input type="text" style="width:200px" name="trgt_value0" value="" onchange="parametersChanged()"> </td> <!-- Bracket-Close Y/N --> <td> - <select name="trgt_bracketclose0" size="1"> + <select name="trgt_bracketclose0" size="1" onchange="parametersChanged()"> <option value="0" selected>&nbsp;</option> <option value="1">)</option> </select> @@ -308,7 +292,7 @@ <tr><td colspan=5><br><hr></td></tr> <tr> <td><b><bean:message key="Mailinglist"/>:</b><br> - <select name="listID"> + <select name="listID" onchange="parametersChanged()"> <option value="0" <%if(mailingListID==0) {%> selected <%}%> ><bean:message key="All_Mailinglists"/></option> <agn:ShowTable id="agntbl2" sqlStatement="<%= new String("SELECT mailinglist_id, shortname FROM mailinglist_tbl WHERE company_id="+AgnUtils.getCompanyID(request)) %>" maxRows="100"> <option value="<%= pageContext.getAttribute("_agntbl2_mailinglist_id") %>" <%if(Integer.toString(mailingListID).equals(pageContext.getAttribute("_agntbl2_mailinglist_id"))) {%> selected <%}%> ><%= pageContext.getAttribute("_agntbl2_shortname") %></option> @@ -317,7 +301,7 @@ </td> <td><b><bean:message key="Target"/>:</b><br> - <select name="targetID"> + <select name="targetID" onchange="parametersChanged()"> <option value="0" <%if(targetID==0) {%> selected <%}%> ><bean:message key="All"/></option> <agn:ShowTable id="agntbl3" sqlStatement="<%= new String("SELECT target_id, target_shortname FROM dyn_target_tbl WHERE company_id="+AgnUtils.getCompanyID(request)) %>" maxRows="200"> <option value="<%= pageContext.getAttribute("_agntbl3_target_id") %>" <%if(Integer.toString(targetID).equals(pageContext.getAttribute("_agntbl3_target_id"))) {%> selected <%}%> ><%= pageContext.getAttribute("_agntbl3_target_shortname") %></option> @@ -328,7 +312,7 @@ <td><b><bean:message key="RecipientType"/>:</b><br> - <select name="user_type"> <!-- usr type; 'E' for everybody --> + <select name="user_type" onchange="parametersChanged()"> <!-- usr type; 'E' for everybody --> <option value="E" <%if(user_type.equals("E")) {%> selected <%}%> ><bean:message key="All"/></option> <option value="A" <%if(user_type.equals("A")) {%> selected <%}%> ><bean:message key="Administrator"/></option> <option value="T" <%if(user_type.equals("T")) {%> selected <%}%> ><bean:message key="TestSubscriber"/></option> @@ -337,7 +321,7 @@ </td> <td><b><bean:message key="RecipientStatus"/>:</b><br> - <select name="user_status"> <!-- usr status; '0' is for everybody --> + <select name="user_status" onchange="parametersChanged()"> <!-- usr status; '0' is for everybody --> <option value="0" <%if(user_status==0) {%> selected <%}%> ><bean:message key="All"/></option> <option value="1" <%if(user_status==1) {%> selected <%}%> ><bean:message key="Active"/></option> <option value="2" <%if(user_status==2) {%> selected <%}%> ><bean:message key="Bounced"/></option> @@ -357,7 +341,7 @@ <tr> <td><bean:message key="Admin.numberofrows"/></td> <td> - <html:select property="numberofRows"> + <html:select property="numberofRows" onchange="parametersChanged()"> <% String[] sizes={"20","50","100"}; for( int i=0;i< sizes.length; i++ ) @@ -375,9 +359,8 @@ </td> </tr> </html:form> - <tr><td colspan=5> - <ajax:displayTag id="recipientTable" tableClass="dataTable" ajaxFlag="displayAjax" parameters="listID,action,targetID,user_type,user_status"> - <display:table class="dataTable" pagesize="${recipientForm.numberofRows}" id="recipient" name="recipientList" sort="external" requestURI="/recipient.do?action=${ACTION_LIST}" excludedParams="*" > + <tr><td colspan="5"> + <display:table class="dataTable" pagesize="${recipientForm.numberofRows}" id="recipient" name="recipientList" sort="external" requestURI="/recipient.do?action=${ACTION_LIST}" excludedParams="*" partialList="true" size="${recipientList.fullListSize}"> <display:column class="name" headerClass="head_name" titleKey="Salutation" > <bean:message key="gender.${recipient.gender}.short"/> </display:column> @@ -393,7 +376,7 @@ </agn:ShowByPermission> </display:column> </display:table> - </ajax:displayTag> </td></tr> + <tr><td colspan="5"><bean:message key="Total"/>&nbsp;<bean:message key="Recipients"/>:&nbsp;<%= aForm.getAll() %></td></tr> </table> <%@include file="/footer.jsp"%> src/jsp/recipient/list.jsp @@ -74,6 +74,7 @@ if(recipient.getRecipientID()!=0) { <html:hidden property="user_type"/> <html:hidden property="user_status"/> <html:hidden property="listID"/> + <html:hidden property="targetID"/> <tr> <td><b><bean:message key="Salutation"/>:</b></td> src/jsp/recipient/view.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, java.util.*" contentType="text/html; charset=utf-8" buffer="32kb" errorPage="/error.jsp"%> + --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, java.util.*" contentType="text/html; charset=utf-8" buffer="32kb" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -28,7 +28,8 @@ <agn:CheckLogon/> -<% int tmpAdminID=0; +<% + int tmpAdminID=0; String tmpUsername=new String(""); if(request.getAttribute("adminForm")!=null) { tmpAdminID=((AdminForm)request.getAttribute("adminForm")).getAdminID(); src/jsp/settings/admin/delete.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.*" errorPage="/error.jsp"%> + --%><%@ page language="java" contentType="text/html; charset=utf-8" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.*" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> src/jsp/settings/admin/list.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.Admin, java.util.*" contentType="text/html; charset=utf-8" buffer="64kb" errorPage="/error.jsp"%> + --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.Admin, java.util.*" contentType="text/html; charset=utf-8" buffer="64kb" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -30,7 +30,8 @@ <agn:Permission token="admin.show"/> -<% int tmpAdminID = 0; +<% + int tmpAdminID = 0; int tmpCompID = 0; String tmpUser = ""; int i=1; @@ -43,7 +44,8 @@ tmpAdminID=((AdminForm)request.getAttribute("adminForm")).getAdminID(); userrights=((AdminForm)request.getAttribute("adminForm")).getUserRights(); grouprights=((AdminForm)request.getAttribute("adminForm")).getGroupRights(); - } %> + } +%> <% pageContext.setAttribute("agnSubtitleKey", new String("Admin")); %> <!-- ueber rechte Seite --> <% pageContext.setAttribute("sidemenu_active", new String("Settings")); %> <!-- links Button --> src/jsp/settings/admin/rights.jsp @@ -20,7 +20,7 @@ * * Contributor(s): AGNITAS AG. ********************************************************************************/ - --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.beans.Admin, java.util.*" contentType="text/html; charset=utf-8" errorPage="/error.jsp"%> + --%><%@ page language="java" import="org.agnitas.util.*, org.agnitas.web.*, org.agnitas.web.forms.*, org.agnitas.beans.Admin, java.util.*" contentType="text/html; charset=utf-8" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/agnitas-taglib.tld" prefix="agn" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> @@ -30,7 +30,8 @@ <agn:Permission token="admin.show"/> -<% int tmpAdminID=0; +<% + int tmpAdminID=0; String tmpUsername=new String(""); int tmpCompanyID=0; if(request.getAttribute("adminForm")!=null) { src/jsp/settings/admin/view.jsp @@ -160,39 +160,124 @@ </td> </tr> - <script type="text/javascript"> - <!-- - var oFCKeditorHtml=null; - function editHtmlHtml() { - if(oFCKeditorHtml==null) { - oFCKeditorHtml = new FCKeditor( 'arHtml' ) ; - oFCKeditorHtml.Config[ "AutoDetectLanguage" ] = false ; - oFCKeditorHtml.Config[ "DefaultLanguage" ] = "<%= aLocale.getLanguage() %>" ; - oFCKeditorHtml.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; - oFCKeditorHtml.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="/fckeditor2.5/emmconfig.jsp?mailingID=0"/>" ; - oFCKeditorHtml.ToolbarSet = "emm" ; - oFCKeditorHtml.BasePath = baseUrl+"/fckeditor2.5/" ; - oFCKeditorHtml.Height = "400" ; // 400 pixels - oFCKeditorHtml.Width = 650 ; // 400 pixels - oFCKeditorHtml.ReplaceTextarea(); - } - return true; - } - //--> - </script> - + <script type="text/javascript"> + var isFCKEditorActive=false; + function Toggle() + { + // Try to get the FCKeditor instance, if available. + var oEditor ; + if ( typeof( FCKeditorAPI ) != 'undefined' ) + oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + + // Get the _Textarea and _FCKeditor DIVs. + var eTextareaDiv = document.getElementById( 'Textarea' ) ; + var eFCKeditorDiv = document.getElementById( 'FCKeditor' ) ; + + // If the _Textarea DIV is visible, switch to FCKeditor. + if ( eTextareaDiv.style.display != 'none' ) + { + // If it is the first time, create the editor. + if ( !oEditor ) + { + CreateEditor() ; + } + else + { + // Set the current text in the textarea to the editor. + oEditor.SetData( document.getElementById('newContent').value ) ; + } + + // Switch the DIVs display. + eTextareaDiv.style.display = 'none' ; + eFCKeditorDiv.style.display = '' ; + + // This is a hack for Gecko 1.0.x ... it stops editing when the editor is hidden. + if ( oEditor && !document.all ) + { + if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG ) + oEditor.MakeEditable() ; + } + isFCKEditorActive=true; + } + else + { + // Set the textarea value to the editor value. + document.getElementById('newContent').value = oEditor.GetXHTML() ; + + // Switch the DIVs display. + eTextareaDiv.style.display = '' ; + eFCKeditorDiv.style.display = 'none' ; + isFCKEditorActive=false; + } + } + + function CreateEditor() + { + // Copy the value of the current textarea, to the textarea that will be used by the editor. + document.getElementById('DataFCKeditor').value = document.getElementById('newContent').value ; + + // Automatically calculates the editor base path based on the _samples directory. + // This is usefull only for these samples. A real application should use something like this: + // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. + + // Create an instance of FCKeditor (using the target textarea as the name). + + oFCKeditorNew = new FCKeditor( 'DataFCKeditor' ) ; + oFCKeditorNew.Config[ "AutoDetectLanguage" ] = false ; + oFCKeditorNew.Config[ "DefaultLanguage" ] = "<%= ((Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY)).getLanguage() %>" ; + oFCKeditorNew.Config[ "BaseHref" ] = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Config[ "CustomConfigurationsPath" ] = "<html:rewrite page="<%= new String("/fckeditor2.5/emmconfig.jsp?mailingID=0") %>"/>" ; + oFCKeditorNew.ToolbarSet = "emm" ; + oFCKeditorNew.BasePath = baseUrl+"/fckeditor2.5/" ; + oFCKeditorNew.Height = "400" ; // 400 pixels + oFCKeditorNew.Width = "650" ; + oFCKeditorNew.ReplaceTextarea(); + + + } + + // The FCKeditor_OnComplete function is a special function called everytime an + // editor instance is completely loaded and available for API interactions. + function FCKeditor_OnComplete( editorInstance ) + { + // Switch Image ?? + } + + function PrepareSave() + { + // If the textarea isn't visible update the content from the editor. + if ( document.getElementById( 'Textarea' ).style.display == 'none' ) + { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById( 'newContent' ).value = oEditor.GetXHTML() ; + } + + } + function save() { + if(isFCKEditorActive== true) { + var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ; + document.getElementById('newContent').value = oEditor.GetXHTML() ; + } + } + + + </script> <tr> <td><bean:message key="HTML_Version"/>:&nbsp;</td> <td> - <img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="editHtmlHtml();" alt="<bean:message key="htmled.title"/>"><br> - <html:textarea property="arHtml" rows="14" cols="75"/> + <img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>edit.gif" border="0" onclick="Toggle();" alt="<bean:message key="htmled.title"/>"><br> + <div id="Textarea"> + <html:textarea property="arHtml" styleId="newContent" rows="14" cols="75"/>&nbsp; + </div> + <div id="FCKeditor" style="display: none"> + <textarea id="DataFCKeditor" rows="14" cols="75"></textarea> </td> </tr> <tr> <td colspan=2> - <html:image src="button?msg=Save" border="0" property="save" value="save"/>&nbsp; + <html:image src="button?msg=Save" border="0" property="save" value="save" onclick="save();"/>&nbsp; <logic:notEqual name="mailloopForm" property="mailloopID" value="0"> src/jsp/settings/mailloop/view.jsp @@ -37,29 +37,28 @@ <%@include file="/header.jsp"%> <% int i=1; %> <html:errors/> - <table border="0" cellspacing="10" cellpadding="0"> - <tr> - <agn:ShowNavigation navigation="SettingsSub" highlightKey=""> - <agn:ShowByPermission token="<%= _navigation_token %>"> - <td> <table width="300" cellspacing="0" cellpadding="0"> - <tr> - <td width ="40"><html:link page="<%= _navigation_href %>"><img border="0" width="40" height="38" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>splash_settings_<%= _navigation_navMsg.toLowerCase().replace('.', '_') %>.gif" alt="<bean:message key="<%= _navigation_navMsg %>"/>"></html:link></td> - <td class="boxhead" width="250"><html:link page="<%= _navigation_href %>"><span class="head1"><bean:message key="<%= _navigation_navMsg %>"/></span></html:link></td> - <td width="10"><img width="10" height="38" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_topright.gif"></td> - </tr> - <tr> - <td colspan=3 class="boxmiddle" height="80" width="300"><img src="images/emm/one_pixel.gif" width=1 height=60 align="left"><html:link page="<%= _navigation_href %>"><bean:message key="<%= new String("splash.settings."+_navigation_navMsg) %>"/></html:link></td> - </tr> - <tr> - <td width="40"><img width="40" height="10" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_bottomleft.gif" alt="<bean:message key="<%= _navigation_navMsg %>"/>"></td> - <td class="boxbottom"></td> - <td width="10"><img width="10" height="10" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_bottomright.gif"></td> - </tr> - </table> - </td> - <% if(i==2) { %> </tr><tr> <% i=0; } i++; %> - </agn:ShowByPermission> - </agn:ShowNavigation> - </tr> - </table> -<%@include file="/footer.jsp"%> + <table border="0" cellspacing="10" cellpadding="0"> + <tr> + <agn:ShowNavigation navigation="SettingsSub" highlightKey=""> + <agn:ShowByPermission token="<%= _navigation_token %>"> + <td> <table width="300" cellspacing="0" cellpadding="0"> + <tr> + <td width ="40"><html:link page="<%= _navigation_href %>"><img border="0" width="40" height="38" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>splash_settings_<%= _navigation_navMsg.toLowerCase().replace('.', '_') %>.gif" alt="<bean:message key="<%= _navigation_navMsg %>"/>"></html:link></td> + <td class="boxhead" width="250"><html:link page="<%= _navigation_href %>"><span class="head1"><bean:message key="<%= _navigation_navMsg %>"/></span></html:link></td> + <td width="10"><img width="10" height="38" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_topright.gif"></td> + </tr> + <tr> + <td colspan=3 class="boxmiddle" height="80" width="300"><img src="images/emm/one_pixel.gif" width=1 height=60 align="left"><html:link page="<%= _navigation_href %>"><bean:message key="<%= new String("splash.settings."+_navigation_navMsg) %>"/></html:link></td> + </tr> + <tr> + <td width="40"><img width="40" height="10" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_bottomleft.gif" alt="<bean:message key="<%= _navigation_navMsg %>"/>"></td> + <td class="boxbottom"></td> + <td width="10"><img width="10" height="10" src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>box_bottomright.gif"></td> + </tr> + </table></td> + <% if(i==2) { %> </tr><tr> <% i=0; } i++; %> + </agn:ShowByPermission> + </agn:ShowNavigation> + </tr> + </table> +<%@include file="/footer.jsp"%> \ No newline at end of file src/jsp/splash_settings.jsp @@ -78,7 +78,7 @@ <table border="0" cellspacing="0" cellpadding="0"> <tr> <td valign=bottom> - <bean:message key="Clicks"/>:&nbsp; + <bean:message key="Opened_Mails"/>:&nbsp; <hr size="1" noshade> <bean:message key="Time"/>:&nbsp; </a> @@ -130,7 +130,7 @@ <tr> <td> <hr size="1" noshade> - <b><bean:message key="Total"/>:</b>&nbsp;<%= ((MailingStatForm)session.getAttribute("mailingStatForm")).getClicks() %>&nbsp;<bean:message key="Clicks"/> + <b><bean:message key="Total"/>:</b>&nbsp;<%= ((MailingStatForm)session.getAttribute("mailingStatForm")).getClicks() %>&nbsp;<bean:message key="Opened_Mails"/> <html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_MAILINGSTAT + "&mailingID=" + tmpMailingID) %>"><html:img src="button?msg=Back" border="0"/></html:link> </td> </tr> src/jsp/stats/mailing_open_day.jsp @@ -84,7 +84,7 @@ <table border="0" cellspacing="0" cellpadding="0"> <tr> <td width="80" valign=bottom> - <bean:message key="Clicks"/>: + <bean:message key="Opened_Mails"/>: <hr size="1" noshade> <bean:message key="Date"/>: </a> @@ -172,7 +172,7 @@ <tr> <td> <hr size="1" noshade> - <B><bean:message key="Total"/>:</B>&nbsp;<%= ((MailingStatForm)session.getAttribute("mailingStatForm")).getClicks() %>&nbsp;<bean:message key="Clicks"/> + <B><bean:message key="Total"/>:</B>&nbsp;<%= ((MailingStatForm)session.getAttribute("mailingStatForm")).getClicks() %>&nbsp;<bean:message key="Opened_Mails"/> <html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_MAILINGSTAT + "&mailingID=" + tmpMailingID + "&targetID=" + tmpTargetID) %>"><html:img src="button?msg=Back" border="0"/></html:link> </td> </tr> src/jsp/stats/mailing_open_week.jsp @@ -40,7 +40,6 @@ tmpMailingID=aForm.getMailingID(); tmpShortname=aForm.getMailingShortname(); } - %> <% pageContext.setAttribute("sidemenu_active", new String("Mailings")); %> @@ -84,36 +83,30 @@ if(pageContext.getSession().getAttribute("map") == null) { <html:hidden property="action"/> <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> <td><span class="head3"><bean:message key="Opened_Mails"/><br><br></span></td> <td align="right"> &nbsp; - <html:link page="<%= new String("/file_download?key=" + timekey) %>"><img src="<bean:write name="emm.layout" property="baseUrl" scope="session"/>icon_save.gif" border="0"></html:link> - </td> </tr> - </table> - - - <table border="0" cellspacing="0" cellpadding="0"> - - + <tr> + <td colspan="2"><html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_OPEN_TIME + "&mailingID=" + tmpMailingID) %>"><b><bean:message key="OpenTime"/></b></html:link></td> + </tr> + <tr> + <td colspan="2">&nbsp;</td> + </tr> <tr> <td><b><bean:message key="domain"/>&nbsp;&nbsp;</b></td> <td><b><bean:message key="Opened_Mails"/></b></td> - </tr> - <tr> <td colspan="2"><hr></td> </tr> - <% Hashtable values = aForm.getValues(); int i = 1; while (values.containsKey(new Integer(i))) { @@ -143,7 +136,6 @@ if(pageContext.getSession().getAttribute("map") == null) { <tr> <td colspan="2"><hr></td> </tr> - <tr> <td><b><bean:message key="Total"/></b>&nbsp;&nbsp;</td> <td align="right"><b><%=totalOp %>&nbsp;&nbsp;</b></td> @@ -153,20 +145,13 @@ if(pageContext.getSession().getAttribute("map") == null) { my_map.put(timekey, file); pageContext.getSession().setAttribute("map", my_map); %> - <tr> <td colspan="2">&nbsp;</td> </tr> - <tr> - <td colspan="2"><html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_OPEN_TIME + "&mailingID=" + tmpMailingID) %>"><b><bean:message key="OpenTime"/></b></html:link></td> - </tr> <tr><td><br></td></tr> <tr> <td colspan="2"><html:link page="<%= new String("/mailing_stat.do?action=" + MailingStatAction.ACTION_MAILINGSTAT) %>"><html:img src="button?msg=Back" border="0"/></html:link></td> </tr> - </table> - </html:form> - -<%@include file="/footer.jsp"%> +<%@include file="/footer.jsp"%> \ No newline at end of file src/jsp/stats/mailing_stat_opened.jsp @@ -1,5 +1,5 @@ -.dataTable { text-align: left; } +.dataTable { text-align: left;} .head_action { width: 15px; padding-left: 5px;} .head_status { width: 60px; padding-left: 5px;} .head_mailing { width: 160px; padding-left: 5px;} @@ -8,8 +8,7 @@ .head_name { width: 160px; padding-left: 5px;} .head_senddate { width: 120px; padding-left: 5px;} .head_edit { width: 60px; padding-left: 5px;} -.head_firstname { width: 120px; padding-left: 5px;} -.head_lastname { width: 120px; padding-left: 5px;} +.head_email { width: 350px; padding-left: 5px;} .action { width: 15px; padding-left: 5px;} .status { width: 60px; padding-left: 5px;} @@ -19,8 +18,7 @@ .name { width: 160px; padding-left: 5px;} .senddate { width: 120px; padding-left: 5px;} .edit { width: 60px; padding-left: 5px;} -.firstname { width: 120px; padding-left: 5px;} -.lastname { width: 120px; padding-left: 5px;} +.email { width: 350px; padding-left: 5px;} thead tr { background-color:#D9E6F3; src/jsp/styles/displaytag.css @@ -152,6 +152,8 @@ cp = [] # Optional commands if len (sys.argv) > 1: os.chdir (home) + versionTable = '__version' + curversion = '5.5.1' if sys.argv[1] == 'setup': show ('setup:\n') show ('Setup database, please enter the super user password defined during MySQL instllation:\n') @@ -161,6 +163,15 @@ if len (sys.argv) > 1: if os.system ('mysql -u root -p -e "source USR_SHARE\\openemm.sql" openemm'): error ('Failed to setup database') show ('Database setup completed.\n') + db = agn.DBase () + if not db is None: + cursor = db.cursor () + if not cursor is None: + cursor.execute ('CREATE TABLE %s (version varchar(50))' % versionTable) + cursor.execute ('INSERT INTO %s VALUES (:version)' % versionTable, {'version': curversion}) + cursor.sync () + cursor.close () + db.close () if sys.argv[1] in ('setup', 'config'): db = agn.DBase () if not db: @@ -218,17 +229,16 @@ if len (sys.argv) > 1: i = db.cursor () if not i: error ('Failed to connect to database') - table = '__version_tbl' found = False for r in i.query ('SHOW TABLES'): - if r[0] == table: + if r[0] == versionTable: found = True break if not found: version = '5.1.0' tempfile = 'version.sql' fd = open (tempfile, 'w') - fd.write ('CREATE TABLE %s (version varchar(50));\n' % table) + fd.write ('CREATE TABLE %s (version varchar(50));\n' % versionTable) fd.close () show ('Database update, please enter your database super user password now\n') st = os.system ('mysql -u root -p -e "source %s" openemm' % tempfile) @@ -238,11 +248,11 @@ if len (sys.argv) > 1: pass if st: error ('Failed to setup database') - i.update ('INSERT INTO %s VALUES (:version)' % table, {'version': version }) + i.update ('INSERT INTO %s VALUES (:version)' % versionTable, {'version': version }) db.commit () else: version = None - for r in i.query ('SELECT version FROM %s' % table): + for r in i.query ('SELECT version FROM %s' % versionTable): version = r[0] if version is None: error ('Found version table, but no content in table') @@ -253,7 +263,6 @@ if len (sys.argv) > 1: ans = prompt ('It looks like your previous version is "%s", is this corrent? [no] ' % version) if not ans or not ans[0] in 'Yy': error ('Version conflict!') - curversion = '5.5.0' updates = [] for fname in os.listdir ('USR_SHARE'): if fname.endswith ('.usql'): @@ -282,7 +291,7 @@ if len (sys.argv) > 1: show ('No database update from %s to %s required\n' % (version, upd[1])) version = upd[1] seen.append (upd[2]) - i.update ('UPDATE %s SET version = :version' % table, {'version': version}) + i.update ('UPDATE %s SET version = :version' % versionTable, {'version': version}) db.commit () found = True break src/script/control/openemm.py @@ -25,10 +25,11 @@ ********************************************************************************** Support routines for general and company specific purposes: class struct: general empty class for temp. structured data - class AgnError: general exception thrown by this module (deprectated) class error: new version for general execption def chop: removes trailing newlines - def atob: converts a string to a boolean value + def atob: converts a string to a boolean value + def numfmt: converts a number to pretty printed version + def validate: validates an input string def filecount: counts files matching a pattern in a directory def which: finds program in path def mkpath: creates a path from path components @@ -94,7 +95,14 @@ try: except ImportError: database = None # -version = ('2.0.1', '2008-06-17 10:46:41 CEST', 'ud') +changelog = [ + ('2.0.0', '2008-04-18', 'Initial version of redesigned code', 'ud@agnitas.de'), + ('2.0.1', '2008-07-01', 'Added autocommitment', 'ud@agnitas.de'), + ('2.0.3', '2008-07-31', 'Template with inclusing support', 'ud@agnitas.de'), + ('2.0.4', '2008-08-07', 'Added numfmt', 'ud@agnitas.de'), + ('2.0.5', '2008-08-11', 'Added validate', 'ud@agnitas.de'), +] +version = (changelog[-1][0], '2008-08-21 16:03:52 CEST', 'ud') # verbose = 1 system = platform.system ().lower () @@ -167,7 +175,6 @@ This is a general exception thrown by this module.""" def __init__ (self, message = None): Exception.__init__ (self, message) self.msg = message -AgnError = error def require (checkversion, checklicence = None): if cmp (checkversion, version[0]) > 0: @@ -188,11 +195,71 @@ removes any trailing LFs and CRs.""" def atob (s): """def atob (s): -tries to interpret the incoming string as a boolean value""" +tries to interpret the incoming string as a boolean value.""" if s and len (s) > 0 and s[0] in [ '1', 'T', 't', 'Y', 'y', '+' ]: return True return False +def numfmt (n, separator = '.'): + """def numfmt (n, separator = '.'): + +convert the number to a more readble form using separator.""" + if n == 0: + return '0' + if n < 0: + prefix = '-' + n = -n + else: + prefix = '' + rc = '' + while n > 0: + if n >= 1000: + rc = '%s%03d%s' % (separator, n % 1000, rc) + else: + rc = '%d%s' % (n, rc) + n /= 1000 + return prefix + rc + +def validate (s, pattern, *funcs, **kw): + """def validate (s, pattern *funcs): + +pattern is a regular expression where s is matched against. +Each group element is validated against a function found in funcs.""" + if not pattern.startswith ('^'): + pattern = '^' + pattern + if not pattern.endswith ('$') or pattern.endswith ('\\$'): + pattern += '$' + try: + reflags = kw['flags'] + except KeyError: + reflags = 0 + try: + pat = re.compile (pattern, reflags) + except Exception, e: + raise error ('Failed to compile regular expression "%s": %s' % (pattern, e.args[0])) + mtch = pat.match (s) + if mtch is None: + raise error ('No match') + if len (funcs) > 0: + flen = len (funcs) + n = 0 + report = [] + grps = mtch.groups () + if not grps: + grps = [mtch.group ()] + for elem in grps: + if n < flen: + if type (funcs[n]) in (types.ListType, types.TupleType): + (func, reason) = funcs[n] + else: + func = funcs[n] + reason = '%r' % func + if not func (elem): + report.append ('Failed in group #%d: %s' % (n + 1, reason)) + n += 1 + if report: + raise error ('Validation failed: %s' % ', '.join (report)) + def filecount (directory, pattern): """def filecount (directory, pattern): @@ -305,16 +372,21 @@ prints s with a newline appended to stderr.""" def transformSQLwildcard (s): r = '' + needFinal = True for ch in s: + needFinal = True if ch in '$^*?()+[{]}|\\.': r += '\\%s' % ch elif ch == '%': r += '.*' + needFinal = False elif ch == '_': r += '.' else: r += ch - return r + '$' + if needFinal: + r += '$' + return r def compileSQLwildcard (s, reFlags = 0): return re.compile (transformSQLwildcard (s), reFlags) @@ -898,6 +970,8 @@ def mailsend (relay, sender, receivers, headers, body, return (rc, 'Missing relay\n') if not sender: return (rc, 'Missing sender\n') + if type (receivers) in types.StringTypes: + receivers = [receivers] if len (receivers) == 0: return (rc, 'Missing receivers\n') if not body: @@ -909,29 +983,30 @@ def mailsend (relay, sender, receivers, headers, body, if codetype (code) != 2: raise smtplib.SMTPResponseException (code, 'HELO ' + myself + ': ' + detail) else: - report = report + 'HELO ' + myself + ' sent\n' + report += 'HELO %s sent\n%d %s recvd\n' % (myself, code, detail) (code, detail) = s.mail (sender) if codetype (code) != 2: raise smtplib.SMTPResponseException (code, 'MAIL FROM:<' + sender + '>: ' + detail) else: - report = report + 'MAIL FROM:<' + sender + '> sent\n' + report += 'MAIL FROM:<%s> sent\n%d %s recvd\n' % (sender, code, detail) for r in receivers: (code, detail) = s.rcpt (r) if codetype (code) != 2: raise smtplib.SMTPResponseException (code, 'RCPT TO:<' + r + '>: ' + detail) else: - report = report + 'RCPT TO:<' + r + '> sent\n' + report += 'RCPT TO:<%s> sent\n%d %s recvd\n' % (r, code, detail) mail = '' hsend = False hrecv = False - for h in headers: - if len (h) > 0 and h[-1] != '\n': - h += '\n' - if not hsend and len (h) > 5 and h[:5].lower () == 'from:': - hsend = True - elif not hrecv and len (h) > 3 and h[:3].lower () == 'to:': - hrecv = True - mail = mail + h + if headers: + for h in headers: + if len (h) > 0 and h[-1] != '\n': + h += '\n' + if not hsend and len (h) > 5 and h[:5].lower () == 'from:': + hsend = True + elif not hrecv and len (h) > 3 and h[:3].lower () == 'to:': + hrecv = True + mail = mail + h if not hsend: mail += 'From: ' + sender + '\n' if not hrecv: @@ -946,20 +1021,20 @@ def mailsend (relay, sender, receivers, headers, body, if codetype (code) != 2: raise smtplib.SMTPResponseException (code, 'DATA: ' + detail) else: - report = report + 'DATA sent\n' + report += 'DATA sent\n%d %s recvd\n' % (code, detail) s.quit () - report = report + 'QUIT sent\n' + report += 'QUIT sent\n' rc = True except smtplib.SMTPConnectError, e: - report = report + 'Unable to connect to %s, got %d %s response\n' % (relay, e.smtp_code, e.smtp_error) + report += 'Unable to connect to %s, got %d %s response\n' % (relay, e.smtp_code, e.smtp_error) except smtplib.SMTPServerDisconnected: - report = report + 'Server connection lost\n' + report += 'Server connection lost\n' except smtplib.SMTPResponseException, e: - report = report + 'Invalid response: %d %s\n' % (e.smtp_code, e.smtp_error) + report += 'Invalid response: %d %s\n' % (e.smtp_code, e.smtp_error) except socket.error, e: - report = report + 'General socket error: %s\n' % `e.args` + report += 'General socket error: %s\n' % `e.args` except Exception, e: - report = report + 'General problems during mail sending: %s, %s\n' % (`type (e)`, `e.args`) + report += 'General problems during mail sending: %s, %s\n' % (`type (e)`, `e.args`) return (rc, report) #}}} # @@ -1134,8 +1209,9 @@ if database: return record class DBCursor: - def __init__ (self, db): + def __init__ (self, db, autocommit): self.db = db + self.autocommit = autocommit self.curs = None self.desc = False self.rfparse = re.compile (':[A-Za-z0-9_]+|%') @@ -1177,10 +1253,6 @@ if database: return self.curs.description return None - # - # new interface using iterators and support for named - # parameter - # def __reformat (self, req, parm): try: @@ -1285,7 +1357,7 @@ if database: self.__error (e) raise error ('update failed: ' + self.lastError ()) rows = self.curs.rowcount - if rows > 0 and commit: + if rows > 0 and (commit or self.autocommit): if not self.sync (): raise error ('commit failed: ' + self.lastError ()) self.desc = False @@ -1353,16 +1425,21 @@ if database: if self.db: try: curs = self.db.cursor () + try: + if curs.arraysize < 100: + curs.arraysize = 100 + except AttributeError: + pass except database.Error, err: self.__error (err) return curs - def cursor (self): + def cursor (self, autocommit = False): c = None if not self.db: self.open () if self.db: - c = DBCursor (self) + c = DBCursor (self, autocommit) return c def query (self, req): @@ -1446,6 +1523,7 @@ are mostly transformed directly into a python construct: ## ... this introduces a comment up to end of line #property(expr) this sets a property of the template #pragma(expr) alias for property +#include(expr) inclusion of file, subclass must realize this #if(pyexpr) --> if pyexpr: #elif(pyexpr) --> elif pyexpr: #else --> else @@ -1496,7 +1574,7 @@ Dies ist ein Beispiel. """ codeStart = re.compile ('^[ \t]*#code[^\n]*\n', re.IGNORECASE) codeEnd = re.compile ('(^|\n)[ \t]*#end[^\n]*(\n|$)', re.IGNORECASE | re.MULTILINE) - token = re.compile ('((^|\n)[ \t]*#(#|property|pragma|if|elif|else|do|pass|break|continue|for|while|try|except|finally|with|end|stop)|\\$(\\$|[0-9a-z_]+(\\.[0-9a-z_]+)*|\\{[^}]*\\}))', re.IGNORECASE | re.MULTILINE) + token = re.compile ('((^|\n)[ \t]*#(#|property|pragma|include|if|elif|else|do|pass|break|continue|for|while|try|except|finally|with|end|stop)|\\$(\\$|[0-9a-z_]+(\\.[0-9a-z_]+)*|\\{[^}]*\\}))', re.IGNORECASE | re.MULTILINE) rplc = re.compile ('\\\\|"|\'|\n|\r|\t|\f|\v', re.MULTILINE) rplcMap = {'\n': '\\n', '\r': '\\r', '\t': '\\t', '\f': '\\f', '\v': '\\v'} langID = re.compile ('^([ \t]*)([a-z][a-z]):', re.IGNORECASE) @@ -1662,8 +1740,17 @@ Dies ist ein Beispiel. if token == '#': while pos < clen and self.content[pos] != '\n': pos += 1 + if pos < clen: + pos += 1 elif token in ('property', 'pragma'): self.__setProperty (arg) + elif token in ('include', ): + try: + included = self.include (arg) + if included: + self.content = self.content[:pos] + included + self.content[pos:] + except error, e: + self.__compileError (tstart, 'Failed to include "%s": %s' % (arg, e.msg)) elif token in ('if', 'else', 'elif', 'for', 'while', 'try', 'except', 'finally', 'with'): if token in ('else', 'elif', 'except', 'finally'): if self.indent > 0: @@ -1715,6 +1802,9 @@ Dies ist ein Beispiel. self.code += '\n' self.code += self.postcode self.compiled = compile (self.code, '<template>', 'exec') + + def include (self, arg): + raise error ('Subclass responsible for implementing "include"') def property (self, var): try: src/script/lib/agn.py @@ -30,6 +30,15 @@ import agn agn.require ('2.0.0') agn.loglevel = agn.LV_INFO # + +if not agn.iswin: + try: + import smenable + except ImportError: + smenable = None +else: + smenable = None +# delay = 180 configFilename = agn.base + os.sep + 'var' + os.sep + 'spool' + os.sep + 'bav' + os.sep + 'bav.conf' @@ -133,6 +142,16 @@ class Data: self.last = '' self.autoresponder = [] self.mtdom = {} + + self.sendmailFree = False + if agn.iswin: + self.sendmailFree = True + else: + if not smenable is None: + sm = smenable.SMCtrl () + if sm.valid and not sm.enabled (): + self.sendmailFree = True + sm.done () self.readMailertable () try: files = os.listdir (arDirectory) @@ -148,11 +167,20 @@ class Data: self.domains = [] self.mtdom = {} - if agn.iswin: + if self.sendmailFree: self.domains = [self.fixdomain] me = socket.getfqdn () if me: self.domains.append (me) + db = agn.DBase () + if not db is None: + c = db.cursor () + if not c is None: + for r in c.query ('SELECT mailloop_domain FROM company_tbl'): + if r[0] and not r[0] in self.domains: + self.domains.append (r[0]) + c.close () + db.close () return try: for line in fileReader (mailBase + '/mailertable'): @@ -189,7 +217,7 @@ class Data: def readMailFiles (self): rc = '' - if agn.iswin: + if self.sendmailFree: return rc try: for line in fileReader (mailBase + '/local-host-names'): @@ -267,7 +295,8 @@ class Data: domains.append (cdomain) else: - agn.log (agn.LV_ERROR, 'data', 'Companys domain "%s" not found in mailertable' % cdomain) + + agn.log (agn.LV_WARNING, 'data', 'Domain "%s" not known' % cdomain) except KeyError: agn.log (agn.LV_DEBUG, 'data', 'No domain for company found, further processing') if domains is None: src/script/process/bav-update.py @@ -666,7 +666,7 @@ class BAV: else: parm = 'sent' self.saveMessage (parm) - if match is None: + if parm == 'sent': while self.msg.has_key (BAV.x_agn): del self.msg[BAV.x_agn] if self.parm.has_key ('fwd'): src/script/process/bavd.py @@ -102,4 +102,6 @@ def main (pgm, args): ctrl.done () if not fail is None: agn.die (s = fail) -main (sys.argv[0], sys.argv[1:]) +# +if __name__ == '__main__': + main (sys.argv[0], sys.argv[1:]) src/script/process/smenable.py @@ -127,7 +127,7 @@ try: else: max_mailtrack_id = data[0] - iquery = 'INSERT INTO softbounce_email_tbl (company_id, email, bnccnt, mailing_id, creation_date) VALUES (:company, :email, 1, :mailing, now())' + iquery = 'INSERT INTO softbounce_email_tbl (company_id, email, bnccnt, mailing_id, creation_date, change_date) VALUES (:company, :email, 1, :mailing, now(), now())' icurs = db.cursor () uquery = 'UPDATE softbounce_email_tbl SET mailing_id = :mailing, change_date = now(), bnccnt=bnccnt+1 WHERE company_id = :company AND email = :email' src/script/process/softbounce.py @@ -25,7 +25,7 @@ # import sys, os, getopt, time, signal, re import agn -agn.require ('2.0.0') +agn.require ('2.0.4') agn.loglevel = agn.LV_INFO # delay = 30 @@ -57,6 +57,9 @@ class Update: #{{{ for o in nopts: self.opts[o[0]] = o[1] + def done (self): + pass + def shouldRun (self): return True @@ -195,6 +198,7 @@ class UpdateBounce (Update): #{{{ self.ustatus = agn.UserStatus () self.mailingMap = {} self.dsnparse = re.compile ('^([0-9])\\.([0-9])\\.([0-9])$') + self.igcount = None self.sucount = None self.sbcount = None self.hbcount = None @@ -260,13 +264,15 @@ class UpdateBounce (Update): #{{{ else: return self.mailingMap[mailing] def updateStart (self, inst): + self.igcount = 0 self.sucount = 0 self.sbcount = 0 self.hbcount = 0 return True def updateEnd (self, inst): - agn.log (agn.LV_INFO, 'udpBounce', 'Found %d hardbounces, %d softbounces, %d successes in %d lines' % (self.hbcount, self.sbcount, self.sucount, self.lineno)) + + agn.log (agn.LV_INFO, 'udpBounce', 'Found %d hardbounces, %d softbounces, %d successes, %d ignored in %d lines' % (self.hbcount, self.sbcount, self.sucount, self.igcount, self.lineno)) return True def updateLine (self, inst, line): @@ -294,9 +300,9 @@ class UpdateBounce (Update): #{{{ agn.log (agn.LV_WARNING, 'updBounce', 'Cannot map mailing %d to company for line: %s' % (mailing, line)) return False - logMode = 1 + logging = True rc = True - if logMode & 1 == 1: + if logging: if detail == 200: self.sucount += 1 else: @@ -310,7 +316,7 @@ class UpdateBounce (Update): #{{{ inst.update ('INSERT INTO bounce_tbl (company_id, customer_id, detail, mailing_id, dsn, change_date) VALUES (:company, :customer, :detail, :mailing, :dsn, now())', data) except agn.error, e: - agn.log (agn.LV_ERROR, 'updBounce', 'Unable to add %s to database: %s' % (`data`, e.msg)) + agn.log (agn.LV_ERROR, 'updBounce', 'Unable to add bounce %s to database: %s' % (`data`, e.msg)) rc = False if detail in (510, 511, 512) or bouncetype in (3, 4, 6): self.hbcount += 1 @@ -330,6 +336,8 @@ class UpdateBounce (Update): #{{{ self.sbcount += 1 if self.sbcount % 1000 == 0: inst.sync () + else: + self.igcount += 1 return rc #}}} class UpdateAccount (Update): #{{{ @@ -479,13 +487,15 @@ while not term: db.close () # # Zzzzz.... - count = delay - while count > 0 and not term: + countDelay = delay + while countDelay > 0 and not term: if agn.iswin and agn.winstop (): term = True break time.sleep (1) - count -= 1 + countDelay -= 1 +for upd in updates: + upd.done () agn.log (agn.LV_INFO, 'main', 'Going down') agn.unlock () src/script/process/update.py src/java/org/agnitas/dao/impl/OpenSessionInViewFilter.java src/java/org/agnitas/dao/impl/SerializeRequestFilter.java src/java/org/agnitas/web/AdminForm.java src/java/org/agnitas/web/CampaignForm.java src/java/org/agnitas/web/EmmActionForm.java src/java/org/agnitas/web/StrutsFormBase.java src/jsp/WEB-INF/conf/navigation/ProfileDbSub.properties src/jsp/WEB-INF/conf/navigation/templates.properties src/jsp/fckeditor2.5/editor/dtd/fck_dtd_test.html src/jsp/fckeditor2.5/editor/filemanager/connectors/test.html src/jsp/fckeditor2.5/editor/filemanager/connectors/uploadtest.html 7b5b4d6b49c43cc033ba10263d1dca834097e913 Nicolas Marchildon nicolas@marchildon.net http://github.com/elecnix/openemm/commit/cdc73107446d5a4ab63f3ab673c22f79d689a891 cdc73107446d5a4ab63f3ab673c22f79d689a891 2008-10-23T08:15:18-07:00 2008-10-23T08:15:18-07:00 Imported OpenEMM-5.5.1-src.tar.gz 555094be67acb2565932c999955c42ed5da4940c Nicolas Marchildon nicolas@marchildon.net