Merge to 2.2.8

Update ChangeLog
quickfix for IE for searchInbox
2014-09-10 14:17:14 -04:00 · 2014-09-10 14:15:34 -04:00 · 2014-09-10 13:22:36 -04:00 · 2014-09-10 13:02:45 -04:00 · 2014-09-10 13:02:13 -04:00 · 2014-09-10 11:58:47 -04:00
195 changed files with 4759 additions and 3193 deletions
@@ -18,7 +18,6 @@ ADDITIONAL_INCLUDE_DIRS += \
 ADDITIONAL_LIB_DIRS += \
        -L../SoObjects/SOGo/SOGo.framework/ \
 	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
-	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
        -L/usr/local/lib

@@ -28,8 +28,13 @@
  ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
  ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
  <Location />
-    Order allow,deny
-    Allow from all
+    <IfVersion < 2.4>      
+      Order deny,allow
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
  </Location>

  <Proxy http://127.0.0.1:20000>
@@ -5,8 +5,14 @@ Alias /SOGo/WebServerResources/ \

 <Directory /usr/lib/GNUstep/SOGo/>
    AllowOverride None
-    Order deny,allow
-    Allow from all
+
+    <IfVersion < 2.4>      
+        Order deny,allow
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>

    # Explicitly allow caching of static content to avoid browser specific behavior.
    # A resource's URL MUST change in order to have the client load the new version.
@@ -1,3 +1,865 @@
+commit 69c8aa074364395a8bdf3705d74ee6a93c11d54a
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Sep 10 13:22:36 2014 -0400
+
+    quickfix for IE for searchInbox
+
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit 36b833ccb58353d36085a9fc8ca087f9684b7efb
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Sep 10 13:02:13 2014 -0400
+
+    bugFix InboxSearch IMAP query keywords
+
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit 9d6bcb00bcbae81d55fa2d5c27d3e6458d5a2bb9
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Sep 10 11:58:47 2014 -0400
+
+    Fix compilation warning
+
+M	UI/MailerUI/UIxMailEditor.m
+
+commit 1dd3dbacb50a03a6e59508d3f504754ded0e1e5b
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Sep 10 11:37:52 2014 -0400
+
+    Various fixes and improvements to the Mail module
+
+M	UI/MailerUI/English.lproj/Localizable.strings
+M	UI/MailerUI/French.lproj/Localizable.strings
+M	UI/MailerUI/Toolbars/SOGoMailFolder.toolbar
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+
+commit c441fa5b802a7920315c927479621de92937846c
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Sep 10 10:47:18 2014 -0400
+
+    Various fix and improvements to Scheduler module
+
+M	UI/Scheduler/French.lproj/Localizable.strings
+M	UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+M	UI/WebServerResources/SchedulerUI.js
+
+commit 7e297ad56c76d3c3477d66dcf0407889d1b40479
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Sep 10 10:58:46 2014 -0400
+
+    Remove spaces
+
+M	UI/WebServerResources/SchedulerUI.js
+
+commit 8eb4212f5ddc8b97c8a1cee7b5b08e2652f2b04f
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Sep 10 10:49:54 2014 -0400
+
+    Various fix and improvements to Mail module
+
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+
+commit 3ad9327d171dc48f100eb490029999e3704068ac
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Wed Sep 10 10:25:42 2014 -0400
+
+    putting test-prevent-invitations back in
+
+M	Tests/Integration/config.py.in
+D	Tests/Integration/dont-test-prevent-invitations.py
+A	Tests/Integration/test-prevent-invitations.py
+
+commit 0483794f451bf07ec6fc9b32db18b82eb962219b
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Wed Sep 10 09:20:47 2014 -0400
+
+    Updated the documentation for the release
+
+M	Documentation/SOGo Installation Guide.odt
+M	Documentation/SOGo Mozilla Thunderbird Configuration.odt
+M	Documentation/SOGo Native Microsoft Outlook Configuration.odt
+M	NEWS
+M	Version
+
+commit 3c1d6d7d898a663f826cb0a32b013f01e02656d0
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 16:03:44 2014 -0400
+
+    bugfix; UserSettings was not refresh properly after toggling threads
+
+M	UI/WebServerResources/MailerUI.js
+
+commit 1dcf631ad6e78174a43b076c804b6026b45e532a
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Sep 9 15:49:16 2014 -0400
+
+    Update translations
+
+M	NEWS
+M	SoObjects/Appointments/Catalan.lproj/Localizable.strings
+M	SoObjects/Appointments/Czech.lproj/Localizable.strings
+M	SoObjects/Appointments/Dutch.lproj/Localizable.strings
+M	SoObjects/Appointments/Hungarian.lproj/Localizable.strings
+M	SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
+M	SoObjects/Appointments/Polish.lproj/Localizable.strings
+M	SoObjects/Contacts/Catalan.lproj/Localizable.strings
+M	SoObjects/Contacts/NorwegianBokmal.lproj/Localizable.strings
+M	SoObjects/Mailer/Catalan.lproj/Localizable.strings
+M	SoObjects/Mailer/NorwegianBokmal.lproj/Localizable.strings
+M	UI/Common/Catalan.lproj/Localizable.strings
+M	UI/Common/Czech.lproj/Localizable.strings
+M	UI/Common/Dutch.lproj/Localizable.strings
+M	UI/Common/Finnish.lproj/Localizable.strings
+M	UI/Common/NorwegianBokmal.lproj/Localizable.strings
+M	UI/Common/Polish.lproj/Localizable.strings
+M	UI/Common/SpanishSpain.lproj/Localizable.strings
+M	UI/Contacts/Catalan.lproj/Localizable.strings
+M	UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
+M	UI/MailPartViewers/Catalan.lproj/Localizable.strings
+M	UI/MailPartViewers/NorwegianBokmal.lproj/Localizable.strings
+M	UI/MailerUI/Catalan.lproj/Localizable.strings
+M	UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
+M	UI/PreferencesUI/Catalan.lproj/Localizable.strings
+M	UI/PreferencesUI/Czech.lproj/Localizable.strings
+M	UI/PreferencesUI/Dutch.lproj/Localizable.strings
+M	UI/PreferencesUI/French.lproj/Localizable.strings
+M	UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+M	UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
+M	UI/PreferencesUI/Polish.lproj/Localizable.strings
+M	UI/Scheduler/Catalan.lproj/Localizable.strings
+M	UI/Scheduler/Czech.lproj/Localizable.strings
+M	UI/Scheduler/Dutch.lproj/Localizable.strings
+M	UI/Scheduler/Hungarian.lproj/Localizable.strings
+M	UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
+M	UI/Scheduler/Polish.lproj/Localizable.strings
+
+commit cbc53b3a52f435f0e1ca49c532baf9954b2da82d
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Sep 9 15:38:15 2014 -0400
+
+    Updated NEWS file
+
+M	NEWS
+
+commit 574c2457580c24482cfd560512602b901971e53e
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 15:34:04 2014 -0400
+
+    bugfix PreventInvitation; fix object parsing on a blank user
+
+M	UI/WebServerResources/UIxPreferences.js
+
+commit f3ca4ea7fca3e2f2d8434914fba0dc9e397d7e1f
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 15:29:08 2014 -0400
+
+    bugfix foldingThread; Renaming a foldername with a space was not correctly handled
+
+M	UI/MailerUI/UIxMailFolderActions.m
+
+commit e542ff56465a22767751ff3a4259ce0c5d3f2bb8
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Sep 9 15:15:56 2014 -0400
+
+    Fix for bug #1240
+
+M	NEWS
+M	UI/MainUI/SOGoUserHomePage.m
+
+commit 9daab5a9a1de1c49b79deca6bda9cc667edd78bd
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Mon Sep 8 14:58:21 2014 -0400
+
+    update NEWS file
+
+M	NEWS
+
+commit 1fb3198dbc379566e504d0423dd69f4968626564
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Sep 4 11:42:46 2014 -0400
+
+    applied comments
+
+M	SoObjects/SOGo/SOGoUserDefaults.m
+
+commit d62c50476342d50bde7536ebcc2f1bd7ed83faed
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 29 13:16:30 2014 -0400
+
+    Changed the configurable variable SOGoMailMessageCheck to a general refresh associated to the current view
+
+M	SoObjects/SOGo/SOGoDefaults.plist
+M	SoObjects/SOGo/SOGoDomainDefaults.h
+M	SoObjects/SOGo/SOGoDomainDefaults.m
+M	SoObjects/SOGo/SOGoUserDefaults.h
+M	SoObjects/SOGo/SOGoUserDefaults.m
+M	UI/PreferencesUI/Arabic.lproj/Localizable.strings
+M	UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+M	UI/PreferencesUI/Catalan.lproj/Localizable.strings
+M	UI/PreferencesUI/Czech.lproj/Localizable.strings
+M	UI/PreferencesUI/Danish.lproj/Localizable.strings
+M	UI/PreferencesUI/Dutch.lproj/Localizable.strings
+M	UI/PreferencesUI/English.lproj/Localizable.strings
+M	UI/PreferencesUI/Finnish.lproj/Localizable.strings
+M	UI/PreferencesUI/French.lproj/Localizable.strings
+M	UI/PreferencesUI/German.lproj/Localizable.strings
+M	UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+M	UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+M	UI/PreferencesUI/Italian.lproj/Localizable.strings
+M	UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
+M	UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
+M	UI/PreferencesUI/Polish.lproj/Localizable.strings
+M	UI/PreferencesUI/Russian.lproj/Localizable.strings
+M	UI/PreferencesUI/Slovak.lproj/Localizable.strings
+M	UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
+M	UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
+M	UI/PreferencesUI/Swedish.lproj/Localizable.strings
+M	UI/PreferencesUI/UIxPreferences.m
+M	UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+M	UI/PreferencesUI/Welsh.lproj/Localizable.strings
+M	UI/Templates/ContactsUI/UIxContactEditor.wox
+M	UI/Templates/MailerUI/UIxMailMainFrame.wox
+M	UI/Templates/PreferencesUI/UIxPreferences.wox
+M	UI/Templates/SchedulerUI/UIxCalMainView.wox
+M	UI/WebServerResources/ContactsUI.js
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/SchedulerUI.js
+M	UI/WebServerResources/UIxPreferences.js
+
+commit 7db526a5d968e0f0c7ad0782f8449220df722359
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 13:50:42 2014 -0400
+
+    bugfix for new user without userSettings.mail
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/WebServerResources/MailerUI.js
+
+commit 06f81a032cafe6017e328f8c8b4215119cc502a0
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 12:44:23 2014 -0400
+
+    applied comments
+
+M	UI/WebServerResources/MailerUI.js
+
+commit df42c31618611f41856bc5a2427e7b59cc899bda
+Author: Alexandre Cloutier <alexandre.cl07@gmail.com>
+Date:   Mon Sep 8 12:43:29 2014 -0400
+
+    Update NEWS file
+
+M	NEWS
+
+commit e6002c9b2a419dd12f543990fed588a07b0a88df
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Mon Sep 8 12:39:55 2014 -0400
+
+    applied comments
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/MailerUI/UIxMailFolderActions.m
+M	UI/WebServerResources/MailerUI.js
+
+commit 0c88edc61b788c5a33de2ab85fda9680deb80bc2
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Sep 4 11:09:04 2014 -0400
+
+    bugfix where an exception was raised if threadsCollapsed is undefined
+
+M	UI/WebServerResources/SOGoMailDataSource.js
+
+commit 267a689683dd435fde53dc7f442a9e9853b91305
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 29 09:30:40 2014 -0400
+
+    Applied comments
+
+M	UI/MailerUI/UIxMailFolderActions.m
+
+commit c9d1294a8aca4e66c8ef59595035e9f8b3dd35ac
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Aug 28 17:55:35 2014 -0400
+
+    Manage the collapse UIDs save in the user settings
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/MailerUI/UIxMailFolderActions.m
+
+commit 59023da7f00010c44ff026019d93009ff908d13e
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 13 18:39:33 2014 -0400
+
+    applied comments and fix bug where the folded threads were saved only after refreshing the entire page
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/WebServerResources/MailerUI.js
+
+commit c5f9dd086b78319d5e8170b62ae854a8e9d625c0
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Aug 12 17:43:01 2014 -0400
+
+    Possibility to collapsed threads with persistance
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/MailerUI/product.plist
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/SOGoDataTable.js
+M	UI/WebServerResources/SOGoMailDataSource.js
+
+commit 0bfaceb398e701379efa4be935d5c8d6ebd69313
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 12:51:59 2014 -0400
+
+    applied comments
+
+M	UI/MailerUI/UIxMailFolderActions.m
+
+commit 9a380f711c0b2bb9e7a15c561d8661a5aa975c2d
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 9 10:28:59 2014 -0400
+
+    bugfix PreventInvitation
+
+M	SoObjects/Appointments/SOGoAppointmentObject.m
+M	UI/PreferencesUI/UIxPreferences.m
+M	UI/WebServerResources/UIxPreferences.js
+
+commit 8c8e7d24a76d82cf37b19d02983e140fff177540
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Mon Sep 8 15:25:21 2014 -0400
+
+    Modified Apache's config file to handle Apache > 2.3
+
+M	Apache/SOGo-apple-ab.conf
+M	Apache/SOGo.conf
+M	NEWS
+
+commit 77c50e523250ccdceafa3fe1b1a3439e630a407e
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Mon Sep 8 14:11:42 2014 -0400
+
+    applied comments; fix errors from merge and update NEWS file
+
+M	NEWS
+M	UI/WebServerResources/MailerUI.js
+
+commit b639c2d251c48a5ab6498a81e8a40fb3f153ef84
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Sep 5 16:04:29 2014 -0400
+
+    Fixes for IE
+
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit 984e208dd938911cdb091514e8da2a3f328bedce
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Sep 5 11:01:57 2014 -0400
+
+    IE bugfixes
+
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+M	UI/WebServerResources/iefixes.css
+
+commit 606ee9780e8f8edaecfbf0f245ee114a2c31874e
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Thu Sep 4 22:36:02 2014 -0400
+
+    dont test prevent invitations
+
+A	Tests/Integration/dont-test-prevent-invitations.py
+D	Tests/Integration/test-prevent-invitations.py
+
+commit c6f82dac01545789528c524d91ac532ba04d5290
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Thu Sep 4 22:24:32 2014 -0400
+
+    catch specific exception
+
+M	Tests/Integration/webdavlib.py
+
+commit e37a603632e532d3f36588b3212575e02939a702
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Thu Sep 4 21:59:36 2014 -0400
+
+    should help some builds that might timeout
+
+M	Tests/Integration/webdavlib.py
+
+commit ca8351d1f9097793ed816c099683c3b97e87a13d
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Sep 4 10:50:03 2014 -0400
+
+    fix IE7, IE8, IE9, IE10, IE11 GUI
+
+M	UI/MailerUI/English.lproj/Localizable.strings
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+M	UI/WebServerResources/iefixes.css
+
+commit 031e4c9409abd0ce46a634d5e05db417e785faa7
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Wed Sep 3 22:43:49 2014 -0400
+
+    more of the same
+
+M	Tests/Integration/test-preferences.py
+M	Tests/Integration/test-sieve.py
+
+commit c621bbcd563a8b4306cbf59d9390f12a9a260e7c
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Wed Sep 3 22:32:46 2014 -0400
+
+    Those need the same adjustments
+
+M	Tests/Integration/test-preferences.py
+M	Tests/Integration/test-sieve.py
+
+commit 4b94a183be2887ef958931bb4848dec51ad41cbb
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Wed Sep 3 13:50:13 2014 -0400
+
+    urllib.quote needs a string
+
+M	Tests/Integration/test-prevent-invitations.py
+
+commit 32476b16cc79f113be494f6bc755d47b89a2ab85
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 2 14:31:46 2014 -0400
+
+    applied comments and fix bug when tagging msgs already tagged
+
+M	UI/MailerUI/UIxMailFolderActions.m
+M	UI/WebServerResources/MailerUI.js
+
+commit 3b65eaea0b177374abe7389a42935ccd08629910
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 2 13:42:04 2014 -0400
+
+    Tagging labels with 1 AJAX request
+
+M	UI/MailerUI/UIxMailFolderActions.m
+M	UI/MailerUI/product.plist
+M	UI/WebServerResources/MailerUI.js
+
+commit 7e26d80c77316c0869470b045a29786efccfdeb2
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Sep 2 10:11:27 2014 -0400
+
+    merge conflicts
+
+M	UI/MailerUI/UIxMailActions.m
+M	UI/MailerUI/UIxMailFolderActions.m
+M	UI/MailerUI/product.plist
+M	UI/WebServerResources/MailerUI.js
+
+commit 1af52e6d6b93bc68dc7c038ce740851fb56c88b3
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Aug 29 15:33:56 2014 -0400
+
+    Fix message labels handling
+    
+    Selecting "none" from the label submenu on a multiple selection of
+    messages is now working. When changing the label of multiple messages,
+    the display is now properly updated.
+    
+    Fixes #2902
+
+M	NEWS
+M	UI/WebServerResources/MailerUI.js
+
+commit eaf815eae62c8c7311158a34eb0b67bda2d3f9e6
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 29 14:55:21 2014 -0400
+
+    update NEWS file
+
+M	NEWS
+
+commit 9bd09cc55d08ed34745f4fa51413dc760c7114d1
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Aug 28 13:20:43 2014 -0400
+
+    add the location column
+
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit ced09628940cde92c3bb70ce96e31dd5cc973b08
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Thu Aug 28 10:43:32 2014 -0400
+
+    Added white_listed_attendee to the config file
+
+M	Tests/Integration/config.py.in
+
+commit dadad3df2a755ffcd73198d633a8eb368412b2b3
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Aug 28 09:37:49 2014 -0400
+
+    Fix some compilation warnings
+
+M	UI/Scheduler/UIxAppointmentActions.m
+M	UI/Scheduler/UIxCalMainView.m
+
+commit da184f8459a43bbe0c7f740e366cdf60baedb0ef
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 27 16:50:45 2014 -0400
+
+    bugfix#2864
+
+M	UI/WebServerResources/SchedulerUI.js
+
+commit 03152ea3d4cbf39ef8a5340e865d038bc899877f
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 27 16:01:35 2014 -0400
+
+    bugfix with DND from calendar view to calendar list
+
+M	UI/WebServerResources/SchedulerUIDnD.js
+
+commit 84a08659ecc263f1962aa138bb025308aaf41870
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 27 13:50:56 2014 -0400
+
+    bugfix where it is not possible to delete msg when mailbox is full
+
+M	UI/WebServerResources/MailerUI.js
+
+commit d749d5c2fb9a41697732eaef3f17e27e807fff55
+Author: Luc Charland <lcharland@inverse.ca>
+Date:   Wed Aug 27 13:31:49 2014 -0400
+
+    Added tests for prevent invitation and whitelist
+
+M	Tests/Integration/preferences.py
+M	Tests/Integration/test-preferences.py
+A	Tests/Integration/test-prevent-invitations.py
+
+commit 07a138e0d62ebaaea722dc91ae0be162385d74ed
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 27 12:30:33 2014 -0400
+
+    applied comments and add the possibility to resize the search inbox window
+
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+
+commit 76c9b45fd077759c888cde2941e710a9e5925577
+Author: Alexandre Cloutier <alexandre.cl07@gmail.com>
+Date:   Tue Aug 26 14:25:27 2014 -0400
+
+    update Localizable.strings
+    
+    Update the print window options strings
+
+M	UI/Scheduler/English.lproj/Localizable.strings
+
+commit 38a3b7bb4f29aa676c7af0dccde3d87973b1007e
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Tue Aug 26 13:36:42 2014 -0400
+
+    print calendars events&Tasks with colors - either borders or backgrounds
+
+M	UI/Scheduler/UIxCalListingActions.m
+M	UI/Scheduler/UIxCalViewPrint.h
+M	UI/Scheduler/UIxCalViewPrint.m
+M	UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+M	UI/WebServerResources/SchedulerUI.js
+M	UI/WebServerResources/UIxCalViewPrint.css
+M	UI/WebServerResources/UIxCalViewPrint.js
+
+commit b2b77c65d3d35d7c96986eb0f01c53783e0c6b05
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Aug 26 09:00:13 2014 -0400
+
+    Fix folders paths of "sogo-tool restore -l"
+
+M	NEWS
+M	Tools/SOGoToolRestore.m
+
+commit 6aecccf6ca26231342af1f8542dfbe28347778fc
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Mon Aug 25 13:46:35 2014 -0400
+
+    indentations
+
+M	UI/WebServerResources/UIxCalViewPrint.js
+
+commit e4a84d49202b2aa42251910dcbc1ffb8de6b498f
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Aug 25 12:15:05 2014 -0400
+
+    Fix usage of SOGoSubscriptionFolderFormat default
+
+M	NEWS
+M	SoObjects/SOGo/SOGoGCSFolder.h
+M	SoObjects/SOGo/SOGoGCSFolder.m
+
+commit 28f26ec08e7994b857c0b51551b1d5625df822b3
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Aug 25 10:16:10 2014 -0400
+
+    Fix display of users with no possible subscription
+
+M	NEWS
+M	UI/WebServerResources/UIxContactsUserFolders.js
+
+commit 74bd96e5a635cefd963315db2fef5199eeba14c4
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Aug 25 10:12:09 2014 -0400
+
+    Fix encoding of new calendars + new subscriptions
+
+M	NEWS
+M	UI/WebServerResources/SchedulerUI.js
+
+commit e044476772b304e307f7853906996282f9b0eb93
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 15 13:41:30 2014 -0400
+
+    bugFix #2827
+
+M	UI/WebServerResources/ContactsUI.js
+
+commit c76cb3646122e43e6b1cb2dfa6e64a88da85d605
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 15 13:06:46 2014 -0400
+
+    Disable the search button on toolbar once it is opened
+
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit 73fcdc230615da8ac22281397f4ba692a4a7cdc8
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Fri Aug 15 11:41:37 2014 -0400
+
+    adjust css for other browser, fix display bug
+
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/tablekit.js
+
+commit b9dd1ddc5ae215b1b1c888ee9538b8036fbf9208
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Fri Aug 15 09:57:19 2014 -0400
+
+    Fix for bug #2892
+
+M	NEWS
+M	UI/Common/UIxFolderActions.m
+
+commit 8783f09a4acca298fc3a9f533feb2dda5590db36
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Aug 14 15:01:40 2014 -0400
+
+    fix leak
+
+M	UI/MailerUI/UIxMailSearch.m
+
+commit 52476251b82ed0c172bc143a0642ae223d306b6e
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Thu Aug 14 14:49:44 2014 -0400
+
+    applied comments, fix bug and add sortable results
+
+M	UI/MailerUI/UIxMailListActions.m
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit f6c7ca33797bfd0e00a6b1f4e85f6b7de1ae9889
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 13 17:41:58 2014 -0400
+
+    applied comments
+
+M	UI/MailerUI/English.lproj/Localizable.strings
+M	UI/MailerUI/UIxMailListActions.m
+M	UI/MailerUI/UIxMailSearch.m
+M	UI/WebServerResources/UIxMailSearch.js
+
+commit c3e46e4bafd6e26ec417927f10cf0c88180b7786
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Mon Aug 11 09:25:09 2014 -0400
+
+    code refactoring and GUI improvement
+
+M	UI/MailerUI/UIxMailListActions.m
+M	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/UIxMailSearch.css
+M	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+
+commit 7794d716b983992251492f26bcf3ff07edbd3b5a
+Author: Alexandre Cloutier <acloutier@inverse.ca>
+Date:   Wed Aug 6 14:49:36 2014 -0400
+
+    version 1 of the inbox search
+
+M	UI/MailerUI/GNUmakefile
+M	UI/MailerUI/Toolbars/SOGoMailFolder.toolbar
+M	UI/MailerUI/UIxMailListActions.m
+M	UI/MailerUI/UIxMailMainFrame.m
+A	UI/MailerUI/UIxMailSearch.h
+A	UI/MailerUI/UIxMailSearch.m
+M	UI/MailerUI/product.plist
+M	UI/Templates/MailerUI/UIxMailMainFrame.wox
+A	UI/Templates/MailerUI/UIxMailSearch.wox
+M	UI/WebServerResources/MailerUI.js
+M	UI/WebServerResources/SOGoDataTable.js
+M	UI/WebServerResources/SOGoMailDataSource.js
+A	UI/WebServerResources/UIxMailSearch.css
+A	UI/WebServerResources/UIxMailSearch.js
+M	UI/WebServerResources/generic.css
+M	UI/WebServerResources/generic.js
+
+commit 5b886e5c4dab6bdf486f937df8bb234c4902f50c
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Aug 1 12:26:53 2014 -0400
+
+    Fix issue with DnD of tasks with FireFox
+
+M	UI/WebServerResources/SchedulerUI.js
+
+commit cde1db93245c8bdfbf8e69ed8efe8a0f6a03027c
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Fri Aug 1 09:40:45 2014 -0400
+
+    Refactored GCSFolder: -writeContent and fixed sogo-tool restore
+
+M	SOPE/GDLContentStore/GCSFolder.h
+M	SOPE/GDLContentStore/GCSFolder.m
+M	SoObjects/Contacts/SOGoContactGCSFolder.h
+M	SoObjects/SOGo/SOGoContentObject.m
+M	Tools/SOGoToolRestore.m
+
+commit f43341c1005d3d5813c23133071c253c753bb3e9
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Thu Jul 31 16:19:49 2014 -0400
+
+    Fixed JSON'ification of the admin module
+
+M	UI/WebServerResources/AdministrationUI.js
+
+commit b05fcc7d82395fe2d988567c36d213aa1c6cfeae
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Wed Jul 30 14:51:00 2014 -0400
+
+    Fat commit to refactor the quick record generation
+
+M	ActiveSync/common.make
+M	GNUmakefile
+M	Main/GNUmakefile.preamble
+M	NEWS
+D	OGoContentStore/COPYING
+D	OGoContentStore/GNUmakefile
+D	OGoContentStore/GNUmakefile.postamble
+D	OGoContentStore/GNUmakefile.preamble
+D	OGoContentStore/OCSContactFieldExtractor.m
+D	OGoContentStore/OCSiCalFieldExtractor.h
+D	OGoContentStore/OCSiCalFieldExtractor.m
+D	OGoContentStore/README
+D	OGoContentStore/Version
+D	OGoContentStore/appointment-oracle.ocs
+D	OGoContentStore/appointment.ocs
+D	OGoContentStore/contact-oracle.ocs
+D	OGoContentStore/contact.ocs
+D	OGoContentStore/iCalRepeatableEntityObject+OCS.h
+D	OGoContentStore/iCalRepeatableEntityObject+OCS.m
+D	OGoContentStore/misc/iNetOrgPerson.txt
+D	OGoContentStore/misc/icaltest.ical
+D	OGoContentStore/misc/test1/GNUmakefile
+D	OGoContentStore/misc/test1/common.h
+D	OGoContentStore/misc/test1/test1.m
+M	OpenChange/GNUmakefile
+M	OpenChange/MAPIStoreContactsMessage.m
+M	OpenChange/MAPIStoreTasksMessage.m
+D	SOPE/GDLContentStore/GCSFieldExtractor.h
+D	SOPE/GDLContentStore/GCSFieldExtractor.m
+M	SOPE/GDLContentStore/GCSFolder.h
+M	SOPE/GDLContentStore/GCSFolder.m
+M	SOPE/GDLContentStore/GCSFolderManager.m
+M	SOPE/GDLContentStore/GCSFolderType.h
+M	SOPE/GDLContentStore/GCSFolderType.m
+M	SOPE/GDLContentStore/GNUmakefile
+A	SOPE/GDLContentStore/GNUmakefile.postamble
+A	SOPE/GDLContentStore/appointment-oracle.ocs
+A	SOPE/GDLContentStore/appointment.ocs
+A	SOPE/GDLContentStore/contact-oracle.ocs
+A	SOPE/GDLContentStore/contact.ocs
+M	SoObjects/Appointments/SOGoAppointmentFolder.m
+M	SoObjects/Appointments/SOGoAppointmentObject.h
+M	SoObjects/Appointments/SOGoAppointmentObject.m
+M	SoObjects/Appointments/SOGoCalendarComponent.h
+M	SoObjects/Appointments/SOGoCalendarComponent.m
+M	SoObjects/Appointments/SOGoComponentOccurence.m
+M	SoObjects/Appointments/SOGoTaskObject.h
+M	SoObjects/Appointments/SOGoTaskObject.m
+M	SoObjects/Appointments/SOGoWebAppointmentFolder.h
+M	SoObjects/Appointments/SOGoWebAppointmentFolder.m
+M	SoObjects/Appointments/iCalCalendar+SOGo.m
+M	SoObjects/Appointments/iCalEntityObject+SOGo.h
+M	SoObjects/Appointments/iCalEntityObject+SOGo.m
+M	SoObjects/Appointments/iCalEvent+SOGo.h
+M	SoObjects/Appointments/iCalEvent+SOGo.m
+M	SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h
+M	SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+M	SoObjects/Appointments/iCalToDo+SOGo.h
+M	SoObjects/Appointments/iCalToDo+SOGo.m
+M	SoObjects/Contacts/NGVCard+SOGo.m
+M	SoObjects/Contacts/NGVList+SOGo.h
+M	SoObjects/Contacts/NGVList+SOGo.m
+M	SoObjects/Contacts/SOGoContactGCSEntry.m
+M	SoObjects/Contacts/SOGoContactGCSList.m
+M	SoObjects/Contacts/SOGoContactLDIFEntry.m
+M	SoObjects/Mailer/SOGoDraftObject.m
+M	SoObjects/SOGo/GNUmakefile.preamble
+M	SoObjects/SOGo/SOGoContentObject.h
+M	SoObjects/SOGo/SOGoContentObject.m
+M	SoObjects/common.make
+M	Tests/Integration/GNUmakefile.preamble
+M	Tests/Unit/GNUmakefile
+M	Tools/GNUmakefile.preamble
+M	Tools/SOGoToolRestore.m
+M	UI/Contacts/UIxContactFolderActions.m
+M	UI/Contacts/UIxListEditor.m
+M	UI/MailPartViewers/UIxMailPartICalActions.m
+M	UI/Scheduler/UIxComponentEditor.m
+M	UI/Scheduler/UIxTaskEditor.m
+M	UI/common.make
+M	packaging/debian-multiarch/sogo.overrides
+M	packaging/debian/sogo.overrides
+M	packaging/rhel/sogo.spec
+
+commit 07324e56a0ab257334d4d4a67ed52ce8f1a844d9
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Jul 30 11:16:35 2014 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit 397a36cc89f0160bc84ba19b2f7adc2b96a6a5c1
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Wed Jul 30 11:16:10 2014 -0400
@@ -6,7 +6,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
 SUBPROJECTS = \
 	SOPE/NGCards \
 	SOPE/GDLContentStore \
