From f827ad748c42daf00836871f7856acb13c6a66d3 Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 1 Jun 2009 17:29:31 +0000 Subject: [PATCH 1/2] Monotone-Parent: 9c939912020f0e7e38a316d6867d7497c4540bd6 Monotone-Revision: e33f6361448cdae2cc2fe618e4581de983c22081 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-06-01T17:29:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/WebServerResources/UIxContactsUserFolders.js | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5658819a5..9af3630c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-01 Cyril Robert + + * UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit): + Fixed encoding issue/crash. + 2009-05-30 Ludovic Marcotte * Modified SOGoCalendarComponent.m so that we diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index a11e3a2f0..cef67f63d 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -2,9 +2,10 @@ function onSearchFormSubmit() { var searchValue = $("searchValue"); + var encodedValue = encodeURI(searchValue.value); var url = (UserFolderURL - + "usersSearch?search=" + escape(searchValue.value)); + + "usersSearch?search=" + encodedValue); if (document.userFoldersRequest) { document.userFoldersRequest.aborted = true; document.userFoldersRequest.abort(); From d6f1ee5e8917d9dc5f4ff4baf05e0d950267a3f8 Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 1 Jun 2009 17:56:31 +0000 Subject: [PATCH 2/2] Reindent Monotone-Parent: e33f6361448cdae2cc2fe618e4581de983c22081 Monotone-Revision: 4460dc88c76a37f4ac0d64f2247e8e155254ca11 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-06-01T17:56:31 Monotone-Branch: ca.inverse.sogo --- SoObjects/Appointments/SOGoAppointmentFolder.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 14dc8c9ad..d24730ac4 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1545,10 +1545,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir document = [[context request] contentAsDOMDocument]; documentElement = [document documentElement]; properties = [[self _parseRequestedProperties: documentElement] - asPointersOfObjects]; + asPointersOfObjects]; [self _appendComponentProperties: properties - matchingFilters: [self _parseCalendarFilters: documentElement] - toResponse: r]; + matchingFilters: [self _parseCalendarFilters: documentElement] + toResponse: r]; [r appendContentString:@""]; free (properties);