Merge to 2.2.13

Merge to 2.2.12a
Merge to 2.2.12
2014-12-30 08:01:52 -05:00 · 2014-12-19 09:04:01 -05:00 · 2014-12-18 08:57:15 -05:00 · 2014-12-10 15:24:12 -05:00 · 2014-12-10 14:25:11 -05:00 · 2014-12-09 09:09:58 -05:00
2554 changed files with 96276 additions and 250088 deletions
@@ -1,32 +1,18 @@
+config.make
+tags
 *._*
-*.css
-*.pyc
-*.sax
-*.swp
-*.wox/
-*/*/*.SOGo/
-*/*/*/obj/
-*/*/obj/
 */obj/
-.scss-lint-config.yml_
-ActiveSync/ActiveSync.SOGo
-Documentation/*.docbook
-Documentation/*.pdf
+*._*
+*/*/obj/
+*/*/*/obj/
+*/*/*.SOGo/
+*.sax
+*.wox/
+*.swp
 SoObjects/SOGo/SOGo.framework/
 SoObjects/SOGo/derived_src/
 Tests/*/config.py
-UI/WebServerResources/.bowerrc
-UI/WebServerResources/.sass-cache/
-UI/WebServerResources/bower_components/
-UI/WebServerResources/css/
-UI/WebServerResources/css/styles.css
-UI/WebServerResources/css/styles.css.map
-UI/WebServerResources/js/*.js
-UI/WebServerResources/js/*.js.map
-UI/WebServerResources/js/vendor/*.js
-UI/WebServerResources/js/vendor/*.js.map
-UI/WebServerResources/node_modules/
-UI/WebServerResources/scss/.sass-cache/
-config.make
-doc
-tags
+*.pyc
+._*
+Documentation/*.docbook
+Documentation/*.pdf
@@ -1,3 +0,0 @@
-[submodule "UI/WebServerResources/angular-material"]
-	path = UI/WebServerResources/angular-material
-	url = https://github.com/angular/material
@@ -12,29 +12,20 @@ trans.da_DK = UI/MailerUI/Danish.lproj/Localizable.strings
 trans.de = UI/MailerUI/German.lproj/Localizable.strings
 trans.es_AR = UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/MailerUI/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/MailerUI/Basque.lproj/Localizable.strings
 trans.fi = UI/MailerUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/MailerUI/French.lproj/Localizable.strings
-trans.hr_HR = UI/MailerUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/MailerUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/MailerUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/MailerUI/Italian.lproj/Localizable.strings
-trans.lt = UI/MailerUI/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/MailerUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MailerUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MailerUI/Polish.lproj/Localizable.strings
-trans.pt = UI/MailerUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MailerUI/Russian.lproj/Localizable.strings
 trans.sk = UI/MailerUI/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/MailerUI/Slovenian.lproj/Localizable.strings
-trans.sr = UI/MailerUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/MailerUI/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-preferencesui]
 source_file = UI/PreferencesUI/English.lproj/Localizable.strings
@@ -47,29 +38,20 @@ trans.da_DK = UI/PreferencesUI/Danish.lproj/Localizable.strings
 trans.de = UI/PreferencesUI/German.lproj/Localizable.strings
 trans.es_AR = UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/PreferencesUI/Basque.lproj/Localizable.strings
 trans.fi = UI/PreferencesUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/PreferencesUI/French.lproj/Localizable.strings
-trans.hr_HR = UI/PreferencesUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/PreferencesUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/PreferencesUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/PreferencesUI/Italian.lproj/Localizable.strings
-trans.lt = UI/PreferencesUI/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/PreferencesUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/PreferencesUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/PreferencesUI/Polish.lproj/Localizable.strings
-trans.pt = UI/PreferencesUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/PreferencesUI/Russian.lproj/Localizable.strings
 trans.sk = UI/PreferencesUI/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/PreferencesUI/Slovenian.lproj/Localizable.strings
-trans.sr = UI/PreferencesUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/PreferencesUI/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-scheduler]
 source_file = UI/Scheduler/English.lproj/Localizable.strings
@@ -82,29 +64,20 @@ trans.da_DK = UI/Scheduler/Danish.lproj/Localizable.strings
 trans.de = UI/Scheduler/German.lproj/Localizable.strings
 trans.es_AR = UI/Scheduler/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/Scheduler/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/Scheduler/Basque.lproj/Localizable.strings
 trans.fi = UI/Scheduler/Finnish.lproj/Localizable.strings
 trans.fr = UI/Scheduler/French.lproj/Localizable.strings
-trans.hr_HR = UI/Scheduler/Croatian.lproj/Localizable.strings
 trans.hu = UI/Scheduler/Hungarian.lproj/Localizable.strings
 trans.is = UI/Scheduler/Icelandic.lproj/Localizable.strings
 trans.it = UI/Scheduler/Italian.lproj/Localizable.strings
-trans.lt = UI/Scheduler/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/Scheduler/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Scheduler/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Scheduler/Polish.lproj/Localizable.strings
-trans.pt = UI/Scheduler/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Scheduler/Russian.lproj/Localizable.strings
 trans.sk = UI/Scheduler/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/Scheduler/Slovenian.lproj/Localizable.strings
-trans.sr = UI/Scheduler/Serbian.lproj/Localizable.strings
 trans.sv = UI/Scheduler/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-contacts]
 source_file = UI/Contacts/English.lproj/Localizable.strings
@@ -117,29 +90,20 @@ trans.da_DK = UI/Contacts/Danish.lproj/Localizable.strings
 trans.de = UI/Contacts/German.lproj/Localizable.strings
 trans.es_AR = UI/Contacts/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/Contacts/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/Contacts/Basque.lproj/Localizable.strings
 trans.fi = UI/Contacts/Finnish.lproj/Localizable.strings
 trans.fr = UI/Contacts/French.lproj/Localizable.strings
-trans.hr_HR = UI/Contacts/Croatian.lproj/Localizable.strings
 trans.hu = UI/Contacts/Hungarian.lproj/Localizable.strings
 trans.is = UI/Contacts/Icelandic.lproj/Localizable.strings
 trans.it = UI/Contacts/Italian.lproj/Localizable.strings
-trans.lt = UI/Contacts/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/Contacts/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Contacts/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Contacts/Polish.lproj/Localizable.strings
-trans.pt = UI/Contacts/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Contacts/Russian.lproj/Localizable.strings
 trans.sk = UI/Contacts/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/Contacts/Slovenian.lproj/Localizable.strings
-trans.sr = UI/Contacts/Serbian.lproj/Localizable.strings
 trans.sv = UI/Contacts/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/Contacts/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mainui]
 source_file = UI/MainUI/English.lproj/Localizable.strings
@@ -152,29 +116,20 @@ trans.da_DK = UI/MainUI/Danish.lproj/Localizable.strings
 trans.de = UI/MainUI/German.lproj/Localizable.strings
 trans.es_AR = UI/MainUI/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/MainUI/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/MainUI/Basque.lproj/Localizable.strings
 trans.fi = UI/MainUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/MainUI/French.lproj/Localizable.strings
-trans.hr_HR = UI/MainUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/MainUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/MainUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/MainUI/Italian.lproj/Localizable.strings
-trans.lt = UI/MainUI/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/MainUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MainUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MainUI/Polish.lproj/Localizable.strings
-trans.pt = UI/MainUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MainUI/Russian.lproj/Localizable.strings
 trans.sk = UI/MainUI/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/MainUI/Slovenian.lproj/Localizable.strings
-trans.sr = UI/MainUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/MainUI/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/MainUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-common]
 source_file = UI/Common/English.lproj/Localizable.strings
@@ -187,29 +142,20 @@ trans.da_DK = UI/Common/Danish.lproj/Localizable.strings
 trans.de = UI/Common/German.lproj/Localizable.strings
 trans.es_AR = UI/Common/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/Common/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/Common/Basque.lproj/Localizable.strings
 trans.fi = UI/Common/Finnish.lproj/Localizable.strings
 trans.fr = UI/Common/French.lproj/Localizable.strings
-trans.hr_HR = UI/Common/Croatian.lproj/Localizable.strings
 trans.hu = UI/Common/Hungarian.lproj/Localizable.strings
 trans.is = UI/Common/Icelandic.lproj/Localizable.strings
 trans.it = UI/Common/Italian.lproj/Localizable.strings
-trans.lt = UI/Common/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/Common/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Common/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Common/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Common/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Common/Polish.lproj/Localizable.strings
-trans.pt = UI/Common/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Common/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Common/Russian.lproj/Localizable.strings
 trans.sk = UI/Common/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/Common/Slovenian.lproj/Localizable.strings
-trans.sr = UI/Common/Serbian.lproj/Localizable.strings
 trans.sv = UI/Common/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/Common/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-administrationui]
 source_file = UI/AdministrationUI/English.lproj/Localizable.strings
@@ -222,29 +168,20 @@ trans.da_DK = UI/AdministrationUI/Danish.lproj/Localizable.strings
 trans.de = UI/AdministrationUI/German.lproj/Localizable.strings
 trans.es_AR = UI/AdministrationUI/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/AdministrationUI/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/AdministrationUI/Basque.lproj/Localizable.strings
 trans.fi = UI/AdministrationUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/AdministrationUI/French.lproj/Localizable.strings
-trans.hr_HR = UI/AdministrationUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/AdministrationUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/AdministrationUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/AdministrationUI/Italian.lproj/Localizable.strings
-trans.lt = UI/AdministrationUI/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/AdministrationUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/AdministrationUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/AdministrationUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/AdministrationUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/AdministrationUI/Polish.lproj/Localizable.strings
-trans.pt = UI/AdministrationUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/AdministrationUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/AdministrationUI/Russian.lproj/Localizable.strings
 trans.sk = UI/AdministrationUI/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/AdministrationUI/Slovenian.lproj/Localizable.strings
-trans.sr = UI/AdministrationUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/AdministrationUI/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/AdministrationUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-appointments]
 source_file = SoObjects/Appointments/English.lproj/Localizable.strings
@@ -257,29 +194,20 @@ trans.da_DK = SoObjects/Appointments/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Appointments/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
-trans.eu = SoObjects/Appointments/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Appointments/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Appointments/French.lproj/Localizable.strings
-trans.hr_HR = SoObjects/Appointments/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Appointments/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Appointments/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Appointments/Italian.lproj/Localizable.strings
-trans.lt = SoObjects/Appointments/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = SoObjects/Appointments/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Appointments/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Appointments/Polish.lproj/Localizable.strings
-trans.pt = SoObjects/Appointments/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Appointments/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Appointments/Slovak.lproj/Localizable.strings
-trans.sl_SI = SoObjects/Appointments/Slovenian.lproj/Localizable.strings
-trans.sr = SoObjects/Appointments/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Appointments/Swedish.lproj/Localizable.strings
-trans.tr_TR = SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-contacts]
 source_file = SoObjects/Contacts/English.lproj/Localizable.strings
@@ -292,29 +220,20 @@ trans.da_DK = SoObjects/Contacts/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Contacts/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Contacts/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = SoObjects/Contacts/SpanishSpain.lproj/Localizable.strings
-trans.eu = SoObjects/Contacts/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Contacts/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Contacts/French.lproj/Localizable.strings
-trans.hr_HR = SoObjects/Contacts/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Contacts/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Contacts/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Contacts/Italian.lproj/Localizable.strings
-trans.lt = SoObjects/Contacts/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = SoObjects/Contacts/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Contacts/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Contacts/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Contacts/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Contacts/Polish.lproj/Localizable.strings
-trans.pt = SoObjects/Contacts/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Contacts/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Contacts/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Contacts/Slovak.lproj/Localizable.strings
-trans.sl_SI = SoObjects/Contacts/Slovenian.lproj/Localizable.strings
-trans.sr = SoObjects/Contacts/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
-trans.tr_TR = SoObjects/Contacts/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-mailer]
 source_file = SoObjects/Mailer/English.lproj/Localizable.strings
@@ -327,29 +246,20 @@ trans.da_DK = SoObjects/Mailer/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Mailer/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Mailer/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = SoObjects/Mailer/SpanishSpain.lproj/Localizable.strings
-trans.eu = SoObjects/Mailer/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Mailer/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Mailer/French.lproj/Localizable.strings
-trans.hr_HR = SoObjects/Mailer/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Mailer/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Mailer/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Mailer/Italian.lproj/Localizable.strings
-trans.lt = SoObjects/Mailer/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = SoObjects/Mailer/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Mailer/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Mailer/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Mailer/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Mailer/Polish.lproj/Localizable.strings
-trans.pt = SoObjects/Mailer/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Mailer/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Mailer/Slovak.lproj/Localizable.strings
-trans.sl_SI = SoObjects/Mailer/Slovenian.lproj/Localizable.strings
-trans.sr = SoObjects/Mailer/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
-trans.tr_TR = SoObjects/Mailer/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mailpartviewers]
 source_file = UI/MailPartViewers/English.lproj/Localizable.strings
@@ -362,26 +272,17 @@ trans.da_DK = UI/MailPartViewers/Danish.lproj/Localizable.strings
 trans.de = UI/MailPartViewers/German.lproj/Localizable.strings
 trans.es_AR = UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings
 trans.es_ES = UI/MailPartViewers/SpanishSpain.lproj/Localizable.strings
-trans.eu = UI/MailPartViewers/Basque.lproj/Localizable.strings
 trans.fi = UI/MailPartViewers/Finnish.lproj/Localizable.strings
 trans.fr = UI/MailPartViewers/French.lproj/Localizable.strings
-trans.hr_HR = UI/MailPartViewers/Croatian.lproj/Localizable.strings
 trans.hu = UI/MailPartViewers/Hungarian.lproj/Localizable.strings
 trans.is = UI/MailPartViewers/Icelandic.lproj/Localizable.strings
 trans.it = UI/MailPartViewers/Italian.lproj/Localizable.strings
-trans.lt = UI/MailPartViewers/Lithuanian.lproj/Localizable.strings
-trans.mk_MK = UI/MailPartViewers/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MailPartViewers/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MailPartViewers/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MailPartViewers/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MailPartViewers/Polish.lproj/Localizable.strings
-trans.pt = UI/MailPartViewers/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MailPartViewers/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MailPartViewers/Russian.lproj/Localizable.strings
 trans.sk = UI/MailPartViewers/Slovak.lproj/Localizable.strings
-trans.sl_SI = UI/MailPartViewers/Slovenian.lproj/Localizable.strings
-trans.sr = UI/MailPartViewers/Serbian.lproj/Localizable.strings
 trans.sv = UI/MailPartViewers/Swedish.lproj/Localizable.strings
-trans.tr_TR = UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MailPartViewers/Ukrainian.lproj/Localizable.strings
-trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings
@@ -1,4 +1 @@
-ifeq ($(HAS_LIBRARY_ssl),yes)
-ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
-BUNDLE_LIBS += -lcrypto
-endif
+# compilation settings
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __NGDOMELEMENTACTIVESYNC_H__

 #import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>

@class NSDictionary;

@@ -101,7 +101,7 @@ static NSArray *asElementArray = nil;
  int i, count;
  
  if (!asElementArray)
-    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", @"Exception", nil];
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", nil];

  data = [NSMutableDictionary dictionary];

@@ -1,6 +1,6 @@
 /*

-Copyright (c) 2015, Inverse inc.
+Copyright (c) 2014, Inverse inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "NGMimeMessage+ActiveSync.h"

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>

 #import <NGMail/NGMailAddress.h>
 #import <NGMail/NGMailAddressParser.h>
@@ -38,14 +40,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@implementation NGMimeMessage (ActiveSync)

- (void) _addRecipients: (NSEnumerator *) enumerator
-                toArray: (NSMutableArray *) recipients
+- (NSArray *) allRecipients
 {
+  NSEnumerator *enumerator, *addressList;
+  NSMutableArray *recipients;
  NGMailAddressParser *parser;
-  NSEnumerator *addressList;
  NGMailAddress *address;
  NSString *s;

+  recipients = [NSMutableArray array];
+
+  enumerator = [[self headersForKey: @"to"] objectEnumerator];
  while ((s = [enumerator nextObject]))
    {
      parser = [NGMailAddressParser mailAddressParserWithString: s];
@@ -54,22 +59,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      while ((address = [addressList nextObject]))
        [recipients addObject: [address address]];
    }
-}

- (NSArray *) allRecipients
-{
-  NSMutableArray *recipients;
-
-  recipients = [NSMutableArray array];
-
-  [self _addRecipients: [[self headersForKey: @"to"] objectEnumerator]
-               toArray: recipients];
-
-  [self _addRecipients: [[self headersForKey: @"cc"] objectEnumerator]
-               toArray: recipients];
-
-  [self _addRecipients: [[self headersForKey: @"bcc"] objectEnumerator]
-               toArray: recipients];
+  enumerator = [[self headersForKey: @"cc"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      parser = [NGMailAddressParser mailAddressParserWithString: s];
+      addressList = [[parser parseAddressList] objectEnumerator];
+      
+      while ((address = [addressList nextObject]))
+        [recipients addObject: [address address]];
+    }

  return recipients;
 }
@@ -29,12 +29,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NGVCard+ActiveSync.h"

+#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSTimeZone.h>
+#import <Foundation/NSString.h>

 #import <NGExtensions/NSString+misc.h>

+#import <NGCards/CardElement.h>
+
 #import <Contacts/NGVCard+SOGo.h>

 #import <SOGo/NSString+Utilities.h>
@@ -42,49 +45,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"

-#import <NGObjWeb/WOContext+SoObjects.h>
-
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
-
@implementation NGVCard (ActiveSync)

-//
-// This function is called for each elements which can be ghosted according to specs. 
-// https://msdn.microsoft.com/en-us/library/gg650908%28v=exchg.80%29.aspx
-//
- (BOOL) _isGhosted: (NSString *) element
-           inContext: (WOContext *) context
-{
-  NSArray *supportedElements;
-
-  supportedElements = [context objectForKey: @"SupportedElements"];
-
-  // If the client does not include a Supported element in the initial Sync command request for
-  // a folder, then all of the elements that can be ghosted are considered not ghosted.
-  if (!supportedElements)
-    return NO;
-
-  // If the client includes an empty Supported element in the initial Sync command request for 
-  // a folder, then all elements that can be ghosted are considered ghosted.
-  if (![supportedElements count])
-    return YES;
-
-  // If the client includes a Supported element that contains child elements in the initial 
-  // Sync command request for a folder, then each child element of that Supported element is 
-  // considered not ghosted. All elements that can be ghosted that are not included as child 
-  // elements of the Supported element are considered ghosted. 
-  if (!([supportedElements indexOfObject: element] == NSNotFound))
-    return YES;
-
-  return NO;
-}
-
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSArray *emails, *addresses, *categories, *elements;
  CardElement *n, *homeAdr, *workAdr;
-  NSMutableString *s, *a;
+  NSMutableString *s;
  NSString *url;
  id o;

@@ -95,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  if ((o = [n flattenedValueAtIndex: 0 forKey: @""]))
    [s appendFormat: @"<LastName xmlns=\"Contacts:\">%@</LastName>", [o activeSyncRepresentationInContext: context]];
-
+  
  if ((o = [n flattenedValueAtIndex: 1 forKey: @""]))
    [s appendFormat: @"<FirstName xmlns=\"Contacts:\">%@</FirstName>", [o activeSyncRepresentationInContext: context]];
  
@@ -138,7 +105,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    [s appendFormat: @"<JobTitle xmlns=\"Contacts:\">%@</JobTitle>", [o activeSyncRepresentationInContext: context]];
  
  if ((o = [self preferredEMail])) 
-    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", [o activeSyncRepresentationInContext: context]];
+    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", o];
  
  
  // Secondary email addresses (2 and 3)
@@ -148,7 +115,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      o = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
      
-      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, [o activeSyncRepresentationInContext: context], i+2];
+      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, o, i+2];

      if (i == 1)
        break;
@@ -178,22 +145,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ([addresses count])
    {
      homeAdr = [addresses objectAtIndex: 0];
-      a = [NSMutableString string];
      
      if ((o = [homeAdr flattenedValueAtIndex: 2  forKey: @""]))
-        [a appendString: [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [homeAdr flattenedValueAtIndex: 1  forKey: @""]) && [o length])
-        [a appendFormat: @"\n%@", [o activeSyncRepresentationInContext: context]];
+        [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [o activeSyncRepresentationInContext: context]];
      
-      [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [a activeSyncRepresentationInContext: context]];
-
      if ((o = [homeAdr flattenedValueAtIndex: 3  forKey: @""]))
        [s appendFormat: @"<HomeCity xmlns=\"Contacts:\">%@</HomeCity>", [o activeSyncRepresentationInContext: context]];
      
      if ((o = [homeAdr flattenedValueAtIndex: 4  forKey: @""]))
        [s appendFormat: @"<HomeState xmlns=\"Contacts:\">%@</HomeState>", [o activeSyncRepresentationInContext: context]];
-
+      
      if ((o = [homeAdr flattenedValueAtIndex: 5  forKey: @""]))
        [s appendFormat: @"<HomePostalCode xmlns=\"Contacts:\">%@</HomePostalCode>", [o activeSyncRepresentationInContext: context]];
      
@@ -209,15 +170,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ([addresses count])
    {
      workAdr = [addresses objectAtIndex: 0];
-      a = [NSMutableString string];
      
      if ((o = [workAdr flattenedValueAtIndex: 2  forKey: @""]))
-        [a appendString: [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [workAdr flattenedValueAtIndex: 1  forKey: @""]) && [o length])
-        [a appendFormat: @"\n%@", [o activeSyncRepresentationInContext: context]];
-
-      [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [a activeSyncRepresentationInContext: context]];
+        [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [o activeSyncRepresentationInContext: context]];
      
      if ((o = [workAdr flattenedValueAtIndex: 3  forKey: @""]))
        [s appendFormat: @"<BusinessCity xmlns=\"Contacts:\">%@</BusinessCity>", [o activeSyncRepresentationInContext: context]];
@@ -234,13 +189,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  // Other, less important fields
  if ((o = [self birthday]))
-    {
-      [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>",
-         [[o dateByAddingYears: 0 months: 0 days: 0
-                         hours: -12 minutes: 0
-                       seconds: 0]
-              activeSyncRepresentationInContext: context]];
-    }
+    [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>", [o activeSyncRepresentationInContext: context]];

  if ((o = [self note]))
    {
@@ -267,7 +216,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                    inContext: (WOContext *) context
 {
  CardElement *element;
-  NSMutableArray *addressLines;
  id o;
  
  // Contact's note
@@ -277,20 +225,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // Categories
  if ((o = [theValues objectForKey: @"Categories"]) && [o length])
    [self setCategories: o];
-  else
-    [[self children] removeObjectsInArray: [self childrenWithTag: @"Categories"]];

  // Birthday
  if ((o = [theValues objectForKey: @"Birthday"]))
    {
      o = [o calendarDate];
-      [self setBday: [o descriptionWithCalendarFormat: @"%Y-%m-%d" timeZone: nil locale: nil]];
+      [self setBday: [o descriptionWithCalendarFormat: @"%Y-%m-%d"]];
    }
-  else if (![self _isGhosted: @"Birthday" inContext: context])
-    {
-      [self setBday: @""];
-    }
-

  //
  // Business address information
@@ -302,48 +243,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // BusinessCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"work"];
-
-  if ((o = [theValues objectForKey: @"BusinessStreet"]) || ![self _isGhosted: @"BusinessStreet" inContext: context])
-    {
-      addressLines = [NSMutableArray arrayWithArray: [o componentsSeparatedByString: @"\n"]];
-
-      [element setSingleValue: @""
-                      atIndex: 1 forKey: @""];
-      [element setSingleValue: [addressLines count] ? [addressLines objectAtIndex: 0] : @""
-                      atIndex: 2 forKey: @""];
-
-      // Extended address line. If there are more than 2 address lines we add them to the extended address line.
-      if ([addressLines count] > 1)
-        {
-          [addressLines removeObjectAtIndex: 0];
-          [element setSingleValue: [addressLines componentsJoinedByString: @" "]
-                          atIndex: 1 forKey: @""];
-        }
-     }
-
-  if ((o = [theValues objectForKey: @"BusinessCity"]) || ![self _isGhosted: @"BusinessCity" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
-                      atIndex: 3 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"BusinessState"]) || ![self _isGhosted: @"BusinessState" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"BusinessState"]
-                      atIndex: 4 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"BusinessPostalCode"]) || ![self _isGhosted: @"BusinessPostalCode" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
-                      atIndex: 5 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"BusinessCountry"]) || ![self _isGhosted: @"BusinessCountry" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
-                      atIndex: 6 forKey: @""];
-    }
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
+                  atIndex: 6 forKey: @""];

  //
  // Home address information
@@ -355,69 +266,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // HomeCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"home"];
-
-  if ((o = [theValues objectForKey: @"HomeStreet"]) || ![self _isGhosted: @"HomeStreet" inContext: context])
-    {
-      addressLines = [NSMutableArray arrayWithArray: [o componentsSeparatedByString: @"\n"]];
-
-      [element setSingleValue: @""
-                      atIndex: 1 forKey: @""];
-      [element setSingleValue: [addressLines count] ? [addressLines objectAtIndex: 0] : @""
-                      atIndex: 2 forKey: @""];
-
-      // Extended address line. If there are more then 2 address lines we add them to the extended address line.
-      if ([addressLines count] > 1)
-        {
-          [addressLines removeObjectAtIndex: 0];
-          [element setSingleValue: [addressLines componentsJoinedByString: @" "]
-                          atIndex: 1 forKey: @""];
-        }
-    }
-
-  if ((o = [theValues objectForKey: @"HomeCity"]) || ![self _isGhosted: @"HomeCity" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"HomeCity"]
-                      atIndex: 3 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"HomeState"]) || ![self _isGhosted: @"HomeState" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"HomeState"]
-                      atIndex: 4 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"HomePostalCode"]) || ![self _isGhosted: @"HomePostalCode" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
-                      atIndex: 5 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"HomeCountry"]) || ![self _isGhosted: @"HomeCountry" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
-                      atIndex: 6 forKey: @""];
-    }
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
+                  atIndex: 6 forKey: @""];

  // Company's name
  if ((o = [theValues objectForKey: @"CompanyName"]))
    [self setOrg: o  units: nil];
-  else if (![self _isGhosted: @"CompanyName" inContext: context])
-    [self setOrg: @""  units: nil];
  
  // Department
  if ((o = [theValues objectForKey: @"Department"]))
    [self setOrg: nil  units: [NSArray arrayWithObjects:o,nil]];
-  else if (![self _isGhosted: @"Department" inContext: context])
-    [self setOrg: nil  units: [NSArray arrayWithObjects:@"",nil]];
  
  // Email addresses
-  if ((o = [theValues objectForKey: @"Email1Address"]) || ![self _isGhosted: @"Email1Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email1Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"work"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
    }
  
-  if ((o = [theValues objectForKey: @"Email2Address"]) || ![self _isGhosted: @"Email2Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email2Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"home"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -425,7 +302,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  // SOGo currently only supports 2 email addresses ... but AS clients might send 3
  // FIXME: revise this when the GUI revamp is done in SOGo
-  if ((o = [theValues objectForKey: @"Email3Address"]) || ![self _isGhosted: @"Email3Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email3Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"three"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -435,62 +312,45 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // MiddleName
  // Suffix   (II)
  // Title    (Mr.)
-  if ((o = [theValues objectForKey: @"FileAs"]) || ![self _isGhosted: @"FileAs" inContext: context])
-    [self setFn: [theValues objectForKey: @"FileAs"]];
+  [self setFn: [theValues objectForKey: @"FileAs"]];

  [self setNWithFamily: [theValues objectForKey: @"LastName"]
                 given: [theValues objectForKey: @"FirstName"]
            additional: nil prefixes: nil suffixes: nil];
  
  // IM information
-  if ((o = [theValues objectForKey: @"IMAddress"]) || ![self _isGhosted: @"IMAddress" inContext: context])
-    [[self uniqueChildWithTag: @"x-aim"]
-      setSingleValue: [theValues objectForKey: @"IMAddress"]
-              forKey: @""];
+  [[self uniqueChildWithTag: @"x-aim"]
+    setSingleValue: [theValues objectForKey: @"IMAddress"]
+            forKey: @""];

  //
  // Phone numbrrs
  //
-  if ((o = [theValues objectForKey: @"BusinessPhoneNumber"]) || ![self _isGhosted: @"BusinessPhoneNumber" inContext: context])
-    {
-      element = [self elementWithTag: @"tel" ofType: @"work"];
-      [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];
-    }
+  element = [self elementWithTag: @"tel" ofType: @"work"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];

-  if ((o = [theValues objectForKey: @"HomePhoneNumber"]) || ![self _isGhosted: @"HomePhoneNumber" inContext: context])
-    {
-      element = [self elementWithTag: @"tel" ofType: @"home"];
-      [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];
-    }
+  element = [self elementWithTag: @"tel" ofType: @"home"];
+  [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];

-  if ((o = [theValues objectForKey: @"MobilePhoneNumber"]) || ![self _isGhosted: @"MobilePhoneNumber" inContext: context])
-    {
-      element = [self elementWithTag: @"tel" ofType: @"cell"];
-      [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];
-    }
+  element = [self elementWithTag: @"tel" ofType: @"cell"];
+  [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];

-  if ((o = [theValues objectForKey: @"BusinessFaxNumber"]) || ![self _isGhosted: @"BusinessFaxNumber" inContext: context])
-    {
-      element = [self elementWithTag: @"tel" ofType: @"fax"];
-      [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];
-    }
+  element = [self elementWithTag: @"tel" ofType: @"fax"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];

-  if ((o = [theValues objectForKey: @"PagerNumber"]) || ![self _isGhosted: @"PagerNumber" inContext: context])
-    {
-      element = [self elementWithTag: @"tel" ofType: @"pager"];
-      [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
-    }
+  element = [self elementWithTag: @"tel" ofType: @"pager"];
+  [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
  
  // Job's title
-  if ((o = [theValues objectForKey: @"JobTitle"]) || ![self _isGhosted: @"JobTitle" inContext: context])
+  if ((o = [theValues objectForKey: @"JobTitle"]))
    [self setTitle: o];
  
  // WebPage (work)
-  if ((o = [theValues objectForKey: @"WebPage"]) || ![self _isGhosted: @"WebPage" inContext: context])
+  if ((o = [theValues objectForKey: @"WebPage"]))
    [[self elementWithTag: @"url" ofType: @"work"]
          setSingleValue: o  forKey: @""];
  
-  if ((o = [theValues objectForKey: @"NickName"]) || ![self _isGhosted: @"NickName" inContext: context])
+  if ((o = [theValues objectForKey: @"NickName"]))
    [self setNickname: o];

  if ((o = [theValues objectForKey: @"Picture"]))
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "NSCalendarDate+ActiveSync.h"

 #import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>

 #define ONE_DAY 86400

@@ -30,13 +30,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "NSData+ActiveSync.h"

 #import <Foundation/NSProcessInfo.h>
-
-#import <SOGo/SOGoSystemDefaults.h>
+#import <Foundation/NSString.h>

 #import <NGExtensions/NGBase64Coding.h>
-#import <NGExtensions/NSObject+Logs.h>

 #include <wbxml/wbxml.h>
+#include <wbxml/wbxml_conv.h>
+#include <wbxml/wbxml_errors.h>

 #define WBXMLDEBUG 0

@@ -44,18 +44,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (void) _dumpToFile
 {
-  BOOL debugOn;
+  NSString *path;

-  debugOn = [[SOGoSystemDefaults sharedSystemDefaults] easDebugEnabled];
-
-  if (debugOn)
-    {
-      NSString *path;
-
-      path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
-      [self writeToFile: path  atomically: YES];
-      [self errorWithFormat: @"Original data written to: %@", path];
-    }
+  path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
+  [self writeToFile: path  atomically: YES];
+  NSLog(@"Original data written to: %@", path);
 }

 //
@@ -63,33 +56,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // 
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  NSString *tmp, *s;
-  unichar *buf, *start, c;
-  int len, i, j;
-
-  tmp = [self stringByEncodingBase64] ;
-
-  len = [tmp length];
-
-  start = buf = (unichar *)malloc(len*sizeof(unichar));
-  [tmp getCharacters: buf range: NSMakeRange(0, len)];
-
-  for (i = 0, j = 0; i < len; i++)
-    {
-      c = *buf;
-
-      if (!(c == 0xA))
-        {
-          *(start+j) = c;
-          j++;
-        }
-
-      buf++;
-    }
-
-  s = [[NSString alloc] initWithCharactersNoCopy: start  length: j  freeWhenDone: YES];
-
-  return AUTORELEASE(s);
+  return [[self stringByEncodingBase64] stringByReplacingString: @"\n" withString: @""];
 }

 - (NSData *) wbxml2xml
@@ -114,7 +81,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      return nil;
    }
@@ -147,7 +114,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  if (ret != WBXML_OK)
    {
-      [self logWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      return nil;
    }
@@ -162,7 +129,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      free(wbxml);
      wbxml_conv_xml2wbxml_destroy(conv);
@@ -1,6 +1,6 @@
 /*

-Copyright (c) 2014-2015, Inverse inc.
+Copyright (c) 2014, Inverse inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __NSSTRINGACTIVESYNC_H__

 #import <Foundation/NSString.h>
+
 #include "SOGoActiveSyncConstants.h"

@class NSCalendarDate;
@@ -48,11 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) deviceType;
 - (NSString *) attachmentName;
 - (NSString *) command;
- (NSString *) collectionid;
- (NSString *) itemid;
- (BOOL) acceptsMultiPart;
 - (NSData *) convertHexStringToBytes;
- (NSString *) protocolVersion;

@end

@@ -31,6 +31,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <Foundation/NSArray.h>
 #include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
+#include <Foundation/NSTimeZone.h>

 #include <SOGo/NSString+Utilities.h>
 #include <SOGo/NSData+Crypto.h>
@@ -62,7 +65,11 @@ static NSArray *easCommandParameters = nil;

 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  return [self safeStringByEscapingXMLString: YES];
+  NSString *s;
+
+  s = [self safeString];
+
+  return [s stringByEscapingHTMLString];
 }

 - (int) activeSyncFolderType
@@ -135,27 +142,6 @@ static NSArray *easCommandParameters = nil;
  return o;
 }

- (NSString *) protocolVersion
-{
-  NSMutableArray *components;
-
-  components = [NSMutableArray arrayWithArray: [[[self componentsSeparatedByString: @"?"] lastObject] componentsSeparatedByString: @"&"]];
-
-  // We handle BASE64 encoded queryStrings. See http://msdn.microsoft.com/en-us/library/ee160227%28v=exchg.80%29.aspx for details.
-  if ([components count] == 1)
-    {
-      NSData *queryString;
-      const char* qs_bytes;
-
-      queryString = [[components objectAtIndex: 0] dataByDecodingBase64];
-      qs_bytes = (const char*)[queryString bytes];
-
-      return [NSString stringWithFormat:@"%.1f", (float)((uint8_t)qs_bytes[0]/10)];
-    }
-
-  return nil;
-}
-
 - (NSString *) _valueForParameter: (NSString *) theParameter
 {
  NSMutableArray *components;
@@ -312,43 +298,6 @@ static NSArray *easCommandParameters = nil;
  return s;
 }

- (NSString *) itemid
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"ITEMID="];
-
-  if (!s)
-    s = @"Unknown";
-
-  return s;
-}
-
- (NSString *) collectionid
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"COLLECTIONID="];
-
-  if (!s)
-    s = @"Unknown";
-
-  return s;
-}
-
- (BOOL) acceptsMultiPart
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"OPTIONS="];
-
-  if (s && [s rangeOfString: @"AcceptMultiPart" options: NSCaseInsensitiveSearch].location != NSNotFound)
-    return YES;
-
-  return NO;
-}
-
-
 //
 // FIXME: combine with our OpenChange code.
 //
@@ -4,7 +4,7 @@ to negotiate the fees associated to your user base.

 To contact Microsoft, please visit:

-http://www.microsoft.com/en-us/legal/intellectualproperty/
+http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exchangeactivesyncprotocol.aspx

 and send an email to iplicreq@microsoft.com

@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "SOGoActiveSyncDispatcher.h"

 #import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>

@class WOResponse;

@@ -1,6 +1,6 @@
 /*

-Copyright (c) 2014-2015, Inverse inc.
+Copyright (c) 2014, Inverse inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -27,31 +27,19 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
-
 #import <Foundation/NSObject.h>

 #include "SOGoActiveSyncConstants.h"

-@class NSCalendarDate;
@class NSException;
-@class NSMutableDictionary;
@class NSURL;
-@class NSNumber;
-
-static volatile BOOL easShouldTerminate = NO;

@interface SOGoActiveSyncDispatcher : NSObject
 {
  NSURL *folderTableURL;
-  NSDictionary *imapFolderGUIDS;
  id context;
-
-  NSNumber *syncRequest;
-  BOOL debugOn;
 }

- (NSMutableDictionary *) globalMetadataForDevice;
-
 - (id) collectionFromId: (NSString *) theCollectionId
                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;

@@ -64,6 +52,5 @@ static volatile BOOL easShouldTerminate = NO;

 - (NSURL *) folderTableURL;
 - (void) ensureFolderTableExists;
- (BOOL) easShouldTerminate;

@end
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@interface SOGoSyncCacheObject : NSObject
 {
-  @public
  id _uid;
  id _sequence;
 }
@@ -32,17 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
-
-static Class NSNullK;

@implementation SOGoSyncCacheObject

-+ (void) initialize
-{
-  NSNullK = [NSNull class];
-}
-
 - (id) init
 {
  if ((self = [super init]))
@@ -54,14 +46,14 @@ static Class NSNullK;
  return self;
 }

-+ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence
+ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence;
 {
  id o;

  o = [[self alloc] init];
-
-  [o setUID: [NSNumber numberWithInt: [theUID intValue]]];
-  [o setSequence: ([theSequence isKindOfClass: NSNullK] ? theSequence : [NSNumber numberWithInt: [theSequence intValue]])];
+ 
+  [o setUID: theUID];
+  [o setSequence: theSequence];
  
  return [o autorelease];
 }
@@ -75,7 +67,7 @@ static Class NSNullK;

 - (id) uid
 {
-  return [_uid description];
+  return _uid;
 }

 - (void) setUID: (id) theUID
@@ -85,7 +77,7 @@ static Class NSNullK;

 - (id) sequence
 {
-  return ([_sequence isKindOfClass: NSNullK] ? _sequence : [_sequence description]);
+  return _sequence;
 }

 - (void) setSequence: (id) theSequence
@@ -96,7 +88,7 @@ static Class NSNullK;

 - (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject
 {
-  return [self->_uid compare: theSyncCacheObject->_uid];
+  return [[self uid] compare: [theSyncCacheObject uid]];
 }

 //
@@ -105,21 +97,21 @@ static Class NSNullK;
 //
 - (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject
 {
-  if ([self->_sequence isEqual: [NSNull null]] &&
-      [theSyncCacheObject->_sequence isEqual: [NSNull null]])
+  if ([[self sequence] isEqual: [NSNull null]] &&
+      [[theSyncCacheObject sequence] isEqual: [NSNull null]])
    return [self compareUID: theSyncCacheObject];
  
-  if (![self->_sequence isEqual: [NSNull null]] && [theSyncCacheObject->_sequence isEqual: [NSNull null]])
+  if (![[self sequence] isEqual: [NSNull null]] && [[theSyncCacheObject sequence] isEqual: [NSNull null]])
    return NSOrderedDescending;
  
-  if ([self->_sequence isEqual: [NSNull null]] && ![theSyncCacheObject->_sequence isEqual: [NSNull null]])
+  if ([[self sequence] isEqual: [NSNull null]] && ![[theSyncCacheObject sequence] isEqual: [NSNull null]])
    return NSOrderedAscending;
  
  // Must check this here, to avoid comparing NSNull objects
-  if ([self->_sequence compare: theSyncCacheObject->_sequence] == NSOrderedSame)
+  if ([[self sequence] compare: [theSyncCacheObject sequence]] == NSOrderedSame)
    return [self compareUID: theSyncCacheObject];
  
-  return [self->_sequence compare: theSyncCacheObject->_sequence];
+  return [[self sequence] compare: [theSyncCacheObject sequence]];
 }

 - (NSString *) description
@@ -128,4 +120,3 @@ static Class NSNullK;
 }

@end
-
@@ -27,11 +27,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
-
 #import <NGObjWeb/SoObjectWebDAVDispatcher.h>

 #include <NGObjWeb/SoObject+SoDAV.h>
-
 #include <NGObjWeb/WEClientCapabilities.h>
 #include <NGObjWeb/WOContext.h>
 #include <NGObjWeb/WORequest.h>
@@ -39,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import <Foundation/NSArray.h>

-
@interface SoObjectWebDAVDispatcher (ActiveSync)

 - (id)_callObjectMethod:(NSString *)_method inContext:(WOContext *)_ctx;
@@ -64,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [response setHeader: @"private"  forKey: @"Cache-Control"];
      [response setHeader: @"OPTIONS, POST"  forKey: @"Allow"];
      [response setHeader: @"14.1"  forKey: @"MS-Server-ActiveSync"];
-      [response setHeader: @"2.5,12.0,12.1,14.0,14.1"  forKey: @"MS-ASProtocolVersions"];
+      [response setHeader: @"2.0,2.1,2.5,12.0,12.1,14.0,14.1"  forKey: @"MS-ASProtocolVersions"];
      [response setHeader: @"Sync,SendMail,SmartForward,SmartReply,GetAttachment,GetHierarchy,CreateCollection,DeleteCollection,MoveCollection,FolderSync,FolderCreate,FolderDelete,FolderUpdate,MoveItems,GetItemEstimate,MeetingResponse,Search,Settings,Ping,ItemOperations,ResolveRecipients,ValidateCert"  forKey: @"MS-ASProtocolCommands"];
      [response setHeader: @"OPTIONS, POST"  forKey: @"Public"];
    }
@@ -30,9 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "iCalAlarm+ActiveSync.h"

 #import <Foundation/NSDictionary.h>
-#import <NGExtensions/NSCalendarDate+misc.h>
+#import <Foundation/NSString.h>
+
 #import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+
 #import <NGCards/iCalAlarm.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalTrigger.h>
@@ -55,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      
      // don't send negative reminder - not supported
      if (delta > 0)
-        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", (int)delta];
+        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", delta];
    }
  
  return s;
@@ -41,9 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
 - (void) takeActiveSyncValues: (NSDictionary *) theValues
                    inContext: (WOContext *) context;
- (void) changeParticipationStatus: (NSDictionary *) theValues
-                         inContext: (WOContext *) context
-                         component: (id) component;
+
@end

 #endif
@@ -30,27 +30,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import "iCalEvent+ActiveSync.h"

+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>

 #import <NGExtensions/NSString+misc.h>
-#import <NGExtensions/NSCalendarDate+misc.h>
-#import <NGExtensions/NSObject+Logs.h>
+#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>

 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalPerson.h>
-#import <NGCards/NSCalendarDate+NGCards.h>
-#import <NGCards/NSString+NGCards.h>

 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/WORequest+SOGo.h>

 #import <Appointments/iCalEntityObject+SOGo.h>
-#import <Appointments/iCalRepeatableEntityObject+SOGo.h>
-#import <Appointments/SOGoAppointmentObject.h>

 #include "iCalAlarm+ActiveSync.h"
 #include "iCalRecurrenceRule+ActiveSync.h"
@@ -63,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (int) _attendeeStatus: (iCalPerson *) attendee
 {
  int  attendee_status;
-
+  
  attendee_status = 5;
  if ([[attendee partStat] caseInsensitiveCompare: @"ACCEPTED"] == NSOrderedSame)
    attendee_status = 3;
@@ -75,29 +73,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  return attendee_status;
 }

-//
-// Possible values are:
-// 0  Free
-// 1  Tentative
-// 2  Busy
-// 3  Out of Office
-// 4  Working elsewhere
-//
- (int) _busyStatus: (iCalPerson *) attendee
-{
-  int  attendee_status;
-
-  attendee_status = 2;
-
-  if ([[attendee partStat] caseInsensitiveCompare: @"DECLINED"] == NSOrderedSame)
-    attendee_status = 0;
-  else if ([[attendee partStat] caseInsensitiveCompare: @"TENTATIVE"] == NSOrderedSame)
-    attendee_status = 1;
-
-  return attendee_status;
-}
-
-
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSMutableString *s;
@@ -122,13 +97,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  else if ([self created])
    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
  
-  // Timezone
-  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
-
  // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
  if ([self startDate])
    {
-      if ([self isAllDay] && !tz)
+      if ([self isAllDay])
        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
                                          hours: 0 minutes: 0
@@ -141,7 +113,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
  if ([self endDate])
    {
-      if ([self isAllDay] && !tz)
+      if ([self isAllDay])
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
                                        hours: 0 minutes: 0
@@ -151,24 +123,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>", [[self endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
    }

+  // Timezone
+  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
+
  if (!tz)
    tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];

-  if (![self recurrenceId])
-    [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+  [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
  
  // Organizer and other invitations related properties
  if ((organizer = [self organizer]))
    {
      meetingStatus = 1;  // meeting and the user is the meeting organizer.
      o = [organizer rfc822Email];
-      if (![self recurrenceId] && [o length])
+      if ([o length])
        {
          [s appendFormat: @"<Organizer_Email xmlns=\"Calendar:\">%@</Organizer_Email>", o];
          
          o = [organizer cn];
          if ([o length])
-            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", [o activeSyncRepresentationInContext: context]];
+            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", o];
        }
    }
  
@@ -206,7 +180,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
   else
    {
-      meetingStatus = 0;  // The event is an appointment, which has no attendees.
+      meetingStatus = 0;  // appointment
    }
  
  // This depends on the 'NEEDS-ACTION' parameter.
@@ -227,12 +201,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"<DisallowNewTimeProposal xmlns=\"Calendar:\">%d</DisallowNewTimeProposal>", 1];
      
      // BusyStatus -- http://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
-      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>",  [self _busyStatus: attendee]];
-    }
-  else
-    {
-      // If it's a normal event (ie, with no organizer/attendee) or we are the organizer to an event
-      // invitation, we set the busy status to 2 (Busy)
      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", 2];
    }

@@ -257,37 +225,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  //[s appendFormat: @"<Importance xmlns=\"Calendar:\">%d</Importance>", v];

  // UID -- http://msdn.microsoft.com/en-us/library/ee159919(v=exchg.80).aspx
-  if (![self recurrenceId] && [[self uid] length])
-    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [[self uid] activeSyncRepresentationInContext: context]];
-
-  // Recurrence rules
-  if ([self isRecurrent])
-    [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
-
-  // Comment
-  o = [self comment];
-  //if (![self recurrenceId] && [o length])
-  if ([o length])
-    {
-      // It is very important here to NOT set <Truncated>0</Truncated> in the response,
-      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
-      o = [o activeSyncRepresentationInContext: context];
-
-      if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-        {
-          [s appendFormat: @"<Body xmlns=\"Calendar:\">%@</Body>", o];
-          [s appendString: @"<BodyTruncated xmlns=\"Calendar:\">0</BodyTruncated>"];
-        }
-      else
-        {
-          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
-          [s appendFormat: @"<Type>%d</Type>", 1];
-          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>",  (int)[o length]];
-          [s appendFormat: @"<Data>%@</Data>", o];
-          [s appendString: @"</Body>"];
-       }
-    }
-
+  if ([[self uid] length])
+    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [self uid]];
+  
  // Sensitivity
  if ([[self accessClass] isEqualToString: @"PRIVATE"])
    v = 2;
@@ -310,6 +250,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"</Categories>"];
    }

+  
  // Reminder -- http://msdn.microsoft.com/en-us/library/ee219691(v=exchg.80).aspx
  // TODO: improve this to handle more alarm types
  if ([self hasAlarms]) 
@@ -320,79 +261,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendString: [alarm activeSyncRepresentationInContext: context]];
    }

-  // Exceptions
+  // Recurrence rules
  if ([self isRecurrent])
    {
-      NSMutableArray *components, *exdates;
-      iCalEvent *current_component;
-      NSString *recurrence_id;
-
-      unsigned int count, max, i;
-
-      components = [NSMutableArray arrayWithArray: [[self parent] events]];
-      max = [components count];
-
-      if (max > 1 || [self hasExceptionDates])
-        {
-          exdates = [NSMutableArray arrayWithArray: [self exceptionDates]];
-
-          [s appendString: @"<Exceptions xmlns=\"Calendar:\">"];
-
-          for (count = 1; count < max; count++)
-            {
-              current_component = [components objectAtIndex: count] ;
-
-              if ([self isAllDay])
-                {
-                  recurrence_id = [NSString stringWithFormat: @"%@",
-                                            [[[current_component recurrenceId] dateByAddingYears: 0 months: 0 days: 0
-                                                                                           hours: 0 minutes: 0
-                                                                                         seconds: -[userTimeZone secondsFromGMTForDate:
-                                                                                                                   [current_component recurrenceId]]]
-                                              activeSyncRepresentationWithoutSeparatorsInContext: context]];
-                }
-              else
-                {
-                  recurrence_id = [NSString stringWithFormat: @"%@", [[current_component recurrenceId]
-                                                                       activeSyncRepresentationWithoutSeparatorsInContext: context]];
-                }
-
-              [s appendString: @"<Exception>"];
-              [s appendFormat: @"<Exception_StartTime xmlns=\"Calendar:\">%@</Exception_StartTime>", recurrence_id];
-              [s appendFormat: @"%@", [current_component activeSyncRepresentationInContext: context]];
-              [s appendString: @"</Exception>"];
-            }
-
-          for (i = 0; i < [exdates count]; i++)
-            {
-              [s appendString: @"<Exception>"];
-              [s appendString: @"<Exception_Deleted>1</Exception_Deleted>"];
-
-              if ([self isAllDay])
-                {
-                  recurrence_id = [NSString stringWithFormat: @"%@",
-                                   [[[[exdates objectAtIndex: i] asCalendarDate] dateByAddingYears: 0 months: 0 days: 0
-                                                                                             hours: 0 minutes: 0
-                                                                                           seconds: -[userTimeZone secondsFromGMTForDate:
-                                                                                                                 [[exdates objectAtIndex: i] asCalendarDate]]]
-                                     activeSyncRepresentationWithoutSeparatorsInContext: context]];
-                }
-              else
-                {
-                  recurrence_id = [NSString stringWithFormat: @"%@", [[[exdates objectAtIndex: i] asCalendarDate]
-                                                                       activeSyncRepresentationWithoutSeparatorsInContext: context]];
-                }
-
-              [s appendFormat: @"<Exception_StartTime xmlns=\"Calendar:\">%@</Exception_StartTime>", recurrence_id];
-              [s appendString: @"</Exception>"];
-            }
-
-            [s appendString: @"</Exceptions>"];
-        }
+      [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
    }

-  if (![self recurrenceId])
-    [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];
+  // Comment
+  o = [self comment];
+  if ([o length])
+    {
+      // It is very important here to NOT set <Truncated>0</Truncated> in the response,
+      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1];
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+
+  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];

  return s;
 }
@@ -438,19 +327,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (void) takeActiveSyncValues: (NSDictionary *) theValues
                    inContext: (WOContext *) context
 {
-  iCalDateTime *start, *end; //, *oldstart;
-  NSCalendarDate *oldstart;
+  iCalDateTime *start, *end;
  NSTimeZone *userTimeZone;
  iCalTimeZone *tz;
  id o;
-  int deltasecs;

  BOOL isAllDay;
-
-  NSMutableArray *occurences;
-
-  occurences = [NSMutableArray arrayWithArray: [[self parent] events]];
-
+  
  if ((o = [theValues objectForKey: @"UID"]))
    [self setUid: o];
    
@@ -463,11 +346,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      isAllDay = YES;
    }
-  else if ([occurences count] && !([theValues objectForKey: @"AllDayEvent"]))
-    {
-      // If the occurence has no AllDay tag use it from master.
-      isAllDay = [[occurences objectAtIndex: 0] isAllDay];
-    }

  //
  // 0- free, 1- tentative, 2- busy and 3- out of office
@@ -516,32 +394,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
  
  // FIXME: merge with iCalToDo
-  if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-    {
-      if ((o = [theValues objectForKey: @"Body"]))
-        [self setComment: o];
-    }
-  else
-    {
-      if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
-        [self setComment: o];
-    }
-
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
  if ((o = [theValues objectForKey: @"Location"]))
    [self setLocation: o];

-  deltasecs = 0;
-  start = nil;
-
  if ((o = [theValues objectForKey: @"StartTime"]))
    {
      o = [o calendarDate];
      start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
-      oldstart = [start dateTime];
      [start setTimeZone: tz];

-      if (isAllDay)
-	{
+       if (isAllDay)
+         {
          [start setDate: o];
          [start setTimeZone: nil];
        }
@@ -549,10 +415,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          [start setDateTime: o];
        }
-
-      // Calculate delta if start date has been changed.
-      if (oldstart)
-	deltasecs = [[start dateTime ] timeIntervalSinceDate: oldstart] * -1;
    }

  if ((o = [theValues objectForKey: @"EndTime"]))
@@ -611,177 +473,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      RELEASE(rule);
      
      [rule takeActiveSyncValues: o  inContext: context];
-
-      // Exceptions
-      if ((o = [theValues objectForKey: @"Exceptions"]) && [o isKindOfClass: [NSArray class]])
-        {
-          NSCalendarDate *recurrenceId, *adjustedRecurrenceId, *currentId;
-          NSMutableArray *exdates, *exceptionstouched;
-          iCalEvent *currentOccurence;
-          NSDictionary *exception;
-
-          unsigned int i, count, max;
-
-          [self removeAllExceptionDates];
-
-          exdates = [NSMutableArray array];
-          exceptionstouched = [NSMutableArray array];
-
-          for (i = 0; i < [o count]; i++)
-            {
-              exception = [o objectAtIndex: i];
-
-              if (![[exception objectForKey: @"Exception_Deleted"] intValue])
-                {
-                  recurrenceId = [[exception objectForKey: @"Exception_StartTime"] asCalendarDate];
-
-                  if (isAllDay)
-                    recurrenceId = [recurrenceId dateByAddingYears: 0 months: 0 days: 0
-                                                             hours: 0 minutes: 0
-                                                           seconds: [userTimeZone secondsFromGMTForDate:recurrenceId]];
-
-                  // When moving the calendar entry (i.e. changing the startDate) iOS and Android sometimes send a value for
-                  // Exception_StartTime which is not what we expect.
-                  // With this we make sure the recurrenceId is always correct.
-                  //
-                  // iOS problem - If the master is a no-allday-event but the exception is, an invalid Exception_StartTime is in the request.
-                  // e.g. it sends 20150409T040000Z instead of 20150409T060000Z;
-                  // This might be a special case since iPhone doesn't allow an allday-exception on a non-allday-event.
-                  if (!([[start dateTime] compare: [[start dateTime] hour:[recurrenceId hourOfDay] minute:[recurrenceId minuteOfHour]]] == NSOrderedSame))
-                    recurrenceId = [recurrenceId hour:[[start dateTime] hourOfDay] minute:[[start dateTime] minuteOfHour]];
-
-                  // We need to store the recurrenceIds and exception dates adjusted by deltasecs.
-                  // This ensures that the adjustment in SOGoCalendarComponent->updateComponent->_updateRecurrenceIDsWithEvent gives the correct dates.
-                  adjustedRecurrenceId = [recurrenceId dateByAddingYears: 0 months: 0 days: 0
-                                                                   hours: 0 minutes: 0 seconds: deltasecs];
-
-                  // search for an existing occurence and update it
-                  max = [occurences count];
-                  currentOccurence = nil;
-                  count = 1;
-                  while (count < max)
-                    {
-                      currentOccurence = [occurences objectAtIndex: count] ;
-                      currentId = [currentOccurence recurrenceId];
-
-                      if ([currentId compare: adjustedRecurrenceId] == NSOrderedSame)
-                        {
-                          [exceptionstouched addObject: adjustedRecurrenceId];
-                          [currentOccurence takeActiveSyncValues: exception  inContext: context];
-
-                          break;
-                        }
-
-                      count++;
-                      currentOccurence = nil;
-                    }
-
-                  // Create a new occurence if we found none to update.
-                  if (!currentOccurence)
-                    {
-                      iCalDateTime *recid;
-
-                      currentOccurence = [self mutableCopy];
-                      [currentOccurence removeAllRecurrenceRules];
-                      [currentOccurence removeAllExceptionRules];
-                      [currentOccurence removeAllExceptionDates];
-
-                      [[self parent] addToEvents: currentOccurence];
-                      [currentOccurence takeActiveSyncValues: exception  inContext: context];
-
-                      recid = (iCalDateTime *)[currentOccurence uniqueChildWithTag: @"recurrence-id"];
-                      if (isAllDay)
-                        [recid setDate: adjustedRecurrenceId];
-                      else
-                        [recid setDateTime: adjustedRecurrenceId];
-
-                      [exceptionstouched addObject: [recid dateTime]];
-                    }
-                }
-              else if ([[exception objectForKey: @"Exception_Deleted"] intValue])
-                {
-                  recurrenceId = [[exception objectForKey: @"Exception_StartTime"] asCalendarDate];
-
-                  if (isAllDay)
-                    recurrenceId = [recurrenceId dateByAddingYears: 0 months: 0
-                                                              days: 0 hours: 0 minutes: 0
-                                                           seconds: [userTimeZone secondsFromGMTForDate:recurrenceId]];
-
-                  // We add only valid exception dates.
-                  if ([self doesOccurOnDate: recurrenceId] &&
-                      ([[start dateTime] compare: [[start dateTime] hour:[recurrenceId hourOfDay]
-                                                                  minute:[recurrenceId minuteOfHour]]] == NSOrderedSame))
-                    {
-                      // We need to store the recurrenceIds and exception dates adjusted by deltasecs.
-                      // This ensures that the adjustment in SOGoCalendarComponent->updateComponent->_updateRecurrenceIDsWithEvent gives the correct dates.
-                      [exdates addObject: [recurrenceId dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: deltasecs]];
-                    }
-                }
-            }
-
-          // Update exception dates in master event.
-          max = [exdates count];
-          if (max > 0)
-            {
-              for (count = 0; count < max; count++)
-                {
-                  if (([exceptionstouched indexOfObject: [exdates objectAtIndex: count]] == NSNotFound))
-                    [self addToExceptionDates: [exdates objectAtIndex: count]];
-                }
-            }
-
-          // Remove all exceptions included in the request.
-          max = [occurences count];
-          count = 1; // skip the master event
-          while (count < max)
-            {
-              currentOccurence = [occurences objectAtIndex: count] ;
-              currentId = [currentOccurence recurrenceId];
-
-              // Delete all occurences which are not touched (modified/added).
-              if (([exceptionstouched indexOfObject: currentId] == NSNotFound))
-                [[[self parent] children] removeObject: currentOccurence];
-
-              count++;
-            }
-        }
-      else if ([self isRecurrent])
-        {
-          // We have no exceptions in request but there is a recurrence rule.
-          // Remove all excpetions and exception dates.
-          iCalEvent *currentOccurence;
-          unsigned int count, max;
-
-          [self removeAllExceptionDates];
-          max = [occurences count];
-          count = 1; // skip the master event
-          while (count < max)
-            {
-              currentOccurence = [occurences objectAtIndex: count];
-              [[[self parent] children] removeObject: currentOccurence];
-              count++;
-            }
-        }
-    }
-  else if ([self isRecurrent])
-    {
-      // We have no recurrence rule in request.
-      // Remove all exceptions, exception dates and recurrence rules.
-      iCalEvent *currentOccurence;
-      unsigned int count, max;
-
-      [self removeAllRecurrenceRules];
-      [self removeAllExceptionRules];
-      [self removeAllExceptionDates];
-
-      max = [occurences count];
-      count = 1; // skip the master event
-      while (count < max)
-        {
-          currentOccurence = [occurences objectAtIndex: count];
-          [[[self parent] children] removeObject: currentOccurence];
-          count++;
-        }
    }

  // Organizer - we don't touch the value unless we're the organizer
@@ -789,7 +480,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      ([self userIsOrganizer: [context activeUser]] || [[context activeUser] hasEmail: o]))
    {
      iCalPerson *person;
-
+      
      person = [iCalPerson elementWithTag: @"organizer"];
      [person setEmail: o];
      [person setCn: [theValues objectForKey: @"Organizer_Name"]];
@@ -797,14 +488,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [self setOrganizer: person];
    }

+  //
+  // iOS is plain stupid here. It seends event invitations with no Organizer.
+  // We check this corner-case and if MeetingStatus == 1 (see http://msdn.microsoft.com/en-us/library/ee219342(v=exchg.80).aspx or details)
+  // and there's no organizer, we fake one.
+  //
  if ((o = [theValues objectForKey: @"MeetingStatus"]))
    {
-     //
-     // iOS is plain stupid here. It seends event invitations with no Organizer.
-     // We check this corner-case and if MeetingStatus == 1 (see http://msdn.microsoft.com/en-us/library/ee219342(v=exchg.80).aspx or details)
-     // and there's no organizer, we fake one.
-     //
-      if ([o intValue] == 1 && ![theValues objectForKey: @"Organizer_Email"] && ![[[self organizer] rfc822Email] length])
+      if ([o intValue] == 1 && ![theValues objectForKey: @"Organizer_Email"])
        {
          iCalPerson *person;
      
@@ -814,20 +505,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          [person setPartStat: @"ACCEPTED"];
          [self setOrganizer: person];
        }
-
-      //
-      // When MeetingResponse fails Outlook still sends a new calendar entry with MeetingStatus=3.
-      // Use the organizer from the request if the event has no organizer.
-      //
-      if ([o intValue] == 3 && [theValues objectForKey: @"Organizer_Email"] && ![[[self organizer] rfc822Email] length])
-        {
-          iCalPerson *person;
-          person = [iCalPerson elementWithTag: @"organizer"];
-          [person setEmail: [theValues objectForKey: @"Organizer_Email"]];
-          [person setCn: [theValues objectForKey: @"Organizer_Name"]];
-          [person setPartStat: @"ACCEPTED"];
-          [self setOrganizer: person];
-        }
    }
  

@@ -837,7 +514,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      // Windows phones sens sometimes an empty Attendees tag.
      // We check it's an array before processing it.
-      if ((o = [theValues objectForKey: @"Attendees"]) && [o isKindOfClass: [NSArray class]])
+      if ((o = [theValues objectForKey: @"Attendees"])&& [o isKindOfClass: [NSArray class]])
        {
          NSMutableArray *attendees;
          NSDictionary *attendee;
@@ -886,36 +563,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
 }

- (void) changeParticipationStatus: (NSDictionary *) theValues
-                         inContext: (WOContext *) context
-                         component: (id) component
-{
-  NSString *status;
-  id o;
-
-  // See: https://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
-  //
-  // 0 == Free
-  // 1 == Tentative
-  // 2 == Busy
-  // 3 == Out of Office
-  // 4 == Working elsehwere
-  //
-  if ((o = [theValues objectForKey: @"BusyStatus"]))
-    {
-      // We translate >= 2 into ACCEPTED
-      if ([o intValue] == 0)
-        status = @"NEEDS-ACTION";
-      else if ([o intValue] >= 2)
-        status = @"ACCEPTED";
-      else
-        status = @"TENTATIVE";
-
-      // There's no delegate in EAS
-      [(SOGoAppointmentObject *) component changeParticipationStatus: status
-                                                        withDelegate: nil
-                                                               alarm: nil];
-    }
-}
-
@end
@@ -35,42 +35,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSString.h>

 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalToDo.h>
 #import <NGCards/iCalByDayMask.h>

-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalTimeZone.h>
-
 #import "NSCalendarDate+ActiveSync.h"
 #import "NSDate+ActiveSync.h"

@implementation iCalRecurrenceRule (ActiveSync)

- (NSCalendarDate *) _adjustedStartDate
-{
-  iCalTimeZone *timeZone;
-
-  timeZone = [(iCalDateTime *)[[self parent] firstChildWithTag: @"dtstart"] timeZone];
-  if (timeZone)
-    return [timeZone computedDateForDate: [[self parent] startDate]];
-  else
-    return [[self parent] startDate];
-}
-
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSMutableString *s;
-  NSString *t;
  int type;

  s = [NSMutableString string];
-
-  if ([[self parent] isKindOfClass: [iCalToDo class]])
-    t = @"Tasks";
-  else
-    t = @"Calendar";
-
-  [s appendFormat: @"<Recurrence xmlns=\"%@:\">", t];
+  
+  [s appendString: @"<Recurrence xmlns=\"Calendar:\">"];

  // 0 -> daily, 1 -> weekly, 2 -> montly, 5 -> yearly
  type = 0;
@@ -82,11 +61,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      // 1 -> sunday, 2 -> monday, 4 -> tuesday, 8 -> wednesday, 16 -> thursday, 32 -> friday, 64 -> saturday, 127 -> last day of month (montly or yearl recurrences only)
      if ([[self byDayMask] isWeekDays])
        {
-          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (2|4|8|16|32)];
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (2|4|8|16|32)];
        }
      else
        {
-          [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+          [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
        }
    }
  else if ([self frequency] == iCalRecurrenceFrequenceWeekly)
@@ -111,11 +90,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          // No byDayMask, we take the event's start date to compute the DayOfWeek
          // 0 == Sunday, 6 == Saturday
-          v = (1 << [[self _adjustedStartDate] dayOfWeek]);
+          v = (1 << [[[self parent] startDate] dayOfWeek]);
        }

-      [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, v];
-      [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+      [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", v];
+      [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
    }
  else if ([self frequency] == iCalRecurrenceFrequenceMonthly)
    {
@@ -132,8 +111,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          if (firstOccurrence < 0)
            firstOccurrence = 5;

-          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-          [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, firstOccurrence];
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];          
+          [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
        }
      else if ([[self byMonthDay] count])
        {
@@ -147,8 +126,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              iCalByDayMask *dm;
          
              dm = [self byDayMask];
-              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, 5];
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", 5];
            }
          else
            {
@@ -160,7 +139,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          // Simple reccurrence rule of type "Monthly"
          type = 2;
-          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%d</Recurrence_DayOfMonth>", t, [[self _adjustedStartDate] dayOfMonth]];
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             [[[self parent] startDate] dayOfMonth]];
        }
    }
  else if ([self frequency] == iCalRecurrenceFrequenceYearly)
@@ -179,39 +159,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              if (firstOccurrence < 0)
                firstOccurrence = 5;
              
-              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, firstOccurrence];
-              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%@</Recurrence_MonthOfYear>", t,
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
                 [self flattenedValuesForKey: @"bymonth"]];
            }
          else
            {
              type = 5; // Yearly
              
-              [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%@</Recurrence_DayOfMonth>", t,
+              [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%@</Recurrence_DayOfMonth>",
                 [self flattenedValuesForKey: @"bymonthday"]];
              
-              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%@</Recurrence_MonthOfYear>", t,
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
                 [self flattenedValuesForKey: @"bymonth"]];
            }
        }
      else
-        {
-          type = 5;
-          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%d</Recurrence_DayOfMonth>", t, [[self _adjustedStartDate] dayOfMonth]];
-          [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%d</Recurrence_MonthOfYear>", t, [[self _adjustedStartDate] monthOfYear]];
-        }
+        type = 5;
    }
  
-  [s appendFormat: @"<Recurrence_Type xmlns=\"%@:\">%d</Recurrence_Type>", t, type];
-
-  if ([[self parent] isKindOfClass: [iCalToDo class]])
-    [s appendFormat: @"<Recurrence_Start xmlns=\"%@:\">%@</Recurrence_Start>", t, [[[self parent] startDate] activeSyncRepresentationInContext: context]];
+  [s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];

  // Occurrences / Until
+  //[s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%d</Recurrence_Occurrences>", 5];
  if ([self repeatCount])
    {
-      [s appendFormat: @"<Recurrence_Occurrences xmlns=\"%@:\">%@</Recurrence_Occurrences>", t,
+      [s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%@</Recurrence_Occurrences>",
         [self flattenedValuesForKey: @"count"]];
    }
  else if ([self untilDate])
@@ -222,10 +196,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      //ud = [[context activeUser] userDefaults];
      //[date setTimeZone: [ud timeZone]];
      
-      [s appendFormat: @"<Recurrence_Until xmlns=\"%@:\">%@</Recurrence_Until>", t,
+      [s appendFormat: @"<Recurrence_Until xmlns=\"Calendar:\">%@</Recurrence_Until>",
         [date activeSyncRepresentationWithoutSeparatorsInContext: context]];
    }  

+
  [s appendString: @"</Recurrence>"];

  return s;
@@ -31,10 +31,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <Foundation/NSArray.h>
 #include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
 #include <Foundation/NSString.h>

 #import <NGCards/iCalByDayMask.h>
 #import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalRecurrenceRule.h>
+
+#import <NGExtensions/NGBase64Coding.h>

 #include "NSData+ActiveSync.h"

@@ -123,7 +128,7 @@ struct SYSTEMTIME {
  //uint16_t wStandardYear;
  struct SYSTEMTIME stStandardDate;
  //uint16_t wDaylightYear;
-  struct SYSTEMTIME stDaylightDate = {0,0,0,0,0,0,0,0};
+  struct SYSTEMTIME stDaylightDate;

  char standardName[64], daylightName[64];

@@ -139,17 +144,13 @@ struct SYSTEMTIME {

  period = [self _mostRecentPeriodWithName: @"DAYLIGHT"];  
  if (!period)
-    {
-      stStandardDate.wMonth = 0;
-      lDaylightBias = 0;
-    }
-  else
-    {
-      lDaylightBias = (uint32_t) -([period secondsOffsetFromGMT] / 60) - lBias;
-      [period _fillTZDate: &stDaylightDate];
-      //wStandardYear = stStandardDate.wYear;
-      //wDaylightYear = stDaylightDate.wYear;
-    }
+    stStandardDate.wMonth = 0;
+
+  lDaylightBias = (uint32_t) -([period secondsOffsetFromGMT] / 60) - lBias;
+  [period _fillTZDate: &stDaylightDate];
+  //wStandardYear = stStandardDate.wYear;
+  //wDaylightYear = stDaylightDate.wYear;
+

  // We build the timezone
  [bytes appendBytes: &lBias  length: 4];
@@ -29,12 +29,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalToDo+ActiveSync.h"

+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>

 #import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>

 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
@@ -45,7 +48,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"
-#include "iCalRecurrenceRule+ActiveSync.h"

@implementation iCalToDo (ActiveSync)

@@ -60,10 +62,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  s = [NSMutableString string];

  // Complete
-  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", [[self status] isEqualToString: @"COMPLETED"] ? 1 : 0];
+  o = [self completed];
+  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", (o ? 1 : 0)];
  
  // DateCompleted
-  if ((o = [self completed]))
+  if (o)
    [s appendFormat: @"<DateCompleted xmlns=\"Tasks:\">%@</DateCompleted>", [o activeSyncRepresentationInContext: context]];
  
  // Start date
@@ -80,10 +83,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"<DueDate xmlns=\"Tasks:\">%@</DueDate>", [o activeSyncRepresentationInContext: context]];
      [s appendFormat: @"<UTCDueDate xmlns=\"Tasks:\">%@</UTCDueDate>", [o activeSyncRepresentationInContext: context]];
    }
-
-  // Recurrence rules
-  if ([self isRecurrent])
-    [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
  
  // Importance
  o = [self priority];
@@ -98,7 +97,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // Reminder - FIXME
  [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
  
-  // Sensitivity
  if ([[self accessClass] isEqualToString: @"PRIVATE"])
    v = 2;
  else if ([[self accessClass] isEqualToString: @"CONFIDENTIAL"])
@@ -106,8 +104,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  else
    v = 0;

-  [s appendFormat: @"<Sensitivity xmlns=\"Tasks:\">%d</Sensitivity>", v];
-
  categories = [self categories];

  if ([categories count])
@@ -130,20 +126,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      // It is very important here to NOT set <Truncated>0</Truncated> in the response,
      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
      o = [o activeSyncRepresentationInContext: context];
-
-      if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-        {
-          [s appendFormat: @"<Body xmlns=\"Tasks:\">%@</Body>", o];
-          [s appendString: @"<BodyTruncated xmlns=\"Tasks:\">0</BodyTruncated>"];
-        }
-      else
-        {
-          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
-          [s appendFormat: @"<Type>%d</Type>", 1];
-          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", (int)[o length]];
-          [s appendFormat: @"<Data>%@</Data>", o];
-          [s appendString: @"</Body>"];
-        }
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1]; 
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
    }
  
  return s;
@@ -165,16 +152,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    [self setSummary: o];

  // FIXME: merge with iCalEvent
-  if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-    {
-      if ((o = [theValues objectForKey: @"Body"]))
-        [self setComment: o];
-    }
-  else
-    {
-      if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
-        [self setComment: o];
-    }
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
  
  if ([[theValues objectForKey: @"Complete"] intValue] &&
      ((o = [theValues objectForKey: @"DateCompleted"])) )
@@ -186,11 +166,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [completed setDate: o];
      [self setStatus: @"COMPLETED"];
    }
-  else
-   {
-     [self setStatus: @"IN-PROCESS"];
-     [self setCompleted: nil];
-   }

  if ((o = [theValues objectForKey: @"DueDate"]))
    {
@@ -202,16 +177,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [due setDateTime: o];
    }

-  if ((o = [theValues objectForKey: @"StartDate"]))
-    {
-      iCalDateTime *due;
-
-      o = [o calendarDate];
-      due = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
-      [due setTimeZone: tz];
-      [due setDateTime: o];
-    }
-
  // 2 == high, 1 == normal, 0 == low
  if ((o = [theValues objectForKey: @"Importance"]))
    {
@@ -251,29 +216,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {

    }
-
-  // Recurrence
-  if ((o = [theValues objectForKey: @"Recurrence"]) && !([[o objectForKey: @"Recurrence_DeadOccur"] intValue]))
-    {
-      iCalRecurrenceRule *rule;
-
-      rule = [[iCalRecurrenceRule alloc] init];
-      [self setRecurrenceRules: [NSArray arrayWithObject: rule]];
-      RELEASE(rule);
-
-      [rule takeActiveSyncValues: o  inContext: context];
-
-      if (!([theValues objectForKey: @"StartDate"]))
-        {
-          iCalDateTime *start;
-
-          start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
-
-          [start setTimeZone: tz];
-          [start setDate: [[o objectForKey: @"Recurrence_Start"] calendarDate]];
-        }
-    }
-
 }

@end
@@ -57,6 +57,8 @@ ProxyPreserveHost On
 #   Allow from your-cas-host-addr
 # </Proxy>

+ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
+
 # Enable to use Microsoft ActiveSync support
 # Note that you MUST have many sogod workers to use ActiveSync.
 # See the SOGo Installation and Configuration guide for more details.
@@ -65,15 +67,11 @@ ProxyPreserveHost On
 # http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
 # retry=60 connectiontimeout=5 timeout=360

-ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
-
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
-## and do not forget to enable the headers module
-<IfModule headers_module>
  RequestHeader set "x-webobjects-server-port" "443"
-  RequestHeader set "x-webobjects-server-name" "%{HTTP_HOST}e" env=HTTP_HOST
-  RequestHeader set "x-webobjects-server-url" "https://%{HTTP_HOST}e" env=HTTP_HOST
+  RequestHeader set "x-webobjects-server-name" "yourhostname"
+  RequestHeader set "x-webobjects-server-url" "https://yourhostname"

 ## When using proxy-side autentication, you need to uncomment and
 ## adjust the following line:
@@ -81,7 +79,6 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 #  RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e" env=REMOTE_USER

  RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
-</IfModule>

  AddDefaultCharset UTF-8

@@ -93,6 +90,5 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 <IfModule rewrite_module>
  RewriteEngine On
  RewriteRule ^/.well-known/caldav/?$ /SOGo/dav [R=301]
-  RewriteRule ^/.well-known/carddav/?$ /SOGo/dav [R=301]
 </IfModule>

@@ -1,189 +0,0 @@
-Developer's Guide
-=================
-:toc: left
-:icons: font
-
-////
-
-    This file is part of the SOGo project.
-
-    See docinfo.xml for authors, copyright and license information.
-
-////
-
-include::includes/global-attributes.asciidoc[]
-
-UI and UX
---------
-
-* http://www.google.com/design/spec/material-design/
-* http://goodui.org/
-  - Try Repeating Your Primary Action instead of showing it just once.
-  - Try Distinct Clickable/Selected Styles instead of blurring them.
-  - Try Undos instead of prompting for confirmation.
-  - Try More Contrast instead of similarity.
-  - Try Exposing Options instead of hiding them.
-  - Try Showing State instead of being state agnostic.
-  - Try Direct Manipulation instead of contextless menus.
-  - Try Exposing Fields instead of creating extra pages.
-  - Try Transitions instead of showing changes instantly.
-  - Try Fewer Borders instead of wasting attention.
-  - Try Designing For Zero Data instead of just data heavy cases.
-  - Try Consistency instead of making people relearn.
-  - Try Conventions instead of reinventing the wheel.
-  - Try Visual Hierarchy instead of dullness.
-  - Try Grouping Related Items instead of disordering.
-  - Try Inline Validation instead of delaying errors.
-  - Try Forgiving Inputs instead of being strict with data.
-  - Try Bigger Click Areas instead of tiny ones.
-  - Try Faster Load Times instead of making people wait.
-  - Try Keyboard Shortcuts instead of buttons only.
-  - Try Upfront Progress instead of starting with a blank.
-  - Try Softer Prompts instead of modal windows.
-  - Try Multifunctional Controls instead of more parts.
-  - Try Icon Labels instead of opening for interpretation.
-* http://designmodo.com/create-style-guides/
-* http://uxmyths.com/
-
-Frameworks & Tools
------------------
-
-GNUstep
-~~~~~~~
-
-SOPE
-~~~~
-
-JavaScript libraries
-~~~~~~~~~~~~~~~~~~~~
-
-* https://angularjs.org/
-* http://angular-ui.github.io/ui-router/
-* https://material.angularjs.org/
-* http://lodash.com/
-* https://github.com/nervgh/angular-file-upload
-
-Code Style
----------
-
-Objective-C
-~~~~~~~~~~~
-
-* To document the Web APIs, we follow the http://apidocjs.com/[APIDOC] standards.
-
-    apidoc -f ".*\\.m" -i UI -o Documentation/JSON-API
-
-* When returning JSON from an object extending UIxComponent, use the following method:
-
-    - (WOResponse *) responseWithStatus: (unsigned int) status
-                  andJSONRepresentation: (NSObject *) contentObject;
-
-HTML
-~~~~
-
-* Localize your strings:
-
-    <var:string label:value="I'm localized!"/>
-
-* Localize your attributes:
-
-    <input type="text" label:placeholder="I'm localized!"/>
-
-* Reuse existing localized strings as much as possible. Otherwise don't forget to update the English Localizable.strings file of the appropriate module.
-
-JavaScript
-~~~~~~~~~~
-
-* http://eslint.org/
-* http://standardjs.com
-* https://github.com/toddmotto/angularjs-styleguide
-* https://github.com/angular/material/blob/master/docs/guides/CODING.md
-* http://jshint.com/
-* https://github.com/angular/material/tree/master/docs/guides
-
-* We conform to https://github.com/airbnb/javascript[Airbnb coding standards]. Use https://github.com/jscs-dev/node-jscs[jscs] with the 'airbnb' preset to validate your code style:
-
-    jscs -p airbnb *.js
-
-* For documentation, we follow the http://usejsdoc.org/[JSDoc3] standards:
-
-    jsdoc UI/WebServerResources/js/{Common,Contacts,Mailer,Preferences,Scheduler}/*.js -d Documentation/JavaScript-API
-
-Models (facades)
-^^^^^^^^^^^^^^^^
-
-////
-http://trochette.github.io/Angular-Design-Patterns-Best-Practices/
-////
-* Move business logic into models and share them.
-* Keep it simple, separate server interaction and error handling from the model. That way model only handle data processing and code is easier to maintain.
-
-SASS/CSS
-~~~~~~~~
-
-* http://componentcss.com/
-* https://github.com/styleguide/css
-* https://smacss.com/
-* http://cssguidelin.es/
-* http://sixrevisions.com/css/css-methodologies/
-* https://css-tricks.com/what-a-css-code-review-might-look-like/
-* http://una.im/classy-css/
-* http://stylelint.io/
-
-A `@mixin` is like a stamp: it creates a duplicated version of the property block (optionally) with arguments provided. An `@extend` appends the element you are extending to the property block. It is your "yes, and ___" statement.
-
-* For documentation, we follow http://sassdoc.com/[SassDoc] annotations.
-* We need the SASS files of Angular Material to build our CSS. The git repository of Angular Material is included as a submodule of SOGo:
-
-    git submodule init
-    git submodule update
-
-* FlexBox compatibility http://caniuse.com/#feat=flexbox
-
-Fonts
-^^^^^
-
-* http://mozilla.github.io/Fira/[Mozilla Fira]
-* https://www.google.com/design/icons/[Material icons]
-
-Building frontend
-----------------
-
-* Install the latest stable release of https://nodejs.org[Node.js]
-* Install grunt
-
-    npm install -g grunt-cli
-    npm install -g bower
-
-* Generate JavaScript files
-
-    cd UI/WebServerResources
-    npm install
-    grunt build
-
-Version Control
---------------
-
-* https://devcharm.com/articles/46/improve-your-git-workflow/
-* https://github.com/angular/material/blob/master/docs/guides/CONTRIBUTING.md#-commit-message-format
-* Each commit should cover only one thing;
-* Begin the commit message with a single short (less than 50 characters) line summarizing the change, followed by a blank line and then a more thorough description;
-* When fixing a bug, commit to the devel branch as well as the maintenance branch of the latest release version (named maintenance/x.y). When a ticket is associated to the bug, add to the description a line saying *Fixes #1234*.
-* `git pull` may introduce http://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful[inconsistencies and problems]. Replace it with the following alias:
-
-    git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'
-
-Testing
-------
-
-* https://github.com/angular/protractor
-* http://karma-runner.github.io/
-
-JSON API
-~~~~~~~~
-
-One practical way to test the JSON API is to use `curl`. To do so, you need to enable `SOGoTrustProxyAuthentication` and configure HTTP authentifcation in Apache. You can pipe the result to http://stedolan.github.io/jq/[jq] to nicely format and filter the output:
-
-    curl -u username:password http://localhost/SOGo/so/username/Calendar/calendarslist | jq '.'
-
-    curl -u username:password -H 'Content-Type: application/json' -d '{}' http://localhost/SOGo/so/francis/Calendar/personal/71B6-54904400-1-7C308500.ics/save
@@ -1,7 +1,5 @@
 Mobile Devices Configuration Guide
 ==================================
-:toc: left
-:icons: font

 ////

@@ -1,7 +1,5 @@
 Mozilla Thunderbird Configuration Guide
 =======================================
-:toc: left
-:icons: font

 ////

@@ -63,8 +61,9 @@ Mozilla Thunderbird

 Mozilla Thunderbird is the official front end client of SOGo.

-Mozilla Thunderbird versions 31, 38, 45 and above are supported
-and it is recommended to use the latest version of Thunderbird.
+Mozilla Thunderbird version 2, 3.1, 10 ESR (Extended Support Release),
+17 ESR, 24 and 31 are supported and it is recommended to use version 31 of
+Thunderbird.

 In order to download and install Mozilla Thunderbird, please visit:

@@ -73,16 +72,33 @@ https://www.mozilla.org/en-US/thunderbird/organizations/all-esr.html
 Mozilla Lightning
 ~~~~~~~~~~~~~~~~~

-When using Thunderbird, you can use the latest version of Mozilla
-Lightning.  Use the Add-ons manager of Thunderbird or visit:
+When using version 24 or 31 of Thunderbird, you can use the latest version of
+Mozilla Lightning. Use the Add-ons manager of Thunderbird or visit:

 https://addons.mozilla.org/en-US/thunderbird/addon/lightning/

+When using version 17 ESR of Thunderbird, you can use Mozilla Lightning
+version 1.9.1. In order to download the extension, please visit:
+
+https://addons.mozilla.org/en-US/thunderbird/addon/lightning/versions/1.9.1
+
+For Thunderbird 2 and 3.1, you need the _Inverse Edition_of Mozilla
+Lightning. It provides back ported features, bug fixes and security
+fixes from the current development version of Mozilla Lightning. For
+Thunderbird 2, it is based on release version 0.9 of Lightning. For
+Thunderbird 3.1, it is based on 1.0b2.
+
+In order to download and install Mozilla Lightning – Inverse Edition for
+Thunderbird 2 or 3.1, please visit:
+
+http://www.sogo.nu/downloads/frontends.html
+
 SOGo Connector and SOGo Integrator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The SOGo Connector and Integrator extensions are provided to perfect the
-integration of Mozilla Thunderbird with the SOGo groupware solution.
+integration of Mozilla Thunderbird 2, 3.1, 10 ESR, 17 ESR, 24 and 31 with
+the SOGo groupware solution.

 First of all, the SOGo Connector extension transforms Thunderbird into a
 full DAV client for groupware servers such as SOGo, eGroupware or
@@ -120,7 +136,7 @@ extensions, please visit:
 http://www.sogo.nu/downloads/frontends.html

 Prior to installing the SOGo Integrator extension, you should read the
-following chapter - _SOGo Integrator Customization_.
+following chapter – _SOGo Integrator Customization_.

 SOGo Integrator Customization
 -----------------------------
@@ -141,7 +157,7 @@ the same user name used to connect to the first email server configured
 in Thunderbird. It is a current limitation but it will fit nearly all
 configurations out there.

-For testing purpose, it is strongly recommended to create and
+For testing purpose, you are strongly recommended to create and
 configure an additional user profile for Thunderbird. This is for two
 reasons. The first is because of the limitation mentioned above. The
 second is because the Integrator will synchronize your personal address
@@ -152,7 +168,7 @@ you may want to make a copy of that address book beforehand.
 The second part requires editing one file in the extension file sub tree
 to specify where the SOGo server is located. This is done by hand. In an
 enterprise environment, this step is only required once per release
-since the updates are expected to propagate automatically.
+since the updates are expected to propagate automatically. 

 Uncompress (using a ZIP or jar tool) the SOGo Integrator XPI and locate
 the following file:
@@ -179,7 +195,7 @@ if the SOGo server is accessible from the following URL:

 Note that if you changed the `x-webobjects-server-url` configuration
 setting from your HTTP server configuration file for SOGo, the
-value *must* match the one you specify in `isi:updateURL` - even the
+value *must* match the one you specify in `isi:updateURL` – even the
 port number.

 Moreover, you *must* change the value of the
@@ -200,7 +216,7 @@ In this section, you will learn how to install and configure the SOGo
 Update Server.

 The SOGo Update Server can be used to automatically install or uninstall
-Mozilla Thunderbird extensions, push user settings and more - all from a
+Mozilla Thunderbird extensions, push user settings and more – all from a
 central place managed by system administrators.

 Installation
@@ -1,7 +1,5 @@
 Native Microsoft Outlook Configuration Guide
 ============================================
-:toc: left
-:icons: font

 ////

@@ -144,7 +142,7 @@ to authenticate users. A SOGoUserSources entry to achieve this wold look
 like this:

 ----
-su - sogo
+su – sogo
 defaults write sogod SOGoUserSources '(
    {
        CNFieldName = displayName;
@@ -235,19 +233,18 @@ Installation
 This section will guide you through the installation of the native
 Microsoft Outlook compatibility layer SOGo offers.

-////
 Red Hat Enterprise Linux v6 x86_64
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 If you are using Red Hat Enterprise Linux version 6 x86_64, packages
 for Samba 4, OpenChange and SOGo and the SOGo OpenChange backend are
 available from SOGo's web site. Please follow the instructions from
-http://www.sogo.nu/english/downloads/backend.html.
+http://www.sogo.nu/english/downloads/backend_nightly.html.

 In order to satisfy certain dependencies, you should also add the EPEL
 source corresponding to your distribution and architecture. More
 information on this is available here:
-http://fedoraproject.org/wiki/EPEL - or more specifically,
+http://fedoraproject.org/wiki/EPEL – or more specifically,
 http://fedoraproject.org/wiki/EPEL/FAQ#How_can_I_install_the_packages_from_the_EPEL_software_repository.3F.

 Once ready, install the OpenChange packages on top of an existing SOGo
@@ -269,30 +266,32 @@ from this guide.

 [NOTE]
 Samba4/OpenChange are not available for now on CentOS 5 i386/x86_64,
-and CentOS 7. On Debian-based systems, packages are available only on
-the x86_64 platform.
+CentOS 6 i386 and CentOS 7.

-Debian 7 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Debian 7.0 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo, OpenChange and the SOGo OpenChange backend are now
 available from SOGo's web site. Please follow the instructions from
 http://www.sogo.nu/english/downloads/backend.html to setup your
 apt sources.

-On Debian7, for some Samba 4 dependencies, you need to use the
-_wheezy-backports_ repository. To do so, create
-`/etc/apt/sources.list.d/backports.list` with the following
-content:
+For Samba 4, you need to use the _wheezy-backports_ repository. To do so, create
+`/etc/apt/sources.list.d/backports.list`:

 deb http://http.debian.net/debian wheezy-backports main

+On Ubuntu 12.04, you will also have to add the Wheezy sources:
+
+ deb http://ftp.us.debian.org/debian wheezy main
+ deb http://security.debian.org/ wheezy/updates main
+
 Then install Samba 4 on top of an existing SOGo
 installation:

 ----
 apt-get update
-apt-get install samba samba-dev
+apt-get -t wheezy-backports install samba samba-dev
 ----

 Once completed, install the packages related to OpenChange and the SOGo
@@ -304,12 +303,7 @@ apt-get install openchangeserver \
                openchangeproxy \ 
                python-ocsmanager \
                mysql-server \
-                python-mysqldb \
-                openchange-ocsmanager \
-                openchange-rpcproxy \
-                python-sievelib \
-                python-spyne \
-                python-rpclib
+                python-mysqldb
 ----

 Once the packages are installed, refer to the _Configuration_ chapter
@@ -319,13 +313,15 @@ from this guide.
 On Ubuntu 12.04, the Samba init scripts need to be modified to
 disable the upstart check. For more details, refer to:
 https://wiki.samba.org/index.php/Samba4/InitScript
-////

-Ubuntu 16.04 (Xenial Xerus)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ubuntu 14.04 (Trusty Tahr)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For Ubuntu 14.04, you must not use the Debian Wheezy backports.

 Please follow the instructions from
-https://sogo.nu/download.html to setup your
+http://www.sogo.nu/english/downloads/backend.html to setup your
 apt sources.

 Then install Samba 4 on top of an existing SOGo
@@ -345,26 +341,12 @@ apt-get install openchangeserver \
                openchangeproxy \ 
                python-ocsmanager \
                mysql-server \
-                python-mysqldb \
-                openchange-ocsmanager \
-                openchange-rpcproxy \
-                python-sievelib \
-                python-spyne \
-                python-rpclib
+                python-mysqldb
 ----

 Once the packages are installed, refer to the _Configuration_ chapter
 from this guide.

-[NOTE]
-The `ocsmanager.conf` and `rpcproxy.conf` are currently located in
-`/etc/apache2/conf.d`. These should be moved to `/etc/apache2/conf-available`.
-This is a packaging error that will soon be fixed.
-
-[NOTE]
-You might have to adjust the `rpcproxy.conf` configuration file to add the
-`Require all granted` permission if you get Apache errors such as
-`client denied by server configuration`.

 Configuration
 -------------
@@ -390,7 +372,7 @@ Run the following commands as root:

 ----
 samba-tool domain provision --realm=example.com \
-          --domain=EXAMPLE \
+          --domain=OPENCHANGE \
          --adminpass='%1OpenChange' \
          --server-role='domain controller'

@@ -398,7 +380,7 @@ samba-tool user setexpiry administrator --noexpiry
 ----

 You might consider changing the realm and domain used, to suit your
-environment.
+enviroment.

 You might also have to
 remove `/etc/samba/smb.conf` prior running this command.
@@ -408,7 +390,6 @@ Add the following parameters to the `[global]` section of the

 ----
 ### Configuration required by OpenChange server ###
-dsdb:schema update allowed = true
 dcerpc endpoint servers = epmapper, mapiproxy, dnsserver
 dcerpc_mapiproxy:server = true
 dcerpc_mapiproxy:interfaces = exchange_emsmdb, exchange_nsp, exchange_ds_rfr
@@ -426,7 +407,6 @@ Your Samba 4 configuration file should look like this:
  netbios name = sogo
  passdb backend = samba4
  ### Configuration required by OpenChange server ###
-  dsdb:schema update allowed = true
  dcerpc endpoint servers = +epmapper, +mapiproxy
  dcerpc_mapiproxy:server = true
  dcerpc_mapiproxy:interfaces = exchange_emsmdb, exchange_nsp, exchange_ds_rfr
@@ -444,7 +424,7 @@ Your Samba 4 configuration file should look like this:
 OpenChange Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~

-Since v2.2, OpenChange stores its metadata in MySQL so you need to have it installed.
+OpenChange 2.2 stores its metadata in MySQL so you need to have it installed.

 First, create the OpenChange MySQL user:

@@ -515,11 +495,9 @@ mapistore:indexing_backend = mysql://openchange-user:openchange$123@localhost/op
 mapiproxy:openchangedb = mysql://openchange-user:openchange$123@localhost/openchange
 ----

-////
 On RHEL, make sure SELinux is disabled:

 setenforce 0
-////

 Next, you can start Samba using the usual command:

@@ -550,14 +528,12 @@ This service runs as a WSGI application under apache (mod_wsgi).
 While HTTPS is not required to access this service, it is strongly
 recommended.

-////
 On RHEL-based distributions, the apache configuration required by these
 services can be found in `/etc/httpd/conf.d/ocsmanager.conf` and
 `/etc/httpd/conf.d/rpcproxy.conf`.
-////

 For Debian-based distributions, these files can be found
-in `/etc/apache2/conf.d/` or `/etc/apache2/conf-available`.
+in `/etc/apache2/conf.d/`.

 The configuration requires three Apache modules:  _mod_proxy_,
 _mod_proxy_http_ and _mod_wsgi_. These are usually already installed but
@@ -565,19 +541,13 @@ might need to be activated on Debian-based installations:

 a2enmod proxy proxy_http wsgi

-The OCS Manager and RPC Proxy configuration module can be enabled using:
-
- a2enconf ocsmanager
- a2enconf rpcproxy
-
-////
 On RHEL-based distributions, make sure the `LoadModule` directive is
-uncommented in `/etc/httpd/conf.d/wsgi.conf`.
-////
+uncommented in `/etc/httpd/conf.d/wsgi.conf` (or
+`python26-mod_wsgi.conf` on RHELv5).

 The _reqtimeout_ apache module is known to cause problems when using the
 default configuration shipped with Debian-based systems. On such
-distributions, Apache will close (HTTP/1.1 500) any HTTP request for
+distributions, apache will close (HTTP/1.1 500) any HTTP request for
 which the HTTP body hasn't arrived in 10 seconds.

 While this is arguably good practice with regular HTTP, it will disrupt
@@ -589,112 +559,17 @@ To avoid this problem, use a much higher timeout or disable the module:
 a2dismod reqtimeout

 You should now restart the Apache service and make sure it will start on
-boot.
-////
-On RHEL-based distributions, do:
+boot. On RHEL-based distributions, do:

 chkconfig httpd on && /etc/init.d/httpd restart
-////
+
 On Debian-based distributions, do:

 update-rc.d apache2 defaults && /etc/init.d/apache2 restart

-Finally, you must adjust the OCS Manager configuration file, which is
-located in `/etc/ocsmanager/ocsmanager.ini`. You should enable LDAP-based
-authentication in the `main` section and configure it accordingly. You should
-also enable rpcproxy. You file should be similar to this one:
-
----
-[DEFAULT]
-debug = true
-email_to = you@yourdomain.com
-smtp_server = localhost
-error_email_from = paste@localhost
-
-[main]
-auth = ldap
-mapistore_root = /var/lib/samba/private
-mapistore_data = /var/lib/samba/private/mapistore
-debug = yes
-
-[auth:file]
-
-[auth:ldap]
-host = ldap://127.0.0.1
-port = 389
-bind_dn = cn=administrator,cn=Users,dc=example,dc=com
-bind_pw = %1OpenChange
-basedn = cn=Users,dc=example,dc=com
-
-[auth:single]
-username = openchange
-password = {SSHA}I6Hy5Wv0wuxyXvMBFWFQDVVN12_CLaX9
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 5000
-protocol_version = HTTP/1.1
-
-[app:main]
-use = egg:ocsmanager
-full_stack = true
-static_files = true
-cache_dir = %(here)s/data
-beaker.session.key = ocsmanager
-beaker.session.secret = SDyKK3dKyDgW0mlpqttTMGU1f
-app_instance_uuid = {ee533ebc-f266-49d1-ae10-d017ee6aa98c}
-NTLMAUTHHANDLER_WORKDIR = /var/cache/ntlmauthhandler
-SAMBA_HOST = 127.0.0.1
-
-[rpcproxy:ldap]
-host = localhost
-port = 389
-basedn = CN=Users,DC=example,DC=com
-set debug = true
----
-
----
-[autodiscover]
-
-[autodiscover:rpcproxy]
-enabled = true
-
-[outofoffice]
-
-[outofoffice:file]
-sieve_script_path = /var/vmail/$domain/$user/sieve-script
-sieve_script_path_mkdir = false
-
-[outofoffice:managesieve]
-secret = secret
-
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] [%(threadName)s] %(message)s
----
-
-Once completed, start the OCS Manager service:
-
- /etc/init.d/openchange-ocsmanager start
+[NOTE]
+Debian-based distributions are not supported anymore for
+OCSManager/rpcproxy. Support will soon resume.

 Name Service Configuration for Web Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -722,7 +597,7 @@ Adding Users
 ------------

 Users that wish to connect natively to SOGo must be provisioned in
-Samba 4 and in OpenChange - even if they already exist in your current
+Samba 4 and in OpenChange – even if they already exist in your current
 LDAP or Microsoft Active Directory server.

 To add a user, execute the following commands: 
@@ -805,6 +680,10 @@ contact Inverse by sending an email to support@inverse.ca.
 General
 ^^^^^^^

+* If you can't see any email's content with Microsoft Outlook 2007,
+install the latest Service Pack available from Microsoft's website for
+this specific version. Microsoft Outlook 2007 (12.0.6423.100) SP2 MSO
+(12.0.6425.1000) is known to work.
 * When you create a new Microsoft Outlook profile, not all folders might
 be synchronized during the first start. Simply select the appropriate
 folder and click "Send and Receive". Synchronizing a folder may take
@@ -816,10 +695,11 @@ can be ignored for now. This feature is currently not supported.
 remove any data associated with the user from the SOGo server and
 recreate a Microsoft Outlook profile.
 To remove any data associated to a user, use
-the `openchange_user_cleanup` script distributed with OpenChange. The script
-can be found in `/usr/share/openchange/`.
+the `openchange_user_cleanup` script distributed with SOGo. The script
+can be found in `/usr/share/doc/sogo/` (`/usr/share/sogo-VERSION/` on
+RHEL).
 To reset a user, run the script as root:
-`openchange_user_cleanup username`. See the usage output for additional options.
+`python openchange_user_cleanup username`. See the usage output for additional options.
 * The "Out of Office Assistant" will not currently work. This feature
 has not been implemented.
 * Creating folders below INBOX (when not normally permitted by the IMAP
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 3.2.2 - November 2016</releaseinfo>
-<subtitle>for version 3.2.2</subtitle>
-<date>2016-11-23</date>
+<releaseinfo>Version 2.2.13 - December 2014</releaseinfo>
+<subtitle>for version 2.2.13</subtitle>
+<date>2014-12-30</date>

 <legalnotice>
  <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
@@ -6,7 +6,7 @@
    Authors: 
      - Inverse inc. <info@inverse.ca>

-    Copyright (C) 2008-2016 Inverse inc.
+    Copyright (C) 2008-2014 Inverse inc.
    License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html

 ////
@@ -17,7 +17,7 @@ Additional Information
 For more information, please consult the online FAQs (Frequently Asked
 Questions) :

-http://sogo.nu/support/faq.html
+http://www.sogo.nu/english/support/faq.html

 You can also read the mailing archives or post your questions to it. For
 details, see :
@@ -6,13 +6,13 @@
    Authors:
      - Inverse inc. <info@inverse.ca>

-    Copyright (C) 2008-2016 Inverse inc.
+    Copyright (C) 2008-2014 Inverse inc.
    License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html

 ////

 // TODO have the build system take care of this

-:release_version: 3.2.2
+:release_version: 2.2.13

 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
@@ -19,6 +19,7 @@
  02111-1307, USA.
 */