-	OGoContentStore	\
 	SoObjects	\
 	Main		\
 	UI		\
@@ -10,14 +10,12 @@ ADDITIONAL_INCLUDE_DIRS += \

 ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework  \
-	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/

 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib

 $(SOGOD)_TOOL_LIBS += \
 	-lSOGo			\
-	-lOGoContentStore	\
 	-lGDLContentStore	\
 	-lGDLAccess		\
 	-lWEExtensions		\
@@ -1,3 +1,34 @@
+2.2.8 (2014-09-10)
+------------------
+
+New features
+ - new user settings for threads collapsing
+ - IMAP global search support (#2670)
+
+Enchancements
+ - major refactoring of the GCS component saving code (dropped OGoContentStore)
+ - printing calendars in colors is now possible in all views; list, daily, weekly and multicolumns
+ - new option to print calendars events and tasks with a background color or with a border color
+ - labels tagging only make one AJAX call for all the selected messages instead of one AJAX call per message  
+ - new option to print calendars events and tasks with a background color or with a border color  
+ - all modules can now be automatically refreshed 
+ - new configurable user defaults variables; SOGoRefreshViewCheck & SOGoRefreshViewIntervals. SOGoMailMessageCheck has
+   been replaced by SOGoRefreshViewCheck and SOGoMailPollingIntervals has been replaced by SOGoRefreshViewIntervals
+ - updated Catalan, Czech, Dutch, Finnish, French, Hungarian, Norwegian, and Polish translations
+
+Bug fixes
+ - fixed crasher when subscribing users to resources (#2892)
+ - fixed encoding of new calendars and new subscriptions (JavaScript only)
+ - fixed display of users with no possible subscription
+ - fixed usage of SOGoSubscriptionFolderFormat domain default when the folder's name hasn't been changed
+ - fixed "sogo-tool restore -l" that was returning incorrect folder IDs
+ - fixed Can not delete mail when over quota (#2812)
+ - fixed Events and tasks cannot be moved to other calendars using drag&drop (#2759)
+ - fixed In "Multicolumn Day View" mouse position is not honored when creating an event (#2864)
+ - fixed handling of messages labels (#2902)
+ - fixed Apache > 2.3 configuration
+ - fixed freebusy retrieval during timezone changes (#1240)
+
 2.2.7 (2014-07-30)
 ------------------

@@ -1,482 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-    MA 02111-1307, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
@@ -1,34 +0,0 @@
-# GNUstep makefile
-
-include ../config.make
-include $(GNUSTEP_MAKEFILES)/common.make
-include ./Version
-
-LIBRARY_NAME = libOGoContentStore
-
-TYPEMODELS_DIR = $(SOGO_TYPEMODELS)
-
-libOGoContentStore_HEADER_FILES_DIR         = .
-libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore
-libOGoContentStore_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-
-ADDITIONAL_INCLUDE_DIRS += -I../SOPE
-ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj
-
-libOGoContentStore_OBJC_FILES +=		\
-	OCSiCalFieldExtractor.m			\
-	OCSContactFieldExtractor.m		\
-
-libOGoContentStore_TYPEMODELS += \
-	appointment.ocs	\
-	contact.ocs \
-	appointment-oracle.ocs \
-	contact-oracle.ocs
-
-include GNUmakefile.preamble
-ifneq ($(FHS_INSTALL_ROOT),)
-GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
-endif
-include $(GNUSTEP_MAKEFILES)/library.make
-include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
@@ -1,32 +0,0 @@
-# compilation settings
-
-libOGoContentStore_LIBRARIES_DEPEND_UPON += \
-	-lGDLContentStore	\
-	-lGDLAccess	\
-	-lNGCards	\
-	-lNGExtensions	\
-	-lEOControl	\
-	-lSaxObjC	\
-	$(BASE_LIBS)
-
-ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects
-
-ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -L../SoObjects/SOGo/SOGo.framework/
-
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-
-ifeq ($(FOUNDATION_LIB),apple)
-libOGoContentStore_PREBIND_ADDR="0xC7700000"
-libOGoContentStore_LDFLAGS += -seg1addr $(libOGoContentStore_PREBIND_ADDR)
-endif
-
-test_quick_extract_TOOL_LIBS += \
-	-lEOControl		\
-	-lSaxObjC		\
-	-lDOM			\
-	-lNGExtensions		\
-	-lNGCards		\
-	-lGDLContentStore	\
-	-lGDLAccess		\
-	-lOGoContentStore       \
-	$(BASE_LIBS)
@@ -1,136 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <NGExtensions/NSNull+misc.h>
-#import <NGExtensions/NSObject+Logs.h>
-
-#import <GDLContentStore/GCSFieldExtractor.h>
-#import <NGCards/NGVCard.h>
-#import <NGCards/NGVList.h>
-
-#import <SOGo/NSArray+Utilities.h>
-
-@interface OCSContactFieldExtractor : GCSFieldExtractor
-@end
-
-@implementation OCSContactFieldExtractor
-
- (NSMutableDictionary *) extractQuickFieldsFromVCard: (NGVCard *) vCard
-{
-  NSMutableDictionary *fields;
-  NSArray *values;
-  CardElement *element;
-  NSString *value;
-
-  fields = [NSMutableDictionary dictionaryWithCapacity: 16];
-
-  value = [vCard fn];
-  if (value)
-    [fields setObject: value forKey: @"c_cn"];
-  element = [vCard n];
-  [fields setObject: [element flattenedValueAtIndex: 0 forKey: @""]
-             forKey: @"c_sn"];
-  [fields setObject: [element flattenedValueAtIndex: 1 forKey: @""]
-             forKey: @"c_givenName"];
-  value = [vCard preferredTel];
-  if (value)
-    [fields setObject: value forKey: @"c_telephonenumber"];
-  value = [vCard preferredEMail];
-  if (![value isNotNull])
-    value = @"";
-  [fields setObject: value forKey: @"c_mail"];
-  element = [vCard org];
-  [fields setObject: [element flattenedValueAtIndex: 0 forKey: @""]
-             forKey: @"c_o"];
-  [fields setObject: [element flattenedValueAtIndex: 1 forKey: @""]
-             forKey: @"c_ou"];
-  element = [vCard preferredAdr];
-  if (element && ![element isVoid])
-    [fields setObject: [element flattenedValueAtIndex: 3
-                                               forKey: @""]
-               forKey: @"c_l"];
-  value = [[vCard uniqueChildWithTag: @"X-AIM"] flattenedValuesForKey: @""];
-  [fields setObject: value forKey: @"c_screenname"];
-  values = [[vCard categories] trimmedComponents];
-  if ([values count] > 0)
-    [fields setObject: [values componentsJoinedByString: @","]
-               forKey: @"c_categories"];
-  else
-    [fields setObject: [NSNull null] forKey: @"c_categories"];
-  [fields setObject: @"vcard" forKey: @"c_component"];
-
-  return fields;
-}
-
- (NSMutableDictionary *) extractQuickFieldsFromVList: (NGVList *) vList
-{
-  NSMutableDictionary *fields;
-  NSString *value;
-
-  fields = [NSMutableDictionary dictionaryWithCapacity: 1];
-
-  value = [vList fn];
-  if (value)
-    [fields setObject: value forKey: @"c_cn"];
-  [fields setObject: @"vlist" forKey: @"c_component"];
-
-  return fields;
-}
-
- (NSMutableDictionary *) extractQuickFieldsFromContent: (NSString *) content
-{
-  NSMutableDictionary *fields;
-  NGVCard *vCard;
-  NGVList *vList;
-  NSString *upperContent;
-
-  fields = nil;
-  if ([content length] > 0)
-    {
-      upperContent = [content uppercaseString];
-      if ([upperContent hasPrefix: @"BEGIN:VCARD"])
-	{
-	  vCard = [NGVCard parseSingleFromSource: content];
-	  if (vCard)
-	    fields = [self extractQuickFieldsFromVCard: vCard];
-	  else
-	    [self errorWithFormat: @"Could not parse VCARD content."];
-	}
-      else if ([upperContent hasPrefix: @"BEGIN:VLIST"])
-	{
-	  vList = [NGVList parseSingleFromSource: content];
-	  if (vList)
-	    fields = [self extractQuickFieldsFromVList: vList];
-	  else
-	    [self errorWithFormat: @"Could not parse VLIST content."];
-	}
-      else
-	[self errorWithFormat: @"Content is unknown."];
-    }
-  else
-    [self errorWithFormat: @"Content is empty."];
-
-  return fields;
-}
-
-@end /* OCSContactFieldExtractor */
@@ -1,35 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#ifndef __OGoContentStore_OCSiCalFieldExtractor_H__
-#define __OGoContentStore_OCSiCalFieldExtractor_H__
-
-#include <GDLContentStore/GCSFieldExtractor.h>
-
-@interface OCSiCalFieldExtractor : GCSFieldExtractor
-{
-}
-
-+ (id)sharedICalFieldExtractor;
-
-@end
-
-#endif /* __OGoContentStore_OCSiCalFieldExtractor_H__ */
@@ -1,96 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with SOGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-
-#import <NGExtensions/NSNull+misc.h>
-#import <NGExtensions/NSObject+Logs.h>
-#import <NGCards/iCalCalendar.h>
-
-#import <SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.h>
-
-#import "OCSiCalFieldExtractor.h"
-
-@implementation OCSiCalFieldExtractor
-
-+ (id) sharedICalFieldExtractor
-{
-  static OCSiCalFieldExtractor *extractor = nil;
-
-  if (!extractor)
-    extractor = [self new];
-
-  return extractor;
-}
-
-/* operations */
-
- (CardGroup *) firstElementFromCalendar: (iCalCalendar *) ical
-{
-  NSArray *elements;
-  CardGroup *element;
-  unsigned int count;
- 
-  elements = [ical allObjects];
-  count = [elements count];
-  if (count)
-    element = [elements objectAtIndex: 0];
-  else
-    {
-      [self logWithFormat: @"ERROR: given calendar contains no elements: %@", ical];
-      element = nil;
-    }
-
-  return element;
-}
-
- (NSMutableDictionary *) extractQuickFieldsFromContent: (NSString *) _content
-{
-  NSMutableDictionary *fields;
-  id cal;
-
-  fields = nil;
- 
-  if ([_content length])
-    {
-      cal = [iCalCalendar parseSingleFromSource: _content];
-      if (cal)
-	{
-	  if ([cal isKindOfClass: [iCalCalendar class]])
-	    cal = [self firstElementFromCalendar: cal];
-
-	  if ([cal isKindOfClass: [iCalRepeatableEntityObject class]])
-	    fields = [cal quickRecord];
-	  else if ([cal isNotNull])
-	    [self logWithFormat: @"ERROR: unexpected iCalendar parse result: %@",
-		  cal];
-	}
-      else
-	[self logWithFormat: @"ERROR: parsing source didn't return anything"];
-    }
-
-  return fields;
-}
-
-@end /* OCSiCalFieldExtractor */
@@ -1,144 +0,0 @@
-Storage Backend
-===============
-
-The storage backend implements the "low level" folder abstraction, which is
-basically an arbitary "BLOB" containing some document. The feature is that
-we extract "quick access" / "searchable" attributes from the document content.
-
-Further it contains the "folder management" API, as named folders can be stored
-in different databases.
-Note: we need a way to tell where "new" folders should be created
-Note: to sync with LDAP we need to periodically delete or archive old folders
-
-Folders have associated a type (like 'calendar') which defines the query
-attributes and serialization format.
-
-TODO
-====
- hierarchies deeper than 4 (properly filter on path in OCS)
-
-Open Questions
-==============
-
-System-meta-data in the blob-table or in the quick-table?
- master data belongs into the blob table
- could be regular 'NSxxx' keys to differentiate meta data from
-
-Class Hierarchy
-===============
-
-  [NSObject]
-    OCSContext                  - tracking context
-    OCSFolder                   - represents a single folder
-    OCSFolderManager            - manages folders
-    OCSFolderType               - the mapping info for a specific folder-type
-    OCSFieldInfo                - mapping info for one 'quick field'
-    OCSChannelManager           - maintains EOAdaptorChannel objects
-
-  TBD:
-  - field 'extractor'
-  - field 'value' (eg array values for participants?)
-  - BLOB archiver/unarchiver
-
-Defaults
-========
-
-  OCSFolderInfoURL - the DB URL where the folder-info table is located
-    eg: http://OGo:OGo@localhost/test/folder_info
-
-  OCSFolderManagerDebugEnabled      - enable folder-manager debug logs
-  OCSFolderManagerSQLDebugEnabled   - enable folder-manager SQL gen debug logs
-
-  OCSChannelManagerDebugEnabled     - enable channel debug pooling logs
-  OCSChannelManagerPoolDebugEnabled - debug pool handle allocation
-  
-  OCSChannelExpireAge       - if that age in seconds is exceeded, a channel 
-                              will be removed from the pool
-  OCSChannelCollectionTimer - time in seconds. each n-seconds the pool will be
-			      checked for channels too old
-  
-  [PGDebugEnabled] - enable PostgreSQL adaptor debugging
-
-URLs
-====
-
-  "Database URLs"
-  
-  We use the schema:
-    postgresql://[user]:[password]@[host]:[port]/[dbname]/[tablename]
-
-BLOB Formats
-============
-
- TBD
- iCal, XML
- problem with iCal is that a complete and valid iCal file is different from
-  just the vevent. so we basically need to parse those files in any case.
- XML: the iCal SaxDriver reports XML events, so we can easily store that as 
-  XML
- we need to parse the BLOB for different clients anyway (iCal != iCal ...)
- XML: we could use some XML query extension to PG in the future?
-
-Update: we now have OCSiCalFieldExtractor
-  - it parses the BLOB as an iCalendar file and extracts a set of fixed
-    keys:
-    - title        - plain copy of "summary"
-    - uid          - plain copy
-    - startdate    - date as utime
-    - enddate      - date as utime
-    - participants - CNs of attendees separated by comma ", "
-    - location
-    - partmails
-    - sequence
-    - TBD: iscyclic
-    - TBD: isallday
-    - TBD: cycles  - I guess the client should fetch the BLOB to resolve
-  - the field extractor is accessed by OCSFolder using the folderinfo:
-    extractor = [self->folderInfo quickExtractor];
-    quickRow  = [extractor extractQuickFieldsFromContent:_content];
-
-Support Tools
-=============
-
- tools we need:
-  - one to recreate a quick table based on the blob table
-
-Notes
-=====
-
- need to use http:// URLs for connect info, until generic URLs in 
-  libFoundation are fixed (the parses breaks on the login/password parts)
-
-QA
-==
-
-Q: Why do we use two tables, we could store the quick columns in the blob?
-==
-They could be in the same table. I considered using separate tables since the 
-quick table is likely to be recreated now and then if BLOB indexing 
-requirements change.
-Actually one could even use different _quick tables which share a common BLOB 
-table.
-(a quick table is nothing more than a database index and like with DB indexes 
- multiple ones for different requirements can make sense).
-
-Further it might improve caching behaviour for row based caches (the quick 
-table is going to be queried much more often) - not sure whether this is 
-relevant with PostgreSQL, probably not?
-
-Q: Can we use a VARCHAR primary key?
-==
-I asked in the postgres IRC channel and apparently the performance penalty of
-string primary keys isn't big.
-We could also use an 'internal' int sequence in addition (might be useful for
-supporting ZideLook)
-Motivation: the 'iCalendar' ID is a string and usually looks like a GUID.
-
-Q: Why using VARCHAR instead of TEXT in the BLOB?
-==
-To quote PostgreSQL documentation:
-"There are no performance differences between these three types, apart from 
- the increased storage size when using the blank-padded type."
-So varchar(xx) is just a large TEXT. Since we intend to store mostly small
-snippets of data (tiny XML fragments), I considered VARCHAR the more 
-appropriate type.
@@ -1,14 +0,0 @@
-# Version file
-
-MAJOR_VERSION=0
-MINOR_VERSION=9
-SUBMINOR_VERSION:=33
-
-# v0.9.30 requires libNGiCal          v4.5.48
-# v0.9.26 requires libGDLContentStore v4.5.26
-# v0.9.19 requires libNGiCal          v4.5.40
-# v0.9.18 requires libNGiCal          v4.5.38
-# v0.9.17 requires libNGiCal          v4.5.37
-# v0.9.11 requires libFoundation      v1.0.63
-# v0.9.11 requires libNGExtensions    v4.3.125
-# v0.9.7  requires libGDLAccess       v1.1.35
@@ -1,35 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: iCalRepeatableEntityObject+OCS.h 617 2005-03-01 17:08:11Z znek $
-
-
-#ifndef	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
-#define	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
-
-#include <NGCards/NGCards.h>
-
-@interface iCalRepeatableEntityObject (OCS)
-
- (NSString *)cycleInfo;
-
-@end
-
-#endif	/* __OGoContentStore_iCalRepeatableEntityObject_OCS_H_ */
@@ -1,29 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-
-#import "iCalRepeatableEntityObject+OCS.h"
-
-@implementation iCalRepeatableEntityObject (OCS)
-
-@end
@@ -1,108 +0,0 @@
-http://www.faqs.org/rfcs/rfc2798.html
-
-Class
-    NAME 'inetOrgPerson'
-    SUP organizationalPerson
-    STRUCTURAL
-    MAY (
-        audio $ businessCategory $ carLicense $ departmentNumber $
-        displayName $ employeeNumber $ employeeType $ givenName $
-        homePhone $ homePostalAddress $ initials $ jpegPhoto $
-        labeledURI $ mail $ manager $ mobile $ o $ pager $
-        photo $ roomNumber $ secretary $ uid $ userCertificate $
-        x500uniqueIdentifier $ preferredLanguage $
-        userSMIMECertificate $ userPKCS12
-    )
-    MUST (
-        cn $ objectClass $ sn
-    )
-    MAY (
-        description $ destinationIndicator $ facsimileTelephoneNumber $
-        internationaliSDNNumber $ l $ ou $ physicalDeliveryOfficeName $
-        postalAddress $ postalCode $ postOfficeBox $
-        preferredDeliveryMethod $ registeredAddress $ seeAlso $
-        st $ street $ telephoneNumber $ teletexTerminalIdentifier $
-        telexNumber $ title $ userPassword $ x121Address
-    )
-
-Properties (inetOrgPerson + organizationalPerson)
-	businessCategory 
-	carLicense 
-	departmentNumber
-	destinationIndicator 
-	employeeNumber 
-	employeeType 
-	facsimileTelephoneNumber
-	givenName
-	homePostalAddress 
-	initials 
-	jpegPhoto
-	l 
-	mail 
-	manager 
-	mobile 
-	o 
-	objectClass 
-	ou 
-	pager
-	physicalDeliveryOfficeName
-	postOfficeBox
-	postalCode 
-	preferredLanguage
-	registeredAddress 
-	roomNumber 
-	secretary 
-	seeAlso
-	sn
-	street 
-	telephoneNumber 
-	teletexTerminalIdentifier
-	title 
-	uid 
-	userCertificate
-	userPKCS12
-	userPassword 
-	x121Address
-        audio 
-        cn 
-        description 
-        displayName 
-        homePhone 
-        internationaliSDNNumber 
-        labeledURI 
-        photo 
-        postalAddress 
-        preferredDeliveryMethod 
-        st 
-        telexNumber 
-        userSMIMECertificate 
-        x500uniqueIdentifier 
-
-Sample:
-   version:           1
-   dn:                cn=Barbara Jensen,ou=Product Development,dc=siroe,dc=com
-   objectClass:       top
-   objectClass:       person
-   objectClass:       organizationalPerson
-   objectClass:       inetOrgPerson
-   cn:                Barbara Jensen
-   cn:                Babs Jensen
-   displayName:       Babs Jensen
-   sn:                Jensen
-   givenName:         Barbara
-   initials:          BJJ
-   title:             manager, product development
-   uid:               bjensen
-   mail:              bjensen@siroe.com
-   telephoneNumber:   +1 408 555 1862
-   facsimileTelephoneNumber: +1 408 555 1992
-   mobile:            +1 408 555 1941
-   roomNumber:        0209
-   carLicense:        6ABC246
-   o:                 Siroe
-   ou:                Product Development
-   departmentNumber:  2604
-   employeeNumber:    42
-   employeeType:      full time
-   preferredLanguage: fr, en-gb;q=0.8, en;q=0.7
-   labeledURI:        http://www.siroe.com/users/bjensen My Home Page
@@ -1,30 +0,0 @@
-BEGIN:VEVENT
-DURATION:PT1H
-ATTENDEE;CN="Elke Bethke";DIR="addressbook://B156F3F0-9CFD-11D8-8561-000
- D93C1A604:ABPerson":mailto:E.Bethke@Sachsen-Anhalt-Lotto.de
-ATTENDEE;CN="Erik Doernenburg";DIR="addressbook://B15FCB0F-9CFD-11D8-8561
- -000D93C1A604:ABPerson":mailto:erik@x101.net
-ATTENDEE;CN="Christian Schnelle";DIR="addressbook://B1418D4E-9CFD-11D8-8
- 561-000D93C1A604:ABPerson":mailto:cs@enervation.de
-ATTENDEE;CN="Chris Herrenberger";DIR="addressbook://B14A390C-9CFD-11D8-8
- 561-000D93C1A604:ABPerson":invalid:nomail
-ATTENDEE;CN="Horst Parplies";DIR="addressbook://B19B47E5-9CFD-11D8-8561-
- 000D93C1A604:ABPerson":mailto:horst.parplies@freenet.de
-ATTENDEE;CN="Imdat Solak";DIR="addressbook://B19EDB62-9CFD-11D8-8561-000
- D93C1A604:ABPerson":mailto:imdat@solak.de
-ATTENDEE;CN="Jens Enders";DIR="addressbook://B1B6819F-9CFD-11D8-8561-000
- D93C1A604:ABPerson":mailto:jens.enders@skyrix.com
-ATTENDEE;CN="Jens Muenster";DIR="addressbook://B1BBA42E-9CFD-11D8-8561-00
- 0D93C1A604:ABPerson":mailto:jens.muenster@skyrix.com
-ATTENDEE;CN="Laurent Pierre";DIR="addressbook://9337C270-A825-11D8-B930-
- 000D93C1A604:ABPerson":mailto:laurent.pierre@linagora.com
-ATTENDEE;CN="Marcel Weiher";DIR="addressbook://B1F9BB12-9CFD-11D8-8561-0
- 00D93C1A604:ABPerson":mailto:marcel@metaobject.co
-DTSTAMP:20040520T140002Z
-UID:BD91C454-AA65-11D8-84CA-000D93C1A604
-SEQUENCE:3
-STATUS:CONFIRMED
-DTSTART;TZID=Europe/Berlin:20040618T160000
-SUMMARY:SIZE EVENT
-X-WR-ITIPSTATUSML:UNCLEAN
-END:VEVENT
@@ -1,15 +0,0 @@
-# $Id$
-
-include $(GNUSTEP_MAKEFILES)/common.make
-
-TOOL_NAME = test
-
-test_OBJC_FILES += test1.m
-
-ADDITIONAL_TOOL_LIBS += -lOGoContentStore
-
-ADDITIONAL_LIB_DIRS += -L../../$(GNUSTEP_OBJ_DIR)
-
-include GNUmakefile.preamble
-include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
@@ -1,3 +0,0 @@
-// $Id$
-
-#import <Foundation/Foundation.h>
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-static void testurl(NSString *s) {
-  NSURL *url;
-  
-  url = [NSURL URLWithString:s];
-  NSLog(@"url: %@", url);
-  NSLog(@"  login: %@", [url user]);
-  NSLog(@"  pwd:   %@", [url password]);
-}
-
-static void test(void) {
-  testurl(@"http://OGoUser:OGoPwd@localhost/OGo");
-  testurl(@"postgresql://OGoUser:OGoPwd@localhost/OGo");
-}
-
-int main(int argc, char **argv, char **env) {
-  NSAutoreleasePool *pool;
-
-  pool = [[NSAutoreleasePool alloc] init];
-#if LIB_FOUNDATION_LIBRARY  
-  [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
-#endif
-
-  test();
-
-  [pool release];
-  return 0;
-}
@@ -137,7 +137,6 @@ $(DBMSGREADER_TOOL)_OBJC_FILES += \

 $(DBMSGREADER_TOOL)_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
-	-L../OGoContentStore/obj/ -lOGoContentStore \
 	-L../SOPE/GDLContentStore/obj/ -lGDLContentStore \
 	-L../SOPE/NGCards/obj/ -lNGCards \
 	-lNGObjWeb
@@ -166,7 +165,6 @@ $(MAPISTORESOGO)_LIB_DIRS += \
 	$(LIBMAPISTORE_LIBS)

 $(SOGOBACKEND)_LIB_DIRS += \
-        -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
 	$(LIBMAPI_LIBS) \
 	$(LIBMAPISTORE_LIBS)
@@ -1200,7 +1200,7 @@ fromProperties: (NSDictionary *) attachmentProps
  //
  // we save the new/modified card
  //
-  [sogoObject saveContentString: [newCard versitString]];
+  [sogoObject saveComponent: newCard];

  [self updateVersions];
 }
@@ -513,7 +513,7 @@
    }
  [vToDo setTimeStampAsDate: now];

-  [sogoObject saveContentString: [vCalendar versitString]];
+  [sogoObject saveComponent: vCalendar];

  [self updateVersions];
 }
@@ -1,37 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#ifndef __GDLContentStore_GCSFieldExtractor_H__
-#define __GDLContentStore_GCSFieldExtractor_H__
-
-#import <Foundation/NSObject.h>
-
-@class NSString, NSMutableDictionary;
-
-@interface GCSFieldExtractor : NSObject
-{
-}
-
- (NSMutableDictionary *)extractQuickFieldsFromContent:(NSString *)_content;
-
-@end
-
-#endif /* __GDLContentStore_GCSFieldExtractor_H__ */
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import "GCSFieldExtractor.h"
-
-@implementation GCSFieldExtractor
-
- (NSMutableDictionary *)extractQuickFieldsFromContent:(NSString *)_content {
-  return nil;
-}
-
-@end /* GCSFieldExtractor */
@@ -117,10 +117,11 @@
 - (NSDictionary *) recordOfEntryWithName: (NSString *) name;

 - (NSException *) writeContent: (NSString *) _content
+                 fromComponent: (id) theComponent
+                     container: (id) theContainer
 			toName: (NSString *) _name
 		   baseVersion: (unsigned int *) _baseVersion;
- (NSException *) writeContent: (NSString *) _content
-			toName: (NSString *) _name;
+
 - (NSException *) deleteContentWithName: (NSString *) _name;
 - (NSException *) deleteAllContent;

@@ -1,22 +1,22 @@
 /*
  Copyright (C) 2004-2007 SKYRIX Software AG
  Copyright (C) 2007      Helge Hess
-  Copyright (c) 2008-2011 Inverse inc.
+  Copyright (c) 2008-2014 Inverse inc.

-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.

-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.

-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
  WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
  License for more details.

  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOGo; see the file COPYING.  If not, write to the
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
 */
@@ -38,7 +38,6 @@
 #import "GCSFolderManager.h"
 #import "GCSFolderType.h"
 #import "GCSChannelManager.h"
-#import "GCSFieldExtractor.h"
 #import "NSURL+GCS.h"
 #import "EOAdaptorChannel+GCS.h"
 #import "EOQualifier+GCS.h"
@@ -882,13 +881,14 @@ andAttribute: (EOAttribute *)_attribute
 }

 - (NSException *) writeContent: (NSString *) _content
-			toName: (NSString *) _name
+                 fromComponent: (id) theComponent
+                     container: (id) theContainer
+  			toName: (NSString *) _name
 		   baseVersion: (unsigned int *) _baseVersion
 {
  EOAdaptorChannel    *storeChannel, *quickChannel;
  NSMutableDictionary *quickRow, *contentRow;
  NSDictionary	      *currentRow;
-  GCSFieldExtractor   *extractor;
  NSNumber            *storedVersion;
  BOOL                isNewRecord, hasInsertDelegate, hasUpdateDelegate;
  NSCalendarDate      *nowDate;
@@ -944,8 +944,7 @@ andAttribute: (EOAttribute *)_attribute
 	      || *_baseVersion == [storedVersion unsignedIntValue])
 	    {
 	      /* extract quick info */
-	      extractor = [folderInfo quickExtractor];
-	      quickRow = [extractor extractQuickFieldsFromContent:_content];
+              quickRow = [theComponent performSelector: @selector(quickRecordForContainer:)  withObject: theContainer];
 	      if (quickRow)
 		{
 		  [quickRow setObject:_name forKey:@"c_name"];
@@ -1080,8 +1079,8 @@ andAttribute: (EOAttribute *)_attribute
 			  __PRETTY_FUNCTION__];
 		}
 	      else
-		error = [self errorExtractorReturnedNoQuickRow:extractor
-			      forContent:_content];
+                [self errorWithFormat:@"%s: could not extract quick row information",
+                      __PRETTY_FUNCTION__];
 	    }
 	  else /* version mismatch (concurrent update) */
 	    error = [self errorVersionMismatchBetweenStoredVersion:
@@ -1101,13 +1100,6 @@ andAttribute: (EOAttribute *)_attribute
  return error;
 }

-
- (NSException *)writeContent:(NSString *)_content toName:(NSString *)_name {
-  /* this method does not check for concurrent writes */
-  unsigned int v = 0;
-  return [self writeContent:_content toName:_name baseVersion:&v];
-}
-
 - (NSException *)deleteContentWithName:(NSString *)_name {
  EOAdaptorChannel *storeChannel, *quickChannel;
  EOAdaptorContext *adaptorCtx;
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2011 Inverse inc. 
+  Copyright (C) 2006-2014 Inverse inc. 
  Copyright (C) 2004-2007 SKYRIX Software AG

  This file is part of SOGo.
@@ -41,7 +41,7 @@
@class NSString, NSArray, NSDictionary;
@class EOQualifier;
@class NGResourceLocator;
-@class GCSFolder, GCSFieldExtractor;
+@class GCSFolder;

@interface GCSFolderType : NSObject
 {
@@ -50,7 +50,6 @@
  NSArray      *fields, *quickFields;  // GCSFieldInfo objects
  EOQualifier  *folderQualifier;       // to further limit the table set
  NSString     *extractorClassName;
-  GCSFieldExtractor *extractor;
 }

 + (id)folderTypeWithName:(NSString *)_type;
@@ -67,10 +66,6 @@

 - (NSString *)sqlQuickCreateWithTableName:(NSString *)_tabName;

-/* quick support */
-
- (GCSFieldExtractor *)quickExtractor;
-
 /* locator used to find .ocs files */

 + (NGResourceLocator *)resourceLocator;
@@ -1,20 +1,20 @@
 /*
  Copyright (C) 2004-2005 SKYRIX Software AG

-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.

-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.

-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
  WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
  License for more details.

  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING. If not, write to the
+  License along with SOGo; see the file COPYING. If not, write to the
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
 */
@@ -35,7 +35,6 @@
 #import "GCSFolderType.h"
 #import "GCSFolder.h"
 #import "GCSFieldInfo.h"
-#import "GCSFieldExtractor.h"

@implementation GCSFolderType

@@ -116,7 +115,6 @@

 - (void) dealloc
 {
-  [extractor release];
  [extractorClassName release];
  [blobTablePattern release];
  [quickTablePattern release];
@@ -173,36 +171,6 @@
  return sql;
 }

-/* quick support */
-
- (GCSFieldExtractor *) quickExtractor
-{
-  Class clazz;
-  GCSFieldExtractor *quickExtractor;
-
-  if (!extractor)
-    {
-      clazz = (extractorClassName
-	       ? NSClassFromString (extractorClassName)
-	       : [GCSFieldExtractor class]);
-      if (clazz)
-	{
-	  extractor = [clazz new];
-	  if (!extractor)
-	    [self logWithFormat:@"ERROR: could not create field extractor of class %@",
-		  clazz];
-	}
-      else
-	[self logWithFormat:@"ERROR: did not find field extractor class (%@)", extractorClassName];
-    }
-  if ([extractor isNotNull])
-    quickExtractor = extractor;
-  else
-    quickExtractor = nil;
- 
-  return quickExtractor;
-}
-
 - (NSArray *) quickFields
 {
  return quickFields;
@@ -31,7 +31,6 @@ libGDLContentStore_HEADER_FILES +=		\
 	GCSFolderManager.h			\
 	GCSFolderType.h				\
 	GCSChannelManager.h			\
-	GCSFieldExtractor.h			\
 	GCSSessionsFolder.h			\
 	GCSSpecialQueries.h			\
 	GCSStringFormatter.h			\
@@ -48,7 +47,6 @@ libGDLContentStore_OBJC_FILES +=		\
 	GCSFolderManager.m			\
 	GCSFolderType.m				\
 	GCSChannelManager.m			\
-	GCSFieldExtractor.m			\
 	GCSSessionsFolder.m			\
 	GCSSpecialQueries.m			\
 	GCSStringFormatter.m			\
@@ -60,6 +58,14 @@ GDLContentStore_HEADER_FILES = $(libGDLContentStore_HEADER_FILES)
 GDLContentStore_OBJC_FILES   = $(libGDLContentStore_OBJC_FILES)
 GDLContentStore_SUBPROJECTS  = $(libGDLContentStore_SUBPROJECTS)

+# Type models
+TYPEMODELS_DIR = $(SOGO_TYPEMODELS)
+
+libGDLContentStore_TYPEMODELS += \
+	appointment.ocs	\
+	contact.ocs \
+	appointment-oracle.ocs \
+	contact-oracle.ocs

 # building

@@ -3,10 +3,10 @@
 $(TYPEMODELS_DIR) :
 	$(MKDIRS) $(TYPEMODELS_DIR)

-ocs-typemodels : $(TYPEMODELS_DIR) $(libOGoContentStore_TYPEMODELS)
-	@(if [ "$(libOGoContentStore_TYPEMODELS)" != "" ]; then \
+ocs-typemodels : $(TYPEMODELS_DIR) $(libGDLContentStore_TYPEMODELS)
+	@(if [ "$(libGDLContentStore_TYPEMODELS)" != "" ]; then \
 	  echo "Copying type models into install path ..."; \
-          for ff in $(libOGoContentStore_TYPEMODELS); do \
+          for ff in $(libGDLContentStore_TYPEMODELS); do \
 	    cp $$ff $(TYPEMODELS_DIR)/$$ff; \
          done; \
 	fi)
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "Està prohibit Convidar a les següents persones:";
 "Personal Calendar" = "Calendari personal";
 vevent_class0 = "(Esdeveniment públic)";
 vevent_class1 = "(Esdeveniment privat)";
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "Pozvání následujících osob je zakázáno:";
 "Personal Calendar" = "Osobní kalendář";
 vevent_class0 = "(Veřejná událost)";
 vevent_class1 = "(Soukromá událost)";
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "De volgende personen uitnodigen is niet toegestaan:";
 "Personal Calendar" = "Persoonlijke agenda";
 vevent_class0 = "(Publieke afspraak)";
 vevent_class1 = "(Privé-afspraak)";
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "A következő személyek meghívása tilos:";
 "Personal Calendar" = "Személyes naptár";
 vevent_class0 = "(Nyilvános esemény)";
 vevent_class1 = "(Magán esemény)";
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "Invitering av følgende personer er forbudt.";
 "Personal Calendar" = "Personlig kalender";
 vevent_class0 = "(Offentlig hendelse)";
 vevent_class1 = "(Privat hendelse)";
@@ -1,3 +1,4 @@
+"Inviting the following persons is prohibited:" = "Zapraszanie następujących osób jest zakazane:";
 "Personal Calendar" = "Kalendarz osobisty";
 vevent_class0 = "(Wydarzenie publiczne)";
 vevent_class1 = "(Wydarzenie prywatne)";
@@ -983,7 +983,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 	{
          if ([dateRange containsDate: [component startDate]])
            {
-              newRecord = [self fixupRecord: [component quickRecord]];
+              newRecord = [self fixupRecord: [component quickRecordForContainer: self]];
              [ma replaceObjectAtIndex: recordIndex withObject: newRecord];
            }
          else
@@ -999,7 +999,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
    {
      // The recurrence id of the exception is outside the date range;
      // simply add the exception to the records array
-      newRecord = [self fixupRecord: [component quickRecord]];
+      newRecord = [self fixupRecord: [component quickRecordForContainer: self]];
      newRecordRange = [NGCalendarDateRange 
 			 calendarDateRangeWithStartDate: [newRecord objectForKey: @"startDate"]
 			 endDate: [newRecord objectForKey: @"endDate"]];
@@ -3034,7 +3034,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
    [content appendFormat: @"%@\n",  [timezone versitString]];
  [content appendFormat: @"%@\nEND:VCALENDAR", [event versitString]];
  
-  return ([object saveContentString: content] == nil) ? uid : nil;
+  return ([object saveCalendar: [iCalCalendar parseSingleFromSource: content]] == nil) ? uid : nil;
 }

 /**
@@ -3047,7 +3047,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
  NSArray *vtimezones;
  NSMutableArray *components;
  NSMutableDictionary *timezones, *uids;
-  NSString *tzId, *uid, *originalUid, *content;
+  NSString *tzId, *uid, *originalUid;
  iCalEntityObject *element;
  iCalDateTime *startDate;
  iCalTimeZone *timezone;
@@ -3175,8 +3175,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
                              [masterCalendar addToEvents: event];
                              if (timezone)
                                [masterCalendar addTimeZone: timezone];
-                              content = [masterCalendar versitString];
-                              [master saveContentString: content];
+                              [master saveCalendar: masterCalendar];
                              continue;
                            }
                        }
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2011 Inverse inc.
+  Copyright (C) 2007-2014 Inverse inc.

  This file is part of SOGo

@@ -187,15 +187,15 @@
  if (![theUID isEqualToString: theOwner])
    {
      SOGoAppointmentObject *attendeeObject;
-      NSString *iCalString;
+      iCalCalendar *iCalendarToSave;
      
-      iCalString = nil;
+      iCalendarToSave = nil;
      attendeeObject = [self _lookupEvent: [theEvent uid] forUID: theUID];
      
      // We must add an occurence to a non-existing event. We have
      // to handle this with care, as in the postCalDAVEventRequestTo:from:
      if ([attendeeObject isNew] && [theEvent recurrenceId])
-	      {
+        {
          iCalEvent *ownerEvent;
          iCalPerson *person;
          SOGoUser *user;
@@ -217,7 +217,7 @@
              [person setRole: @"REQ-PARTICIPANT"];
              [ownerEvent addToAttendees: person];
              
-              iCalString = [[ownerEvent parent] versitString];
+              iCalendarToSave = [ownerEvent parent];
            }
        }
      else
@@ -229,12 +229,12 @@
          // in attendee's calendar (add exception dates and remove matching
          // occurrences) -- see _updateRecurrenceIDsWithEvent:
          
-          iCalString = [[theEvent parent] versitString];
+          iCalendarToSave = [theEvent parent];
        }
      
      // Save the event in the attendee's calendar
-      if (iCalString)
-      [attendeeObject saveContentString: iCalString];
+      if (iCalendarToSave)
+        [attendeeObject saveCalendar: iCalendarToSave];
    }
 }

@@ -253,7 +253,6 @@
      iCalRepeatableEntityObject *event;
      iCalCalendar *calendar;
      NSCalendarDate *currentId;
-      NSString *calendarContent;
      NSArray *occurences;
      int max, count;
      
@@ -294,10 +293,8 @@
              
              [event increaseSequence];
              
-              // We generate the updated iCalendar file and we save it
-              // in the database.
-              calendarContent = [calendar versitString];
-              [object saveContentString: calendarContent];
+              // We save the updated iCalendar in the database.
+              [object saveCalendar: calendar];
            }
        }
    }
@@ -413,27 +410,25 @@

 // This method scans the list of attendees.
 - (NSException *) _handleAttendeeAvailability: (NSArray *) theAttendees
-                                    forEvent: (iCalEvent *) theEvent
+                                     forEvent: (iCalEvent *) theEvent
 {
  iCalPerson *currentAttendee;
-  NSMutableArray *attendees, *unavailableAttendees, *whiteList;
-  NSEnumerator *enumerator;
-  NSPredicate *predicate;
-  NSString *currentUID, *ownerUID;
-  NSMutableString *reason;
-  NSDictionary *values;
-  NSMutableDictionary *value, *moduleSettings;
  SOGoUser *user;
  SOGoUserSettings *us;
-  int count = 0, i = 0;
-  
-  
+  NSMutableArray *unavailableAttendees;
+  NSEnumerator *enumerator;
+  NSString *currentUID, *ownerUID, *whiteListString;
+  NSMutableString *reason;
+  NSDictionary *values;
+  NSMutableDictionary *value, *moduleSettings, *whiteList;
+  int i, count;
+  i = count = 0;
+
  // Build list of the attendees uids without ressources
-  attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
  unavailableAttendees = [[NSMutableArray alloc] init];
  enumerator = [theAttendees objectEnumerator];
  ownerUID = [[[self context] activeUser] login];
-  
+
  while ((currentAttendee = [enumerator nextObject]))
    {
      currentUID = [currentAttendee uid];
@@ -446,11 +441,10 @@
          if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
            {
              // Check if the user have a whiteList
-              whiteList = [NSMutableArray arrayWithObject:[moduleSettings objectForKey:@"PreventInvitationsWhitelist"]];
-              predicate = [NSPredicate predicateWithFormat:@"SELF CONTAINS[cd] %@", ownerUID];
-              [whiteList filterUsingPredicate:predicate];
+              whiteListString = [moduleSettings objectForKey:@"PreventInvitationsWhitelist"];
+              whiteList = [whiteListString objectFromJSONString];
              // If the filter have a hit, do not add the currentUID to the unavailableAttendees array
-              if ([whiteList count] == 0)
+              if (![whiteList objectForKey:ownerUID])
                {
                  values = [NSDictionary dictionaryWithObject:[user cn] forKey:@"Cn"];
                  [unavailableAttendees addObject:values];
@@ -500,7 +494,7 @@
  NSMutableArray *attendees;
  NSEnumerator *enumerator;
  NSString *currentUID;
-  SOGoUser *user, *currentUser, *ownerUser;
+  SOGoUser *user, *currentUser;
  
  // Build a list of the attendees uids
  attendees = [NSMutableArray arrayWithCapacity: [theAttendees count]];
@@ -971,7 +965,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
  iCalCalendar *calendar;
  iCalEntityObject *event;
  iCalPerson *otherAttendee, *otherDelegate;
-  NSString *iCalString, *recurrenceTime, *delegateEmail;
+  NSString *recurrenceTime, *delegateEmail;
  NSException *error;
  BOOL addDelegate, removeDelegate;

@@ -1082,10 +1076,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
            }
        }
      
-      // We generate the updated iCalendar file and we save it
-      // in the database.
-      iCalString = [[event parent] versitString];
-      error = [eventObject saveContentString: iCalString];
+      // We save the updated iCalendar in the database.
+      error = [eventObject saveCalendar: [event parent]];
    }
      
  return error;
@@ -1464,7 +1456,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
              // Over DAV, it'll be handled directly in PUTAction:
              if (![context request] || [[context request] handledByDefaultHandler]
                                     || [[[context request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
-                ex = [self saveContentString: [[event parent] versitString]];
+                ex = [self saveCalendar: [event parent]];
            }
        }
      else
@@ -2099,8 +2091,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
  // the content string and we could have etag mismatches.
  baseVersion = (isNew ? 0 : version);
      
-  ex = [self saveContentString: [calendar versitString]
-                   baseVersion: baseVersion];
+  ex = [self saveComponent: calendar
+               baseVersion: baseVersion];
      
  return ex;
 }
@@ -1,6 +1,6 @@
 /* SOGoCalendarComponent.h - this file is part of SOGo
 * 
- * Copyright (C) 2006-2013 Inverse inc.
+ * Copyright (C) 2006-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -169,6 +169,11 @@
  DESTROY(originalCalendar);
 }

+- (Class *) parsingClass
+{
+  return [iCalCalendar class];
+}
+
 - (NSString *) davContentType
 {
  return @"text/calendar";
@@ -662,7 +667,7 @@

 - (NSException *) saveCalendar: (iCalCalendar *) newCalendar
 {
-  [self saveContentString: [newCalendar versitString]];
+  [super saveComponent: newCalendar];

  return nil;
 }
@@ -1193,7 +1198,19 @@
 				 [NSString stringWithFormat: @"%@.ics", newUID]
 			       inContainer: newFolder];

-  return [newComponent saveContentString: [calendar versitString]];
+  return [newComponent saveCalendar: calendar];
+}
+
+- (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
+{
+  NSException *ex;
+
+  ex = [self copyToFolder: newFolder];
+
+  if (!ex)
+    ex = [self delete];
+
+  return ex;
 }

 #warning Should we not remove the concept of Organizer and Participant roles?
@@ -1,9 +1,6 @@
 /* SOGoComponentOccurence.m - this file is part of SOGo
 * 
- * Copyright (C) 2008-2011 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *         Francis Lachapelle <flachapelle@inverse.ca>
+ * Copyright (C) 2008-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -152,7 +149,6 @@
  NSArray *occurences;
  NSCalendarDate *recurrenceId, *currentId;
  NSException *error;
-  NSString *newContent;
  NSTimeZone *timeZone;
  iCalCalendar *calendar;
  iCalEntityObject *currentOccurence;
@@ -197,10 +193,8 @@
      [master addToExceptionDates: recurrenceId];
      [master increaseSequence];

-      // We generate the updated iCalendar file and we save it
-      // in the database.
-      newContent = [calendar versitString];
-      error = [container saveContentString: newContent];
+      // We save the updated iCalendar in the database.
+      error = [container saveComponent: calendar];
    }

  return error;
@@ -1,6 +1,6 @@
 /*

-  Copyright (C) 2006-2013 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.
  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo.
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2012 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.
  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo.
@@ -65,12 +65,12 @@

 #warning this code should be put in SOGoCalendarComponent once the UID hack\
  in SOGoAppointmentObject is resolved
- (NSException *) saveContentString: (NSString *) newContent
-                        baseVersion: (unsigned int) newVersion
+- (NSException *) saveComponent: (id) theComponent
+                    baseVersion: (unsigned int) newVersion
 {
  NSException *ex;

-  ex = [super saveContentString: newContent baseVersion: newVersion];
+  ex = [super saveComponent: theComponent baseVersion: newVersion];
  [fullCalendar release];
  fullCalendar = nil;
  [safeCalendar release];
@@ -1,9 +1,6 @@
 /* SOGoWebAppointmentFolder.h - this file is part of SOGo
 *
- * Copyright (C) 2009-2012 Inverse inc.
- *
- * Author: Cyril Robert <crobert@inverse.ca>
- *         Ludovic Marcotte <lmarcotte@inverse.ca>
+ * Copyright (C) 2009-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,9 +1,6 @@
 /* SOGoWebAppointmentFolder.m - this file is part of SOGo
 *
- * Copyright (C) 2009-2013 Inverse inc.
- *
- * Author: Cyril Robert <crobert@inverse.ca>
- *         Ludovic Marcotte <lmarcotte@inverse.ca>
+ * Copyright (C) 2009-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,8 +1,6 @@
 /* iCalCalendar+SOGo.m - this file is part of SOGo
 *
- * Copyright (C) 2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2012-2014 Inverse inc
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -80,4 +78,24 @@
  return [self _occurrence: recID inArray: [self todos]];
 }

+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
+{
+  CardGroup *element;
+  NSArray *elements;
+  
+  unsigned int count;
+ 
+  elements = [self allObjects];
+  count = [elements count];
+  if (count)
+    element = [elements objectAtIndex: 0];
+  else
+    {
+      [self logWithFormat: @"ERROR: given calendar contains no elements: %@", self];
+      element = nil;
+    }
+
+  return [element quickRecordForContainer: theContainer];
+}
+
@end
@@ -43,7 +43,7 @@ extern NSNumber *iCalDistantFutureNumber;
 - (id) itipEntryWithMethod: (NSString *) method;

 - (NSArray *) attendeesWithoutUser: (SOGoUser *) user;
- (NSMutableDictionary *) quickRecord;
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer;

 - (int) priorityNumber;
 - (NSString *) createdBy;
@@ -213,7 +213,7 @@ NSNumber *iCalDistantFutureNumber = nil;
  return dateNumber;
 }

- (NSMutableDictionary *) quickRecord
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
 {
  [self subclassResponsibility: _cmd];

@@ -1,9 +1,6 @@
 /* iCalEvent+SOGo.h - this file is part of SOGo
 *
- * Copyright (C) 2007-2011 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *         Francis Lachapelle <flachapelle@inverse.ca>
+ * Copyright (C) 2007-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -32,7 +29,7 @@

 - (BOOL) isStillRelevant;
 - (unsigned int) occurenceInterval;
- (NSMutableDictionary *) quickRecord;
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer;
 - (void) updateRecurrenceRulesUntilDate: (NSCalendarDate *) previousEndDate;

@end
@@ -1,9 +1,6 @@
 /* iCalEvent+SOGo.m - this file is part of SOGo
 *
- * Copyright (C) 2007-2013 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *         Francis Lachapelle <flachapelle@inverse.ca>
+ * Copyright (C) 2007-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -67,7 +64,7 @@
 //
 //
 //
- (NSMutableDictionary *) quickRecord
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
 {
  NSMutableDictionary *row;
  NSCalendarDate *startDate, *endDate, *nextAlarmDate;
@@ -1,24 +1,22 @@
 /* iCalRepeatableEntityObject+SOGo.h - this file is part of SOGo
-  Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2008-2013 Inverse inc.
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
+ *
+ * Copyright (C) 2007-2014 Inverse inc.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */

 #import <NGCards/iCalRepeatableEntityObject.h>

@@ -1,24 +1,22 @@
-/*
-  Copyright (C) 2008-2013 Inverse inc.
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
+/* iCalRepeatableEntityObject+SOGo.m - this file is part of SOGo
+ *
+ * Copyright (C) 2007-2014 Inverse inc.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */

 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
@@ -1,8 +1,6 @@
 /* iCalToDo+SOGo.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,7 +27,7 @@

@interface iCalToDo (SOGoExtensions)

- (NSMutableDictionary *) quickRecord;
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer;

@end

@@ -1,9 +1,6 @@
-/* iCalEvent+SOGo.m - this file is part of SOGo
+/* iCalToDot+SOGo.m - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse inc.
- * Copyright (C) 2004-2005 SKYRIX Software AG
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2008-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,7 +38,7 @@

@implementation iCalToDo (SOGoExtensions)

- (NSMutableDictionary *) quickRecord
+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
 {
  NSMutableDictionary *row;
  NSCalendarDate *startDate, *dueDate, *nextAlarmDate;
@@ -1 +1,2 @@
 "Personal Address Book" = "Llibreta personal d'adreces";
+"Collected Address Book" = "Llibreta d'adreces recopilades";
@@ -24,9 +24,12 @@
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>

+#import <NGExtensions/NSNull+misc.h>
+
 #import <NGCards/NSArray+NGCards.h>
 #import <NGCards/NSString+NGCards.h>

+#import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSCalendarDate+SOGo.h>

 #import "NSDictionary+LDIF.h"
@@ -788,4 +791,51 @@ convention:
  return date;
 }

+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
+{
+  NSMutableDictionary *fields;
+  CardElement *element;
+  NSString *value;
+  NSArray *v;
+
+  fields = [NSMutableDictionary dictionaryWithCapacity: 16];
+
+  value = [self fn];
+  if (value)
+    [fields setObject: value forKey: @"c_cn"];
+  element = [self n];
+  [fields setObject: [element flattenedValueAtIndex: 0 forKey: @""]
+             forKey: @"c_sn"];
+  [fields setObject: [element flattenedValueAtIndex: 1 forKey: @""]
+             forKey: @"c_givenName"];
+  value = [self preferredTel];
+  if (value)
+    [fields setObject: value forKey: @"c_telephonenumber"];
+  value = [self preferredEMail];
+  if (![value isNotNull])
+    value = @"";
+  [fields setObject: value forKey: @"c_mail"];
+  element = [self org];
+  [fields setObject: [element flattenedValueAtIndex: 0 forKey: @""]
+             forKey: @"c_o"];
+  [fields setObject: [element flattenedValueAtIndex: 1 forKey: @""]
+             forKey: @"c_ou"];
+  element = [self preferredAdr];
+  if (element && ![element isVoid])
+    [fields setObject: [element flattenedValueAtIndex: 3
+                                               forKey: @""]
+               forKey: @"c_l"];
+  value = [[self uniqueChildWithTag: @"X-AIM"] flattenedValuesForKey: @""];
+  [fields setObject: value forKey: @"c_screenname"];
+  v = [[self categories] trimmedComponents];
+  if ([v count] > 0)
+    [fields setObject: [v componentsJoinedByString: @","]
+               forKey: @"c_categories"];
+  else
+    [fields setObject: [NSNull null] forKey: @"c_categories"];
+  [fields setObject: @"vcard" forKey: @"c_component"];
+
+  return fields;
+}
+
@end /* NGVCard */
@@ -1,8 +1,6 @@
 /* NGVCard+SOGo.h - this file is part of SOGo
 *
- * Copyright (C) 2009 Inverse inc.
- *
- * Author: Cyril Robert <crobert@inverse.ca>
+ * Copyright (C) 2009-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,8 +1,6 @@
 /* NGVCard+SOGo.m - this file is part of SOGo
 *
- * Copyright (C) 2009 Inverse inc.
- *
- * Author: Cyril Robert <crobert@inverse.ca>
+ * Copyright (C) 2009-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -71,4 +69,19 @@
  return rc;
 }

+- (NSMutableDictionary *) quickRecordForContainer: (id) theContainer
+{
+  NSMutableDictionary *fields;
+  NSString *value;
+  
+  fields = [NSMutableDictionary dictionaryWithCapacity: 1];
+  
+  value = [self fn];
+  if (value)
+    [fields setObject: value forKey: @"c_cn"];
+  [fields setObject: @"vlist" forKey: @"c_component"];
+
+  return fields;
+}
+
@end /* NGVList */
@@ -1 +1,2 @@
 "Personal Address Book" = "Personlig adressebok";
+"Collected Address Book" = "Samlet addressebok";
@@ -48,6 +48,11 @@
  [super dealloc];
 }

+- (Class *) parsingClass
+{
+  return [NGVCard class];
+}
+
 /* content */

 - (NGVCard *) vCard
@@ -121,11 +126,25 @@

  newContact = [[self class] objectWithName:
 			       [NSString stringWithFormat: @"%@.vcf", newUID]
-			     inContainer: newFolder];
+                                inContainer: newFolder];

-  return [newContact saveContentString: [newCard versitString]];
+  return [newContact saveComponent: newCard];
 }

+
+- (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
+{
+  NSException *ex;
+
+  ex = [self copyToFolder: newFolder];
+
+  if (!ex)
+    ex = [self delete];
+
+  return ex;
+}
+
+
 - (NSString *) displayName
 {
  return [[self vCard] fn];
@@ -150,7 +169,7 @@
  NSException *result;

  if (card)
-    result = [self saveContentString: [card versitString]];
+    result = [super saveComponent: card];
  else
    result = nil; /* TODO: we should probably return an exception instead */

@@ -160,15 +179,15 @@
 - (NSException *) saveComponent: (NGVCard *) newCard
 {
  ASSIGN(card, newCard);
-  return [self save];
+  return [super saveComponent: newCard];
 }

- (NSException *) saveContentString: (NSString *) newContent
-                        baseVersion: (unsigned int) newVersion
+- (NSException *) saveComponent: (NGVCard *) newCard
+                    baseVersion: (unsigned int) newVersion
 {
  NSException *ex;

-  ex = [super saveContentString: newContent baseVersion: newVersion];
+  ex = [super saveComponent: newCard baseVersion: newVersion];
  [card release];
  card = nil;

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2011 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.
  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo.
@@ -1,8 +1,6 @@
 /* SOGoContactGCSList.m - this file is part of SOGo
 *
- * Copyright (C) 2008-2009 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2008-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -45,6 +43,12 @@
  [super dealloc];
 }

+- (Class *) parsingClass
+{
+  return [NGVList class];
+}
+
+
 /* content */

 - (NGVList *) vList
@@ -77,7 +81,19 @@
                [NSString stringWithFormat: @"%@.vlf", newUID]
                               inContainer: newFolder];

-  return [newGList saveContentString: [newList versitString]];
+  return [newGList saveComponent: newList];
+}
+
+- (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
+{
+  NSException *ex;
+
+  ex = [self copyToFolder: newFolder];
+
+  if (!ex)
+    ex = [self delete];
+
+  return ex;
 }

 /* DAV */
@@ -100,7 +116,7 @@

  vlist = [self vList];

-  [self saveContentString: [vlist versitString]];
+  [self saveComponent: vlist];
 }

@end
@@ -1,9 +1,6 @@
 /* SOGoContactLDIFEntry.m - this file is part of SOGo
 *
- * Copyright (C) 2006-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *         Ludovic Marcotte <lmarcotte@inverse.ca>
+ * Copyright (C) 2006-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -231,7 +228,7 @@
 				      [NSString stringWithFormat: @"%@.vcf", newUID]
 				    inContainer: newFolder];

-  return [newContact saveContentString: [newCard versitString]];
+  return [newContact saveComponent: newCard];
 }

@end
@@ -1,2 +1,2 @@
-"SieveFolderName"  = "Filtres";
 "OtherUsersFolderName"   = "Altres usuaris";
+"SharedFoldersName" = "Carpetes compartides";
@@ -1,2 +1,2 @@
-"SieveFolderName"  = "Filter";
 "OtherUsersFolderName"   = "Andre brukere";
+"SharedFoldersName" = "Delte mapper";
@@ -1833,7 +1833,7 @@ static NSString    *userAgent      = nil;
        newContact = [contactGCSEntry objectWithName: uid
                                         inContainer: folder];
        [newContact setIsNew: YES];
-        [newContact saveContentString: [card versitString]];
+        [newContact saveComponent: card];
      }
    }
  }
@@ -15,7 +15,6 @@ ADDITIONAL_CPPFLAGS += \

 SOGo_LIBRARIES_DEPEND_UPON += \
        -Wl,--no-as-needed \
-	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
 	-lmemcached		\
 	-lGDLAccess		\
@@ -1,20 +1,21 @@
 /*
  Copyright (C) 2004 SKYRIX Software AG
+  Copyright (C) 2005-2014 Inverse inc.

-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.

-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.

-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
  WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
  License for more details.

  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOGo; see the file COPYING.  If not, write to the
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
 */
@@ -50,6 +51,7 @@
 - (id) initWithName: (NSString *) newName
 	 andContent: (NSString *) newContent
 	inContainer: (SOGoGCSFolder *) newContainer;
+- (Class *) parsingClass;

 /* content */

@@ -62,9 +64,9 @@
 - (NSCalendarDate *) lastModified;

 - (NSString *) contentAsString;
- (NSException *) saveContentString: (NSString *) _str
-                        baseVersion: (unsigned int) _baseVersion;
- (NSException *) saveContentString: (NSString *)_str;
+- (NSException *) saveComponent: (id) theComponent
+                    baseVersion: (unsigned int) _baseVersion;
+- (NSException *) saveComponent: (id) theComponent;

 - (id) PUTAction: (WOContext *) _ctx;

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2013 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.
  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo.
@@ -32,6 +32,9 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <GDLContentStore/GCSFolder.h>

+#import <NGCards/iCalCalendar.h>
+#import <NGCards/NGVCard.h>
+
 #import "NSCalendarDate+SOGo.h"
 #import "SOGoCache.h"
 #import "SOGoGCSFolder.h"
@@ -87,6 +90,13 @@
  return self;
 }

+- (Class *) parsingClass
+{
+  [self subclassResponsibility: _cmd];
+  
+  return nil;
+}
+
 - (void) _setRecord: (NSDictionary *) objectRecord
 {
  id data;
@@ -187,16 +197,18 @@
  return content;
 }

- (NSException *) saveContentString: (NSString *) newContent
-                        baseVersion: (unsigned int) newVersion
+- (NSException *) saveComponent: (id) theComponent
+                    baseVersion: (unsigned int) newVersion
 {
  /* Note: "iCal multifolder saves" are implemented in the apt subclass! */
  GCSFolder *folder;
  NSException *ex;
  NSCalendarDate *now;
+  NSString *newContent;

  ex = nil;
-
+  
+  newContent = [theComponent versitString];
  now = [NSCalendarDate calendarDate];
  if (!content)
    ASSIGN (creationDate, now);
@@ -208,8 +220,10 @@
  if (folder)
    {
      ex = [folder writeContent: newContent
-		   toName: nameInContainer
-		   baseVersion: &version];
+                  fromComponent: theComponent
+                      container: container
+                         toName: nameInContainer
+                    baseVersion: &version];
      if (ex)
 	[self errorWithFormat:@"write failed: %@", ex];
    }
@@ -223,9 +237,9 @@
  return ex;
 }

- (NSException *) saveContentString: (NSString *) newContent
+- (NSException *) saveComponent: (id) theComponent
 {
-  return [self saveContentString: newContent baseVersion: version];
+  return [self saveComponent: theComponent  baseVersion: version];
 }

 /* actions */
@@ -239,17 +253,7 @@

 - (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
 {
-  SOGoContentObject *newObject;
-  NSException *ex;
-
-  newObject = [[self class] objectWithName: nameInContainer
-			    inContainer: newFolder];
-  [newObject setIsNew: YES];
-  ex = [newObject saveContentString: content];
-  if (!ex)
-    ex = [self delete];
-
-  return ex;
+  [self subclassResponsibility: _cmd];
 }

 - (NSException *) delete
@@ -341,8 +345,8 @@

      /* attempt a save */
      
-      error = [self saveContentString: [rq contentAsString]
-		    baseVersion: baseVersion];
+      error = [self saveComponent: [[self parsingClass] parseSingleFromSource: [rq contentAsString]]
+                      baseVersion: baseVersion];
      if (error)
 	response = (WOResponse *) error;
      else
@@ -55,11 +55,11 @@
    SOGoIMAPServer = "localhost";
    SOGoMailDomain = "localhost";
    SOGoSelectedAddressBook = "collected";
-    SOGoMailMessageCheck = "manually";
+    SOGoRefreshViewCheck = "manually";
    SOGoMailMessageForwarding = "inline";
    SOGoMailReplyPlacement = "below";
    SOGoMailSignaturePlacement = "below";
-    SOGoMailPollingIntervals = ( 1, 2, 5, 10, 20, 30, 60 );
+    SOGoRefreshViewIntervals = ( 1, 2, 5, 10, 20, 30, 60 );
    SOGoMailComposeMessageType = "text";
    SOGoMailListViewColumnsOrder = ( "Thread", "Flagged", "Attachment", "Subject",
                                     "From", "Unread", "Date", "Priority",
@@ -66,7 +66,7 @@
 - (BOOL) foldersSendEMailNotifications;
 - (NSArray *) calendarDefaultRoles;
 - (NSArray *) contactsDefaultRoles;
- (NSArray *) mailPollingIntervals;
+- (NSArray *) refreshViewIntervals;
 - (NSString *) subscriptionFolderFormat;

 - (NSString *) calendarDefaultCategoryColor;
@@ -225,9 +225,9 @@
  return [mailingMechanism lowercaseString];
 }

- (NSArray *) mailPollingIntervals
+- (NSArray *) refreshViewIntervals
 {
-  return [self arrayForKey: @"SOGoMailPollingIntervals"];
+  return [self arrayForKey: @"SOGoRefreshViewIntervals"];
 }

 - (NSString *) smtpServer
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2006-2013 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.

  This file is part of SOGo.

@@ -53,7 +53,6 @@
  NSString *ocsPath;
  GCSFolder *ocsFolder;
  NSMutableDictionary *childRecords;
-  NSMutableDictionary *folderSubscriptionValues;
  BOOL userCanAccessAllObjects; /* i.e. user obtains 'Access Object' on
                                   subobjects */
 }
@@ -102,7 +101,8 @@
                withReference: (NSString *) reference;

 - (BOOL) subscribeUserOrGroup: (NSString *) theIdentifier
-		     reallyDo: (BOOL) reallyDo;
+		     reallyDo: (BOOL) reallyDo
+                     response: (WOResponse *) theResponse;
 - (BOOL) userIsSubscriber: (NSString *) subscribingUser;

 - (void) initializeQuickTablesAclsInContext: (WOContext *) localContext;
@@ -196,7 +196,6 @@ static NSArray *childRecordFields = nil;
      ocsPath = nil;
      ocsFolder = nil;
      childRecords = [NSMutableDictionary new];
-      folderSubscriptionValues = nil;
      userCanAccessAllObjects = NO;
    }

@@ -208,7 +207,6 @@ static NSArray *childRecordFields = nil;
  [ocsFolder release];
  [ocsPath release];
  [childRecords release];
-  [folderSubscriptionValues release];
  [super dealloc];
 }

@@ -287,9 +285,6 @@ static NSArray *childRecordFields = nil;
 - (void) _setDisplayNameFromRow: (NSDictionary *) row
 {
  NSString *primaryDN;
-  NSDictionary *ownerIdentity;
-  NSString *subjectFormat;
-  SOGoDomainDefaults *dd;
  
  primaryDN = [row objectForKey: @"c_foldername"];
  
@@ -301,7 +296,7 @@ static NSArray *childRecordFields = nil;
        displayName = [self labelForKey: primaryDN
                              inContext: context];
      else
-        displayName =primaryDN;
+        displayName = primaryDN;
      
      RETAIN(displayName);
    }
@@ -348,7 +343,31 @@ static NSArray *childRecordFields = nil;

 - (void) _fetchDisplayNameFromSubscriber
 {
+  NSDictionary *ownerIdentity, *folderSubscriptionValues;
+  NSString *displayNameFormat;
+  SOGoDomainDefaults *dd;
+
  displayName = [self folderPropertyValueInCategory: @"FolderDisplayNames"];
+  if (!displayName)
+    {
+      [self _fetchDisplayNameFromOwner];
+
+      // We MUST NOT use SOGoUser instances here (by calling -primaryIdentity)
+      // as it'll load user defaults and user settings which is _very costly_
+      // since it involves JSON parsing and database requests
+      ownerIdentity = [[SOGoUserManager sharedUserManager]
+                                contactInfosForUserWithUIDorEmail: owner];
+
+      folderSubscriptionValues = [[NSDictionary alloc] initWithObjectsAndKeys: displayName, @"FolderName",
+                                                  [ownerIdentity objectForKey: @"cn"], @"UserName",
+                                                  [ownerIdentity objectForKey: @"c_email"], @"Email", nil];
+
+      dd = [[context activeUser] domainDefaults];
+      displayNameFormat = [dd subscriptionFolderFormat];
+
+      displayName = [folderSubscriptionValues keysWithFormat: displayNameFormat];
+    }
+
  [displayName retain];
 }

@@ -855,13 +874,10 @@ static NSArray *childRecordFields = nil;
 		     reallyDo: (BOOL) reallyDo
                     response: (WOResponse *) theResponse
 {
-  NSDictionary *ownerIdentity, *folderSubscriptionValues;
  NSMutableDictionary *moduleSettings, *folderShowAlarms;
-  NSString *subjectFormat, *formattedName;
  NSMutableArray *folderSubscription;
  NSString *subscriptionPointer;
  NSMutableArray *allUsers;
-  SOGoDomainDefaults *dd;
  SOGoUserSettings *us;
  NSDictionary *dict;
  SOGoUser *sogoUser;
@@ -869,7 +885,7 @@ static NSArray *childRecordFields = nil;
  int i;

  dict = [[SOGoUserManager sharedUserManager] contactInfosForUserWithUIDorEmail: theIdentifier];
-  
+
  if ([[dict objectForKey: @"isGroup"] boolValue])
    {
      SOGoGroup *aGroup;
@@ -891,28 +907,12 @@ static NSArray *childRecordFields = nil;
      else
 	allUsers = [NSArray array];
    }
-  
+
  rc = NO;
-  
-  // We MUST NOT use SOGoUser instances here (by calling -primaryIdentity)
-  // as it'll load user defaults and user settings which is _very costly_
-  // since it involves JSON parsing and database requests
-  ownerIdentity = [[SOGoUserManager sharedUserManager]
-                                contactInfosForUserWithUIDorEmail: owner];
-  
-  
-  folderSubscriptionValues = [[NSDictionary alloc] initWithObjectsAndKeys: [self displayName], @"FolderName",
-                                              [ownerIdentity objectForKey: @"cn"], @"UserName",
-                                              [ownerIdentity objectForKey: @"c_email"], @"Email", nil];
-  
-  dd = [[context activeUser] domainDefaults];
-  subjectFormat = [dd subscriptionFolderFormat];
-  
-  formattedName = [folderSubscriptionValues keysWithFormat: subjectFormat];
-  
+
  // This is consumed by SOGo Integrator during folder subscription since v24.0.6
  if (theResponse)
-    [theResponse appendContentString: formattedName];
+    [theResponse appendContentString: [self displayName]];

  for (i = 0; i < [allUsers count]; i++)
    {
@@ -926,8 +926,7 @@ static NSArray *childRecordFields = nil;
          [us setObject: moduleSettings forKey: [container nameInContainer]];
        }

-      folderSubscription
-        = [moduleSettings objectForKey: @"SubscribedFolders"];
+      folderSubscription = [moduleSettings objectForKey: @"SubscribedFolders"];
      subscriptionPointer = [self folderReference];
      
      folderShowAlarms = [moduleSettings objectForKey: @"FolderShowAlarms"];
@@ -950,7 +949,7 @@ static NSArray *childRecordFields = nil;
                                 forKey: @"FolderShowAlarms"];
            }

