frontend update to 19.04.000.482

frontend/build/templates/web-basic.xml

@@ -330,6 +330,23 @@
 		<url-pattern>/r.html</url-pattern>
 	</servlet-mapping>
 
+	<servlet>
+		<servlet-name>RedirectLoginServlet</servlet-name>
+		<servlet-class>com.agnitas.web.RedirectToUrlServlet</servlet-class>
+	     <init-param>
+	         <param-name>httpCode</param-name>
+	         <param-value>301</param-value>
+	     </init-param>
+	     <init-param>
+	         <param-name>destinationUrl</param-name>
+	         <param-value>/logon.action</param-value>
+	     </init-param>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>RedirectLoginServlet</servlet-name>
+		<url-pattern>/logon.do</url-pattern>
+	</servlet-mapping>
+
 	<servlet>
 		<servlet-name>RedirectServletUserForm</servlet-name>
 		<servlet-class>com.agnitas.userform.trackablelinks.web.ComRdirUserForm</servlet-class>

frontend/src/java/com/agnitas/dao/impl/ComMailingDaoImpl.java

@@ -34,48 +34,6 @@
 import java.util.Vector;
 import java.util.stream.Collectors;
 
-import com.agnitas.beans.ComMailing;
-import com.agnitas.beans.ComMailing.MailingContentType;
-import com.agnitas.beans.ComRdirMailingData;
-import com.agnitas.beans.ComTarget;
-import com.agnitas.beans.ComTrackableLink;
-import com.agnitas.beans.DynamicTag;
-import com.agnitas.beans.LinkProperty;
-import com.agnitas.beans.MaildropEntry;
-import com.agnitas.beans.MailingsListProperties;
-import com.agnitas.beans.MediatypeEmail;
-import com.agnitas.beans.impl.ComMailingImpl;
-import com.agnitas.beans.impl.ComRdirMailingDataImpl;
-import com.agnitas.beans.impl.DynamicTagImpl;
-import com.agnitas.beans.impl.MediatypeEmailImpl;
-import com.agnitas.dao.ComCompanyDao;
-import com.agnitas.dao.ComMailingComponentDao;
-import com.agnitas.dao.ComMailingDao;
-import com.agnitas.dao.ComTargetDao;
-import com.agnitas.dao.ComTrackableLinkDao;
-import com.agnitas.dao.ComUndoDynContentDao;
-import com.agnitas.dao.ComUndoMailingComponentDao;
-import com.agnitas.dao.ComUndoMailingDao;
-import com.agnitas.dao.DaoUpdateReturnValueCheck;
-import com.agnitas.dao.DynamicTagDao;
-import com.agnitas.emm.core.LinkServiceImpl;
-import com.agnitas.emm.core.birtreport.dto.FilterType;
-import com.agnitas.emm.core.birtreport.util.BirtReportSettingsUtils;
-import com.agnitas.emm.core.commons.database.DatabaseInformation;
-import com.agnitas.emm.core.commons.database.DatabaseInformationException;
-import com.agnitas.emm.core.commons.database.fulltext.FulltextSearchQueryGenerator;
-import com.agnitas.emm.core.maildrop.MaildropStatus;
-import com.agnitas.emm.core.mailing.MailingDataException;
-import com.agnitas.emm.core.mailing.TooManyTargetGroupsInMailingException;
-import com.agnitas.emm.core.mailing.bean.ComFollowUpStats;
-import com.agnitas.emm.core.mailing.dao.ComMailingParameterDao;
-import com.agnitas.emm.core.mediatypes.common.MediaTypes;
-import com.agnitas.emm.core.target.TargetExpressionUtils;
-import com.agnitas.emm.core.workflow.beans.Workflow.WorkflowStatus;
-import com.agnitas.emm.core.workflow.beans.WorkflowDependencyType;
-import com.agnitas.emm.grid.grid.dao.ComGridTemplateDao;
-import com.agnitas.predelivery.dao.ComPredeliveryDao;
-import com.agnitas.util.SpecialCharactersWorker;
 import org.agnitas.beans.BindingEntry.UserType;
 import org.agnitas.beans.DynamicTagContent;
 import org.agnitas.beans.Mailing;
@@ -124,6 +82,49 @@
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 import org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer;
 
