diff --git a/ChangeLog b/ChangeLog index 0c9077e9d..f2194d6a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2012-05-09 Ludovic Marcotte + + * SoObjects/Mailer/SOGoDraftObject.m - don't encode message/rfc822 + parts in base64 - it's not allowed. + +2012-05-08 Francis Lachapelle + + * UI/WebServerResources/ContactsUI.js (configureDraggables) + (configureDroppables, startDragging, whileDragging, stopDragging) + (dropAction): drag'n'drop is how handle by jQuery instead of Scriptaculous. + + * UI/WebServerResources/MailerUI.js (configureDraggables) + (configureDroppables, startDragging, whileDragging, stopDragging) + (dropAction): idem. + + * UI/WebServerResources/generic.js (onCloseButtonClick) + (showPromptDialog, showSelectDialog, showAuthenticationDialog) + (disposeDialog, _disposeDialog): idem. + + * UI/WebServerResources/SOGoRootPage.js (initLogin): idem. + + * UI/Contacts/UIxContactView.m (-primaryEmail): in the mailto + link, remove double-quotes and escape single-quotes from the fullname. + (-secondaryEmail): idem. + 2012-05-04 Wolfgang Sourdeau * OpenChange/MAPIStoreSOGo.m: register and unregister current diff --git a/NEWS b/NEWS index e27d23c65..b61d917fe 100644 --- a/NEWS +++ b/NEWS @@ -15,12 +15,15 @@ Enhancements - updated CKEditor to version 3.6.3 - automatically add/remove attendees to recurrence exceptions when they are being added to the master event + - replaced the Scriptaculous Javascript framework by jQuery to improve the + drag'n'drop experience Bug Fixes - fixed wrong date validation in preferences module affecting French users - fixed bugs in weekly recurrence calculator - when saving a draft, fixed content-transfer-encoding to properly handle 8bit data + - escaped single-quote in HTML view of contacts 1.3.14 (2012-03-23) ------------------- diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index b751f8171..3d0c540ee 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1181,11 +1181,6 @@ static NSString *userAgent = nil; content = [[NSData alloc] initWithContentsOfMappedFile:p]; [content autorelease]; - content = [content dataByEncodingBase64]; - [map setObject: @"base64" forKey: @"content-transfer-encoding"]; - [map setObject:[NSNumber numberWithInt:[content length]] - forKey: @"content-length"]; - /* Note: the -init method will create a temporary file! */ body = [[NGMimeFileData alloc] initWithBytes:[content bytes] length:[content length]]; diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m index 53fb24428..0433e9a9a 100644 --- a/UI/Contacts/UIxContactView.m +++ b/UI/Contacts/UIxContactView.m @@ -1,6 +1,6 @@ /* Copyright (C) 2004 SKYRIX Software AG - Copyright (C) 2005-2011 Inverse inc. + Copyright (C) 2005-2012 Inverse inc. This file is part of SOGo. @@ -135,13 +135,18 @@ - (NSString *) primaryEmail { - NSString *email, *mailTo; + NSString *email, *fn, *mailTo; email = [card preferredEMail]; if ([email length] > 0) - mailTo = [NSString stringWithFormat: @"');\">" - @"%@", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email]; + { + fn = [card fn]; + fn = [fn stringByReplacingString: @"\"" withString: @""]; + fn = [fn stringByReplacingString: @"'" withString: @"\\\'"]; + mailTo = [NSString stringWithFormat: @"');\">" + @"%@", email, fn, email, email]; + } else mailTo = nil; @@ -151,7 +156,7 @@ - (NSString *) secondaryEmail { - NSString *email, *mailTo; + NSString *email, *fn, *mailTo; NSMutableArray *emails; emails = [NSMutableArray array]; @@ -182,9 +187,12 @@ if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame) { + fn = [card fn]; + fn = [fn stringByReplacingString: @"\"" withString: @""]; + fn = [fn stringByReplacingString: @"'" withString: @"\\\'"]; mailTo = [NSString stringWithFormat: @"');\">" - @"%@", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email]; + @"%@", email, fn, email, email]; break; } } diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index a8a9a9653..5918e9dae 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -8,6 +8,7 @@ xmlns:label="OGo:label" xmlns:rsrc="OGo:url" const:userDefaultsKeys="SOGoContactsCategories" + const:jsFiles="jquery-ui.js" className="UIxPageFrame" title="name" var:popup="isPopup"> diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index 9aaad9993..30c93a901 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -9,7 +9,7 @@ title="title" const:userDefaultsKeys="SOGoMailMessageCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder" const:userSettingsKeys="Mail" - const:jsFiles="dtree.js,MailerUIdTree.js,SOGoAutoCompletion.js,SOGoResizableTable.js,SOGoMailDataSource.js,SOGoDataTable.js"> + const:jsFiles="dtree.js,MailerUIdTree.js,SOGoAutoCompletion.js,SOGoResizableTable.js,SOGoMailDataSource.js,SOGoDataTable.js,jquery-ui.js"> + + @@ -163,7 +165,6 @@ -