-          [self setFolderPropertyValue: formattedName
+          [self setFolderPropertyValue: [self displayName]
                            inCategory: @"FolderDisplayNames"
                              settings: us];

@@ -117,8 +117,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (void) setSelectedAddressBook: (NSString *) newValue;
 - (NSString *) selectedAddressBook;

- (void) setMailMessageCheck: (NSString *) newValue;
- (NSString *) mailMessageCheck;
+- (void) setRefreshViewCheck: (NSString *) newValue;
+- (NSString *) refreshViewCheck;

 - (void) setMailComposeMessageType: (NSString *) newValue;
 - (NSString *) mailComposeMessageType;
@@ -198,7 +198,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
                        @"SOGoLanguage", @"Language",
                        @"SOGoMailComposeMessageType", @"ComposeMessagesType",
                        @"SOGoSelectedAddressBook", @"SelectedAddressBook",
-                        @"SOGoMailMessageCheck", @"MessageCheck",
+                        @"SOGoRefreshViewCheck", @"RefreshViewCheck",
                        @"SOGoMailMessageForwarding", @"MessageForwarding",
                        @"SOGoMailSignature", @"MailSignature",
                        @"SOGoMailSignaturePlacement", @"SignaturePlacement",
@@ -488,14 +488,14 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
  return [self stringForKey: @"SOGoSelectedAddressBook"];
 }

