From 60555b95682e59cb50f4e164a6861bbdcc9287f6 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 8 May 2012 18:58:57 +0000 Subject: [PATCH 1/3] See ChangeLog. Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f Monotone-Revision: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-05-08T18:58:57 --- ChangeLog | 6 ++++++ UI/Contacts/UIxContactView.m | 22 +++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47e33fe24..4255b1745 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-08 Francis Lachapelle + + * UI/Contacts/UIxContactView.m (-primaryEmail): in the mailto + link, remove double-quotes and escape single-quotes from the fullname. + (-secondaryEmail): idem. + 2012-05-01 Wolfgang Sourdeau * UI/WebServerResources/generic.js (accessToSubscribedFolder): use 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; } } From 93dd01d271db1ca59211f238b31c54f3dcd57aa6 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 9 May 2012 10:52:36 +0000 Subject: [PATCH 2/3] See ChangeLog Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0 Monotone-Revision: 4e44cee96e74269b692d100a0c98730015a49d07 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-05-09T10:52:36 --- ChangeLog | 5 +++++ SoObjects/Mailer/SOGoDraftObject.m | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4255b1745..775458aa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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/Contacts/UIxContactView.m (-primaryEmail): in the mailto 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]]; From 61a2a4a7ee13d9bffb5d150fbaf476f7be373ec2 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 9 May 2012 13:31:20 +0000 Subject: [PATCH 3/3] See ChangeLog. Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0 Monotone-Revision: ee535991d8282dcec82a7f59c0d07efbbddada4f Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-05-09T13:31:20 --- ChangeLog | 14 + NEWS | 3 + .../ContactsUI/UIxContactFoldersView.wox | 1 + UI/Templates/MailerUI/UIxMailMainFrame.wox | 2 +- UI/Templates/UIxPageFrame.wox | 3 +- UI/WebServerResources/ContactsUI.js | 93 +- UI/WebServerResources/GNUmakefile | 1 - UI/WebServerResources/MailerUI.js | 108 +- UI/WebServerResources/SOGoRootPage.js | 5 +- UI/WebServerResources/generic.js | 25 +- UI/WebServerResources/jquery-ui.js | 1874 +++++++++++++++++ UI/WebServerResources/jquery.js | 4 + UI/WebServerResources/scriptaculous.js | 65 - .../scriptaculous/MIT-LICENSE | 20 - .../scriptaculous/builder.js | 136 -- .../scriptaculous/controls.js | 965 --------- .../scriptaculous/dragdrop.js | 995 --------- .../scriptaculous/effects.js | 1130 ---------- UI/WebServerResources/scriptaculous/slider.js | 275 --- UI/WebServerResources/scriptaculous/sound.js | 55 - .../scriptaculous/unittest.js | 568 ----- debian/sogo.overrides | 4 +- 22 files changed, 1971 insertions(+), 4375 deletions(-) create mode 100644 UI/WebServerResources/jquery-ui.js create mode 100644 UI/WebServerResources/jquery.js delete mode 100644 UI/WebServerResources/scriptaculous.js delete mode 100644 UI/WebServerResources/scriptaculous/MIT-LICENSE delete mode 100644 UI/WebServerResources/scriptaculous/builder.js delete mode 100644 UI/WebServerResources/scriptaculous/controls.js delete mode 100644 UI/WebServerResources/scriptaculous/dragdrop.js delete mode 100644 UI/WebServerResources/scriptaculous/effects.js delete mode 100644 UI/WebServerResources/scriptaculous/slider.js delete mode 100644 UI/WebServerResources/scriptaculous/sound.js delete mode 100644 UI/WebServerResources/scriptaculous/unittest.js diff --git a/ChangeLog b/ChangeLog index 4255b1745..1cba7fd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 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. 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/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 @@ -