docs: add attribution to the ytnef project

style: capitalize TNEF in file names
fix(mail): avoid name collision in SOGoTnefMailBodyPart.m
2021-08-13 11:02:51 -04:00 · 2021-08-13 10:35:19 -04:00 · 2021-08-13 08:20:29 -04:00 · 2021-08-13 08:18:57 -04:00 · 2021-08-06 16:24:28 -04:00 · 2021-08-06 15:28:35 -04:00
1780 changed files with 40428 additions and 95148 deletions
@@ -3,7 +3,7 @@
 ## Reporting Bugs and Suggesting Enhancements

 If you encounter a possible bug with SOGo, you can access our
-[bug tracking system](https://bugs.sogo.nu/).
+[bug tracking system](https://sogo.nu/bugs/).

 Please make sure to respect the following guidelines when reporting a bug:

@@ -16,32 +16,6 @@ Please make sure to respect the following guidelines when reporting a bug:

 Begin by reading [SOGo Developer's Guide](../Documentation/SOGoDevelopersGuide.asciidoc).

-### Translations
-
-Three type of files must be translated. The first type are **Localizable.strings**; they can be
-translated online using **[Transifex](https://www.transifex.com/alinto/sogo/)**. To use Transifex,
-you must first sign up for a [free account](https://www.transifex.com/signup/). Once registered,
-[request a new team](https://www.transifex.com/alinto/teams/) for your language. Once authorized,
-you'll be able to start/continue translating SOGo in your language.
-
-The second type are **wox and html templates**. Only words outside the tags (<>) must be
-translated. Start by duplicating the English templates:
-
-* [UI/Templates/SOGoACLEnglishAdditionAdvisory.wox](https://raw.githubusercontent.com/alinto/sogo/master/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox)
-* [UI/Templates/SOGoACLEnglishRemovalAdvisory.wox](https://raw.githubusercontent.com/alinto/sogo/master/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox)
-* [UI/Templates/SOGoACLEnglishModificationAdvisory.wox](https://raw.githubusercontent.com/alinto/sogo/master/UI/Templates/SOGoACLEnglishModificationAdvisory.wox)
-* [UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox](https://raw.githubusercontent.com/alinto/sogo/master/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox)
-* [UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox](https://raw.githubusercontent.com/alinto/sogo/master/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox)
-* [SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html](https://raw.githubusercontent.com/alinto/sogo/master/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html)
-* [SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html](https://raw.githubusercontent.com/alinto/sogo/master/SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html)
-
-The third type is the locale file formatted as a **plist**. Duplicate the English locale. Beware that words with other characters than [a-zA-Z] (accents, non-latin...) must be between double quotes ("). You can look at other files as arabic or french to have an example:
-
-* [UI/MainUI/English.lproj/Locale](https://raw.githubusercontent.com/alinto/sogo/master/UI/MainUI/English.lproj/Locale)
-
-Once translated, create an archive with all the files and [contact
-us](https://sogo.nu/support.html#/commercial). We'll integrate it in the next version of SOGo.
-
 ### Git Commit Guidelines

 We have very precise rules over how our git commit messages can be formatted. This leads to **more
@@ -107,7 +81,7 @@ The body should include the motivation for the change and contrast this with pre

 #### Footer
 The footer should contain any information about **Breaking Changes** and is also the
-place to reference [Mantis](https://bugs.sogo.nu) issues that this commit **Fixes** or **Resolves**.
+place to reference [Mantis](https://sogo.nu/bus/) issues that this commit **Fixes** or **Resolves**.

 > Breaking Changes are intended to be highlighted in the CHANGELOG as changes that will require
 > community users to modify their code after updating to a version that contains this commit.
@@ -12,7 +12,6 @@
 ActiveSync/ActiveSync.SOGo
 Documentation/*.docbook
 Documentation/*.pdf
-Documentation/*.html
 SoObjects/SOGo/SOGo.framework/
 SoObjects/SOGo/derived_src/
 Tests/*/config.py
@@ -29,30 +28,3 @@ UI/WebServerResources/scss/.sass-cache/
 config.make
 doc
 tags
-.DS_Store
-Tests/package-lock.json
-.vscode
-.configure-test*
-UI/WebServerResources/package-lock.json
-
-# CKEditor
-UI/WebServerResources/js/vendor/ckeditor/samples/
-UI/WebServerResources/js/vendor/ckeditor/skins/n1theme/readme.md
-UI/WebServerResources/js/vendor/ckeditor/*.md
-UI/WebServerResources/js/vendor/ckeditor/adapters/jquery.js
-UI/WebServerResources/js/vendor/ckeditor/bender-runner.config.json
-UI/WebServerResources/js/vendor/ckeditor/plugins/onchange/docs
-UI/WebServerResources/js/vendor/ckeditor/plugins/scayt/*.md
-UI/WebServerResources/js/vendor/ckeditor/skins/n1theme/*.md
-
-# Transifex
-.tx/config_20230213185112.bak
-
-# Tests
-Tests/node_modules
-Tests/lib/config.js
-Tests/results.xml
-Tests/results
-
-# SAML2 autogenerated files
-SoObjects/SOGo/SOGoSAML2Exceptions.*
@@ -1,60 +1,464 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr: French, pt_BR: BrazilianPortuguese, ru: Russian, sk: Slovak, es_AR: SpanishArgentina, fi: Finnish, id_ID: Indonesian, lt: Lithuanian, tr_TR: TurkishTurkey, zh_TW: ChineseTaiwan, ar: Arabic, cs: Czech, nn_NO: NorwegianNynorsk, sl_SI: Slovenian, uk: Ukrainian, zh_CN: ChineseChina, sv: Swedish, bg_BG: Bulgarian, cy: Welsh, is: Icelandic, sr: Serbian, lv: Latvian, pl: Polish, ro_RO: Romanian, bs_BA: Bosnian,ca: Catalan, he: Hebrew, kk: Kazakh, pt: Portuguese, es_ES: SpanishSpain, eu: Basque, hu: Hungarian, ja: Japanese, mk_MK: Macedonian, nb_NO: NorwegianBokmal, nl: Dutch, sr@latin: SerbianLatin, da_DK: Danish, de: German, hr_HR: Croatian, it: Italian, sr_ME@latin: Montenegrin, gl_ES: Galician

-[o:alinto:p:sogo:r:soobjects-appointments]
-source_file       = SoObjects/Appointments/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = SoObjects/Appointments/<lang>.lproj/Localizable.strings
+[sogo.ui-mailerui]
+source_file = UI/MailerUI/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/MailerUI/Arabic.lproj/Localizable.strings
+trans.ca = UI/MailerUI/Catalan.lproj/Localizable.strings
+trans.cs = UI/MailerUI/Czech.lproj/Localizable.strings
+trans.cy = UI/MailerUI/Welsh.lproj/Localizable.strings
+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.he = UI/MailerUI/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/MailerUI/Croatian.lproj/Localizable.strings
+trans.hu = UI/MailerUI/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/MailerUI/Indonesian.lproj/Localizable.strings
+trans.is = UI/MailerUI/Icelandic.lproj/Localizable.strings
+trans.it = UI/MailerUI/Italian.lproj/Localizable.strings
+trans.ja = UI/MailerUI/Japanese.lproj/Localizable.strings
+trans.lt = UI/MailerUI/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/MailerUI/Latvian.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.ro_RO = UI/MailerUI/Romanian.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.sr@latin = UI/MailerUI/SerbianLatin.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_CN = UI/MailerUI/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings

+[sogo.ui-preferencesui]
+source_file = UI/PreferencesUI/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/PreferencesUI/Arabic.lproj/Localizable.strings
+trans.ca = UI/PreferencesUI/Catalan.lproj/Localizable.strings
+trans.cs = UI/PreferencesUI/Czech.lproj/Localizable.strings
+trans.cy = UI/PreferencesUI/Welsh.lproj/Localizable.strings
+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.he = UI/PreferencesUI/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/PreferencesUI/Croatian.lproj/Localizable.strings
+trans.hu = UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/PreferencesUI/Indonesian.lproj/Localizable.strings
+trans.is = UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+trans.it = UI/PreferencesUI/Italian.lproj/Localizable.strings
+trans.ja = UI/PreferencesUI/Japanese.lproj/Localizable.strings
+trans.lt = UI/PreferencesUI/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/PreferencesUI/Latvian.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.ro_RO = UI/PreferencesUI/Romanian.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.sr@latin = UI/PreferencesUI/SerbianLatin.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_CN = UI/PreferencesUI/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:soobjects-contacts]
-source_file       = SoObjects/Contacts/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = SoObjects/Contacts/<lang>.lproj/Localizable.strings
+[sogo.ui-scheduler]
+source_file = UI/Scheduler/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/Scheduler/Arabic.lproj/Localizable.strings
+trans.ca = UI/Scheduler/Catalan.lproj/Localizable.strings
+trans.cs = UI/Scheduler/Czech.lproj/Localizable.strings
+trans.cy = UI/Scheduler/Welsh.lproj/Localizable.strings
+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.he = UI/Scheduler/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/Scheduler/Croatian.lproj/Localizable.strings
+trans.hu = UI/Scheduler/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/Scheduler/Indonesian.lproj/Localizable.strings
+trans.is = UI/Scheduler/Icelandic.lproj/Localizable.strings
+trans.it = UI/Scheduler/Italian.lproj/Localizable.strings
+trans.ja = UI/Scheduler/Japanese.lproj/Localizable.strings
+trans.lt = UI/Scheduler/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/Scheduler/Latvian.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.ro_RO = UI/Scheduler/Romanian.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.sr@latin = UI/Scheduler/SerbianLatin.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_CN = UI/Scheduler/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:soobjects-mailer]
-source_file       = SoObjects/Mailer/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = SoObjects/Mailer/<lang>.lproj/Localizable.strings
+[sogo.ui-contacts]
+source_file = UI/Contacts/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/Contacts/Arabic.lproj/Localizable.strings
+trans.ca = UI/Contacts/Catalan.lproj/Localizable.strings
+trans.cs = UI/Contacts/Czech.lproj/Localizable.strings
+trans.cy = UI/Contacts/Welsh.lproj/Localizable.strings
+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.he = UI/Contacts/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/Contacts/Croatian.lproj/Localizable.strings
+trans.hu = UI/Contacts/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/Contacts/Indonesian.lproj/Localizable.strings
+trans.is = UI/Contacts/Icelandic.lproj/Localizable.strings
+trans.it = UI/Contacts/Italian.lproj/Localizable.strings
+trans.ja = UI/Contacts/Japanese.lproj/Localizable.strings
+trans.lt = UI/Contacts/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/Contacts/Latvian.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.ro_RO = UI/Contacts/Romanian.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.sr@latin = UI/Contacts/SerbianLatin.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_CN = UI/Contacts/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-administrationui]
-source_file       = UI/AdministrationUI/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/AdministrationUI/<lang>.lproj/Localizable.strings
+[sogo.ui-mainui]
+source_file = UI/MainUI/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/MainUI/Arabic.lproj/Localizable.strings
+trans.ca = UI/MainUI/Catalan.lproj/Localizable.strings
+trans.cs = UI/MainUI/Czech.lproj/Localizable.strings
+trans.cy = UI/MainUI/Welsh.lproj/Localizable.strings
+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.he = UI/MainUI/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/MainUI/Croatian.lproj/Localizable.strings
+trans.hu = UI/MainUI/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/MainUI/Indonesian.lproj/Localizable.strings
+trans.is = UI/MainUI/Icelandic.lproj/Localizable.strings
+trans.it = UI/MainUI/Italian.lproj/Localizable.strings
+trans.ja = UI/MainUI/Japanese.lproj/Localizable.strings
+trans.lt = UI/MainUI/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/MainUI/Latvian.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.ro_RO = UI/MainUI/Romanian.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.sr@latin = UI/MainUI/SerbianLatin.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_CN = UI/MainUI/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-common]
-source_file       = UI/Common/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/Common/<lang>.lproj/Localizable.strings
+[sogo.ui-common]
+source_file = UI/Common/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/Common/Arabic.lproj/Localizable.strings
+trans.ca = UI/Common/Catalan.lproj/Localizable.strings
+trans.cs = UI/Common/Czech.lproj/Localizable.strings
+trans.cy = UI/Common/Welsh.lproj/Localizable.strings
+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.he = UI/Common/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/Common/Croatian.lproj/Localizable.strings
+trans.hu = UI/Common/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/Common/Indonesian.lproj/Localizable.strings
+trans.is = UI/Common/Icelandic.lproj/Localizable.strings
+trans.it = UI/Common/Italian.lproj/Localizable.strings
+trans.ja = UI/Common/Japanese.lproj/Localizable.strings
+trans.lt = UI/Common/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/Common/Latvian.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.ro_RO = UI/Common/Romanian.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.sr@latin = UI/Common/SerbianLatin.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_CN = UI/Common/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-contacts]
-source_file       = UI/Contacts/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/Contacts/<lang>.lproj/Localizable.strings
+[sogo.ui-administrationui]
+source_file = UI/AdministrationUI/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/AdministrationUI/Arabic.lproj/Localizable.strings
+trans.ca = UI/AdministrationUI/Catalan.lproj/Localizable.strings
+trans.cs = UI/AdministrationUI/Czech.lproj/Localizable.strings
+trans.cy = UI/AdministrationUI/Welsh.lproj/Localizable.strings
+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.he = UI/AdministrationUI/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/AdministrationUI/Croatian.lproj/Localizable.strings
+trans.hu = UI/AdministrationUI/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/AdministrationUI/Indonesian.lproj/Localizable.strings
+trans.is = UI/AdministrationUI/Icelandic.lproj/Localizable.strings
+trans.it = UI/AdministrationUI/Italian.lproj/Localizable.strings
+trans.ja = UI/AdministrationUI/Japanese.lproj/Localizable.strings
+trans.lt = UI/AdministrationUI/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/AdministrationUI/Latvian.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.ro_RO = UI/AdministrationUI/Romanian.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.sr@latin = UI/AdministrationUI/SerbianLatin.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_CN = UI/AdministrationUI/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-mailerui]
-source_file       = UI/MailerUI/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/MailerUI/<lang>.lproj/Localizable.strings
+[sogo.soobjects-appointments]
+source_file = SoObjects/Appointments/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = SoObjects/Appointments/Arabic.lproj/Localizable.strings
+trans.ca = SoObjects/Appointments/Catalan.lproj/Localizable.strings
+trans.cs = SoObjects/Appointments/Czech.lproj/Localizable.strings
+trans.cy = SoObjects/Appointments/Welsh.lproj/Localizable.strings
+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.he = SoObjects/Appointments/Hebrew.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Appointments/Croatian.lproj/Localizable.strings
+trans.hu = SoObjects/Appointments/Hungarian.lproj/Localizable.strings
+trans.id_ID = SoObjects/Appointments/Indonesian.lproj/Localizable.strings
+trans.is = SoObjects/Appointments/Icelandic.lproj/Localizable.strings
+trans.it = SoObjects/Appointments/Italian.lproj/Localizable.strings
+trans.ja = SoObjects/Appointments/Japanese.lproj/Localizable.strings
+trans.lt = SoObjects/Appointments/Lithuanian.lproj/Localizable.strings
+trans.lv = SoObjects/Appointments/Latvian.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.ro_RO = SoObjects/Appointments/Romanian.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.sr@latin = SoObjects/Appointments/SerbianLatin.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_CN = SoObjects/Appointments/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-mailpartviewers]
-source_file       = UI/MailPartViewers/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/MailPartViewers/<lang>.lproj/Localizable.strings
+[sogo.soobjects-contacts]
+source_file = SoObjects/Contacts/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = SoObjects/Contacts/Arabic.lproj/Localizable.strings
+trans.ca = SoObjects/Contacts/Catalan.lproj/Localizable.strings
+trans.cs = SoObjects/Contacts/Czech.lproj/Localizable.strings
+trans.cy = SoObjects/Contacts/Welsh.lproj/Localizable.strings
+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.he = SoObjects/Contacts/Hebrew.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Contacts/Croatian.lproj/Localizable.strings
+trans.hu = SoObjects/Contacts/Hungarian.lproj/Localizable.strings
+trans.id_ID = SoObjects/Contacts/Indonesian.lproj/Localizable.strings
+trans.is = SoObjects/Contacts/Icelandic.lproj/Localizable.strings
+trans.it = SoObjects/Contacts/Italian.lproj/Localizable.strings
+trans.ja = SoObjects/Contacts/Japanese.lproj/Localizable.strings
+trans.lt = SoObjects/Contacts/Lithuanian.lproj/Localizable.strings
+trans.lv = SoObjects/Contacts/Latvian.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.ro_RO = SoObjects/Contacts/Romanian.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.sr@latin = SoObjects/Contacts/SerbianLatin.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_CN = SoObjects/Contacts/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings

-[o:alinto:p:sogo:r:ui-mainui]
-source_file       = UI/MainUI/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/MainUI/<lang>.lproj/Localizable.strings
-
-[o:alinto:p:sogo:r:ui-preferencesui]
-source_file       = UI/PreferencesUI/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/PreferencesUI/<lang>.lproj/Localizable.strings
-
-[o:alinto:p:sogo:r:ui-scheduler]
-source_file       = UI/Scheduler/English.lproj/Localizable.strings
-source_lang       = en
-file_filter       = UI/Scheduler/<lang>.lproj/Localizable.strings
+[sogo.soobjects-mailer]
+source_file = SoObjects/Mailer/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = SoObjects/Mailer/Arabic.lproj/Localizable.strings
+trans.ca = SoObjects/Mailer/Catalan.lproj/Localizable.strings
+trans.cs = SoObjects/Mailer/Czech.lproj/Localizable.strings
+trans.cy = SoObjects/Mailer/Welsh.lproj/Localizable.strings
+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.he = SoObjects/Mailer/Hebrew.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Mailer/Croatian.lproj/Localizable.strings
+trans.hu = SoObjects/Mailer/Hungarian.lproj/Localizable.strings
+trans.id_ID = SoObjects/Mailer/Indonesian.lproj/Localizable.strings
+trans.is = SoObjects/Mailer/Icelandic.lproj/Localizable.strings
+trans.it = SoObjects/Mailer/Italian.lproj/Localizable.strings
+trans.ja = SoObjects/Mailer/Japanese.lproj/Localizable.strings
+trans.lt = SoObjects/Mailer/Lithuanian.lproj/Localizable.strings
+trans.lv = SoObjects/Mailer/Latvian.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.ro_RO = SoObjects/Mailer/Romanian.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.sr@latin = SoObjects/Mailer/SerbianLatin.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_CN = SoObjects/Mailer/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings

+[sogo.ui-mailpartviewers]
+source_file = UI/MailPartViewers/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = UI/MailPartViewers/Arabic.lproj/Localizable.strings
+trans.ca = UI/MailPartViewers/Catalan.lproj/Localizable.strings
+trans.cs = UI/MailPartViewers/Czech.lproj/Localizable.strings
+trans.cy = UI/MailPartViewers/Welsh.lproj/Localizable.strings
+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.he = UI/MailPartViewers/Hebrew.lproj/Localizable.strings
+trans.hr_HR = UI/MailPartViewers/Croatian.lproj/Localizable.strings
+trans.hu = UI/MailPartViewers/Hungarian.lproj/Localizable.strings
+trans.id_ID = UI/MailPartViewers/Indonesian.lproj/Localizable.strings
+trans.is = UI/MailPartViewers/Icelandic.lproj/Localizable.strings
+trans.it = UI/MailPartViewers/Italian.lproj/Localizable.strings
+trans.ja = UI/MailPartViewers/Japanese.lproj/Localizable.strings
+trans.lt = UI/MailPartViewers/Lithuanian.lproj/Localizable.strings
+trans.lv = UI/MailPartViewers/Latvian.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.ro_RO = UI/MailPartViewers/Romanian.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.sr@latin = UI/MailPartViewers/SerbianLatin.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_CN = UI/MailPartViewers/ChineseChina.lproj/Localizable.strings
+trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings
@@ -5,7 +5,7 @@ const tracker = {

 module.exports = {
  tagPrefix: "SOGo-",
-  issueUrlFormat: "https://bugs.sogo.nu/view.php?id={{id}}",
+  issueUrlFormat: "https://sogo.nu/bugs/view.php?id={{id}}",
  compareUrlFormat: "{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}",
  types: [
    {type: "feat",     section: "Features"},
@@ -34,7 +34,7 @@ ActiveSync_RESOURCE_FILES +=		\
 ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
 ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
-ADDITIONAL_INCLUDE_DIRS += $(shell pkg-config --cflags libwbxml2)
+ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
 ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2

 -include GNUmakefile.preamble
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@interface NGMimeMessage (ActiveSync)

- (NSArray *) allBareRecipients;
+- (NSArray *) allRecipients;

@end

@@ -38,47 +38,39 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@implementation NGMimeMessage (ActiveSync)

- (NSArray *) allRecipients
+- (void) _addRecipients: (NSEnumerator *) enumerator
+                toArray: (NSMutableArray *) recipients
 {
  NGMailAddressParser *parser;
  NSEnumerator *addressList;
-  NSMutableArray *allRecipients;
  NGMailAddress *address;
-  NSEnumerator *recipients;
  NSString *s;
-  NSString *fieldNames[] = {@"to", @"cc", @"bcc"};
-  unsigned int count;

-  allRecipients = [NSMutableArray arrayWithCapacity: 16];
-
-  for (count = 0; count < 3; count++)
+  while ((s = [enumerator nextObject]))
    {
-      recipients = [[self headersForKey: fieldNames[count]] objectEnumerator];
-      while ((s = [recipients nextObject]))
-        {
-          parser = [NGMailAddressParser mailAddressParserWithString: s];
-          addressList = [[parser parseAddressList] objectEnumerator];
-          while ((address = [addressList nextObject]))
-            [allRecipients addObject: [address address]];
-       }
+      parser = [NGMailAddressParser mailAddressParserWithString: s];
+      addressList = [[parser parseAddressList] objectEnumerator];
+      
+      while ((address = [addressList nextObject]))
+        [recipients addObject: [address address]];
    }
-
-  return allRecipients;
 }

- (NSArray *) allBareRecipients
+- (NSArray *) allRecipients
 {
-  NSMutableArray *bareRecipients;
-  NSEnumerator *allRecipients;
-  NSString *recipient;
+  NSMutableArray *recipients;

-  bareRecipients = [NSMutableArray array];
+  recipients = [NSMutableArray array];

-  allRecipients = [[self allRecipients] objectEnumerator];
-  while ((recipient = [allRecipients nextObject]))
-    [bareRecipients addObject: [recipient pureEMailAddress]];
+  [self _addRecipients: [[self headersForKey: @"to"] objectEnumerator]
+               toArray: recipients];

-  return bareRecipients;
+  [self _addRecipients: [[self headersForKey: @"cc"] objectEnumerator]
+               toArray: recipients];
+
+  [self _addRecipients: [[self headersForKey: @"bcc"] objectEnumerator]
+               toArray: recipients];
+
+  return recipients;
 }
-
@end
@@ -114,7 +114,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"wbxml2xml failed: %s\n", wbxml_errors_string(ret)];
+      [self errorWithFormat: @"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
      [self _dumpToFile];
      return nil;
    }
@@ -147,7 +147,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  if (ret != WBXML_OK)
    {
-      [self logWithFormat: @"xml2wbxml failed: %s\n", wbxml_errors_string(ret)];
+      [self logWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
      [self _dumpToFile];
      return nil;
    }
@@ -162,7 +162,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"xml2wbxml failed: %s\n", wbxml_errors_string(ret)];
+      [self errorWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
      [self _dumpToFile];
      free(wbxml);
      wbxml_conv_xml2wbxml_destroy(conv);
@@ -2627,17 +2627,17 @@ FIXME
      // We first check of any of the collections we want to sync are already
      // in an other sync process. If that's the case, we do not do anything
      // and we return immediately. So we'll let the other sync process terminate
-      globalMetadata = [self globalMetadataForDevice];
      for (j = 0; j < [allCollections count]; j++)
        {
          aCollection = [allCollections objectAtIndex: j];
+          globalMetadata = [self globalMetadataForDevice];

          key = [NSString stringWithFormat: @"SyncRequest+%@", [[[(id)[aCollection getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL]];

          if (!([[globalMetadata objectForKey: key] isEqual: processIdentifier]))
            {
              if (debugOn)
-                [self logWithFormat: @"EAS - Discard response %@", globalMetadata];
+                [self logWithFormat: @"EAS - Discard response %@", [self globalMetadataForDevice]];

              [output appendString: @"<Status>13</Status>"];
              [output appendString: @"</Sync>"];
@@ -60,7 +60,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGMime/NGMimeFileData.h>
 #import <NGMime/NGMimeMultipartBody.h>
 #import <NGMime/NGMimeType.h>
-#import <NGMime/NGMimeHeaderFields.h>
 #import <NGMail/NGMimeMessageParser.h>
 #import <NGMail/NGMimeMessage.h>
 #import <NGMail/NGMimeMessageGenerator.h>
@@ -291,36 +290,6 @@ struct GlobalObjectId {
 }


-//  Format replyTo
-//
-//  If there are multiple e-mail addresses, they are separated by a semi-colon.
- (NSString *) _replyToAddressesFrom: (NSArray *) enveloppeAddresses
-{
-  NSMutableArray *addresses;
-  NSString *rc;
-  NGImap4EnvelopeAddress *address;
-  NSString *email;
-  int count, max;
-
-  rc = nil;
-  max = [enveloppeAddresses count];
-
-  if (max > 0)
-    {
-      addresses = [NSMutableArray array];
-      for (count = 0; count < max; count++)
-        {
-          address = [enveloppeAddresses objectAtIndex: count];
-          email = [NSString stringWithFormat: @"%@", [address email]];
-
-          [addresses addObject: email];
-        }
-      rc = [addresses componentsJoinedByString: @"; "];
-    }
-
-  return rc;
-}
-
 //
 //
 //
@@ -410,7 +379,7 @@ struct GlobalObjectId {

      charset = [[[self lookupInfoForBodyPart: key] objectForKey: @"parameterList"] objectForKey: @"charset"];

-      if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame)
+      if (![charset length])
        charset = @"utf-8";
      
      s = [NSString stringWithData: d  usingEncodingNamed: charset];
@@ -457,7 +426,7 @@ struct GlobalObjectId {

      body = [thePart body];

-      if ([body isKindOfClass: [NGMimeMultipartBody class]] || [body isKindOfClass: [NGMimeMessage class]])
+      if ([body isKindOfClass: [NGMimeMultipartBody class]])
        {
          [self _sanitizedMIMEPart: body
                         performed: b];
@@ -509,13 +478,6 @@ struct GlobalObjectId {
          RELEASE(fdata);
          *b = YES;
        }
-      else if ([body isKindOfClass: [NSData class]])
-        {
-          [thePart setHeader: @"base64"  forKey: @"content-transfer-encoding"];
-          [thePart setBody: [body dataByEncodingBase64]];
-          [thePart setHeader: [NSString stringWithFormat:@"%d", (int)[[thePart body] length]]
-                                         forKey: @"content-length"];
-	}
    }
 }

@@ -708,7 +670,7 @@ struct GlobalObjectId {
          
          charset = [[[self lookupInfoForBodyPart: @""] objectForKey: @"parameterList"] objectForKey: @"charset"];
          
-          if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame)
+          if (![charset length])
            charset = @"utf-8";
          
          d = [[self fetchPlainTextParts] objectForKey: @""];
@@ -1139,11 +1101,10 @@ struct GlobalObjectId {
      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:message"];
    }

-  // ReplyTo
-  value = [self _replyToAddressesFrom: [self replyToEnvelopeAddresses]];
-  if (value)
-    [s appendFormat: @"<Reply-To xmlns=\"Email:\">%@</Reply-To>", [value activeSyncRepresentationInContext: context]];
-
+  // Reply-To - FIXME
+  //NSArray *replyTo = [[message objectForKey: @"envelope"] replyTo];
+  //if ([replyTo count])
+  //  [s appendFormat: @"<Reply-To xmlns=\"Email:\">%@</Reply-To>", [addressFormatter stringForArray: replyTo]];
  
  // InternetCPID - 65001 == UTF-8, we use this all the time for now.
  //              - 20127 == US-ASCII
@@ -40,7 +40,7 @@
  <Proxy http://127.0.0.1:20000>
    RequestHeader set "x-webobjects-server-port" "8843"
    RequestHeader set "x-webobjects-server-name" "CHANGETHIS:8843"
-    RequestHeader set "x-webobjects-server-url" "https://CHANGETHIS:8843"
+    RequestHeader set "x-webobjects-server-url" "http://CHANGETHIS:8843"
    RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
    AddDefaultCharset UTF-8
  </Proxy>
@@ -25,11 +25,6 @@ Alias /SOGo/WebServerResources/ \
 # Don't send the Referer header for cross-origin requests
 Header always set Referrer-Policy "same-origin"

-<Location /SOGo>
-  # Don't cache dynamic content
-  Header set Cache-Control "max-age=0, no-cache, no-store"
-</Location>
-
 ## Uncomment the following to enable proxy-side authentication, you will then
 ## need to set the "SOGoTrustProxyAuthentication" SOGo user default to YES and
 ## adjust the "x-webobjects-remote-user" proxy header in the "Proxy" section
@@ -53,12 +48,8 @@ Header always set Referrer-Policy "same-origin"
 #</Location>

 ProxyRequests Off
-ProxyPreserveHost On
 SetEnv proxy-nokeepalive 1
-
-# Uncomment the following lines if you experience "Bad gateway" errors with mod_proxy
-#SetEnv proxy-initial-not-pooled 1
-#SetEnv force-proxy-request-1.0 1
+ProxyPreserveHost On

 # When using CAS, you should uncomment this and install cas-proxy-validate.py
 # in /usr/lib/cgi-bin to reduce server overloading
@@ -80,24 +71,24 @@ SetEnv proxy-nokeepalive 1
 # 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 nocanon
+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 make sure to enable the headers module
-  <IfModule headers_module>
-    RequestHeader set "x-webobjects-server-port" "443"
-    SetEnvIf Host (.*) HTTP_HOST=$1
-    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
+<IfModule headers_module>
+  RequestHeader set "x-webobjects-server-port" "443"
+  SetEnvIf Host (.*) HTTP_HOST=$1
+  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

 ## When using proxy-side autentication, you need to uncomment and
 ## adjust the following line:
-    RequestHeader unset "x-webobjects-remote-user"
-#    RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e" env=REMOTE_USER
+  RequestHeader unset "x-webobjects-remote-user"
+#  RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e" env=REMOTE_USER

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

  AddDefaultCharset UTF-8

@@ -8,7 +8,7 @@ HTML = $(patsubst %.asciidoc,%.html, $(ASCIIDOCS))
 	asciidoctor-pdf \
 		-a pdf-fontsdir=fonts \
 		-a release_version=`git describe --abbrev=0 --tags | cut -d'-' -f 2` \
-		-a release_month=`LANG=en_US.UTF-8 date +%B` \
+		-a release_month=`date +%B` \
 		-a pdf-theme=asciidoctor-pdf-theme.yml \
 		--trace \
 		$<
@@ -17,7 +17,7 @@ HTML = $(patsubst %.asciidoc,%.html, $(ASCIIDOCS))
 	asciidoctor \
 		-D . \
 		-a release_version=`git describe --abbrev=0 --tags | cut -d'-' -f 2` \
-		-a release_month=`LANG=en_US.UTF-8 date +%B` \
+		-a release_month=`date +%B` \
 		-n \
 		$<

@@ -22,7 +22,7 @@ devices (iPhone, iPod touch, and iPad).
 The instructions are based on version {release_version} of SOGo.

 The latest version of this guide is available at
-https://www.sogo.nu/support.html#/documentation.
+https://sogo.nu/downloads/documentation.html.

 Introduction
 ------------
@@ -46,7 +46,7 @@ device, or Outlook 2013

 SOGo is developed by a community of developers located mainly in North
 America and Europe. More information can be found on
-https://www.sogo.nu/.
+http://www.sogo.nu/.

 Installation
 ------------
@@ -167,7 +167,7 @@ For example, one would replace:

 by:

- <Seq about="https://sogo.nu" isi:updateURL="https://sogo.acme.com/plugins/updates.php?plugin=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;platform=%PLATFORM%">
+ <Seq about="http://inverse.ca/sogo-integrator/extensions" isi:updateURL="https://sogo.acme.com/plugins/updates.php?plugin=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;platform=%PLATFORM%">

 if the SOGo server is accessible from the following URL:

@@ -22,7 +22,7 @@ Guide_ for more information on installing and configuring SOGo.
 The instructions are based on version {release_version} of SOGo.

 The latest version of this guide is available
-at https://www.sogo.nu/support.html#/documentation.
+at https://sogo.nu/downloads/documentation.html.

 Introduction
 ------------
@@ -50,7 +50,7 @@ https://www.facebook.com/caldavsynchronizer/[CalDav Synchronizer on Facebook]
 Enterprise Support
 ~~~~~~~~~~~~~~~~~~

-Alinto (https://alinto.com/[http://alinto.com]) offers professional services around SOGo to help organizations deploy the solution and
+Inverse (http://inverse.ca/[http://inverse.ca]) offers professional services around SOGo to help organizations deploy the solution and
 migrate from their legacy systems.

 For enterprise support on the integration between SOGo and Microsoft Outlook using the Outlook CalDav Synchronizer, please visit https://caldavsynchronizer.org/enterprise
@@ -1,323 +0,0 @@
-#
-# https://github.com/asciidoctor/asciidoctor-pdf/blob/master/docs/theming-guide.adoc
-#
-
-font:
-  catalog:
-    # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
-    #Noto Serif:
-    #  normal: notoserif-regular-subset.ttf
-    #  bold: notoserif-bold-subset.ttf
-    #  italic: notoserif-italic-subset.ttf
-    #  bold_italic: notoserif-bold_italic-subset.ttf
-    Lato-Light:
-      normal: lato/Lato-Light.ttf
-      bold: lato/Lato-Regular.ttf
-      italic: lato/Lato-LightItalic.ttf
-      bold_italic: lato/Lato-Italic.ttf
-    # M+ 1mn supports ASCII and the circled numbers used for conums
-    #M+ 1mn:
-    #  normal: mplus1mn-regular-subset.ttf
-    #  bold: mplus1mn-bold-subset.ttf
-    #  italic: mplus1mn-italic-subset.ttf
-    #  bold_italic: mplus1mn-bold_italic-subset.ttf
-    Inconsolata:
-      normal: inconsolata.ttf
-      bold: inconsolata.ttf
-      italic: inconsolata.ttf
-      bold_italic: inconsolata.ttf
-page:
-  background_color: FFFFFF
-  layout: portrait
-  initial_zoom: FitH
-  margin: [1in, 1in, 1in, 1in]
-  # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress
-  margin_inner: 1in
-  margin_outer: 1in
-  size: Letter
-base:
-  align: justify
-  # color as hex string (leading # is optional)
-  font_color: 333333
-  font_color: 000000
-  # color as RGB array
-  #font_color: [51, 51, 51]
-  # color as CMYK array (approximated)
-  #font_color: [0, 0, 0, 0.92]
-  #font_color: [0, 0, 0, 92%]
-  font_family: Lato-Light
-  # choose one of these font_size/line_height_length combinations
-  #font_size: 14
-  #line_height_length: 20
-  #font_size: 11.25
-  #line_height_length: 18
-  #font_size: 11.2
-  #line_height_length: 16
-  font_size: 10
-  #line_height_length: 15
-  # correct line height for Noto Serif metrics
-  line_height_length: 10
-  #font_size: 11.25
-  #line_height_length: 18
-  line_height: $base_line_height_length / $base_font_size
-  font_size_large: round($base_font_size * 1.25)
-  font_size_small: round($base_font_size * 0.85)
-  font_size_min: $base_font_size * 0.75
-  font_style: normal
-  border_color: EEEEEE
-  border_radius: 4
-  border_width: 0.5
-section:
-  indent: [0.67in, 0]
-role:
-  line-through:
-    text_decoration: line-through
-  underline:
-    text_decoration: underline
-  big:
-    font_size: $base_font_size_large
-  small:
-    font_size: $base_font_size_small
-  subtitle:
-    font_size: 0.8em
-    font_color: 999999
-# FIXME vertical_rhythm is weird; we should think in terms of ems
-#vertical_rhythm: $base_line_height_length * 2 / 3
-# correct line height for Noto Serif metrics (comes with built-in line height)
-vertical_rhythm: $base_line_height_length
-horizontal_rhythm: $base_line_height_length
-# QUESTION should vertical_spacing be block_spacing instead?
-vertical_spacing: $vertical_rhythm
-link:
-  font_color: 428BCA
-  font_color: 007BFF
-# literal is currently used for inline monospaced in prose and table cells
-literal:
-  font_color: 333333
-  font_color: B12146
-  font_color: E83E8C
-  font_family: Inconsolata
-button:
-  content: "[\u2009%s\u2009]"
-  font_style: bold
-key:
-  background_color: F5F5F5
-  background_color: F8F8F8
-  border_color: CCCCCC
-  border_offset: 2
-  border_radius: 2
-  border_width: 0.5
-  font_family: $literal_font_family
-  separator: "\u202f+\u202f"
-mark:
-  background_color: FFFF00
-  border_offset: 1
-menu:
-  caret_content: " <font size=\"1.15em\"><color rgb=\"b12146\">\u203a</color></font> "
-heading:
-  align: left
-  font_color: $base_font_color
-  font_style: bold
-  # h1 is used for part titles (book doctype) or the doctitle (article doctype)
-  h1_font_size: floor($base_font_size * 2.6)
-  # h2 is used for chapter titles (book doctype only)
-  h2_font_size: floor($base_font_size * 2.15)
-  h3_font_size: round($base_font_size * 1.7)
-  h4_font_size: $base_font_size_large
-  h5_font_size: $base_font_size
-  h6_font_size: $base_font_size_small
-  #line_height: 1.4
-  # correct line height for Noto Serif metrics (comes with built-in line height)
-  line_height: 1
-  margin_top: $vertical_rhythm * 0.4
-  margin_bottom: $vertical_rhythm * 0.9
-  min_height_after: $base_line_height_length * 1.5
-  h2-margin_bottom: 60
-  #h2-text_decoration: underline
-title_page:
-  align: right
-  logo:
-    top: 10%
-  title:
-    top: 55%
-    font_size: $heading_h1_font_size
-    font_color: 999999
-    font_color: $base_font_color
-    line_height: 0.9
-  subtitle:
-    font_size: $heading_h3_font_size
-    font_style: bold_italic
-    line_height: 1
-  authors:
-    margin_top: $base_font_size * 1.25
-    font_size: $base_font_size_large
-    font_color: 181818
-  revision:
-    margin_top: $base_font_size * 1.25
-block:
-  margin_top: 0
-  margin_bottom: $vertical_rhythm
-caption:
-  align: left
-  font_size: $base_font_size * 0.95
-  font_style: italic
-  # FIXME perhaps set line_height instead of / in addition to margins?
-  margin_inside: $vertical_rhythm / 3
-  #margin_inside: $vertical_rhythm / 4
-  margin_outside: 0
-lead:
-  font_size: $base_font_size_large
-  line_height: 1.4
-abstract:
-  font_color: 5C6266
-  font_size: $lead_font_size
-  line_height: $lead_line_height
-  font_style: italic
-  first_line_font_style: bold
-  title:
-    align: center
-    font_color: $heading_font_color
-    font_size: $heading_h4_font_size
-    font_style: $heading_font_style
-admonition:
-  column_rule_color: $base_border_color
-  column_rule_width: $base_border_width
-  padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm]
-  # icon:
-  #   caution:
-  #     name: far-lightbulb
-  #     name: fa-fire
-  #     stroke_color: 111111
-  #     size: 24
-  label:
-    text_transform: uppercase
-    font_style: bold
-    # caution:
-    #   font_color: F77D05
-blockquote:
-  font_size: $base_font_size_large
-  border_color: $base_border_color
-  border_width: 0
-  border_left_width: 5
-  # FIXME disable negative padding bottom once margin collapsing is implemented
-  padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_left_width / 2]
-  cite_font_size: $base_font_size_small
-  cite_font_color: 999999
-verse:
-  font_size: $blockquote_font_size
-  border_color: $blockquote_border_color
-  border_width: $blockquote_border_width
-  border_left_width: $blockquote_border_left_width
-  padding: $blockquote_padding
-  cite_font_size: $blockquote_cite_font_size
-  cite_font_color: $blockquote_cite_font_color
-# code is used for source blocks (perhaps change to source or listing?)
-code:
-  font_color: $base_font_color
-  #font_color: FFFFFF
-  font_family: $literal_font_family
-  font_size: ceil($base_font_size)
-  padding: $code_font_size
-  line_height: 1.25
-  # line_gap is an experimental property to control how a background color is applied to an inline block element
-  line_gap: 3.8
-  background_color: F5F5F5
-  background_color: F8F8F8
-  #background_color: 6C757D
-  border_color: CCCCCC
-  border_radius: $base_border_radius
-  border_radius: 0
-  border_width: 0.75
-  border_width: 0
-conum:
-  font_family: $literal_font_family
-  font_color: $literal_font_color
-  font_size: $base_font_size
-  line_height: 4 / 3
-  glyphs: circled
-example:
-  border_color: $base_border_color
-  border_radius: $base_border_radius
-  border_width: 0.75
-  background_color: $page-background-color
-  # FIXME reenable padding bottom once margin collapsing is implemented
-  padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
-image:
-  align: left
-prose:
-  margin_top: $block_margin_top
-  margin_bottom: $block_margin_bottom
-sidebar:
-  background_color: EEEEEE
-  border_color: E1E1E1
-  border_radius: $base_border_radius
-  border_width: $base_border_width
-  # FIXME reenable padding bottom once margin collapsing is implemented
-  padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25]
-  title:
-    align: center
-    font_color: $heading_font_color
-    font_size: $heading_h4_font_size
-    font_style: $heading_font_style
-thematic_break:
-  border_color: $base_border_color
-  border_style: solid
-  border_width: $base_border_width
-  margin_top: $vertical_rhythm * 0.5
-  margin_bottom: $vertical_rhythm * 1.5
-description_list:
-  term_font_style: bold
-  term_spacing: $vertical_rhythm / 4
-  description_indent: $horizontal_rhythm * 1.25
-outline_list:
-  indent: $horizontal_rhythm * 1.5
-  #marker_font_color: 404040
-  # NOTE outline_list_item_spacing applies to list items that do not have complex content
-  item_spacing: $vertical_rhythm / 2
-table:
-  background_color: $page_background_color
-  border_color: DDDDDD
-  border_width: $base_border_width
-  cell_padding: 3
-  head:
-    font_style: bold
-    border_bottom_width: $base_border_width * 2.5
-  body:
-    stripe_background_color: F9F9F9
-  foot:
-    background_color: F0F0F0
-toc:
-  indent: $horizontal_rhythm
-  line_height: $base_line_height
-  dot_leader:
-    #content: ". "
-    font_color: A9A9A9
-    #levels: 2 3
-footnotes:
-  font_size: round($base_font_size * 0.75)
-  item_spacing: $outline_list_item_spacing / 2
-header:
-  # Can't show chapter number. See https://github.com/asciidoctor/asciidoctor-pdf/issues/1373
-  font_size: $base_font_size_small
-  line_height: 1
-  vertical_align: middle
-footer:
-  font_size: $base_font_size_small
-  # NOTE if background_color is set, background and border will span width of page
-  #border_color: DDDDDD
-  border_width: 0.25
-  #height: $base_line_height_length * 2.5
-  height: $base_line_height_length * 5
-  line_height: 1
-  padding: [$base_line_height_length / 2, 1, 0, 1]
-  vertical_align: top
-  recto: &shared_footer
-    #columns: "<50% =0% >50%"
-    left:
-      content: 'Copyright © Inverse inc.'
-    center:
-      content: '{chapter-title}'
-    right:
-      content: '{page-number}'
-  verso: *shared_footer
-    #columns: $footer_recto_columns
@@ -5,9 +5,8 @@
    This file is part of the SOGo project.
    Authors: 
      - Inverse inc. <info@inverse.ca>
-      - Alinto <contact@sogo.nu>

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

 ////
@@ -23,6 +22,6 @@ https://sogo.nu/support/faq.html
 You can also read the mailing archives or post your questions to it. For
 details, see :

-https://mailing.sogo.nu/sympa/info/users
+https://lists.inverse.ca/sogo

 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
@@ -5,9 +5,8 @@
    This file is part of the SOGo project.
    Authors:
      - Inverse inc. <info@inverse.ca>
-      - Alinto <contact@sogo.nu>

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

 ////
@@ -16,14 +15,14 @@ Commercial Support and Contact Information
 ------------------------------------------

 For any questions or comments, do not hesitate to contact us by writing
-an email to contact@sogo.nu.
+an email to support@inverse.ca.

-Alinto (https://alinto.com) offers professional services around SOGo
+Inverse (https://inverse.ca/) offers professional services around SOGo
 to help organizations deploy the solution, customize, migrate versions or
 from another system, performance tuning or aligning with best practices.

 Hourly rates or support packages are offered to best suit your needs.

-Please visit https://alinto.com/ for details.
+Please visit https://inverse.ca/ for details.

 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
@@ -1,6 +1,6 @@
 Version {release_version} - {release_month} {docyear}

-Copyright © {docyear} Inverse inc. / Alinto
+Copyright © {docyear} Inverse inc.

 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".

@@ -10,5 +10,4 @@ Copyright © Łukasz Dziedzic, http://www.latofonts.com, with Reserved Font Name

 Copyright © Raph Levien, http://levien.com/, with Reserved Font Name: "Inconsolata".

-image::images/inverse-logo.jpeg[width="25%",pdfwidth="50%",align="right"]
-image::images/alinto.small.png[width="25%",pdfwidth="50%",align="right"]
+image::images/inverse-logo.jpg[width="25%",pdfwidth="50%",align="right"]
@@ -5,9 +5,8 @@
    This file is part of the SOGo project.
    Authors:
      - Inverse inc. <info@inverse.ca>
-      - Alinto <contact@sogo.nu>

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

 ////
@@ -5,9 +5,8 @@
    This file is part of the SOGo project.
    Authors:
      - Inverse inc. <info@inverse.ca>
-      - Alinto <contact@sogo.nu>

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

 ////
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005-2022 Inverse inc.
+  Copyright (C) 2005-2016 Inverse inc.

  This file is part of SOGo

@@ -199,7 +199,7 @@ static BOOL debugLeaks;
  /* FIXME: make use of [EOChannelAdaptor describeTableNames] instead */
  tableName = [url lastPathComponent];
  if ([tc evaluateExpressionX:
-	    [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2",
+	    [NSString stringWithFormat: @"SELECT count(*) FROM %@",
 		      tableName]])
    {
      // We re-acquire the channel in case it was abruptly closed between statements
@@ -232,7 +232,7 @@ static BOOL debugLeaks;

  tableName = [NSString stringWithFormat: @"sogo_quick_%@", typeName];
  driver = [url substringToIndex: [url rangeOfString: @":"].location];
-  sql = [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2",
+  sql = [NSString stringWithFormat: @"SELECT count(*) FROM %@",
                  tableName];
  if ([channel evaluateExpressionX: sql])
    {
@@ -314,9 +314,6 @@ static BOOL debugLeaks;
    {
      fm = [GCSFolderManager defaultFolderManager];

-      // Create the sessions table
-      [[fm adminFolder] createFolderIfNotExists];
-
      // Create the sessions table
      [[fm sessionsFolder] createFolderIfNotExists];
      
@@ -352,10 +349,8 @@ static BOOL debugLeaks;
    {
      if ([[context request] handledByDefaultHandler])
        authenticator = [SOGoWebAuthenticator sharedSOGoWebAuthenticator];
-      else {
+      else
        authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
-      }
-        
    }

  return authenticator;
@@ -368,16 +363,10 @@ static BOOL debugLeaks;
 {
  SOGoUser *user;
  id userFolder;
-  NSData *decodedLogin;
-  NSString *login;
-  WORequest *request;

-  request = [_ctx request];
-  login = [SOGoUser getDecryptedUsernameIfNeeded: _key request: request];
-
-  user = [SOGoUser userWithLogin: login roles: nil];
+  user = [SOGoUser userWithLogin: _key roles: nil];
  if (user)
-    userFolder = [$(@"SOGoUserFolder") objectWithName: login
+    userFolder = [$(@"SOGoUserFolder") objectWithName: _key
                                          inContainer: self];
  else
    userFolder = nil;
@@ -483,7 +472,7 @@ static BOOL debugLeaks;

 - (void) checkIfDaemonHasToBeShutdown
 {
-  unsigned long long vmem;
+  unsigned int vmem;

  if (vMemSizeLimit > 0)
    {
@@ -48,16 +48,7 @@ main (int argc, char **argv, char **env)
      rc = 0;
      sd = [SOGoSystemDefaults sharedSystemDefaults];
      [NSTimeZone setDefaultTimeZone: [sd timeZone]];
-      //Check if sogo secret is set and correct
-      if([sd isSogoSecretSet] && ![sd sogoSecretValue])
-      {
-        rc =-1;
-        NSLog (@"Sogo secret is not correctly set");
-      }
-      else
-      {
-        WOWatchDogApplicationMain (@"SOGo", argc, (void *) argv);
-      }
+      WOWatchDogApplicationMain (@"SOGo", argc, (void *) argv);
    }
  else
    {
@@ -12,18 +12,18 @@ There are multiple ways you can contribute to the project

 ## Source Code

-You can browse the lastest version of the source code online from Alinto's github repository:
+You can browse the lastest version of the source code online from Inverse's github repository:

-* [https://github.com/Alinto/sogo](https://github.com/Alinto/sogo)
+* [https://github.com/inverse-inc/sogo](https://github.com/inverse-inc/sogo)

-To compile SOGo, you first need to obtain the source code of both SOGo and SOPE. The source code of SOPE and SOGo can be obtained from Alinto's github repositories:
+To compile SOGo, you first need to obtain the source code of both SOGo and SOPE. The source code of SOPE and SOGo can be obtained from Inverse's github repositories:

-* [https://github.com/Alinto/sope/archive/master.zip](https://github.com/Alinto/sope/archive/master.zip)
-* [https://github.com/Alinto/sogo/archive/master.zip](https://github.com/Alinto/sogo/archive/master.zip)
+* [https://github.com/inverse-inc/sope/archive/master.zip](https://github.com/inverse-inc/sope/archive/master.zip)
+* [https://github.com/inverse-inc/sogo/archive/master.zip](https://github.com/inverse-inc/sogo/archive/master.zip)

-The source code of the SOGo Connector extension for Thunderbird 78+ can be obtained from Alinto's github repository:
+The source code of the SOGo Connector extension for Thunderbird 78+ can be obtained from Inverse's github repository:

-* [https://github.com/Alinto/sogo-connector](https://github.com/Alinto/sogo-connector)
+* [https://github.com/inverse-inc/sogo-connector](https://github.com/inverse-inc/sogo-connector)

 Please refer to the [FAQ](https://sogo.nu/support.html#/faq) for [compilation instructions](https://sogo.nu/support/faq/how-do-i-compile-sogo.html).

@@ -31,12 +31,10 @@ Please refer to the [FAQ](https://sogo.nu/support.html#/faq) for [compilation in

 SOGo and its associated components are available in various languages. The following list describes the official translations alongside their maintainers:

-* [en] English - [Alinto](https://www.alinto.com)
+* [en] English - [Inverse inc.](https://inverse.ca/)
 * [ar] Arabic - Anass Ahmed
 * [eu] Basque - Gorka Gonzalez
-* [bs_BA] Bosnian - Refik Bećirović
 * [pr_BR] Brazilian Portuguese - Alexandre Marcilio
-* [bg] Bulgarian - Todor Todorov
 * [ca] Catalan - Hector M. Rulot Segovia
 * [zh_CN] Chinese (China) - Thomas Kuiper
 * [zh_TW] Chinese (Taiwan)
@@ -45,8 +43,7 @@ SOGo and its associated components are available in various languages. The follo
 * [da_DK] Danish (Denmark) - Altibox
 * [nl] Dutch - Roel van Os
 * [fi] Finnish - Kari Salmu
-* [fr] French - [Alinto](https://www.alinto.com)
-* [gl] Galician - Simon Lang
+* [fr] French - [Inverse](https://inverse.ca/)
 * [de] German - Alexander Greiner-Baer
 * [he] Hebrew - Raz Aidlitz
 * [hu] Hungarian - Sándor Kuti
@@ -54,12 +51,10 @@ SOGo and its associated components are available in various languages. The follo
 * [is] Icelandic - Anna Jonna Armannsdottir
 * [it] Italian - Alessio Fattorini
 * [jp] Japanese - Ryo Yamamoto
-* [kk] Kazakh - Nazym Idrissova
 * [lv] Latvian - Juris Balandis
 * [lt] Lithuanian - Mantas Liobė
 * [mk_MK] Macedonian - Miroslav Jovanovic
-* [sr_ME] Montenegrin - Ivan Pleskonjić
-* [nb_NO] Norwegian (Bokmål) - Jan Ivar Karlsen / Altibox
+* [nb_NO] Norwegian (Bokmål) - Jan Ivar Karlsen
 * [nn_NO] Norwegian (Nynorsk) - Altibox
 * [pl] Polish - Paweł Bogusławski
 * [pt] Portuguese - Eduardo Crispim
@@ -72,8 +67,8 @@ SOGo and its associated components are available in various languages. The follo
 * [es_AR] Spanish (Argentina) - Federico Alberto Sayd
 * [es_ES] Spanish (Spain) - Dominique Couot
 * [sv] Swedish - Peter Johansson
-* [tr_TR] Turkish (Turkey) - Muhammed Yalçınkaya, Sinan Kurşunoğlu
+* [tr_TR] Turkish (Turkey) - Sinan Kurşunoğlu
 * [uk] Ukrainian - Oleksa Stasevych
 * [cy] Welsh - Iona Bailey
 
-If you would like to translate the software in an other language, please consult the [FAQ](https://sogo.nu/support/faq/how-to-translate-sogo-in-another-language.html).
+If you would like to translate the software in an other language, please consult the [FAQ](https://sogo.nu/support/faq/how-to-translate-sogo-in-another-language.html). You can also subscribe to the SOGo i18n mailing list to follow string additions or changes. To subscribe to i18n@sogo.nu, send an email to i18n-request@sogo.nu with SUBSCRIBE i18n as the subject. Archived posts are [available online](https://lists.inverse.ca/sogo/arc/i18n).
@@ -39,7 +39,7 @@
    didOpen = YES;
  }

-  sql = [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2",
+  sql = [NSString stringWithFormat: @"SELECT COUNT(*) FROM %@ WHERE 1 = 2",
                  tableName];
  ex = [self evaluateExpressionX: sql];
  [self cancelFetch];
@@ -25,13 +25,10 @@
 #include <EOControl/EOQualifier.h>

@class NSMutableString;
-@class EOAdaptor;

@interface EOQualifier(GCS)

- (void) appendSQLToString: (NSMutableString *) _ms;
- (void) appendSQLToString: (NSMutableString *) _ms
-               withAdaptor: (EOAdaptor *) _adaptor;
+- (void) _gcsAppendToString: (NSMutableString *) _ms;

@end

@@ -24,10 +24,6 @@
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>

-#import <GDLAccess/EOAdaptor.h>
-#import <GDLAccess/EOAttribute.h>
-#import <GDLAccess/EOSQLExpression.h>
-
 #import "EOQualifier+GCS.h"

 #if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
@@ -37,9 +33,9 @@
@implementation EOQualifier(GCS)

 - (void) _appendAndQualifier: (EOAndQualifier *) _q
-                 withAdaptor: (EOAdaptor *) _adaptor
                    toString: (NSMutableString *) _ms
 {
+  // TODO: move to EOQualifier category
  NSArray *qs;
  unsigned i, count;
  
@@ -50,15 +46,14 @@
  for (i = 0; i < count; i++) {
    if (i != 0) [_ms appendString:@" AND "];
    if (count > 1) [_ms appendString:@"("];
-    [[qs objectAtIndex:i] appendSQLToString: _ms
-                                withAdaptor: _adaptor];
+    [[qs objectAtIndex:i] _gcsAppendToString: _ms];
    if (count > 1) [_ms appendString:@")"];
  }
 }
- (void) _appendOrQualifier: (EOAndQualifier *) _q
-                withAdaptor: (EOAdaptor *) _adaptor
-                   toString: (NSMutableString *) _ms
+- (void)_appendOrQualifier: (EOAndQualifier *) _q
+                  toString: (NSMutableString *) _ms
 {
+  // TODO: move to EOQualifier category
  NSArray *qs;
  unsigned i, count;
  
@@ -69,28 +64,23 @@
  for (i = 0; i < count; i++) {
    if (i != 0) [_ms appendString:@" OR "];
    if (count > 1) [_ms appendString:@"("];
-    [[qs objectAtIndex:i] appendSQLToString: _ms
-                                withAdaptor: _adaptor];
+    [[qs objectAtIndex:i] _gcsAppendToString: _ms];
    if (count > 1) [_ms appendString:@")"];
  }
 }

- (void) _appendNotQualifier: (EONotQualifier *) _q
-                 withAdaptor: (EOAdaptor *) _adaptor
-                    toString:(NSMutableString *) _ms
+- (void)_appendNotQualifier: (EONotQualifier *)_q
+                   toString:(NSMutableString *) _ms
 {
  [_ms appendString:@" NOT ("];
-  [[_q qualifier] appendSQLToString: _ms
-                        withAdaptor: _adaptor];
+  [[_q qualifier] _gcsAppendToString: _ms];
  [_ms appendString:@")"];
 }

 - (void) _appendKeyValueQualifier: (EOKeyValueQualifier *) _q
-                      withAdaptor: (EOAdaptor *) _adaptor
                         toString: (NSMutableString *) _ms
 {
  id val;
-  EOAttribute *attribute;
  NSString *qKey, *qOperator, *qValue, *qFormat;
  BOOL isCI;

@@ -129,33 +119,9 @@
      qValue = [val stringValue];
    else if ([val isKindOfClass: [NSString class]]) {
      if ([(EOKeyValueQualifier *)self formatted])
-        {
-          qValue = val;
-        }
+        qValue = val;
      else
-        {
-          if (_adaptor)
-            {
-              // The value is a string, assume qualifier applies to a varchar column type
-              attribute = [EOAttribute new];
-              [attribute setExternalType: @"varchar"];
-              [attribute autorelease];
-
-              if (sel_isEqual([_q selector], EOQualifierOperatorLike) ||
-                  sel_isEqual([_q selector], EOQualifierOperatorCaseInsensitiveLike))
-                {
-                  qValue = [[_adaptor expressionClass] sqlPatternFromShellPattern: val];
-                  qValue = [_adaptor formatValue: qValue
-                                    forAttribute: attribute];
-                }
-              else
-                qValue = [_adaptor formatValue: val
-                                  forAttribute: attribute];
-            }
-          else
-            // No adaptor provided, don't parse value
-            qValue = [NSString stringWithFormat: @"'%@'", val];
-        }
+        qValue = [NSString stringWithFormat: @"'%@'", val];
    }
    else {
      qValue = @"NULL";
@@ -189,43 +155,29 @@
 }

 - (void) _appendQualifier: (EOQualifier *) _q
-              withAdaptor: (EOAdaptor *) _adaptor
                 toString: (NSMutableString *) _ms
 {
  if (_q == nil) return;
  
  if ([_q isKindOfClass: [EOAndQualifier class]])
    [self _appendAndQualifier: (id)_q
-                  withAdaptor: _adaptor
                     toString: _ms];
  else if ([_q isKindOfClass: [EOOrQualifier class]])
    [self _appendOrQualifier: (id)_q
-                 withAdaptor: _adaptor
-                    toString: _ms];
+                    toString:_ms];
  else if ([_q isKindOfClass: [EOKeyValueQualifier class]])
    [self _appendKeyValueQualifier: (id)_q
-                       withAdaptor: _adaptor
-                          toString: _ms];
+                          toString:_ms];
  else if ([_q isKindOfClass: [EONotQualifier class]])
    [self _appendNotQualifier: (id)_q
-                  withAdaptor: (EOAdaptor *) _adaptor
-                     toString: _ms];
+                     toString:_ms];
  else
    [self errorWithFormat:@"unknown qualifier: %@", _q];
 }

- (void) appendSQLToString: (NSMutableString *) _ms
+- (void) _gcsAppendToString: (NSMutableString *) _ms
 {
  [self _appendQualifier: self
-             withAdaptor: nil
-                toString: _ms];
-}
-
- (void) appendSQLToString: (NSMutableString *) _ms
-               withAdaptor: (EOAdaptor *) _adaptor
-{
-  [self _appendQualifier: self
-             withAdaptor: _adaptor
                toString: _ms];
 }

@@ -1,53 +0,0 @@
-/* GCSAdminFolder.h - this file is part of $PROJECT_NAME_HERE$
- *
- * Copyright (C) 2023 Alinto
- *
- * 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 GCSALARMSFOLDER_H
-#define GCSALARMSFOLDER_H
-
-
-@class NSCalendarDate;
-@class NSException;
-@class NSNumber;
-@class NSString;
-
-@class GCSFolderManager;
-
-@interface GCSAdminFolder : NSObject
-{
-  GCSFolderManager *folderManager;
-}
-
-+ (id)adminFolderWithFolderManager:(GCSFolderManager *)newFolderManager;
-
- (void) setFolderManager: (GCSFolderManager *) newFolderManager;
-
-/* operations */
-
- (NSString *)getMotd;
-
- (void) createFolderIfNotExists;
- (BOOL) canConnectStore;
-
- (NSException *)writeMotd:(NSString *)motd;
- (NSException *)deleteMotd;
-
-@end
-
-#endif /* GCSALARMSFOLDER_H */
@@ -1,347 +0,0 @@
-/* GCSAdminFolder.m - this file is part of SOGo
- *
- * Copyright (C) 2023 Alinto
- *
- * 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 <NGExtensions/NSObject+Logs.h>
-#import <NGExtensions/NSNull+misc.h>
-
-#import <GDLAccess/EOAdaptorContext.h>
-#import <GDLAccess/EOAttribute.h>
-#import <GDLAccess/EOEntity.h>
-#import <GDLAccess/EOSQLQualifier.h>
-
-#import "EOQualifier+GCS.h"
-#import "GCSChannelManager.h"
-#import "GCSFolderManager.h"
-#import "GCSSpecialQueries.h"
-#import "NSURL+GCS.h"
-
-#import "GCSAdminFolder.h"
-
-static NSString *adminFolderURLString = nil;
-
-#warning GCSAdminFolder should share a common ancestor with GCSFolder
-
-@implementation GCSAdminFolder
-
-+ (void) initialize
-{
-  NSUserDefaults *ud;
-
-  if (!adminFolderURLString)
-    {
-      ud = [NSUserDefaults standardUserDefaults];
-      ASSIGN (adminFolderURLString,
-              [ud stringForKey: @"OCSAdminURL"]);
-    }
-}
-
-+ (id) adminFolderWithFolderManager: (GCSFolderManager *) newFolderManager
-{
-  GCSAlarmsFolder *newFolder;
-
-  if (adminFolderURLString)
-    {
-      newFolder = [self new];
-      [newFolder autorelease];
-      [newFolder setFolderManager: newFolderManager];
-    }
-  else
-    {
-      [self errorWithFormat: @"'OCSAdminURL' is not set"];
-      newFolder = nil;
-    }
-
-  return newFolder;
-}
-
- (void) setFolderManager: (GCSFolderManager *) newFolderManager
-{
-  ASSIGN (folderManager, newFolderManager);
-}
-
-/* accessors */
-
- (NSURL *) _location
-{
-  NSURL *location;
-
-  if (adminFolderURLString)
-    location = [NSURL URLWithString: adminFolderURLString];
-  else
-    {
-      [self warnWithFormat: @"'OCSAdminURL' is not set"];
-      location = nil;
-    }
-
-  return location;
-}
-
- (GCSChannelManager *) _channelManager
-{
-  return [folderManager channelManager];
-}
-
- (NSString *) _storeTableName
-{
-  return [[self _location] gcsTableName];
-}
-
- (EOEntity *) _storeTableEntityForChannel: (EOAdaptorChannel *) tc
-{
-  static EOEntity *entity = nil;
-  EOAttribute *attribute;
-  NSString *tableName;
-  NSString *columns[] = { @"c_key", @"c_content", nil };
-  NSString **column;
-  NSMutableArray *keys;
-  NSDictionary *types;
-  
-  if (!entity)
-    {
-      entity = [EOEntity new];
-      tableName = [self _storeTableName];
-      [entity setName: tableName];
-      [entity setExternalName: tableName];
-
-      types = [[tc specialQueries] adminAttributeTypes];
-
-      column = columns;
-      while (*column)
-        {
-          attribute = [EOAttribute new];
-          [attribute setName: *column];
-          [attribute setColumnName: *column];
-          [attribute setExternalType: [types objectForKey: *column]];
-          [entity addAttribute: attribute];
-          [attribute release];
-          column++;
-        }
-
-      keys = [NSMutableArray arrayWithCapacity: 1];
-      [keys addObject: [entity attributeNamed: @"c_key"]];
-      [entity setPrimaryKeyAttributes: keys];
-
-      keys = [NSMutableArray arrayWithCapacity: 1];
-      [keys addObject: [entity attributeNamed: @"c_content"]];
-      [entity setClassProperties: keys];
-
-      [entity setAttributesUsedForLocking: [NSArray array]];
-    }
-
-  return entity;
-}
-
-/* connection */
-
- (EOAdaptorChannel *) _acquireStoreChannel
-{
-  return [[self _channelManager] acquireOpenChannelForURL: [self _location]];
-}
-
- (void) _releaseChannel: (EOAdaptorChannel *) _channel
-{
-  [[self _channelManager] releaseChannel:_channel  immediately: YES];
-}
-
- (BOOL) canConnectStore
-{
-  return [[self _channelManager] canConnect:[self _location]];
-}
-
- (void) createFolderIfNotExists
-{
-  EOAdaptorChannel *tc;
-  NSString *sql, *tableName;
-  GCSSpecialQueries *queries;
-
-  tc = [self _acquireStoreChannel];
-  tableName = [self _storeTableName];
-
-  queries = [tc specialQueries];
-
-  sql = [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2",
-                  [self _storeTableName]];
-  if ([tc evaluateExpressionX: sql])
-    {
-      sql = [queries createAdminFolderWithName: tableName];
-      if (![tc evaluateExpressionX: sql])
-	[self logWithFormat:
-                @"admin folder table '%@' successfully created!",
-              tableName];
-    }
-  else
-    [tc cancelFetch];
-
-  [self _releaseChannel: tc];
-}
-
-/* operations */
-
-/* table has the following fields:
-     c_key VARCHAR(255) NOT NULL
-     c_content MEDIUMTEXT NOT NULL
-*/
-
- (NSDictionary *) recordForEntryWithKey: (NSString *) key
-{
-  EOAdaptorChannel *tc;
-  EOAdaptorContext *context;
-  NSException *error;
-  NSArray *attrs;
-  NSDictionary *record;
-  EOEntity *entity;
-  EOSQLQualifier *qualifier;
-
-  record = nil;
-
-  tc = [self _acquireStoreChannel];
-  if (tc)
-    {
-      context = [tc adaptorContext];
-      entity = [self _storeTableEntityForChannel: tc];
-      qualifier = [[EOSQLQualifier alloc] initWithEntity: entity
-                                         qualifierFormat:
-                                            @"c_key='%@'",
-                                          key];
-      [qualifier autorelease];
-
-      [context beginTransaction];
-      error = [tc selectAttributesX: [entity attributesUsedForFetch]
-               describedByQualifier: qualifier
-                         fetchOrder: nil
-                               lock: NO];
-      if (error)
-        [self errorWithFormat:@"%s: cannot execute fetch: %@", 
-              __PRETTY_FUNCTION__, error];
-      else
-        {
-	  attrs = [tc describeResults: NO];
-          record = [tc fetchAttributes: attrs withZone: NULL];
-          [tc cancelFetch];
-        }
-      [context rollbackTransaction];
-      [self _releaseChannel: tc];
-    }
-
-  return record;
-}
-
- (NSString *) getMotd {
-  NSDictionary *r;
-
-  r = [self recordForEntryWithKey: @"motd"];
-  if (r && [r objectForKey:@"c_content"]) {
-    return [r objectForKey:@"c_content"];
-  }
-
-  return nil;
-}
-
- (NSDictionary *) _newRecordWithKey: (NSString *) key
-                      content: (NSString *) content
-{
-  return [NSDictionary dictionaryWithObjectsAndKeys: key, @"c_key",
-                       content, @"c_content",
-                       nil];
-}
-
- (NSException *) writeMotd: (NSString *)motd
-{
-  NSDictionary *record, *newRecord;
-  NSException *error;
-  EOAdaptorChannel *tc;
-  EOAdaptorContext *context;
-  EOEntity *entity;
-  EOSQLQualifier *qualifier;
-
-  error = nil;
-  tc = [self _acquireStoreChannel];
-  if (tc)
-    {
-      context = [tc adaptorContext];
-      newRecord = [self _newRecordWithKey: @"motd" content: motd];
-      record = [self recordForEntryWithKey: @"motd"];
-      entity = [self _storeTableEntityForChannel: tc];
-      [context beginTransaction];
-      if (record)
-        {
-          qualifier = [[EOSQLQualifier alloc] initWithEntity: entity
-                                             qualifierFormat:
-                                                @"c_key='motd'"];
-          [qualifier autorelease];
-          error = [tc updateRowX: newRecord describedByQualifier: qualifier];
-        }
-      else
-        error = [tc insertRowX: newRecord forEntity: entity];
-      if (error)
-        {
-          [context rollbackTransaction];
-          [self errorWithFormat:@"%s: cannot write record: %@", 
-                __PRETTY_FUNCTION__, error];
-        }
-      else
-        [context commitTransaction];
-      [self _releaseChannel: tc];
-    }
-  return error;
-}
-
- (NSException *) deleteRecordForKey: (NSString *) key
-{
-  EOAdaptorChannel *tc;
-  EOAdaptorContext *context;
-  EOEntity *entity;
-  EOSQLQualifier *qualifier;
-  NSException *error;
-
-  error = nil;
-  tc = [self _acquireStoreChannel];
-  if (tc)
-    {
-      context = [tc adaptorContext];
-      entity = [self _storeTableEntityForChannel: tc];
-      qualifier = [[EOSQLQualifier alloc] initWithEntity: entity
-                                         qualifierFormat:
-                                            @"c_key='%@'",
-                                          key];
-      [qualifier autorelease];
-      [context beginTransaction];
-      error = [tc deleteRowsDescribedByQualifierX: qualifier];
-      if (error)
-        {
-          [context rollbackTransaction];
-          [self errorWithFormat:@"%s: cannot delete record: %@", 
-                __PRETTY_FUNCTION__, error];
-        }
-      else
-        [context commitTransaction];
-      [self _releaseChannel: tc];
-    }
-  
-  return error;
-}
-
- (NSException *) deleteMotd
-{
-  return [self deleteRecordForKey:@"motd"];
-}
-
-@end
@@ -1,6 +1,6 @@
 /* GCSAlarmsFolder.m - this file is part of SOGo
 *
- * Copyright (C) 2010-2022 Inverse inc.
+ * Copyright (C) 2010-2016 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
@@ -182,7 +182,7 @@ static NSString *alarmsFolderURLString = nil;

  queries = [tc specialQueries];

-  sql = [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2",
+  sql = [NSString stringWithFormat: @"SELECT count(*) FROM %@",
                  [self _storeTableName]];
  if ([tc evaluateExpressionX: sql])
    {
@@ -202,7 +202,7 @@ static NSString *alarmsFolderURLString = nil;

 /* table has the following fields:
     c_path VARCHAR(255) NOT NULL
-     c_name VARCHAR(255) NOT NULL
+     c_name VARCHAR(255) NOT NULLo
     c_uid VARCHAR(255) NOT NULL
     c_recurrence_id INT NULL
     c_alarm_number INT NOT NULL
@@ -51,7 +51,6 @@
 - (void)releaseChannel:(EOAdaptorChannel *)_channel;
 - (void)releaseChannel:(EOAdaptorChannel *)_channel
           immediately:(BOOL)_immediately;
- (void) releaseAllChannels;

 /* checking for tables */

@@ -399,27 +399,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
    }
 }

- (void) releaseAllChannels
-{
-  EOAdaptorChannel *channel;
-  GCSChannelHandle *handle;
-  NSEnumerator *e;
-
-  e = [busyChannels objectEnumerator];
-  while ((handle = [e nextObject]))
-    {
-      [handle retain];
-      ASSIGN (handle->lastReleaseTime, [NSCalendarDate date]);
-      [busyChannels removeObject: handle];
-      channel = [handle channel];
-      if (debugPools)
-        [self logWithFormat: @"releaseAllChannels: freeing old channel (age %ds, %p) ", (int)[handle age], channel];
-      if ([channel isOpen])
-	[channel closeChannel];
-      [handle release];
-    }
-}
-
 /* checking for tables */

 - (BOOL) canConnect: (NSURL *) _url
@@ -159,6 +159,10 @@
 /* helpers */

 - (EOAttribute *) _attributeForColumn: (NSString *) _field;
+- (void) _findQualifiers: (id) qualifier
+             withAdaptor: (EOAdaptor *) adaptor;
+- (void) _formatQualifierValue: (EOKeyValueQualifier *) qualifier
+                   withAdaptor: (EOAdaptor *) adaptor;
@end

 #endif /* __GDLContentStore_GCSFolder_H__ */
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 2004-2007 SKYRIX Software AG
  Copyright (C) 2007      Helge Hess
-  Copyright (c) 2008-2022 Inverse inc.
+  Copyright (c) 2008-2019 Inverse inc.

  This file is part of SOGo.

@@ -26,11 +26,9 @@

 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EOSortOrdering.h>
-#import <EOControl/EOQualifier.h>

 #import <GDLAccess/EOEntity.h>
 #import <GDLAccess/EOAttribute.h>
-#import <GDLAccess/EOSQLExpression.h>
 #import <GDLAccess/EOSQLQualifier.h>
 #import <GDLAccess/EOAdaptor.h>
 #import <GDLAccess/EOAdaptorContext.h>
@@ -403,9 +401,19 @@ static GCSStringFormatter *stringFormatter = nil;
          adaptor = [adaptorCtx adaptor];
        }

+      if ([qualifier isKindOfClass: [EOAndQualifier class]])
+        [self _findQualifiers: (id)qualifier withAdaptor: adaptor];
+      else if ([qualifier isKindOfClass: [EOOrQualifier class]])
+        [self _findQualifiers: (id)qualifier withAdaptor: adaptor];
+      else if ([qualifier isKindOfClass: [EOKeyValueQualifier class]])
+        [self _formatQualifierValue: (EOKeyValueQualifier *)qualifier withAdaptor: adaptor];
+      else if ([qualifier isKindOfClass: [EONotQualifier class]])
+        [self _formatQualifierValue: (EOKeyValueQualifier *)[(id)qualifier qualifier] withAdaptor: adaptor];
+      else
+        [self errorWithFormat:@"unknown qualifier: %@", qualifier];
+
      ms = [NSMutableString stringWithCapacity:32];
-      [qualifier appendSQLToString: ms
-                       withAdaptor: adaptor];
+      [qualifier _gcsAppendToString: ms];
    }
  else
    ms = nil;
@@ -413,6 +421,51 @@ static GCSStringFormatter *stringFormatter = nil;
  return ms;
 }

+- (void) _findQualifiers: (id) qualifier
+             withAdaptor: (EOAdaptor *) adaptor
+{
+  NSArray *qs;
+  unsigned i, count;
+
+  if (qualifier == nil) return;
+
+  qs = [qualifier qualifiers];
+  if ((count = [qs count]) == 0)
+    return;
+
+  for (i = 0; i < count; i++) {
+    id q = [qs objectAtIndex: i];
+    if ([q isKindOfClass: [EOAndQualifier class]])
+      [self _findQualifiers: q withAdaptor: adaptor];
+    else if ([q isKindOfClass:[EOOrQualifier class]])
+      [self _findQualifiers: q withAdaptor: adaptor];
+    else if ([q isKindOfClass:[EOKeyValueQualifier class]])
+      [self _formatQualifierValue: (EOKeyValueQualifier *)q withAdaptor: adaptor];
+    else if ([q isKindOfClass:[EONotQualifier class]])
+      [self _formatQualifierValue: (EOKeyValueQualifier *)[q qualifier] withAdaptor: adaptor];
+    else
+      [self errorWithFormat:@"unknown qualifier: %@", q];
+  }
+}
+
+- (void) _formatQualifierValue: (EOKeyValueQualifier *) qualifier
+                   withAdaptor: (EOAdaptor *) adaptor
+{
+  NSString *field;
+  EOAttribute *attribute;
+  NSString *formattedValue;
+
+  field = [qualifier key];
+  attribute = [self _attributeForColumn: field];
+  if (attribute && [[qualifier value] isNotNull])
+    {
+      formattedValue = [adaptor formatValue: [qualifier value]
+                               forAttribute: attribute];
+      [qualifier setValue: formattedValue];
+      [qualifier setFormatted: YES];
+    }
+}
+
 - (NSString *)_sqlForSortOrderings:(NSArray *)_so {
  NSMutableString *sql;
  unsigned i, count;
@@ -987,7 +1040,7 @@ andAttribute: (EOAttribute *)_attribute
  NSDictionary	      *currentRow;
  NSNumber            *storedVersion;
  BOOL                isNewRecord, hasInsertDelegate, hasUpdateDelegate;
-  NSCalendarDate      *nowDate, *startDate;
+  NSCalendarDate      *nowDate;
  NSNumber            *now;
  EOEntity *quickTableEntity, *storeTableEntity;
  NSArray *rows;
@@ -1002,7 +1055,6 @@ andAttribute: (EOAttribute *)_attribute
 	  error   = nil;
 	  nowDate = [NSCalendarDate date];
 	  now     = [NSNumber numberWithUnsignedInt:[nowDate timeIntervalSince1970]];
-    startDate = nil;

 	  if (doLogStore)
 	    [self logWithFormat:@"should store content: '%@'\n%@", _name, _content];
@@ -1072,7 +1124,6 @@ andAttribute: (EOAttribute *)_attribute

 		  [contentRow setObject:_name forKey:@"c_name"];
 		  [contentRow setObject:now forKey:@"c_lastmodified"];
-
 		  if (isNewRecord)
 		    {
 		      [contentRow setObject:now forKey:@"c_creationdate"];
@@ -1143,21 +1194,6 @@ andAttribute: (EOAttribute *)_attribute
 			}
 		      else
 			{
-        // Update c_startdate for appointments
-        if ([theComponent respondsToSelector:@selector(startDate)]) {
-          NSTimeInterval t;
-          startDate = [theComponent startDate];
-          t = [startDate timeIntervalSince1970];
-          if (startDate) {
-            if (t < (long long)INT_MAX && t > (long long)INT_MIN) {
-              [quickRow setObject:[NSNumber numberWithInt: t] forKey:@"c_startdate"];
-            } else {
-              [self errorWithFormat:@"Unexpected value. Invalid start date for timestamp %f", t];
-              [quickRow setObject:[NSNumber numberWithInt: 0] forKey:@"c_startdate"];
-            }
-          }
-        }
-      
 			  if (!ofFlags.sameTableForQuick)
 			    error = (hasUpdateDelegate
 				     ? [quickChannel updateRowX: quickRow
@@ -31,7 +31,7 @@
 */

@class NSString, NSArray, NSURL, NSDictionary, NSException;
-@class GCSChannelManager, GCSAlarmsFolder, GCSAdminFolder, GCSFolder, GCSFolderType, GCSSessionsFolder;
+@class GCSChannelManager, GCSAlarmsFolder, GCSFolder, GCSFolderType, GCSSessionsFolder;

@interface GCSFolderManager : NSObject
 {
@@ -89,9 +89,6 @@
 /* sessions */
 - (GCSSessionsFolder *)sessionsFolder;

-/* admin */
- (GCSAdminFolder *)adminFolder;
-
 /* folder types */

 - (GCSFolderType *)folderTypeWithName:(NSString *)_name;
@@ -37,7 +37,6 @@
 #import "GCSChannelManager.h"
 #import "EOAdaptorChannel+GCS.h"
 #import "GCSAlarmsFolder.h"
-#import "GCSAdminFolder.h"
 #import "GCSFolder.h"
 #import "GCSFolderType.h"
 #import "GCSSessionsFolder.h"
@@ -498,12 +497,6 @@ static BOOL       _singleStoreMode           = NO;
  return [GCSSessionsFolder sessionsFolderWithFolderManager: self];
 }

-/* admin */
- (GCSAdminFolder *) adminFolder
-{
-  return [GCSAdminFolder adminFolderWithFolderManager: self];
-}
-
 - (NSString *)generateSQLWhereForInternalNames:(NSArray *)_names
 				    exactMatch:(BOOL)_beExact orDirectSubfolderMatch:(BOOL)_directSubs
 {
@@ -1,6 +1,8 @@
 /* GCSSessionsFolder.m - this file is part of SOGo
 *
- * Copyright (C) 2010-2022 Inverse inc.
+ * Copyright (C) 2010-2011 Inverse inc.
+ *
+ * Author: Ludovic Marcotte  <lmarcotte@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
@@ -179,7 +181,7 @@ static NSString *sessionsFolderURLString = nil;

  queries = [tc specialQueries];

-  sql = [NSString stringWithFormat: @"SELECT 1 FROM %@ WHERE 1 = 2", tableName];
+  sql = [NSString stringWithFormat: @"SELECT count(*) FROM %@", tableName];
  if ([tc evaluateExpressionX: sql])
    {
      sql = [queries createSessionsFolderWithName: tableName];
@@ -39,11 +39,8 @@
 - (NSString *) createSessionsFolderWithName: (NSString *) tableName;
 - (NSDictionary *) sessionsAttributeTypes;

- (NSString *)createAdminFolderWithName:(NSString *)tableName;
- (NSDictionary *)adminAttributeTypes;
-
- (NSString *) updateCPathInFolderInfo:(NSString *)tableName
-withCPath2:(NSString *)c_path2;
+- (NSString *) updateCPathInFolderInfo: (NSString *) tableName
+                            withCPath2: (NSString *) c_path2;

@end

@@ -81,20 +81,6 @@
  return nil;
 }

- (NSString *) createAdminFolderWithName: (NSString *) tableName
-{
-  [self subclassResponsibility: _cmd];
-
-  return nil;
-}
-
- (NSDictionary *) adminAttributeTypes
-{
-  [self subclassResponsibility: _cmd];
-
-  return nil;
-}
-
 - (NSString *) createFolderTableWithName: (NSString *) tableName
 {
  [self subclassResponsibility: _cmd];
@@ -171,30 +157,6 @@
  return types;
 }

- (NSString *) createAdminFolderWithName: (NSString *) tableName
-{
-  static NSString *sqlFolderFormat
-    = (@"CREATE TABLE %@ (" 
-       @" c_key VARCHAR(255) NOT NULL,"
-       @" c_content TEXT NOT NULL)");
-
-  return [NSString stringWithFormat: sqlFolderFormat, tableName];
-}
-
- (NSDictionary *) adminAttributeTypes
-{
-  static NSMutableDictionary *types = nil;
-
-  if (!types)
-    {
-      types = [NSMutableDictionary new];
-      [types setObject: @"varchar" forKey: @"c_key"];
-      [types setObject: @"varchar" forKey: @"c_content"];
-    }
-
-  return types;
-}
-
 - (NSString *) createFolderTableWithName: (NSString *) tableName
 {
  static NSString *sqlFolderFormat
@@ -227,7 +189,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ ("
       @" c_id VARCHAR(255) PRIMARY KEY,"
-       @" c_value VARCHAR(4096) NOT NULL,"
+       @" c_value VARCHAR(255) NOT NULL,"
       @" c_creationdate INT4 NOT NULL,"
       @" c_lastseen INT4 NOT NULL)");

@@ -300,30 +262,6 @@
  return types;
 }

- (NSString *) createAdminFolderWithName: (NSString *) tableName
-{
-  static NSString *sqlFolderFormat
-    = (@"CREATE TABLE %@ (" 
-       @" c_key VARCHAR(255) NOT NULL,"
-       @" c_content MEDIUMTEXT NOT NULL)");
-
-  return [NSString stringWithFormat: sqlFolderFormat, tableName];
-}
-
- (NSDictionary *) adminAttributeTypes
-{
-  static NSMutableDictionary *types = nil;
-
-  if (!types)
-    {
-      types = [NSMutableDictionary new];
-      [types setObject: @"varchar" forKey: @"c_key"];
-      [types setObject: @"varchar" forKey: @"c_content"];
-    }
-
-  return types;
-}
-
 - (NSString *) createFolderTableWithName: (NSString *) tableName
 {
  static NSString *sqlFolderFormat
@@ -356,7 +294,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
       @" c_id VARCHAR(255) PRIMARY KEY,"
-       @" c_value VARCHAR(4096) NOT NULL,"
+       @" c_value VARCHAR(255) NOT NULL,"
       @" c_creationdate INT NOT NULL,"
       @" c_lastseen INT NOT NULL)");

@@ -429,30 +367,6 @@
  return types;
 }

- (NSString *) createAdminFolderWithName: (NSString *) tableName
-{
-  static NSString *sqlFolderFormat
-    = (@"CREATE TABLE %@ (" 
-       @" c_key VARCHAR2(255) NOT NULL,"
-       @" c_content VARCHAR2(65535) NOT NULL)");
-
-  return [NSString stringWithFormat: sqlFolderFormat, tableName];
-}
-
- (NSDictionary *) adminAttributeTypes
-{
-  static NSMutableDictionary *types = nil;
-
-  if (!types)
-    {
-      types = [NSMutableDictionary new];
-      [types setObject: @"varchar2" forKey: @"c_key"];
-      [types setObject: @"varchar2" forKey: @"c_content"];
-    }
-
-  return types;
-}
-
 - (NSString *) createFolderTableWithName: (NSString *) tableName
 {
  static NSString *sqlFolderFormat
@@ -484,7 +398,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
       @" c_id VARCHAR2(255) PRIMARY KEY,"
-       @" c_value VARCHAR2(4096) NOT NULL,"
+       @" c_value VARCHAR2(255) NOT NULL,"
       @" c_creationdate INTEGER NOT NULL,"
       @" c_lastseen INTEGER NOT NULL)");

@@ -25,7 +25,6 @@ libGDLContentStore_HEADER_FILES +=		\
 	EOAdaptorChannel+GCS.h			\
 	\
 	GCSAlarmsFolder.h			\
-	GCSAdminFolder.h			\
 	GCSContext.h				\
 	GCSFieldInfo.h				\
 	GCSFolder.h				\
@@ -42,7 +41,6 @@ libGDLContentStore_OBJC_FILES +=		\
 	EOQualifier+GCS.m			\
 	\
 	GCSAlarmsFolder.m			\
-	GCSAdminFolder.m			\
 	GCSContext.m				\
 	GCSFieldInfo.m				\
 	GCSFolder.m				\
@@ -159,28 +159,28 @@ static NGCardsSaxHandler *sax = nil;
  CardElement *newChild;

  if (aChild)
-  {
-    childTag = [aChild tag];
-    newChild = nil;
-    mappedClass = [self classForTag: [childTag uppercaseString]];
-    if (mappedClass)
-	  {
-	    if (![aChild isKindOfClass: mappedClass])
+    {
+      childTag = [aChild tag];
+      newChild = nil;
+      mappedClass = [self classForTag: [childTag uppercaseString]];
+      if (mappedClass)
+	{
+	  if (![aChild isKindOfClass: mappedClass])
 	    {
 	      //NSLog (@"warning: new child to entity '%@': '%@' converted to '%@'",
 	      //	     tag, childTag, NSStringFromClass(mappedClass));
 	      newChild = [aChild elementWithClass: mappedClass];
 	    }
-	  }
+	}
      //   else
      //     NSLog (@"warning: no mapped class for tag '%@'",
      //            childTag);

-    if (!newChild)
-	    newChild = aChild;
-    [children addObject: newChild];
-    [newChild setParent: self];
-  }
+      if (!newChild)
+	newChild = aChild;
+      [children addObject: newChild];
+      [newChild setParent: self];
+    }
 }

 - (CardElement *) uniqueChildWithTag: (NSString *) aTag
@@ -59,7 +59,7 @@
          && ![subValue hasSuffix: @"\""])
        subValue = [NSString stringWithFormat: @"\"%@\"", subValue];

-      escaped = [subValue escapedForCardsAsAttributes: asAttributes];
+      escaped = [subValue escapedForCards];
      if ([escaped length] > 0)
        {
          [aString appendString: escaped];
@@ -34,7 +34,7 @@

 - (NSString *) foldedForVersitCards;
 - (NSArray *) asCardAttributeValues;
- (NSString *) escapedForCardsAsAttributes: (BOOL) asAttributes;
+- (NSString *) escapedForCards;
 - (NSString *) rfc822Email;

 - (NSTimeInterval) durationAsTimeInterval;
@@ -45,27 +45,19 @@
    [foldedString appendString: self];
  else
    {
-      //Check if the 75th chars is a 2*16bits chars, in this case, cut one char before
-      unichar c = [self characterAtIndex: 74];
-      int substringCut;
-      if (c >= 0xD800 && c <= 0xDBFF)
-        substringCut = 74;
-      else
-        substringCut = 75;
-      subStringRange = NSMakeRange (0, substringCut);
-      [foldedString appendFormat: @"%@\r\n", [self substringWithRange: subStringRange]];
-
-      subStringRange = NSMakeRange (substringCut, 74);
+      subStringRange = NSMakeRange (0, 75);
+      [foldedString appendFormat: @"%@\r\n",
+                    [self substringWithRange: subStringRange]];
+      subStringRange = NSMakeRange (75, 74);
      while ((length - subStringRange.location) > 75)
        {
-          c = [self characterAtIndex: (subStringRange.location+subStringRange.length-1)];
-          if (c >= 0xD800 && c <= 0xDBFF)
-            subStringRange.length--;
-          [foldedString appendFormat: @" %@\r\n", [self substringWithRange: subStringRange]];
-          subStringRange.location += subStringRange.length;
+          [foldedString appendFormat: @" %@\r\n",
+                        [self substringWithRange: subStringRange]];
+          subStringRange.location += 74;
        }
      subStringRange.length = length - subStringRange.location;
-      [foldedString appendFormat: @" %@", [self substringWithRange: subStringRange]];
+      [foldedString appendFormat: @" %@",
+                    [self substringWithRange: subStringRange]];
    }

  return foldedString;
@@ -91,21 +83,19 @@
  newCurrentChar = newPart;

  isEscaped = NO;
-  isQuoted = (max > 1 && [self hasPrefix: @"\""] && [self hasSuffix: @"\""]);
-  if (isQuoted)
-    {
-      // Remove leading and trailing quotes
-      currentChar++;
-      lastChar--;
-    }
+  isQuoted = NO;

  while (currentChar < lastChar)
    {
      if (isQuoted)
        {
-          // Don't escape characters
-          *newCurrentChar = *currentChar;
-          newCurrentChar++;
+          if (*currentChar == '"')
+            isQuoted = NO;
+          else
+            {
+              *newCurrentChar = *currentChar;
+              newCurrentChar++;
+            }
        }
      else if (isEscaped)
        {
@@ -124,14 +114,16 @@
        }
      else
        {
-          if (*currentChar == '\\')
+          if (*currentChar == '"')
+            isQuoted = YES;
+          else if (*currentChar == '\\')
            isEscaped = YES;
          else if (*currentChar == ',')
            {
-              // The comma is a value delimiter
-              newString = [[NSString alloc] initWithCharactersNoCopy: newPart
-                                                              length: (newCurrentChar - newPart)
-                                                        freeWhenDone: YES];
+              newString = [[NSString alloc]
+                            initWithCharactersNoCopy: newPart
+                                              length: (newCurrentChar - newPart)
+                                        freeWhenDone: YES];
              [values addObject: newString];
              [newString release];
              newPart = NSZoneMalloc (NULL, max * sizeof (unichar));
@@ -146,9 +138,10 @@
      currentChar++;
    }

-  newString = [[NSString alloc] initWithCharactersNoCopy: newPart
-                                                  length: (newCurrentChar - newPart)
-                                            freeWhenDone: YES];
+  newString = [[NSString alloc]
+                initWithCharactersNoCopy: newPart
+                                  length: (newCurrentChar - newPart)
+                            freeWhenDone: YES];
  [values addObject: newString];
  [newString release];

@@ -157,7 +150,7 @@
  return values;
 }

- (NSString *) escapedForCardsAsAttributes: (BOOL) asAttributes
+- (NSString *) escapedForCards
 {
  NSMutableString *string;
  unsigned int len, i;
@@ -172,29 +165,33 @@
    {
      c = [self characterAtIndex: i];

-      if (!isQuoted || !asAttributes)
-        switch (c)
-          {
-          case ',':
-            [string appendString: @"\\,"];
-            continue;
-            //case ':':
-            // [string appendString: @"\\:"];
-            //break;
-          case ';':
-            [string appendString:  @"\\;"];
-            continue;
-          }
+      if (isQuoted)
+        {
+          if (c == '"')
+            isQuoted = NO;
+
+          [string appendFormat: @"%C", c];
+          continue;
+        }

      switch (c)
        {
        case '"':
-          isQuoted = !isQuoted;
+          isQuoted = YES;
          [string appendFormat: @"%C", c];
          break;
        case '\\':
          [string appendString: @"\\\\"];
          break;
+        case ',':
+          [string appendString: @"\\,"];
+          break;
+          //case ':':
+          // [string appendString: @"\\:"];
+          //break;
+        case ';':
+          [string appendString:  @"\\;"];
+          break;
        case'\n':
          [string appendString: @"\\n"];
          break;
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Abidjan
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Abidjan
 BEGIN:STANDARD
 TZNAME:GMT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Algiers
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Algiers
 BEGIN:STANDARD
 TZNAME:CET
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Bissau
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Bissau
 BEGIN:STANDARD
 TZNAME:GMT
@@ -1,23 +1,15 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Cairo
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Cairo
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19700424T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR
-END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EET
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-DTSTART:19701030T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
@@ -1,10 +1,10 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Casablanca
 TZUNTIL:20870511T020001Z
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Casablanca
 BEGIN:STANDARD
 TZNAME:+01
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Ceuta
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:Africa/Ceuta
 BEGIN:DAYLIGHT
 TZNAME:CEST
@@ -1,10 +1,10 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/El_Aaiun
 TZUNTIL:20870511T020001Z
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/El_Aaiun
 BEGIN:STANDARD
 TZNAME:+01
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Johannesburg
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Johannesburg
 BEGIN:STANDARD
 TZNAME:SAST
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Juba
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Juba
 BEGIN:STANDARD
 TZNAME:CAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Khartoum
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Khartoum
 BEGIN:STANDARD
 TZNAME:CAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Lagos
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Lagos
 BEGIN:STANDARD
 TZNAME:WAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Maputo
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Maputo
 BEGIN:STANDARD
 TZNAME:CAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Monrovia
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Monrovia
 BEGIN:STANDARD
 TZNAME:GMT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Nairobi
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Nairobi
 BEGIN:STANDARD
 TZNAME:EAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Ndjamena
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Ndjamena
 BEGIN:STANDARD
 TZNAME:WAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Sao_Tome
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Sao_Tome
 BEGIN:STANDARD
 TZNAME:GMT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Tripoli
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Tripoli
 BEGIN:STANDARD
 TZNAME:EET
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Tunis
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Tunis
 BEGIN:STANDARD
 TZNAME:CET
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Windhoek
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135711Z
 X-LIC-LOCATION:Africa/Windhoek
 BEGIN:STANDARD
 TZNAME:CAT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Adak
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Adak
 BEGIN:DAYLIGHT
 TZNAME:HDT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Anchorage
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Anchorage
 BEGIN:DAYLIGHT
 TZNAME:AKDT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Araguaina
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Araguaina
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Buenos_Aires
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Buenos_Aires
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Catamarca
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Catamarca
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Cordoba
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Cordoba
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Jujuy
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Jujuy
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/La_Rioja
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/La_Rioja
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Mendoza
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Mendoza
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Rio_Gallegos
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Rio_Gallegos
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Salta
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Salta
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/San_Juan
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/San_Juan
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/San_Luis
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/San_Luis
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Tucuman
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Tucuman
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Ushuaia
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Argentina/Ushuaia
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Asuncion
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Asuncion
 BEGIN:DAYLIGHT
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Bahia
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Bahia
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,15 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Bahia_Banderas
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Bahia_Banderas
 BEGIN:STANDARD
 TZNAME:CST
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-DTSTART:19700101T000000
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19700405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Barbados
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Barbados
 BEGIN:STANDARD
 TZNAME:AST
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Belem
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Belem
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Belize
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Belize
 BEGIN:STANDARD
 TZNAME:CST
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Boa_Vista
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Boa_Vista
 BEGIN:STANDARD
 TZNAME:-04
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Bogota
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Bogota
 BEGIN:STANDARD
 TZNAME:-05
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Boise
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Boise
 BEGIN:DAYLIGHT
 TZNAME:MDT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cambridge_Bay
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Cambridge_Bay
 BEGIN:DAYLIGHT
 TZNAME:MDT
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Campo_Grande
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Campo_Grande
 BEGIN:STANDARD
 TZNAME:-04
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cancun
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Cancun
 BEGIN:STANDARD
 TZNAME:EST
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Caracas
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Caracas
 BEGIN:STANDARD
 TZNAME:-04
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cayenne
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Cayenne
 BEGIN:STANDARD
 TZNAME:-03
@@ -1,9 +1,9 @@
 BEGIN:VCALENDAR
-PRODID:-//Alinto//NONSGML IANA 2024c//EN
+PRODID:-//Inverse inc.//NONSGML IANA 2021a//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Chicago
-LAST-MODIFIED:20240220T101645Z
+LAST-MODIFIED:20210303T135712Z
 X-LIC-LOCATION:America/Chicago
 BEGIN:DAYLIGHT
 TZNAME:CDT
Author	SHA1	Message	Date
Francis Lachapelle	d6d972d16b	docs: add attribution to the ytnef project	2021-08-13 11:02:51 -04:00
Francis Lachapelle	ccc3de3597	style: capitalize TNEF in file names	2021-08-13 10:35:19 -04:00
Francis Lachapelle	7b72f50c1c	fix(mail): avoid name collision in SOGoTnefMailBodyPart.m	2021-08-13 08:20:29 -04:00
Francis Lachapelle	87ccc5c041	docs: fix copyrights in SOGoTnefMailBodyPart.h	2021-08-13 08:18:57 -04:00
Francis Lachapelle	37a11ffff4	fix(packaging): add dependency on libytnef	2021-08-06 16:24:28 -04:00
Francis Lachapelle	208f4366c4	fix(mail): improve decoding of ms-tnef body parts - added decoding of meeting request & reponse - added SOGoTnefDecoderDebugEnabled system default	2021-08-06 15:28:35 -04:00
Francis Lachapelle	b39da3050b	fix(mail): add missing wox template for UIxMailPartTnefViewer	2021-08-06 15:11:59 -04:00
Francis Lachapelle	e7813b2d5e	test: restore tests for RTF handler	2021-08-04 13:22:59 -04:00
Francis Lachapelle	171c18677a	feat(mail): initial support for ms-tnef (winmail.dat) body part Fixes #2242 Fixes #4503	2021-08-04 13:22:59 -04:00