- (void) setMailMessageCheck: (NSString *) newValue
+- (void) setRefreshViewCheck: (NSString *) newValue
 {
-  [self setObject: newValue forKey: @"SOGoMailMessageCheck"];
+  [self setObject: newValue forKey: @"SOGoRefreshViewCheck"];
 }

- (NSString *) mailMessageCheck
+- (NSString *) refreshViewCheck
 {
-  return [self stringForKey: @"SOGoMailMessageCheck"];
+  return [self stringForKey: @"SOGoRefreshViewCheck"];
 }

 - (void) setMailComposeMessageType: (NSString *) newValue
@@ -20,7 +20,6 @@ ADDITIONAL_INCLUDE_DIRS += \
 ADDITIONAL_LIB_DIRS += \
        -L../SOGo/SOGo.framework/ \
 	-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
        -L/usr/local/lib

@@ -11,7 +11,6 @@ ADDITIONAL_INCLUDE_DIRS += \

 ADDITIONAL_LIB_DIRS += \
 	-L../../SoObjects/SOGo/SOGo.framework -lSOGo \
-	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
 	-L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
        -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions
@@ -23,6 +23,8 @@ attendee1_delegate_password = "sogo"
 resource_no_overbook = "res"
 resource_can_overbook = "res-nolimit"