+import com.agnitas.beans.ComMailing;
+import com.agnitas.beans.ComMailing.MailingContentType;
+import com.agnitas.beans.ComRdirMailingData;
+import com.agnitas.beans.ComTarget;
+import com.agnitas.beans.ComTrackableLink;
+import com.agnitas.beans.DynamicTag;
+import com.agnitas.beans.LinkProperty;
+import com.agnitas.beans.MaildropEntry;
+import com.agnitas.beans.MailingsListProperties;
+import com.agnitas.beans.MediatypeEmail;
+import com.agnitas.beans.impl.ComMailingImpl;
+import com.agnitas.beans.impl.ComRdirMailingDataImpl;
+import com.agnitas.beans.impl.DynamicTagImpl;
+import com.agnitas.beans.impl.MediatypeEmailImpl;
+import com.agnitas.dao.ComCompanyDao;
+import com.agnitas.dao.ComMailingComponentDao;
+import com.agnitas.dao.ComMailingDao;
+import com.agnitas.dao.ComTargetDao;
+import com.agnitas.dao.ComTrackableLinkDao;
+import com.agnitas.dao.ComUndoDynContentDao;
+import com.agnitas.dao.ComUndoMailingComponentDao;
+import com.agnitas.dao.ComUndoMailingDao;
+import com.agnitas.dao.DaoUpdateReturnValueCheck;
+import com.agnitas.dao.DynamicTagDao;
+import com.agnitas.emm.core.LinkServiceImpl;
+import com.agnitas.emm.core.birtreport.dto.FilterType;
+import com.agnitas.emm.core.birtreport.util.BirtReportSettingsUtils;
+import com.agnitas.emm.core.commons.database.DatabaseInformation;
+import com.agnitas.emm.core.commons.database.DatabaseInformationException;
+import com.agnitas.emm.core.commons.database.fulltext.FulltextSearchQueryGenerator;
+import com.agnitas.emm.core.maildrop.MaildropStatus;
+import com.agnitas.emm.core.mailing.MailingDataException;
+import com.agnitas.emm.core.mailing.TooManyTargetGroupsInMailingException;
+import com.agnitas.emm.core.mailing.bean.ComFollowUpStats;
+import com.agnitas.emm.core.mailing.dao.ComMailingParameterDao;
+import com.agnitas.emm.core.mediatypes.common.MediaTypes;
+import com.agnitas.emm.core.target.TargetExpressionUtils;
+import com.agnitas.emm.core.workflow.beans.Workflow.WorkflowStatus;
+import com.agnitas.emm.core.workflow.beans.WorkflowDependencyType;
+import com.agnitas.emm.grid.grid.dao.ComGridTemplateDao;
+import com.agnitas.predelivery.dao.ComPredeliveryDao;
+import com.agnitas.util.SpecialCharactersWorker;
+
 /**
  * TODO: Check concatenated SQl statements for sql-injection possibilities,
  *       replace where possible by real ?-parameters, also for better db performance
@@ -773,6 +774,7 @@ private void removeDynTagContentsExceptIds(int mailingId, int dynNameId, Collect
 	}
 	*/
 
