Contact Us: GWT

- Contact Us page rewritten to GWT
  (set unitime.legacy.inquiry to true for the old Struts-based page)

Author: tomas-muller

JavaSource/org/unitime/commons/JavaMailWrapper.java

@@ -90,7 +90,7 @@ public void setFrom(String email, String name) throws MessagingException, Unsupp
 
 	@Override
 	public void setReplyTo(String email, String name) throws UnsupportedEncodingException, MessagingException {
-		if (email != null)
+		if (email != null && !email.isEmpty())
 			iMail.setReplyTo(new InternetAddress[] {new InternetAddress(email, name, "UTF-8")});
 	}
 

JavaSource/org/unitime/timetable/action/InquiryAction.java

@@ -25,10 +25,12 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,6 +89,17 @@ public class InquiryAction extends UniTimeAction<InquiryForm> implements Uploade
 
 
 	public String execute() throws Exception {
+		if (ApplicationProperty.LegacyInquiry.isFalse()) {
+    		String url = "inquiry";
+    		boolean first = true;
+    		for (Enumeration<String> e = getRequest().getParameterNames(); e.hasMoreElements(); ) {
+    			String param = e.nextElement();
+    			url += (first ? "?" : "&") + param + "=" + URLEncoder.encode(getRequest().getParameter(param), "utf-8");
+    			first = false;
+    		}
+    		response.sendRedirect(url);
+			return null;
+    	}
 		if (form == null) {
 			form = new InquiryForm();
 		}

JavaSource/org/unitime/timetable/defaults/ApplicationProperty.java

@@ -3858,6 +3858,11 @@ public enum ApplicationProperty {
 	@Description("University Timetabling Application: switch the user interface back to the old (Struts-based) main page")
 	LegacyMain("unitime.legacy.main"),
 
+	@Type(Boolean.class)
+	@DefaultValue("false")
+	@Description("Contact Us: switch the user interface back to the old (Struts-based) contact us page")
+	LegacyInquiry("unitime.legacy.inquiry"),
+	
 	@Type(Boolean.class)
 	@DefaultValue("false")
 	@Description("Student Scheduling: provide associated (parent) course -- a student requesting both courses cannot get the course without also getting the associated course")

JavaSource/org/unitime/timetable/gwt/client/Pages.java

@@ -72,6 +72,7 @@
 import org.unitime.timetable.gwt.client.offerings.OfferingDetailPage;
 import org.unitime.timetable.gwt.client.offerings.SubpartDetailPage;
 import org.unitime.timetable.gwt.client.offerings.SubpartEditPage;
+import org.unitime.timetable.gwt.client.page.ContactUsPage;
 import org.unitime.timetable.gwt.client.page.MainPage;
 import org.unitime.timetable.gwt.client.page.ManagerSettingsPage;
 import org.unitime.timetable.gwt.client.page.SelectUserRolePage;
@@ -503,6 +504,10 @@ public enum Pages {
 		public Widget create() { return new MainPage(); }
 		public String name(GwtMessages messages) { return messages.pageUniversityTimetablingApplication(); }
 		}),
+	inquiry(new PageFactory() {
+		public Widget create() { return new ContactUsPage(); }
+		public String name(GwtMessages messages) { return messages.pageContactUs(); }
+		}),
 	;
 
 	private PageFactory iFactory;