+white_listed_attendee = '{"sogo1":"John Doe <sogo1@example.com>"}'
+
 mailserver = "imaphost"

 testput_nbrdays = 30
@@ -46,7 +46,7 @@ class preferences:

    self.client = webdavlib.WebDAVClient(hostname, port)

-    authCookie = sogoLogin.getAuthCookie(hostname, port, username, password)
+    authCookie = sogoLogin.getAuthCookie(hostname, port, self.login, self.passw)
    self.cookie = authCookie

    # map between preferences/jsonDefaults and the webUI names
@@ -56,17 +56,22 @@ class preferences:
        "SOGoTimeZone": "timezone",
        "SOGoSieveFilters": "sieveFilters",

-			   # Vacation stuff
-			   "Vacation": "enableVacation", # to disable, don't specify it
-			   "autoReplyText": "autoReplyText", # string
-			   "autoReplyEmailAddresses":  "autoReplyEmailAddresses", # LIST
-			   "daysBetweenResponse":  "daysBetweenResponsesList", 
-			   "ignoreLists":  "ignoreLists", #bool
+        # Vacation stuff
+        "Vacation": "enableVacation", # to disable, don't specify it
+        "autoReplyText": "autoReplyText", # string
+        "autoReplyEmailAddresses":  "autoReplyEmailAddresses", # LIST
+        "daysBetweenResponse":  "daysBetweenResponsesList", 
+        "ignoreLists":  "ignoreLists", #bool