+	@Override
 	@DaoUpdateReturnValueCheck
     public boolean cleanupContentForDynName(int mailingId, int companyId, String dynName) {
         return cleanupContentForDynNames(mailingId, companyId, Collections.singletonList(dynName));
@@ -3313,7 +3315,7 @@ public List<Map<String, Object>> getSentAndScheduled(@VelocityCheck final int co
                 + " WHERE mailing.company_id = ? AND mailing.deleted = 0 AND maildrop.status_field = 'W' AND mediatype.mediatype = 0 "
 				+ (isOracleDB() ? "AND maildrop.senddate > CAST(? AS DATE) AND maildrop.senddate < CAST(? AS DATE)" : "AND maildrop.senddate > ? AND maildrop.senddate < ?")
                 + " GROUP BY mailing.mailing_id, mailing.shortname, mediatype.param, mailing.work_status "; //ORDER BY min(maildrop.senddate)";
-        query = addSentMailingSort(query, "date", "desc");
+        query = addSortingToQuery(query, "MIN(maildrop.senddate)", "desc");
         final List<Map<String, Object>> mailingList = select(logger, query, MailingComponent.TYPE_THUMBNAIL_IMAGE, companyId, startDate, endDate);
 		for (final Map<String, Object> mailing : mailingList) {
 			final String param = mailing.get("subject").toString();

frontend/src/java/com/agnitas/web/RedirectToUrlServlet.java

@@ -0,0 +1,57 @@
+/*
+
+    Copyright (C) 2019 AGNITAS AG (https://www.agnitas.org)
+
+    This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+    You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+package com.agnitas.web;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+public class RedirectToUrlServlet extends HttpServlet {
+	/** The logger. */
+	private static final transient Logger logger = Logger.getLogger(RedirectToUrlServlet.class);
+
+	/** Serial version UID: */
+	private static final long serialVersionUID = -595094416663851734L;
+
+	private String destinationUrl = null;
+	private int httpCode = 301;
+
+	@Override
+	public void init(ServletConfig config) throws ServletException {
+		super.init(config);
+
+		try {
+			destinationUrl = config.getInitParameter("destinationUrl");
+		} catch (NumberFormatException e) {
+			logger.error("Invalid destinationUrl");
+		}
+
+		try {
+			httpCode = Integer.parseInt(config.getInitParameter("httpCode"));
+		} catch (NumberFormatException e) {
+			logger.error("Invalid httpCode");
+		}
+	}
+
+	@Override
+	public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+		getInitParameter("destinationUrl");
+		response.setStatus(httpCode);
+		response.setContentType("text/html");
+		response.setHeader("Location", destinationUrl);
+	}
+}

frontend/src/java/org/agnitas/util/HtmlUtils.java

@@ -423,7 +423,10 @@ private static void embedStyles(StringBuilder builder, Node node, DeclarationMap
                         if (StringUtils.equalsIgnoreCase("stylesheet", element.getAttribute("rel"))) {
                             String address = element.getAttribute("href");
                             if (StringUtils.isBlank(element.getAttribute("media")) && StringUtils.isNotBlank(address)) {
-                                address = HttpUtils.resolveRelativeUri(options.getBaseUrl(), address);
+                                if (options.getBaseUrl() != null) {
+                                    address = HttpUtils.resolveRelativeUri(options.getBaseUrl(), address);
+                                }
+
                                 try {
                                     URL remoteResource = new URL(address);
 
@@ -595,7 +598,7 @@ private static void appendAttributes(StringBuilder builder, DeclarationMap style
                         break;
 
                     case "src":
-                        if (StringUtils.equals(element.getTagName(), "img") && !value.startsWith("[")) {
+                        if (options.getBaseUrl() != null && StringUtils.equals(element.getTagName(), "img") && !value.startsWith("[")) {
                             value = HttpUtils.resolveRelativeUri(options.getBaseUrl(), value);
                         }
                         //$FALL-THROUGH$
@@ -740,7 +743,7 @@ public static class StylesEmbeddingOptions {
 
         private StylesEmbeddingOptions(StylesEmbeddingOptionsBuilder builder) {
             this.encoding = builder.encoding;
-            this.baseUrl = Objects.requireNonNull(builder.baseUrl, "baseUrl == null");
+            this.baseUrl = builder.baseUrl;
             this.mediaType = builder.mediaType;
             this.escapeAgnTags = builder.escapeAgnTags;
             this.prettyPrint = builder.prettyPrint;

frontend/src/view/WEB-INF/conf/new_messages.properties

@@ -521,3 +521,11 @@ fr.UserRight.Premium#others.webservice.user.show=Faire la liste d'utilisateurs d
 it.UserRight.Premium#others.webservice.user.show=Elenca utenti webservice
 nl.UserRight.Premium#others.webservice.user.show=Gebruikers van Webservice als lijst weergeven
 
+en.UserRight.ImportExport.import.mode.globus_special_4er_block=Globus Special Import 4er Block
+de.UserRight.ImportExport.import.mode.globus_special_4er_block=Globus Special Import 4er Block
+
+en.import.mode.globus_special_4er_block=Globus Special Import 4er Block
+de.import.mode.globus_special_4er_block=Globus Special Import 4er Block
+
+en.error.missingMandatoryColumn=Missing mandatory column: {0}
+de.error.missingMandatoryColumn=Fehlende erforderliche Spalte: {0}

frontend/src/view/WEB-INF/jsp/actions/ops/UpdateCustomer-trackpoint-table.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/actions/ops/UpdateCustomer-trackpoint.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/importwizard/profile/action_settings-extended_actions.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/importwizard/profile/file_settings-nocsvheaders.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/importwizard_classic/importwizard_classic-start-premium_charsets.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/actions-dropdown-followup.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/actions-dropdown-mailingexport.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-attachments-uploaded-pdf.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-components-sftp-content.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-components-sftp-tab.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-content-view-disableLinkExtension.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-list-follow-form.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-list-follow-js.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-list-interval-form.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-list-interval-js.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-send-prioritization.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-send2-optimized-mailing-generation-close.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-send2-optimized-mailing-generation-open.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-send2-recipients.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-trackablelink_list-revenue.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-trackablelink_view-revenue.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/mailing-view-base-follow.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/media/meditypes-list-item.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/media/prioritized-mediatypes.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/media/sms-mediatype-forbidden-message.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/view_base_settings-follow.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/view_base_settings-follow2.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/view_base_settings-follow3.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/view_base_settings-interval.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-attachment-personalize.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-attachment-personalize2.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-start-grid.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-start-grid2.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-template-hide.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-template-hidescript.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/mailing/wizard/mailing-wizard-type-followup.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/recipient/recipient-novip-normal.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/recipient/recipient-novip-test.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/stats/birt/stats-birt-mailing_stat-setup-extended.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>

frontend/src/view/WEB-INF/jsp/stats/birt/stats-birt-mailing_stat-setup-extended2.jspf

@@ -1 +1 @@
-<%-- This file was left blank intentionally. --%>
+<%-- This file was left empty intentionally. --%>