CVE-2022-4593 (published 2022-12-18T08:15Z)

A vulnerability was found in retra-system. It has been classified as problematic. Affected is an unknown function. The manipulation leads to cross site scripting. It is possible to launch the attack remotely. The name of the patch is a6d94ab88f4a6f631a14c59b72461140fb57ae1f. It is recommended to apply a patch to fix this issue. VDB-216186 is the identifier assigned to this vulnerability.

CVSS v3 base score: 6.1, MEDIUM (CVSS:3.1/AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N)

Weakness information:
cwe_id: CWE-79
cwe_name: Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting')
description: The product does not neutralize or incorrectly neutralizes user-controllable input before it is placed in output that is used as a web page that is served to other users.
extended_description: 
            Cross-site scripting (XSS) vulnerabilities occur when:
            
               Untrusted data enters a web application, typically from a web request.
               The web application dynamically generates a web page that contains this untrusted data.
               During page generation, the application does not prevent the data from containing content that is executable by a web browser, such as JavaScript, HTML tags, HTML attributes, mouse events, Flash, ActiveX, etc.
               A victim visits the generated web page through a web browser, which contains malicious script that was injected using the untrusted data.
               Since the script comes from a web page that was sent by the web server, the victim's web browser executes the malicious script in the context of the web server's domain.
               This effectively violates the intention of the web browser's same-origin policy, which states that scripts in one domain should not be able to access resources or run code in a different domain.
            
            There are three main kinds of XSS:
            
               
                  Type 1: Reflected XSS (or Non-Persistent) - 
         			The server reads data directly from the HTTP request and reflects it back in the HTTP response. Reflected XSS exploits occur when an attacker causes a victim to supply dangerous content to a vulnerable web application, which is then reflected back to the victim and executed by the web browser. The most common mechanism for delivering malicious content is to include it as a parameter in a URL that is posted publicly or e-mailed directly to the victim. URLs constructed in this manner constitute the core of many phishing schemes, whereby an attacker convinces a victim to visit a URL that refers to a vulnerable site. After the site reflects the attacker's content back to the victim, the content is executed by the victim's browser.
               
                  Type 2: Stored XSS (or Persistent) - 
               The application stores dangerous data in a database, message forum, visitor log, or other trusted data store. At a later time, the dangerous data is subsequently read back into the application and included in dynamic content. From an attacker's perspective, the optimal place to inject malicious content is in an area that is displayed to either many users or particularly interesting users. Interesting users typically have elevated privileges in the application or interact with sensitive data that is valuable to the attacker. If one of these users executes malicious content, the attacker may be able to perform privileged operations on behalf of the user or gain access to sensitive data belonging to the user. For example, the attacker might inject XSS into a log message, which might not be handled properly when an administrator views the logs.
            
               
                  Type 0: DOM-Based XSS - 
               In DOM-based XSS, the client performs the injection of XSS into the page; in the other types, the server performs the injection. DOM-based XSS generally involves server-controlled, trusted script that is sent to the client, such as Javascript that performs sanity checks on a form before the user submits it. If the server-supplied script processes user-supplied data and then injects it back into the web page (such as with dynamic HTML), then DOM-based XSS is possible.
            
            
            Once the malicious script is injected, the attacker can perform a variety of malicious activities. The attacker could transfer private information, such as cookies that may include session information, from the victim's machine to the attacker. The attacker could send malicious requests to a web site on behalf of the victim, which could be especially dangerous to the site if the victim has administrator privileges to manage that site. Phishing attacks could be used to emulate trusted web sites and trick the victim into entering a password, allowing the attacker to compromise the victim's account on that web site. Finally, the script could exploit a vulnerability in the web browser itself possibly taking over the victim's machine, sometimes referred to as "drive-by hacking."
            In many cases, the attack can be launched without the victim even being aware of it. Even with careful users, attackers frequently use a variety of methods to encode the malicious portion of the attack, such as URL encoding or Unicode, so the request looks less suspicious.
         
         

Fix information:
repo_url: https://github.com/retra/retra-system
commit_details: repo_url: https://github.com/retra/retra-system
author: siglp
author_date: 2022-01-07 14:46:49+01:00
msg: RETRA-41 - Specialni znaky v nazvu projektu
RETRA-48 - Chyba při renderování textu worklogu
RETRA-56 - Retra je nachylna na XSS
repository: repo_url: https://github.com/retra/retra-system
repo_name: retra/retra-system
repo_language: Java
owner: retra
file_changes: filename: SystemController.java
change_type: ModificationType.MODIFY
diff: @@ -419,9 +419,11 @@ public class SystemController extends DispatchController {
 
 	private List<Project> filterActiveProject(Set<Project> projects) {
 		List<Project> filtersList = new ArrayList<Project>();
-		for (Project p : projects) {
-			if (p.getState() == Project.STATE_ACTIVE) {
-				filtersList.add(p);
+		if (projects != null && !projects.isEmpty()) {
+			for (Project p : projects) {
+				if (p.getState() == Project.STATE_ACTIVE) {
+					filtersList.add(p);
+				}
 			}
 		}
 		return filtersList;

programming_language: Java
filename: DateDecorator.java
change_type: ModificationType.MODIFY
diff: @@ -6,6 +6,7 @@ import java.util.Date;
 
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.displaytag.decorator.DisplaytagColumnDecorator;
 import org.displaytag.exception.DecoratorException;
 import org.displaytag.properties.MediaTypeEnum;
@@ -25,6 +26,10 @@ public class DateDecorator implements DisplaytagColumnDecorator {
 			return dateFormat.format(columnValue);
 		}
 
+		if (columnValue instanceof String) {
+			return StringEscapeUtils.escapeHtml(columnValue.toString());
+		}
+		
 		// not date return it as it comes
 		return columnValue;
 	}

programming_language: Java
filename: EmailDecorator.java
change_type: ModificationType.MODIFY
diff: @@ -2,6 +2,7 @@ package cz.softinel.retra.core.utils.decorator;
 
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.displaytag.decorator.DisplaytagColumnDecorator;
 import org.displaytag.exception.DecoratorException;
 import org.displaytag.properties.MediaTypeEnum;
@@ -12,7 +13,8 @@ public class EmailDecorator implements DisplaytagColumnDecorator {
 		if (columnValue == null) {
 			return null;
 		}
-		return "<a href='mailto:" + columnValue + "'>" + columnValue + "</a>";
+		String escaped = StringEscapeUtils.escapeHtml(columnValue.toString());
+		return "<a href='mailto:" + escaped + "'>" + escaped + "</a>";
 	}
 
 }

programming_language: Java
filename: HourDecorator.java
change_type: ModificationType.MODIFY
diff: @@ -6,6 +6,7 @@ import java.util.Date;
 
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.displaytag.decorator.DisplaytagColumnDecorator;
 import org.displaytag.exception.DecoratorException;
 import org.displaytag.properties.MediaTypeEnum;
@@ -25,6 +26,10 @@ public class HourDecorator implements DisplaytagColumnDecorator {
 			return dateFormat.format(columnValue);
 		}
 
+		if (columnValue instanceof String) {
+			return StringEscapeUtils.escapeHtml(columnValue.toString());
+		}
+
 		// not date return it as it comes
 		return columnValue;
 	}

programming_language: Java
filename: HoursDecorator.java
change_type: ModificationType.MODIFY
diff: @@ -8,6 +8,7 @@ import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.displaytag.decorator.DisplaytagColumnDecorator;
 import org.displaytag.exception.DecoratorException;
 import org.displaytag.properties.MediaTypeEnum;
@@ -37,6 +38,10 @@ public class HoursDecorator implements DisplaytagColumnDecorator {
 			return formatter.format(columnValue);
 		}
 
+		if (columnValue instanceof String) {
+			return StringEscapeUtils.escapeHtml(columnValue.toString());
+		}
+
 		// not number return it as it comes
 		return columnValue;
 	}

programming_language: Java
filename: ScheduleOverviewDecorator.java
change_type: ModificationType.MODIFY
diff: @@ -6,6 +6,7 @@ import java.util.Date;
 
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.displaytag.decorator.DisplaytagColumnDecorator;
 import org.displaytag.exception.DecoratorException;
 import org.displaytag.properties.MediaTypeEnum;
@@ -43,9 +44,9 @@ public class ScheduleOverviewDecorator implements DisplaytagColumnDecorator {
 			Type type = schedule.getType();
 			String typeName = "";
 			if (type != null) {
-				typeName = type.getName();
+				typeName = StringEscapeUtils.escapeHtml(type.getName());
 			}
-			String comment = schedule.getComment();
+			String comment = StringEscapeUtils.escapeHtml(schedule.getComment());
 			if (comment == null) {
 				comment = "";
 			}
@@ -96,6 +97,10 @@ public class ScheduleOverviewDecorator implements DisplaytagColumnDecorator {
 
 		}
 
+		if (columnValue instanceof String) {
+			result = StringEscapeUtils.escapeHtml(columnValue.toString());
+		}
+
 		// not schedule return it as it comes
 		return result;
 	}

programming_language: Java
filename: JiraHelper.java
change_type: ModificationType.MODIFY
diff: @@ -5,6 +5,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.StringEscapeUtils;
+
 import cz.softinel.retra.jiraintegration.logic.JiraLogic;
 
 public abstract class JiraHelper {
@@ -60,10 +62,11 @@ public abstract class JiraHelper {
 					JiraIssue issue = jiraLogic.getJiraIssue(code);
 					String title = code;
 					if (issue != null) {
-						title = code + " - " + issue.getSummary();
+						String summary = getSafeJiraText(issue.getSummary());
+						title = code + " - " + summary;
+						String replacement = String.format(url, code, title, code);
+						result = result.replaceAll(code, replacement);
 					}
-					String replacement = String.format(url, code, title, code);
-					result = result.replaceAll(code, replacement);
 				}
 			} else {
 				result = text;
@@ -75,4 +78,12 @@ public abstract class JiraHelper {
 		return result;
 	}
 
+	public static String getSafeJiraText(final String text) {
+		String safeText = "";
+		if (text != null) {
+			safeText = StringEscapeUtils.escapeHtml(text);
+			safeText = safeText.replace("$", "&dollar;").replace("{", "&lcub;").replace("}", "&rcub;");
+		}
+		return safeText;
+	}
 }

programming_language: Java
filename: JiraIssue.java
change_type: ModificationType.MODIFY
diff: @@ -84,6 +84,12 @@ public class JiraIssue implements Serializable, Comparable<JiraIssue> {
 		this.self = self;
 	}
 
+	public void setSummary(String summary) {
+		if (fields != null) {
+			this.fields.setSummary(summary); 
+		}
+	}
+
 	public String getSummary() {
 		return fields == null ? null : fields.summary;
 	}