-			   # forward stuff
-         "Forward": "enableForward", # to disable, don't specify it
-         "forwardAddress": "forwardAddress",
-         "keepCopy": "forwardKeepCopy",
+        # forward stuff
+        "Forward": "enableForward", # to disable, don't specify it
+        "forwardAddress": "forwardAddress",
+        "keepCopy": "forwardKeepCopy",
+
+        # Calendar stuff
+        "enablePreventInvitations": "preventInvitations",
+        "PreventInvitations": "PreventInvitations",
+        "whiteList": "whiteList",
    }

  def set(self, preference, value=None):
@@ -74,11 +79,11 @@ class preferences:
    content=""
    if isinstance(preference, dict):
      for k,v in preference.items():
-        content+="%s=%s&" % (self.preferencesMap[k], v)
+        content+="%s=%s&" % (self.preferencesMap[k], urllib.quote(v))
    else:
      # assume it is a str
      formKey = self.preferencesMap[preference]
-      content = "%s=%s&hasChanged=1" % (formKey, value)
+      content = "%s=%s&hasChanged=1" % (formKey, urllib.quote(value))


    url = "/SOGo/so/%s/preferences" % self.login
@@ -94,7 +99,7 @@ class preferences:
      raise Exception ("failure setting prefs, (code = %d)" \
                       % post.response["status"])

