moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

Caldav: first check that email address is valid to avoid InvalidSmtpAddress error on FreeBusy request and new timezone name mapping

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1644 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-03-22 21:34:05 +00:00
parent 367c57b60b
commit eda37cdcb0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/davmail/exchange/ExchangeSession.java
View File

@ -3128,6 +3128,11 @@ public abstract class ExchangeSession {
* @throws IOException on error * @throws IOException on error
*/ */
public FreeBusy getFreebusy(String attendee, String startDateValue, String endDateValue) throws IOException { public FreeBusy getFreebusy(String attendee, String startDateValue, String endDateValue) throws IOException {
// first check that email address is valid to avoid InvalidSmtpAddress error
if (attendee == null || attendee.indexOf('@') < 0 || attendee.charAt(attendee.length() - 1) == '@') {
return null;
}
attendee = replaceIcal4Principal(attendee); attendee = replaceIcal4Principal(attendee);
if (attendee.startsWith("mailto:") || attendee.startsWith("MAILTO:")) { if (attendee.startsWith("mailto:") || attendee.startsWith("MAILTO:")) {
attendee = attendee.substring("mailto:".length()); attendee = attendee.substring("mailto:".length());

3
src/java/timezones.properties
View File

@ -93,4 +93,5 @@ GMT\ -0500\ (Standard)\ /\ GMT\ -0400\ (Daylight)=America/New_York
GMT\ -0600\ (Standard)\ /\ GMT\ -0500\ (Daylight)=America/Chicago GMT\ -0600\ (Standard)\ /\ GMT\ -0500\ (Daylight)=America/Chicago
GMT\ -0700\ (Standard)\ /\ GMT\ -0600\ (Daylight)=America/Denver GMT\ -0700\ (Standard)\ /\ GMT\ -0600\ (Daylight)=America/Denver
GMT\ -0800\ (Standard)\ /\ GMT\ -0700\ (Daylight)=America/Los_Angeles GMT\ -0800\ (Standard)\ /\ GMT\ -0700\ (Daylight)=America/Los_Angeles
GMT\ Standard\ Time=GMT Standard Time GMT\ Standard\ Time=GMT Standard Time
Greenwich\ Standard\ Time=Greenwich Standard Time