Merge remote-tracking branch 'upstream/develop' into writePerformance

vivo-project · Feb 11, 2016 · 97658ad · 97658ad
2 parents e4a8c4f + 9ff3dd5
commit 97658ad
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
@@ -171,7 +171,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response )
             msg.setSubject( deliveryfrom );
 
             // add the multipart to the message
-            msg.setContent(msgText,"text/html");
+            msg.setContent(msgText,"text/html; charset=UTF-8");
 
             // set the Date: header
             msg.setSentDate( new Date() );

diff --git a/...in/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/...in/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
@@ -276,7 +276,7 @@ private void sendMessage(Session s, String webuseremail, String webusername,
         msg.setSubject( deliveryfrom );
 
         // add the multipart to the message
-        msg.setContent(msgText,"text/html");
+        msg.setContent(msgText,"text/html; charset=UTF-8");
 
         // set the Date: header
         msg.setSentDate( new Date() );

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
@@ -172,15 +172,15 @@ public boolean send() {
 				if (htmlContent.isEmpty()) {
 					log.error("Message has neither text body nor HTML body");
 				} else {
-					msg.setContent(htmlContent, "text/html");
+					msg.setContent(htmlContent, "text/html; charset=UTF-8");
 				}
 			} else {
 				if (htmlContent.isEmpty()) {
-					msg.setContent(textContent, "text/plain");
+					msg.setContent(textContent, "text/plain; charset=UTF-8");
 				} else {
 					MimeMultipart content = new MimeMultipart("alternative");
-					addBodyPart(content, textContent, "text/plain");
-					addBodyPart(content, htmlContent, "text/html");
+					addBodyPart(content, textContent, "text/plain; charset=UTF-8");
+					addBodyPart(content, htmlContent, "text/html; charset=UTF-8");
 					msg.setContent(content);
 				}
 			}

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
@@ -56,7 +56,7 @@ public void sendMessage(String messageText, String subject, String from, String
 	            msg.setSubject( subject );
 
 	            // add the multipart to the message
-	            msg.setContent(messageText,"text/html");
+	            msg.setContent(messageText,"text/html; charset=UTF-8");
 
 	            // set the Date: header
 	            msg.setSentDate( new Date() );

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -192,7 +192,7 @@
         <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
-            <version>2.0.8</version>
+            <version>2.0.M2.8</version><!-- Resolved from VIVO repository as not in central; newer causes errors -->
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
@@ -214,6 +214,18 @@
             <artifactId>antisamy</artifactId>
             <version>1.4.4</version>
         </dependency>
+        <dependency>
+            <!-- Used for JSP runtime -->
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <!-- Used for JSP runtime -->
+            <groupId>javax.servlet.jsp.jstl</groupId>
+            <artifactId>jstl-api</artifactId>
+            <version>1.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.vivoweb.dependencies</groupId>

diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
@@ -34,8 +34,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />'
            $('a#closeLink').click(function() {
               $('ul#advanced').css("visibility","hidden"); 
               $('a#closeLink').css("visibility","hidden");
+              return false;
            });
-
+           return false;
         });
     });
     

diff --git a/webapp/web/js/sparql/init-yasqe.js → ...p/src/main/webapp/js/sparql/init-yasqe.js b/webapp/web/js/sparql/init-yasqe.js → ...p/src/main/webapp/js/sparql/init-yasqe.js
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
@@ -34,8 +34,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />'
            $('a#closeLink').click(function() {
               $('ul#advanced').css("visibility","hidden"); 
               $('a#closeLink').css("visibility","hidden");
+              return false;
            });
-
+           return false;
         });
     });