-  def get(self, preference):
+  def get(self, preference=None):
    url = "/SOGo/so/%s/preferences/jsonDefaults" % self.login
    get = HTTPPreferencesGET (url)
    get.cookie = self.cookie
@@ -102,7 +107,26 @@ class preferences:
    content = simplejson.loads(get.response['body'])
    result = None
    try:
-      result = content[preference]
+      if preference:
+        result = content[preference]
+      else:
+        result = content
+    except:
+      pass
+    return result
+
+  def get_settings(self, preference=None):
+    url = "/SOGo/so/%s/preferences/jsonSettings" % self.login
+    get = HTTPPreferencesGET (url)
+    get.cookie = self.cookie
+    self.client.execute (get)
+    content = simplejson.loads(get.response['body'])
+    result = None
+    try:
+      if preference:
+        result = content[preference]
+      else:
+        result = content
    except:
      pass
    return result
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from config import hostname, port, username, password
+from config import hostname, port, username, password, white_listed_attendee

 import preferences
 import simplejson
@@ -35,5 +35,22 @@ class preferencesTest(unittest.TestCase):
      prefText = "weird data   \ ' \"; ^"
      self._setTextPref(prefText)

+    def testSetPreventInvitation(self):
+      """ Set/get the PreventInvitation pref"""
+      self.prefs.set('PreventInvitations', '0')
+      notset = self.prefs.get_settings('')['Calendar']['PreventInvitations']
+      self.assertEqual(notset, 0)
+      self.prefs.set('enablePreventInvitations', '0')
+      isset = self.prefs.get_settings('')['Calendar']['PreventInvitations']
+      self.assertEqual(isset, 1)
+
+    def testPreventInvitationsWhiteList(self):
+      """Add to the PreventInvitations Whitelist"""
+      self.prefs.set("whiteList", white_listed_attendee)
+      whitelist = self.prefs.get_settings('Calendar')['PreventInvitationsWhitelist']
+      self.assertEqual(whitelist, white_listed_attendee)
+
+
+
 if __name__ == "__main__":
    sogotests.runTests()
@@ -0,0 +1,209 @@
+#!/usr/bin/python
+from config import hostname, port, username, password, \
+                   superuser, superuser_password, \
+                   attendee1, attendee1_username, \
+                   attendee1_password, \
+                   attendee1_delegate, attendee1_delegate_username, \
+                   attendee1_delegate_password, \
+                   resource_no_overbook, resource_can_overbook, \
+                   white_listed_attendee
+
+import preferences
+import simplejson
+import sogotests
+import unittest
+import utilities
+import datetime
+import dateutil.tz
+import vobject
+import vobject.base
+import vobject.icalendar
+import webdavlib
+import StringIO
+
+
+class preventInvitationsTest(unittest.TestCase):
+    def setUp(self):
+      self.prefs = preferences.preferences(attendee1, attendee1_password)
+      self.caldav = CalDAVSchedulingTest(self)
+
+    def tearDown(self):
+      self.prefs.set("autoReplyText", "")
+      self.prefs.set('PreventInvitations', '0')
+      self.prefs.set("whiteList", "")
+      #- Manual Cleanup, not called because classs is not derived from unittest
+      self.caldav.tearDown()
+
+    def testDontPreventInvitation(self):
+      """ Set/get the PreventInvitation pref"""
+      #- First accept the invitation
+      self.prefs.set('PreventInvitations', '0')
+      notset = self.prefs.get_settings('')['Calendar']['PreventInvitations']
+      self.assertEqual(notset, 0)
+      self.caldav.AddAttendee()
+      self.caldav.VerifyEvent()
+
+    def testPreventInvitation(self):
+      """ Set PreventInvitation and don't accept the Invitation"""
+      #- Second, enable PreventInviation and refuse it
+      self.prefs.set('enablePreventInvitations', '0')
+      isset = self.prefs.get_settings('')['Calendar']['PreventInvitations']
+      self.assertEqual(isset, 1)
+      self.caldav.AddAttendee(409)
+      self.caldav.VerifyEvent(404)
+
+    def testPreventInvitationWhiteList(self):
+      """ Set PreventInvitation add to WhiteList and accept the Invitation"""
+      #- First, add the Organiser to the Attendee's whitelist
+      self.prefs.set('enablePreventInvitations', '0')
+      self.prefs.set("whiteList", white_listed_attendee)
+      whitelist = self.prefs.get_settings('Calendar')['PreventInvitationsWhitelist']
+      self.assertEqual(whitelist, white_listed_attendee)
+
+      #- Second, try again to invite, it should work
+      self.prefs.set('enablePreventInvitations', '0')
+      isset = self.prefs.get_settings('')['Calendar']['PreventInvitations']
+      self.assertEqual(isset, 1)
+      self.caldav.AddAttendee()
+      self.caldav.VerifyEvent()
+
+
+class CalDAVSchedulingTest(object):
+    def __init__(self, parent_self):
+        self.test = parent_self # used for utilities
+        self.setUp()
+
+    def setUp(self):
+        self.superuser_client = webdavlib.WebDAVClient(hostname, port,
+                                             superuser, superuser_password)
+        self.client = webdavlib.WebDAVClient(hostname, port,
+                                             username, password)
+        self.attendee1_client = webdavlib.WebDAVClient(hostname, port,
+                                             attendee1_username, attendee1_password)
+        self.attendee1_delegate_client = webdavlib.WebDAVClient(hostname, port,
+                                                                attendee1_delegate_username, attendee1_delegate_password)
+
+        utility = utilities.TestUtility(self.test, self.client)
+        (self.user_name, self.user_email) = utility.fetchUserInfo(username)
+        (self.attendee1_name, self.attendee1_email) = utility.fetchUserInfo(attendee1)
+        (self.attendee1_delegate_name, self.attendee1_delegate_email) = utility.fetchUserInfo(attendee1_delegate)
+
+        self.user_calendar = "/SOGo/dav/%s/Calendar/personal/" % username
+        self.attendee1_calendar = "/SOGo/dav/%s/Calendar/personal/" % attendee1
+        self.attendee1_delegate_calendar = "/SOGo/dav/%s/Calendar/personal/" % attendee1_delegate
+
+        # fetch non existing event to let sogo create the calendars in the db
+        self._getEvent(self.client, "%snonexistent" % self.user_calendar, exp_status=404)
+        self._getEvent(self.attendee1_client, "%snonexistent" % self.attendee1_calendar, exp_status=404)
+        self._getEvent(self.attendee1_delegate_client, "%snonexistent" %
+                        self.attendee1_delegate_calendar, exp_status=404)
+
+        # list of ics used by the test.
+        # tearDown will loop over this and wipe them in all users' calendar
+        self.ics_list = []
+
+
+    def tearDown(self):
+        # delete all created  events from all users' calendar
+        for ics in self.ics_list:
+          self._deleteEvent(self.superuser_client,
+                          "%s%s" % (self.user_calendar, ics), None)
+          self._deleteEvent(self.superuser_client,
+                          "%s%s" % (self.attendee1_calendar, ics), None)
+          self._deleteEvent(self.superuser_client,
+                          "%s%s" % (self.attendee1_delegate_calendar, ics), None)
+
+    def _newEvent(self, summary="test event", uid="test", transp=0):
+        transparency = ("OPAQUE", "TRANSPARENT")
+
+        newCal = vobject.iCalendar()
+        vevent = newCal.add('vevent')
+        vevent.add('summary').value = summary
+        vevent.add('transp').value = transparency[transp]
+
+        now = datetime.datetime.now(dateutil.tz.gettz("America/Montreal"))
+        startdate = vevent.add('dtstart')
+        startdate.value = now
+        enddate = vevent.add('dtend')
+        enddate.value = now + datetime.timedelta(0, 3600)
+        vevent.add('uid').value = uid
+        vevent.add('dtstamp').value = now
+        vevent.add('last-modified').value = now
+        vevent.add('created').value = now
+        vevent.add('class').value = "PUBLIC"
+        vevent.add('sequence').value = "0"
+
+        return newCal
+
+    def _putEvent(self, client, filename, event, exp_status = 201):
+        put = webdavlib.HTTPPUT(filename, event.serialize())
+        put.content_type = "text/calendar; charset=utf-8"
+        client.execute(put)
+        if exp_status is not None:
+            self.test.assertEquals(put.response["status"], exp_status)
+
+    def _getEvent(self, client, filename, exp_status = 200):
+        get = webdavlib.HTTPGET(filename)
+        client.execute(get)
+
+        if exp_status is not None:
+            self.test.assertEquals(get.response["status"], exp_status)
+
+        if get.response["headers"]["content-type"].startswith("text/calendar"):
+            stream = StringIO.StringIO(get.response["body"])
+            event = vobject.base.readComponents(stream).next()
+        else:
+            event = None
+
+        return event
+
+    def _deleteEvent(self, client, filename, exp_status = 204):
+        delete = webdavlib.WebDAVDELETE(filename)
+        client.execute(delete)
+        if exp_status is not None:
+            self.test.assertEquals(delete.response["status"], exp_status)
+
+    def AddAttendee(self, exp_status=204):
+        """ add attendee after event creation """
+
+        # make sure the event doesn't exist
+        ics_name = "test-add-attendee.ics"
+        self.ics_list += [ics_name]
+
+        self._deleteEvent(self.client,
+                          "%s%s" % (self.user_calendar,ics_name), None)
+        self._deleteEvent(self.attendee1_client,
+                          "%s%s" % (self.attendee1_calendar,ics_name), None)
+
+        # 1. create an event in the organiser's calendar
+        event = self._newEvent(summary="Test add attendee", uid="Test add attendee")
+        organizer = event.vevent.add('organizer')
+        organizer.cn_param = self.user_name
+        organizer.value = self.user_email
+        self._putEvent(self.client, "%s%s" % (self.user_calendar, ics_name), event)
+
+        # 2. add an attendee
+        event.add("method").value = "REQUEST"
+        attendee = event.vevent.add('attendee')
+        attendee.cn_param = self.attendee1_name
+        attendee.rsvp_param = "TRUE"
+        attendee.partstat_param = "NEEDS-ACTION"
+        attendee.value = self.attendee1_email
+        self._putEvent(self.client, "%s%s" % (self.user_calendar, ics_name), event,
+                       exp_status=exp_status)
+
+        #- save event for VerifyEvent
+        self.event = event
+        self.ics_name = ics_name
+
+    def VerifyEvent(self, exp_status=200):
+        # 1. verify that the attendee has the event
+        attendee_event = self._getEvent(self.attendee1_client, "%s%s" % (self.attendee1_calendar, self.ics_name), exp_status)
+
+        # 2. make sure the received event match the original one
+        if attendee_event:
+            self.test.assertEquals(self.event.vevent.uid, attendee_event.vevent.uid)
+
+
+if __name__ == "__main__":
+    sogotests.runTests()
@@ -73,9 +73,9 @@ class sieveTest(unittest.TestCase):
 					       "days": preferences.daysBetweenResponseList[daysSelect],
 					     }

-      filterAdd = {"Vacation":1,
+      filterAdd = {"Vacation":"1",
                   "autoReplyText": vacation_msg,
-                   "daysBetweenResponse": daysSelect,
+                   "daysBetweenResponse": "%d" % daysSelect,
 		   "autoReplyEmailAddresses": self.user_email,
 		  } 

@@ -94,11 +94,11 @@ class sieveTest(unittest.TestCase):
 					       "days": preferences.daysBetweenResponseList[daysSelect],
 					     }