+#import <Foundation/NSObject.h>

@interface MainUIProduct : NSObject
 {
@@ -26,6 +27,7 @@

@end

+#import <Foundation/Foundation.h>

@implementation MainUIProduct

@@ -20,6 +20,7 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSException.h>

@interface NSException (SOGoExtensions)

@@ -19,6 +19,7 @@
 * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
+#include <execinfo.h>

 #import "NSException+Stacktrace.h"

@@ -1,6 +1,8 @@
 /* SOGo+DAV.h - this file is part of SOGo
 *
- * Copyright (C) 2010-2016 Inverse inc.
+ * Copyright (C) 2010 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
 * 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,6 +31,7 @@
@interface SOGo (SOGoWebDAVExtensions)

 - (WOResponse *) davPrincipalMatch: (WOContext *) localContext;
+// - (WOResponse *) davPrincipalPropertySearch: (WOContext *) localContext;
 - (WOResponse *) davPrincipalSearchPropertySet: (WOContext *) localContext;

@end
@@ -1,6 +1,6 @@
 /* SOGo+DAV.m - this file is part of SOGo
 *
- * Copyright (C) 2010-2016 Inverse inc.
+ * Copyright (C) 2010-2013 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
@@ -18,12 +18,18 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>

 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>

+#import <DOM/DOMDocument.h>
+#import <DOM/DOMNode.h>
+#import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>

 #import <SOGo/NSArray+Utilities.h>
@@ -36,7 +42,6 @@
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserManager.h>

 #import "SOGo+DAV.h"

@@ -179,8 +184,9 @@
    [hrefs addObject: [self davURLAsString]];
 }

- (NSDictionary *)  _handlePrincipalMatchPrincipalProperty: (id <DOMElement>) child
-						 inContext: (WOContext *) localContext
+- (NSDictionary *)
+   _handlePrincipalMatchPrincipalProperty: (id <DOMElement>) child
+                                inContext: (WOContext *) localContext
 {
  NSMutableArray *hrefs;
  NSDictionary *response;
@@ -261,7 +267,7 @@
  NSObject <DOMNodeList> *list;
  NSObject <DOMNode> *valueNode;
  NSArray *elements;
-  NSString *property=nil, *match=nil;
+  NSString *property, *match;

  list = [searchElement getElementsByTagName: @"prop"];
  if ([list length])
@@ -359,26 +365,31 @@
    withEmailAddressSetMatching: (NSString *) value
                      inContext: (WOContext *) localContext
 {
-  SOGoUserManager *um;
+  id <SOGoSource> authenticationSource;
+  SOGoUser *activeUser;
  NSArray *records;
  NSUInteger count, max;
  NSString *uid;
  SOGoUserFolder *collection;

-  um = [SOGoUserManager sharedUserManager];
-  records = [um fetchUsersMatching: value
-			  inDomain: [[localContext activeUser] domain]];
-
-  max = [records count];
-  for (count = 0; count < max; count++)
+  activeUser = [localContext activeUser];
+  if ([activeUser respondsToSelector: @selector (authenticationSource)])
    {
-      uid = [[records objectAtIndex: count] objectForKey: @"c_uid"];
-      if ([uid length] > 0)
-	{
-	  collection = [[SOGoUser userWithLogin: uid]
+      authenticationSource = [[localContext activeUser] authenticationSource];
+      records = [authenticationSource
+                  fetchContactsMatching: value
+                               inDomain: [activeUser domain]];
+      max = [records count];
+      for (count = 0; count < max; count++)
+        {
+          uid = [[records objectAtIndex: count] objectForKey: @"c_uid"];
+          if ([uid length] > 0)
+            {
+              collection = [[SOGoUser userWithLogin: uid]
                             homeFolderInContext: localContext];
-	  [collections addObject: collection];
-	}
+              [collections addObject: collection];
+            }
+        }
    }
 }

@@ -574,6 +585,7 @@
                             @"addressbook", @"calendar-access",
                             @"calendar-schedule", @"calendar-auto-schedule",
                             @"calendar-proxy",
+
                             @"calendar-query-extended",
                             @"extended-mkcol",
                             @"calendarserver-principal-property-search",
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2005-2016 Inverse inc.
+  Copyright (C) 2005-2010 Inverse inc.
+  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo.

@@ -26,6 +27,7 @@

@class NSArray;
@class NSDictionary;
+@class NSMutableDictionary;

@class SOGoCache;

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

  This file is part of SOGo

@@ -19,11 +20,18 @@
  02111-1307, USA.
 */

+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSURL.h>

 #import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/GCSFolderManager.h>
-#import <GDLContentStore/GCSFolderType.h>
 #import <GDLContentStore/GCSAlarmsFolder.h>
 #import <GDLContentStore/GCSSessionsFolder.h>

@@ -50,6 +58,7 @@
 #import <SOGo/SOGoPublicBaseFolder.h>
 #import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoProxyAuthenticator.h>
+#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoWebAuthenticator.h>
@@ -136,7 +145,7 @@ static BOOL debugLeaks;
  [$(@"SOGoFolder") soClass];

  /* load products */
-  [[SOGoProductLoader productLoader] loadAllProducts: YES];
+  [[SOGoProductLoader productLoader] loadAllProducts];
 }

 - (id) init