programming_language: Java
filename: WorklogLogicImpl.java
change_type: ModificationType.MODIFY
diff: @@ -3,6 +3,7 @@ package cz.softinel.retra.worklog.blo;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -427,7 +428,7 @@ public class WorklogLogicImpl extends AbstractLogicBean implements WorklogLogic
 	}
 
 	private void updateDescriptionGuiImpl(Worklog worklog) {
-		worklog.setDescriptionGui(JiraHelper.getLinkableText(worklog.getDescription(), jiraLogic));
+		worklog.setDescriptionGui(JiraHelper.getLinkableText(StringEscapeUtils.escapeHtml(worklog.getDescription()), jiraLogic));
 	}
 
 	private boolean isGivenEmpLoggedEmployee(Long givenPk) {

programming_language: Java
filename: AbstractWorklogFormController.java
change_type: ModificationType.MODIFY
diff: @@ -200,6 +200,7 @@ public abstract class AbstractWorklogFormController extends FormController {
 		if (issues != null && !issues.isEmpty()) {
 			for (JiraIssue ji : issues) {
 				ji.setGuiLink(JiraHelper.getLinkableText(ji.getKey(), "(Show...)", jiraLogic));
+				ji.setSummary(JiraHelper.getSafeJiraText(ji.getSummary()));
 			}
 		}
 		model.put("issues", issues);

programming_language: Java
filename: LovsFactory.java
change_type: ModificationType.MODIFY
diff: @@ -83,7 +83,7 @@ public final class LovsFactory extends ApplicationObjectSupport {
 		}
 
 		Lov lov = lovsInMap.get(code);
-		if (lov == null || lov.getFields() != null) {
+		if (lov == null || lov.getFields() == null) {
 			throw new RuntimeException("Missing LOV for code: " + code);
 		}
 		// TODO: Check ... it is good solution?

programming_language: Java
filename: SelectTag.java
change_type: ModificationType.MODIFY
diff: @@ -9,6 +9,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.poi.util.StringUtil;
 
 import cz.softinel.uaf.util.CommonHelper;
 
@@ -85,7 +87,15 @@ public class SelectTag extends VisualComponentTag {
 					try {
 						Comparable<String> v1 = BeanUtils.getProperty(o1, orderBy);
 						String v2 = BeanUtils.getProperty(o2, orderBy);
-						return v1.compareTo(v2);
+						if (v1 != null && v2 != null) {
+							return v1.compareTo(v2);							
+						} else {
+							if (v2 == null) {
+								return 0;
+							} else {
+								return -1;
+							}
+						}
 					} catch (IllegalAccessException e) {
 						throw new RuntimeException("Exception while getting property: " + e.getMessage(), e);
 					} catch (InvocationTargetException e) {
@@ -194,8 +204,11 @@ public class SelectTag extends VisualComponentTag {
 				prefix = "&nbsp;&nbsp;&nbsp;&nbsp;" + prefix;
 			}
 		}
+		String escapedValue = StringEscapeUtils.escapeHtml(value);
+		String escapedLabel = StringEscapeUtils.escapeHtml(label);
+		
 		output.append(
-				"\n		<option value='" + value + "'" + selectedAttribute + ">" + prefix + label + "</option>");
+				"\n		<option value='" + escapedValue + "'" + selectedAttribute + ">" + prefix + escapedLabel + "</option>");
 	}
 
 	// Setters ...

programming_language: Java
filename: Includes.jsp
change_type: ModificationType.MODIFY
diff: @@ -7,6 +7,7 @@
 --%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
 --%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
 --%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
+--%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%--
 --%><%@ taglib prefix="display" uri="http://displaytag.sf.net" %><%--
 --%><%--
 --%><%@ taglib prefix="vc" uri="/WEB-INF/tld/visual-component.tld" %><%--

programming_language: Shell
filename: ComponentCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -7,11 +7,11 @@
 <form action="${requestURI}" method="post" >
 
 	<spring:bind path="componentForm.pk">
-		<input type="hidden" name="${status.expression}" value="${status.value}" />
+		<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 	</spring:bind>
 
 	<spring:bind path="componentForm.projectPk">
-				<input type="hidden" name="${status.expression}" value="${status.value}" />
+				<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 	</spring:bind>
  
 	<table class="formTable">
@@ -19,7 +19,7 @@
 			<spring:bind path="componentForm.code">
 				<th><fmt:message key="entity.component.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -30,7 +30,7 @@
 			<spring:bind path="componentForm.name">
 				<th><fmt:message key="entity.component.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: ComponentEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -19,7 +19,7 @@
 			<spring:bind path="componentForm.code">
 				<th><fmt:message key="entity.component.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -30,7 +30,7 @@
 			<spring:bind path="componentForm.name">
 				<th><fmt:message key="entity.component.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: EmployeeChangeContactInfo.jsp
change_type: ModificationType.MODIFY
diff: @@ -10,7 +10,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.firstName">
 				<th><fmt:message key="entity.contactInfo.firstName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -21,7 +21,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.lastName">
 				<th><fmt:message key="entity.contactInfo.lastName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -32,7 +32,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.email">
 				<th><fmt:message key="entity.contactInfo.email" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -43,7 +43,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.web">
 				<th><fmt:message key="entity.contactInfo.web" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -54,7 +54,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone1">
 				<th><fmt:message key="entity.contactInfo.phone1" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -65,7 +65,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone2">
 				<th><fmt:message key="entity.contactInfo.phone2" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -76,7 +76,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.fax">
 				<th><fmt:message key="entity.contactInfo.fax" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: EmployeeChangePassword.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,7 +11,7 @@
 				<th><fmt:message key="entity.login.name" /></th>
 				<td>
 					${status.value}
-					<input type="hidden" name="${status.expression}" value="${status.value}" />
+					<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 				</td>
 			</spring:bind>
 		</tr>
@@ -20,7 +20,7 @@
 				<th><fmt:message key="entity.login.ldapLogin" /></th>
 				<td>
 					${status.value}
-					<input type="hidden" name="${status.expression}" value="${status.value}" />
+					<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 				</td>
 			</spring:bind>
 		</tr>
@@ -28,7 +28,7 @@
 			<spring:bind path="employeeForm.user.login.passwordOriginal">
 				<th><fmt:message key="entity.login.password.original" /></th>
 				<td>
-					<input type="password" name="${status.expression}" value="${status.value}" />
+					<input type="password" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -39,7 +39,7 @@
 			<spring:bind path="employeeForm.user.login.password">
 				<th><fmt:message key="entity.login.password.new" /></th>
 				<td>
-					<input type="password" name="${status.expression}" value="${status.value}" />
+					<input type="password" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -50,7 +50,7 @@
 			<spring:bind path="employeeForm.user.login.passwordConfirmation">
 				<th><fmt:message key="entity.login.password.confirmation" /></th>
 				<td>
-					<input type="password" name="${status.expression}" value="${status.value}" />
+					<input type="password" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: EmployeeCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -10,7 +10,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.firstName">
 				<th><fmt:message key="entity.contactInfo.firstName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -21,7 +21,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.lastName">
 				<th><fmt:message key="entity.contactInfo.lastName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -32,7 +32,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.email">
 				<th><fmt:message key="entity.contactInfo.email" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -43,7 +43,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.web">
 				<th><fmt:message key="entity.contactInfo.web" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -54,7 +54,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone1">
 				<th><fmt:message key="entity.contactInfo.phone1" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -65,7 +65,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone2">
 				<th><fmt:message key="entity.contactInfo.phone2" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -76,7 +76,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.fax">
 				<th><fmt:message key="entity.contactInfo.fax" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -87,7 +87,7 @@
 			<spring:bind path="employeeForm.user.login.name">
 				<th><fmt:message key="entity.login.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -98,7 +98,7 @@
 			<spring:bind path="employeeForm.user.login.ldapLogin">
 				<th><fmt:message key="entity.login.ldapLogin" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -109,7 +109,7 @@
 			<spring:bind path="employeeForm.user.login.password">
 				<th><fmt:message key="entity.login.password" /></th>
 				<td>
-					<input type="password" name="${status.expression}" value="${status.value}" />
+					<input type="password" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -120,7 +120,7 @@
 			<spring:bind path="employeeForm.user.login.passwordConfirmation">
 				<th><fmt:message key="entity.login.password.confirmation" /></th>
 				<td>
-					<input type="password" name="${status.expression}" value="${status.value}" />
+					<input type="password" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -131,7 +131,7 @@
 			<spring:bind path="employeeForm.icompany">
 				<th><fmt:message key="entity.employee.icompany" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${icompanies}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${icompanies}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value=""><fmt:message key="employee.icompany.unassigned" /></vc:select-option>
 					</vc:select>

programming_language: Shell
filename: EmployeeEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -9,7 +9,7 @@
 <form action="${requestURI}" method="post" >
 
 			<spring:bind path="employeeForm.pk">
-				<input type="hidden" name="${status.expression}" value="${status.value}" />
+				<input type="hidden" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 			</spring:bind>
 
 	<table class="formTable">
@@ -17,7 +17,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.firstName">
 				<th><fmt:message key="entity.contactInfo.firstName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -28,7 +28,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.lastName">
 				<th><fmt:message key="entity.contactInfo.lastName" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -39,7 +39,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.email">
 				<th><fmt:message key="entity.contactInfo.email" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -50,7 +50,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.web">
 				<th><fmt:message key="entity.contactInfo.web" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -61,7 +61,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone1">
 				<th><fmt:message key="entity.contactInfo.phone1" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -72,7 +72,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.phone2">
 				<th><fmt:message key="entity.contactInfo.phone2" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -83,7 +83,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.fax">
 				<th><fmt:message key="entity.contactInfo.fax" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -94,7 +94,7 @@
 			<spring:bind path="employeeForm.user.contactInfo.jirauser">
 				<th><fmt:message key="entity.contactInfo.jirauser" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -105,8 +105,8 @@
 			<spring:bind path="employeeForm.user.login.name">
 				<th><fmt:message key="entity.login.name" /></th>
 				<td>
-					<input type="hidden" name="${status.expression}" value="${status.value}" />
-					${status.value}
+					<input type="hidden" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
+					${fn:escapeXml(fn:escapeXml(status.value))}
 				</td>
 			</spring:bind>
 		</tr>
@@ -114,7 +114,7 @@
 			<spring:bind path="employeeForm.user.login.ldapLogin">
 				<th><fmt:message key="entity.login.ldapLogin" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(fn:escapeXml(status.value))}" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -125,7 +125,7 @@
 			<spring:bind path="employeeForm.icompany">
 				<th><fmt:message key="entity.employee.icompany" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${icompanies}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${icompanies}" selected="${fn:escapeXml(fn:escapeXml(status.value))}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value=""><fmt:message key="employee.icompany.unassigned" /></vc:select-option>
 					</vc:select>
@@ -140,7 +140,7 @@
 				<th><fmt:message key="entity.employee.igenerate" /></th>
 				<td>
 					<c:choose>
-						<c:when test="${status.value != null && status.value == true}"><input type="checkbox" name="${status.expression}" checked="checked" /></c:when>
+						<c:when test="${fn:escapeXml(status.value) != null && fn:escapeXml(status.value) == true}"><input type="checkbox" name="${status.expression}" checked="checked" /></c:when>
 						<c:otherwise><input type="checkbox" name="${status.expression}" /></c:otherwise>
 					</c:choose>
 					<c:forEach items="${status.errorMessages}">
@@ -159,7 +159,7 @@
 	<spring:bind path="employeeForm.projects">
 	<select name="${status.expression}" multiple="multiple">
            <c:forEach items="${projects}" var="project">
-               <c:forEach items="${status.value}" var="currentProject">
+               <c:forEach items="${fn:escapeXml(status.value)}" var="currentProject">
                
                     <c:if test="${currentProject.pk == project.pk}">
                        <c:set var="selected" value="true"/>

programming_language: HTML
filename: EmployeeManagement.jsp
change_type: ModificationType.MODIFY
diff: @@ -9,7 +9,7 @@
 	sort="list">
 
 	<display:column property="user.contactInfo.displayName" titleKey="entity.contactInfo.displayName" sortable="true" 
-		comparator="${nameComparator}"/>
+		comparator="${nameComparator}" escapeXml="true" />
 	<display:column property="user.contactInfo.email" titleKey="entity.contactInfo.email" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.EmailDecorator"/>
 
 	<display:column property="user.state" titleKey="entity.user.state" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.StateDecorator" />

programming_language: HTML
filename: EmployeeView.jsp
change_type: ModificationType.MODIFY
diff: @@ -6,48 +6,48 @@
 	<table class="formTable">
 		<tr>
 			<th><fmt:message key="entity.contactInfo.displayName" /></th>
-			<td>${employee.user.contactInfo.displayName}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.displayName)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.firstName" /></th>
-			<td>${employee.user.contactInfo.firstName}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.firstName)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.lastName" /></th>
-			<td>${employee.user.contactInfo.lastName}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.lastName)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.email" /></th>
-			<td>${employee.user.contactInfo.email}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.email)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.web" /></th>
-			<td>${employee.user.contactInfo.web}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.web)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.phone1" /></th>
-			<td>${employee.user.contactInfo.phone1}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.phone1)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.phone2" /></th>
-			<td>${employee.user.contactInfo.phone2}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.phone2)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.contactInfo.fax" /></th>
-			<td>${employee.user.contactInfo.fax}</td>
+			<td>${fn:escapeXml(employee.user.contactInfo.fax)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.login.name" /></th>
-			<td>${employee.user.login.name}</td>
+			<td>${fn:escapeXml(employee.user.login.name)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.login.ldapLogin" /></th>
-			<td>${employee.user.login.ldapLogin}</td>
+			<td>${fn:escapeXml(employee.user.login.ldapLogin)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.employee.icompany" /></th>
 			<td>
-				<c:if test="${employee.icompany != null}" >${employee.icompany.codeAndName}</c:if>
+				<c:if test="${employee.icompany != null}" >${fn:escapeXml(employee.icompany.codeAndName)}</c:if>
 				<c:if test="${employee.icompany == null}" >-</c:if>
 			</td>
 		</tr>
@@ -65,7 +65,7 @@
 	<br><center><b>Projects</b></center>
 	
 	<display:table name="employee.projects" requestURI="${requestURI}" defaultsort="1" pagesize="${defaultPageSize}" id="project" sort="list">
-		<display:column property="name" titleKey="entity.project.name" sortable="true"/>
+		<display:column property="name" titleKey="entity.project.name" sortable="true" escapeXml="true"/>
 	</display:table>
 	
 	<table class="formTable">

programming_language: HTML
filename: InvoiceBatchGenerateConfirm.jsp
change_type: ModificationType.MODIFY
diff: @@ -7,19 +7,19 @@
 <table class="formTable">
 	<tr>
 		<th><fmt:message key="entity.invoice.sequence" /></th>
-		<td>${invoiceSeq.codeAndName}</td>
+		<td>${fn:escapeXml(invoiceSeq.codeAndName)}</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.orderDate" /></th>
-		<td>${form.orderDate}</td>
+		<td>${fn:escapeXml(form.orderDate)}</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.finishDate" /></th>
-		<td>${form.finishDate}	</td>
+		<td>${fn:escapeXml(form.finishDate)}	</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.name" /></th>
-		<td>${form.name}</td>
+		<td>${fn:escapeXml(form.name)}</td>
 	</tr>
 </table>
 
@@ -34,12 +34,12 @@
 		<!-- data columns -->
 		<display:column titleKey="entity.employee.icompany" media="html" >
 			<!-- this is hack for sorting -->
-			<span class="invisible">${employee.icompany.code}</span>
-			<span title="${employee.icompany.codeAndName}">${employee.icompany.codeAndName}</span>
+			<span class="invisible">${fn:escapeXml(employee.icompany.code)}</span>
+			<span title="${fn:escapeXml(employee.icompany.codeAndName)}">${fn:escapeXml(employee.icompany.codeAndName)}</span>
 		</display:column>
-		<display:column property="employee.icompany" titleKey="entity.employee.icompany" media="csv excel xml pdf rtf"/>
+		<display:column property="employee.icompany" titleKey="entity.employee.icompany" media="csv excel xml pdf rtf" escapeXml="true"/>
 
-		<display:column property="user.contactInfo.displayName" titleKey="entity.contactInfo.displayName" sortable="true" 	/>
+		<display:column property="user.contactInfo.displayName" titleKey="entity.contactInfo.displayName" sortable="true" escapeXml="true"/>
 
 	</display:table>
 	

programming_language: HTML
filename: InvoiceBatchGenerateForm.jsp
change_type: ModificationType.MODIFY
diff: @@ -22,7 +22,7 @@
 			<spring:bind path="form.sequence">
 				<th><fmt:message key="entity.invoice.sequence" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${sequences}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${sequences}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value="">--- <fmt:message key="invoice.sequence.please.define" /> ---</vc:select-option>
 					</vc:select> 
@@ -45,7 +45,7 @@
 			<spring:bind path="form.orderDate">
 				<th><fmt:message key="entity.invoice.orderDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceOrderDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceOrderDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceOrderDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -62,7 +62,7 @@
 			<spring:bind path="form.finishDate">
 				<th><fmt:message key="entity.invoice.finishDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceFinishDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceFinishDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFinishDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -79,7 +79,7 @@
 			<spring:bind path="form.name">
 				<th><fmt:message key="entity.invoice.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250" size="75"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250" size="75"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: InvoiceBatchResult.jsp
change_type: ModificationType.MODIFY
diff: @@ -16,10 +16,10 @@
 		<display:setProperty name="export.pdf.filename" value="invoices.pdf" />
 		<display:setProperty name="export.rtf.filename" value="invoices.rtf" />
 
-		<display:column property="employee.icompany.codeAndName" titleKey="entity.employee.icompany" sortable="true" />		
-		<display:column property="code" titleKey="entity.invoice.code" sortable="true" maxLength="10"/> 
-		<display:column property="employee.user.contactInfo.displayName" titleKey="entity.invoice.employee"/>
-		<display:column property="name" titleKey="entity.invoice.name" sortable="true" />
+		<display:column property="employee.icompany.codeAndName" titleKey="entity.employee.icompany" sortable="true" escapeXml="true" />		
+		<display:column property="code" titleKey="entity.invoice.code" sortable="true" maxLength="10" escapeXml="true" /> 
+		<display:column property="employee.user.contactInfo.displayName" titleKey="entity.invoice.employee" escapeXml="true" />
+		<display:column property="name" titleKey="entity.invoice.name" sortable="true" escapeXml="true" />
 		
 	</display:table>
 

programming_language: HTML
filename: InvoiceCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,7 +11,7 @@
 			<spring:bind path="invoiceForm.sequence">
 				<th><fmt:message key="entity.invoice.sequence" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${sequences}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${sequences}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value="">--- <fmt:message key="invoice.sequence.please.define" /> ---</vc:select-option>
 					</vc:select> 
@@ -25,7 +25,7 @@
 			<spring:bind path="invoiceForm.code">
 				<th><fmt:message key="entity.invoice.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -37,7 +37,7 @@
 			<spring:bind path="invoiceForm.orderDate">
 				<th><fmt:message key="entity.invoice.orderDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceOrderDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceOrderDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceOrderDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -54,7 +54,7 @@
 			<spring:bind path="invoiceForm.finishDate">
 				<th><fmt:message key="entity.invoice.finishDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceFinishDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceFinishDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFinishDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -71,7 +71,7 @@
 			<spring:bind path="invoiceForm.name">
 				<th><fmt:message key="entity.invoice.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250" size="75"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250" size="75"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: InvoiceEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -6,7 +6,7 @@
 
 <form action="${requestURI}" method="post" >
 	<spring:bind path="invoiceForm.pk">
-		<input type="hidden" name="${status.expression}" value="${status.value}" />
+		<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 	</spring:bind>
 	
 	<table class="formTable">
@@ -16,7 +16,7 @@
 				<td>
 					${invoiceForm.code}
 					<spring:bind path="invoiceForm.code">
-						<input type="hidden" name="${status.expression}" value="${status.value}" />
+						<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 					</spring:bind>
 				</td>
 			</c:if>
@@ -25,7 +25,7 @@
 			<spring:bind path="invoiceForm.code">
 				<th><fmt:message key="entity.invoice.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -37,7 +37,7 @@
 			<spring:bind path="invoiceForm.orderDate">
 				<th><fmt:message key="entity.invoice.orderDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceOrderDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceOrderDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceOrderDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -54,7 +54,7 @@
 			<spring:bind path="invoiceForm.finishDate">
 				<th><fmt:message key="entity.invoice.finishDate" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="invoiceFinishDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="invoiceFinishDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFinishDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -71,7 +71,7 @@
 			<spring:bind path="invoiceForm.name">
 				<th><fmt:message key="entity.invoice.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250" size="75"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250" size="75"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: InvoiceList.jsp
change_type: ModificationType.MODIFY
diff: @@ -14,7 +14,7 @@
 		<tr>
 			<th><fmt:message key="entity.invoice.orderDateFrom" /></th>
 			<td>
-				<input type="text" name="invoiceFilterOrderDateFrom" value="${invoiceFilterOrderDateFrom}" tabindex="1" id="invoiceFilterOrderDateFromId"/><%--
+				<input type="text" name="invoiceFilterOrderDateFrom" value="${fn:escapeXml(invoiceFilterOrderDateFrom)}" tabindex="1" id="invoiceFilterOrderDateFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFilterOrderDateFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -24,7 +24,7 @@
 			</td>
 			<th><fmt:message key="entity.invoice.employee" /></th>
 			<td>
-				<vc:select name="invoiceFilterEmployee" valueObjects="${employees}" selected="${invoiceFilterEmployee}" 
+				<vc:select name="invoiceFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(invoiceFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="2">
 					<vc:select-option value="-1">--- <fmt:message key="invoice.allEmployees" /> ---</vc:select-option>
@@ -37,7 +37,7 @@
 		<tr>
 			<th><fmt:message key="entity.invoice.orderDateTo" /></th>
 			<td>
-				<input type="text" name="invoiceFilterOrderDateTo" value="${invoiceFilterOrderDateTo}" tabindex="1" id="invoiceFilterOrderDateToId"/><%--
+				<input type="text" name="invoiceFilterOrderDateTo" value="${fn:escapeXml(invoiceFilterOrderDateTo)}" tabindex="1" id="invoiceFilterOrderDateToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFilterOrderDateToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -65,7 +65,7 @@
 		<tr>
 			<th><fmt:message key="entity.invoice.finishDateFrom" /></th>
 			<td>
-				<input type="text" name="invoiceFilterFinishDateFrom" value="${invoiceFilterFinishDateFrom}" tabindex="1" id="invoiceFilterFinishDateFromId"/><%--
+				<input type="text" name="invoiceFilterFinishDateFrom" value="${fn:escapeXml(invoiceFilterFinishDateFrom)}" tabindex="1" id="invoiceFilterFinishDateFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFilterFinishDateFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -75,13 +75,13 @@
 			</td>
 			<th><fmt:message key="entity.invoice.code" /></th>
 			<td>
-				<input type="text" name="invoiceFilterCode" value="${invoiceFilterCode}" maxlength="30"/>
+				<input type="text" name="invoiceFilterCode" value="${fn:escapeXml(invoiceFilterCode)}" maxlength="30"/>
 			</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.invoice.finishDateTo" /></th>
 			<td>
-				<input type="text" name="invoiceFilterFinishDateTo" value="${invoiceFilterFinishDateTo}" tabindex="1" id="invoiceFilterFinishDateToId"/><%--
+				<input type="text" name="invoiceFilterFinishDateTo" value="${fn:escapeXml(invoiceFilterFinishDateTo)}" tabindex="1" id="invoiceFilterFinishDateToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="invoiceFilterFinishDateToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -107,13 +107,13 @@
 	<display:setProperty name="export.rtf.filename" value="${employee.user.contactInfo.displayName}-invoice.rtf" />
 	
 	<!-- data columns -->
-	<display:column property="orderDate" titleKey="entity.invoice.orderDate" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />
+	<display:column property="orderDate" titleKey="entity.invoice.orderDate" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator"/>
 	<display:column property="finishDate" titleKey="entity.invoice.finishDate" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />
 
-	<display:column property="code" titleKey="entity.invoice.code" sortable="true" maxLength="10"/> 
-	<display:column property="name" titleKey="entity.invoice.name" sortable="true" />
-	<display:column property="employee.user.contactInfo.displayName" titleKey="entity.invoice.employee"/>
-	<display:column property="employee.user.login.ldapLogin" titleKey="entity.invoice.employee.ldaplogin" media="csv excel xml pdf rtf" />
+	<display:column property="code" titleKey="entity.invoice.code" sortable="true" maxLength="10" escapeXml="true" /> 
+	<display:column property="name" titleKey="entity.invoice.name" sortable="true" escapeXml="true" />
+	<display:column property="employee.user.contactInfo.displayName" titleKey="entity.invoice.employee" escapeXml="true" />
+	<display:column property="employee.user.login.ldapLogin" titleKey="entity.invoice.employee.ldaplogin" media="csv excel xml pdf rtf" escapeXml="true"/>
 	
 	<display:column property="state" titleKey="entity.invoice.state" media="html" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.StateDecorator" maxLength="5" class="center"/>
 	<display:column titleKey="entity.invoice.state" media="csv excel xml pdf rtf">

programming_language: Shell
filename: InvoiceView.jsp
change_type: ModificationType.MODIFY
diff: @@ -8,7 +8,7 @@
 	<table class="formTable">
 		<tr>
 			<th><fmt:message key="entity.invoice.code" /></th>
-			<td>${invoice.code}</td>
+			<td>${fn:escapeXml(invoice.code)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.invoice.orderDate" /></th>
@@ -20,11 +20,11 @@
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.invoice.employee" /></th>
-			<td>${invoice.employee.user.contactInfo.displayName}</td>
+			<td>${fn:escapeXml(invoice.employee.user.contactInfo.displayName)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.invoice.name" /></th>
-			<td>${invoice.name}</td>
+			<td>${fn:escapeXml(invoice.name)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.invoice.state" /></th>
@@ -69,29 +69,29 @@
 		<!-- data columns -->
 		<display:column property="workFrom" titleKey="worklog.date" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />
 	
-		<display:column titleKey="worklog.project" media="html" >
+		<display:column titleKey="worklog.project" media="html">
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.project.code}</span>
-			<acronym title="${worklog.project.name}">${worklog.project.code}</acronym>
+			<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+			<acronym title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</acronym>
 		</display:column>
-		<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+		<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true"/>
 	
 		<display:column titleKey="worklog.component" media="html">
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.component.code}</span>
-			<acronym title="${worklog.component.name}">${worklog.component.code}</acronym>
+			<span class="invisible">${fn:escapeXml(worklog.component.code)}</span>
+			<acronym title="${fn:escapeXml(worklog.component.name)}">${fn:escapeXml(worklog.component.code)}</acronym>
 		</display:column>
-		<display:column property="component.code" titleKey="worklog.component" media="csv excel xml pdf rtf"/>
+		<display:column property="component.code" titleKey="worklog.component" media="csv excel xml pdf rtf" escapeXml="true"/>
 		
 		<display:column titleKey="worklog.activity" media="html">
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.activity.code}</span>
-			<acronym title="${worklog.activity.name}">${worklog.activity.code}</acronym>
+			<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+			<acronym title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</acronym>
 		</display:column>
-		<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+		<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true"/>
 
 		<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-		<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+		<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true"/>
 
 		<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 		<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: ProjectCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -10,7 +10,7 @@
 			<spring:bind path="projectForm.parentPk">
 				<th><fmt:message key="entity.project.parent" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -22,7 +22,7 @@
 			<spring:bind path="projectForm.code">
 				<th><fmt:message key="entity.project.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -33,7 +33,7 @@
 			<spring:bind path="projectForm.name">
 				<th><fmt:message key="entity.project.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250" size="75" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250" size="75" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -44,7 +44,7 @@
 			<spring:bind path="projectForm.category">
 				<th><fmt:message key="entity.project.category" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${categories}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${categories}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value=""><fmt:message key="project.category.unassigned" /></vc:select-option>
 					</vc:select>
@@ -58,7 +58,7 @@
 			<spring:bind path="projectForm.estimation">
 				<th><fmt:message key="entity.project.estimation" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="15" size="10" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="15" size="10" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: ProjectEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -8,7 +8,7 @@
 
 <form action="${requestURI}" method="post" >
 		<spring:bind path="projectForm.pk">
-				<input type="hidden" name="${status.expression}" value="${status.value}" />
+				<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 		</spring:bind>
 	
 	<table class="formTable">
@@ -16,7 +16,7 @@
 			<spring:bind path="projectForm.parentPk">
 				<th><fmt:message key="entity.project.parent" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -28,7 +28,7 @@
 			<spring:bind path="projectForm.code">
 				<th><fmt:message key="entity.project.code" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="30"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="30"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -39,7 +39,7 @@
 			<spring:bind path="projectForm.name">
 				<th><fmt:message key="entity.project.name" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="250"  size="75"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="250"  size="75"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -50,7 +50,7 @@
 			<spring:bind path="projectForm.category">
 				<th><fmt:message key="entity.project.category" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${categories}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${categories}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 						<vc:select-option value=""><fmt:message key="project.category.unassigned" /></vc:select-option>
 					</vc:select>
@@ -64,7 +64,7 @@
 			<spring:bind path="projectForm.estimation">
 				<th><fmt:message key="entity.project.estimation" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" maxlength="15" size="10" />
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" maxlength="15" size="10" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>
@@ -103,7 +103,7 @@
                </c:forEach>
            <option value="${employee.pk}"
              <c:if test="${selected}">selected="selected"</c:if>>
-               ${employee.user.contactInfo.displayName}
+               ${fn:escapeXml(employee.user.contactInfo.displayName)}
            </option>
            <c:remove var="selected"/>
          </c:forEach>

programming_language: HTML
filename: ProjectManageComponents.jsp
change_type: ModificationType.MODIFY
diff: @@ -6,25 +6,25 @@
 
 <form action="${requestURI}" method="post" >
 		<spring:bind path="projectForm.pk">
-				<input type="hidden" name="${status.expression}" value="${status.value}" />
+				<input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" />
 		</spring:bind>
 		
 		<table class="formTable">
 		<tr>
 			<th><fmt:message key="entity.project.code" /></th>
-			<td>${projectForm.code}</td>
+			<td>${fn:escapeXml(projectForm.code)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.project.name" /></th>
-			<td>${projectForm.name}</td>
+			<td>${fn:escapeXml(projectForm.name)}</td>
 		</tr>
 		
 	</table>
 	
 	<display:table name="${projectForm.components}" requestURI="${requestURI}" defaultsort="1" pagesize="${defaultPageSize}" id="component"
 		sort="list">
-		<display:column property="code" titleKey="entity.component.code" sortable="true" />
-		<display:column property="name" titleKey="entity.component.name" sortable="true" />
+		<display:column property="code" titleKey="entity.component.code" sortable="true" escapeXml="true" />
+		<display:column property="name" titleKey="entity.component.name" sortable="true" escapeXml="true" />
 		
 		<display:column url="/ComponentEdit.do?fkprm=true" paramId="pk" paramProperty="pk" media="html" class="action"  headerClass="action" 
 			titleKey="action.edit">

programming_language: HTML
filename: ProjectManagement.jsp
change_type: ModificationType.MODIFY
diff: @@ -13,11 +13,11 @@
 		<tr>
 			<th><fmt:message key="entity.project.code" /></th>
 			<td>
-				<input type="text" name="projectFilterCode" value="${projectFilterCode}" maxlength="30"/>
+				<input type="text" name="projectFilterCode" value="${fn:escapeXml(projectFilterCode)}" maxlength="30"/>
 			</td>
 			<th><fmt:message key="entity.project.employee" /></th>
 			<td>
-				<vc:select name="projectFilterEmployee" valueObjects="${employees}" selected="${projectFilterEmployee}" 
+				<vc:select name="projectFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(projectFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="2">
 					<vc:select-option value="-1">--- <fmt:message key="project.allEmployees" /> ---</vc:select-option>
@@ -27,7 +27,7 @@
 		<tr>
 			<th><fmt:message key="entity.project.name" /></th>
 			<td>
-				<input type="text" name="projectFilterName" value="${projectFilterName}" maxlength="255"/>
+				<input type="text" name="projectFilterName" value="${fn:escapeXml(projectFilterName)}" maxlength="255"/>
 			</td>
 			<th><fmt:message key="entity.project.state" /></th>
 			<td>
@@ -55,11 +55,11 @@
 
 <display:table name="projects" requestURI="${requestURI}" defaultsort="1" pagesize="${defaultPageSize}" id="project" sort="list">
 
-	<display:column property="parent.code" titleKey="entity.project.parent.code" sortable="true" maxLength="10"/>
-	<display:column property="code" titleKey="entity.project.code" sortable="true" maxLength="10"/> 
-	<display:column property="name" titleKey="entity.project.name" sortable="true" />
-	<display:column property="estimation" titleKey="entity.project.estimation" sortable="true" />
-	<display:column property="category.code" titleKey="entity.project.category" sortable="true" />
+	<display:column property="parent.code" titleKey="entity.project.parent.code" sortable="true" maxLength="10" escapeXml="true" />
+	<display:column property="code" titleKey="entity.project.code" sortable="true" maxLength="10" escapeXml="true" /> 
+	<display:column property="name" titleKey="entity.project.name" sortable="true"  escapeXml="true"/>
+	<display:column property="estimation" titleKey="entity.project.estimation" sortable="true" escapeXml="true" />
+	<display:column property="category.code" titleKey="entity.project.category" sortable="true" escapeXml="true" />
 	
 	<display:column property="state" titleKey="entity.project.state" media="html" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.StateDecorator" maxLength="5" class="center"/>
 	<display:column titleKey="entity.project.state" media="csv excel xml pdf rtf">

programming_language: HTML
filename: ProjectView.jsp
change_type: ModificationType.MODIFY
diff: @@ -9,26 +9,26 @@
 	<table class="formTable">
 		<tr>
 			<th><fmt:message key="entity.project.parent.code" /></th>
-			<td>${project.parent.code}</td>
+			<td>${fn:escapeXml(project.parent.code)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.project.code" /></th>
-			<td>${project.code}</td>
+			<td>${fn:escapeXml(project.code)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.project.name" /></th>
-			<td>${project.name}</td>
+			<td>${fn:escapeXml(project.name)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.project.category" /></th>
 			<td>
-				<c:if test="${project.category != null}" >${project.category.code} - ${project.category.name}</c:if>
+				<c:if test="${project.category != null}" >${fn:escapeXml(project.category.code)} - ${fn:escapeXml(project.category.name)}</c:if>
 				<c:if test="${project.category == null}" >-</c:if>
 			</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="entity.project.estimation" /></th>
-			<td>${project.estimation}</td>
+			<td>${fn:escapeXml(project.estimation)}</td>
 		</tr>		
 		<tr>
 			<th><fmt:message key="entity.project.workEnabled" /></th>
@@ -52,7 +52,7 @@
 	
 	<display:table name="project.employees" requestURI="${requestURI}" defaultsort="1" pagesize="${defaultPageSize}" id="employee"
 		sort="list">
-		<display:column property="user.contactInfo.displayName" titleKey="entity.contactInfo.displayName" sortable="true"/>
+		<display:column property="user.contactInfo.displayName" titleKey="entity.contactInfo.displayName" sortable="true" escapeXml="true" />
 	</display:table>	
 	
 	<table class="formTable">

programming_language: HTML
filename: ScheduleCopy.jsp
change_type: ModificationType.MODIFY
diff: @@ -6,7 +6,7 @@
 
 <form action="${requestURI}" method="post" >
 	<spring:bind path="scheduleForm.pk">
-		<td><input type="hidden" name="${status.expression}" value="${status.value}" /></td>
+		<td><input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" /></td>
 	</spring:bind>
 	
 	<table class="formTable">
@@ -14,7 +14,7 @@
 			<spring:bind path="scheduleForm.date">
 				<th><fmt:message key="schedule.copyFrom" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleCopyFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleCopyFromId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleCopyFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -31,7 +31,7 @@
 			<spring:bind path="scheduleForm.copyDestinationFrom">
 				<th><fmt:message key="scheduleForm.copyDestinationFrom" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleCopyDestinationFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleCopyDestinationFromId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleCopyDestinationFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -48,7 +48,7 @@
 			<spring:bind path="scheduleForm.copyDestinationTo">
 				<th><fmt:message key="scheduleForm.copyDestinationTo" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleCopyDestinationToId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleCopyDestinationToId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleCopyDestinationToImgId"/>
 					<script type="text/javascript">
 					<!--

programming_language: Shell
filename: ScheduleCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -10,7 +10,7 @@
 			<spring:bind path="scheduleForm.date">
 				<th><fmt:message key="schedule.date" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -27,7 +27,7 @@
 			<spring:bind path="scheduleForm.type">
 				<th><fmt:message key="schedule.type" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${types}" selected="${status.value}"
+					<vc:select name="${status.expression}" valueObjects="${types}" selected="${fn:escapeXml(status.value)}"
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -39,7 +39,7 @@
 			<spring:bind path="scheduleForm.workFrom">
 				<th><fmt:message key="schedule.workFrom" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleWorkFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleWorkFromId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="scheduleWorkFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -56,7 +56,7 @@
 			<spring:bind path="scheduleForm.workTo">
 				<th><fmt:message key="schedule.workTo" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleWorkToId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleWorkToId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="scheduleWorkToImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -73,7 +73,7 @@
 			<spring:bind path="scheduleForm.comment">
 				<th><fmt:message key="schedule.comment" /></th>
 				<td>
-					<textarea name="${status.expression}" cols="40" rows="5" >${status.value}</textarea>
+					<textarea name="${status.expression}" cols="40" rows="5" >${fn:escapeXml(status.value)}</textarea>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: ScheduleEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -6,7 +6,7 @@
 
 <form action="${requestURI}" method="post" >
 	<spring:bind path="scheduleForm.pk">
-		<td><input type="hidden" name="${status.expression}" value="${status.value}" /></td>
+		<td><input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" /></td>
 	</spring:bind>
 	
 	<table class="formTable">
@@ -14,7 +14,7 @@
 			<spring:bind path="scheduleForm.date">
 				<th><fmt:message key="schedule.date" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -31,7 +31,7 @@
 			<spring:bind path="scheduleForm.type">
 				<th><fmt:message key="schedule.type" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${types}" selected="${status.value}"
+					<vc:select name="${status.expression}" valueObjects="${types}" selected="${fn:escapeXml(status.value)}"
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -60,7 +60,7 @@
 			<spring:bind path="scheduleForm.workTo">
 				<th><fmt:message key="schedule.workTo" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="scheduleWorkToId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="scheduleWorkToId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="scheduleWorkToImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -77,7 +77,7 @@
 			<spring:bind path="scheduleForm.comment">
 				<th><fmt:message key="schedule.comment" /></th>
 				<td>
-					<textarea name="${status.expression}" cols="40" rows="5" >${status.value}</textarea>
+					<textarea name="${status.expression}" cols="40" rows="5" >${fn:escapeXml(status.value)}</textarea>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: ScheduleList.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,7 +11,7 @@
 		<tr>
 			<th><fmt:message key="schedule.workFrom" /></th>
 			<td>
-				<input type="text" name="scheduleFilterFrom" value="${scheduleFilterFrom}" tabindex="1" id="scheduleFilterWorkFromId"/><%--
+				<input type="text" name="scheduleFilterFrom" value="${fn:escapeXml(scheduleFilterFrom)}" tabindex="1" id="scheduleFilterWorkFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleFilterWorkFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -21,7 +21,7 @@
 			</td>
 			<th><fmt:message key="schedule.employee" /></th>
 			<td>
-				<vc:select name="scheduleFilterEmployee" valueObjects="${employees}" selected="${scheduleFilterEmployee}" 
+				<vc:select name="scheduleFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(scheduleFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -30,7 +30,7 @@
 		<tr>
 			<th><fmt:message key="schedule.workTo" /></th>
 			<td>
-				<input type="text" name="scheduleFilterTo" value="${scheduleFilterTo}" tabindex="2" id="scheduleFilterWorkToId"/><%--
+				<input type="text" name="scheduleFilterTo" value="${fn:escapeXml(scheduleFilterTo)}" tabindex="2" id="scheduleFilterWorkToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="scheduleFilterWorkToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -40,7 +40,7 @@
 			</td>
 			<th><fmt:message key="schedule.type" /></th>
 			<td>
-				<vc:select name="scheduleFilterType" valueObjects="${types}" selected="${scheduleFilterType}"
+				<vc:select name="scheduleFilterType" valueObjects="${types}" selected="${fn:escapeXml(scheduleFilterType)}"
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="schedule.allTypes" /> ---</vc:select-option>
@@ -51,7 +51,7 @@
 			<td colspan="2"></td>
 			<th><fmt:message key="schedule.state" /></th>
 			<td>
-				<vc:select name="scheduleFilterState" valueObjects="${scheduleStates}" selected="${scheduleFilterState}"
+				<vc:select name="scheduleFilterState" valueObjects="${scheduleStates}" selected="${fn:escapeXml(scheduleFilterState)}"
 				valueProperty="value" labelProperty="label" orderBy="label"
 				tabindex="5">
 					<vc:select-option value="">--- <fmt:message key="schedule.allStates" /> ---</vc:select-option>
@@ -81,13 +81,13 @@
 
 	<display:column titleKey="schedule.type" sortable="true" media="html">
 		<!-- this is hack for sorting -->
-		<span class="invisible">${schedule.type.code}</span>
-		<span title="${schedule.type.name}">${schedule.type.code}</span>
+		<span class="invisible">${fn:escapeXml(schedule.type.code)}</span>
+		<span title="${fn:escapeXml(schedule.type.name)}">${fn:escapeXml(schedule.type.code)}</span>
 	</display:column>
-	<display:column property="type.code" titleKey="schedule.type" sortable="true" media="csv excel xml pdf rtf"/>
+	<display:column property="type.code" titleKey="schedule.type" sortable="true" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column titleKey="schedule.state" sortable="true">
-		<fmt:message key="schedule.state.${schedule.state}"/>
+		<fmt:message key="schedule.state.${fn:escapeXml(schedule.state)}"/>
 	</display:column>
 
 	<display:column property="createdOn" titleKey="schedule.createdOn" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />

programming_language: SQL
filename: ScheduleOverviewList.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,12 +11,12 @@
 		<tr>
 			<th><fmt:message key="schedule.month" /></th>
 			<td>
-				<vc:select name="scheduleFilterMonth" valueObjects="${months}" selected="${scheduleFilterMonth}"
+				<vc:select name="scheduleFilterMonth" valueObjects="${months}" selected="${fn:escapeXml(scheduleFilterMonth)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="1" />
 			</td>
 			<th><fmt:message key="schedule.employee" /></th>
 			<td>
-				<vc:select name="scheduleFilterEmployee" valueObjects="${employees}" selected="${scheduleFilterEmployee}" 
+				<vc:select name="scheduleFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(scheduleFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="2" /> 
 			</td>
@@ -25,7 +25,7 @@
 		<tr>
 			<th><fmt:message key="schedule.year" /></th>
 			<td>
-				<vc:select name="scheduleFilterYear" valueObjects="${years}" selected="${scheduleFilterYear}"
+				<vc:select name="scheduleFilterYear" valueObjects="${years}" selected="${fn:escapeXml(scheduleFilterYear)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="3" />
 			</td>
 			<td colspan="2"></td>
@@ -44,7 +44,7 @@
 	<display:setProperty name="export.rtf.filename" value="${employee.user.contactInfo.displayName}-schedule.rtf" />
 
 	<!-- header -->
-	<display:caption>${employee.user.contactInfo.displayName} - <fmt:message key="month.${scheduleFilterMonth}"/> ${scheduleFilterYear}</display:caption>
+	<display:caption>${fn:escapeXml(employee.user.contactInfo.displayName)} - <fmt:message key="month.${fn:escapeXml(scheduleFilterMonth)}"/> ${fn:escapeXml(scheduleFilterYear)}</display:caption>
 	
 	<!-- data columns -->
 	<display:column property="monday" titleKey="day.2" decorator="cz.softinel.retra.core.utils.decorator.ScheduleOverviewDecorator" class="day ${scheduleOverview.monday.cssClass}" headerClass="day" media="html" />
@@ -69,7 +69,7 @@
 	<table class="invisibleInPrint" width="100%">
 		<tr>
 			<td class="center scheduleDefault"><fmt:message key="schedule.default" /></td>
-			<c:forEach items="${types}" var="type"><td class="center ${type.cssClass}">${type.name}</td></c:forEach>
+			<c:forEach items="${types}" var="type"><td class="center ${type.cssClass}">${fn:escapeXml(type.name)}</td></c:forEach>
 			<td class="center scheduleWeekend"><fmt:message key="schedule.weekend.holidays" /></td>
 		</tr>
 	</table>

programming_language: HTML
filename: ScheduleView.jsp
change_type: ModificationType.MODIFY
diff: @@ -2,7 +2,7 @@
 
 <%@ include file="../Includes.jsp"%>
 
-<c:set var="requestURI" value="ScheduleList.do?fkprm=true&scheduleFilterEmployee=${schedule.employee.pk}" />
+<c:set var="requestURI" value="ScheduleList.do?fkprm=true&scheduleFilterEmployee=${fn:escapeXml(schedule.employee.pk)}" />
 
 <form action="${requestURI}" method="post" >
 	<table class="formTable">
@@ -28,7 +28,7 @@
 		</tr>
 		<tr>
 			<th><fmt:message key="schedule.comment" /></th>
-			<td>${schedule.comment}</td>
+			<td>${fn:escapeXml(schedule.comment)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="schedule.createdOn" /></th>

programming_language: Shell
filename: WorklogCreate.jsp
change_type: ModificationType.MODIFY
diff: @@ -15,7 +15,7 @@
 			<spring:bind path="worklogForm.date">
 				<th><fmt:message key="worklog.date" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -33,7 +33,7 @@
 				<th><fmt:message key="worklog.project" /></th>
 				<td colspan="2">
 					<!-- valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk" />  -->
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk" onchange="worklogProjectChange()" id="worklogProjectId" /> 
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -45,7 +45,7 @@
 			<spring:bind path="worklogForm.component">
 				<th><fmt:message key="worklog.component" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${components}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${components}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 					>
 						<vc:select-option value=""><fmt:message key="worklog.component.unassigned" /></vc:select-option>
@@ -60,7 +60,7 @@
 			<spring:bind path="worklogForm.activity">
 				<th><fmt:message key="worklog.activity" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk" id="worklogActivityId" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -72,7 +72,7 @@
 			<spring:bind path="worklogForm.invoice">
 				<th><fmt:message key="worklog.invoice" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 					>
 						<vc:select-option value=""><fmt:message key="worklog.invoice.unassigned" /></vc:select-option>
@@ -87,7 +87,7 @@
 			<spring:bind path="worklogForm.workFrom">
 				<th><fmt:message key="worklog.workFrom" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogWorkFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogWorkFromId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="worklogWorkFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -104,7 +104,7 @@
 			<spring:bind path="worklogForm.workTo">
 				<th><fmt:message key="worklog.workTo" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogWorkToId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogWorkToId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="worklogWorkToImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -121,7 +121,7 @@
 			<spring:bind path="worklogForm.description">
 				<th><fmt:message key="worklog.description" /></th>
 				<td width="300">
-					<textarea id="descriptionId" name="${status.expression}" cols="40" rows="7" onkeypress="return imposeMaxLength(event, this, 249);">${status.value}</textarea>
+					<textarea id="descriptionId" name="${status.expression}" cols="40" rows="7" onkeypress="return imposeMaxLength(event, this, 249);">${fn:escapeXml(status.value)}</textarea>
 					<script language="javascript" type="text/javascript">
 					<!--
 					function imposeMaxLength(Event, Object, MaxLen)
@@ -151,7 +151,7 @@
 			<spring:bind path="worklogForm.issueTrackingReference">
 				<td><fmt:message key="worklog.jiraIssue" /></td>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="jiraissue" maxlength="50"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="jiraissue" maxlength="50"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: WorklogDaily.jsp
change_type: ModificationType.MODIFY
diff: @@ -14,7 +14,7 @@
 		<tr>
 			<th><fmt:message key="worklog.date" /></th>
 			<td>
-				<input type="text" name="worklogFilterDate" value="${worklogFilterDate}" tabindex="1" id="worklogFilterDateId"/><%--
+				<input type="text" name="worklogFilterDate" value="${fn:escapeXml(worklogFilterDate)}" tabindex="1" id="worklogFilterDateId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterDateImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -24,7 +24,7 @@
 			</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -49,7 +49,7 @@
 </div>
 
 <table id="worklog" class="listTable">
-	<caption>Daily worklog for ${employee.user.contactInfo.displayName}, ${worklogFilterDate} (<fmt:message key="day.${dayOfWeek}"/>&nbsp;-&nbsp;<span class="${dayOfWeekCss}" title="<fmt:message key="${dayOfWeekTitle}"/>">&nbsp;&nbsp;&nbsp;</span>)</caption>
+	<caption>Daily worklog for ${fn:escapeXml(employee.user.contactInfo.displayName)}, ${fn:escapeXml(worklogFilterDate)} (<fmt:message key="day.${dayOfWeek}"/>&nbsp;-&nbsp;<span class="${dayOfWeekCss}" title="<fmt:message key="${dayOfWeekTitle}"/>">&nbsp;&nbsp;&nbsp;</span>)</caption>
 	<thead>
 		<tr>
 			<th><fmt:message key="worklog.date"/></th>
@@ -100,10 +100,10 @@
 				<td><fmt:formatDate value="${worklog.workFrom}" pattern="${TypeFormats.HOUR_FORMAT}"/></td>
 				<td><fmt:formatDate value="${worklog.workTo}" pattern="${TypeFormats.HOUR_FORMAT}"/></td>
 				<td>${worklog.descriptionGui}</td>
-				<td><acronym title="${worklog.project.name}">${worklog.project.code}</acronym></td>
-				<td><acronym title="${worklog.component.name}">${worklog.component.code}</acronym></td>
-				<td><acronym title="${worklog.activity.name}">${worklog.activity.code}</acronym></td>
-				<td class="nowrap"><acronym title="${worklog.invoice.name}">${worklog.invoice.code}</acronym><c:if test="${worklog.invoice != null}">&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle"/></c:if></td>
+				<td><acronym title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</acronym></td>
+				<td><acronym title="${fn:escapeXml(worklog.component.name)}">${fn:escapeXml(worklog.component.code)}</acronym></td>
+				<td><acronym title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</acronym></td>
+				<td class="nowrap"><acronym title="${fn:escapeXml(worklog.invoice.name)}">${fn:escapeXml(worklog.invoice.code)}</acronym><c:if test="${worklog.invoice != null}">&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle"/></c:if></td>
 				<td><fmt:formatNumber value="${worklog.hours}" maxFractionDigits="2" minFractionDigits="2"/></td>
 				<td class="actions">
 					[ 
@@ -124,7 +124,7 @@
 				<tr class="even"><td colspan="10">
 					<c:choose>
 						<c:when test="${securityContext.loggedEmployee.pk == employee.pk}">
-							<a href="WorklogDailyCreate.do?fkprm=true&setDate=${worklogFilterDate}">Insert new worklog item</a>
+							<a href="WorklogDailyCreate.do?fkprm=true&setDate=${fn:escapeXml(worklogFilterDate)}">Insert new worklog item</a>
 						</c:when>
 						<c:otherwise>
 							Nothing found to display.
@@ -176,7 +176,7 @@
 	</tr>
 	<c:forEach items="${projectProjectionList}" var="project">
 		<tr class="odd">
-			<th>${project.key.code}</th>
+			<th>${fn:escapeXml(project.key.code)}</th>
 			<c:forEach items="${activityProjectionList}" var="activity">
 				<td style='text-align:right;'>
 					<fmt:formatNumber value="${grouppedWorklog.map[project.key][activity.key].sum}" maxFractionDigits="2" minFractionDigits="2" />

programming_language: Shell
filename: WorklogDailyOverview.jsp
change_type: ModificationType.MODIFY
diff: @@ -13,7 +13,7 @@
 			<td></td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -22,7 +22,7 @@
 		<tr>
 			<th><fmt:message key="worklog.date" /></th>
 			<td>
-				<input type="text" name="worklogFilterDate" value="${worklogFilterDate}" tabindex="1" id="worklogFilterDateId"/><%--
+				<input type="text" name="worklogFilterDate" value="${fn:escapeXml(worklogFilterDate)}" tabindex="1" id="worklogFilterDateId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterDateImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -32,7 +32,7 @@
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -43,7 +43,7 @@
 			<td colspan="2"></td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -73,20 +73,20 @@
 
 	<display:column titleKey="worklog.project" media="html" >
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.project.code}</span>
-		<span title="${worklog.project.name}">${worklog.project.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+		<span title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</span>
 	</display:column>
-	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column titleKey="worklog.activity" media="html">
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.activity.code}</span>
-		<span title="${worklog.activity.name}">${worklog.activity.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+		<span title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</span>
 	</display:column>
-	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true" />
 
-	<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+	<display:column property="descriptionGui" titleKey="worklog.description" media="html" escapeXml="true" />	
+	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true "/>
 
 	<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 	<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: WorklogEdit.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,7 +11,7 @@
 
 <form action="${requestURI}" method="post" >
 	<spring:bind path="worklogForm.pk">
-		<td><input type="hidden" name="${status.expression}" value="${status.value}" /></td>
+		<td><input type="hidden" name="${status.expression}" value="${fn:escapeXml(status.value)}" /></td>
 	</spring:bind>
 	
 	<table class="formTable">
@@ -19,7 +19,7 @@
 			<spring:bind path="worklogForm.date">
 				<th><fmt:message key="worklog.date" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}"  id="worklogDateId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}"  id="worklogDateId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogDateImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -36,7 +36,7 @@
 			<spring:bind path="worklogForm.project">
 				<th><fmt:message key="worklog.project" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk" onchange="worklogProjectChange()" id="worklogProjectId" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -48,7 +48,7 @@
 			<spring:bind path="worklogForm.component">
 				<th><fmt:message key="worklog.component" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${components}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${components}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 					>
 						<vc:select-option value=""><fmt:message key="worklog.component.unassigned" /></vc:select-option>
@@ -63,7 +63,7 @@
 			<spring:bind path="worklogForm.activity">
 				<th><fmt:message key="worklog.activity" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk" id="worklogActivityId" />
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
@@ -75,7 +75,7 @@
 			<spring:bind path="worklogForm.invoice">
 				<th><fmt:message key="worklog.invoice" /></th>
 				<td colspan="2">
-					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 					>
 						<vc:select-option value=""><fmt:message key="worklog.invoice.unassigned" /></vc:select-option>
@@ -90,7 +90,7 @@
 			<spring:bind path="worklogForm.workFrom">
 				<th><fmt:message key="worklog.workFrom" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogWorkFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogWorkFromId"/><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="worklogWorkFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -107,7 +107,7 @@
 			<spring:bind path="worklogForm.workTo">
 				<th><fmt:message key="worklog.workTo" /></th>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogWorkToId" /><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogWorkToId" /><%--
 				--%><img src="${imgRoot}/hoursIco.gif" alt="<fmt:message key='hours.label' />" title="<fmt:message key='hours.label' />" align="top" id="worklogWorkToImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -124,7 +124,7 @@
 			<spring:bind path="worklogForm.description">
 				<th><fmt:message key="worklog.description" /></th>
 				<td width="300">
-					<textarea id="descriptionId" name="${status.expression}" cols="40" rows="7" onkeypress="return imposeMaxLength(event, this, 249);">${status.value}</textarea>
+					<textarea id="descriptionId" name="${status.expression}" cols="40" rows="7" onkeypress="return imposeMaxLength(event, this, 249);">${fn:escapeXml(status.value)}</textarea>
 					<script language="javascript" type="text/javascript">
 					<!--
 					function imposeMaxLength(Event, Object, MaxLen)
@@ -154,7 +154,7 @@
 			<spring:bind path="worklogForm.issueTrackingReference">
 				<td><fmt:message key="worklog.jiraIssue" /></td>
 				<td colspan="2">
-					<input type="text" name="${status.expression}" value="${status.value}" id="jiraissue" maxlength="50"/>
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="jiraissue" maxlength="50"/>
 					<c:forEach items="${status.errorMessages}">
 						<span class="error"><fmt:message key="error.sign" /></span>
 					</c:forEach>

programming_language: Shell
filename: WorklogImportConfirm.jsp
change_type: ModificationType.MODIFY
diff: @@ -13,10 +13,10 @@
 		
 		<!-- data columns -->
 		<display:column property="workFrom" titleKey="worklog.date" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />
-		<display:column property="project.code" titleKey="worklog.project" />
-		<display:column property="activity.code" titleKey="worklog.activity" />
-		<display:column property="invoice.name" titleKey="workLog.invoice"/>
-		<display:column property="description" titleKey="worklog.description"/>
+		<display:column property="project.code" titleKey="worklog.project" escapeXml="true" />
+		<display:column property="activity.code" titleKey="worklog.activity" escapeXml="true" />
+		<display:column property="invoice.name" titleKey="workLog.invoice" escapeXml="true" />
+		<display:column property="description" titleKey="worklog.description" escapeXml="true" />
 		<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 		<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 		<display:column property="hours" titleKey="worklog.hours" format="{0,number,#,##0.00}"/>

programming_language: Shell
filename: WorklogImportMapping.jsp
change_type: ModificationType.MODIFY
diff: @@ -18,14 +18,14 @@
 	<c:when test="${ not empty form.externalProjects}">
 		<c:forEach var="externalProject" items="${form.externalProjects}" varStatus="status">
 			<tr>
-				<th>${externalProject.name}</th>
+				<th>${fn:escapeXml(externalProject.name)}</th>
 				<td>
-					<vc:select name="externalProjects[${status.index}].projectId" valueObjects="${projects}" selected="${externalProject.projectId}" 
+					<vc:select name="externalProjects[${status.index}].projectId" valueObjects="${projects}" selected="${fn:escapeXml(externalProject.projectId)}" 
 							valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="-1"><fmt:message key="worklog.pleaseSpecify" /></vc:select-option>
 					</vc:select>
 				<c:if test="${showInvoices}">
-					<vc:select name="externalProjects[${status.index}].invoiceId" valueObjects="${invoices}" selected="${externalProject.invoiceId}" 
+					<vc:select name="externalProjects[${status.index}].invoiceId" valueObjects="${invoices}" selected="${fn:escapeXml(externalProject.invoiceId)}" 
 							valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="-1">&nbsp;</vc:select-option>
 					</vc:select>
@@ -55,9 +55,9 @@
 	<c:when test="${ not empty form.externalActivities}">
 		<c:forEach var="externalActivity" items="${form.externalActivities}" varStatus="status">
 			<tr>
-				<th>${externalActivity.name}</th>
+				<th>${fn:escapeXml(externalActivity.name)}</th>
 				<td>
-					<vc:select name="externalActivities[${status.index}].activityId" valueObjects="${activities}" selected="${externalActivity.activityId}" 
+					<vc:select name="externalActivities[${status.index}].activityId" valueObjects="${activities}" selected="${fn:escapeXml(externalActivity.activityId)}"
 							valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="-1"><fmt:message key="worklog.pleaseSpecify" /></vc:select-option>
 					</vc:select>

programming_language: HTML
filename: WorklogInvoicePairConfirm.jsp
change_type: ModificationType.MODIFY
diff: @@ -7,15 +7,15 @@
 <table class="formTable">
 	<tr>
 		<th><fmt:message key="entity.invoice.code" /></th>
-		<td>${invoice.code}</td>
+		<td>${fn:escapeXml(invoice.code)}</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.employee" /></th>
-		<td>${invoice.employee.user.contactInfo.displayName}</td>
+		<td>${fn:escapeXml(invoice.employee.user.contactInfo.displayName)}</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.name" /></th>
-		<td>${invoice.name}</td>
+		<td>${fn:escapeXml(invoice.name)}</td>
 	</tr>
 	<tr>
 		<th><fmt:message key="entity.invoice.state" /></th>
@@ -36,27 +36,27 @@
 
 		<display:column titleKey="worklog.project" media="html" >
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.project.code}</span>
-			<span title="${worklog.project.name}">${worklog.project.code}</span>
+			<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+			<span title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</span>
 		</display:column>
-		<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+		<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 		<display:column titleKey="worklog.component" media="html">
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.component.code}</span>
-			<acronym title="${worklog.component.name}">${worklog.component.code}</acronym>
+			<span class="invisible">${fn:escapeXml(worklog.component.code)}</span>
+			<acronym title="${fn:escapeXml(worklog.component.name)}">${fn:escapeXml(worklog.component.code)}</acronym>
 		</display:column>
-		<display:column property="component.code" titleKey="worklog.component" media="csv excel xml pdf rtf"/>
+		<display:column property="component.code" titleKey="worklog.component" media="csv excel xml pdf rtf" escapeXml="true" />
 			
 		<display:column titleKey="worklog.activity" media="html">
 			<!-- this is hack for sorting -->
-			<span class="invisible">${worklog.activity.code}</span>
-			<span title="${worklog.activity.name}">${worklog.activity.code}</span>
+			<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+			<span title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</span>
 		</display:column>
-		<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+		<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true" />
 
 		<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-		<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+		<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true" />
 
 		<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 		<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: WorklogInvoicePairFilter.jsp
change_type: ModificationType.MODIFY
diff: @@ -24,14 +24,14 @@
 				<th><fmt:message key="worklog.invoice" /></th>
 				<td>
 					<c:if test="${empty invoices}">
-					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 							<vc:select-option value="">--- <fmt:message key="invoice.please.define" /> ---</vc:select-option>
 					</vc:select>
 					</c:if>
 
 					<c:if test="${!empty invoices}">
-					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${invoices}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" />
 					</c:if>
 					<c:forEach items="${status.errorMessages}">
@@ -49,7 +49,7 @@
 			<spring:bind path="form.dateFrom">
 				<th><fmt:message key="worklog.workFrom" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogDateFromId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogDateFromId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogDateFromImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -66,7 +66,7 @@
 			<spring:bind path="form.dateTo">
 				<th><fmt:message key="worklog.workTo" /></th>
 				<td>
-					<input type="text" name="${status.expression}" value="${status.value}" id="worklogDateToId"/><%--
+					<input type="text" name="${status.expression}" value="${fn:escapeXml(status.value)}" id="worklogDateToId"/><%--
 				--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogDateToImgId"/>
 					<script type="text/javascript">
 					<!--
@@ -83,7 +83,7 @@
 			<spring:bind path="form.project">
 				<th><fmt:message key="worklog.project" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
 					</vc:select> 
@@ -97,7 +97,7 @@
 			<spring:bind path="form.activity">
 				<th><fmt:message key="worklog.activity" /></th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 					</vc:select>

programming_language: Shell
filename: WorklogList.jsp
change_type: ModificationType.MODIFY
diff: @@ -14,7 +14,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workFrom" /></th>
 			<td>
-				<input type="text" name="worklogFilterFrom" value="${worklogFilterFrom}" tabindex="1" id="worklogFilterWorkFromId"/><%--
+				<input type="text" name="worklogFilterFrom" value="${fn:escapeXml(worklogFilterFrom)}" tabindex="1" id="worklogFilterWorkFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -24,7 +24,7 @@
 			</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -32,7 +32,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workTo" /></th>
 			<td>
-				<input type="text" name="worklogFilterTo" value="${worklogFilterTo}" tabindex="2" id="worklogFilterWorkToId"/><%--
+				<input type="text" name="worklogFilterTo" value="${fn:escapeXml(worklogFilterTo)}" tabindex="2" id="worklogFilterWorkToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -42,7 +42,7 @@
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -54,7 +54,7 @@
 			<td colspan="2"></td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -79,27 +79,27 @@
 	<display:setProperty name="export.pdf.filename" value="${employee.user.contactInfo.displayName}-worklog.pdf" />
 	<display:setProperty name="export.rtf.filename" value="${employee.user.contactInfo.displayName}-worklog.rtf" />
 	
-	<display:caption>${employee.user.contactInfo.displayName}</display:caption>
+	<display:caption>${fn:escapeXml(employee.user.contactInfo.displayName)}</display:caption>
 	
 	<!-- data columns -->
 	<display:column property="workFrom" titleKey="worklog.date" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" />
 
 	<display:column titleKey="worklog.project" sortable="true" media="html" >
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.project.code}</span>
-		<span title="${worklog.project.name}">${worklog.project.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+		<span title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</span>
 	</display:column>
-	<display:column property="project.code" titleKey="worklog.project" sortable="true" media="csv excel xml pdf rtf"/>
+	<display:column property="project.code" titleKey="worklog.project" sortable="true" media="csv excel xml pdf rtf" escapeXml="true"/>
 
 	<display:column titleKey="worklog.activity" sortable="true" media="html">
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.activity.code}</span>
-		<span title="${worklog.activity.name}">${worklog.activity.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+		<span title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</span>
 	</display:column>
-	<display:column property="activity.code" titleKey="worklog.activity" sortable="true" media="csv excel xml pdf rtf"/>
+	<display:column property="activity.code" titleKey="worklog.activity" sortable="true" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column property="descriptionGui" titleKey="worklog.description" media="html" sortable="true"/>	
-	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true"/>
 	
 	<display:column property="workFrom" titleKey="worklog.workFrom" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 	<display:column property="workTo" titleKey="worklog.workTo" sortable="true" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: WorklogMonthlyOverview.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,12 +11,12 @@
 		<tr>
 			<th><fmt:message key="worklog.month" /></th>
 			<td>
-				<vc:select name="worklogFilterMonth" valueObjects="${months}" selected="${worklogFilterMonth}"
+				<vc:select name="worklogFilterMonth" valueObjects="${months}" selected="${fn:escapeXml(worklogFilterMonth)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="1" />
 			</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -25,12 +25,12 @@
 		<tr>
 			<th><fmt:message key="worklog.year" /></th>
 			<td>
-				<vc:select name="worklogFilterYear" valueObjects="${years}" selected="${worklogFilterYear}"
+				<vc:select name="worklogFilterYear" valueObjects="${years}" selected="${fn:escapeXml(worklogFilterYear)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="3" />
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -42,7 +42,7 @@
 			<td>&nbsp;</td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -72,20 +72,20 @@
 
 	<display:column titleKey="worklog.project" media="html" >
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.project.code}</span>
-		<span title="${worklog.project.name}">${worklog.project.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+		<span title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</span>
 	</display:column>
-	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column titleKey="worklog.activity" media="html">
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.activity.code}</span>
-		<span title="${worklog.activity.name}">${worklog.activity.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+		<span title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</span>
 	</display:column>
-	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 	<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: WorklogOverview.jsp
change_type: ModificationType.MODIFY
diff: @@ -14,7 +14,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workFrom" /></th>
 			<td>
-				<input type="text" name="worklogFilterFrom" value="${worklogFilterFrom}" tabindex="1" id="worklogFilterWorkFromId"/><%--
+				<input type="text" name="worklogFilterFrom" value="${fn:escapeXml(worklogFilterFrom)}" tabindex="1" id="worklogFilterWorkFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -24,7 +24,7 @@
 			</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -35,7 +35,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workTo" /></th>
 			<td>
-				<input type="text" name="worklogFilterTo" value="${worklogFilterTo}" tabindex="2" id="worklogFilterWorkToId"/><%--
+				<input type="text" name="worklogFilterTo" value="${fn:escapeXml(worklogFilterTo)}" tabindex="2" id="worklogFilterWorkToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -45,7 +45,7 @@
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" 
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -55,11 +55,11 @@
 		<tr>			
 			<th><fmt:message key="worklog.invoice.code" /></th>
 			<td>
-				<input type="text" name="worklogFilterInvoiceCode" value="${worklogFilterInvoiceCode}" maxlength="30"/>
+				<input type="text" name="worklogFilterInvoiceCode" value="${fn:escapeXml(worklogFilterInvoiceCode)}" maxlength="30"/>
 			</td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -72,10 +72,10 @@
 					<c:forEach items="${invoiceRelations}" var="relation">
 						<c:choose>
 							<c:when test="${relation.code == worklogFilterInvoiceRelation}">
-								<option value="${relation.code}" selected="selected"><fmt:message key="invoice.relation.${relation.code}" /></option>
+								<option value="${fn:escapeXml(relation.code)}" selected="selected"><fmt:message key="invoice.relation.${relation.code}" /></option>
 							</c:when>
 							<c:otherwise>
-								<option value="${relation.code}"><fmt:message key="invoice.relation.${relation.code}" /></option>
+								<option value="${fn:escapeXml(relation.code)}"><fmt:message key="invoice.relation.${relation.code}" /></option>
 							</c:otherwise>
 						</c:choose>
 					</c:forEach>				
@@ -108,7 +108,7 @@
 
 	<div class="tabber">
 	
-		<h2 class="visibleOnlyInPrint">${employee.user.contactInfo.displayName}: ${worklogFilterFrom} - ${worklogFilterTo}</h2>
+		<h2 class="visibleOnlyInPrint">${fn:escapeXml(employee.user.contactInfo.displayName)}: ${fn:escapeXml(worklogFilterFrom)} - ${fn:escapeXml(worklogFilterTo)}</h2>
 	
 		<div class="tabbertab">
 			<h2>Worklog Items</h2>
@@ -128,37 +128,37 @@
 			
 				<display:column titleKey="worklog.project" media="html" >
 					<!-- this is hack for sorting -->
-					<span class="invisible">${worklog.project.code}</span>
-					<acronym title="${worklog.project.name}">${worklog.project.code}</acronym>
+					<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+					<acronym title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</acronym>
 				</display:column>
-				<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+				<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 				<display:column titleKey="worklog.component" media="html">
 					<!-- this is hack for sorting -->
-					<span class="invisible">${worklog.component.code}</span>
-					<acronym title="${worklog.component.name}">${worklog.component.code}</acronym>
+					<span class="invisible">${fn:escapeXml(worklog.component.code)}</span>
+					<acronym title="${fn:escapeXml(worklog.component.name)}">${fn:escapeXml(worklog.component.code)}</acronym>
 				</display:column>
-				<display:column property="component.code" titleKey="worklog.component" media="csv excel xml rtf"/>			
+				<display:column property="component.code" titleKey="worklog.component" media="csv excel xml rtf" escapeXml="true" />			
 
 				<display:column titleKey="worklog.activity" media="html">
 					<!-- this is hack for sorting -->
-					<span class="invisible">${worklog.activity.code}</span>
-					<acronym title="${worklog.activity.name}">${worklog.activity.code}</acronym>
+					<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+					<acronym title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</acronym>
 				</display:column>
 				<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
 
 				<display:column titleKey="worklog.invoice" media="html" class="nowrap">
 					<c:if test="${worklog.invoice != null}">
-						<span class="invisible">${worklog.invoice.code}</span>
-						<acronym title="${worklog.invoice.name}">${worklog.invoice.code}</acronym>&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle"/>
+						<span class="invisible">${fn:escapeXml(worklog.invoice.code)}</span>
+						<acronym title="${fn:escapeXml(worklog.invoice.name)}">${fn:escapeXml(worklog.invoice.code)}</acronym>&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle"/>
 					</c:if>
 				</display:column>
-				<display:column property="invoice.code" titleKey="worklog.invoice" media="csv excel xml rtf"/>
+				<display:column property="invoice.code" titleKey="worklog.invoice" media="csv excel xml rtf" escapeXml="true" />
 			
-				<display:column property="employee.user.contactInfo.displayName" titleKey="worklog.employee"/>
+				<display:column property="employee.user.contactInfo.displayName" titleKey="worklog.employee" escapeXml="true" />
 			
 				<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-				<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+				<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true" />
 
 				<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 				<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
@@ -216,7 +216,7 @@
 			<tr>
 				<th>Day \ Project</th>
 				<c:forEach items="${projectProjectionList}" var="project">
-					<th>${project.key}</th>
+					<th>${fn:escapeXml(project.key)}</th>
 				</c:forEach>
 				<th>Hours / day</th>
 			</tr>
@@ -270,8 +270,8 @@
 			<c:forEach items="${project.projectionFor[3].list}" var="activity">
 				<tr class="even">
 					<th><fmt:formatDate value="${day.key}" pattern="${TypeFormats.DATE_FORMAT_DOW}"/></th>
-					<td>${project.key}</td>
-					<td>${activity.key}</td>
+					<td>${fn:escapeXml(project.key)}</td>
+					<td>${fn:escapeXml(activity.key)}</td>
 					<th style='text-align:right;'><fmt:formatNumber value="${activity.value.sum}" maxFractionDigits="2" minFractionDigits="2" /></th>
 				</tr>
 			</c:forEach>
@@ -284,7 +284,7 @@
 				</tr>
 			</c:forEach>
 				<tr class="odd totalRow">
-					<th>Week ${week.key}</th>
+					<th>Week ${fn:escapeXml(week.key)}</th>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<th style='text-align:right;'><fmt:formatNumber value="${week.value.sum}" maxFractionDigits="2" minFractionDigits="2" /></th>
@@ -306,14 +306,14 @@
 			<tr>
 				<th>&nbsp;</th>
 				<c:forEach items="${activityProjectionList}" var="activity">
-					<th>${activity.key}</th>
+					<th>${fn:escapeXml(activity.key)}</th>
 				</c:forEach>
 				<th><fmt:message key="worklog.total"/></th>
 			</tr>
 		  </thead>
 			<c:forEach items="${projectProjectionList}" var="project">
 				<tr class="odd">
-					<th>${project.key}</th>
+					<th>${fn:escapeXml(project.key)}</th>
 					<c:forEach items="${activityProjectionList}" var="activity">
 						<td style='text-align:right;'>
 							<fmt:formatNumber value="${worklogGroupped.map[false][false][project.key][activity.key].sum}" maxFractionDigits="2" minFractionDigits="2" />

programming_language: HTML
filename: WorklogOverviewList.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,12 +11,12 @@
 		<tr>
 			<th><fmt:message key="worklog.month" /></th>
 			<td>
-				<vc:select name="worklogFilterMonth" valueObjects="${months}" selected="${worklogFilterMonth}"
+				<vc:select name="worklogFilterMonth" valueObjects="${months}" selected="${fn:escapeXml(worklogFilterMonth)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="1" />
 			</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="2" /> 
 			</td>
@@ -25,7 +25,7 @@
 		<tr>
 			<th><fmt:message key="worklog.year" /></th>
 			<td>
-				<vc:select name="worklogFilterYear" valueObjects="${years}" selected="${worklogFilterYear}"
+				<vc:select name="worklogFilterYear" valueObjects="${years}" selected="${fn:escapeXml(worklogFilterYear)}"
 				valueProperty="value" labelProperty="label" orderBy="label" tabindex="3" />
 			</td>
 			<td colspan="2"></td>
@@ -44,17 +44,17 @@
 	<display:setProperty name="export.rtf.filename" value="${employee.user.contactInfo.displayName}-worklog.rtf" />
 
 	<!-- header -->
-	<display:caption>${employee.user.contactInfo.displayName} - <fmt:message key="month.${worklogFilterMonth}"/> ${worklogFilterYear}</display:caption>
+	<display:caption>${fn:escapeXml(employee.user.contactInfo.displayName)} - <fmt:message key="month.${worklogFilterMonth}"/> ${fn:escapeXml(worklogFilterYear)}</display:caption>
 	
 	<!-- data columns -->
 	<display:column property="date" titleKey="worklog.date" decorator="cz.softinel.retra.core.utils.decorator.DateDecorator" group="1" class="printBold" />
 
 	<display:column titleKey="worklog.project">
-		${worklog.project.code} - ${worklog.project.name}
+		${fn:escapeXml(worklog.project.codefn:escapeXml)} - ${fn:escapeXml(worklog.project.name)}
 	</display:column>
 
 	<display:column titleKey="worklog.activity">
-		${worklog.activity.code} - ${worklog.activity.name}
+		${fn:escapeXml(worklog.activity.code)} - ${fn:escapeXml(worklog.activity.name)}
 	</display:column>
 
 	<display:column property="hours" titleKey="worklog.hours" total="true" format="{0,number,0.00}"/>

programming_language: HTML
filename: WorklogProjectOverview.jsp
change_type: ModificationType.MODIFY
diff: @@ -14,7 +14,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workFrom" /></th>
 			<td>
-				<input type="text" name="worklogFilterFrom" value="${worklogFilterFrom}" tabindex="1" id="worklogFilterWorkFromId"/><%--
+				<input type="text" name="worklogFilterFrom" value="${fn:escapeXml(worklogFilterFrom)}" tabindex="1" id="worklogFilterWorkFromId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkFromImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -24,7 +24,7 @@
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -35,7 +35,7 @@
 		<tr>
 			<th><fmt:message key="worklog.workTo" /></th>
 			<td>
-				<input type="text" name="worklogFilterTo" value="${worklogFilterTo}" tabindex="2" id="worklogFilterWorkToId"/><%--
+				<input type="text" name="worklogFilterTo" value="${fn:escapeXml(worklogFilterTo)}" tabindex="2" id="worklogFilterWorkToId"/><%--
 			--%><img src="${imgRoot}/calendarIco.gif" alt="<fmt:message key='calendar.label' />" title="<fmt:message key='calendar.label' />" align="top" id="worklogFilterWorkToImgId"/>
 				<script type="text/javascript">
 				<!--
@@ -45,7 +45,7 @@
 			</td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -54,7 +54,7 @@
 		<tr>			
 			<th><fmt:message key="worklog.invoice.code" /></th>
 			<td>
-				<input type="text" name="worklogFilterInvoiceCode" value="${worklogFilterInvoiceCode}" maxlength="30"/>
+				<input type="text" name="worklogFilterInvoiceCode" value="${fn:escapeXml(worklogFilterInvoiceCode)}" maxlength="30"/>
 			</td>
 			<th></th>
 			<td></td>
@@ -66,10 +66,10 @@
 					<c:forEach items="${invoiceRelations}" var="relation">
 						<c:choose>
 							<c:when test="${relation.code == worklogFilterInvoiceRelation}">
-								<option value="${relation.code}" selected="selected"><fmt:message key="invoice.relation.${relation.code}" /></option>
+								<option value="${fn:escapeXml(relation.code)}" selected="selected"><fmt:message key="invoice.relation.${relation.code}" /></option>
 							</c:when>
 							<c:otherwise>
-								<option value="${relation.code}"><fmt:message key="invoice.relation.${relation.code}" /></option>
+								<option value="${fn:escapeXml(relation.code)}"><fmt:message key="invoice.relation.${relation.code}" /></option>
 							</c:otherwise>
 						</c:choose>
 					</c:forEach>				
@@ -89,8 +89,8 @@
 	<div class="tabbertab">
 		<h2>Employee</h2>
 		<display:table id="worklogByEmployeeId" name="worklogByEmployee.list" requestURI="${requestURI}" export="true">
-			<display:column property="key" titleKey="worklog.employee" />
-			<display:column property="keyInfo" titleKey="worklog.employee.ldaplogin" media="csv excel xml pdf rtf"/>			
+			<display:column property="key" titleKey="worklog.employee" escapeXml="true"/>
+			<display:column property="keyInfo" titleKey="worklog.employee.ldaplogin" media="csv excel xml pdf rtf" escapeXml="true" />			
 			<display:column property="value.sum" titleKey="worklog.hours" format="{0,number,#,##0.00}"/>
 			<display:footer media="html">
 				<tr>
@@ -104,7 +104,7 @@
 	<div class="tabbertab">
 		<h2>Activity</h2>
 		<display:table id="worklogByAcrivityId" name="worklogByAcrivity.list" requestURI="${requestURI}" export="true">
-			<display:column property="key" titleKey="worklog.activity" />
+			<display:column property="key" titleKey="worklog.activity" escapeXml="true" />
 			<display:column property="value.sum" titleKey="worklog.hours" format="{0,number,#,##0.00}" />
 			<display:footer media="html">
 				<tr>
@@ -118,7 +118,7 @@
 	<div class="tabbertab">
 		<h2>Project</h2>
 		<display:table id="worklogByProjectId" name="worklogByProject.list" requestURI="${requestURI}" export="true">
-			<display:column property="key" titleKey="worklog.project" />
+			<display:column property="key" titleKey="worklog.project" escapeXml="true" />
 			<display:column property="value.sum" titleKey="worklog.hours" format="{0,number,#,##0.00}" />
 			<display:footer media="html">
 				<tr>
@@ -136,14 +136,14 @@
 			<tr>
 				<th>&nbsp;</th>
 				<c:forEach items="${worklogGrouppedAcrivity.list}" var="activity">
-					<th>${activity.key}</th>
+					<th>${fn:escapeXml(activity.key)}</th>
 				</c:forEach>
 				<th>Total</th>
 			</tr>
 		</thead>
 			<c:forEach items="${worklogByEmployee.list}" var="employee">
 				<tr class="odd">
-					<th>${employee.key}</th>
+					<th>${fn:escapeXml(employee.key)}</th>
 					<c:forEach items="${worklogGrouppedAcrivity.list}" var="activity">
 						<td style='text-align:right;'>
 							<fmt:formatNumber value="${worklogGroupped.map[employee.key][activity.key][false].sum}" maxFractionDigits="2" minFractionDigits="2" />
@@ -185,14 +185,14 @@
 			<tr>
 				<th>&nbsp;</th>
 				<c:forEach items="${projectProjectionList}" var="project">
-					<th>${project.key}</th>
+					<th>${fn:escapeXml(project.key)}</th>
 				</c:forEach>
 				<th><fmt:message key="worklog.total"/></th>
 			</tr>
 		</thead>
 			<c:forEach items="${employeeProjectionList}" var="employee">
 				<tr class="odd">
-					<th>${employee.key}</th>
+					<th>${fn:escapeXml(employee.key)}</th>
 					<c:forEach items="${projectProjectionList}" var="project">
 						<td style='text-align:right;'>
 							<fmt:formatNumber value="${worklogGroupped.map[employee.key][false][project.key].sum}" pattern="#,##0.0#" />
@@ -218,14 +218,14 @@
 			<tr>
 				<th>&nbsp;</th>
 				<c:forEach items="${activityProjectionList}" var="activity">
-					<th>${activity.key}</th>
+					<th>${fn:escapeXml(activity.key)}</th>
 				</c:forEach>
 				<th><fmt:message key="worklog.total"/></th>
 			</tr>
 		</thead>
 			<c:forEach items="${projectProjectionList}" var="project">
 				<tr class="odd">
-					<th>${project.key}</th>
+					<th>${fn:escapeXml(project.key)}</th>
 					<c:forEach items="${activityProjectionList}" var="activity">
 						<td style='text-align:right;'>
 							<fmt:formatNumber value="${worklogGroupped.map[false][activity.key][project.key].sum}" maxFractionDigits="2" minFractionDigits="2" />
@@ -262,37 +262,37 @@
 		
 			<display:column titleKey="worklog.project" media="html" >
 				<!-- this is hack for sorting -->
-				<span class="invisible">${worklog.project.code}</span>
-				<acronym title="${worklog.project.name}">${worklog.project.code}</acronym>
+				<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+				<acronym title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</acronym>
 			</display:column>
-			<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+			<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 			<display:column titleKey="worklog.component" media="html">
 				<!-- this is hack for sorting -->
-				<span class="invisible">${worklog.component.code}</span>
-				<acronym title="${worklog.component.name}">${worklog.component.code}</acronym>
+				<span class="invisible">${fn:escapeXml(worklog.component.code)}</span>
+				<acronym title="${fn:escapeXml(worklog.component.name)}">${fn:escapeXml(worklog.component.code)}</acronym>
 			</display:column>
-			<display:column property="component.code" titleKey="worklog.component" media="csv excel xml rtf"/>
+			<display:column property="component.code" titleKey="worklog.component" media="csv excel xml rtf" escapeXml="true" />
 		
 			<display:column titleKey="worklog.activity" media="html">
 				<!-- this is hack for sorting -->
-				<span class="invisible">${worklog.activity.code}</span>
-				<acronym title="${worklog.activity.name}">${worklog.activity.code}</acronym>
+				<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+				<acronym title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</acronym>
 			</display:column>
-			<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+			<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true" />
 		
 			<display:column titleKey="worklog.invoice" media="html" class="nowrap">
 				<c:if test="${worklog.invoice != null}">
-					<span class="invisible">${worklog.invoice.code}</span>
-					<acronym title="${worklog.invoice.name}">${worklog.invoice.code}</acronym>&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="middle"/>
+					<span class="invisible">${fn:escapeXml(worklog.invoice.code)}</span>
+					<acronym title="${fn:escapeXml(worklog.invoice.name)}">${fn:escapeXml(worklog.invoice.code)}</acronym>&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="middle"/>
 				</c:if>
 			</display:column>
-			<display:column property="invoice.code" titleKey="worklog.invoice" media="csv excel xml rtf"/>
+			<display:column property="invoice.code" titleKey="worklog.invoice" media="csv excel xml rtf" escapeXml="true" />
 		
-			<display:column property="employee.user.contactInfo.displayName" titleKey="worklog.employee"/>
+			<display:column property="employee.user.contactInfo.displayName" titleKey="worklog.employee" escapeXml="true" />
 		
 			<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-			<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+			<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true" />
 
 			<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 			<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: WorklogView.jsp
change_type: ModificationType.MODIFY
diff: @@ -12,23 +12,23 @@
 		</tr>
 		<tr>
 			<th><fmt:message key="worklog.project" /></th>
-			<td>${worklog.project.code} - ${worklog.project.name}</td>
+			<td>${fn:escapeXml(worklog.project.code)} - ${fn:escapeXml(worklog.project.name)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="worklog.component" /></th>
 			<td>
-				<c:if test="${worklog.component != null}" >${worklog.component.code} - ${worklog.component.name}</c:if>
+				<c:if test="${worklog.component != null}" >${fn:escapeXml(worklog.component.code)} - ${fn:escapeXml(worklog.component.name)}</c:if>
 				<c:if test="${worklog.component == null}" >-</c:if>
 			</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="worklog.activity" /></th>
-			<td>${worklog.activity.code} - ${worklog.activity.name}</td>
+			<td>${fn:escapeXml(worklog.activity.code)} - ${fn:escapeXml(worklog.activity.name)}</td>
 		</tr>
 		<tr>
 			<th><fmt:message key="worklog.invoice" /></th>
 			<td>
-				<c:if test="${worklog.onInvoice}" >${worklog.invoice.code} (${worklog.invoice.name})&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle" /></c:if>
+				<c:if test="${worklog.onInvoice}" >${fn:escapeXml(worklog.invoice.code)} (${fn:escapeXml(worklog.invoice.name)})&nbsp;-&nbsp;<img src="${imgRoot}/<fmt:message key='invoice.state.img.${worklog.invoice.state}' />" alt="<fmt:message key='invoice.state.${worklog.invoice.state}' />" title="<fmt:message key='invoice.state.${worklog.invoice.state}' />" align="absmiddle" /></c:if>
 				<c:if test="${!worklog.onInvoice}" >-</c:if>
 			</td>
 		</tr>

programming_language: Shell
filename: WorklogWeeklyOverview.jsp
change_type: ModificationType.MODIFY
diff: @@ -13,7 +13,7 @@
 			<td>&nbsp;</td>
 			<th><fmt:message key="worklog.employee" /></th>
 			<td>
-				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${worklogFilterEmployee}" 
+				<vc:select name="worklogFilterEmployee" valueObjects="${employees}" selected="${fn:escapeXml(worklogFilterEmployee)}" 
 				valueProperty="pk" labelProperty="user.contactInfo.displayName" orderBy="user.contactInfo.displayName"
 				tabindex="3" /> 
 			</td>
@@ -22,12 +22,12 @@
 		<tr>
 			<th><fmt:message key="worklog.week" /></th>
 			<td>
-				<vc:select name="worklogFilterWeek" valueObjects="${weeks}" selected="${worklogFilterWeek}" 
+				<vc:select name="worklogFilterWeek" valueObjects="${weeks}" selected="${fn:escapeXml(worklogFilterWeek)}" 
 				valueProperty="code" labelProperty="label" orderBy="code" tabindex="1" />
 			</td>
 			<th><fmt:message key="worklog.project" /></th>
 			<td>
-				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${worklogFilterProject}" 
+				<vc:select name="worklogFilterProject" valueObjects="${projects}" selected="${fn:escapeXml(worklogFilterProject)}" 
 				valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"
 				tabindex="4">
 					<vc:select-option value="">--- <fmt:message key="worklog.allProjects" /> ---</vc:select-option>
@@ -39,7 +39,7 @@
 			<td>&nbsp;</td>
 			<th><fmt:message key="worklog.activity" /></th>
 			<td>
-				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${worklogFilterActivity}" 
+				<vc:select name="worklogFilterActivity" valueObjects="${activities}" selected="${fn:escapeXml(worklogFilterActivity)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 					<vc:select-option value="">--- <fmt:message key="worklog.allActivities" /> ---</vc:select-option>
 				</vc:select> <!-- tabindex="5" -->
@@ -69,20 +69,20 @@
 
 	<display:column titleKey="worklog.project" media="html" >
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.project.code}</span>
-		<span title="${worklog.project.name}">${worklog.project.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.project.code)}</span>
+		<span title="${fn:escapeXml(worklog.project.name)}">${fn:escapeXml(worklog.project.code)}</span>
 	</display:column>
-	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf"/>
+	<display:column property="project.code" titleKey="worklog.project" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column titleKey="worklog.activity" media="html">
 		<!-- this is hack for sorting -->
-		<span class="invisible">${worklog.activity.code}</span>
-		<span title="${worklog.activity.name}">${worklog.activity.code}</span>
+		<span class="invisible">${fn:escapeXml(worklog.activity.code)}</span>
+		<span title="${fn:escapeXml(worklog.activity.name)}">${fn:escapeXml(worklog.activity.code)}</span>
 	</display:column>
-	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf"/>
+	<display:column property="activity.code" titleKey="worklog.activity" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column property="descriptionGui" titleKey="worklog.description" media="html"/>	
-	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf"/>
+	<display:column property="description" titleKey="worklog.description" media="csv excel xml pdf rtf" escapeXml="true" />
 
 	<display:column property="workFrom" titleKey="worklog.workFrom" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>
 	<display:column property="workTo" titleKey="worklog.workTo" decorator="cz.softinel.retra.core.utils.decorator.HourDecorator"/>

programming_language: HTML
filename: ChangeVisualConfiguration.jsp
change_type: ModificationType.MODIFY
diff: @@ -11,7 +11,7 @@
 			<spring:bind path="visualConfigurationForm.skinName">
 				<th>Skin</th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${skins}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${skins}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="name" labelProperty="title" >
 						<vc:select-option value="">--- default ---</vc:select-option>
 					</vc:select>					
@@ -25,7 +25,7 @@
 			<spring:bind path="visualConfigurationForm.timeSelectorImplementation">
 				<th>Time Selector</th>
 				<td>
-					<vc:select name="${status.expression}" valueObjects="${timeSelectors}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${timeSelectors}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="name" labelProperty="title" >
 						<vc:select-option value="">--- default ---</vc:select-option>
 					</vc:select>					
@@ -39,7 +39,7 @@
 				<th>Default activity for projects</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.da">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -53,7 +53,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p0">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -62,7 +62,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a0">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -76,7 +76,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p1">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -85,7 +85,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a1">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -99,7 +99,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p2">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -108,7 +108,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a2">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -122,7 +122,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p3">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -131,7 +131,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a3">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -145,7 +145,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p4">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -154,7 +154,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a4">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -168,7 +168,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p5">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -177,7 +177,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a5">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -191,7 +191,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p6">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -200,7 +200,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a6">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -214,7 +214,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p7">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -223,7 +223,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a7">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -237,7 +237,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p8">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -246,7 +246,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a8">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					
@@ -260,7 +260,7 @@
 				<th>Project / Default activity</th>
 				<td>
 			<spring:bind path="visualConfigurationForm.p9">
-					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${projects}" selected="${fn:escapeXml(status.value)}" 
 						valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk"> 
 						<vc:select-option value="">--- project ---</vc:select-option>
 					</vc:select>					
@@ -269,7 +269,7 @@
 					</c:forEach>
 			</spring:bind>
 			<spring:bind path="visualConfigurationForm.a9">
-					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${status.value}" 
+					<vc:select name="${status.expression}" valueObjects="${activities}" selected="${fn:escapeXml(status.value)}" 
 					valueProperty="pk" labelProperty="codeAndName" orderBy="codeAndName" parentProperty="parent.pk">
 						<vc:select-option value="">--- default activity ---</vc:select-option>
 					</vc:select>					

programming_language: Shell
filename: Login.jsp
change_type: ModificationType.MODIFY
diff: @@ -7,7 +7,7 @@
 	<form action="LoginAction.do?fkprm=true&originalUrl=${originalUrl}" method="post">
 		<p>Username</p>
 		<p>
-			<input type="text" name="loginName" value="${loginName}" />
+			<input type="text" name="loginName" value="${fn:escapeXml(loginName)}" />
 		</p>
 		<p>Password</p>
 		<p>

programming_language: HTML
filename: RetraError.jsp
change_type: ModificationType.MODIFY
diff: @@ -5,7 +5,7 @@
 <div class="component dashboardComponentHalf">
 	<h2><fmt:message key="retra.error"/></h2>
 	<form action="Newsboard.do?fkprm=true" method="post">
-		<p><fmt:message key="retra.error.id"/>: ${errId}</p>
+		<p><fmt:message key="retra.error.id"/>: ${fn:escapeXml(errId)}</p>
 		<p>
 			<input type="submit" name="submit" class="button" value="<fmt:message key="newsboard.label"/>" />
 		</p>

programming_language: HTML
filename: years.xml
change_type: ModificationType.MODIFY
diff: @@ -24,5 +24,26 @@
 		<field value="2018" key="year.2018" />
 		<field value="2019" key="year.2019" />
 		<field value="2020" key="year.2020" />
+		<field value="2021" key="year.2021" />
+		<field value="2022" key="year.2022" />
+		<field value="2023" key="year.2023" />
+		<field value="2024" key="year.2024" />
+		<field value="2025" key="year.2025" />
+		<field value="2026" key="year.2026" />
+		<field value="2027" key="year.2027" />
+		<field value="2028" key="year.2028" />
+		<field value="2029" key="year.2029" />
+		<field value="2030" key="year.2030" />
+		<field value="2030" key="year.2030" />
+		<field value="2031" key="year.2031" />
+		<field value="2032" key="year.2032" />
+		<field value="2033" key="year.2033" />
+		<field value="2034" key="year.2034" />
+		<field value="2035" key="year.2035" />
+		<field value="2036" key="year.2036" />
+		<field value="2037" key="year.2037" />
+		<field value="2038" key="year.2038" />
+		<field value="2039" key="year.2039" />
+		<field value="2040" key="year.2040" />
 	</lov>
 </lovs>

programming_language: Shell
filename: system-news.xml
change_type: ModificationType.MODIFY
diff: @@ -1,6 +1,17 @@
 <!-- TODO: must be done better structure, keys to message properties etc.  -->
 
 <news>
+	<item date="xx.yy.2022"
+		  title="Build 2.11.0"
+		  body="Fix of these issues:&lt;br />
+		  &lt;a href='https://jira/browse/RETRA-55' target='_blank'>RETRA-55&lt;/a> - Retra logovani - zlepsit, prechod na log4j2.&lt;br />
+		  &lt;a href='https://jira/browse/RETRA-56' target='_blank'>RETRA-56&lt;/a> - Retra je nachylna na XSS.&lt;br />
+		  &lt;a href='https://jira/browse/RETRA-41' target='_blank'>RETRA-41&lt;/a> - Specialni znaky v nazvu projektu.&lt;br />
+		  &lt;a href='https://jira/browse/RETRA-48' target='_blank'>RETRA-48&lt;/a> - Chyba při renderování textu worklogu.&lt;br />
+		  "
+		  author="Retra Team"
+	/>
+
 	<item date="27.6.2019"
 		  title="Build 2.10.0"
 		  body="Fix &lt;a href='https://jira/browse/RETRA-44' target='_blank'>RETRA-44&lt;/a> - Rozsireni exportu Timesheetu a Invoice o sloupec username."
@@ -26,7 +37,7 @@
 		  body="Bugfixing of jokes generator."
 		  author="Retra Team"
 	/>
-
+<!--
 	<item date="22.5.2018"
 		  title="Build 2.6.0"
 		  body="Small refactoring of permissions and bugfix."
@@ -80,7 +91,7 @@
 		  body="New integration with JIRA implemented (worklogs) and some bugfix."
 		  author="Retra Team"
 	/>
-	<!-- item date="2.2.2015"
+	<item date="2.2.2015"
 		  title="Build 2.0.0"
 		  body="Invoice batch generating, filtering projects and employees for assign and some bugfix."
 		  author="Retra Team"

programming_language: Shell
filename: about.properties
change_type: ModificationType.MODIFY
diff: @@ -6,12 +6,12 @@ about.authors.label=Authors
 about.contributors.label=Contributors
 
 about.version.major=2
-about.version.minor=10
+about.version.minor=11
 about.version.build=0
 
 about.text=Retra is application for managing internal resources and simple internal information system
 
-about.releasedOn=27.6.2019
+about.releasedOn=xx.yy.2022
 
 about.authors=Radek Pinc, Petr S\u00edgl
 about.contributors=Bori\u0161a \u017divkovi\u0107, Pavel M\u00fcller, Jaroslava Faustov\u00e1, Jan N\u011bmec, Karel Mr\u00e1zek, David Smekal, Erik Szalai, Pavel Vlasat\u00fd, Martin Javorek, Milan \u010ce\u010drdle
\ No newline at end of file

programming_language: Batchfile
filename: messages.properties
change_type: ModificationType.MODIFY
diff: @@ -3,8 +3,8 @@ header.title=Retra
 header.author=Radek Pinc, Petr S\u00edgl
 header.description=Retra - Resource and Activity Tracker
 header.keywords=Retra, Resource, Activity, Project, Managing, Tracker
-footer.copyright=Copyright &copy; 2007-2019, <a href='About.do?fkprm=true'>Retra Team</a>
-footer.copyright.noLink=Copyright &copy; 2007-2019, Retra Team
+footer.copyright=Copyright &copy; 2007-2022, <a href='About.do?fkprm=true'>Retra Team</a>
+footer.copyright.noLink=Copyright &copy; 2007-2022, Retra Team
 newsboard.label=Newsboard
 dashboard.label=Dashboard
 login.label=Login

programming_language: Batchfile