-      filterAdd = {"Vacation":1,
+      filterAdd = {"Vacation":"1",
                   "autoReplyText": vacation_msg,
-                   "daysBetweenResponse": daysSelect,
+                   "daysBetweenResponse": "%d" % daysSelect,
 		   "autoReplyEmailAddresses": self.user_email,
-		   "ignoreLists": 1,
+		   "ignoreLists": "1",
 		  } 

      self.prefs.set(filterAdd)
@@ -112,7 +112,7 @@ class sieveTest(unittest.TestCase):

      sieveScript = sieve_simple_forward % { "redirect_mailaddr": redirect_mailaddr }

-      filterAdd = { "Forward": 1,
+      filterAdd = { "Forward": "1",
                    "forwardAddress": redirect_mailaddr,
                  }

@@ -126,9 +126,9 @@ class sieveTest(unittest.TestCase):

      sieveScript = sieve_forward_keep % { "redirect_mailaddr": redirect_mailaddr }

-      filterAdd = { "Forward": 1,
+      filterAdd = { "Forward": "1",
                    "forwardAddress": redirect_mailaddr,
-                    "keepCopy": 1,
+                    "keepCopy": "1",
                  }

      self.prefs.set(filterAdd)
@@ -106,7 +106,12 @@ class WebDAVClient:
        query.start = time.time()
        self.conn.request(query.method, query.url,
                          body, self.prepare_headers(query, body))
-        query.set_response(self.conn.getresponse());
+        try:
+            query.set_response(self.conn.getresponse());
+        except httplib.BadStatusLine, e:
+            print e
+            time.sleep(3)
+            query.set_response(self.conn.getresponse());
        query.duration = time.time() - query.start

 class HTTPSimpleQuery:
@@ -35,7 +35,7 @@ $(TEST_TOOL)_CPPFLAGS += \
 ADDITIONAL_LIB_DIRS += \
 	-L../../SoObjects/SOGo/SOGo.framework/Versions/Current -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \
 	-L/usr/local/lib  -lSaxObjC \
-	-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj -Wl,-rpath,../../OGoContentStore/obj
+	-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
 ADDITIONAL_LDFLAGS += -Wl,--no-as-needed

 -include GNUmakefile.preamble
@@ -11,7 +11,6 @@ ADDITIONAL_INCLUDE_DIRS += \

 ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework -lSOGo \
-	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
 	-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
        -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb
@@ -1,8 +1,6 @@
 /* SOGoToolRestore.m - this file is part of SOGo
 *
- * Copyright (C) 2009-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2009-2014 Inverse inc.
 *
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -43,6 +41,10 @@
 #import <SOGo/SOGoUserProfile.h>
 #import <SOGo/SOGoUserSettings.h>

+#import <NGCards/iCalCalendar.h>
+#import <NGCards/NGVCard.h>
+#import <NGCards/NGVList.h>
+
 #import "SOGoTool.h"

 /* TODO:
@@ -116,6 +118,29 @@ typedef enum SOGoToolRestoreMode {
 	   "            sogo-tool restore -p /tmp/foo bob\n");
 }

+- (Class) parsingClassForContent: (NSString *) theContent
+{
+  CardGroup *cardEntry;
+  NSString *firstTag;
+  Class objectClass;
+
+  objectClass = Nil;
+
+  cardEntry = [CardGroup parseSingleFromSource: theContent];
+  if (cardEntry)
+    {
+      firstTag = [[cardEntry tag] uppercaseString];
+      if ([firstTag isEqualToString: @"VCARD"])
+	objectClass = [NGVCard class];
+      else if ([firstTag isEqualToString: @"VLIST"])
+	objectClass = [NGVList class];
+      else
+	objectClass = [iCalCalendar class];
+    }
+
+  return objectClass;
+}
+
 - (BOOL) checkDirectory
 {
  NSFileManager *fm;
@@ -347,11 +372,12 @@ typedef enum SOGoToolRestoreMode {
 - (BOOL) restoreRecords: (NSArray *) records
               ofFolder: (GCSFolder *) gcsFolder
 {
-  NSAutoreleasePool *pool;
  NSDictionary *existingRecords, *currentRecord;
  NSString *cName, *cContent;
-  int count, max;
+  NSAutoreleasePool *pool;
+
  unsigned int version;
+  int count, max;
  BOOL rc;

  if (records)
@@ -374,7 +400,10 @@ typedef enum SOGoToolRestoreMode {
            {
              NSLog (@"restoring record '%@'", cName);
              cContent = [currentRecord objectForKey: @"c_content"];
-              [gcsFolder writeContent: cContent toName: cName
+              [gcsFolder writeContent: cContent
+                        fromComponent: [[self parsingClassForContent: cContent] parseSingleFromSource: cContent]
+                            container: nil
+                               toName: cName
                          baseVersion: &version];
            }
        }
@@ -529,14 +558,14 @@ typedef enum SOGoToolRestoreMode {
  if (tables)
    {
      NSLog (@"Restorable folders:");
-      folderPrefixLen = 1 + [userID length];
-      tableKeys = [[tables allKeys] objectEnumerator];
+      folderPrefixLen = 8 + [userID length]; // tables keys start with /Users/<userID>
+      tableKeys = [[[tables allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)] objectEnumerator];
      while ((key = [tableKeys nextObject]))
        {
          currentFolder = [tables objectForKey: key];
          folderKey = [key substringFromIndex: folderPrefixLen];
-          NSLog (@"  '%@': %@",
-                 [currentFolder objectForKey: @"displayname"], folderKey);
+          NSLog (@"  %@ (%@)",
+                 folderKey, [currentFolder objectForKey: @"displayname"]);
        }
    }
  else
@@ -69,6 +69,7 @@
 "You cannot create a list in a shared address book." 
        = "No podeu crear una llista en una agenda compartida.";
 "Warning" = "Atenció";
+"Can't contact server" = "Ha ocorregut un error en contactar amb el servidor. Per favor, intenti-ho més tarda.";

 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "No teniu permís per a accedir a aquest mòdul o sistema. Contacteu amb l'administrador.";
@@ -101,10 +102,9 @@
 "Due Date:" = "Data límit:";
 "Location:" = "Lloc:";

-/* Mail labels */
+/* mail labels */
 "Important" = "Important";
 "Work" = "Feina";
-"Work" = "Feina";
 "Personal" = "Personal";
 "To Do" = "Per fer";
 "Later" = "Més tard";
Author	SHA1	Message	Date
Ludovic Marcotte	329552030b	Merge to 2.2.8	2014-09-10 14:17:14 -04:00
Ludovic Marcotte	38cb86bdb1	Update ChangeLog	2014-09-10 14:15:34 -04:00
Alexandre Cloutier	69c8aa0743	quickfix for IE for searchInbox	2014-09-10 13:22:36 -04:00
Alexandre Cloutier	60e3c1c822	Merge branch 'master' of https://github.com/inverse-inc/sogo	2014-09-10 13:02:45 -04:00
Alexandre Cloutier	36b833ccb5	bugFix InboxSearch IMAP query keywords	2014-09-10 13:02:13 -04:00
Francis Lachapelle	9d6bcb00bc	Fix compilation warning	2014-09-10 11:58:47 -04:00
Francis Lachapelle	1dd3dbacb5	Various fixes and improvements to the Mail module	2014-09-10 11:37:52 -04:00
Francis Lachapelle	c441fa5b80	Various fix and improvements to Scheduler module	2014-09-10 10:58:58 -04:00
Francis Lachapelle	7e297ad56c	Remove spaces	2014-09-10 10:58:46 -04:00
Francis Lachapelle	8eb4212f5d	Various fix and improvements to Mail module	2014-09-10 10:49:54 -04:00
Luc Charland	3ad9327d17	putting test-prevent-invitations back in	2014-09-10 10:25:42 -04:00
Ludovic Marcotte	0483794f45	Updated the documentation for the release	2014-09-10 09:20:47 -04:00
Alexandre Cloutier	3c1d6d7d89	bugfix; UserSettings was not refresh properly after toggling threads	2014-09-09 16:05:12 -04:00
Francis Lachapelle	1dcf631ad6	Update translations	2014-09-09 15:50:39 -04:00
Ludovic Marcotte	cbc53b3a52	Updated NEWS file	2014-09-09 15:38:15 -04:00
Alexandre Cloutier	574c245758	bugfix PreventInvitation; fix object parsing on a blank user	2014-09-09 15:36:14 -04:00
Alexandre Cloutier	f3ca4ea7fc	bugfix foldingThread; Renaming a foldername with a space was not correctly handled	2014-09-09 15:36:14 -04:00
Ludovic Marcotte	e542ff5646	Fix for bug #1240	2014-09-09 15:15:56 -04:00
Francis Lachapelle	bbe1e09ab9	Merge pull request #52 from alexcloutier/feature/RefreshViewCheck All modules can now be automatically refreshed	2014-09-09 15:12:21 -04:00
Alexandre Cloutier	9daab5a9a1	update NEWS file	2014-09-09 14:28:05 -04:00
Alexandre Cloutier	1fb3198dbc	applied comments	2014-09-09 14:27:05 -04:00
Alexandre Cloutier	d62c504763	Changed the configurable variable SOGoMailMessageCheck to a general refresh associated to the current view	2014-09-09 14:27:05 -04:00
extrafu	126a05d391	Merge pull request #54 from alexcloutier/feature/FoldingThreads Feature/folding threads	2014-09-09 14:06:30 -04:00
extrafu	42ffe14052	Merge pull request #55 from alexcloutier/bugfix/LabelsTagging Bugfix/labels tagging	2014-09-09 14:06:19 -04:00
Alexandre Cloutier	7db526a5d9	bugfix for new user without userSettings.mail	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	06f81a032c	applied comments	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	df42c31618	Update NEWS file	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	e6002c9b2a	applied comments	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	0c88edc61b	bugfix where an exception was raised if threadsCollapsed is undefined	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	267a689683	Applied comments	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	c9d1294a8a	Manage the collapse UIDs save in the user settings	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	59023da7f0	applied comments and fix bug where the folded threads were saved only after refreshing the entire page	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	c5f9dd086b	Possibility to collapsed threads with persistance	2014-09-09 13:51:02 -04:00
Alexandre Cloutier	0bfaceb398	applied comments	2014-09-09 12:51:59 -04:00
Alexandre Cloutier	9a380f711c	bugfix PreventInvitation	2014-09-09 11:30:00 -04:00
Ludovic Marcotte	8c8e7d24a7	Modified Apache's config file to handle Apache > 2.3	2014-09-08 15:25:21 -04:00
Alexandre Cloutier	77c50e5232	applied comments; fix errors from merge and update NEWS file	2014-09-08 14:11:42 -04:00
Francis Lachapelle	56ef00661c	Merge pull request #50 from alexcloutier/feature/SearchInbox New feature to search multiple mailboxes	2014-09-05 16:09:59 -04:00
Francis Lachapelle	b639c2d251	Fixes for IE	2014-09-05 16:04:29 -04:00
Alexandre Cloutier	984e208dd9	IE bugfixes	2014-09-05 11:01:57 -04:00
Luc Charland	606ee9780e	dont test prevent invitations	2014-09-04 22:36:02 -04:00
Luc Charland	c6f82dac01	catch specific exception	2014-09-04 22:24:32 -04:00
Luc Charland	e37a603632	should help some builds that might timeout	2014-09-04 21:59:36 -04:00
Alexandre Cloutier	ca8351d1f9	fix IE7, IE8, IE9, IE10, IE11 GUI	2014-09-04 10:50:03 -04:00
Luc Charland	031e4c9409	more of the same	2014-09-03 22:43:49 -04:00
Luc Charland	c621bbcd56	Those need the same adjustments	2014-09-03 22:32:46 -04:00
Luc Charland	4b94a183be	urllib.quote needs a string	2014-09-03 13:50:13 -04:00
Alexandre Cloutier	32476b16cc	applied comments and fix bug when tagging msgs already tagged	2014-09-02 14:31:46 -04:00
Alexandre Cloutier	3b65eaea0b	Tagging labels with 1 AJAX request	2014-09-02 13:42:04 -04:00
Alexandre Cloutier	7e26d80c77	merge conflicts	2014-09-02 10:11:27 -04:00
Francis Lachapelle	1af52e6d6b	Fix message labels handling Selecting "none" from the label submenu on a multiple selection of messages is now working. When changing the label of multiple messages, the display is now properly updated. Fixes #2902	2014-08-29 15:39:06 -04:00
Alexandre Cloutier	eaf815eae6	update NEWS file	2014-08-29 14:55:21 -04:00
Alexandre Cloutier	9bd09cc55d	add the location column	2014-08-28 13:20:43 -04:00
Luc Charland	ced0962894	Added white_listed_attendee to the config file	2014-08-28 10:43:32 -04:00
Francis Lachapelle	dadad3df2a	Fix some compilation warnings	2014-08-28 09:38:09 -04:00
Alexandre Cloutier	da184f8459	bugfix#2864	2014-08-27 16:50:45 -04:00
Alexandre Cloutier	03152ea3d4	bugfix with DND from calendar view to calendar list	2014-08-27 16:01:35 -04:00
Alexandre Cloutier	8fbd2384a4	Merge branch 'master' of https://github.com/inverse-inc/sogo	2014-08-27 13:55:02 -04:00
Alexandre Cloutier	84a08659ec	bugfix where it is not possible to delete msg when mailbox is full	2014-08-27 13:50:56 -04:00
Luc Charland	d749d5c2fb	Added tests for prevent invitation and whitelist	2014-08-27 13:31:49 -04:00
Alexandre Cloutier	07a138e0d6	applied comments and add the possibility to resize the search inbox window	2014-08-27 12:30:33 -04:00
Alexandre Cloutier	76c9b45fd0	update Localizable.strings Update the print window options strings	2014-08-26 14:25:27 -04:00
Alexandre Cloutier	1ab3a588f3	Merge branch 'master' of https://github.com/inverse-inc/sogo	2014-08-26 13:41:58 -04:00
Alexandre Cloutier	38a3b7bb4f	print calendars events&Tasks with colors - either borders or backgrounds	2014-08-26 13:36:42 -04:00
Francis Lachapelle	b2b77c65d3	Fix folders paths of "sogo-tool restore -l"	2014-08-26 09:00:13 -04:00
Alexandre Cloutier	6aecccf6ca	indentations	2014-08-25 13:46:35 -04:00
Francis Lachapelle	e4a84d4920	Fix usage of SOGoSubscriptionFolderFormat default	2014-08-25 12:15:05 -04:00
Francis Lachapelle	28f26ec08e	Fix display of users with no possible subscription	2014-08-25 10:16:10 -04:00
Francis Lachapelle	74bd96e5a6	Fix encoding of new calendars + new subscriptions	2014-08-25 10:12:09 -04:00
Alexandre Cloutier	e044476772	bugFix #2827	2014-08-15 13:41:30 -04:00
Alexandre Cloutier	c76cb36461	Disable the search button on toolbar once it is opened	2014-08-15 13:06:46 -04:00
Alexandre Cloutier	73fcdc2306	adjust css for other browser, fix display bug	2014-08-15 11:41:37 -04:00
Ludovic Marcotte	b9dd1ddc5a	Fix for bug #2892	2014-08-15 09:57:19 -04:00
Alexandre Cloutier	8783f09a4a	fix leak	2014-08-14 15:01:40 -04:00
Alexandre Cloutier	52476251b8	applied comments, fix bug and add sortable results	2014-08-14 14:49:44 -04:00
Alexandre Cloutier	f6c7ca3379	applied comments	2014-08-13 17:41:58 -04:00
Alexandre Cloutier	c3e46e4baf	code refactoring and GUI improvement	2014-08-11 09:25:09 -04:00
Alexandre Cloutier	7794d716b9	version 1 of the inbox search	2014-08-06 14:49:36 -04:00
Francis Lachapelle	5b886e5c4d	Fix issue with DnD of tasks with FireFox	2014-08-01 12:26:53 -04:00
Ludovic Marcotte	cde1db9324	Refactored GCSFolder: -writeContent and fixed sogo-tool restore	2014-08-01 09:40:45 -04:00
Ludovic Marcotte	f43341c100	Fixed JSON'ification of the admin module	2014-07-31 16:19:49 -04:00
Ludovic Marcotte	b05fcc7d82	Fat commit to refactor the quick record generation	2014-07-30 14:51:00 -04:00
Ludovic Marcotte	04904d8c61	Merge to 2.2.6	2014-07-02 11:41:46 -04:00
Francis Lachapelle	f0b4a05c70	Merge to 2.2.5	2014-06-05 13:35:45 -04:00
Francis Lachapelle	95d6911f1a	Merge to 2.2.4	2014-05-29 11:17:46 -04:00
Francis Lachapelle	48f98ef34e	Merge to 2.2.3	2014-04-03 10:06:08 -04:00
Francis Lachapelle	ae0c5eae77	Merge to 2.2.2	2014-03-21 15:39:00 -04:00
Francis Lachapelle	0c2d727057	Merge to 2.2.2	2014-03-21 15:33:55 -04:00
Francis Lachapelle	072f5f5a15	Merge to 2.2.1	2014-03-07 14:03:41 -05:00
Francis Lachapelle	1db85743a0	Merge to 2.2.0	2014-02-24 16:54:11 -05:00
Jean Raby	2cf66e037d	Merge to 2.1.1	2013-11-19 14:00:22 -05:00
Francis Lachapelle	449d838dc2	Merge to 2.1.0	2013-11-07 14:43:19 -05:00
Francis Lachapelle	c4bc215a47	Merge to 2.0.7	2013-07-23 10:02:39 -04:00
Francis Lachapelle	c9936d7ecf	Merge to 2.0.7	2013-07-23 08:38:44 -04:00
Francis Lachapelle	885e59a2af	Merge to 2.0.7	2013-07-19 13:46:37 -04:00
Jean Raby	bf398889bf	Merge to 2.0.6b	2013-06-27 11:36:30 -04:00
Ludovic Marcotte	e26e3d7307	Revert "Properly escape the foldername to avoid XSS issues" This reverts commit `045b275b27`.	2013-06-27 11:15:41 -04:00
Ludovic Marcotte	045b275b27	Properly escape the foldername to avoid XSS issues	2013-06-27 11:06:07 -04:00
Jean Raby	7ec1973e0f	Merge to 2.0.6a	2013-06-25 09:22:35 -04:00
Ludovic Marcotte	a79a9c4eff	Merge to 2.0.6 Conflicts: Documentation/SOGo Installation Guide.odt	2013-06-21 12:44:35 -04:00
Jean Raby	f049e2430a	Added ldap attribute mapping table	2013-04-22 12:25:22 -04:00
Jean Raby	59b3219f2d	Merge to 2.05a	2013-04-16 15:20:19 -04:00
Francis Lachapelle	e9eb8bdc86	Merge to 2.0.5	2013-04-11 12:56:34 -04:00
Francis Lachapelle	5e0c7ae4f2	Merge to 2.0.4b	2013-02-04 14:24:46 -05:00
Francis Lachapelle	c1c0c1ab44	Merge to 2.0.4a	2013-01-30 08:54:00 -05:00
Francis Lachapelle	a59fff785b	Merge to 2.0.4	2013-01-25 14:01:10 -05:00
Francis Lachapelle	6a70db80e6	Merge to 2.0.3a	2012-12-07 09:35:03 -05:00
Francis Lachapelle	d610630c8d	Merge to 2.0.3 (again)	2012-12-06 13:08:47 -05:00
Francis Lachapelle	4dc7790015	Merge to 2.0.3	2012-12-06 10:40:33 -05:00
Francis Lachapelle	9dd000a2ca	Merge to 2.0.2 Merge commit '1080bee3ba9749aad0dc28625081fc6a496f7280' into maint Conflicts: OpenChange/MAPIStoreContext.h OpenChange/MAPIStoreContext.m	2012-11-15 10:10:48 -05:00
Wolfgang Sourdeau	ce4084e528	getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers	2012-10-12 16:55:27 -04:00