From 69b0f9fcbf078c0a0ddc8249b89d702222e497e9 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 3 Sep 2013 12:05:13 -0400
Subject: [PATCH] Mail notifications: Escape HTML in wox templates

We don't escape the values in the classes but in the templates.
---
 SoObjects/Appointments/SOGoAptMailNotification.m  | 6 +++---
 UI/Templates/Appointments/SOGoAptMailDeletion.wox | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 0d0db981e..4c26191ae 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2012 Inverse inc.
+  Copyright (C) 2006-2013 Inverse inc.
   Copyright (C) 2000-2005 SKYRIX Software AG
 
   This file is part of SOGo.
@@ -142,12 +142,12 @@
 
 - (NSString *) location
 {
-  return [[apt location] stringByEscapingHTMLString];
+  return [apt location];
 }
 
 - (NSString *) summary
 {
-  return [[apt summary] stringByEscapingHTMLString];
+  return [apt summary];
 }
 
 - (void) setOrganizerName: (NSString *) theString
diff --git a/UI/Templates/Appointments/SOGoAptMailDeletion.wox b/UI/Templates/Appointments/SOGoAptMailDeletion.wox
index b19a19f2f..aea834b62 100644
--- a/UI/Templates/Appointments/SOGoAptMailDeletion.wox
+++ b/UI/Templates/Appointments/SOGoAptMailDeletion.wox
@@ -24,9 +24,9 @@ h1, dd, .dl-list dt { margin-left: 130px; }
       <small><var:string value="organizerName" const:escapeHTML="NO"/><var:string value="sentByText" const:escapeHTML="NO"/></small></h1>
 
       <dl class="dl-horizontal">
-        <var:if condition="apt.location.length"
+        <var:if condition="location.length"
         ><dt><var:string label:value="location_label" const:escapeHTML="NO"/></dt>
-        <dd><var:string value="apt.location" const:escapeHTML="NO"/></dd></var:if>
+        <dd><var:string value="location" const:escapeHTML="NO"/></dd></var:if>
         <dt><var:string label:value="startDate_label" const:escapeHTML="NO"/></dt>
         <dd><var:string value="formattedAptStartDate" const:escapeHTML="NO"
            /><var:if condition="formattedAptStartTime.length"> - <var:string value="formattedAptStartTime" const:escapeHTML="NO"/> <var:string value="viewTZ" const:escapeHTML="NO"/>