@@ -211,94 +220,36 @@ static BOOL debugLeaks;
  [cm releaseChannel: tc];
 }

- (void) _checkQuickTableWithTypeName: typeName
-                               withCm: (GCSChannelManager *) cm
-                             tableURL: (NSString *) url
-{
-  GCSFolderType *type;
-  NSString *sql;
-  NSString *tableName;
-  EOAdaptorChannel *channel;
-
-  channel = [cm acquireOpenChannelForURL: [NSURL URLWithString: url]];
-
-  tableName = [NSString stringWithFormat: @"sogo_quick_%@", typeName];
-  sql = [NSString stringWithFormat: @"SELECT count(*) FROM %@",
-                  tableName];
-  if ([channel evaluateExpressionX: sql])
-    {
-      type = [GCSFolderType folderTypeWithName: typeName];
-      if (type)
-        {
-          sql = [type sqlQuickCreateWithTableName: tableName];
-          if (![channel evaluateExpressionX: sql])
-            [self logWithFormat: @"sogo quick table %@ successfully created!",
-                  tableName];
-        }
-    }
-  else
-    [channel cancelFetch];
-
-  [cm releaseChannel:channel];
-}
-
-
-//
-// If OCSStoreURL is defined, we also check for OCSAclURL, OCSCacheFolderURL
-// and we create the combined quick tables.
-//
 - (BOOL) _checkMandatoryTables
 {
  GCSChannelManager *cm;
  GCSFolderManager *fm;
-  NSArray *urlStrings;
-  NSArray *quickTypeStrings;
-  NSString *tmp, *value;
+  NSString *urlStrings[] = {@"SOGoProfileURL", @"OCSFolderInfoURL", nil};
+  NSString **urlString;
+  NSString *value;
  SOGoSystemDefaults *defaults;
-  NSEnumerator *e;
-  BOOL ok, combined;
+  BOOL ok;

  defaults = [SOGoSystemDefaults sharedSystemDefaults];
  ok = YES;
-
-  if ([GCSFolderManager singleStoreMode])
-    {
-      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", @"OCSStoreURL", @"OCSAclURL", @"OCSCacheFolderURL", nil];
-      quickTypeStrings = [NSArray arrayWithObjects: @"contact", @"appointment", nil];
-      combined = YES;
-    }
-  else
-    {
-      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", nil];
-      combined = NO;
-    }
-
  cm = [GCSChannelManager defaultChannelManager];

-  e = [urlStrings objectEnumerator];
-  while (ok && (tmp = [e nextObject]))
+  urlString = urlStrings;
+  while (ok && *urlString)
    {
-      value = [defaults stringForKey: tmp];
+      value = [defaults stringForKey: *urlString];
      if (value)
-	  [self _checkTableWithCM: cm tableURL: value andType: tmp];
+	{
+	  [self _checkTableWithCM: cm tableURL: value andType: *urlString];
+	  urlString++;
+	}
      else
 	{
-	  [self errorWithFormat: @"No value specified for '%@'", tmp];
+	  NSLog (@"No value specified for '%@'", *urlString);
 	  ok = NO;
 	}
    }

-  if (combined)
-    {
-      e = [quickTypeStrings objectEnumerator];
-      while ((tmp = [e nextObject]))
-        {
-          [self _checkQuickTableWithTypeName: tmp
-                                      withCm: cm
-                                    tableURL: [defaults stringForKey: @"OCSFolderInfoURL"]];
-        }
-    }
-
  if (ok)
    {
      fm = [GCSFolderManager defaultFolderManager];
@@ -474,12 +425,8 @@ static BOOL debugLeaks;
 {
  static NSArray *runLoopModes = nil;
  static BOOL debugOn = NO;
-
-  SOGoSystemDefaults *sd;
  WOResponse *resp;
  NSDate *startDate;
-  NSString *path;
-
  NSTimeInterval timeDelta;

  if (debugRequests)
@@ -489,13 +436,12 @@ static BOOL debugLeaks;
      startDate = [NSDate date];
    }

-  sd = [SOGoSystemDefaults sharedSystemDefaults];
  cache = [SOGoCache sharedCache];
 #ifdef GNUSTEP_BASE_LIBRARY
  if (debugLeaks)
    {
      if (debugOn)
-        [self logWithFormat: @"allocated classes:\n%s", GSDebugAllocationList (YES)];
+        NSLog (@"allocated classes:\n%s", GSDebugAllocationList (YES));
      else
        {
          debugOn = YES;
@@ -504,64 +450,6 @@ static BOOL debugLeaks;
    }
 #endif

-  // We check for rate-limiting settings - ignore anything actually
-  // sent to /SOGo/ (so unauthenticated requests).
-  path = [_request requestHandlerPath];
-  if ([path length] && [sd maximumRequestCount] > 0)
-    {
-      NSDictionary *requestCount;
-      NSString *username;
-      NSRange r;
-
-      r = [path rangeOfString: @"/"];
-
-      // We handle /sogo1/Calendar/.../ and "sogo1" as paths
-      if (r.length)
-        username = [path substringWithRange: NSMakeRange(0, r.location)];
-      else
-        username = path;
-
-      requestCount = [cache requestCountForLogin: username];
-
-      if (requestCount)
-        {
-          unsigned int  current_time, start_time, delta, block_time, request_count;
-
-          current_time = [[NSCalendarDate date] timeIntervalSince1970];
-          start_time = [[requestCount objectForKey: @"InitialDate"] unsignedIntValue];
-          delta = current_time - start_time;
-
-          block_time = [sd requestBlockInterval];
-          request_count = [[requestCount objectForKey: @"RequestCount"] intValue];
-
-          if ( request_count >= [sd maximumRequestCount] &&
-               delta < [sd maximumRequestInterval] &&
-               delta <= block_time )
-            {
-              resp = [WOResponse responseWithRequest: _request];
-              [resp setStatus: 429];
-              return resp;
-            }
-
-          if (delta > block_time)
-            {
-              [cache setRequestCount: 1
-                            forLogin: username
-                            interval: current_time];
-            }
-          else
-            [cache setRequestCount: (request_count+1)
-                          forLogin: username
-                          interval: start_time];
-        }
-      else
-        {
-          [cache setRequestCount: 1
-                        forLogin: username
-                        interval: 0];
-        }
-    }
-
  resp = [super dispatchRequest: _request];
  [cache killCache];

@@ -1,15 +1,15 @@
 /*
  Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2006-2015 Inverse inc.
+  Copyright (C) 2006-2009 Inverse inc.

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

-  SOGo is free software; you can redistribute it and/or modify it under
+  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.

-  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  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.
@@ -21,8 +21,10 @@
 */

 #include <unistd.h>
+#include <sys/types.h>

 #import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>

 #import <NGObjWeb/SoApplication.h>
@@ -1,758 +1,22 @@
-3.2.2 (2016-11-23)
------------------
-
-New features
- - [core] support repetitive email alarms on tasks and events (#1053)
- - [web] allow to hide center column on large screens (#3861)
- - [eas] relaxed permission requirements for subscription synchronizations (#3118 and #3180)
-
-Enhancements
- - [core] added sha256-crypt and sha512-crypt password support
- - [core] updated time zones to version 2016i
- - [eas] now also search on senders when using EAS Search ops
- - [web] allow multiple messages to be marked as seen (#3873)
- - [web] use switches instead of checkboxes in Calendars module
-
-Bug fixes
- - [core] fixed condition in weekly recurrence calculator
- - [core] always send IMIP messages using UTF-8
- - [web] fixed mail settings persistence when sorting by arrival date
- - [web] disable submit button while saving an event or a task (#3880)
- - [web] disable submit button while saving a contact
- - [web] fixed computation of week number
- - [web] fixed and improved IMAP folder subscriptions manager (#3865)
- - [web] fixed Sieve script activation when vacation start date is in the future (#3885)
- - [web] fixed moving a component without the proper rights (#3889)
- - [web] restored Sieve folder encoding support (#3904)
- - [web] allow edition of a mailbox rights when user can administer mailbox
-
-3.2.1 (2016-11-02)
------------------
-
-Enhancements
- - [web] add constraints to start/end dates of automatic responder (#3841)
- - [web] allow a mailbox to be deleted immediately (#3875)
- - [web] updated Angular to version 1.5.8
- - [eas] initial support for recurring tasks EAS
- - [eas] now support replied/forwarded flags using EAS (#3796)
- - [core] updated time zones to version 2016h
-
-Bug fixes
- - [web] fixed tasks list when some weekdays are disabled
- - [web] fixed automatic refresh of calendar view
- - [web] respect SOGoSearchMinimumWordLength in contacts list editor
- - [web] improved memory usage when importing very large address books
- - [web] fixed progress indicator while importing cards or events and tasks
- - [web] improved detection of changes in CKEditor (#3839)
- - [web] fixed vCard generation for tags with no type (#3826)
- - [web] only show the organizer field of an IMIP REPLY if one is defined
- - [web] fixed saving the note of a card (#3849)
- - [web] fixed support for recurrent tasks (#3864)
- - [web] restored support for alarms in tasks
- - [web] improved validation of mail account delegators
- - [web] fixed auto-completion of list members (#3870)
- - [web] added missing options to subscribed addressbooks (#3850)
- - [web] added missing options to subscribed calendars (#3863)
- - [web] fixed resource conflict error handling (403 vs 409 HTTP code) (#3837)
- - [web] restored immediate deletion of messages (without moving them to the trash)
- - [web] avoid mail notifications on superfluous event changes (#3790)
- - [web] CKEditor: added the pastefromexcel plugin (#3854)
- - [eas] improve handling of email folders without a parent
- - [eas] never send IMIP reply when the "initiator" is Outlook 2013/2016
- - [core] only consider SMTP addresses for AD's proxyAddresses (#3842)
- - [core] sogo-tool manage-eas now works with single store mode
-
-
-3.2.0 (2016-10-03)
------------------
-
-New features
- - [web] added IMAP folder subscriptions management (#255)
- - [web] keyboard hotkeys (#1711, #1467, #3817)
- - [eas] initial support for server-side mailbox search operations
-
-Enhancements
- - [web] don't allow a recurrence rule to end before the first occurrence
- - [web] updated Angular Material to version 1.1.1
- - [web] show user's name upon successful login
- - [web] inserted unseen messages count and mailbox name in browser's window title
- - [web] disable JavaScript theme generation when SOGoUIxDebugEnabled is set to NO
- - [web] added Serbian (sr) translation - thanks to Bogdanović Bojan
- - [web] added sort by arrival date in Mail module (#708)
- - [web] restored "now" line in Calendar module
- - [web] updated CKEditor to version 4.5.11
- - [web] allow custom email address to be one of the user's profile (#3551)
- - [eas] propagate message submission errors to EAS clients (#3774) 
-
-Bug fixes
- - [eas] properly generate the BusyStatus for normal events
- - [eas] properly escape all email and address fields
- - [eas] properly generate yearly rrule
- - [eas] make sure we don't sleep for too long when EAS processes need interruption
- - [eas] fixed recurring events with timezones for EAS (#3822)
- - [web] restored functionality to save unknown recipient emails to address book on send
- - [web] fixed ripple blocking the form when submitting no values (#3808)
- - [web] fixed error handling when renaming a mailbox
- - [web] handle binary content transfer encoding when displaying mails
- - [web] removed resize grips to short events (#3771)
- - [core] strip protocol value from proxyAddresses attribute (#3182)
- - [core] we now search in all domain sources for Apple Calendar
- - [core] properly handle groups in Apple Calendar's delegation
- - [core] fixed caching expiration of ACLs assigned to LDAP groups (#2867)
- - [core] make sure new cards always have a UID (#3819)
- - [core] fixed default TRANSP value when creating event
-
-3.1.5 (2016-08-10)
------------------
-
-New features
- - [web] drag'n'drop of messages in the Mail module (#3497, #3586, #3734, #3788)
- - [web] drag'n'drop of cards in the AddressBook module
- - [eas] added folder merging capabilities
-
-Enhancements
- - [web] improve action progress when login in or sending a message (#3765, #3761)
- - [web] don't allow to send the message while an upload is in progress
- - [web] notify when successfully copied or moved some messages
- - [web] restored indicator in the top banner when a vacation message (auto-reply) is active
- - [web] removed animation when dragging an event to speed up rendering
- - [web] expunge drafts mailbox when a draft is sent and deleted
- - [web] actions of Sieve filters are now sortable
- - [web] show progress indicator when refreshing events/tasks lists
- - [web] updated CKEditor to version 4.5.10
-
-Bug fixes
- - [web] fixed refresh of addressbook when deleting one or many cards
- - [web] reset multiple-selection mode after deleting cards, events or tasks
- - [web] fixed exception when moving tasks to a different calendar
- - [web] fixed printing of long mail (#3731)
- - [web] fixed position of ghost block when creating an event from DnD
- - [web] fixed avatar image in autocompletion
- - [web] restored expunge of current mailbox when leaving the Mail module
- - [web] added support for multiple description values in LDAP entries (#3750)
- - [web] don't allow drag'n'drop of invitations
- - [eas] fixed long GUID issue preventing sometimes synchronisation (#3460)
- - [core] fixing sogo-tool backup with multi-domain configuration but domain-less logins
- - [core] during event scheduling, use 409 instead of 403 so Lightning doesn't fail silently
- - [core] correctly calculate recurrence exceptions when not overlapping the recurrence id
- - [core] prevent invalid SENT-BY handling during event invitations (#3759)
-
-3.1.4 (2016-07-12)
------------------
-
-New features
- - [core] new sogo-tool truncate-calendar feature (#1513, #3141)
- - [eas] initial Out-of-Office support in EAS
- - [oc] initial support for calendar and address book sharing with OpenChange
-
-Enhancements
- - [eas] use the preferred email identity in EAS if valid (#3698)
- - [eas] handle inline attachments during EAS content generation
- - [web] all batch operations can now be performed on selected messages in advanced search mode
- - [web] add date picker to change date, week, or month of current Calendar view
- - [web] style cancelled events in Calendar module
- - [web] replace sortable library for better support with Firefox
- - [web] stage-1 tuning of sgColorPicker directive
- - [oc] better handling of nested attachments with OpenChange
-
-Bug fixes
- - [web] fixed crash when an attachment filename has no extension
- - [web] fixed selection of transparent all-day events (#3744)
- - [web] leaving the dropping area while dragging a file was blocking the mail editor
- - [web] fixed scrolling of all-day events (#3190)
- - [eas] handle base64 EAS protocol version
- - [eas] handle missing IMAP folders from a hierarchy using EAS
-
-3.1.3 (2016-06-22)
------------------
-
-New features
- - [core] now possible to define default Sieve filters (#2949)
- - [core] now possible to set vacation message start date (#3679)
- - [web] add a header and/or footer to the vacation message (#1961)
- - [web] specify a custom subject for the vacation message (#685, #1447)
-
-Enhancements
- - [core] when restoring data using sogo-tool, regenerate Sieve script (#3029)
- - [web] always display name of month in week view (#3724)
- - [web] use a speed dial (instead of a dialog) for card/list creation
- - [web] use a speed dial for event/task creation
- - [web] CSS is now minified using clean-css
-
-Bug fixes
- - [core] properly handle sorted/deleted calendars (#3723)
- - [core] properly handle flattened timezone definitions (#2690)
- - [web] fixed generic avatar in lists (#3719)
- - [web] fixed validation in Sieve filter editor
- - [web] properly encode rawsource of events and tasks to avoid XSS issues (#3718)
- - [web] properly encode rawsource of cards to avoid XSS issues
- - [web] fixed all-day events covering a timezone change (#3457)
- - [web] sgTimePicker parser now respects the user's time format and language
- - [web] fixed time format when user chooses the default one
- - [web] added missing delegators identities in mail editor (#3720)
- - [web] honour the domain default SOGoAppointmentSendEMailNotifications (#3729)
- - [web] the login module parameter is now properly restored when set as "Last used"
- - [web] if cn isn't found for shared mailboxes, use email address (#3733)
- - [web] fixed handling of attendees when updating an event
- - [web] show tooltips over long calendar/ab names (#232)
- - [web] one-click option to give all permissions for user (#1637)
- - [web] never query gravatar.com when disabled
-
-3.1.2 (2016-06-06)
------------------
-
-Enhancements
- - [web] updated Angular Material to version 1.1.0rc5
-
-Bug fixes
- - [web] fixed error handling when renaming a mailbox
- - [web] fixed user removal from ACLs in Administration module (#3713)
- - [web] fixed event classification icon (private/confidential) in month view (#3711)
- - [web] CKEditor: added the pastefromword plugin (#2295, #3313)
- - [web] fixed loading of card from global addressbooks
- - [web] fixed negative offset when saving an all-day event (#3717)
-
-3.1.1 (2016-06-02)
------------------
-
-Enhancements
- - [web] expose all email addresses in autocompletion of message editor (#3443)
- - [web] Gravatar service can now be disabled (#3600)
- - [web] collapsable mail accounts (#3493)
- - [web] show progress indicator when loading messages and cards
- - [web] display messages sizes in list of Mail module
- - [web] link event's attendees email addresses to mail composer
- - [web] respect SOGoSearchMinimumWordLength when searching for events or tasks
- - [web] updated CKEditor to version 4.5.9
- - [web] CKEditor: switched to the minimalist skin
- - [web] CKEditor: added the base64image plugin
-
-Bug fixes
- - [core] strip X- tags when securing content (#3695)
- - [web] fixed creation of chip on blur (sgTransformOnBlur directive)
- - [web] fixed composition of new messages from Contacts module
- - [web] fixed autocompletion of LDAP-based groups (#3673)
- - [web] fixed month view when current month covers six weeks (#3663)
- - [web] fixed negative offset when converting a regular event to an all-day event (#3655)
- - [web] fixed event classification icon (private/confidential) in day/week/multicolumn views
- - [web] fixed display of mailboxes list on mobiles (#3654)
- - [web] restored Catalan and Slovak translations (#3687)
- - [web] fixed restore of mailboxes expansion state when multiple IMAP accounts are configured
- - [web] improved CSS sanitizer for HTML messages (#3700)
- - [web] fixed toolbar of mail editor when sender address was too long (#3705)
- - [web] fixed decoding of filename in attachments (quotes and Cyrillic characters) (#2272)
- - [web] fixed recipients when replying from a message in the Sent mailbox (#2625)
- - [eas] when using EAS/ItemOperations, use IMAP PEEK operation
-
-3.1.0 (2016-05-18)
------------------
-
-New features
- - [core] new database structure options to make SOGo use a total of nine tables
- - [core] new user-based rate-limiting support for all SOGo requests (#3188)
- - [web] toolbar of all-day events can be expanded to display all events
- - [web] added AngularJS's XSRF support (#3246)
- - [web] calendars list can be reordered and filtered
- - [web] user can limit the calendars view to specific week days (#1841)
-
-Enhancements
- - [web] updated Angular Material to version 1.1.0rc4
- - [web] added Lithuanan (lt) translation - thanks to Mantas Liobė
- - [web] added Turkish (Turkey) (tr_TR) translation - thanks to Sinan Kurşunoğlu
- - [web] we now "cc" delegates during invitation updates (#3195)
- - [web] new SOGoHelpURL preference to set a custom URL for SOGo help (#2768)
- - [web] now able to copy/move events and also duplicate them (#3196)
- - [web] improved preferences validation and now check for unsaved changes
- - [web] display events and tasks priorities in list and day/week views (#3162)
- - [web] style events depending on the user participation state
- - [web] style transparent events (show time as free) (#3192)
- - [web] improved input parsing of time picker (#3659)
- - [web] restored support for Web calendars that require authentication
-
-Bug fixes
- - [core] properly escape wide characters (#3616)
- - [core] avoid double-appending domains in cache for multi-domain configurations (#3614)
- - [core] fixed multidomain issue with non-unique ID accross domains (#3625)
- - [core] fixed bogus headers generation when stripping folded bcc header (#3664)
- - [core] fixed issue with multi-value org units (#3630)
- - [core] sanity checks for events with bogus timezone offsets
- - [web] fixed missing columns in SELECT statements (PostgreSQL)
- - [web] fixed display of ghosts when dragging events
- - [web] fixed management of mail labels in Preferences module
- - [web] respect super user privileges to create in any calendar and addressbook (#3533)
- - [web] properly null-terminate IS8601-formatted dates (#3539)
- - [web] display CC/BCC fields in message editor when initialized with values
- - [web] fixed message initialization in popup window (#3583)
- - [web] create chip (recipient) on blur (#3470)
- - [web] fixed position of warning when JavaScript is disabled (#3449)
- - [web] respect the LDAP attributes mapping in the list view
- - [web] handle empty body data when forwarding mails (#3581)
- - [web] show repeating events when we ask for "All" or "Future" events (#69)
- - [web] show the To instead of From when we are in the Sent folder (#3547)
- - [web] fixed handling of mail tags in mail viewer
- - [web] avoid marking mails as read when archiving a folder (#2792)
- - [web] fixed crash when sending a message with a special priority
- - [web] fixed saving of a custom weekly recurrence definition
- - [web] properly escape the user's display name (#3617)
- - [web] avoid returning search results on objects without read permissions (#3619)
- - [web] restore priority of event or task in component editor
- - [web] fixed menu content visibility when printing an email (#3584)
- - [web] retired CSS reset so the style of HTML messages is respected (#3582)
- - [web] fixed messages archiving as zip file
- - [web] adapted time picker to match changes of md calendar picker
- - [web] fixed sender addresses of draft when using multiple IMAP accounts (#3577)
- - [web] create a new message when clicking on a "mailto" link (#3588)
- - [web] fixed handling of Web calendars option "reload on login"
- - [web] add recipient chip when leaving an input field (to/cc/bcc) (#3470)
- - [dav] we now handle the default classifications for tasks (#3541)
- - [eas] properly unfold long mail headers (#3152)
- - [eas] correctly set EAS message class for S/MIME messages (#3576)
- - [eas] handle FilterType changes using EAS (#3543)
- - [eas] handle Dovecot's mail_shared_explicit_inbox parameter
- - [eas] prevent concurrent Sync ops from same device (#3603)
- - [eas] handle EAS loop termination when SOGo is being shutdown (#3604)
- - [eas] now cache heartbeat interval and folders list during Ping ops (#3606)
- - [eas] sanitize non-us-ascii 7bit emails (#3592)
- - [eas] properly escape organizer name (#3615)
- - [eas] correctly set answered/forwarded flags during smart operations
- - [eas] don't mark calendar invitations as read when fetching messages
-
-3.0.2 (2016-03-04)
------------------
-
-New features
- - [web] show all/only this calendar
- - [web] convert a message to an appointment or a task (#1722)
- - [web] customizable base font size for HTML messages
- - [web you can now limit the file upload size using the WOMaxUploadSize
-   configuration parameter (integer value in kilobytes) (#3510, #3135)
-
-Enhancements
- - [web] added Junk handling feature from v2
- - [web] updated Material Icons font to version 2.1.3
- - [web] don't offer forward/vacation options in filters if not enabled
- - [web] mail filters are now sortable
- - [web] now supports RFC6154 and NoInferiors IMAP flag
- - [web] improved confirm dialogs for deletions
- - [web] allow resources to prevent invitations (#3410)
- - [web] warn when double-booking attendees and offer force save option
- - [web] list search now displays a warning regarding the minlength constraint
- - [web] loading an LDAP-based addressbook is now instantaneous when listRequiresDot is disabled (#438, #3464)
- - [web] improve display of messages with many recipients
- - [web] colorize categories chips in event and task viewers
- - [web] initial stylesheet for printing (#3484)
- - [web] updated lodash to version 4.6.1
- - [i18n] updated French and Finnish translations
- - [eas] now support EAS MIME truncation
-
-Bug fixes
- - [web] handle birthday dates before 1970 (#3567)
- - [web] safe-guarding against bogus value coming from the quick tables
- - [web] apply search filters when automatically reloading current mailbox (#3507)
- - [web] fixed virtual repeater when moving up in messages list
- - [web] really delete mailboxes being deleted from the Trash folder (#595, #1189, #641)
- - [web] fixed address autocompletion of mail editor affecting cards list of active addressbook
- - [web] fixed batched delete of components (#3516)
- - [web] fixed mail draft autosave in preferences (#3519)
- - [web] fixed password change (#3496)
- - [web] fixed saving of notification email for calendar changes (#3522)
- - [web] fixed ACL editor for authenticated users in Mail module
- - [web] fixed fab button position in Calendar module (#3462)
- - [web] fixed default priority of sent messages (#3542)
- - [web] removed double-quotes from Chinese (Taiwan) translations that were breaking templates
- - [web] fixed unseen count retrieval of nested IMAP folders
- - [web] properly extract the mail column values from an SQL contacts source (#3544)
- - [web] fixed incorrect date formatting when timezone was after UTC+0 (#3481, #3494)
- - [web] replaced checkboxes in menu by a custom checkmark (#3557)
- - [web] fixed attachments display when forwarding a message (#3560)
- - [web] activate new calendar subscriptions by default
- - [web] keep specified task status when not completed (#3499)
- - [eas] allow EAS attachments get on 2nd-level mailboxes (#3505)
- - [eas] fix EAS bday shift (#3518)
- - [eas] encode CR in EAS payload (#3626)
-
-3.0.1 (2016-02-05)
------------------
-
-Enhancements
- - [web] improved scrolling behavior when deleting a single message (#3489)
- - [web] added "Move To" option for selected messages (#3477)
- - [web] updated CKEditor to version 4.5.7
- - [web] updated Angular Material to 1.0.5
- - [web/eas] add shared/public namespaces in the list or returned folders
-
-Bug fixes
- - [web] safeguard against mailboxes with no quota (#3468)
- - [web] fixed blank calendar view when selecting "Descending Order" in the sort menu
- - [web] show active user's default email address instead of system email address (#3473)
- - [web] fixed display of HTML tags when viewing a message raw source (#3490)
- - [web] fixed IMIP accept/decline when there is only one MIME part
- - [web] improved handling of IMAP connection problem in Web interface
- - [web] fixed frequency parsing of recurrence rule when saving new appointment (#3472)
- - [web] added support for %p in date formatting (#3480)
- - [web] make sure an email is defined before trying to use it (#3488)
- - [web] handle broken messages that have no date (#3498)
- - [web] fixed virtual-repeater display in Webmail when a search is performed (#3500)
- - [web] fixed drag'n'drop of all-day events in multicolumn view
- - [eas] correctly encode filename of attachments over EAS (#3491)
-
-3.0.0 (2016-01-27)
------------------
-
-New features
- - complete rewrite of the JavaScript frontend using Angular and AngularMaterial
- - responsive design and accessible options focused on mobile devices
- - horizontal 3-pane view for a better experience on large desktop screens
- - new color palette and better contrast ratio as recommended by the W3C
- - improved accessibility to persons with disabilities by enabling common ARIA attributes
- - use of Mozilla's Fira Sans typeface
- - and many more!
-
-2.3.7 (2016-01-25)
------------------
-
-New features
- - new junk/not junk capability with generic SMTP integration
-
-Enhancements
- - newly created folders using EAS are always sync'ed by default (#3454)
- - added Croatian (hr_HR) translation - thanks to Jens Riecken
-
-Bug fixes
- - now always generate invitation updates when using EAS
- - rewrote the string sanitization to be 32-bit Unicode safe
- - do not try to decode non-wbxml responses for debug output (#3444)
-
-2.3.6 (2016-01-18)
------------------
-
-New features
- - now able to sync only default mail folders when using EAS
-
-Enhancements
- - Unit testing for RTFHandler
- - JUnit output for sogo-tests
-
-Bug fixes
- - don't unescape twice mail folder names (#3423)
- - don't consider mobile Outlook EAS clients as DAV ones (#3431)
- - we now follow 301 redirects when fetching ICS calendars
- - when deleting an event using EAS, properly invoke the auto-scheduling code
- - do not include failure attachments (really long filenames)
- - fix encoding of email subjects with non-ASCII characters
- - fix appointment notification mails using SOGoEnableDomainBasedUID configuration
- - fix shifts in event times on Outlook
-
-2.3.5 (2016-01-05)
------------------
-
-Enhancements
- - return an error to openchange if mail message delivery fails
- - return the requested elements on complex requests from Outlook when downloading changes
- - user sources can be loaded dynamically
- - unify user sources API
- - updated Russian translation (#3383)
-
-Bug fixes
- - properly compute the last week number for the year (#1010)
- - share calendar, tasks and contacts folders in Outlook 2013 with editor permissions
- - priorize filename in Content-Disposition against name in Content-Type to get the filename of an attachment in mail
- - request all contacts when there is no filter in Contacts menu in Webmail
- - personal contacts working properly on Outlook
- - fixes on RTF parsing used by event/contact description and mail as RTF to read non-ASCII characters:
-   better parsing of font table, when using a font, switch to its character set, correct parsing of
-   escaped characters and Unicode character command word support for unicode characters greater than 32767
- - no crash resolving recipients after reconnecting LDAP connection
- - avoid creation of phantom contacts in SOGo from distribution list synced from Outlook.
- - accepted & updated event names are now shown correctly in Outlook
- - provide safe guards in mail and calendar to avoid exceptions while syncing
-
-2.3.4 (2015-12-15)
------------------
-
-New features
- - initial support for EAS calendar exceptions
-
-Enhancements
- - limit the maximum width of toolbar buttons (#3381)
- - updated CKEditor to version 4.5.6
-
-Bug fixes
- - JavaScript exception when printing events from calendars with no assigned color (#3203)
- - EAS fix for wrong charset being used (#3392)
- - EAS fix on qp-encoded subjects (#3390)
- - correctly handle all-day event exceptions when the master event changes
- - prevent characters in calendar component UID causing issues during import process
- - avoid duplicating attendees when accepting event using a different identity over CalDAV
-
-2.3.3a (2015-11-18)
-------------------
-
-Bug fixes
- - expanded mail folders list is not saved (#3386)
- - cleanup translations
-
-2.3.3 (2015-11-11)
------------------
-
-New features
- - initial S/MIME support for EAS (#3327)
- - now possible to choose which folders to sync over EAS
-
-Enhancements
- - we no longer always entirely rewrite messages for Outlook 2013 when using EAS
- - support for ghosted elements on contacts over EAS
- - added Macedonian (mk_MK) translation - thanks to Miroslav Jovanovic
- - added Portuguese (pt) translation - thanks to Eduardo Crispim
-
-Bug fixes
- - numerous EAS fixes when connections are dropped before the EAS client receives the response (#3058, #2849)
- - correctly handle the References header over EAS (#3365)
- - make sure English is always used when generating Date headers using EAS (#3356)
- - don't escape quoted strings during versit generation
- - we now return all cards when we receive an empty addressbook-query REPORT
- - avoid crash when replying to a mail with no recipients (#3359)
- - inline images sent from SOGo webmail are not displayed in Mozilla Thunderbird (#3271)
- - prevent postal address showing on single line over EAS (#2614)
- - display missing events when printing working hours only
- - fix corner case making server crash when syncing hard deleted messages when clear offline items was set up (Zentyal)
- - avoid infinite Outlook client loops trying to set read flag when it is already set (Zentyal)
- - avoid crashing when calendar metadata is missing in the cache (Zentyal)
- - fix recurrence pattern event corner case created by Mozilla Thunderbird which made server crash (Zentyal)
- - fix corner case that removes attachments on sending messages from Outlook (Zentyal)
- - freebusy on web interface works again in multidomain environments (Zentyal)
- - fix double creation of folders in Outlook when the folder name starts with a digit (Zentyal)
- - avoid crashing Outlook after setting a custom view in a calendar folder (Zentyal)
- - handle emails having an attachment as their content
- - fixed JavaScript syntax error in attendees editor
- - fixed wrong comparison of meta vs. META tag in HTML mails
- - fixed popup menu position when moved to the left (#3381)
- - fixed dialog position when at the bottom of the window (#2646, #3378)
-
-2.3.2 (2015-09-16)
------------------
-
-Enhancements
- - improved EAS speed and memory usage, avoiding many IMAP LIST commands (#3294)
- - improved EAS speed during initial syncing of large mailboxes (#3293)
- - updated CKEditor to version 4.5.3
-
-Bug fixes
- - fixed display of whitelisted attendees in Preferences window on Firefox (#3285)
- - non-latin subfolder names are displayed correctly on Outlook (Zentyal)
- - fixed several sync issues on environments with multiple users (Zentyal)
- - folders from other users will no longer appear on your Outlook (Zentyal)
- - use right auth in multidomain environments in contacts and calendar from Outlook (Zentyal)
- - session fix when SOGoEnableDomainBasedUID is enabled but logins are domain-less
- - less sync issues when setting read flag (Zentyal)
- - attachments with non-latin filenames sent by Outlook are now received (Zentyal)
- - support attachments from more mail clients (Zentyal)
- - avoid conflicting message on saving a draft mail (Zentyal)
- - less conflicting messages in Outlook while moving messages between folders (Zentyal)
- - start/end shifting by 1 hour due to timezone change on last Sunday of October 2015 (#3344)
- - fixed localization of calendar categories with empty profile (#3295)
- - fixed options availability in contextual menu of Contacts module (#3342)
-
-2.3.1 (2015-07-23)
------------------
-
-Enhancements
- - improved EAS speed, especially when fetching big attachments
- - now always enforce the organizer's default identity in appointments
- - improved the handling of default calendar categories/colors (#3200) 
- - added support for DeletesAsMoves over EAS
- - added create-folder subcommand to sogo-tool to create contact and calendar folders
- - group mail addresses can be used as recipient in Outlook
- - added 'ActiveSync' module constraints
- - updated CKEditor to version 4.5.1
- - added Slovenian translation - thanks to Jens Riecken
- - added Chinese (Taiwan) translation
-
-Bug fixes
- - EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders
- - fixed some rare cornercases in multidomain configurations
- - properly escape folder after creation using EAS (#3237)
- - fixed potential organizer highjacking when using EAS (#3131)
- - properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082)
- - properly encode id of DOM elements in Address Book module (#3239, #3245)
- - fixed multi-domain support for sogo-tool backup/restore (#2600)
- - fixed data ordering in events list of Calendar module (#3261)
- - fixed data ordering in tasks list of Calendar module (#3267)
- - Android EAS Lollipop fixes (#3268 and #3269) 
- - improved EAS email flagging handling (#3140)
- - fixed computation of GlobalObjectId (#3235)
- - fixed EAS conversation ID issues on BB10 (#3152)
- - fixed CR/LF printing in event's description (#3228)
- - optimized Calendar module in multidomain configurations
-
-2.3.0 (2015-06-01)
-------------------
-
-New features
- - Internet headers are now shown in Outlook (Zentyal)
-
-Enhancements
- - improved multipart handling using EAS
- - added systemd startup script (PR#76)
- - added Basque translation - thanks to Gorka Gonzalez
- - updated Brazilian (Portuguese), Dutch, Norwegian (Bokmal), Polish, Russian, and Spanish (Spain) translations
- - calendar sharing request support among different Outlook versions (Zentyal)
- - improved sync speed from Outlook by non-reprocessing already downloaded unread mails (Zentyal)
- - added support for sharing calendar invitations
- - missing contact fields are now saved and available when sharing it (Office, Profession, Manager's name, Assistant's name, Spouse/Partner, Anniversary) (Zentyal)
- - appointment color and importance work now between Outlooks (Zentyal)
- - synchronize events, contacts and tasks in reverse chronological order (Zentyal)
- - during login, we now extract the domain from the user to accelerate authentication requests on sources
- - make sure sure email invitations can always be read by EAS clients
- - now able to print event/task's description (new components only) in the list view (#2881)
- - now possible to log EAS commands using the SOGoEASDebugEnabled system defaults
- - many improvements to EAS SmartReply/SmartForward commands
- - event invitation response mails from Outlook are now sent
- - mail subfolders created in WebMail are created when Outlook synchronises
- - mail root folder created in WebMail (same level INBOX) are created on Outlook logon
-
-Bug fixes
- - now keep the BodyPreference for future EAS use and default to MIME if none set (#3146)
- - EAS reply fix when message/rfc822 parts are included in the original mail (#3153)
- - fixed yet an other potential crash during freebusy lookups during timezone changes
- - fixed display of freebusy information in event attendees editor during timezone changes
- - fixed timezone of MSExchange freebusy information
- - fixed a potential EAS error with multiple email priority flags
- - fixed paragraphs margins in HTML messages (#3163)
- - fixed regression when loading the inbox for the first time
- - fixed serialization of the PreventInvitationsWhitelist settings
- - fixed md4 support (for NTLM password changes) with GNU TLS
- - fixed edition of attachment URL in event/task editor
- - sent mails are not longer in Drafts folder using Outlook (Zentyal)
- - deleted mails are properly synced between Outlook profiles from the same account (Zentyal)
- - does not create a mail folder in other user's mailbox (Zentyal)
- - fix server-side crash with invalid events (Zentyal)
- - fix setting permissions for a folder with several users (Zentyal)
- - fix reception of calendar event invitations on optional attendees (Zentyal)
- - fix server side crash parsing rtf without color table (Zentyal)
- - weekly recurring events created in SOGo web interface are now shown in Outlook (Zentyal)
- - fix exception modifications import in recurrence series (Zentyal)
- - fix server side crash parsing rtf emails with images (with word97 format) (Zentyal)
- - fix sender on importing email messages like event invitations (Zentyal)
- - fix Outlook crashes when modifying the view of a folder (Zentyal)
- - fix server side crash when reading some recurrence appointments (Zentyal)
- - Outlook clients can use reply all functionality on multidomain environment (Zentyal)
- - optional attendes on events are now shown properly (Zentyal)
- - fixed the EAS maximum response size being per-folder, and not global
- - now set MeetingMessageType only for EAS 14.1
- - now correctly handle external invitations using EAS
- - now correctly handle multiple email addresses in the GAL over EAS (#3102)
- - now handle very large amount of participants correctly (#3175)
- - fix message bodies not shown on some EAS devices (#3173)
- - avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES
- - recurrent all day events are now shown properly in Outlook
-
-2.2.17a (2015-03-15)
--------------------
-
-Bug fixes
- - avoid calling -stringByReplacingOccurrencesOfString:... for old GNUstep runtime
-
-2.2.17 (2015-03-24)
-------------------
-
-Enhancements
- - support for mail prority using EAS
- - immediately delete mails from EAS clients when they are marked as deleted on the IMAP server
- - now favor login@domain as the default email address if multiple mail: fields are specified
- - enable by default HTML mails support using EAS on Windows and BB phones
- - now possible to configure objectClass names for LDAP groups using GroupObjectClasses (#1499)
-
-Bug fixes
- - fixed login issue after password change (#2601)
- - fixed potential encoding issue using EAS and 8-bit mails (#3116)
- - multiple collections support for GetItemEstimate using EAS
- - fixed empty sync responses for EAS 2.5 and 12.0 clients
- - use the correct mail body element for EAS 2.5 clients
- - fixed tasks disappearing issue with RoadSync
- - use the correct body element for events for EAS 2.5 clients
- - SmartReply improvements for missing body attributes
- - do not use syncKey from cache when davCollectionTag = -1
- - use correct mail attachment elements for EAS 2.5 clients
- - fixed contacts lookup by UID in freebusy
- - reduced telephone number to a single value in JSON response of contacts list
- - fixed freebusy data when 'busy off hours' is enabled and period starts during the weekend
- - fixed fetching of freebusy data from the Web interface
- - fixed EAS handling of Bcc in emails (#3138)
- - fixed Language-Region tags in Web interface (#3121)
- - properly fallback over EAS to UTF-8 and then Latin1 for messages w/o charset (#3103)
- - prevent potential freebusy lookup crashes during timezone changes with repetitive events
- - improved GetItemEstimate to count all vasnished/deleted mails too
- - improvements to EAS SyncKey handling to avoid missing mails (#3048, #3058)
- - fixed EAS replies decoding from Outlook (#3123)
-
-2.2.16 (2015-02-12)
-------------------
-
-New features
- - now possible for SOGo to change the sambaNTPassword/sambaLMPassword
- - now possible to limit automatic forwards to internal/external domains
-
-Enhancements
- - added support for email categories using EAS (#2995)
- - now possible to always send vacation messages (#2332)
- - added EAS best practices to the documentation
- - improved fetching of text parts over EAS
- - updated Czech, Finnish, French, German and Hungarian translations
-
-Bug fixes
- - (regression) fixed sending a message when mail module is not active (#3088)
- - mail labels with blanks are not handled correctly (#3078)
- - fixed BlackBerry issues sending multiple mails over EAS (#3095)
- - fixed plain/text mails showing on one line on Android/EAS (#3055)
- - fixed exception in sogo-tool when parsing arguments of a set operation
-
-2.2.15 (2015-01-30)
-------------------
-
-Enhancements
- - improved handling of EAS Push when no heartbeat is provided
- - no longer need to kill Outlook 2013 when creating EAS profiles (#3076)
- - improved server-side CSS cleaner (#3040)
- - unified the logging messages in sogo.log file (#2534/#3063)
- - updated Brazilian (Portuguese) and Hungarian translations
-
-2.2.14 (2015-01-20)
-------------------
-
-Enhancements
- - MultipleBookingsFieldName can be set to -1 to show busy status when booked at least once 
- - handle multipart objects in EAS/ItemOperations
-
-Bug fixes
- - fixed calendar selection in event and task editors (#3049, #3050)
- - check for resources existence when listing subscribed ones (#3054)
- - correctly recognize Apple Calendar on Yosemite (#2960) 
- - fixed two potential autorelease pool leaks (#3026 and #3051)
- - fixed birthday offset in EAS
- - fixed From's full name over EAS
- - fixed potential issue when handling multiple Add/Change/Delete/Fetch EAS commands (#3057)
- - fixed wrong timezone calculation on recurring events
-
 2.2.13 (2014-12-30)
 -------------------

+Bug fixes
+ - fix contact description truncation on WP8 phones (#3028)
+ - fix freebusy information not always returned
+ - fix tz issue when the user one was different from the system one with EAS
+
 Enhancements
 - initial support for empty sync request/response for EAS
 - added the SOGoMaximumSyncResponseSize EAS configuration parameter to
   support memory-limited sync response sizes
 - we now not only use the creation date for event's cutoff date (EAS)

-Bug fixes
- - fixed contact description truncation on WP8 phones (#3028)
- - fixed freebusy information not always returned
- - fixed tz issue when the user one was different from the system one with EAS
-
 2.2.12a (2014-12-19)
 --------------------

 Bug fixes
- - fixed empty HTML mails being sent (#3034)
+ - fix empty HTML mails being sent (#3034)

 2.2.12 (2014-12-18)
 -------------------
@@ -768,12 +32,12 @@ Enhancements
 - updated Czech, Dutch, Finnish, French, German, Polish and Spanish (Spain) translations

 Bug fixes
- - fixed for privacy and categories for EAS (#3022)
+ - fix for privacy and categories for EAS (#3022)
 - correctly set MeetingStatus for EAS on iOS devices
 - Ubuntu Lucid fixes for EAS
- - fixed calendar reminders for future events (#3008)
+ - fix calendar reminders for future events (#3008)
 - make sure all text parts are UTF-8 re-encoded for Outlook 2013 over EAS (#3003)
- - fixed task description truncation affecting WP8 phones over EAS (#3028)
+ - fix task description truncation affecting WP8 phones over EAS (#3028)
 
 2.2.11a (2014-12-10)
 --------------------
@@ -1,34 +0,0 @@
-/* Codepages.h - this file is part of SOGo
- *
- * Copyright (C) 2014 Jesús García Sáez
- *
- * 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 3, 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/NSDictionary.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSString.h>
-
-
-@interface Codepages
-
-+ (NSDictionary *) getCodepagesTable;
-+ (NSDictionary *) getReverseCodepagesTable;
-
-+ (NSNumber *) getCodepageFromName: (NSString *) name;
-+ (NSString *) getNameFromCodepage: (NSNumber *) codepage;
-
-@end
@@ -1,214 +0,0 @@
-/* Codepages.m - this file is part of SOGo
- *
- * Copyright (C) 2014 Jesús García Sáez
- *
- * 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 3, 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 "Codepages.h"
-#import <Foundation/NSArray.h>
-
-@implementation Codepages
-
-+ (NSDictionary *) getCodepagesTable
-{
-  static NSDictionary *table = nil;
-
-  if (table == nil)
-    {
-      /* http://msdn.microsoft.com/en-us/library/dd317756%28v=vs.85%29.aspx */
-      table = [[NSDictionary dictionaryWithObjectsAndKeys:
-                  [NSNumber numberWithInt: 37], @"ibm037",
-                  [NSNumber numberWithInt: 437], @"ibm437",
-                  [NSNumber numberWithInt: 500], @"ibm500",
-                  [NSNumber numberWithInt: 708], @"asmo-708",
-                  [NSNumber numberWithInt: 720], @"dos-720",
-                  [NSNumber numberWithInt: 737], @"ibm737",
-                  [NSNumber numberWithInt: 775], @"ibm775",
-                  [NSNumber numberWithInt: 850], @"ibm850",
-                  [NSNumber numberWithInt: 852], @"ibm852",
-                  [NSNumber numberWithInt: 855], @"ibm855",
-                  [NSNumber numberWithInt: 857], @"ibm857",
-                  [NSNumber numberWithInt: 858], @"ibm00858",
-                  [NSNumber numberWithInt: 860], @"ibm860",
-                  [NSNumber numberWithInt: 861], @"ibm861",
-                  [NSNumber numberWithInt: 862], @"dos-862",
-                  [NSNumber numberWithInt: 863], @"ibm863",
-                  [NSNumber numberWithInt: 864], @"ibm864",
-                  [NSNumber numberWithInt: 865], @"ibm865",
-                  [NSNumber numberWithInt: 866], @"cp866",
-                  [NSNumber numberWithInt: 869], @"ibm869",
-                  [NSNumber numberWithInt: 870], @"ibm870",
-                  [NSNumber numberWithInt: 874], @"windows-874",
-                  [NSNumber numberWithInt: 875], @"cp875",
-                  [NSNumber numberWithInt: 932], @"shift_jis",
-                  [NSNumber numberWithInt: 936], @"gb2312",
-                  [NSNumber numberWithInt: 949], @"ks_c_5601-1987",
-                  [NSNumber numberWithInt: 950], @"big5",
-                  [NSNumber numberWithInt: 1026], @"ibm1026",
-                  [NSNumber numberWithInt: 1047], @"ibm01047",
-                  [NSNumber numberWithInt: 1140], @"ibm01140",
-                  [NSNumber numberWithInt: 1141], @"ibm01141",
-                  [NSNumber numberWithInt: 1142], @"ibm01142",
-                  [NSNumber numberWithInt: 1143], @"ibm01143",
-                  [NSNumber numberWithInt: 1144], @"ibm01144",
-                  [NSNumber numberWithInt: 1145], @"ibm01145",
-                  [NSNumber numberWithInt: 1146], @"ibm01146",
-                  [NSNumber numberWithInt: 1147], @"ibm01147",
-                  [NSNumber numberWithInt: 1148], @"ibm01148",
-                  [NSNumber numberWithInt: 1149], @"ibm01149",
-                  [NSNumber numberWithInt: 1200], @"utf-16",
-                  [NSNumber numberWithInt: 1201], @"unicodefffe",
-                  [NSNumber numberWithInt: 1250], @"windows-1250",
-                  [NSNumber numberWithInt: 1251], @"windows-1251",
-                  [NSNumber numberWithInt: 1252], @"windows-1252",
-                  [NSNumber numberWithInt: 1253], @"windows-1253",
-                  [NSNumber numberWithInt: 1254], @"windows-1254",
-                  [NSNumber numberWithInt: 1255], @"windows-1255",
-                  [NSNumber numberWithInt: 1256], @"windows-1256",
-                  [NSNumber numberWithInt: 1257], @"windows-1257",
-                  [NSNumber numberWithInt: 1258], @"windows-1258",
-                  [NSNumber numberWithInt: 1361], @"johab",
-                  [NSNumber numberWithInt: 10000], @"macintosh",
-                  [NSNumber numberWithInt: 10001], @"x-mac-japanese",
-                  [NSNumber numberWithInt: 10002], @"x-mac-chinesetrad",
-                  [NSNumber numberWithInt: 10003], @"x-mac-korean",
-                  [NSNumber numberWithInt: 10004], @"x-mac-arabic",
-                  [NSNumber numberWithInt: 10005], @"x-mac-hebrew",
-                  [NSNumber numberWithInt: 10006], @"x-mac-greek",
-                  [NSNumber numberWithInt: 10007], @"x-mac-cyrillic",
-                  [NSNumber numberWithInt: 10008], @"x-mac-chinesesimp",
-                  [NSNumber numberWithInt: 10010], @"x-mac-romanian",
-                  [NSNumber numberWithInt: 10017], @"x-mac-ukrainian",
-                  [NSNumber numberWithInt: 10021], @"x-mac-thai",
-                  [NSNumber numberWithInt: 10029], @"x-mac-ce",
-                  [NSNumber numberWithInt: 10079], @"x-mac-icelandic",
-                  [NSNumber numberWithInt: 10081], @"x-mac-turkish",
-                  [NSNumber numberWithInt: 10082], @"x-mac-croatian",
-                  [NSNumber numberWithInt: 12000], @"utf-32",
-                  [NSNumber numberWithInt: 12001], @"utf-32be",
-                  [NSNumber numberWithInt: 20000], @"x-chinese-cns",
-                  [NSNumber numberWithInt: 20001], @"x-cp20001",
-                  [NSNumber numberWithInt: 20002], @"x-chinese-eten",
-                  [NSNumber numberWithInt: 20003], @"x-cp20003",
-                  [NSNumber numberWithInt: 20004], @"x-cp20004",
-                  [NSNumber numberWithInt: 20005], @"x-cp20005",
-                  [NSNumber numberWithInt: 20105], @"x-ia5",
-                  [NSNumber numberWithInt: 20106], @"x-ia5-german",
-                  [NSNumber numberWithInt: 20107], @"x-ia5-swedish",
-                  [NSNumber numberWithInt: 20108], @"x-ia5-norwegian",
-                  [NSNumber numberWithInt: 20127], @"us-ascii",
-                  [NSNumber numberWithInt: 20261], @"x-cp20261",
-                  [NSNumber numberWithInt: 20269], @"x-cp20269",
-                  [NSNumber numberWithInt: 20273], @"ibm273",
-                  [NSNumber numberWithInt: 20277], @"ibm277",
-                  [NSNumber numberWithInt: 20278], @"ibm278",
-                  [NSNumber numberWithInt: 20280], @"ibm280",
-                  [NSNumber numberWithInt: 20284], @"ibm284",
-                  [NSNumber numberWithInt: 20285], @"ibm285",
-                  [NSNumber numberWithInt: 20290], @"ibm290",
-                  [NSNumber numberWithInt: 20297], @"ibm297",
-                  [NSNumber numberWithInt: 20420], @"ibm420",
-                  [NSNumber numberWithInt: 20423], @"ibm423",
-                  [NSNumber numberWithInt: 20424], @"ibm424",
-                  [NSNumber numberWithInt: 20833], @"x-ebcdic-koreanextended",
-                  [NSNumber numberWithInt: 20838], @"ibm-thai",
-                  [NSNumber numberWithInt: 20866], @"koi8-r",
-                  [NSNumber numberWithInt: 20871], @"ibm871",
-                  [NSNumber numberWithInt: 20880], @"ibm880",
-                  [NSNumber numberWithInt: 20905], @"ibm905",
-                  [NSNumber numberWithInt: 20924], @"ibm00924",
-                  [NSNumber numberWithInt: 20932], @"euc-jp",
-                  [NSNumber numberWithInt: 20936], @"x-cp20936",
-                  [NSNumber numberWithInt: 20949], @"x-cp20949",
-                  [NSNumber numberWithInt: 21025], @"cp1025",
-                  [NSNumber numberWithInt: 21866], @"koi8-u",
-                  [NSNumber numberWithInt: 28591], @"iso-8859-1",
-                  [NSNumber numberWithInt: 28592], @"iso-8859-2",
-                  [NSNumber numberWithInt: 28593], @"iso-8859-3",
-                  [NSNumber numberWithInt: 28594], @"iso-8859-4",
-                  [NSNumber numberWithInt: 28595], @"iso-8859-5",
-                  [NSNumber numberWithInt: 28596], @"iso-8859-6",
-                  [NSNumber numberWithInt: 28597], @"iso-8859-7",
-                  [NSNumber numberWithInt: 28598], @"iso-8859-8",
-                  [NSNumber numberWithInt: 28599], @"iso-8859-9",
-                  [NSNumber numberWithInt: 28603], @"iso-8859-13",
-                  [NSNumber numberWithInt: 28605], @"iso-8859-15",
-                  [NSNumber numberWithInt: 29001], @"x-europa",
-                  [NSNumber numberWithInt: 38598], @"iso-8859-8-i",
-                  [NSNumber numberWithInt: 50220], @"iso-2022-jp",
-                  [NSNumber numberWithInt: 50221], @"csiso2022jp",
-                  [NSNumber numberWithInt: 50222], @"iso-2022-jp",
-                  [NSNumber numberWithInt: 50225], @"iso-2022-kr",
-                  [NSNumber numberWithInt: 50227], @"x-cp50227",
-                  [NSNumber numberWithInt: 51932], @"euc-jp",
-                  [NSNumber numberWithInt: 51936], @"euc-cn",
-                  [NSNumber numberWithInt: 51949], @"euc-kr",
-                  [NSNumber numberWithInt: 52936], @"hz-gb-2312",
-                  [NSNumber numberWithInt: 54936], @"gb18030",
-                  [NSNumber numberWithInt: 57002], @"x-iscii-de",
-                  [NSNumber numberWithInt: 57003], @"x-iscii-be",
-                  [NSNumber numberWithInt: 57004], @"x-iscii-ta",
-                  [NSNumber numberWithInt: 57005], @"x-iscii-te",
-                  [NSNumber numberWithInt: 57006], @"x-iscii-as",
-                  [NSNumber numberWithInt: 57007], @"x-iscii-or",
-                  [NSNumber numberWithInt: 57008], @"x-iscii-ka",
-                  [NSNumber numberWithInt: 57009], @"x-iscii-ma",
-                  [NSNumber numberWithInt: 57010], @"x-iscii-gu",
-                  [NSNumber numberWithInt: 57011], @"x-iscii-pa",
-                  [NSNumber numberWithInt: 65000], @"utf-7",
-                  [NSNumber numberWithInt: 65001], @"utf-8",
-                  nil] retain];
-      }
-    return table;
-}
-
-+ (NSDictionary *) getReverseCodepagesTable
-{
-  static NSDictionary *table = nil;
-
-  if (table == nil)
-    {
-      NSDictionary *codepages_table;
-      NSEnumerator *enumerator;
-      NSMutableArray *codepages, *names;
-      id key;
-      // Build reverse table: (NSNumber) codepage -> (NSString) encoding name
-      codepages_table = [self getCodepagesTable];
-      codepages = [NSMutableArray arrayWithCapacity: [codepages_table count]];
-      names = [NSMutableArray arrayWithCapacity: [codepages_table count]];
-      enumerator = [codepages_table keyEnumerator];
-      while ((key = [enumerator nextObject]))
-        {
-          [names addObject: key];
-          [codepages addObject: [codepages_table objectForKey: key]];
-        }
-      table = [[NSDictionary dictionaryWithObjects: names forKeys: codepages] retain];
-    }
-  return table;
-}
-
-+ (NSNumber *) getCodepageFromName: (NSString *) name
-{
-  return [[self getCodepagesTable] objectForKey: [name lowercaseString]];
-}
-
-+ (NSString *) getNameFromCodepage: (NSNumber *) codepage
-{
-  return [[self getReverseCodepagesTable] objectForKey: codepage];
-}
-
-@end
@@ -31,7 +31,7 @@ endif
 all::
 	@echo " Python executable: ${PYTHON}"

-SAMBA_PRIVATE_DIR = $(shell $(PYTHON) ./samba-get-config.py 'private dir' || echo /var/lib/samba/private)
+SAMBA_PRIVATE_DIR = $(shell $(PYTHON) ./samba-get-config.py "private dir")

 $(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication

@@ -78,9 +78,6 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreGCSMessage.m \
 	MAPIStoreGCSMessageTable.m \
 	\
-	MAPIStoreCalTaskFolder.m \
-	MAPIStoreCalTaskMessage.m \
-	\
 	MAPIStoreCalendarAttachment.m \
 	MAPIStoreCalendarContext.m \
 	MAPIStoreCalendarFolder.m \
@@ -103,7 +100,6 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreMailAttachment.m \
 	MAPIStoreMailContext.m \
 	MAPIStoreMailFolder.m \
-	MAPIStoreMailFolderTable.m \
 	MAPIStoreMailMessage.m \
 	MAPIStoreMailVolatileMessage.m \
 	MAPIStoreMailMessageTable.m \
@@ -114,8 +110,6 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	\
 	MAPIStoreFallbackContext.m \
 	\
-	MAPIStoreSharingMessage.m \
-	\
 	NSArray+MAPIStore.m \
 	NSData+MAPIStore.m \
 	NSDate+MAPIStore.m \
@@ -126,9 +120,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	iCalEvent+MAPIStore.m \
 	iCalTimeZone+MAPIStore.m \
 	\
-	RTFHandler.m \
-	\
-	Codepages.m
+	RTFHandler.m


 $(SOGOBACKEND)_RESOURCE_FILES += \
@@ -148,8 +140,7 @@ $(DBMSGREADER_TOOL)_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
 	-L../SOPE/GDLContentStore/obj/ -lGDLContentStore \
 	-L../SOPE/NGCards/obj/ -lNGCards \
-	-lNGObjWeb \
-	$(LIBMAPI_LIBS)
+	-lNGObjWeb

 TEST_TOOL_NAME += $(PLREADER_TOOL) $(DBMSGREADER_TOOL)

@@ -180,7 +171,7 @@ $(SOGOBACKEND)_LIB_DIRS += \
 	$(LIBMAPISTORE_LIBS)

 ADDITIONAL_INCLUDE_DIRS += \
-	-Wall \
+	-Werror -Wall \
 	-DSAMBA_PRIVATE_DIR=@"\"$(SAMBA_PRIVATE_DIR)\"" \
 	$(LIBMAPI_CFLAGS) \
 	$(LIBMAPISTORE_CFLAGS) \
@@ -33,9 +33,8 @@
 }

 - (id) authenticatorInContext: (id) context;
- (MAPIStoreUserContext *) userContext;
+
 - (void) setUserContext: (MAPIStoreUserContext *) newContext;
- (void) cleanup;

@end

@@ -76,11 +76,6 @@ MAPIApplication *MAPIApp = nil;
  return NO;
 }

- (MAPIStoreUserContext *) userContext
-{
-    return userContext;
-}
-
 - (void) setUserContext: (MAPIStoreUserContext *) newContext
 {
  /* user contexts must not be retained here ad their holder (mapistore)
@@ -93,9 +88,4 @@ MAPIApplication *MAPIApp = nil;
  return [userContext authenticator];
 }

- (void) cleanup
-{
-  [userContext deactivate];
-}
-
@end
@@ -24,7 +24,6 @@
 #define MAPISTORECALENDARWRAPPER_H

 #import <NGCards/iCalPerson.h>
-#import <NGCards/iCalTimeZone.h>
 #import <Appointments/iCalEntityObject+SOGo.h>

 #import "MAPIStoreObjectProxy.h"
@@ -43,7 +42,7 @@
  iCalCalendar *calendar;
  iCalEvent *firstEvent;
  iCalEvent *event;
-  iCalTimeZone *timeZone;
+  NSTimeZone *timeZone;
  SOGoUser *user;
  NSString *senderEmail;
  NSData *globalObjectId;
@@ -58,119 +57,117 @@
 + (id) wrapperWithICalEvent: (iCalEvent *) newEvent
                    andUser: (SOGoUser *) newUser
             andSenderEmail: (NSString *) newSenderEmail
+                 inTimeZone: (NSTimeZone *) newTimeZone
         withConnectionInfo: (struct mapistore_connection_info *) newConnInfo;
 - (id) initWithICalEvent: (iCalEvent *) newEvent
                 andUser: (SOGoUser *) newUser
          andSenderEmail: (NSString *) newSenderEmail
+              inTimeZone: (NSTimeZone *) newTimeZone
      withConnectionInfo: (struct mapistore_connection_info *) newConnInfo;

 /* getters */
 - (void) fillMessageData: (struct mapistore_message *) dataPtr
                inMemCtx: (TALLOC_CTX *) memCtx;

- (NSString *) creator;
- (NSString *) owner;
- (NSUInteger) sensitivity;
+- (int) getPidTagSenderEmailAddress: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagSenderAddressType: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagSenderName: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagSenderEntryId: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx;

- (enum mapistore_error) getPidTagSenderEmailAddress: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagSenderAddressType: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagSenderName: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagSenderEntryId: (void **) data
-                                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagReceivedByAddressType: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagReceivedByEmailAddress: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagReceivedByName: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagReceivedByEntryId: (void **) data
+                      inMemCtx: (TALLOC_CTX *) memCtx;

- (enum mapistore_error) getPidTagReceivedByAddressType: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagReceivedByEmailAddress: (void **) data
-                                                inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagReceivedByName: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagReceivedByEntryId: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx;
-
- (enum mapistore_error) getPidTagIconIndex: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagOwnerAppointmentId: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidMeetingType: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagMessageClass: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagStartDate: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentSequence: (void **) data
-                                             inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentStateFlags: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidResponseStatus: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx;
-
- (enum mapistore_error) getPidLidAppointmentStartWhole: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidCommonStart: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagEndDate: (void **) data
-                                 inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentEndWhole: (void **) data
-                                             inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidCommonEnd: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentDuration: (void **) data
-                                             inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentSubType: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidBusyStatus: (void **) data // TODO
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidIndentedBusyStatus: (void **) data // TODO
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data // SUMMARY
-                                           inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidLocation: (void **) data // LOCATION
-                                  inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
-                                 inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagSensitivity: (void **) data // not implemented, depends on CLASS
-                                     inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagImportance: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagBody: (void **) data
+- (int) getPidTagIconIndex: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagOwnerAppointmentId: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidMeetingType: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagMessageClass: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagStartDate: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentSequence: (void **) data
+                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentStateFlags: (void **) data
                              inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidIsRecurring: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidRecurring: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentRecur: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidGlobalObjectId: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidCleanGlobalObjectId: (void **) data
-                                             inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidServerProcessed: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidServerProcessingActions: (void **) data
-                                                 inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidAppointmentReplyTime: (void **) data
-                                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidResponseStatus: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+
+- (int) getPidLidAppointmentStartWhole: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidCommonStart: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagEndDate: (void **) data
+            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentEndWhole: (void **) data
+                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidCommonEnd: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentDuration: (void **) data
+                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentSubType: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidBusyStatus: (void **) data // TODO
+                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidIndentedBusyStatus: (void **) data // TODO
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                          inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidLocation: (void **) data // LOCATION
+                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
+                inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagSensitivity: (void **) data // not implemented, depends on CLASS
+                inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagImportance: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagBody: (void **) data
+         inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidIsRecurring: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidRecurring: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentRecur: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidGlobalObjectId: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidCleanGlobalObjectId: (void **) data
+                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidServerProcessed: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidServerProcessingActions: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidAppointmentReplyTime: (void **) data
+                             inMemCtx: (TALLOC_CTX *) memCtx;

 /* reminders */
- (enum mapistore_error) getPidLidReminderSet: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderDelta: (void **) data
-                                       inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderTime: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderSignalTime: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderOverride: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderType: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderPlaySound: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidLidReminderFileParameter: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderSet: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderDelta: (void **) data
+                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderTime: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderSignalTime: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderOverride: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderType: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderPlaySound: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidLidReminderFileParameter: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx;

@end

@@ -36,13 +36,13 @@
 - (void) setAID: (uint32_t) newAID;
 - (uint32_t) AID;

- (enum mapistore_error) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                                     withMID: (uint64_t *) mid
-                            withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                              withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                    withMID: (uint64_t *) mid
+           withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+             withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                     inMemCtx: (TALLOC_CTX *) memCtx;

 /* helpers */
 - (NSData *) mimeAttachTag;
@@ -67,40 +67,40 @@
  return mimeAttachTag;
 }

- (enum mapistore_error) getPidTagMid: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagMid: (void **) data
+            inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, [container objectId]);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachNumber: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachNumber: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, aid);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagRenderingPosition: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagRenderingPosition: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0xffffffff);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAccessLevel: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAccessLevel: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (enum mapistore_error) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                                     withMID: (uint64_t *) mid
-                            withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                                    inMemCtx: (TALLOC_CTX *) memCtx
+- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                    withMID: (uint64_t *) mid
+           withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreEmbeddedMessage *attMessage;
  struct mapistore_message *mapistoreMsg;
@@ -118,9 +118,9 @@
  return (attMessage ? MAPISTORE_SUCCESS : MAPISTORE_ERROR);
 }

- (enum mapistore_error) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                              withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+             withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreEmbeddedMessage *attMessage;
  struct mapistore_message *mapistoreMsg;
@@ -46,9 +46,6 @@
                              forURL: (NSURL *) server
                          forceRenew: (BOOL) renew;

- (NSString *) passwordInContext: (WOContext *) context;
-
-
@end

 #endif /* MAPISTOREAUTHENTICATOR_H */
@@ -72,8 +72,4 @@
        return imapPassword;
 }

- (NSString *) passwordInContext: (WOContext *) context
-{
-	return password;
-}
@end
@@ -1,35 +0,0 @@
-/* MAPIStoreCalTaskFolder.h - this file is part of SOGo
- *
- * Copyright (C) 2016 Enrique J. Hernandez
- *
- * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
- *
- * 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.
- */
-
-#ifndef MAPISTORECALTASKFOLDER_H
-#define MAPISTORECALTASKFOLDER_H
-
-#import "MAPIStoreGCSFolder.h"
-
-/* This class is intended to share code between Calendar and Tasks as
-   of nowadays share the table */
-
-@interface MAPIStoreCalTaskFolder : MAPIStoreGCSFolder
-
-@end
-
-#endif /* MAPISTORECALTASKFOLDER_H */
@@ -1,101 +0,0 @@
-/* MAPIStoreCalTaskFolder.m - this file is part of SOGo
- *
- * Copyright (C) 2016 Enrique J. Hernandez
- *
- * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
- *
- * 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 3, 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/NSDictionary.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSString.h>
-
-#import <SOGo/SOGoPermissions.h>
-
-#import "MAPIStoreCalTaskFolder.h"
-
-@implementation MAPIStoreCalTaskFolder
-
- (NSArray *) expandRoles: (NSArray *) roles
-{
-  static NSDictionary *rolesMap = nil;
-  NSArray *subRoles;
-  NSMutableSet *expandedRoles;
-  NSString *role, *subRole;
-  NSUInteger i, max, j;
-
-  if (!rolesMap)
-    {
-      /* Build the map of array permissions */
-      rolesMap = [[NSDictionary alloc] initWithObjects: [NSArray arrayWithObjects:
-                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_PublicDAndTViewer,
-                                                                                              SOGoCalendarRole_PublicViewer,
-                                                                                              SOGoCalendarRole_PublicResponder,
-                                                                                              SOGoCalendarRole_PublicModifier, nil],
-                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_ConfidentialDAndTViewer,
-                                                                                              SOGoCalendarRole_ConfidentialViewer,
-                                                                                              SOGoCalendarRole_ConfidentialResponder,
-                                                                                              SOGoCalendarRole_ConfidentialModifier, nil],
-                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_PrivateDAndTViewer,
-                                                                                              SOGoCalendarRole_PrivateViewer,
-                                                                                              SOGoCalendarRole_PrivateResponder,
-                                                                                              SOGoCalendarRole_PrivateModifier, nil],
-                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_ComponentDAndTViewer,
-                                                                                              SOGoCalendarRole_ComponentViewer,
-                                                                                              SOGoCalendarRole_ComponentResponder,
-                                                                                              SOGoCalendarRole_ComponentModifier, nil],
-                                                                   nil]
-                                               forKeys: [NSArray arrayWithObjects: @"Public", @"Confidential", @"Private",
-                                                                                   @"Component", nil]];
-    }
-
-  max = [roles count];
-  expandedRoles = [NSMutableSet set];
-  for (i = 0; i < max; i++)
-    {
-      role = [roles objectAtIndex: i];
-      subRoles = nil;
-      if ([role hasPrefix: @"Public"])
-          subRoles = [rolesMap objectForKey: @"Public"];
-      else if ([role hasPrefix: @"Confidential"])
-          subRoles = [rolesMap objectForKey: @"Confidential"];
-      else if ([role hasPrefix: @"Private"])
-          subRoles = [rolesMap objectForKey: @"Private"];
-      else if ([role hasPrefix: @"Component"])
-          subRoles = [rolesMap objectForKey: @"Component"];
-
-      if (subRoles)
-        {
-          for (j = 0; j < [subRoles count]; j++)
-            {
-              subRole = [subRoles objectAtIndex: j];
-              [expandedRoles addObject: subRole];
-
-              if ([subRole isEqualToString: role])
-                break;
-            }
-        }
-      else
-        {
-          [expandedRoles addObject: role];
-        }
-    }
-
-  return [expandedRoles allObjects];
-}
-
-@end
@@ -1,40 +0,0 @@
-/* MAPIStoreCalTaskMessage.h - this file is part of SOGo
- *
- * Copyright (C) 2016 Enrique J. Hernandez
- *
- * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
- *
- * 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.
- */
-
-#ifndef MAPISTORECALTASKMESSAGE_H
-#define MAPISTORECALTASKMESSAGE_H
-
-#import "MAPIStoreGCSMessage.h"
-
-/* This class is intended to share common logic for Calendar and Tasks
-   as of today they are stored in the same table. This is relevant for
-   permissions */
-@interface MAPIStoreCalTaskMessage : MAPIStoreGCSMessage
-{
-}
-
-/* Get the sensitivity (access class) from a message */
- (NSUInteger) sensitivity;
-
-@end
-
-#endif /* MAPISTORECALTASKMESSAGE_H */
@@ -1,107 +0,0 @@
-/* MAPIStoreCalTaskMessage.h - this file is part of SOGo
- *
- * Copyright (C) 2016 Enrique J. Hernandez
- *
- * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
- *
- * 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/NSString.h>
-
-#import <NGObjWeb/WOContext+SoObjects.h>
-
-#import <SOGo/SOGoPermissions.h>
-
-#import "MAPIStoreFolder.h"
-#import "MAPIStoreCalTaskMessage.h"
-
-@implementation MAPIStoreCalTaskMessage
-
-/* It must be implemented by subclasses */
- (NSUInteger) sensitivity
-{
-  [self subclassResponsibility: _cmd];
-
-  return 0;
-}
-
- (NSArray *) expandRoles: (NSArray *) roles
-{
-  return [container expandRoles: roles];
-}
-
- (BOOL) subscriberCanModifyMessage
-{
-  BOOL rc;
-  NSArray *roles;
- 
-  roles = [self activeUserRoles];
- 
-  if (isNew)
-    rc = [roles containsObject: SOGoRole_ObjectCreator];
-  else
-    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
-          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
-
-  /* Check if the message is owned and it has permission to edit it */
-  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
-    {
-      NSString *currentUser;
-
-      currentUser = [[container context] activeUser];
-      rc = [currentUser isEqual: [self ownerUser]];
-    }
-
-  if (!rc)
-    {
-      NSUInteger sensitivity;
-
-      /* Get sensitivity of the message to check if the user can
-         modify the message */
-      sensitivity = [self sensitivity];
-      /* FIXME: Use OpenChange constant names */
-      switch (sensitivity)
-        {
-        case 0:  /* PUBLIC */
-          rc = [roles containsObject: SOGoCalendarRole_PublicModifier]
-               || [roles containsObject: SOGoCalendarRole_PublicResponder];
-          break;
-        case 1:  /* PERSONAL */
-        case 2:  /* PRIVATE */
-          rc = [roles containsObject: SOGoCalendarRole_PrivateModifier]
-               || [roles containsObject: SOGoCalendarRole_PrivateResponder];
-          break;
-        case 3:  /* CONFIDENTIAL */
-          rc = [roles containsObject: SOGoCalendarRole_ConfidentialModifier]
-               || [roles containsObject: SOGoCalendarRole_ConfidentialResponder];
-        }
-    }
-  return rc;
-}
-
- (BOOL) subscriberCanReadMessage
-{
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-
-  return ([roles containsObject: SOGoCalendarRole_ComponentViewer]
-          || [roles containsObject: SOGoCalendarRole_ComponentDAndTViewer]
-          || [self subscriberCanModifyMessage]);
-}
-
-@end
@@ -94,64 +94,64 @@
           flattenedValuesForKey: @""];
 }

- (enum mapistore_error) getPidTagAttachmentHidden: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachmentHidden: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getYes: data inMemCtx: localMemCtx];
 }

- (enum mapistore_error) getPidTagAttachmentFlags: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachmentFlags: (void **) data
+                        inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = MAPILongValue (localMemCtx, 0x00000002); /* afException */

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachmentLinkId: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachmentLinkId: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getLongZero: data inMemCtx: localMemCtx];
 }

- (enum mapistore_error) getPidTagAttachFlags: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachFlags: (void **) data
+                    inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getLongZero: data inMemCtx: localMemCtx];
 }

- (enum mapistore_error) getPidTagAttachMethod: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachMethod: (void **) data
+                     inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = MAPILongValue (localMemCtx, afEmbeddedMessage);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachEncoding: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagAttachEncoding: (void **) data
+                      inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = [[NSData data] asBinaryInMemCtx: localMemCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagDisplayName: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = [@"Untitled" asUnicodeInMemCtx: localMemCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachmentContactPhoto: (void **) data
-                                                inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachmentContactPhoto: (void **) data
+                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagExceptionReplaceTime: (void **) data
-                                              inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagExceptionReplaceTime: (void **) data
+                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -178,8 +178,8 @@
  return rc;
 }

- (enum mapistore_error) getPidTagExceptionStartTime: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagExceptionStartTime: (void **) data
+                           inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -205,8 +205,8 @@
  return rc;
 }

- (enum mapistore_error) getPidTagExceptionEndTime: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) localMemCtx
+- (int) getPidTagExceptionEndTime: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -58,6 +58,7 @@
                wrapperWithICalEvent: [newContainer event]
                             andUser: [userContext sogoUser]
                      andSenderEmail: nil
+                          inTimeZone: [userContext timeZone]
                  withConnectionInfo: [context connectionInfo]];
      [self addProxy: appointmentWrapper];
    }
@@ -89,73 +90,73 @@
  *dataPtr = msgData;
 }

- (enum mapistore_error) getPidTagMessageClass: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagMessageClass: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = talloc_strdup (memCtx, "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}");

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagMessageFlags: (void **) data // TODO
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagMessageFlags: (void **) data // TODO
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, MSGFLAG_UNMODIFIED);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagResponseRequested: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagResponseRequested: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

 /* discarded properties */

- (enum mapistore_error) getPidLidAppointmentLastSequence: (void **)
-                                                 inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidAppointmentLastSequence: (void **)
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidLidMeetingWorkspaceUrl: (void **)
-                                             inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidMeetingWorkspaceUrl: (void **)
+                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidLidContacts: (void **)
-                                  inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidContacts: (void **)
+                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagSensitivity: (void **)
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagSensitivity: (void **)
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidLidPrivate: (void **)
-                                 inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidPrivate: (void **)
+                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidNameKeywords: (void **)
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidNameKeywords: (void **)
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidLidFExceptionalBody: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidFExceptionalBody: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }
@@ -208,7 +209,6 @@
  [[container event] updateFromMAPIProperties: properties
                                inUserContext: [self userContext]
                               withActiveUser: activeUser
-                                        isNew: NO
 				     inMemCtx: memCtx];
 }

@@ -23,9 +23,9 @@
 #ifndef MAPISTORECALENDARFOLDER_H
 #define MAPISTORECALENDARFOLDER_H

-#import "MAPIStoreCalTaskFolder.h"
+#import "MAPIStoreGCSFolder.h"

-@interface MAPIStoreCalendarFolder : MAPIStoreCalTaskFolder
+@interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder

@end

@@ -63,27 +63,24 @@
  SOGoAppointmentObject *newEntry;
  NSString *name;

-  [[self userContext] activate];
+  //[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];

  name = [NSString stringWithFormat: @"%@.ics",
                   [SOGoObject globallyUniqueObjectId]];
  newEntry = [SOGoAppointmentObject objectWithName: name
                                       inContainer: sogoObject];
  [newEntry setIsNew: YES];
+  /* the WOContext is required here for resolving notification pages */
+  [newEntry setContext: [[self userContext] woContext]];
  newMessage = [MAPIStoreCalendarMessage mapiStoreObjectWithSOGoObject: newEntry
                                                           inContainer: self];
+
+  
  return newMessage;
 }

 - (NSArray *) rolesForExchangeRights: (uint32_t) rights
 {
-  /* Limitations
-
-     Following rights are not supported by SOGo specifically:
-
-     - CreateSubfolders: No calendar subfolders
-     - FolderVisible: It is inferred by other rights when extracting
-   */
  NSMutableArray *roles;

  roles = [NSMutableArray arrayWithCapacity: 6];
@@ -91,35 +88,18 @@
    [roles addObject: SOGoRole_ObjectCreator];
  if (rights & RightsDeleteAll)
    [roles addObject: SOGoRole_ObjectEraser];
-  if (rights & RightsDeleteOwn)
-    [roles addObject: MAPIStoreRightDeleteOwn];
-
  if (rights & RightsEditAll)
    {
      [roles addObject: SOGoCalendarRole_PublicModifier];
      [roles addObject: SOGoCalendarRole_PrivateModifier];
      [roles addObject: SOGoCalendarRole_ConfidentialModifier];
    }
-  if (rights & RightsEditOwn)
-    [roles addObject: MAPIStoreRightEditOwn];
-
-  if (rights & RightsReadItems)
+  else if (rights & RightsReadItems)
    {
      [roles addObject: SOGoCalendarRole_PublicViewer];
      [roles addObject: SOGoCalendarRole_PrivateViewer];
      [roles addObject: SOGoCalendarRole_ConfidentialViewer];
    }
-  if (rights & RightsFreeBusySimple)
-    [roles addObject: SOGoCalendarRole_PublicDAndTViewer];
-
-  if (rights & RightsFreeBusyDetailed)
-    [roles addObject: SOGoCalendarRole_ConfidentialDAndTViewer];
-
-  if (rights & RightsFolderOwner)
-    [roles addObject: MAPIStoreRightFolderOwner];
-
-  if (rights & RightsFolderContact)
-    [roles addObject: MAPIStoreRightFolderContact];

  // [self logWithFormat: @"roles for rights %.8x = (%@)", rights, roles];

@@ -133,38 +113,20 @@
  if ([roles containsObject: SOGoRole_ObjectCreator])
    rights |= RightsCreateItems;
  if ([roles containsObject: SOGoRole_ObjectEraser])
-    rights |= RightsDeleteAll | RightsDeleteOwn;
+    rights |= RightsDeleteAll;
  if ([roles containsObject: SOGoCalendarRole_PublicModifier]
      && [roles containsObject: SOGoCalendarRole_PrivateModifier]
      && [roles containsObject: SOGoCalendarRole_ConfidentialModifier])
-    rights |= RightsReadItems | RightsEditAll | RightsEditOwn | RightsFreeBusySimple | RightsFreeBusyDetailed;
+    rights |= RightsReadItems | RightsEditAll;
  else if ([roles containsObject: SOGoCalendarRole_PublicViewer]
           && [roles containsObject: SOGoCalendarRole_PrivateViewer]
           && [roles containsObject: SOGoCalendarRole_ConfidentialViewer])
-    rights |= RightsReadItems;
-
-  if ([roles containsObject: MAPIStoreRightEditOwn])
-    rights |= RightsEditOwn;
-  if ([roles containsObject: MAPIStoreRightDeleteOwn])
-    rights |= RightsDeleteOwn;
-
-  if ([roles containsObject: SOGoCalendarRole_PublicDAndTViewer])
-      rights |= RightsFreeBusySimple;
-
-  if ([roles containsObject: SOGoCalendarRole_ConfidentialDAndTViewer])
-      rights |= RightsFreeBusySimple | RightsFreeBusyDetailed;
-
-  if ((rights & RightsReadItems) != 0 || (rights & RightsCreateItems) != 0 || (rights & RightsDeleteAll) != 0)
+    rights |= RightsReadItems | 0x1800;
+  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */

-  if ([roles containsObject: MAPIStoreRightFolderOwner])
-    rights |= RightsFolderOwner | RoleNone;
-
-  if ([roles containsObject: MAPIStoreRightFolderContact])
-    rights |= RightsFolderContact;
-
  // [self logWithFormat: @"rights for roles (%@) = %.8x", roles, rights];
-
+ 
  return rights;
 }

@@ -207,16 +169,8 @@
            [(SOGoAppointmentFolder *) sogoObject aclSQLListingFilter]];
 }

- (enum mapistore_error) getPidTagContainerClass: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx
-{
-  *data = [@"IPF.Appointment" asUnicodeInMemCtx: memCtx];
-
-  return MAPISTORE_SUCCESS;
-}
-
- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
-                                                 inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDefaultPostMessageClass: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Appointment" asUnicodeInMemCtx: memCtx];

@@ -23,13 +23,13 @@
 #ifndef MAPISTORECALENDARMESSAGE_H
 #define MAPISTORECALENDARMESSAGE_H

-#import "MAPIStoreCalTaskMessage.h"
+#import "MAPIStoreGCSMessage.h"

@class iCalCalendar;
@class iCalEvent;
@class MAPIStoreAppointmentWrapper;

-@interface MAPIStoreCalendarMessage : MAPIStoreCalTaskMessage
+@interface MAPIStoreCalendarMessage : MAPIStoreGCSMessage
 {
  iCalCalendar *calendar;
  iCalEvent *masterEvent;
@@ -81,7 +81,7 @@

 // extern void ndr_print_AppointmentRecurrencePattern(struct ndr_print *ndr, const char *name, const struct AppointmentRecurrencePattern *r);

-static Class NSArrayK, MAPIStoreAppointmentWrapperK;
+static Class NSArrayK;

@implementation SOGoAppointmentObject (MAPIStoreExtension)

@@ -97,7 +97,6 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
 + (void) initialize
 {
  NSArrayK = [NSArray class];
-  MAPIStoreAppointmentWrapperK = [MAPIStoreAppointmentWrapper class];
 }

 + (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
@@ -181,12 +180,6 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
      else
        {
          origCalendar = [sogoObject calendar: YES secure: YES];
-          if (!origCalendar)
-            {
-              [self errorWithFormat: @"Incorrect calendar event %@. Empty message is created",
-                    [self url]];
-              return self;
-            }
          calendar = [origCalendar mutableCopy];
          masterEvent = [[calendar events] objectAtIndex: 0];
          [self _setupAttachmentParts];
@@ -197,6 +190,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
        = [MAPIStoreAppointmentWrapper wrapperWithICalEvent: masterEvent
                                                    andUser: [userContext sogoUser]
                                             andSenderEmail: nil
+                                                 inTimeZone: [userContext timeZone]
                                         withConnectionInfo: [context connectionInfo]];
      [self addProxy: appointmentWrapper];
    }
@@ -211,25 +205,15 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  [super dealloc];
 }

- (MAPIStoreAppointmentWrapper *) _appointmentWrapper
+/* getters */
+- (int) getPidLidFInvited: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx
 {
-  NSUInteger i, max;
-  id proxy;
-  max = [proxies count];
-  for (i = 0; i < max; i++) {
-    proxy = [proxies objectAtIndex: i];
-    if ([proxy isKindOfClass: MAPIStoreAppointmentWrapperK])
-      {
-        return proxy;
-      }
-  }
-  return nil;
+  return [self getYes: data inMemCtx: memCtx];
 }

-
-/* getters */
- (enum mapistore_error) getPidTagMessageClass: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagMessageClass: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  SOGoUser *owner;

@@ -242,8 +226,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidLidSideEffects: (void **) data // TODO
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidLidSideEffects: (void **) data // TODO
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx,
                         seOpenToDelete | seOpenToCopy | seOpenToMove
@@ -252,7 +236,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }
@@ -340,63 +324,100 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
    }
  else
    {
-      [[self _appointmentWrapper] fillMessageData: msgData
-                                         inMemCtx: memCtx];
+      /* HACK: we know the first (and only) proxy is our appointment wrapper
+         instance, but this might not always be true */
+      [[proxies objectAtIndex: 0] fillMessageData: msgData
+                                  inMemCtx: memCtx];
    }

  *dataPtr = msgData;
 }

- (enum mapistore_error) getPidTagResponseRequested: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx
+/* sender representing */
+// - (int) getPidTagSentRepresentingEmailAddress: (void **) data
+//                                      inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderEmailAddress: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingAddressType: (void **) data
+//                                     inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getSMTPAddrType: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingName: (void **) data
+//                              inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderName: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingEntryId: (void **) data
+//                                 inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderEntryId: data inMemCtx: memCtx];
+// }
+
+/* attendee */
+// - (int) getPidTagReceivedByAddressType: (void **) data
+//                        inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByAddressType: data
+//                                                    inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByEmailAddress: (void **) data
+//                            inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByEmailAddress: data
+//                                                        inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByName: (void **) data
+//                    inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByName: data
+//                                                inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByEntryId: (void **) data
+//                       inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByEntryId: data
+//                                                   inMemCtx: memCtx];
+// }
+
+// /* attendee representing */
+// - (int) getPidTagReceivedRepresentingEmailAddress: (void **) data
+//                                  inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByEmailAddress: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingAddressType: (void **) data
+//                              inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getSMTPAddrType: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingName: (void **) data
+//                          inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByName: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingEntryId: (void **) data
+//                             inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByEntryId: data inMemCtx: memCtx];
+// }
+
+- (int) getPidTagResponseRequested: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

-/* This three methods: getPidTagNormalizedSubject,
-   getPidTagSensitivity and getPidTagImportance are implemented in
-   MAPIStoreMessage base class, then the proxy method is not reached
-   (see MAPIStoreObject).
-*/
- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data
-                                           inMemCtx: (TALLOC_CTX *) memCtx
-{
-  MAPIStoreAppointmentWrapper *appointmentWrapper;
-
-  appointmentWrapper = [self _appointmentWrapper];
-  if (appointmentWrapper)
-    return [appointmentWrapper getPidTagNormalizedSubject: data inMemCtx: memCtx];
-
-  return MAPISTORE_ERR_NOT_FOUND;
-}
-
- (enum mapistore_error) getPidTagSensitivity: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
-{
-  MAPIStoreAppointmentWrapper *appointmentWrapper;
-
-  appointmentWrapper = [self _appointmentWrapper];
-  if (appointmentWrapper)
-    return [appointmentWrapper getPidTagSensitivity: data inMemCtx: memCtx];
-
-  return [self getLongZero: data inMemCtx: memCtx];
-}
-
- (enum mapistore_error) getPidTagImportance: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx
-{
-  MAPIStoreAppointmentWrapper *appointmentWrapper;
-
-  appointmentWrapper = [self _appointmentWrapper];
-  if (appointmentWrapper)
-    return [appointmentWrapper getPidTagImportance: data inMemCtx: memCtx];
-
-  *data = MAPILongValue (memCtx, 1);
-
-  return MAPISTORE_SUCCESS;
-}
-
-
 - (NSString *) _uidFromGlobalObjectId: (TALLOC_CTX *) memCtx 
 {
  NSData *objectId;
@@ -493,7 +514,6 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  folder = [sogoObject container];

  /* reinstantiate the old sogo object and attach it to self */
-  [[self userContext] activate];
  woContext = [[self userContext] woContext];
  if (isNew)
    {
@@ -528,19 +548,29 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  ASSIGN (sogoObject, newObject);
 }

- (NSUInteger) sensitivity
+- (BOOL) subscriberCanReadMessage
 {
-  return [[self _appointmentWrapper] sensitivity];
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  return ([roles containsObject: SOGoCalendarRole_ComponentViewer]
+          || [roles containsObject: SOGoCalendarRole_ComponentDAndTViewer]
+          || [self subscriberCanModifyMessage]);
 }

- (NSString *) creator
+- (BOOL) subscriberCanModifyMessage
 {
-  return [[self _appointmentWrapper] creator];
-}
+  BOOL rc;
+  NSArray *roles = [self activeUserRoles];

- (NSString *) owner
-{
-  return [[self _appointmentWrapper] owner];
+  if (isNew)
+    rc = [roles containsObject: SOGoRole_ObjectCreator];
+  else
+    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
+          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
+
+  return rc;
 }

 - (void) _updateAttachedEvents
@@ -567,7 +597,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
    }
 }

- (void) save: (TALLOC_CTX *) memCtx
+- (void) save: (TALLOC_CTX *) memCtx 
 {
  // iCalCalendar *vCalendar;
  // NSCalendarDate *now;
@@ -622,10 +652,9 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  [masterEvent updateFromMAPIProperties: properties
                          inUserContext: [self userContext]
                         withActiveUser: activeUser
-                                  isNew: isNew
 	                       inMemCtx: memCtx];
  [self _updateAttachedEvents];
-  [[self userContext] activate];
+  [[self userContext] activateWithUser: activeUser];
  [sogoObject updateContentWithCalendar: calendar
                            fromRequest: nil];
  [self updateVersions];
@@ -661,7 +690,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return newAttachment;
 }

- (enum mapistore_error) setReadFlag: (uint8_t) flag
+- (int) setReadFlag: (uint8_t) flag
 {
  return MAPISTORE_SUCCESS;
 }
@@ -182,9 +182,6 @@ static Class MAPIStoreCalendarMessageK = Nil;
                          forKey: MAPIPropertyKey (PR_CREATION_TIME)];
      [knownProperties setObject: @"c_uid"
                          forKey: MAPIPropertyKey (PR_OWNER_APPT_ID)];
-      /* Use by oxcfxics to sort the latest first */
-      [knownProperties setObject: @"c_lastmodified"
-                          forKey: MAPIPropertyKey (PidTagMessageDeliveryTime)];
    }

  return [knownProperties objectForKey: MAPIPropertyKey (property)];
@@ -92,52 +92,52 @@
  return [container lastModificationTime];
 }

- (enum mapistore_error) getPidTagAttachEncoding: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagAttachEncoding: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
 {
  *data = [[NSData data] asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachFlags: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachFlags: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagAttachmentFlags: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachmentFlags: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagAttachmentHidden: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachmentHidden: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagAttachmentLinkId: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachmentLinkId: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagAttachMethod: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachMethod: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x00000001);

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachmentContactPhoto: (void **) data
-                                                inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachmentContactPhoto: (void **) data
+                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagAttachDataBinary: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachDataBinary: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  if (!photoData)
    ASSIGN (photoData,
@@ -148,8 +148,8 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachSize: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachSize: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  if (!photoData)
    ASSIGN (photoData,
@@ -160,16 +160,16 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachExtension: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachExtension: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self fileExtension] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachLongFilename: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachLongFilename: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *filename;

@@ -181,15 +181,15 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachFilename: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachFilename: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagAttachLongFilename: data
                                  inMemCtx: memCtx];
 }

- (enum mapistore_error) getPidTagDisplayName: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagAttachLongFilename: data inMemCtx: memCtx];
 }
@@ -28,7 +28,6 @@
 #import <Contacts/SOGoContactFolders.h>

 #import "MAPIApplication.h"
-#import "MAPIStoreUserContext.h"
 #import "MAPIStoreContactsContext.h"
 #import "MAPIStoreContactsMessage.h"
 #import "MAPIStoreContactsMessageTable.h"
@@ -59,12 +58,10 @@
  SOGoContactGCSEntry *newEntry;
  NSString *name;

-  [[self userContext] activate];
-
  name = [NSString stringWithFormat: @"%@.vcf",
                   [SOGoObject globallyUniqueObjectId]];
  newEntry = [SOGoContactGCSEntry objectWithName: name
-                                     inContainer: sogoObject];
+				     inContainer: sogoObject];
  [newEntry setIsNew: YES];
  newMessage = [MAPIStoreContactsMessage mapiStoreObjectWithSOGoObject: newEntry
                                                           inContainer: self];
@@ -74,34 +71,18 @@

 - (NSArray *) rolesForExchangeRights: (uint32_t) rights
 {
-  /* Limitations
-
-     Following rights are not supported by SOGo specifically:
-
-     - CreateSubfolders: No contacts subfolders
-     - FolderVisible: It is inferred by other rights when extracting
-   */
  NSMutableArray *roles;

-  roles = [NSMutableArray arrayWithCapacity: 8];
+  roles = [NSMutableArray arrayWithCapacity: 6];
  if (rights & RightsCreateItems)
    [roles addObject: SOGoRole_ObjectCreator];
  if (rights & RightsDeleteAll)
    [roles addObject: SOGoRole_ObjectEraser];
-  if (rights & RightsDeleteOwn)
-    [roles addObject: MAPIStoreRightDeleteOwn];
  if (rights & RightsEditAll)
    [roles addObject: SOGoRole_ObjectEditor];
-  if (rights & RightsEditOwn)
-    [roles addObject: MAPIStoreRightEditOwn];
  if (rights & RightsReadItems)
    [roles addObject: SOGoRole_ObjectViewer];

-  if (rights & RightsFolderOwner)
-    [roles addObject: MAPIStoreRightFolderOwner];
-  if (rights & RightsFolderContact)
-    [roles addObject: MAPIStoreRightFolderContact];
-
  return roles;
 }

@@ -111,28 +92,15 @@

  if ([roles containsObject: SOGoRole_ObjectCreator])
    rights |= RightsCreateItems;
-
  if ([roles containsObject: SOGoRole_ObjectEraser])
-    rights |= RightsDeleteAll | RightsDeleteOwn;
-  else if ([roles containsObject: MAPIStoreRightDeleteOwn])
-    rights |= RightsDeleteOwn;
-
+    rights |= RightsDeleteAll;
  if ([roles containsObject: SOGoRole_ObjectEditor])
-    rights |= RightsEditAll | RightsEditOwn;
-  else if ([roles containsObject: MAPIStoreRightEditOwn])
-    rights |= RightsEditOwn;
-
+    rights |= RightsEditAll;
  if ([roles containsObject: SOGoRole_ObjectViewer])
    rights |= RightsReadItems;
  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */
-
-  if ([roles containsObject: MAPIStoreRightFolderOwner])
-    rights |= RightsFolderOwner | RoleNone;
-
-  if ([roles containsObject: MAPIStoreRightFolderContact])
-    rights |= RightsFolderContact;
-
+ 
  return rights;
 }

@@ -146,8 +114,8 @@
  return [[self activeUserRoles] containsObject: SOGoRole_ObjectViewer];
 }

- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
-                                                 inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDefaultPostMessageClass: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Contact" asUnicodeInMemCtx: memCtx];

@@ -220,9 +220,6 @@ static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
 			  forKey: MAPIPropertyKey (PidTagSubject)];
      [knownProperties setObject: @"c_cn"
 			  forKey: MAPIPropertyKey (PidTagNormalizedSubject)];
-      /* Use by oxcfxics to sort the latest first */
-      [knownProperties setObject: @"c_lastmodified"
-                          forKey: MAPIPropertyKey (PidTagMessageDeliveryTime)];
    }

  return [knownProperties objectForKey: MAPIPropertyKey (property)];
@@ -72,10 +72,10 @@
                                  forUser: (NSString *) username
                                 withRole: (enum mapistore_context_role) role;

-+ (enum mapistore_error) openContext: (MAPIStoreContext **) contextPtr
-                             withURI: (const char *) newUri
-                      connectionInfo: (struct mapistore_connection_info *) newConnInfo
-                      andTDBIndexing: (struct indexing_context *) indexing;
+ (int) openContext: (MAPIStoreContext **) contextPtr
+            withURI: (const char *) newUri
+     connectionInfo: (struct mapistore_connection_info *) newConnInfo
+     andTDBIndexing: (struct indexing_context *) indexing;

 - (id)   initFromURL: (NSURL *) newUri
  withConnectionInfo: (struct mapistore_connection_info *) newConnInfo
@@ -91,11 +91,11 @@
 // - (id) lookupObject: (NSString *) objectURLString;

 /* backend methods */
- (enum mapistore_error) getPath: (char **) path
-                          ofFMID: (uint64_t) fmid
-                        inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getRootFolder: (MAPIStoreFolder **) folderPtr
-                               withFID: (uint64_t) fmid;
+- (int) getPath: (char **) path
+         ofFMID: (uint64_t) fmid
+       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getRootFolder: (MAPIStoreFolder **) folderPtr
+              withFID: (uint64_t) fmid;

 /* util methods */
 - (NSString *) extractChildNameFromURL: (NSString *) childURL
@@ -33,6 +33,7 @@
 #import <SOGo/SOGoUser.h>

 #import "MAPIStoreAttachment.h"
+// #import "MAPIStoreAttachmentTable.h"
 #import "MAPIStoreFallbackContext.h"
 #import "MAPIStoreFolder.h"
 #import "MAPIStoreFolderTable.h"
@@ -50,7 +51,6 @@
 #import "MAPIStoreContext.h"

 #undef DEBUG
-#include <dlinklist.h>
 #include <stdbool.h>
 #include <gen_ndr/exchange.h>
 #include <util/attr.h>
@@ -88,31 +88,32 @@ static NSMutableDictionary *contextClassMapping;
      currentClass = [classes objectAtIndex: count];
      moduleName = [currentClass MAPIModuleName];
      if (moduleName)
-        {
-          [contextClassMapping setObject: currentClass
+	{
+	  [contextClassMapping setObject: currentClass
                                  forKey: moduleName];
-          NSLog (@"  registered class '%@' as handler of '%@' contexts",
-                 NSStringFromClass (currentClass), moduleName);
-        }
+	  NSLog (@"  registered class '%@' as handler of '%@' contexts",
+		 NSStringFromClass (currentClass), moduleName);
+	}
    }

  MAPIStoreFallbackContextK = [MAPIStoreFallbackContext class];
 }

 + (struct mapistore_contexts_list *) listAllContextsForUser: (NSString *)  userName
-                                               withIndexing: (struct indexing_context *) indexing
+                                            withIndexing: (struct indexing_context *) indexing
                                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct mapistore_contexts_list *list, *current;
  NSArray *classes;
  Class currentClass;
  NSUInteger count, max;
+  MAPIStoreUserContext *userContext;

  list = NULL;

-  // User context is activated on initialization
-  [MAPIStoreUserContext userContextWithUsername: userName
-                                 andTDBIndexing: indexing];
+  userContext = [MAPIStoreUserContext userContextWithUsername: userName
+                                               andTDBIndexing: indexing];
+  [userContext activateWithUser: [userContext sogoUser]];

  classes = GSObjCAllSubclassesOfClass (self);
  max = [classes count];
@@ -120,7 +121,7 @@ static NSMutableDictionary *contextClassMapping;
    {
      currentClass = [classes objectAtIndex: count];
      current = [currentClass listContextsForUser: userName
-                                     withIndexing: indexing
+                                  withIndexing: indexing
                                         inMemCtx: memCtx];
      if (current)
        DLIST_CONCATENATE(list, current, void);
@@ -130,7 +131,7 @@ static NSMutableDictionary *contextClassMapping;
 }

 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName
-                                            withIndexing: (struct indexing_context *) indexing
+                                         withIndexing: (struct indexing_context *) indexing
                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return NULL;
@@ -212,16 +213,18 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return completeURL;
 }

-+ (enum mapistore_error) openContext: (MAPIStoreContext **) contextPtr
-                             withURI: (const char *) newUri
-                      connectionInfo: (struct mapistore_connection_info *) newConnInfo
-                      andTDBIndexing: (struct indexing_context *) indexing
+ (int) openContext: (MAPIStoreContext **) contextPtr
+            withURI: (const char *) newUri
+     connectionInfo: (struct mapistore_connection_info *) newConnInfo
+     andTDBIndexing: (struct indexing_context *) indexing
 {
  MAPIStoreContext *context;
  Class contextClass;
  NSString *module;
  NSURL *baseURL;
-  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
+  int rc = MAPISTORE_ERR_NOT_FOUND;
+
+  //NSLog (@"METHOD '%s' (%d) -- uri: '%s'", __FUNCTION__, __LINE__, newUri);

  context = nil;

@@ -273,11 +276,6 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 {
  NSString *username;

-  if (newConnInfo == NULL)
-    {
-      return nil;
-    }
-
  if ((self = [self init]))
    {
      ASSIGN (contextUrl, newUrl);
@@ -294,6 +292,13 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
      ASSIGN (userContext,
              [MAPIStoreUserContext userContextWithUsername: username
                                             andTDBIndexing: indexing]);
+
+#if 0
+      mapistore_mgmt_backend_register_user (newConnInfo,
+                                            "SOGo",
+                                            [username UTF8String]);
+#endif
+
      connInfo = newConnInfo;
      username = [NSString stringWithUTF8String: newConnInfo->username];
      ASSIGN (activeUser, [SOGoUser userWithLogin: username]);
@@ -311,6 +316,12 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)

 - (void) dealloc
 {
+#if 0
+  mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo", 
+                                          [[userContext username]
+                                            UTF8String]);
+#endif
+
  [contextUrl release];
  [userContext release];
  [containersBag release];
@@ -338,16 +349,26 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return activeUser;
 }

- (enum mapistore_error) getPath: (char **) path
-                          ofFMID: (uint64_t) fmid
-                        inMemCtx: (TALLOC_CTX *) memCtx
-{
-  enum mapistore_error rc;
-  NSString *objectURL, *url;
+// - (void) logRestriction: (struct mapi_SRestriction *) res
+// 	      withState: (MAPIRestrictionState) state
+// {
+//   NSString *resStr;

-  url = [contextUrl absoluteString];
-  // FIXME transform percent escapes but not for user part of the url
-  //[xxxx stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+//   resStr = MAPIStringForRestriction (res);
+
+//   [self logWithFormat: @"%@  -->  %@", resStr, MAPIStringForRestrictionState (state)];
+// }
+
+- (int) getPath: (char **) path
+         ofFMID: (uint64_t) fmid
+       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  int rc;
+  NSString *objectURL, *url;
+  // TDB_DATA key, dbuf;
+
+  url = [[contextUrl absoluteString]
+            stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
  objectURL = [[userContext mapping] urlFromID: fmid];
  if (objectURL)
    {
@@ -368,6 +389,14 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  else
    {
      [self errorWithFormat: @"%s: you should *never* get here", __PRETTY_FUNCTION__];
+      // /* attempt to populate our mapping dict with data from indexing.tdb */
+      // key.dptr = (unsigned char *) talloc_asprintf (memCtx, "0x%.16llx",
+      //                                               (long long unsigned int )fmid);
+      // key.dsize = strlen ((const char *) key.dptr);
+
+      // dbuf = tdb_fetch (memCtx->indexing_list->index_ctx->tdb, key);
+      // talloc_free (key.dptr);
+      // uri = talloc_strndup (memCtx, (const char *)dbuf.dptr, dbuf.dsize);
      *path = NULL;
      rc = MAPISTORE_SUCCESS;
    }
@@ -379,10 +408,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 {
 }

- (enum mapistore_error) getRootFolder: (MAPIStoreFolder **) folderPtr
-                               withFID: (uint64_t) newFid
+- (int) getRootFolder: (MAPIStoreFolder **) folderPtr
+              withFID: (uint64_t) newFid
 {
  enum mapistore_error rc;
+  MAPIStoreMapping *mapping;
  MAPIStoreFolder *baseFolder;
  SOGoFolder *currentFolder;
  WOContext *woContext;
@@ -390,7 +420,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  NSArray *pathComponents;
  NSUInteger count, max;

-  [userContext activate];
+  mapping = [userContext mapping];
+  if (![mapping urlFromID: newFid])
+    [mapping registerURL: [contextUrl absoluteString]
+                  withID: newFid];
+  [userContext activateWithUser: activeUser];
  woContext = [userContext woContext];

  [self ensureContextFolder];
@@ -438,16 +472,8 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
                     mapiStoreObjectWithSOGoObject: currentFolder
                                       inContainer: nil];
      [baseFolder setContext: self];
-
-      if ([[userContext sogoUser] isEqual: activeUser]
-          || [baseFolder subscriberCanReadMessages])
-        {
-          *folderPtr = baseFolder;
-          rc = MAPISTORE_SUCCESS;
-        }
-      else
-        rc = MAPISTORE_ERR_DENIED;
-
+      *folderPtr = baseFolder;
+      rc = MAPISTORE_SUCCESS;
    }
  else if ([[userContext sogoUser] isEqual: activeUser])
    rc = MAPISTORE_ERR_NOT_FOUND;
@@ -460,7 +486,7 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 /* utils */

 - (NSString *) extractChildNameFromURL: (NSString *) objectURL
-                        andFolderURLAt: (NSString **) folderURL;
+			andFolderURLAt: (NSString **) folderURL;
 {
  NSString *childKey;
  NSRange lastSlash;
@@ -469,15 +495,15 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  if ([objectURL hasSuffix: @"/"])
    objectURL = [objectURL substringToIndex: [objectURL length] - 2];
  lastSlash = [objectURL rangeOfString: @"/"
-                               options: NSBackwardsSearch];
+			       options: NSBackwardsSearch];
  if (lastSlash.location != NSNotFound)
    {
      slashPtr = NSMaxRange (lastSlash);
      childKey = [objectURL substringFromIndex: slashPtr];
      if ([childKey length] == 0)
-        childKey = nil;
+	childKey = nil;
      if (folderURL)
-        *folderURL = [objectURL substringToIndex: slashPtr];
+	*folderURL = [objectURL substringToIndex: slashPtr];
    }
  else
    childKey = nil;
@@ -488,10 +514,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 - (uint64_t) idForObjectWithKey: (NSString *) key
                    inFolderURL: (NSString *) folderURL
 {
-  NSString *childURL;
+  NSString *childURL, *owner;
  MAPIStoreMapping *mapping;
  uint64_t mappingId;
-  enum mapistore_error ret;
+  uint32_t contextId;
+  void *rootObject;

  if (key)
    childURL = [NSString stringWithFormat: @"%@%@", folderURL,
@@ -502,71 +529,52 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  mappingId = [mapping idFromURL: childURL];
  if (mappingId == NSNotFound)
    {
-      const char *owner;
+      //[self warnWithFormat: @"no id exist yet for '%@', requesting one...",
+      //      childURL];
+      mapistore_indexing_get_new_folderID (connInfo->mstore_ctx, &mappingId);
+      [mapping registerURL: childURL withID: mappingId];
+      contextId = 0;

-      [self logWithFormat: @"No id exist yet for '%@', requesting one", childURL];
-      owner = [[userContext username] UTF8String];
-      ret = mapistore_indexing_get_new_folderID_as_user (connInfo->mstore_ctx, owner, &mappingId);
-      if (ret == MAPISTORE_SUCCESS)
-        [mapping registerURL: childURL withID: mappingId];
-      else
-        [self errorWithFormat: @"Error trying to get new folder id (%d): %s",
-              ret, mapistore_errstr (ret)];
+      mapistore_search_context_by_uri (connInfo->mstore_ctx, [folderURL UTF8String],
+                                       &contextId, &rootObject);
+      owner = [userContext username];
+      mapistore_indexing_record_add_mid (connInfo->mstore_ctx, contextId,
+                                         [owner UTF8String], mappingId);
    }

  return mappingId;
 }

-/* Get new change number from openchange db interface using
-   resource's owner user */
 - (uint64_t) getNewChangeNumber
 {
-  const char *owner;
-  enum MAPISTATUS retval;
  uint64_t newVersionNumber;

-  owner = [[userContext username] UTF8String];
-  retval = openchangedb_get_new_changeNumber (connInfo->oc_ctx, owner, &newVersionNumber);
-  if (retval != MAPI_E_SUCCESS)
-    [NSException raise: @"MAPIStoreIOException"
-                format: @"Impossible to get new change number for %s: %s", owner,
-                 mapi_get_errstr (retval)];
+  if (openchangedb_get_new_changeNumber (connInfo->oc_ctx, &newVersionNumber)
+      != MAPI_E_SUCCESS)
+    abort ();

  return newVersionNumber;
 }

-/* Get new change numbers from openchange db interface using
-   resource's owner user */
 - (NSArray *) getNewChangeNumbers: (uint64_t) max
 {
-  const char *owner;
-  enum MAPISTATUS retval;
  TALLOC_CTX *memCtx;
  NSMutableArray *newChangeNumbers;
  uint64_t count;
  struct UI8Array_r *numbers;
  NSString *newNumber;

-  memCtx = talloc_new (NULL);
-  if (!memCtx)
-    [NSException raise: @"MAPIStoreIOException"
-                format: @"Not enough memory to allocate change numbers"];
-
+  memCtx = talloc_zero(NULL, TALLOC_CTX);
  newChangeNumbers = [NSMutableArray arrayWithCapacity: max];
-  owner = [[userContext username] UTF8String];
-
-  retval = openchangedb_get_new_changeNumbers (connInfo->oc_ctx, memCtx, owner, max, &numbers);
-  if (retval != MAPI_E_SUCCESS || numbers->cValues != max)
-    {
-      talloc_free (memCtx);
-      [NSException raise: @"MAPIStoreIOException"
-                  format: @"Failing to get %d new change numbers: %s", max,
-                          mapi_get_errstr (retval)];
-    }
-
+  
+  if (openchangedb_get_new_changeNumbers (connInfo->oc_ctx,
+                                          memCtx, max, &numbers)
+      != MAPI_E_SUCCESS || numbers->cValues != max)
+    abort ();
  for (count = 0; count < max; count++)
    {
-      newNumber = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
+      newNumber
+        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
      [newChangeNumbers addObject: newNumber];
    }

@@ -575,31 +583,30 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return newChangeNumbers;
 }

-/* Get new fmids from mapistore_indexing interface using resource's
-   owner user */
 - (NSArray *) getNewFMIDs: (uint64_t) max
 {
-  const char *owner;
-  enum mapistore_error ret;
+  TALLOC_CTX *memCtx;
  NSMutableArray *newFMIDs;
+  uint64_t count;
+  struct UI8Array_r *numbers;
  NSString *newNumber;
-  uint64_t count, newFID;

+  memCtx = talloc_zero(NULL, TALLOC_CTX);
  newFMIDs = [NSMutableArray arrayWithCapacity: max];
-  /* Get the resource's owner name */
-  owner = [[userContext username] UTF8String];
-
+  
+  if (mapistore_indexing_get_new_folderIDs (connInfo->mstore_ctx,
+                                            memCtx, max, &numbers)
+      != MAPISTORE_SUCCESS || numbers->cValues != max)
+    abort ();
  for (count = 0; count < max; count++)
    {
-      ret = mapistore_indexing_get_new_folderID_as_user (connInfo->mstore_ctx, owner, &newFID);
-      if (ret != MAPISTORE_SUCCESS)
-          [NSException raise: @"MAPIStoreIOException"
-                      format: @"Impossible to get new fmid for %s", owner];
-
-      newNumber = [NSString stringWithUnsignedLongLong: newFID];
+      newNumber
+        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
      [newFMIDs addObject: newNumber];
    }

+  talloc_free (memCtx);
+
  return newFMIDs;
 }

@@ -25,16 +25,6 @@

 #import "MAPIStoreFolder.h"

-extern NSString *MAPIStoreRightReadItems;
-extern NSString *MAPIStoreRightCreateItems;
-extern NSString *MAPIStoreRightEditOwn;
-extern NSString *MAPIStoreRightEditAll;
-extern NSString *MAPIStoreRightDeleteOwn;
-extern NSString *MAPIStoreRightDeleteAll;
-extern NSString *MAPIStoreRightCreateSubfolders;
-extern NSString *MAPIStoreRightFolderOwner;
-extern NSString *MAPIStoreRightFolderContact;
-
@interface MAPIStoreDBFolder : MAPIStoreFolder

@end
@@ -51,6 +51,16 @@

 static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;

+static NSString *MAPIStoreRightReadItems = @"RightsReadItems";
+static NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
+static NSString *MAPIStoreRightEditOwn = @"RightsEditOwn";
+static NSString *MAPIStoreRightEditAll = @"RightsEditAll";
+static NSString *MAPIStoreRightDeleteOwn = @"RightsDeleteOwn";
+static NSString *MAPIStoreRightDeleteAll = @"RightsDeleteAll";
+static NSString *MAPIStoreRightCreateSubfolders = @"RightsCreateSubfolders";
+static NSString *MAPIStoreRightFolderOwner = @"RightsFolderOwner";
+static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
+
@implementation MAPIStoreDBFolder

 + (void) initialize
@@ -92,7 +102,7 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
    {
      value = get_SPropValue_SRow (aRow, PidTagDisplayName_string8);
      if (value)
-        folderName = [NSString stringWithUTF8String: (const char *) value->value.lpszA];
+        folderName = [NSString stringWithUTF8String: value->value.lpszA];
      else
        folderName = nil;
    }
@@ -128,9 +138,7 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
  MAPIStoreMapping *mapping;
  NSRange slashRange;

-  pathComponent = nil;
-
-  if (isMove && ([targetFolder isKindOfClass: MAPIStoreDBFolderK] || !targetFolder))
+  if (isMove && [targetFolder isKindOfClass: MAPIStoreDBFolderK])
    {
      path = [sogoObject path];
      slashRange = [path rangeOfString: @"/" options: NSBackwardsSearch];
@@ -139,28 +147,14 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
                    format: @"db folder path must start with a '/'"];
      else
        pathComponent = [path substringFromIndex: slashRange.location + 1];
-
-      if (targetFolder)
-        {
-          targetPath = [[targetFolder sogoObject] path];
-          newPath = [NSString stringWithFormat: @"%@/%@",
-                              targetPath, pathComponent];
-          [dbFolder changePathTo: newPath
-                intoNewContainer: [targetFolder dbFolder]];
-        }
-      else
-        [dbFolder changePathTo: [NSString stringWithFormat: @"/fallback/%@", pathComponent]
-              intoNewContainer: nil];
-
+      targetPath = [[targetFolder sogoObject] path];
+      newPath = [NSString stringWithFormat: @"%@/%@",
+                          targetPath, pathComponent];
+      [dbFolder changePathTo: newPath];
+      
      mapping = [self mapping];
-
-      if (targetFolder)
-        newURL = [NSString stringWithFormat: @"%@%@/",
-                           [targetFolder url], pathComponent];
-      else
-        newURL = [NSString stringWithFormat: @"sogo://%@@fallback/%@/",
-                           [[self userContext] username], pathComponent];
-
+      newURL = [NSString stringWithFormat: @"%@%@/",
+                         [targetFolder url], pathComponent];
      [mapping updateID: [self objectId]
                withURL: newURL];

@@ -183,8 +177,6 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
  SOGoMAPIDBMessage *fsObject;
  NSString *newKey;

-  [[self userContext] activate];
-
  newKey = [NSString stringWithFormat: @"%@.plist",
                     [SOGoObject globallyUniqueObjectId]];
  fsObject = [SOGoMAPIDBMessage objectWithName: newKey
@@ -206,13 +198,10 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
  ownerUser = [[self userContext] sogoUser];
  if ([[context activeUser] isEqual: ownerUser]
      || [self subscriberCanReadMessages])
-    {
-      [[self userContext] activate];
-      keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
-                                                 includeDeleted: NO
-                                              matchingQualifier: qualifier
-                                               andSortOrderings: sortOrderings];
-    }
+    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
+                                             includeDeleted: NO
+                                          matchingQualifier: qualifier
+                                           andSortOrderings: sortOrderings];
  else
    keys = [NSArray array];

@@ -222,7 +211,6 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
                         andSortOrderings: (NSArray *) sortOrderings
 {
-  [[self userContext] activate];
  return [dbFolder childKeysOfType: MAPIFolderCacheObject
                    includeDeleted: NO
                 matchingQualifier: qualifier
@@ -258,7 +246,7 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
      if ([date laterDate: fileDate] == fileDate)
        {
          //[self logWithFormat: @"current date: %@", date];
-
+          
          date = fileDate;
        }
    }
@@ -311,9 +299,9 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
  if ([roles containsObject: MAPIStoreRightDeleteOwn])
    rights |= RightsDeleteOwn;
  if ([roles containsObject: MAPIStoreRightEditAll])
-    rights |= RightsEditAll | RightsEditOwn;
+    rights |= RightsEditAll;
  if ([roles containsObject: MAPIStoreRightDeleteAll])
-    rights |= RightsDeleteAll | RightsDeleteOwn;
+    rights |= RightsDeleteAll;
  if ([roles containsObject: MAPIStoreRightCreateSubfolders])
    rights |= RightsCreateSubfolders;
  if ([roles containsObject: MAPIStoreRightFolderOwner])
@@ -322,7 +310,7 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
    rights |= RightsFolderContact;
  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */
-
+ 
  return rights;
 }

@@ -345,7 +333,8 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;

 - (BOOL) subscriberCanModifyMessages
 {
-  return [self _testRoleForActiveUser: MAPIStoreRightEditAll];
+  return ([self _testRoleForActiveUser: MAPIStoreRightEditAll]
+          || [self _testRoleForActiveUser: MAPIStoreRightEditOwn]);
 }

 - (BOOL) subscriberCanReadMessages
@@ -356,7 +345,7 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
     subscribed to read an open contained messages in order to enable them to
     find the "LocalFreebusy" message */
  [sogoObject reloadIfNeeded];
-
+  
  displayName = [[sogoObject properties]
                  objectForKey: MAPIPropertyKey (PidTagDisplayName)];

@@ -366,7 +355,8 @@ static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;

 - (BOOL) subscriberCanDeleteMessages
 {
-  return [self _testRoleForActiveUser: MAPIStoreRightDeleteAll];
+  return ([self _testRoleForActiveUser: MAPIStoreRightDeleteAll]
+          || [self _testRoleForActiveUser: MAPIStoreRightDeleteOwn]);
 }

 - (BOOL) subscriberCanCreateSubFolders
@@ -22,14 +22,10 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGObjWeb/WOContext+SoObjects.h>
-#import <SOGo/SOGoFolder.h>
-#import <SOGo/SOGoUser.h>

 #import "MAPIStoreContext.h"
 #import "MAPIStorePropertySelectors.h"
@@ -38,7 +34,6 @@
 #import "MAPIStoreDBFolder.h"
 #import "MAPIStoreDBMessage.h"
 #import "MAPIStoreTypes.h"
-#import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"

@@ -48,41 +43,26 @@

@implementation MAPIStoreDBMessage

-+ (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
-                                       inMemCtx: (TALLOC_CTX *) memCtx
+ (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct SPropTagArray *properties;
  NSUInteger count;
-
-  enum MAPITAGS faiProperties[] = {
-    0x68330048, /* PR_VIEW_CLSID */
-    0x68350102, /* PR_VIEW_STATE */
-    0x683c0102,
-    0x683d0040,
-    0x683e0102,
-    0x683f0102, /* PR_VIEW_VIEWTYPE_KEY */
-    0x68410003,
-    0x68420102,
-    0x68450102,
-    0x68460003,
-    0x7006001F, /* PR_VD_NAME_W */
-    0x70030003, /* PR_VD_FLAGS */
-    0x70070003  /* PR_VD_VERSION */
-  };
-
-  size_t faiSize = sizeof(faiProperties) / sizeof(enum MAPITAGS);
+  enum MAPITAGS faiProperties[] = { 0x68350102, 0x683c0102, 0x683e0102,
+                                    0x683f0102, 0x68410003, 0x68420102,
+                                    0x68450102, 0x68460003 };

  properties = talloc_zero (memCtx, struct SPropTagArray);
-  properties->cValues = MAPIStoreSupportedPropertiesCount + faiSize;
+  properties->cValues = MAPIStoreSupportedPropertiesCount + 8;
  properties->aulPropTag = talloc_array (properties, enum MAPITAGS,
-                                         MAPIStoreSupportedPropertiesCount + faiSize);
+                                         MAPIStoreSupportedPropertiesCount + 8);

  for (count = 0; count < MAPIStoreSupportedPropertiesCount; count++)
    properties->aulPropTag[count] = MAPIStoreSupportedProperties[count];

  /* FIXME (hack): append a few undocumented properties that can be added to
     FAI messages */
-  for (count = 0; count < faiSize; count++)
+  for (count = 0; count < 8; count++)
    properties->aulPropTag[MAPIStoreSupportedPropertiesCount+count]
      = faiProperties[count];

@@ -91,13 +71,6 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
-                                       inMemCtx: (TALLOC_CTX *) memCtx
-{
-  return [[self class] getAvailableProperties: propertiesP
-                                     inMemCtx: memCtx];
-}
-
 - (id) initWithSOGoObject: (id) newSOGoObject
              inContainer: (MAPIStoreObject *) newContainer
 {
@@ -112,180 +85,29 @@
  return self;
 }

- (NSString *) description
-{
-  id key, value;
-  NSEnumerator *propEnumerator;
-  NSMutableString *description;
-
-  description = [NSMutableString stringWithFormat: @"%@ %@. Properties: {", NSStringFromClass ([self class]),
-                                 [self url]];
-
-  propEnumerator = [properties keyEnumerator];
-  while ((key = [propEnumerator nextObject]))
-    {
-      uint32_t proptag = 0;
-      if ([key isKindOfClass: [NSString class]] && [(NSString *)key intValue] > 0)
-        proptag = [(NSString *)key intValue];
-      else if ([key isKindOfClass: [NSNumber class]])
-        proptag = [key unsignedLongValue];
-
-      if (proptag > 0)
-        {
-          const char *propTagName = get_proptag_name ([key unsignedLongValue]);
-          NSString *propName;
-
-          if (propTagName)
-            propName = [NSString stringWithCString: propTagName
-                                          encoding: NSUTF8StringEncoding];
-          else
-            propName = [NSString stringWithFormat: @"0x%.4x", [key unsignedLongValue]];
-
-          [description appendFormat: @"'%@': ", propName];
-        }
-      else
-        [description appendFormat: @"'%@': ", key];
-
-      value = [properties objectForKey: key];
-      [description appendFormat: @"%@ (%@), ", value, NSStringFromClass ([value class])];
-    }
-
-  [description appendString: @"}\n"];
-
-  return description;
-}
-
 - (uint64_t) objectVersion
 {
-  /* Return the global counter from CN structure.
-     See [MS-OXCFXICS] Section 2.2.2.1 */
-  NSNumber *versionNbr, *cn;
+  NSNumber *versionNbr;
  uint64_t objectVersion;

  [(SOGoMAPIDBMessage *) sogoObject reloadIfNeeded];
-  versionNbr = [properties objectForKey: @"version_number"];
+  versionNbr = [properties objectForKey: @"version"];
  if (versionNbr)
-    objectVersion = exchange_globcnt ([versionNbr unsignedLongLongValue]);
+    objectVersion = (([versionNbr unsignedLongLongValue] >> 16)
+                     & 0x0000ffffffffffffLL);
  else
-    {
-      /* Old version which stored the CN structure not useful for searching */
-      cn = [properties objectForKey: @"version"];
-      if (cn)
-        objectVersion = (([cn unsignedLongLongValue] >> 16)
-                          & 0x0000ffffffffffffLL);
-      else
-        objectVersion = ULLONG_MAX;
-    }
+    objectVersion = ULLONG_MAX;

  return objectVersion;
 }

- (void) _updatePredecessorChangeList
-{
-  BOOL updated;
-  enum mapistore_error rc;
-  NSData *currentChangeList, *changeKey;
-  NSMutableArray *changeKeys;
-  NSMutableData *newChangeList;
-  NSUInteger count, len;
-  struct SizedXid *changes;
-  struct SPropValue property;
-  struct SRow aRow;
-  struct XID *currentChangeKey;
-  TALLOC_CTX *localMemCtx;
-  uint32_t nChanges;
-
-  localMemCtx = talloc_new (NULL);
-  if (!localMemCtx)
-    {
-      [self errorWithFormat: @"No more memory"];
-      return;
-    }
-
-  changeKey = [self getReplicaKeyFromGlobCnt: [self objectVersion]];
-
-  currentChangeList = [properties objectForKey: MAPIPropertyKey (PidTagPredecessorChangeList)];
-  if (!currentChangeList)
-    {
-      /* Create a new PredecessorChangeList */
-      len = [changeKey length];
-      newChangeList = [NSMutableData dataWithCapacity: len + 1];
-      [newChangeList appendUInt8: len];
-      [newChangeList appendData: changeKey];
-    }
-  else
-    {
-      /* Update current predecessor change list with new change key */
-      changes = [currentChangeList asSizedXidArrayInMemCtx: localMemCtx
-                                                      with: &nChanges];
-
-      updated = NO;
-      currentChangeKey = [changeKey asXIDInMemCtx: localMemCtx];
-      for (count = 0; count < nChanges && !updated; count++)
-        {
-          if (GUID_equal(&changes[count].XID.NameSpaceGuid, &currentChangeKey->NameSpaceGuid))
-            {
-              NSData *globCnt, *oldGlobCnt;
-              oldGlobCnt = [NSData dataWithBytes: changes[count].XID.LocalId.data length: changes[count].XID.LocalId.length];
-              globCnt = [NSData dataWithBytes: currentChangeKey->LocalId.data length: currentChangeKey->LocalId.length];
-              if ([globCnt compare: oldGlobCnt] == NSOrderedDescending)
-                {
-                  if ([globCnt length] != [oldGlobCnt length])
-                    {
-                      [self errorWithFormat: @"Cannot compare globcnt with different length: %@ and %@", globCnt, oldGlobCnt];
-                      abort();
-                    }
-                  memcpy (changes[count].XID.LocalId.data, currentChangeKey->LocalId.data, currentChangeKey->LocalId.length);
-                  updated = YES;
-                }
-            }
-        }
-
-      /* Serialise it */
-      changeKeys = [NSMutableArray array];
-
-      if (!updated)
-        [changeKeys addObject: changeKey];
-
-      for (count = 0; count < nChanges; count++)
-        {
-          changeKey = [NSData dataWithXID: &changes[count].XID];
-          [changeKeys addObject: changeKey];
-        }
-
-      [changeKeys sortUsingFunction: MAPIChangeKeyGUIDCompare context: localMemCtx];
-
-      newChangeList = [NSMutableData data];
-      len = [changeKeys count];
-      for (count = 0; count < len; count++)
-        {
-          changeKey = [changeKeys objectAtIndex: count];
-          [newChangeList appendUInt8: [changeKey length]];
-          [newChangeList appendData: changeKey];
-        }
-    }
-
-  if ([newChangeList length] > 0)
-    {
-      property.ulPropTag = PidTagPredecessorChangeList;
-      property.value.bin = *[newChangeList asBinaryInMemCtx: localMemCtx];
-      aRow.cValues = 1;
-      aRow.lpProps = &property;
-      rc = [self addPropertiesFromRow: &aRow];
-      if (rc != MAPISTORE_SUCCESS)
-          [self errorWithFormat: @"Impossible to add a new predecessor change list: %d", rc];
-    }
-
-  talloc_free (localMemCtx);
-}
-
 //
 // FIXME: how this can happen?
 //
 // We might get there if for some reasons, all classes weren't able
 // to tell us the message class.
 //
- (enum mapistore_error) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];

@@ -294,10 +116,10 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getProperties: (struct mapistore_property_data *) data
-                              withTags: (enum MAPITAGS *) tags
-                              andCount: (uint16_t) columnCount
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getProperties: (struct mapistore_property_data *) data
+             withTags: (enum MAPITAGS *) tags
+             andCount: (uint16_t) columnCount
+             inMemCtx: (TALLOC_CTX *) memCtx
 {
  [sogoObject reloadIfNeeded];

@@ -307,12 +129,12 @@
                     inMemCtx: memCtx];
 }

- (enum mapistore_error) getProperty: (void **) data
-                             withTag: (enum MAPITAGS) propTag
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getProperty: (void **) data
+            withTag: (enum MAPITAGS) propTag
+           inMemCtx: (TALLOC_CTX *) memCtx
 {
  id value;
-  enum mapistore_error rc;
+  int rc;
 
  value = [properties objectForKey: MAPIPropertyKey (propTag)];
  if (value)
@@ -338,29 +160,10 @@
    [properties setObject: attachmentParts forKey: @"attachments"];

  newVersion = [[self context] getNewChangeNumber];
-  newVersion = exchange_globcnt ((newVersion >> 16) & 0x0000ffffffffffffLL);
-
  [properties setObject: [NSNumber numberWithUnsignedLongLong: newVersion]
-                 forKey: @"version_number"];
+                 forKey: @"version"];

-  /* Remove old version */
-  [properties removeObjectForKey: @"version"];
-
-  /* Update PredecessorChangeList accordingly */
-  [self _updatePredecessorChangeList];
-
-  if (isNew)
-    {
-      NSString *lastModifierName;
-
-      lastModifierName = (NSString *)[properties objectForKey: MAPIPropertyKey (PidTagLastModifierName)];
-      if ([lastModifierName length] > 0)
-        [properties setObject: lastModifierName
-                       forKey: MAPIPropertyKey (PidTagCreatorName)];
-    }
-
-  // [self logWithFormat: @"Saving %@", [self description]];
-  // [self logWithFormat: @"%d props in dict", [properties count]];
+  [self logWithFormat: @"%d props in dict", [properties count]];

  [sogoObject save];
 }
@@ -377,77 +180,20 @@
  return [msgClass isEqualToString: @"IPM.Microsoft.ScheduleData.FreeBusy"];
 }

-//-----------------------------
-// Permissions
-//-----------------------------
-
+/* TODO: differentiate between the "Own" and "All" cases */
 - (BOOL) subscriberCanReadMessage
 {
  return [(MAPIStoreFolder *) container subscriberCanReadMessages];
-}
-
- (SOGoUser *) _ownerUser
-{
-  NSString *ownerName;
-  SOGoUser *ownerUser = nil;
-
-  ownerName = [properties objectForKey: MAPIPropertyKey (PidTagCreatorName)];
-  if ([ownerName length] > 0)
-    ownerUser = [SOGoUser userWithLogin: ownerName];
-
-  return ownerUser;
-}
-
- (NSArray *) activeUserRoles
-{
-  /* Override because of this exception: NSInvalidArgumentException,
-     reason: [SOGoMAPIDBMessage-aclsForUser:] should be overridden by
-     subclass */
-  if (!activeUserRoles)
-    {
-      SOGoUser *activeUser;
-
-      activeUser = [[self context] activeUser];
-      activeUserRoles = [[container aclFolder] aclsForUser: [activeUser login]];
-      [activeUserRoles retain];
-    }
-
-  return activeUserRoles;
+          // || [self _messageIsFreeBusy]);
 }

 - (BOOL) subscriberCanModifyMessage
 {
-  BOOL rc;
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-
-  if (isNew)
-    rc = [(MAPIStoreFolder *) container subscriberCanCreateMessages];
-  else
-    rc = [roles containsObject: MAPIStoreRightEditAll];
-
-  /* Check if the message is owned and it has permission to edit it */
-  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
-    rc = [[[container context] activeUser] isEqual: [self _ownerUser]];
-
-  return rc;
-}
-
- (BOOL) subscriberCanDeleteMessage
-{
-  BOOL rc;
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-
-  rc = [roles containsObject: MAPIStoreRightDeleteAll];
-
-  /* Check if the message is owned and it has permission to delete it */
-  if (!rc && [roles containsObject: MAPIStoreRightDeleteOwn])
-    rc = [[[container context] activeUser] isEqual: [self _ownerUser]];
-
-  return rc;
+  return ((isNew
+           && [(MAPIStoreFolder *) container subscriberCanCreateMessages])
+          || (!isNew
+              && [(MAPIStoreFolder *) container subscriberCanModifyMessages]));
+          // || [self _messageIsFreeBusy]);
 }

 - (NSDate *) creationTime
@@ -460,36 +206,4 @@
  return [sogoObject lastModified];
 }

- (enum mapistore_error) setReadFlag: (uint8_t) flag
-{
-  /* Modify PidTagMessageFlags from SetMessageReadFlag and
-     SyncImportReadStateChanges ROPs */
-  NSNumber *flags;
-  uint32_t newFlag;
-
-  flags = [properties objectForKey: MAPIPropertyKey (PR_MESSAGE_FLAGS)];
-  if (flags)
-    {
-      newFlag = [flags unsignedLongValue];
-      if (flag & SUPPRESS_RECEIPT)
-        newFlag |= MSGFLAG_READ;
-      if (flag & CLEAR_RN_PENDING)
-        newFlag &= ~MSGFLAG_RN_PENDING;
-      if (flag & CLEAR_READ_FLAG)
-        newFlag &= ~MSGFLAG_READ;
-      if (flag & CLEAR_NRN_PENDING)
-        newFlag &= ~MSGFLAG_NRN_PENDING;
-    }
-  else
-    {
-      newFlag = MSGFLAG_READ;
-      if (flag & CLEAR_READ_FLAG)
-        newFlag = 0x0;
-    }
-  [properties setObject: [NSNumber numberWithUnsignedLong: newFlag]
-                 forKey: MAPIPropertyKey (PR_MESSAGE_FLAGS)];
-
-  return MAPISTORE_SUCCESS;
-}
-
@end
@@ -61,15 +61,14 @@ static Class MAPIStoreDBMessageK = Nil;

  if ((uint32_t) res->ulPropTag == PidTagChangeNumber)
    {
-      SEL operator;
-
      value = NSObjectFromMAPISPropValue (&res->lpProp);
      cVersion = exchange_globcnt (([value unsignedLongLongValue] >> 16)
                                   & 0x0000ffffffffffffLL);
      version = [NSNumber numberWithUnsignedLongLong: cVersion];
-      operator = [self operatorFromRestrictionOperator: res->relop];
-      *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"version_number"
-                                           operatorSelector: operator
+      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
+      [self logWithFormat: @"  version: %.16lx", cVersion];
+      *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"version"
+                                           operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
                                                      value: version];
      [*qualifier autorelease];
      rc = MAPIRestrictionStateNeedsEval;
@@ -56,81 +56,81 @@ static Class MAPIStoreAttachmentK;
           idForObjectWithKey: objectKey];
 }

- (enum mapistore_error) getPidTagAccessLevel: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAccessLevel: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

 /* disabled properties */
- (enum mapistore_error) getPidTagFolderId: (void **) data
-                                  inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagFolderId: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagChangeKey: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagChangeKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagSourceKey: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagSourceKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagParentSourceKey: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagParentSourceKey: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagChangeNumber: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagChangeNumber: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagInstID: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagInstID: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagInstanceNum: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagInstanceNum: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagRowType: (void **) data
-                                 inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagRowType: (void **) data
+                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagDepth: (void **) data
-                               inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDepth: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagIconIndex: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagIconIndex: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagGenerateExchangeViews: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagGenerateExchangeViews: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (enum mapistore_error) getPidTagOriginalMessageClass: (void **) dataa
-                                              inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagOriginalMessageClass: (void **) dataa
+                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }
@@ -24,7 +24,6 @@

 #import "MAPIStoreActiveTables.h"
 #import "MAPIStoreContext.h"
-#import "MAPIStoreFolder.h"
 #import "MAPIStoreUserContext.h"
 #import "NSObject+MAPIStore.h"

@@ -46,8 +45,8 @@
                         andType: MAPISTORE_FAI_TABLE];
 }

- (enum mapistore_error) getPidTagAssociated: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAssociated: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }
@@ -70,7 +69,7 @@

 - (BOOL) subscriberCanReadMessage
 {
-  return [(MAPIStoreFolder *)container subscriberCanReadMessages];
+  return NO;
 }

 - (BOOL) subscriberCanModifyMessage
@@ -30,7 +30,6 @@

 #undef DEBUG
 #include <inttypes.h>
-#include <dlinklist.h>
 #include <mapistore/mapistore.h>

@implementation MAPIStoreFallbackContext
@@ -56,10 +55,7 @@
  NSString *baseURL, *url, *name;
  MAPIStoreUserContext *userContext;

-  baseURL = [NSString stringWithFormat: @"sogo://%@@fallback/",
-                      [userName stringByReplacingOccurrencesOfString: @"@"
-                                withString: @"%40"]];
-
+  baseURL = [NSString stringWithFormat: @"sogo://%@@fallback/", userName];

  context = talloc_zero (memCtx, struct mapistore_contexts_list);
  context->url = [baseURL asUnicodeInMemCtx: context];
@@ -103,10 +99,7 @@
                          forUser: (NSString *) userName
 {
  return [NSString stringWithFormat: @"sogo://%@@fallback/0x%.16"PRIx64"/",
-                   [userName stringByReplacingOccurrencesOfString: @"@"
-                             withString: @"%40"],
-                   (unsigned long long) fid];
-
+                   userName, (unsigned long long) fid];
 }

@end
@@ -22,7 +22,6 @@
 #define MAPISTOREFOLDER_H

 #import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>

@class NSArray;
@class NSMutableArray;
@@ -42,20 +41,6 @@

 #import "MAPIStoreSOGoObject.h"

-/* MAPI Permissions
-
-   This set has only sogo-openchange library scope
- */
-extern NSString *MAPIStoreRightReadItems;
-extern NSString *MAPIStoreRightCreateItems;
-extern NSString *MAPIStoreRightEditOwn;
-extern NSString *MAPIStoreRightEditAll;
-extern NSString *MAPIStoreRightDeleteOwn;
-extern NSString *MAPIStoreRightDeleteAll;
-extern NSString *MAPIStoreRightCreateSubfolders;
-extern NSString *MAPIStoreRightFolderOwner;
-extern NSString *MAPIStoreRightFolderContact;
-
@interface MAPIStoreFolder : MAPIStoreSOGoObject
 {
  MAPIStoreContext *context;
@@ -89,8 +74,6 @@ extern NSString *MAPIStoreRightFolderContact;
 - (MAPIStorePermissionsTable *) permissionsTable;
 - (NSArray *) permissionEntries;

- (NSArray *) expandRoles: (NSArray *) roles;
-
 /* message objects and tables */
 - (id) lookupMessage: (NSString *) messageKey;
 - (NSArray *) messageKeys;
@@ -113,34 +96,33 @@ extern NSString *MAPIStoreRightFolderContact;

 /* backend interface */

- (enum mapistore_error) openFolder: (MAPIStoreFolder **) childFolderPtr
-                            withFID: (uint64_t) fid;
- (enum mapistore_error) createFolder: (MAPIStoreFolder **) childFolderPtr
-                              withRow: (struct SRow *) aRow
-                               andFID: (uint64_t) fid;
- (enum mapistore_error) deleteFolder;
- (enum mapistore_error) getChildCount: (uint32_t *) rowCount
-                           ofTableType: (enum mapistore_table_type) tableType;
+- (int) openFolder: (MAPIStoreFolder **) childFolderPtr
+           withFID: (uint64_t) fid;
+- (int) createFolder: (MAPIStoreFolder **) childFolderPtr
+             withRow: (struct SRow *) aRow
+              andFID: (uint64_t) fid;
+- (int) deleteFolder;
+- (int) getChildCount: (uint32_t *) rowCount
+          ofTableType: (enum mapistore_table_type) tableType;

- (enum mapistore_error) createMessage: (MAPIStoreMessage **) messagePtr
-                               withMID: (uint64_t) mid
-                          isAssociated: (BOOL) isAssociated;
+- (int) createMessage: (MAPIStoreMessage **) messagePtr
+              withMID: (uint64_t) mid
+         isAssociated: (BOOL) isAssociated;

- (enum mapistore_error) openMessage: (MAPIStoreMessage **) messagePtr
-                             withMID: (uint64_t) mid
-                          forWriting: (BOOL) readWrite
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) deleteMessageWithMID: (uint64_t) mid
-                                     andFlags: (uint8_t) flags;
+- (int) openMessage: (MAPIStoreMessage **) messagePtr
+            withMID: (uint64_t) mid
+         forWriting: (BOOL) readWrite
+           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) deleteMessageWithMID: (uint64_t) mid
+                    andFlags: (uint8_t) flags;

- (enum mapistore_error) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
-                                         andCount: (uint32_t) count
-                                       fromFolder: (MAPIStoreFolder *) sourceFolder
-                                         withMIDs: (uint64_t *) targetMids
-                                    andChangeKeys: (struct Binary_r **) targetChangeKeys
-                        andPredecessorChangeLists: (struct Binary_r **) targetPredecessorChangeLists
-                                         wantCopy: (uint8_t) want_copy
-                                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                        andCount: (uint32_t) count
+                      fromFolder: (MAPIStoreFolder *) sourceFolder
+                        withMIDs: (uint64_t *) targetMids
+                   andChangeKeys: (struct Binary_r **) targetChangeKeys
+                        wantCopy: (uint8_t) want_copy
+                        inMemCtx: (TALLOC_CTX *) memCtx;

 - (enum mapistore_error) moveCopyToFolder: (MAPIStoreFolder *) targetFolder
                              withNewName: (NSString *) newFolderName
@@ -148,27 +130,26 @@ extern NSString *MAPIStoreRightFolderContact;
                              isRecursive: (BOOL) isRecursive
                          inMemCtx: (TALLOC_CTX *) memCtx;

- (enum mapistore_error) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
-                                   andCN: (uint64_t *) cnPtr
-                        fromChangeNumber: (uint64_t) changeNum
-                             inTableType: (enum mapistore_table_type) tableType
-                                inMemCtx: (TALLOC_CTX *) mem_ctx;
+- (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
+                  andCN: (uint64_t *) cnPtr
+       fromChangeNumber: (uint64_t) changeNum
+            inTableType: (enum mapistore_table_type) tableType
+               inMemCtx: (TALLOC_CTX *) mem_ctx;

- (enum mapistore_error) getTable: (MAPIStoreTable **) tablePtr
-                      andRowCount: (uint32_t *) count
-                        tableType: (enum mapistore_table_type) tableType
-                      andHandleId: (uint32_t) handleId;
+- (int) getTable: (MAPIStoreTable **) tablePtr
+     andRowCount: (uint32_t *) count
+       tableType: (enum mapistore_table_type) tableType
+     andHandleId: (uint32_t) handleId;

- (enum mapistore_error) modifyPermissions: (struct PermissionData *) permissions
-                                 withCount: (uint16_t) pcount
-                                  andFlags: (int8_t) flags;
+- (int) modifyPermissions: (struct PermissionData *) permissions
+                withCount: (uint16_t) pcount
+                 andFlags: (int8_t) flags;
 - (enum mapistore_error) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids
                                          ofTableType: (enum mapistore_table_type) tableType;


 /* helpers */
 - (uint64_t) idForObjectWithKey: (NSString *) childKey;
- (MAPIStoreFolder *) rootContainer;

 /* subclasses */
 - (MAPIStoreMessage *) createMessage;
@@ -203,6 +184,12 @@ extern NSString *MAPIStoreRightFolderContact;
 /* subclass helpers */
 - (void) setupVersionsMessage;
 - (void) ensureIDsForChildKeys: (NSArray *) keys;
+- (void) postNotificationsForMoveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                                       andMessageURLs: (NSArray *) oldMessageURLs
+                                             andCount: (uint32_t) midCount
+                                           fromFolder: (MAPIStoreFolder *) sourceFolder
+                                             withMIDs: (uint64_t *) targetMids
+                                             wantCopy: (uint8_t) wantCopy;

@end

@@ -82,9 +82,7 @@
                                                   andTDBIndexing: indexing];
      parentFolder = [[userContext rootFolders] objectForKey: moduleName];
      baseUrl = [NSString stringWithFormat: @"sogo://%@@%@/",
-                          [userName stringByReplacingOccurrencesOfString: @"@"
-                                    withString: @"%40"],
-                          moduleName];
+                          userName, moduleName];

      subfolders = [parentFolder subFolders];
      max = [subfolders count];
@@ -121,6 +119,7 @@

  userContext = [MAPIStoreUserContext userContextWithUsername: userName
                                               andTDBIndexing: NULL];
+  [MAPIApp setUserContext: userContext];
  moduleName = [self MAPIModuleName];
  parentFolder = [[userContext rootFolders] objectForKey: moduleName];
  nameInContainer = nil;
@@ -128,11 +127,10 @@
  if (![parentFolder newFolderWithName: folderName
                       nameInContainer: &nameInContainer])
    mapistoreURI = [NSString stringWithFormat: @"sogo://%@@%@/%@/",
-                             [userName stringByReplacingOccurrencesOfString: @"@"
-                                       withString: @"%40"],
-                             moduleName, nameInContainer];
+                             userName, moduleName, nameInContainer];
  else
    mapistoreURI = nil;
+  [MAPIApp setUserContext: nil];

  return mapistoreURI;
 }
@@ -41,10 +41,8 @@

 /* synchronisation */
 - (BOOL) synchroniseCache;
- (BOOL) synchroniseCacheFor: (NSString *) nameInContainer;
 - (void) updateVersionsForMessageWithKey: (NSString *) messageKey
-                           withChangeKey: (NSData *) oldChangeKey
-                andPredecessorChangeList: (NSData *) pcl;
+                           withChangeKey: (NSData *) newChangeKey;
 - (NSNumber *) lastModifiedFromMessageChangeNumber: (NSString *) changeNumber;
 - (NSString *) changeNumberForMessageWithKey: (NSString *) messageKey;
 - (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey;
@@ -75,7 +75,6 @@ static Class NSNumberK;
          [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                inContainer: dbFolder]);
  [versionsMessage setObjectType: MAPIInternalCacheObject];
-  [versionsMessage reloadIfNeeded];
 }

 - (void) dealloc
@@ -86,9 +85,9 @@ static Class NSNumberK;
  [super dealloc];
 }

- (enum mapistore_error) deleteFolder
+- (int) deleteFolder
 {
-  enum mapistore_error rc;
+  int rc;
  NSException *error;
  NSString *name;

@@ -138,8 +137,8 @@ static Class NSNumberK;
    [sogoObject renameTo: newDisplayName];
 }

- (enum mapistore_error) getPidTagDisplayName: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *displayName;
  Class cClass;
@@ -262,6 +261,7 @@ static Class NSNumberK;
 */
 - (void) _setChangeKey: (NSData *) changeKey
       forMessageEntry: (NSMutableDictionary *) messageEntry
+      inChangeListOnly: (BOOL) inChangeListOnly
 {
  struct XID *xid;
  NSString *guid;
@@ -270,15 +270,19 @@ static Class NSNumberK;
  NSMutableDictionary *changeList;

  xid = [changeKey asXIDInMemCtx: NULL];
-  guid = [NSString stringWithGUID: &xid->NameSpaceGuid];
-  globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length];
+  guid = [NSString stringWithGUID: &xid->GUID];
+  globCnt = [NSData dataWithBytes: xid->Data length: xid->Size];
  talloc_free (xid);

-  /* 1. set change key association */
-  changeKeyDict = [NSDictionary dictionaryWithObjectsAndKeys: guid, @"GUID",
-                                globCnt, @"LocalId",
-                                nil];
-  [messageEntry setObject: changeKeyDict forKey: @"ChangeKey"];
+  if (!inChangeListOnly)
+    {
+      /* 1. set change key association */
+      changeKeyDict = [NSDictionary dictionaryWithObjectsAndKeys:
+                                      guid, @"GUID",
+                                    globCnt, @"LocalId",
+                                    nil];
+      [messageEntry setObject: changeKeyDict forKey: @"ChangeKey"];
+    }

  /* 2. append/update predecessor change list */
  changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
@@ -292,77 +296,6 @@ static Class NSNumberK;
  [changeList setObject: globCnt forKey: guid];
 }

- (void) _updatePredecessorChangeList: (NSData *) predecessorChangeList
-                      forMessageEntry: (NSMutableDictionary *) messageEntry
-                     withOldChangeKey: (NSData *) oldChangeKey
-{
-  NSData *globCnt, *oldGlobCnt;
-  NSDictionary *changeKeyDict;
-  NSString *guid;
-  NSMutableDictionary *changeList;
-  struct SizedXid *sizedXIDList;
-  struct XID xid, *givenChangeKey;
-  TALLOC_CTX *localMemCtx;
-  uint32_t i, length;
-
-  localMemCtx = talloc_new (NULL);
-  if (!localMemCtx)
-    {
-      [self errorWithFormat: @"No more memory"];
-      return;
-    }
-
-  if (predecessorChangeList)
-    {
-      sizedXIDList = [predecessorChangeList asSizedXidArrayInMemCtx: localMemCtx with: &length];
-
-      changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
-      if (!changeList)
-        {
-          changeList = [NSMutableDictionary new];
-          [messageEntry setObject: changeList
-                           forKey: @"PredecessorChangeList"];
-          [changeList release];
-        }
-
-      if (sizedXIDList) {
-        for (i = 0; i < length; i++)
-          {
-            xid = sizedXIDList[i].XID;
-            guid = [NSString stringWithGUID: &xid.NameSpaceGuid];
-            globCnt = [NSData dataWithBytes: xid.LocalId.data length: xid.LocalId.length];
-            oldGlobCnt = [changeList objectForKey: guid];
-            if (!oldGlobCnt || ([globCnt compare: oldGlobCnt] == NSOrderedDescending))
-              [changeList setObject: globCnt forKey: guid];
-          }
-      }
-    }
-
-  if (oldChangeKey)
-    {
-      givenChangeKey = [oldChangeKey asXIDInMemCtx: localMemCtx];
-      if (givenChangeKey) {
-        guid = [NSString stringWithGUID: &givenChangeKey->NameSpaceGuid];
-        globCnt = [NSData dataWithBytes: givenChangeKey->LocalId.data length: givenChangeKey->LocalId.length];
-
-        changeKeyDict = [messageEntry objectForKey: @"ChangeKey"];
-        if (!changeKeyDict ||
-            ([guid isEqualToString: [changeKeyDict objectForKey: @"GUID"]]
-             && ([globCnt compare: [changeKeyDict objectForKey: @"LocalId"]] == NSOrderedDescending)))
-          {
-            /* The given change key is greater than current one stored in
-               metadata or it does not exist */
-            [messageEntry setObject: [NSDictionary dictionaryWithObjectsAndKeys: guid, @"GUID",
-                                                   globCnt, @"LocalId",
-                                                   nil]
-                             forKey: @"ChangeKey"];
-          }
-      }
-    }
-
-  talloc_free (localMemCtx);
-}
-
 - (EOQualifier *) componentQualifier
 {
  if (!componentQualifier)
@@ -532,7 +465,8 @@ static Class NSNumberK;
 	      // A GLOBCNT structure is a 6-byte global namespace counter,
 	      // we strip the first 2 bytes. The first two bytes is the ReplicaId
              changeKey = [self getReplicaKeyFromGlobCnt: newChangeNum >> 16];
-              [self _setChangeKey: changeKey forMessageEntry: messageEntry];
+              [self _setChangeKey: changeKey forMessageEntry: messageEntry
+                 inChangeListOnly: NO];
            }

          now = [NSCalendarDate date];
@@ -548,123 +482,13 @@ static Class NSNumberK;
  return rc;
 }

- (BOOL) synchroniseCacheFor: (NSString *) nameInContainer
-{
-  /* Try to synchronise old messages in versions.plist cache using an
-     specific c_name. It returns a boolean indicating if the
-     synchronisation was carried out succesfully.
-
-     It should be used as last resort, keeping synchroniseCache as the
-     main sync entry point. */
-
-  uint64_t changeNumber;
-  NSString *changeNumberStr;
-  NSData *changeKey;
-  NSNumber *cLastModified, *cDeleted, *cVersion;
-  EOFetchSpecification *fs;
-  EOQualifier *searchQualifier, *fetchQualifier;
-  NSArray *fetchResults;
-  NSDictionary *result;
-  NSMutableDictionary *currentProperties, *messages, *mapping, *messageEntry;
-  GCSFolder *ocsFolder;
-  static NSArray *fields;
-
-  [versionsMessage reloadIfNeeded];
-  currentProperties = [versionsMessage properties];
-
-  messages = [currentProperties objectForKey: @"Messages"];
-  if (!messages)
-    {
-        messages = [NSMutableDictionary new];
-        [currentProperties setObject: messages forKey: @"Messages"];
-        [messages release];
-    }
-
-  messageEntry = [messages objectForKey: nameInContainer];
-  if (!messageEntry)
-    {
-      /* Fetch the message by its name */
-      if (!fields)
-        fields = [[NSArray alloc]
-                  initWithObjects: @"c_name", @"c_version", @"c_lastmodified",
-                  @"c_deleted", nil];
-
-      searchQualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_name"
-                                     operatorSelector: EOQualifierOperatorEqual
-                                                value: nameInContainer];
-      fetchQualifier = [[EOAndQualifier alloc]
-                        initWithQualifiers: searchQualifier,
-                        [self contentComponentQualifier],
-                        nil];
-      [fetchQualifier autorelease];
-      [searchQualifier release];
-
-      ocsFolder = [sogoObject ocsFolder];
-      fs = [EOFetchSpecification
-            fetchSpecificationWithEntityName: [ocsFolder folderName]
-                                   qualifier: fetchQualifier
-                               sortOrderings: nil];
-      fetchResults = [ocsFolder fetchFields: fields
-                         fetchSpecification: fs
-                              ignoreDeleted: NO];
-
-      if ([fetchResults count] == 1)
-        {
-          result = [fetchResults objectAtIndex: 0];
-          cLastModified = [result objectForKey: @"c_lastmodified"];
-          cDeleted = [result objectForKey: @"c_deleted"];
-          if ([cDeleted isKindOfClass: NSNumberK] && [cDeleted intValue])
-            cVersion = [NSNumber numberWithInt: -1];
-          else
-            cVersion = [result objectForKey: @"c_version"];
-
-          changeNumber = [[self context] getNewChangeNumber];
-          changeNumberStr = [NSString stringWithUnsignedLongLong: changeNumber];
-
-          /* Create new message entry in Messages dict */
-          messageEntry = [NSMutableDictionary new];
-          [messages setObject: messageEntry forKey: nameInContainer];
-          [messageEntry release];
-
-          /* Store cLastModified, cVersion and the change number */
-          [messageEntry setObject: cLastModified forKey: @"c_lastmodified"];
-          [messageEntry setObject: cVersion forKey: @"c_version"];
-          [messageEntry setObject: changeNumberStr forKey: @"version"];
-
-          /* Store the change key */
-          changeKey = [self getReplicaKeyFromGlobCnt: changeNumber >> 16];
-          [self _setChangeKey: changeKey forMessageEntry: messageEntry];
-
-          /* Store the changeNumber -> cLastModified mapping */
-          mapping = [currentProperties objectForKey: @"VersionMapping"];
-          if (!mapping)
-            {
-              mapping = [NSMutableDictionary new];
-              [currentProperties setObject: mapping forKey: @"VersionMapping"];
-              [mapping release];
-            }
-          [mapping setObject: cLastModified forKey: changeNumberStr];
-
-          /* Save the message */
-          [versionsMessage save];
-          return YES;
-        }
-      else
-          return NO;
-    }
-
-  /* If message entry exists, then synchroniseCache did its job */
-  return YES;
-}
-
 - (void) updateVersionsForMessageWithKey: (NSString *) messageKey
-                           withChangeKey: (NSData *) oldChangeKey
-                andPredecessorChangeList: (NSData *) pcl
+                           withChangeKey: (NSData *) newChangeKey
 {
  NSMutableDictionary *messages, *messageEntry;

  [self synchroniseCache];
-  if (oldChangeKey || pcl)
+  if (newChangeKey)
    {
      messages = [[versionsMessage properties] objectForKey: @"Messages"];
      messageEntry = [messages objectForKey: messageKey];
@@ -672,8 +496,8 @@ static Class NSNumberK;
        [NSException raise: @"MAPIStoreIOException"
                    format: @"no version record found for message '%@'",
                     messageKey];
-      [self _updatePredecessorChangeList: pcl forMessageEntry: messageEntry
-                        withOldChangeKey: oldChangeKey];
+      [self _setChangeKey: newChangeKey forMessageEntry: messageEntry
+         inChangeListOnly: YES];
      [versionsMessage save];
    }
 }
@@ -681,12 +505,12 @@ static Class NSNumberK;
 - (NSNumber *) lastModifiedFromMessageChangeNumber: (NSString *) changeNumber
 {
  NSDictionary *mapping;
-  NSNumber *lastModified;
+  NSNumber *modseq;

  mapping = [[versionsMessage properties] objectForKey: @"VersionMapping"];
-  lastModified = [mapping objectForKey: changeNumber];
+  modseq = [mapping objectForKey: changeNumber];

-  return lastModified;
+  return modseq;
 }

 - (NSString *) changeNumberForMessageWithKey: (NSString *) messageKey
@@ -859,7 +683,6 @@ static Class NSNumberK;
      woContext = [[self userContext] woContext];
      activeUserRoles = [activeUser rolesForObject: sogoObject
                                         inContext: woContext];
-      activeUserRoles = [self expandRoles: activeUserRoles];
      [activeUserRoles retain];
    }

@@ -23,8 +23,6 @@
 #ifndef MAPISTOREGCSMESSAGE_H
 #define MAPISTOREGCSMESSAGE_H

-#import <SOGo/SOGoUser.h>
-
 #import "MAPIStoreMessage.h"

@interface MAPIStoreGCSMessage : MAPIStoreMessage
@@ -32,11 +30,6 @@
 }

 /* subclass helpers */
-
-/* Return the message original creator */
- (NSString *) creator;
- (NSString *) owner;
- (SOGoUser *) ownerUser;
 - (void) updateVersions;

@end
@@ -20,12 +20,10 @@
 * Boston, MA 02111-1307, USA.
 */

-#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
 #import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 #import <SOGo/SOGoContentObject.h>
@@ -37,7 +35,6 @@
 #import "MAPIStoreTypes.h"
 #import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
-#import "NSString+MAPIStore.h"

 #import "MAPIStoreGCSMessage.h"

@@ -57,28 +54,76 @@
  return [sogoObject lastModified];
 }

- (enum mapistore_error) getPidTagCreatorName: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAccess: (void **) data // TODO
+               inMemCtx: (TALLOC_CTX *) memCtx
 {
-  enum mapistore_error rc;
-  NSString *creator;
+  MAPIStoreContext *context;
+  WOContext *woContext;
+  SoSecurityManager *sm;
+  MAPIStoreUserContext *userContext;
+  uint32_t access;

-  creator = [self creator];
-  if (creator)
-    {
-      *data = [creator asUnicodeInMemCtx: memCtx];
-      rc = MAPISTORE_SUCCESS;
-    }
+  context = [self context];
+  userContext = [self userContext];
+  if ([[context activeUser] isEqual: [userContext sogoUser]])
+    access = 0x03;
  else
-    rc = MAPISTORE_ERR_NOT_FOUND;
+    {
+      sm = [SoSecurityManager sharedSecurityManager];
+      woContext = [userContext woContext];

-  return rc;
+      access = 0;
+      if (![sm validatePermission: SoPerm_ChangeImagesAndFiles
+                         onObject: sogoObject
+                        inContext: woContext])
+        access |= 1;
+      if (![sm validatePermission: SoPerm_AccessContentsInformation
+                         onObject: sogoObject
+                        inContext: woContext])
+        access |= 2;
+      if (![sm validatePermission: SOGoPerm_DeleteObject
+                         onObject: sogoObject
+                        inContext: woContext])
+        access |= 4;
+    }
+  *data = MAPILongValue (memCtx, access);
+
+  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagChangeKey: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAccessLevel: (void **) data // TODO
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
-  enum mapistore_error rc = MAPISTORE_SUCCESS;
+  MAPIStoreContext *context;
+  MAPIStoreUserContext *userContext;
+  WOContext *woContext;
+  SoSecurityManager *sm;
+  uint32_t accessLvl;
+
+  context = [self context];
+  userContext = [self userContext];
+  if ([[context activeUser] isEqual: [userContext sogoUser]])
+    accessLvl = 1;
+  else
+    {
+      sm = [SoSecurityManager sharedSecurityManager];
+      woContext = [userContext woContext];
+      if (![sm validatePermission: SoPerm_ChangeImagesAndFiles
+                         onObject: sogoObject
+                        inContext: woContext])
+        accessLvl = 1;
+      else
+        accessLvl = 0;
+    }
+  *data = MAPILongValue (memCtx, accessLvl);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagChangeKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  int rc = MAPISTORE_SUCCESS;
  NSData *changeKey;
  MAPIStoreGCSFolder *parentFolder;
  NSString *nameInContainer;
@@ -95,25 +140,18 @@
          [parentFolder synchroniseCache];
          changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
        }
-      if (changeKey)
-        *data = [changeKey asBinaryInMemCtx: memCtx];
-      else
-        {
-          [self warnWithFormat: @"No change key for %@ in folder %@",
-                nameInContainer,
-                [parentFolder url]
-           ];
-          rc = MAPISTORE_ERR_NOT_FOUND;
-        }
+      if (!changeKey)
+        abort ();
+      *data = [changeKey asBinaryInMemCtx: memCtx];
    }

  return rc;
 }

- (enum mapistore_error) getPidTagPredecessorChangeList: (void **) data
-                                               inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagPredecessorChangeList: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
-  enum mapistore_error rc = MAPISTORE_SUCCESS;
+  int rc = MAPISTORE_SUCCESS;
  NSData *changeList;
  MAPIStoreGCSFolder *parentFolder;

@@ -142,8 +180,7 @@
 {
  uint64_t version = ULLONG_MAX;
  NSString *changeNumber;
-  BOOL synced;
-
+ 
  if (!isNew)
    {
      changeNumber = [(MAPIStoreGCSFolder *) container
@@ -152,28 +189,16 @@
        {
          [self warnWithFormat: @"attempting to get change number"
                @" by synchronising folder..."];
-          synced = [(MAPIStoreGCSFolder *) container synchroniseCache];
-          if (synced)
+          [(MAPIStoreGCSFolder *) container synchroniseCache];
+          changeNumber = [(MAPIStoreGCSFolder *) container
+                            changeNumberForMessageWithKey: [self nameInContainer]];
+          
+          if (changeNumber)
+            [self logWithFormat: @"got one"];
+          else
            {
-              changeNumber = [(MAPIStoreGCSFolder *) container
-                                changeNumberForMessageWithKey: [self nameInContainer]];
-            }
-          if (!changeNumber)
-            {
-              [self warnWithFormat: @"attempting to get change number"
-                    @" by synchronising this specific message..."];
-              synced = [(MAPIStoreGCSFolder *) container
-                        synchroniseCacheFor: [self nameInContainer]];
-              if (synced)
-                {
-                  changeNumber = [(MAPIStoreGCSFolder *) container
-                                  changeNumberForMessageWithKey: [self nameInContainer]];
-                }
-              if (!changeNumber)
-                {
-                  [self errorWithFormat: @"still nothing. We crash!"];
-                  abort();
-                }
+              [self errorWithFormat: @"still nothing. We crash!"];
+              abort();
            }
        }
      version = [changeNumber unsignedLongLongValue] >> 16;
@@ -184,81 +209,13 @@

 - (void) updateVersions
 {
-  /* Update ChangeKey and PredecessorChangeList on message's save */
-  NSData *newChangeKey, *predecessorChangeList;
+  NSData *newChangeKey;

  newChangeKey = [properties objectForKey: MAPIPropertyKey (PR_CHANGE_KEY)];
-  predecessorChangeList = [properties objectForKey: MAPIPropertyKey (PR_PREDECESSOR_CHANGE_LIST)];

  [(MAPIStoreGCSFolder *) container
-      updateVersionsForMessageWithKey: [self nameInContainer]
-                        withChangeKey: newChangeKey
-             andPredecessorChangeList: predecessorChangeList];
-}
-
-//----------------------
-// Sharing
-//----------------------
-
- (NSString *) creator
-{
-  return [self owner];
-}
-
- (NSString *) owner
-{
-  return [sogoObject ownerInContext: nil];
-}
-
- (SOGoUser *) ownerUser
-{
-  NSString *ownerName;
-  SOGoUser *owner = nil;
-
-  ownerName = [self owner];
-  if ([ownerName length] != 0)
-    owner = [SOGoUser userWithLogin: ownerName];
-
-  return owner;
-}
-
- (BOOL) subscriberCanModifyMessage
-{
-  BOOL rc;
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-
-  if (isNew)
-    rc = [roles containsObject: SOGoRole_ObjectCreator];
-  else
-    rc = [roles containsObject: SOGoRole_ObjectEditor];
-
-  /* Check if the message is owned and it has permission to edit it */
-  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
-    rc = [[[container context] activeUser] isEqual: [self ownerUser]];
-
-  return rc;
-}
-
- (BOOL) subscriberCanDeleteMessage
-{
-  BOOL rc;
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-  rc = [roles containsObject: SOGoRole_ObjectEraser];
-
-  /* Check if the message is owned and it has permission to delete it */
-  if (!rc && [roles containsObject: MAPIStoreRightDeleteOwn])
-    {
-      NSString *currentUser;
-
-      currentUser = [[container context] activeUser];
-      rc = [currentUser isEqual: [self ownerUser]];
-    }
-
-  return rc;
+    updateVersionsForMessageWithKey: [self nameInContainer]
+                      withChangeKey: newChangeKey];
 }

@end
@@ -27,7 +27,6 @@
 #import <Foundation/NSString.h>

 #import <NGExtensions/NSObject+Logs.h>
-#import <NGExtensions/NSObject+Values.h>

 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EOQualifier.h>
@@ -39,6 +38,7 @@

 #import "MAPIStoreTypes.h"
 #import "MAPIStoreGCSFolder.h"
+
 #import "MAPIStoreGCSMessageTable.h"

 #undef DEBUG
@@ -89,31 +89,21 @@

  if (res->ulPropTag == PidTagChangeNumber)
    {
-      NSString *changeNumber;
-
      value = NSObjectFromMAPISPropValue (&res->lpProp);
-      changeNumber = [NSString stringWithUnsignedLongLong: [(NSNumber *)value unsignedLongLongValue]];
      lastModified = [(MAPIStoreGCSFolder *)
-                       container lastModifiedFromMessageChangeNumber: changeNumber];
+                       container lastModifiedFromMessageChangeNumber: value];
      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
      //[self logWithFormat: @"  c_lastmodified: %@", lastModified];
      if (lastModified)
        {
-          SEL operator;
-
-          operator = [self operatorFromRestrictionOperator: res->relop];
          *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_lastmodified"
-                                               operatorSelector: operator
+                                               operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
                                                          value: lastModified];
          [*qualifier autorelease];
          rc = MAPIRestrictionStateNeedsEval;
        }
      else
-        {
-          [self logWithFormat: @"No last modified found for: 0x%.16"PRIx64". Then no restriction applied",
-                [value unsignedLongLongValue]];
-          rc = MAPIRestrictionStateAlwaysTrue;
-        }
+        rc = MAPIRestrictionStateAlwaysTrue;
    }
  else
    {
@@ -30,7 +30,6 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <Mailer/SOGoMailBodyPart.h>
 #import <Mailer/SOGoMailObject.h>
-#import <Mailer/NSDictionary+Mail.h>

 #import "MAPIStoreTypes.h"
 #import "MAPIStoreMailMessage.h"
@@ -76,24 +75,24 @@
  ASSIGN (bodyPart, newBodyPart);
 }

- (enum mapistore_error) getPidTagAttachMethod: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachMethod: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x00000001); // afByValue

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachTag: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachTag: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self mimeAttachTag] asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachSize: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachSize: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t longValue;

@@ -103,13 +102,13 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagRecordKey: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagRecordKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  static char recordBytes[] = {0xd9, 0xd8, 0x11, 0xa3, 0xe2, 0x90, 0x18, 0x41,
                               0x9e, 0x04, 0x58, 0x46, 0x9d, 0x6d, 0x1b,
                               0x68};
-
+  
  *data = [[NSData dataWithBytes: recordBytes length: 16]
            asBinaryInMemCtx: memCtx];

@@ -118,19 +117,31 @@

 - (NSString *) _fileName
 {
-  return [bodyInfo filename];
+  NSString *fileName;
+  NSDictionary *parameters;
+
+  fileName = [[bodyInfo objectForKey: @"parameterList"]
+               objectForKey: @"name"];
+  if (!fileName)
+    {
+      parameters = [[bodyInfo objectForKey: @"disposition"]
+                     objectForKey: @"parameterList"];
+      fileName = [parameters objectForKey: @"filename"];
+    }
+
+  return fileName;
 }

- (enum mapistore_error) getPidTagAttachLongFilename: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachLongFilename: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self _fileName] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachFilename: (void **) data
-                                        inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachFilename: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *fileName, *baseName, *ext;

@@ -149,52 +160,39 @@
  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagDisplayName: (void **) data
-                                     inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
 {
-  NSString *fileName;
-
-  fileName = [self _fileName];
-  if ([fileName isEqualToString: @"sharing_metadata.xml"])
-    /* Required to disallow user from seeing the attachment by default */
-    *data = [@"sharing_metadata.xml" asUnicodeInMemCtx: memCtx];
-  else
-    *data = [[bodyInfo objectForKey: @"description"]
-              asUnicodeInMemCtx: memCtx];
+  *data = [[bodyInfo objectForKey: @"description"]
+            asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachContentId: (void **) data
-                                         inMemCtx: (TALLOC_CTX *) memCtx
-{
+- (int) getPidTagAttachContentId: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
+{ 
  *data = [[bodyInfo objectForKey: @"bodyId"]
            asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachMimeTag: (void **) data
-                                       inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachMimeTag: (void **) data
+                      inMemCtx: (TALLOC_CTX *) memCtx
 {
-  NSString *mimeTag, *fileName;
-
-  fileName = [self _fileName];
-  if ([fileName isEqualToString: @"sharing_metadata.xml"])
-    /* Required by [MS-OXWSMSHR] Section 3.1.1 */
-    mimeTag = [NSString stringWithFormat: @"application/x-sharing-metadata-xml"];
-  else
-    mimeTag = [NSString stringWithFormat: @"%@/%@",
-                  [bodyInfo objectForKey: @"type"],
-                  [bodyInfo objectForKey: @"subtype"]];
+  NSString *mimeTag;

+  mimeTag = [NSString stringWithFormat: @"%@/%@",
+                [bodyInfo objectForKey: @"type"],
+                [bodyInfo objectForKey: @"subtype"]];
  *data = [[mimeTag lowercaseString] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (enum mapistore_error) getPidTagAttachDataBinary: (void **) data
-                                          inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagAttachDataBinary: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[bodyPart fetchBLOBWithPeek: YES] asBinaryInMemCtx: memCtx];

@@ -67,7 +67,7 @@ MakeDisplayFolderName (NSString *folderName)
  NSArray *parts;
  NSString *lastFolder;
  NSUInteger max;
-
+ 
  parts = [folderName componentsSeparatedByString: @"/"];
  max = [parts count];
  if (max > 1)
@@ -87,7 +87,7 @@ MakeDisplayFolderName (NSString *folderName)
                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct mapistore_contexts_list *firstContext = NULL, *context;
-  NSString *urlBase, *stringData, *currentName, *realName, *inboxName, *draftsName, *sentName, *trashName;
+  NSString *urlBase, *stringData, *currentName, *inboxName, *draftsName, *sentName, *trashName;
  NSArray *unprefixedFolders;
  NSMutableArray *secondaryFolders;
  enum mapistore_context_role role[] = {MAPISTORE_MAIL_ROLE,
@@ -126,11 +126,7 @@ MakeDisplayFolderName (NSString *folderName)
  trashName = [NSString stringWithFormat: @"folder%@",
                       [unprefixedFolders componentsJoinedByString: @"/folder"]];

-  urlBase = [NSString stringWithFormat: @"sogo://%@:%@@mail/",
-                      [userName stringByReplacingOccurrencesOfString: @"@"
-                                withString: @"%40"],
-                      [userName stringByReplacingOccurrencesOfString: @"@"
-                                withString: @"%40"]];
+  urlBase = [NSString stringWithFormat: @"sogo://%@:%@@mail/", userName, userName];
  for (count = 0; count < 3; count++)
    {
      context = talloc_zero (memCtx, struct mapistore_contexts_list);
@@ -146,9 +142,6 @@ MakeDisplayFolderName (NSString *folderName)
      DLIST_ADD_END (firstContext, context, void);
    }

-  /* FIXME: Flush any cache before retrieving the hierarchy */
-  [accountFolder flushMailCaches];
-
  secondaryFolders = [[accountFolder toManyRelationshipKeysWithNamespaces: NO]
                       mutableCopy];
  [secondaryFolders autorelease];
@@ -160,25 +153,12 @@ MakeDisplayFolderName (NSString *folderName)
  for (count = 0; count < max; count++)
    {
      context = talloc_zero (memCtx, struct mapistore_contexts_list);
-      // secondaryFolders has the names (1) Imap4Encoded ,(2) asCSSIdentifier and (3) "folder"-prefixed
-      //     e.g.: folderProbl&AOg-mes_SP_de_SP_synchronisation
      currentName = [secondaryFolders objectAtIndex: count];
-      // To get the real name we have to revert that (applying the decode functions
-      // in reverse order)
-      //     e.g.: Problèmes de synchronisation
-      realName = [[[currentName substringFromIndex: 6]
-                                fromCSSIdentifier]
-                                stringByDecodingImap4FolderName];
-      // And finally to represent that as URI we have to (1) asCSSIdentifier,
-      // (2) Imap4Encode (3) AddPercentEscapes and (4) add the "folder" prefix
-      //     e.g.: folderProbl&AOg-mes_SP_de_SP_synchronisation
-      // In the example there are no percent escapes added because is already ok
-      stringData = [[[realName asCSSIdentifier]
-                               stringByEncodingImap4FolderName]
-                               stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
-      stringData = [NSString stringWithFormat: @"folder%@", stringData];
-      context->url = [[NSString stringWithFormat: @"%@%@", urlBase, stringData] asUnicodeInMemCtx: context];
-      context->name = [realName asUnicodeInMemCtx: context];
+      stringData = [NSString stringWithFormat: @"%@%@",
+                             urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+      context->url = [stringData asUnicodeInMemCtx: context];
+      stringData = [[[currentName substringFromIndex: 6] fromCSSIdentifier] stringByDecodingImap4FolderName];
+      context->name = [stringData asUnicodeInMemCtx: context];
      context->main_folder = false;
      context->role = MAPISTORE_MAIL_ROLE;
      context->tag = "tag";
@@ -200,20 +180,19 @@ MakeDisplayFolderName (NSString *folderName)

  userContext = [MAPIStoreUserContext userContextWithUsername: userName
                                               andTDBIndexing: NULL];
+  [MAPIApp setUserContext: userContext];
  accountFolder = [[userContext rootFolders] objectForKey: @"mail"];
  folderName = [NSString stringWithFormat: @"folder%@",
-                         [[newFolderName stringByEncodingImap4FolderName] asCSSIdentifier]];
+                         [newFolderName asCSSIdentifier]];
  newFolder = [SOGoMailFolder objectWithName: folderName
                                 inContainer: accountFolder];
  if ([newFolder create])
    mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
-                             [userName stringByReplacingOccurrencesOfString: @"@"
-                                       withString: @"%40"],
-                             [userName stringByReplacingOccurrencesOfString: @"@"
-                                       withString: @"%40"],
-                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+                             userName, userName,
+                             [[folderName stringByEncodingImap4FolderName] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
  else
    mapistoreURI = nil;
+  [MAPIApp setUserContext: nil];

  return mapistoreURI;
 }
@@ -285,12 +264,8 @@ MakeDisplayFolderName (NSString *folderName)
                        componentsSeparatedByString: @"/"];
  folderName = [NSString stringWithFormat: @"folder%@",
                         [unprefixedFolders componentsJoinedByString: @"/folder"]];
-  url = [NSString stringWithFormat: @"sogo://%@:%@@outbox/%@",
-                  [userName stringByReplacingOccurrencesOfString: @"@"
-                            withString: @"%40"],
-                  [userName stringByReplacingOccurrencesOfString: @"@"
-                            withString: @"%40"],
-                  folderName];
+  url = [NSString stringWithFormat: @"sogo://%@:%@@outbox/%@", userName,
+                  userName, folderName];

  context = talloc_zero (memCtx, struct mapistore_contexts_list);
  context->url = [url asUnicodeInMemCtx: context];
@@ -44,24 +44,14 @@

 /* synchronisation & versioning */
 - (BOOL) synchroniseCache;
- (void) synchronizeUpdatedFolder: (NSNumber *) lastModseq
-                      withMapping: (NSMutableDictionary *) mapping;
- (BOOL) synchroniseCacheForUID: (NSString *) messageUID;
 - (NSNumber *) modseqFromMessageChangeNumber: (NSString *) changeNum;
 - (NSString *) messageUIDFromMessageKey: (NSString *) messageKey;
 - (NSString *) changeNumberForMessageUID: (NSString *) messageUid;
 - (void) setChangeKey: (NSData *) changeKey
    forMessageWithKey: (NSString *) messageKey;
- (BOOL) updatePredecessorChangeListWith: (NSData *) changeKey
-                       forMessageWithKey: (NSString *) messageKey;
 - (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey;
 - (NSData *) predecessorChangeListForMessageWithKey: (NSString *) messageKey;

-/* Extra properties from mail messages that already hit the server */
- (void) setExtraProperties: (NSDictionary *) props
-                 forMessage: (NSString *) messageKey;
- (NSDictionary *) extraPropertiesForMessage: (NSString *) messageKey;
-
@end

 /* MAPIStoreOutboxFolder is a special subclass of MAPIStoreMailFolder where
@@ -1,31 +0,0 @@
-/* MAPIStoreMailFolderTable.h - this file is part of SOGo
- *
- * Copyright (C) 2015 Enrique J. Hernández
- *
- * Author: Enrique J. Hernández <ejhernandez@zentyal.com>
- *
- * 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 3, 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.
- */
-
-#ifndef MAPISTOREMAILFOLDERTABLE_H
-#define MAPISTOREMAILFOLDERTABLE_H
-
-#import "MAPIStoreFolderTable.h"
-
-@interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
-@end
-
-#endif /* MAPISTOREMAILFOLDERTABLE_H */
@@ -1,42 +0,0 @@
-/* MAPIStoreMailFolderTable.m - this file is part of SOGo
- *
- * Copyright (C) 2015 Enrique J. Hernández
- *
- * 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 3, 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/NSString.h>
-
-#import "MAPIStoreMailFolderTable.h"
-#import "MAPIStoreTypes.h"
-
-@implementation MAPIStoreMailFolderTable
-
- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
-{
-  switch(property)
-    {
-    case PR_DISPLAY_NAME:
-    case PR_DISPLAY_NAME_UNICODE:
-      return @"name";
-    default:
-      return nil;
-    }
-}
-
-
-@end
-
@@ -25,10 +25,8 @@

 #import "MAPIStoreMessage.h"

+@class NSData;
@class NSString;
-@class NSArray;
-@class NSMutableArray;
-@class NSMutableDictionary;

@class MAPIStoreAppointmentWrapper;
@class MAPIStoreMailFolder;
@@ -37,19 +35,12 @@
 {
  BOOL headerSetup;
  BOOL mailIsEvent;
-  BOOL mailIsMeetingRequest;
-  BOOL mailIsSharingObject;
-
-  NSMutableArray *bodyContentKeys;
-  NSMutableDictionary *bodyPartsEncodings;
-  NSMutableDictionary *bodyPartsCharsets;
-  NSMutableDictionary *bodyPartsMimeTypes;
-  NSMutableDictionary *bodyPartsMixed;
-  
+  NSString *mimeKey;
  NSString *headerCharset;
+  NSString *headerEncoding;
  NSString *headerMimeType;
  BOOL bodySetup;
-  NSArray *bodyContent;
+  NSData *bodyContent;
  BOOL fetchedAttachments;

  MAPIStoreAppointmentWrapper *appointmentWrapper;
@@ -57,31 +48,31 @@

 - (NSString *) subject;

- (enum mapistore_error) getPidTagIconIndex: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagFlagStatus: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagIconIndex: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagFlagStatus: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;

- (enum mapistore_error) getPidTagMessageFlags: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagFollowupIcon: (void **) data
-                                      inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagImportance: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagReceivedByEmailAddress: (void **) data
-                                                inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagSenderEmailAddress: (void **) data
-                                            inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagDisplayTo: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagDisplayCc: (void **) data
-                                   inMemCtx: (TALLOC_CTX *) memCtx;
- (enum mapistore_error) getPidTagDisplayBcc: (void **) data
-                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagMessageFlags: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagFollowupIcon: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagImportance: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagReceivedByEmailAddress: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagSenderEmailAddress: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagDisplayTo: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagDisplayCc: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagDisplayBcc: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;

 /* batch-mode helpers */
- (void) setBodyContentFromRawData: (NSArray *) rawContent;
- (NSArray *) getBodyContent;
+- (NSString *) bodyContentPartKey;
+- (void) setBodyContentFromRawData: (NSData *) rawContent;

@end
Author	SHA1	Message	Date
Ludovic Marcotte	2ae326c41f	Merge to 2.2.13	2014-12-30 08:01:52 -05:00
Ludovic Marcotte	562d3db1a6	Merge to 2.2.12a	2014-12-19 09:04:01 -05:00
Ludovic Marcotte	d3914ae8a8	Merge to 2.2.12	2014-12-18 08:57:15 -05:00
Ludovic Marcotte	97135f2afa	Merge to 2.2.11a	2014-12-10 15:24:12 -05:00
Ludovic Marcotte	3e14825fe2	Merge to 2.2.11a	2014-12-10 14:25:11 -05:00
Ludovic Marcotte	93d190060e	Merge to 2.2.11	2014-12-09 09:09:58 -05:00
Ludovic Marcotte	1f299c7a1a	Merge to 2.2.10 Conflicts: NEWS Version	2014-11-21 09:17:28 -05:00
Ludovic Marcotte	74cfb901fd	Updated for the 2.2.9a release	2014-09-29 15:20:22 -04:00
Ludovic Marcotte	065fd5d9b5	Simplified even more -safeString	2014-09-29 15:17:05 -04:00
Ludovic Marcotte	bf547dd3fe	Fixed sanitization char skipping and #2936	2014-09-29 15:15:30 -04:00
Francis Lachapelle	81e47c59cd	Fix URL in documentation	2014-09-29 15:15:23 -04:00
Ludovic Marcotte	7862cda661	Merge to 2.2.9	2014-09-26 14:32:47 -04:00
Ludovic Marcotte	329552030b	Merge to 2.2.8	2014-09-10 14:17:14 -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