add openid auth bearer

add user folder endpoint
first bacth
2025-06-11 12:52:26 +02:00 · 2025-05-23 14:44:42 +02:00 · 2025-05-22 17:03:24 +02:00 · 2025-05-22 17:03:24 +02:00 · 2025-05-22 17:01:42 +02:00 · 2025-05-22 17:01:42 +02:00
330 changed files with 1457 additions and 13244 deletions
@@ -15,9 +15,9 @@
   *                                                                           *
   * **************************************************************************/

+  /* Database configuration (mysql://, postgresql:// or oracle://) */
  WOPort = "0.0.0.0:50000";

-  /* Database configuration (mysql://, postgresql:// or oracle://) */

  // MySQL
  SOGoProfileURL = "mysql://sogobuild:sogo123@mariadb:3306/sogo/sogo_user_profile";
@@ -1,6 +1,6 @@
 [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, ko: Korean, th: Thai, el: Greek
+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
@@ -5,7 +5,6 @@
 #import <SOGoAPIUserFolder.h>

 #import <GDLContentStore/GCSFolderManager.h>
-#import <GDLContentStore/GCSFolder.h>

@implementation SOGoAPIUserFolder

@@ -21,34 +20,6 @@
  [super dealloc];
 }

-/**
-
-
-
-{
-   "calendar":[
-      {
-         "name":"DidyShared",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/12509-67F67D00-1-3105AF40"
-      },
-      {
-         "name":"LocalDidy",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/1BC38-67B60000-1-6E4B6880"
-      },
-      {
-         "name":"Personal Calendar",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/personal"
-      }
-   ],
-   "username":"sogo-tests1@example.org",
-   "contact":[
-      {
-         "name":"Personal Address Book",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Contacts/personal"
-      }
-   ]
-}
-**/

 - (NSDictionary *) action: (WOContext*) ctx withParam: (NSDictionary *) param
 {
@@ -57,8 +28,6 @@
  NSMutableArray *cardavLinks, *caldavLinks;
  NSString *serverUrl, *basePath, *c_uid, *url;
  GCSFolderManager *fm;
-  GCSFolder *folder;
-
  int max, i;

  //Should be a user
@@ -67,7 +36,7 @@
  //fetch folders
  fm = [GCSFolderManager defaultFolderManager];
  basePath = [NSString stringWithFormat: @"/Users/%@", c_uid];
-  folders = [fm listSubFoldersAndNamesAtPath: basePath recursive: YES];
+  folders = [fm listSubFoldersAtPath: basePath recursive: YES];

  //Generate dav link
  max = [folders count];
@@ -78,21 +47,16 @@
  serverUrl = [[ctx serverURL] absoluteString];
  for (i = 0; i < max; i++)
  {
-    NSMutableDictionary *folderRet;
-    folderRet = [NSMutableDictionary dictionary];
-    folder = [folders objectAtIndex: i];
-    url = [NSString stringWithFormat: @"%@/SOGo/dav/%@/%@", serverUrl, c_uid, [folder objectForKey: @"path"]];
-    [folderRet setObject: url forKey: @"url"];
-    [folderRet setObject: [folder objectForKey: @"name"] forKey: @"name"];
+    url = [NSString stringWithFormat: @"%@/SOGo/dav/%@/%@", serverUrl, c_uid, [folders objectAtIndex: i]];
    if([url rangeOfString:@"/Calendar/"].location == NSNotFound)
    {
      //Contacts
-      [cardavLinks addObject: folderRet];
+      [cardavLinks addObject: url];
    }
    else
    {
      //Calendar
-      [caldavLinks addObject: folderRet];
+      [caldavLinks addObject: url];
    }
  }

@@ -1627,7 +1627,7 @@ struct GlobalObjectId {

      [map setObject: dateReceived forKey: @"date"];

-      messageId = [NSString generateMessageID: [identity objectForKey: @"email"]];
+      messageId = [NSString generateMessageID];
      [map setObject: messageId forKey: @"message-id"];

      attachmentKeys = [self fetchFileAttachmentKeys];
@@ -2,259 +2,6 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

-## [5.12.11](https://github.com/Alinto/sogo/compare/SOGo-5.12.10...SOGo-5.12.11) (2026-09-14)
-
-
-### Features
-
-* **junk:** add junk action on mail view ([3f4f949](https://github.com/Alinto/sogo/commit/3f4f9496644953010a4a429f90eae733a50d61c4))
-
-
-### Bug Fixes
-
-* **core:** keep the [@import](https://github.com/import) cleanup working in stringWithoutHTMLInjection ([8813677](https://github.com/Alinto/sogo/commit/8813677ecb171e5d27cd582989c1d87b308c6df3))
-* **db:** release db channel after using them ([152f44b](https://github.com/Alinto/sogo/commit/152f44b90e08013b5c132473a2de249682d997df))
-* **db:** release db channel after using them part 2 ([089b50c](https://github.com/Alinto/sogo/commit/089b50c0defdb48e8c0bc0a13334591f3ee2dd11))
-* **junk:** extend list of junk icon available ([012e6ef](https://github.com/Alinto/sogo/commit/012e6eff471893efaac033c69ddf7838ca51b791))
-* **mail:** escape mail data placed in attributes of a compiled part ([045a0b9](https://github.com/Alinto/sogo/commit/045a0b9c0ac57aeea1b619f281acff0427cd81c7)), closes [#115](https://bugs.sogo.nu/view.php?id=115)
-* **mail:** stop interpreting iMIP card text fields as markup ([0d66d75](https://github.com/Alinto/sogo/commit/0d66d7503d8fd147842e87b9b4f1b921986ef44b))
-* **pwd:** use the proper url for reset password mail ([382118a](https://github.com/Alinto/sogo/commit/382118a93b6925de2ce7f774abc1865ebea2dbba))
-* **pwd:** use the proper url for reset password mail part2 ([04a3e98](https://github.com/Alinto/sogo/commit/04a3e9823889acaf6c247b224f5f7a0108f8f829))
-* **sanitization:** update regex for html sanitization ([10dc173](https://github.com/Alinto/sogo/commit/10dc1733496fb2f393537d864d83408e357f2215))
-* **UI:** use legitimate sorting value ([d089c40](https://github.com/Alinto/sogo/commit/d089c4046ffac8124874c504491db9d1f15ae650))
-
-
-### Localization
-
-* **hu:** Update Hungarian translations ([1bf1031](https://github.com/Alinto/sogo/commit/1bf1031ab2932f196f1adcc8fdfc9dea7dfb1f65))
-
-## [5.12.10](https://github.com/Alinto/sogo/compare/SOGo-5.12.9...SOGo-5.12.10) (2026-08-13)
-
-
-### Features
-
-* **sogo-tool:** add init-user command to create a user's personal folders and preferences without a login ([aefc14b](https://github.com/Alinto/sogo/commit/aefc14b265172e5ff94fa0fc1e4799f05d8e29f8))
-
-
-### Bug Fixes
-
-* **bug:** escape angularJS only if needed to keep legitimate directive ([41e2b7b](https://github.com/Alinto/sogo/commit/41e2b7b1ab59fefe48cedf49ba82f4e03b646d23))
-* **bug:** incorrect method called ([1caa257](https://github.com/Alinto/sogo/commit/1caa25711f5891135c7ebca63f33b8758c00c8e8))
-* **calendar:** do not transmit og http status to external calendar ([3a78a3b](https://github.com/Alinto/sogo/commit/3a78a3bbb44484c95c141b0f3c0c8fabdc8bcf6a))
-* **ckeditor:** Sync resized image width/height into style and HTML attributes so Outlook and other mail clients ignoring CSS aspect-ratio render the correct dimensions. Closes [#6169](https://bugs.sogo.nu/view.php?id=6169). ([39a3583](https://github.com/Alinto/sogo/commit/39a35830e9d01a26b533515a20c1b4f527064519))
-* **dav:** properly parse MKCOL request ([78807d0](https://github.com/Alinto/sogo/commit/78807d01aee9195b95e2ed21344f260aadb2faef))
-* **event:** clean import of event ([b5c83f5](https://github.com/Alinto/sogo/commit/b5c83f58393e31151939d0d6fc227c0d0f127f33))
-* **event:** clean import of event ([b18f1a0](https://github.com/Alinto/sogo/commit/b18f1a09f59424a36f6de5aa7c30e6f27405c15d))
-* **mail:** escape angularJS directive for description ([47133fd](https://github.com/Alinto/sogo/commit/47133fdf3bc3148d374bbf413f058d714776e832))
-* **mail:** escape References/Organization/Newsgroups headers in HTML forward so message-id chevrons aren't parsed as HTML tags hiding the quoted body. Closes [#6046](https://bugs.sogo.nu/view.php?id=6046). ([f11f34c](https://github.com/Alinto/sogo/commit/f11f34cdefdd4175ae6c8b0814c2ccaecfd7c373))
-* **mail:** Some links broken in HTML rendering due to libxml2 (SOPE) only supporting HTML4 — when an anchor has no content between its opening and closing tags, store it and re-open it around the next element, closing </a> after that element's end tag. Closes [#5961](https://bugs.sogo.nu/view.php?id=5961). Closes [#6172](https://bugs.sogo.nu/view.php?id=6172). ([6904911](https://github.com/Alinto/sogo/commit/6904911ac17651de754246aff26fbb85aa8e01c7))
-* **passwordRecoveyr:** get the domain from the user mail ([a156f4c](https://github.com/Alinto/sogo/commit/a156f4ce9f0eda3ff54633d4bcb7051388d2f39b))
-* **tool:** wrong method called ([97bbd7e](https://github.com/Alinto/sogo/commit/97bbd7ed7f8173894f01b259f2f0f539ad6e95ed))
-
-
-### Localization
-
-* **hu:** Update Hungarian translations ([2a8f20e](https://github.com/Alinto/sogo/commit/2a8f20e080cdb39544622874a12fef807cc66612))
-
-### [5.12.9](https://github.com/Alinto/sogo/compare/SOGo-5.12.8...SOGo-5.12.9) (2026-05-27)
-
-
-### Bug Fixes
-
-* **mail:** do not encode non-html element ([6e59011](https://github.com/Alinto/sogo/commit/6e590115fbce073847369495997228fba2fc3ce8))
-* **mail:** render the subject without html when searching ([be440ba](https://github.com/Alinto/sogo/commit/be440baa23fd8b6ad5d8c947f60f9105ad717214))
-* **pref:** prevent onevent cleaning to remove legitimate words ([c45233c](https://github.com/Alinto/sogo/commit/c45233c11e250a22fa1e1f3e47fee2d6e232045b))
-
-
-### Localization
-
-* **ca:** Update Catalan translations ([fd427f9](https://github.com/Alinto/sogo/commit/fd427f91967b99ca0d8eb42c4e5432f9ae4b49cf))
-* **es_ES:** Update SpanishSpain translations ([d823cad](https://github.com/Alinto/sogo/commit/d823cadda084e735c6dbeb2694f583bdf9fb7f9b))
-
-### [5.12.8](https://github.com/Alinto/sogo/compare/SOGo-5.12.7...SOGo-5.12.8) (2026-05-11)
-
-
-### Bug Fixes
-
-* **acl:** fix folder path ([d902756](https://github.com/Alinto/sogo/commit/d902756aaf955a9ade6061806bb372e15b673197))
-* **acl:** only add existing uid ([f9b7105](https://github.com/Alinto/sogo/commit/f9b71059f4f382d7b337d16ce1257443ade43d02))
-* **css:** do not escape css if missing ([d723261](https://github.com/Alinto/sogo/commit/d7232618e6d6518acd148d3fafc5476d6a83aae1))
-* **mail:** correctly render mail when searching ([0cb21f8](https://github.com/Alinto/sogo/commit/0cb21f8fb95d3fcb5da5112e3dcf082fa7cb1fe3))
-* **mail:** remove negative margin from mail ([6119d6c](https://github.com/Alinto/sogo/commit/6119d6cf232cdf322b6c9d6d8beec7c8f47b8ad2))
-* **mail:** render properly the subject v2 ([29d0bbc](https://github.com/Alinto/sogo/commit/29d0bbc9eb96c2b4a0ada4d93eac79a66c789b22))
-* **mail:** sanitise mail with ics (invitation to event) ([67ce01e](https://github.com/Alinto/sogo/commit/67ce01ec2a1a7854d8e9f615dd65afb949043e86))
-* **openid:** check the userinfo mail + avoid infinite loop ([93b82a0](https://github.com/Alinto/sogo/commit/93b82a0f60ce5d8b0938e3f03d86baee8d075162))
-* **UI:** render properly the subject ([b7641be](https://github.com/Alinto/sogo/commit/b7641be5c80c0c02dc1b4742ce92e4de9a948b72))
-
-
-### Localization
-
-* **pl:** Update Polish translations ([4e5c251](https://github.com/Alinto/sogo/commit/4e5c2516d43a3d80fad75f0a08c114ff3cb3eb03))
-
-### [5.12.7](https://github.com/Alinto/sogo/compare/SOGo-5.12.6...SOGo-5.12.7) (2026-03-30)
-
-
-### Bug Fixes
-
-* **sql:** use proper sql adaptor for usr source ([1f7e5d2](https://github.com/Alinto/sogo/commit/1f7e5d2b2c2047c44a6a9e05f73c36491cb96d21))
-* **typo:** pass the correct arg to checkLogin ([d7f02b6](https://github.com/Alinto/sogo/commit/d7f02b6083197ecabc57c6e3c6f16a3bc23c68d0))
-
-
-### Localization
-
-* **all:** update several translations ([40228c6](https://github.com/Alinto/sogo/commit/40228c619b6df02be4ed5e3f2e0b8d78d8cf15b2))
-* **fr:** Typo in French ([55d615e](https://github.com/Alinto/sogo/commit/55d615e4dd563bc31d82400b1bf110eed61248f6))
-
-### [5.12.6](https://github.com/Alinto/sogo/compare/SOGo-5.12.6...SOGo-5.12.6) (2026-03-19)
-
-### Bug Fixes
-
-* **totp:** new user can properly use totp ([623f08](https://github.com/Alinto/sogo/commit/623f083cd94842766c6d9430cf3bdad8fc4d5dbc))
-
-### [5.12.5](https://github.com/Alinto/sogo/compare/SOGo-5.12.4...SOGo-5.12.5) (2026-03-03)
-
-
-### Bug Fixes
-
-* **db:** increase some column size ([f8638a3](https://github.com/Alinto/sogo/commit/f8638a3f4edd3487901c119b079dea2a3746cd7c))
-* **encryptedUrl:** fix cache key data and expect uncrypted name for freebusy ([95efe73](https://github.com/Alinto/sogo/commit/95efe73e69abaae7fb8c1bdd0fe7ac660d59d7a4))
-* **event:** also add jitsi url in the location as outlook doesn't support attach url ([7876013](https://github.com/Alinto/sogo/commit/7876013a4c1b0c7a1ac7153f2c61ff5f3de39632))
-* **identity:** fix signatrue when changing identity ([71d865b](https://github.com/Alinto/sogo/commit/71d865b86a7c11dc6aa8612999ae515f14a3bdf2))
-* **login:** prevent user search for login keyword ([6f91600](https://github.com/Alinto/sogo/commit/6f916008e9e30bceaf5942e0c8645006d07d3aec))
-* **Mail:** correctly update quota when refreshing ([af984f5](https://github.com/Alinto/sogo/commit/af984f58c043cb7ddc8597f119c8a5b9737612b2))
-* **mail:** use the correct replyTo when set to a non*default identity ([03fa91d](https://github.com/Alinto/sogo/commit/03fa91dc22b268ce230f78e7386234ca84814f27))
-* **minsearch:** fix instance of minsearch ([d7e5165](https://github.com/Alinto/sogo/commit/d7e51655fb0a543cff68a9fbc10ceb67540e4bec))
-* **tool:** rename-user properly change data in c_defaults and c_settings ([d69f55c](https://github.com/Alinto/sogo/commit/d69f55c265e0e5873032d5e14e49636ed6c36631))
-* **trad:** typo in a transation key ([e2b8494](https://github.com/Alinto/sogo/commit/e2b8494a9cde046a8aad71808353366c328e0230))
-* **ui:** prevent UI to search for users with empty string ([389e8e6](https://github.com/Alinto/sogo/commit/389e8e64c4933edbcc1f756f422594e70d70c903))
-* **vulnerability:** prevent javascript njection with hint query ([e821b20](https://github.com/Alinto/sogo/commit/e821b20f87d1a9757f1d0aff7d1e31703f97054b))
-* **vulnerability:** prevent sogo to execute scripts pass in theme query ([16ab99e](https://github.com/Alinto/sogo/commit/16ab99e7cf8db2c30b211f0d5e338d7f9e3a9efb))
-* **vulnerability:** prevent xss with events, tasks and contacts categories ([e9b3f2a](https://github.com/Alinto/sogo/commit/e9b3f2a43d7557e8416f6749df4ab4f9128af2d1))
-* **vulnerability:** properly change the totp code after disabling it ([83d4c52](https://github.com/Alinto/sogo/commit/83d4c522f87cfde0ba543837d9b24c3479083ec2))
-
-
-### Localization
-
-* **ca:** Update Catalan translations ([4a587fe](https://github.com/Alinto/sogo/commit/4a587fe00044bfce55186a7f75af64b5256399d7))
-* **es_ES:** Update SpanishSpain translations ([6ce884b](https://github.com/Alinto/sogo/commit/6ce884b3e71cc08c1e3eedb722be00ade6d1263f))
-* **pt_BR:** Update BrazilianPortuguese translations ([39b820a](https://github.com/Alinto/sogo/commit/39b820a5490eadbbadc6872f0814c23b7a6d4a13))
-* **pt:** Add Greek (partial) ([1fdb4d3](https://github.com/Alinto/sogo/commit/1fdb4d30261f5d69d83eef7d8615ef62ddd94a7e))
-* **pt:** Update Portuguese translations ([fbd056c](https://github.com/Alinto/sogo/commit/fbd056cc293a7c53f0ff0de4dd8a50a0d998291f))
-* **ru:** Update Russian translations ([1be58da](https://github.com/Alinto/sogo/commit/1be58da745b875aeb12096ac8fb8c51c6df99068))
-* **th:** Update Thai translations ([d993227](https://github.com/Alinto/sogo/commit/d993227b36b6fbddebf113a5b544aa3bebf01bcc))
-
-## [5.12.4](https://github.com/Alinto/sogo/compare/SOGo-5.12.3...SOGo-5.13.0) (2025-10-06)
-
-
-### Enhancements
-
-* **mail:** Add a setting to show the attachments above the mail body ([5d61660](https://github.com/Alinto/sogo/commit/5d616600dfa6258e4eebcb5c065e393ebfae8f3a))
-
-### Bug Fixes
-
-* **calendar:** fetch our own iana timezone instead of trusting VTIMEZONE ([244d138](https://github.com/Alinto/sogo/commit/244d1388eb00c060c5302e5bfd997fd397820bc0))
-* **curl:** properly close curl connection ([42f620e](https://github.com/Alinto/sogo/commit/42f620e56201e17391532507c02ae370f117c574))
-* **eas:** use proper imap mech for EAS request when using openid ([a7f7950](https://github.com/Alinto/sogo/commit/a7f7950d91c83acd75c0b0d55dec74ab85d38d6c))
-* **ldap:** don't try to fetch for a nobody user ([4d8cca1](https://github.com/Alinto/sogo/commit/4d8cca10f63aff9499b71d61d59d6f81570eb659))
-* **label:** ensure the translation kept is not null ([0fb3db0](https://github.com/Alinto/sogo/commit/0fb3db060871a14e2abd8c6963ccd812cbacf200))
-* **label:** missing trad ([23c8648](https://github.com/Alinto/sogo/commit/23c8648169b4893aaafa2e369259d94d56c76831))
-* **ldap:** fetch the correct user source when creating an event with an attendee ([736d758](https://github.com/Alinto/sogo/commit/736d7589b16be4ebcf9fc6931a79187888c3b444))
-* **login:** Only remember the login if the auth was successful ([9e20190](https://github.com/Alinto/sogo/commit/9e20190fad1a437f7e1307f0adcfe19a8d45184c))
-* **log:** remove the ics from the log line ([86d94ab](https://github.com/Alinto/sogo/commit/86d94ab8fefaf3aa5ba99e13c28a0b24036d94ff))
-* **mailer:** correctly show interline for p element ([666c979](https://github.com/Alinto/sogo/commit/666c979eeae6d51a6bc09684ebbab57ed9ce4b91))
-* **mailer:** don't add mailto: to string starting with @ ([9817487](https://github.com/Alinto/sogo/commit/981748754a4857bab66a6fb94cdc5da4265ce003))
-* **mail:** preoperly generates the message-id header value ([7bee193](https://github.com/Alinto/sogo/commit/7bee193413935ca03e4936a15791fbbb534493ec))
-* **openid:** correcly type userTokenInterval ([4ef79e2](https://github.com/Alinto/sogo/commit/4ef79e219c289697eec0c2d100c8af1a5d0889b6))
-* **password:** Correctly check the secret question answer when hitting enter instead of the button next ([ed7a136](https://github.com/Alinto/sogo/commit/ed7a136e0f2c5ecd35033aef6d0561d9fcf2ccdc))
-* **task:** fix reminder for tasks ([a7651e5](https://github.com/Alinto/sogo/commit/a7651e56c53a4dc33892d86f404a132a2b8af83a))
-* **ui:** add css class for login page ([a077512](https://github.com/Alinto/sogo/commit/a077512e34bf42933457b92613b348ff2e06642a))
-* **calendar:** don't allocate and copy all children for each time we call _filterComponent: ([481a9bf](https://github.com/Alinto/sogo/commit/481a9bf1de1da8e07b5ed4c1786aac89d19ca6c3))
-* **core:** store translations in a globally static NSMutableDictionary ([f48f27c](https://github.com/Alinto/sogo/commit/f48f27c812466ce806ab60b43ebe5a2bfc97ed0a))
-
-### Localization
-
-* **ar:** Update Arabic translations ([6c3e661](https://github.com/Alinto/sogo/commit/6c3e66142f50c68ee9b1435e5d6961573e7445d4))
-* **bg_BG:** Update Bulgarian translations ([4585293](https://github.com/Alinto/sogo/commit/4585293d999152e6c7b54f00f73f925051a4ed64))
-* **bs_BA:** Update Bosnian translations ([4461122](https://github.com/Alinto/sogo/commit/446112269705ae1565a21d3e39e4665c172fc3d4))
-* **ca:** Update Catalan translations ([b77129e](https://github.com/Alinto/sogo/commit/b77129e2e7608f163eeeb1c4ed7e35fb5558c3cb))
-* **cs:** Update Czech translations ([f252e0e](https://github.com/Alinto/sogo/commit/f252e0e2c271118cceb2979a828f5220350ba57f))
-* **cy:** Update Welsh translations ([6425a62](https://github.com/Alinto/sogo/commit/6425a62e1ab8900dc83df5ca165eb92718856886))
-* **da_DK:** Update Danish translations ([ae293ec](https://github.com/Alinto/sogo/commit/ae293ec3ce7488530199e82bd7bde50b2d506a43))
-* **de:** Update German translations ([95e1937](https://github.com/Alinto/sogo/commit/95e19379f6fa698f54a09d7b7bcb4cfe16b4c358))
-* **es_AR:** Update SpanishArgentina translations ([07e9d34](https://github.com/Alinto/sogo/commit/07e9d34865e57fa64f8db1b7ed4a5a67a0c1f234))
-* **es_ES:** Update SpanishSpain translations ([c755ab3](https://github.com/Alinto/sogo/commit/c755ab3b4ea5ecad2c98d396d6bca6d873d0f1de))
-* **eu:** Update Basque translations ([b96e531](https://github.com/Alinto/sogo/commit/b96e531f662a41802bd83e54e4a8055987d36164))
-* **fi:** Update Finnish translations ([c0c506f](https://github.com/Alinto/sogo/commit/c0c506f9103b12ed5a39b340c4bccac500a2f6a8))
-* **fr:** Update French translations ([a914fd4](https://github.com/Alinto/sogo/commit/a914fd4151e5565d4f168819c2664dc460587dec))
-* **gl:** Update Galician translations ([f017fef](https://github.com/Alinto/sogo/commit/f017fef4b2a86f210f36bd5e62afe37c7bba3a18))
-* **he:** Update Hebrew translations ([070705a](https://github.com/Alinto/sogo/commit/070705acfaa65ad435c1d2fa659e4b1f333b59a8))
-* **hr_HR:** Update Croatian translations ([e662f10](https://github.com/Alinto/sogo/commit/e662f10389795e281abd283775f0d168a519e25d))
-* **hu:** Update Hungarian translations ([799e8c2](https://github.com/Alinto/sogo/commit/799e8c21af79b2a8beb082a9d56a238aee30ae4a))
-* **id_ID:** Update Indonesian translations ([56e4929](https://github.com/Alinto/sogo/commit/56e4929ca78c105dde470a6d26749b1328fad47f))
-* **is:** Update Icelandic translations ([401e2f5](https://github.com/Alinto/sogo/commit/401e2f51cd3a69afa72fb76ffeb8fc91a5779cca))
-* **it:** Update Italian translations ([1bb74c7](https://github.com/Alinto/sogo/commit/1bb74c75227f858d680035a5eccd7c5ef954f869))
-* **ja:** Update Japanese translations ([9a295c5](https://github.com/Alinto/sogo/commit/9a295c5944886df95b941f716fc5e6b4c62525b7))
-* **kk:** Update Kazakh translations ([6514fbb](https://github.com/Alinto/sogo/commit/6514fbb8f1c2745dd44be49c72da88937fcf107f))
-* **ko:** Update Korean translations ([ed91211](https://github.com/Alinto/sogo/commit/ed9121175aa6164a73987a247cebe47e53676529))
-* **lt:** Update Lithuanian translations ([2b455fe](https://github.com/Alinto/sogo/commit/2b455fe587f96700c4398538b995680251660ac1))
-* **lv:** Update Latvian translations ([ad7dc8f](https://github.com/Alinto/sogo/commit/ad7dc8f45ee316c4d39ebf5fa71207947b4be2f8))
-* **mk_MK:** Update Macedonian translations ([798bed5](https://github.com/Alinto/sogo/commit/798bed54e2eb0f76f26dc6c6c423285c565b9888))
-* **nb_NO:** Update NorwegianBokmal translations ([eab6d9f](https://github.com/Alinto/sogo/commit/eab6d9f2492eccc2397c3ad49ab284223cb8771c))
-* **nl:** Update Dutch translations ([b42882b](https://github.com/Alinto/sogo/commit/b42882b564ad9aa1b510b00d06da21688d959785))
-* **nn_NO:** Update NorwegianNynorsk translations ([3a442f1](https://github.com/Alinto/sogo/commit/3a442f1b3d38350a5544f0fb62718f45b70c37ad))
-* **pl:** Update Polish translations ([16fcb46](https://github.com/Alinto/sogo/commit/16fcb46c4be26497d12be712c5bacf0f0056a5b3))
-* **pt_BR:** Update BrazilianPortuguese translations ([9d277c3](https://github.com/Alinto/sogo/commit/9d277c3f157e21183648609e5bee429559e87a63))
-* **pt:** Update Portuguese translations ([972ffcc](https://github.com/Alinto/sogo/commit/972ffcc0c6f4f67da5557da28b6c5af87d632b96))
-* **ro_RO:** Update Romanian translations ([ec4d780](https://github.com/Alinto/sogo/commit/ec4d7807d994836218c6ba9c5979283623a520d4))
-* **ru:** Update Russian translations ([1a80fd6](https://github.com/Alinto/sogo/commit/1a80fd6284750cc9997e6cbbafcdf86765032405))
-* **sk:** Update Slovak translations ([0f24c17](https://github.com/Alinto/sogo/commit/0f24c175163e2a000d6cace4d9302cae384f3b49))
-* **sl_SI:** Update Slovenian translations ([645be8f](https://github.com/Alinto/sogo/commit/645be8fcc53cd2729dad9906e66a8f630cffaf52))
-* **sr_ME@latin:** Update Montenegrin translations ([3dc9b90](https://github.com/Alinto/sogo/commit/3dc9b9099223940ec4a4f660d499ac450398d6cc))
-* **sr@latin:** Update SerbianLatin translations ([c675dbf](https://github.com/Alinto/sogo/commit/c675dbfaa70755abf4300462f538dfa878c7c969))
-* **sr:** Update Serbian translations ([dd367b0](https://github.com/Alinto/sogo/commit/dd367b0e94b74dccfc862d9ca07906cc16234965))
-* **sv:** Update Swedish translations ([2ebb637](https://github.com/Alinto/sogo/commit/2ebb63767e53c39bc982d9959dabacfdce8b9b19))
-* **th:** Update Thai translations ([f86a32d](https://github.com/Alinto/sogo/commit/f86a32d0a148b8465a01f098855dc58470c1a689))
-* **tr_TR:** Update TurkishTurkey translations ([8c38c9c](https://github.com/Alinto/sogo/commit/8c38c9ce038e902d4b79f2093448ffec2c1f1d55))
-* **uk:** Update Ukrainian translations ([5021376](https://github.com/Alinto/sogo/commit/5021376daf92c95a69afa2a2d99cf559f858d478))
-* **zh_CN:** Update ChineseChina translations ([22ab0b3](https://github.com/Alinto/sogo/commit/22ab0b3c751f7c20c234c1824552aaa4c661f983))
-* **zh_TW:** Update ChineseTaiwan translations ([c7a519c](https://github.com/Alinto/sogo/commit/c7a519ca124121e259a00473e6163cbd93e16aa4))
-
-### [5.12.3](https://github.com/Alinto/sogo/compare/SOGo-5.12.2...SOGo-5.12.3) (2025-07-12)
-
-
-### Bug Fixes
-
-* **calendar:** fix recurrent event last date ([3ab8677](https://github.com/Alinto/sogo/commit/3ab86776e2ea826e043e3a0519097538853d82e3)), closes [#8766b7](https://bugs.sogo.nu/view.php?id=8766b7)
-* **view:** automatically refresh view only if a number is set. ([55dbae6](https://github.com/Alinto/sogo/commit/55dbae6bee9bdd1aa00333320ba076617cbfb0fc))
-
-## [5.12.2](https://github.com/Alinto/sogo/compare/SOGo-5.12.1...SOGo-5.12.2) (2025-06-25)
-
-
-### Features
-
-* **api:** add endpoint for caldav/cardav url ([51f1521](https://github.com/Alinto/sogo/commit/51f1521dba2d0ca8bdbadffadb16db26b975f668))
-* **openid:** swicth to libcurl for http request ([a782424](https://github.com/Alinto/sogo/commit/a782424a30cfe8e9c6f2769a45bcdd3498679237))
-
-
-### Bug Fixes
-
-* **api:** add handler for internal error ([dabad1d](https://github.com/Alinto/sogo/commit/dabad1d0cf46263d78558d79d2af9fff528a9a89))
-* **calendar:** properly evalute last occurance freebusy ([8766b7c](https://github.com/Alinto/sogo/commit/8766b7c6b32aedf37d7f8f350e461931b253a4fb))
-* **openid:** add state in connection flow ([085fc4a](https://github.com/Alinto/sogo/commit/085fc4a9eb7d1e2a0f7b48baa1f09a8ba0d515e1))
-* **openid:** allow expires_in param to be null ([9954c36](https://github.com/Alinto/sogo/commit/9954c3607bfda55424f5ac532a1075407235f345))
-* **openid:** make end_session_endpoint optional ([c5fb348](https://github.com/Alinto/sogo/commit/c5fb3482e22f1bfc935213e8ed7208becd9bd1f4))
-* **password:** put correct regex for special char ([e36d0d2](https://github.com/Alinto/sogo/commit/e36d0d219baed8c7d57af0069fadb8d1bf7df072))
-* **session:** allow password/token to be longer than userkey ([516606b](https://github.com/Alinto/sogo/commit/516606baff5674c25da1e76f532ca2a9d7818ec0))
-* **sieve:** add requirements for notify when doing a filter ([f53d7b7](https://github.com/Alinto/sogo/commit/f53d7b73db3d87a17a253bf98ee09a80052b3fd8))
-* **view:** don't hide the option mailcomposer in small screen ([8a90773](https://github.com/Alinto/sogo/commit/8a907737de336f873047ecdc7d5c8ac07ae9e45b))
-
-
-### Localization
-
-* **nl:** Update Dutch translations ([031e117](https://github.com/Alinto/sogo/commit/031e117cbacf9d41caff43be19e639dee81b84dc))
-* **pt:** Update Portuguese translations ([9649ae3](https://github.com/Alinto/sogo/commit/9649ae345f334d390860b0db70db8c3b621f513e))
-* **tr_TR:** Update TurkishTurkey translations ([e9c03d3](https://github.com/Alinto/sogo/commit/e9c03d3cf7e668866ac757f72d87cdc4709c9d33))
-
 ## [5.12.1](https://github.com/Alinto/sogo/compare/SOGo-5.12.0...SOGo-5.12.1) (2025-04-30)


@@ -1,4 +1,5 @@
-= Installation and Configuration Guide
+Installation and Configuration Guide
+====================================
 ////

    This file is part of the SOGo project.
@@ -9,8 +10,8 @@
 ////
 include::includes/global-attributes.asciidoc[]

-
-== About this Guide
+About this Guide
+----------------

 This guide will walk you through the installation and configuration of
 the SOGo solution. It also covers the installation and configuration of
@@ -22,8 +23,8 @@ 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.

-
-== Introduction
+Introduction
+------------

 SOGo is a free and modern scalable groupware server. It offers shared
 calendars, address books, and emails through your favourite Web browser
@@ -47,8 +48,8 @@ device, or Outlook 2013/2016
 SOGo is developed by a community of developers located mainly in North
 America and Europe. More information can be found at https://sogo.nu/

-
-=== Architecture and Compatibility
+Architecture and Compatibility
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 image::images/architecture.png[System Architecture, 400, 964]

@@ -60,11 +61,11 @@ protocol are also supported.
 To install and configure the Outlook CalDav Synchronizer, please refer
 to the _Outlook Connector Configuration Guide_.

+System Requirements
+-------------------

-== System Requirements
-
-
-=== Assumptions
+Assumptions
+~~~~~~~~~~~

 SOGo reuses many components in an infrastructure. Thus, it requires the
 following:
@@ -72,7 +73,7 @@ following:
 * Database server (MariaDB, MySQL, PostgreSQL or Oracle)
 * LDAP server (OpenLDAP, Novell eDirectory, Microsoft Active Directory
 and others) 
-* SMTP server (Postfix)
+* SMTP server (Postfix, Sendmail and others)
 * IMAP server (Courier, Cyrus IMAP Server, Dovecot and others)

 If you plan to use ActiveSync, an IMAP server supporting the ACL,
@@ -103,8 +104,8 @@ components, together with version numbers:

 More recent versions of the software mentioned above can also be used.

-
-=== Minimum Hardware Requirements
+Minimum Hardware Requirements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The following table provides hardware recommendations for the server,
 desktops and mobile devices:
@@ -156,8 +157,8 @@ Linux
 Microsoft ActiveSync.
 |=======================================================================

-
-=== Operating System Requirements
+Operating System Requirements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The following operating systems are currently supported by SOGo:

@@ -181,19 +182,16 @@ directly to the SOGo website at https://sogo.nu/faq/installation.html.
 Note that once the SOGo packages are installed under Debian and Ubuntu,
 this guide can be followed in order to fully configure SOGo.

-
-== Installation
+Installation
+------------

 This section will guide you through the installation of SOGo together
 with its dependencies. The steps described here apply to an RPM-based
 installation for a Red Hat or CentOS 7 distribution. Most of these steps
 should apply to all supported operating systems.

-
-=== Software Downloads
-
-**In order to access the community build, go to https://www.sogo.nu/download.html[SOGo website]
-and select "Development (nightly builds)" at the bottom of the page.**
+Software Downloads
+~~~~~~~~~~~~~~~~~~

 [NOTE]
 In order to access the production builds, you need a proper support contract
@@ -254,8 +252,8 @@ sed -i '/enabled=1/a exclude=gnustep* ytnef*' /etc/yum.repos.d/epel.repo

 For more information on EPEL, visit http://fedoraproject.org/wiki/EPEL/.

-
-=== Software Installation
+Software Installation
+~~~~~~~~~~~~~~~~~~~~~

 Once the yum configuration file has been created, you are now ready to
 install SOGo and its dependencies. To do so, proceed with the following
@@ -275,8 +273,8 @@ for Oracle. The installation command will thus look like this:
 Once completed, SOGo will be fully installed on your server. You are now
 ready to configure it.

-
-== Configuration
+Configuration
+-------------

 In this section, you'll learn how to configure SOGo to use your existing
 LDAP, SMTP and database servers. As previously mentioned, we assume that
@@ -284,8 +282,8 @@ those components run on the same server on which SOGo is being
 installed. If this is not the case, please adjust the configuration
 parameters to reflect those changes.

-
-=== GNUstep Environment Overview
+GNUstep Environment Overview
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo makes use of the GNUstep environment. GNUstep is a free software
 implementation of the OpenStep specification which provides many
@@ -318,8 +316,8 @@ wrapped within curly brackets `{ [configuration] }`. If SOGo refuses to
 start due to syntax errors in its configuration file, `plparse` is helpful
 for finding these, as it indicates the line containing the problem.

-
-=== Preferences Hierarchy
+Preferences Hierarchy
+~~~~~~~~~~~~~~~~~~~~~

 SOGo supports domain names segregation, meaning that you can separate
 multiple groups of users within one installation of SOGo. A user
@@ -349,8 +347,8 @@ following abbreviations in the tables of this document:
 Remember that the hierarchy paradigm allow the default value of a
 parameter to be defined at a parent level.

-
-=== General Preferences
+General Preferences
+~~~~~~~~~~~~~~~~~~~

 The following table describes the general parameters that can be set:

@@ -840,16 +838,6 @@ Obiously, if your users can connect without specifying a domain, let this parame
 |S |SOGoPasswordRecoveryEnabled
 |Boolean enable password recovery with secret question or secondary e-mail. Default value is `NO`.

-|S |SOGoPasswordRecoveryBaseURLs
-| *Since 5.12.11*. List of allowed base URL for password reset link.
-
-`SOGoPasswordRecoveryBaseURLs = ("https://demo.sogo.nu");`
-`SOGoPasswordRecoveryBaseURLs = ("https://platform1.sogo.nu", "https://platform2.sogo.nu);`
-
-Do not end the URLs by '/'.
-
-No defaults, will throw an error if empty or unset.
-
 |S |SOGoPasswordRecoveryDomains
 |List of domains where password recovery is enabled, for example `(example.org, example.net)`. If empty array `()`, disabled for all domains. If not set, enabled for all domains.

@@ -888,8 +876,8 @@ No defaults, will throw an error if empty or unset.

 [[Secret-for-sensitive-data]]

-
-=== Secret for sensitive data
+Secret for sensitive data
+~~~~~~~~~~~~~~~~~~~~~~~~~

 _Since 5.10_

@@ -983,7 +971,8 @@ sogo-tool user-preferences unset default <user> AuxiliaryMailAccounts
 user being the full mail address or just the username if domainless. After that, the user will have to set its auxiliary accounts again.


-=== Authentication using LDAP
+Authentication using LDAP
+~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo can use a LDAP server to authenticate users and, if desired, to
 provide global address books. SOGo can also use an SQL backend for this
@@ -1393,8 +1382,8 @@ Defaults to `NO` when unset.

 |=======================================================================

-
-=== LDAP Attributes Indexing
+LDAP Attributes Indexing
+~~~~~~~~~~~~~~~~~~~~~~~~

 To ensure proper performance of the SOGo application, the following LDAP
 attributes must be fully indexed:
@@ -1410,8 +1399,8 @@ attributes must be fully indexed:
 Please refer to the documentation of the software you use in order to
 index those attributes.

-
-=== LDAP Attributes Mapping
+LDAP Attributes Mapping
+~~~~~~~~~~~~~~~~~~~~~~~

 Some LDAP attributes are mapped to contacts attributes in the SOGo UI.
 The table below list most of them. It is possible to override these by
@@ -1471,8 +1460,8 @@ mapping = {
 |Photo |photo
 |===

-
-=== Authenticating using C.A.S.
+Authenticating using C.A.S.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo natively supports C.A.S. authentication. For activating C.A.S.
 authentication you need first to make sure that the
@@ -1575,8 +1564,8 @@ expected by pam_cas, otherwise it will fail to authenticate incoming
 connection properly.


-[[openid-section]]
-=== Authenticating using OPENID
+Authenticating using OPENID
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo natively supports OPENID authentication. For activating OpenId authentication you need first to make sure that
 _SOGoAuthenticationType_ is set to `openid`,
@@ -1649,8 +1638,8 @@ the session will stays in the table and be useless. That's why a new sogo-tool c
 You can put it in a cron to do that periodicly. +
 See _<<sogo-tool-clean-openid-sessions,sogo-tool clean-openid-sessions>>_.

-
-=== Authenticating using SAML2
+Authenticating using SAML2
+~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo natively supports SAML2 authentication. Please refer to the documentation of your identity
 provider and the SAML2 configuration keys that are listed above for proper setup. Once a SOGo
@@ -1683,7 +1672,8 @@ _NGImap4AuthMechanism_ is configured to use the `SAML` mechanism. If you
 make use of the CrudeSAML PAM plugin, this value may be left empty.


-=== Database Configuration
+Database Configuration
+~~~~~~~~~~~~~~~~~~~~~~

 SOGo requires a relational database system in order to store
 appointments, tasks and contacts information. It also uses the database
@@ -1930,9 +1920,10 @@ calendar.

 Ensure the computer used for the test has emoji fonts installed.

-
 [[Authentication-using-SQL]]
-=== Authentication using SQL
+
+Authentication using SQL
+~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo can use a SQL-based database server for authentication. The
 configuration is very similar to LDAP-based authentication.
@@ -2169,8 +2160,8 @@ or username@domain.tld
 Note that groups are currently not supported for SQL-based
 authentication sources.

-
-=== SMTP Server Configuration
+SMTP Server Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo makes use of a SMTP server to send emails from the Web interface,
 iMIP/iTIP messages and various notifications.
@@ -2184,6 +2175,7 @@ The following table describes the related parameters.
 are:

 [options="compact"]
+* `sendmail` - to use the sendmail binary
 * `smtp` - to use the SMTP protocol

 |D |SOGoSMTPServer
@@ -2211,6 +2203,10 @@ Current, Are supported `PLAIN` and 'xoauth2' for openid.
 |D |SOGoSMTPMasterUserPassword
 |SMTP account password for master account (`SOGoSMTPMasterUserEnabled` enabled).

+|S |WOSendMail
+|The path of the sendmail binary.
+
+Defaults to `/usr/lib/sendmail`.

 |D |SOGoForceExternalLoginWithEmail
 |Parameter used to specify if, when logging in to the SMTP server, the
@@ -2224,8 +2220,8 @@ Possible values are:
 Defaults to `NO` when unset.
 |=======================================================================

-
-=== IMAP Server Configuration
+IMAP Server Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo requires an IMAP server in order to let users consult their email
 messages, manage their folders and more.
@@ -2393,8 +2389,8 @@ permissions for the individual user.
 The default prefix is `$`. 
 |=======================================================================

-
-=== Web Interface Configuration
+Web Interface Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The following additional parameters only affect the Web interface
 behaviour of SOGo.
@@ -2896,27 +2892,13 @@ SOGoMailJunkSettings = {
 };
 ----

-|D |mailJunkIcon
-|Choose the Junk icon. Values are :
-https://materialui.co/icon/thumb-down[thumb_down],
-https://materialui.co/icon/gpp-bad[gpp_bad],
-https://materialui.co/icon/local-fire-department[local_fire_department],
-https://materialui.co/icon/bug-report[bug_report],
-https://materialui.co/icon/error[error],
-https://materialui.co/icon/warning[warning],
-https://materialui.co/icon/dangerous[dangerous] and
-https://materialui.co/icon/report-gmailerrorred[report_gmailerrorred].
-
-
-Defaults to `thumb_down`.
-
 |D |SOGoMailKeepDraftsAfterSend
 |Parameter used to keep mails in the drafts folder once they have been
 sent by SOGo. Defaults to `NO` when unset.
 |=======================================================================

-
-=== SOGo Configuration Summary
+SOGo Configuration Summary
+~~~~~~~~~~~~~~~~~~~~~~~~~~

 The complete SOGo configuration file `/etc/sogo/sogo.conf` should look
 like this:
@@ -2964,9 +2946,10 @@ like this:
 }
 ----

-
 [[multi-domains-configuration]]
-=== Multi-domains Configuration
+
+Multi-domains Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 If you want your installation to isolate two groups of users, you must
 define a distinct authentication source for each _domain_. Your domain keys
@@ -3062,8 +3045,8 @@ Defaults to an empty array, which means domains are isolated from each
 other.
 |=======================================================================

-
-=== Apache Configuration
+Apache Configuration
+~~~~~~~~~~~~~~~~~~~~

 The SOGo configuration for Apache is located in
 `/etc/httpd/conf.d/SOGo.conf`.
@@ -3092,8 +3075,8 @@ The default configuration will use `mod_proxy` and `mod_headers` to
 relay requests to the `sogod` parent process. This is suitable for small
 to medium deployments.

-
-=== Starting Services
+Starting Services
+~~~~~~~~~~~~~~~~~

 Once SOGo if fully installed and configured, start the services using
 the following command:
@@ -3109,8 +3092,8 @@ modules and configuration files were added:
 Finally, you should also make sure that the `memcached` service is
 started and that it is also automatically started at boot time.

-
-=== _Cronjob_ — EMail reminders
+_Cronjob_ — EMail reminders
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo allows you to set email-based reminders for events and tasks. To
 enable this, you must enable the `SOGoEnableEMailAlarms` preference and
@@ -3137,8 +3120,8 @@ SOGoSMTPMasterUserUsername = "foo";
 SOGoSMTPMasterUserPassword = "bar";
 ```

-
-=== _Cronjob_ — Vacation messages activation and expiration
+_Cronjob_ — Vacation messages activation and expiration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 When vacation messages are enabled (see the parameter
 _SOGoVacationEnabled_), users can set an activation or expiration date
@@ -3159,8 +3142,8 @@ The _cronjob_ should look like this:
 0 0 * * * sogo /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds
 ----

-
-=== _Password_ — Force user password change at login
+_Password_ — Force user password change at login
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The following commands force user to change his password at login :

@@ -3174,11 +3157,11 @@ Disable :
 /usr/sbin/sogo-tool user-preferences unset settings [USER] ForceResetPassword
 ----

+Managing User Accounts
+----------------------

-== Managing User Accounts
-
-
-=== Creating the SOGo Administrative Account
+Creating the SOGo Administrative Account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 First, create the SOGo administrative account in your LDAP server. The
 following LDIF file (`sogo.ldif`) can be used as an example:
@@ -3205,8 +3188,8 @@ administrative account using the following command:

 ldappasswd -h 127.0.0.1 -x -w qwerty -D cn=Manager,dc=acme,dc=com uid=sogo,ou=users,dc=acme,dc=com -s qwerty

-
-=== Creating a User Account
+Creating a User Account
+~~~~~~~~~~~~~~~~~~~~~~~

 SOGo uses LDAP directories to authenticate users. Use the following LDIF
 file (`jdoe.ldif`) as an example to create a SOGo user account:
@@ -3239,8 +3222,8 @@ easier. These GUI utilities can make use of templates to create and
 pre-configure typical user accounts or any standardized LDAP record,
 along with the correct object classes, fields and default values.

-
-=== Microsoft Enterprise ActiveSync
+Microsoft Enterprise ActiveSync
+-------------------------------

 SOGo supports the Microsoft ActiveSync protocol.

@@ -3376,8 +3359,8 @@ and send an email to iplicreq@microsoft.com
 Alinto provides this software for free, but is not responsible for
 anything related to its usage.

-
-== Microsoft Enterprise ActiveSync Tuning
+Microsoft Enterprise ActiveSync Tuning
+--------------------------------------

 First of all, it is important to know that most EAS devices will keep
 HTTP connections open to SOGo (and thus, Apache) for a long time. This
@@ -3452,8 +3435,8 @@ SOGoMaximumSyncInterval = 3540;
 SOGoInternalSyncInterval = 60;
 ----

-
-== S/MIME Support in SOGo
+S/MIME Support in SOGo
+----------------------

 SOGo supports S/MIME email signing and encryption. When receiving
 S/MIME signed emails, SOGo automatically extracts the PKCS (Public-Key
@@ -3471,10 +3454,11 @@ please have a look at Actalis:
 https://www.actalis.it/products/certificates-for-secure-electronic-mail.aspx


-== Using SOGo
+Using SOGo
+----------

-
-=== SOGo Web Interface
+SOGo Web Interface
+~~~~~~~~~~~~~~~~~~

 To acces the SOGo Web Interface, point your Web browser, which is
 running from the same server where SOGo was installed, to the following
@@ -3483,8 +3467,8 @@ URL: http://127.0.0.1/SOGo.
 Log in using the "jdoe" user and the "qwerty" password. The underlying
 database tables will automatically be created by SOGo.

-
-=== Mozilla Thunderbird and Lightning
+Mozilla Thunderbird and Lightning
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Alternatively, you can access SOGo with a GroupDAV and a CalDAV client.
 A typical well-integrated setup is to use Mozilla Thunderbird and
@@ -3526,8 +3510,8 @@ To access your personal calendar:
 `http://127.0.0.1/SOGo/dav/jdoe/Calendar/personal/`
 * Click on Continue.

-
-=== Apple Calendar (macOS, iOS, iPadOS)
+Apple Calendar (macOS, iOS, iPadOS)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Apple Calendar on macOS, iOS, and iPadOS can also be used
 as a client application for SOGo.
@@ -3545,8 +3529,8 @@ You have to add the profile to your device :
 * Go to Settings / Profiles / Click on + / Continue
 * Type your SOGo account password and click on install

-
-=== Apple AddressBook
+Apple AddressBook
+~~~~~~~~~~~~~~~~~

 Since Mac OS X 10.6 (Snow Leopard), Apple AddressBook can be configured
 to use SOGo.
@@ -3594,8 +3578,8 @@ You have to add the profile to your device :
 * Go to Settings / Profiles / Click on + / Continue
 * Type your SOGo account password and click on install

-
-=== Microsoft ActiveSync
+Microsoft ActiveSync
+~~~~~~~~~~~~~~~~~~~~

 You can synchronize contacts, emails, events and tasks from SOGo with
 any mobile devices that support Microsoft ActiveSync. Microsoft Outlook
@@ -3604,9 +3588,8 @@ any mobile devices that support Microsoft ActiveSync. Microsoft Outlook
 The Microsoft ActiveSync server URL is generally something
 like: `http://127.0.0.1/Microsoft-Server-ActiveSync`.

-
-== Using sogo-tool
-
+Using sogo-tool
+---------------
 The command _sogo-tool_ allows to do some operations on database and sieve filter. It is included with
 the sogo package on Debian/Ubuntu but must be installed manually on RHEl/CentOS:

@@ -3615,8 +3598,8 @@ the sogo package on Debian/Ubuntu but must be installed manually on RHEl/CentOS:
 *_WARNING_: Use sogo-tool with full awareness of what you are doing. This is an admin tool that can cause loss of data
 or completely make the webmail unusable by a user.*

-
-=== sogo-tool backup/restore
+sogo-tool backup/restore
+~~~~~~~~~~~~~~~~~~~~~~~~

 The backup tool saves the information of a user into a file. The information saved are its preferences, its events and its contacts.

@@ -3697,8 +3680,8 @@ sogo-tool restore -F "Contacts/personal" tmp/backup user1
 sogo-tool restore -F "Calendar/60C8-65323D80-7-4D9F7D80" tmp/backup user1
 ----

-
-=== sogo-tool checkup
+sogo-tool checkup
+~~~~~~~~~~~~~~~~~

 Check the events and contacts data's integrity of a user

@@ -3729,8 +3712,8 @@ sogo-tool checkup -d user1

 [[sogo-tool-clean-openid-sessions]]

-
-=== sogo-tool clean-openid-sessions
+sogo-tool clean-openid-sessions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Obviously only usefull if you have set SOGo with openId authentication.
 Will clean all expired openId sessions from the database.
@@ -3742,8 +3725,8 @@ Example:
 sogo-tool clean-openid-sessions
 ----

-
-=== sogo-tool cleanup
+sogo-tool cleanup
+~~~~~~~~~~~~~~~~~

 Will purge all user's deleted events and contacts which the deletion is older than a number of days.

@@ -3767,7 +3750,8 @@ Purged 5 records from folder /Users/user2/Calendar/personal
 ----


-=== sogo-tool create-folder
+sogo-tool create-folder
+~~~~~~~~~~~~~~~~~~~~~~~

 Create a folder (Calendar or Address Book) for a user.

@@ -3784,31 +3768,8 @@ sogo-tool create-folder user2 Calendar Pro_Calendar
 ----


-=== sogo-tool init-user
-
-Create the personal calendar and the personal address book of one or more users, and initialize
-their preferences. Those folders and preferences are otherwise only created upon the user's first
-login, which prevents any operation on them (setting ACLs or reading the user's preferences from a
-provisioning tool, for instance) beforehand.
-
-The resulting preferences are the same as the ones a login through the web interface would produce.
-
- init-user [-l language] user1 [user2] ...
-
-* *user* is the name of the user
-* *language* is the language of the user's preferences, as it would be chosen at login. When
-omitted, the language of the domain or of the system is used. The categories and labels stored in
-the preferences are localized accordingly.
-
-Example:
----
-sogo-tool init-user user1
-sogo-tool init-user user1 user2
-sogo-tool init-user -l French user1
----
-
-
-=== sogo-tool dump-defaults
+sogo-tool dump-defaults
+~~~~~~~~~~~~~~~~~~~~~~~

 Output all current defaults value of GNUstep and SOGo (sogo.conf)

@@ -3825,8 +3786,8 @@ sogo-tool dump-defaults all
 sogo-tool dump-defaults -f /tmp/foo/conf.xml
 ----

-
-=== sogo-tool expire-sessions
+sogo-tool expire-sessions
+~~~~~~~~~~~~~~~~~~~~~~~~~

 Expires user sessions from database without activity for specified number of minutes. When a user log in to sogo for
 the first time, sogo will create a entry in database's table OCSSessionsFolderURL with the user's information. Sogo will 
@@ -3845,8 +3806,8 @@ sogo-tool expire-sessions 160     #Will remove session which last activity is ol
 sogo-tool expire-sessions 0       #Will remove session which last activity is older than 0 minutes.
 ----

-
-=== sogo-tool manage-acl
+sogo-tool manage-acl
+~~~~~~~~~~~~~~~~~~~~

 Manage access-control list (ACL) of a user for folders (Calendar and Address Book).

@@ -3917,8 +3878,8 @@ Example:
 sogo-tool manage-acl unsubscribe sogo-tests1 Contacts/5E1D-653FC400-1-1A330C40 sogo-tests2
 ----

-
-=== sogo-tool manage-eas
+sogo-tool manage-eas
+~~~~~~~~~~~~~~~~~~~~

 Manage EAS folders

@@ -3948,8 +3909,8 @@ sogo-tool manage-eas mergevcard  janedow androidc316986417 YES
 sogo-tool manage-eas mergevevent janedow androidc316986417 YES
 ----

-
-=== sogo-tool remove
+sogo-tool remove
+~~~~~~~~~~~~~~~~

 Remove all folders (Calendar and Address Book) and Preference settings of a user. The personal Calendar and Address Book
 will stay but be emptied of all entries. The Preferences will go back to defaults values as for a new user.
@@ -3973,8 +3934,8 @@ Deleting /Users/user2/Contacts/B087-65363400-7-374DA380
 Deleting /Users/user2/Contacts/personal
 ----

-
-=== sogo-tool remove-doubles
+sogo-tool remove-doubles
+~~~~~~~~~~~~~~~~~~~~~~~~

 remove duplicate contacts from the specified user addressbook

@@ -3999,8 +3960,8 @@ sogo-tool remove-doubles user1 personal
 sogo-tool remove-doubles user2 489-65376E80-1-2D2BA000
 ----

-
-=== sogo-tool rename-user
+sogo-tool rename-user
+~~~~~~~~~~~~~~~~~~~~~

 Update records pertaining to a user after a change of user id. Will change all folders path, subscriptions from others users,
 all mention of user id in database.
@@ -4018,8 +3979,8 @@ Example:
 sogo-tool rename-user old_username new_username
 ----

-
-=== sogo-tool truncate-calendar
+sogo-tool truncate-calendar
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Remove old calendar entries from the specified user calendar.

@@ -4049,7 +4010,8 @@ Removing 1 records...
 Removed 1 records.
 ----

-=== sogo-tool update-autoreply
+sogo-tool update-autoreply
+~~~~~~~~~~~~~~~~~~~~~~~~~~

 _This command is only useful if your sieve server doesn't have the capabilities *date* or *relational*_
 In that case this command will check vacation's setting of all the users. If vacation is enabled/disabled,
@@ -4069,7 +4031,8 @@ Example:
 [[sogo-tool-update-secret]]


-=== sogo-tool update-secret
+sogo-tool update-secret
+~~~~~~~~~~~~~~~~~~~~~~~

 _New in 5.10_

@@ -4095,7 +4058,8 @@ If your data are already encrypted with 'oldSecret' but you want to decrypt them
 sogo-tool update-secret -o oldSecret
 ----

-=== sogo-tool user-preferences
+sogo-tool user-preferences
+~~~~~~~~~~~~~~~~~~~~~~~~~~

 Get, set or unset user defaults / settings in the database.

@@ -4154,153 +4118,9 @@ sogo-tool user-preferences set defaults user1 Forward -f /path/filename -p cred
 ----


-== API REST

-Starting from 5.12.2, an API with two endpoints is available.
-All response will be on json format. In case of errors, the message will be:
-```json
-{"error" : "message"}
-```
-with an explicit message
-
-=== API server url
-
-_<scheme>_://_<domain>_/SOGo/SOGoAPI/_<action>_
-
-•	*scheme* : https or http
-•	*domain* : domain or ip:port of SOGo's server
-•	*action* : name of the action. No action does the Version action described below.
-
-=== Authentication
-
-Somes actions needs to be authenticated. There is two ways to do so:
-
-* *Basic auth*
-
-Add a header *Auhtorization* with value:
-
-'Basic <credentials>'
-
-*credentials* is the sitrng '<uid>:<password>' base64 encoded.
-
-* *OpenID*
-
-**Only works if you configure sogo to use openid. See <<openid-section, the related section>>**
-
-Add a header *Auhtorization* with value:
-
-'Bearer <access_token>'
-
-*acces_token* is from the https://connect2id.com/products/server/docs/api/token#url[openid protocol]. It has to be fetch with the scope `openid`.
-
-=== Action - Version
-
-*	*URL*: <scheme>://<domain>/SOGo/SOGoAPI/Version
-*	*Authentication needed*: NO
-*	*HTTP method allowed*: GET
-*	*Description*: Return the current version of sogo
-* *Answer structure*:
-```json
-{
-   "major":5,
-   "patch":1,
-   "minor":12
-}
-```
-
-=== Action - UserFolder
-
-*	*URL*: <scheme>://<domain>/SOGo/SOGoAPI/UserFolder
-*	*Authentication needed*: YES
-*	*HTTP method allowed*: GET
-*	*Description*: Return the caldav and cardav links of the authenticated user, plus their names.
-* *Answer structure*:
-```json
-{
-   "calendar":[
-      {
-         "name":"DidyShared",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/12509-67F67D00-1-3105AF40"
-      },
-      {
-         "name":"LocalDidy",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/1BC38-67B60000-1-6E4B6880"
-      },
-      {
-         "name":"Personal Calendar",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Calendar/personal"
-      }
-   ],
-   "username":"sogo-tests1@example.org",
-   "contact":[
-      {
-         "name":"Personal Address Book",
-         "url":"http://127.0.0.1/SOGo/dav/sogo-tests1@example.org/Contacts/personal"
-      }
-   ]
-}
-```
-* *Note*:
-
-The Answer has 3 primary keys:
-
-** *username*: uid of the user.
-** *calendar*: array of calendar's folder info.
-** *contact*: array of calendar's folder info.
-
-A folder info is a dict with:
-
-** *name*: Name of the folder.
-** *url*: Dav link of the folder.
-
-=== Errors and messages
-
-Complete http response is `{“error:” : <message>}`.
-*<action>* is the one used for the request: `<scheme>://<domain>/SOGo/SOGoAPI/<action>`
-
-[%header,cols="1,3,3"]
-|===
-|Status |Message |Description
-
-|400
-|No backend API found for action: <action>
-|The requested action doesn't exist
-
-|500
-|Can't alloc and init class: <classAction>
-|The requested action exist but failed to be instantiated. <classAction> is the class's name
-
-|400
-|Method <method> not allowed for action <action>
-|Http method not allowed. <methos> is the one used (GET, PUT, POST...)
-
-|400
-|Missing param <param> for action <action>
-|Required param for action not found. <param> is the name of the missing parameter.
-
-|401
-|No authorization header found for <action>
-|No Authorization header found
-
-|401
-|Authorization method incorrect: <auth> for action <action>
-|Value of Authorization's header doesn't start with Basic or Bearer. <auth> is the full value.
-
-|401
-|User wrong login or not found for action <action>
-|Fail to authenticate the user. Various causes possible: wrong login, wrong password, expired token...
-
-|500
-|Internal error during: <action>
-|Internal error during the action
-|===
-
-
-To have more logs you can add `SOGoAPIDebugEnabled = YES;` to your sogo.conf.
-
-
-
-== Upgrading
+Upgrading
+---------

 This section describes what needs to be done when upgrading to the
 current version of SOGo from the previous release.
@@ -4308,9 +4128,6 @@ current version of SOGo from the previous release.
 [cols="100a"]
 |=======================================================================

-h|5.12.11
-|If you enable Password Recovery, new mandatory settings `SOGoPasswordRecoveryBaseURLs`
-
 h|5.11
 |Parameters `SOGoGlobalAddressBookFirstEntries` and `SOGoGlobalAddressBookFirstEntriesCount` has been removed. Please use `listRequiresDot` and `globalAddressBookFirstEntriesCount` instead. Signature are now between a div tag to avoid CKEditor changing the content - set `SOGoForceRawHtmlSignature` to `NO` to leave signature (https://bugs.sogo.nu/view.php?id=5920).

@@ -12,8 +12,8 @@

 ////

-
-== Additional Information
+Additional Information
+----------------------

 For more information, please consult the online FAQs (Frequently Asked
 Questions) :
@@ -12,7 +12,8 @@

 ////

-== Commercial Support and Contact Information
+Commercial Support and Contact Information
+------------------------------------------

 For any questions or comments, do not hesitate to contact us by writing
 an email to contact@sogo.nu.
@@ -380,7 +380,7 @@ static BOOL debugLeaks;

  request = [_ctx request];
  login = [SOGoUser getDecryptedUsernameIfNeeded: _key request: request];
-  if([login isEqualToString: @"changeLanguage"] || [login isEqualToString: @"login"])
+  if([login isEqualToString: @"changeLanguage"])
    user = nil;
  else
  {
@@ -76,7 +76,6 @@

 - (BOOL)folderExistsAtPath:(NSString *)_path;
 - (NSArray *)listSubFoldersAtPath:(NSString *)_path recursive:(BOOL)_flag;
- (NSArray *)listSubFoldersAndNamesAtPath:(NSString *)_path recursive:(BOOL)_recursive;

 - (NSDictionary *) recordAtPath: (NSString *) _path;
 - (GCSFolder *)folderAtPath:(NSString *)_path;
@@ -32,12 +32,10 @@
 #import <NGExtensions/NSObject+Logs.h>

 #import <GDLAccess/EOAdaptorContext.h>
-#import <GDLAccess/EOAdaptor.h>
 #import <NGExtensions/NGResourceLocator.h>

 #import "GCSChannelManager.h"
 #import "EOAdaptorChannel+GCS.h"
-#import "EOQualifier+GCS.h"
 #import "GCSAlarmsFolder.h"
 #import "GCSAdminFolder.h"
 #import "GCSOpenIdFolder.h"
@@ -385,12 +383,21 @@ static BOOL       _singleStoreMode           = NO;
  return [[self channelManager] canConnect:[self folderInfoLocation]];
 }

- (NSArray *)performSQL:(NSString *)_sql withChannel: (EOAdaptorChannel*) channel{
+- (NSArray *)performSQL:(NSString *)_sql {
+  EOAdaptorChannel *channel;
  NSException    *ex;
  NSMutableArray *rows;
  NSDictionary   *row;
  NSArray        *attrs;
  
+  /* acquire channel */
+  
+  if ((channel = [self acquireOpenChannel]) == nil) {
+    if (debugOn) [self debugWithFormat:@"could not acquire channel!"];
+    return nil;
+  }
+  if (debugOn) [self debugWithFormat:@"acquired channel: %@", channel];
+  
  /* run SQL */
  
  if ((ex = [channel evaluateExpressionX:_sql]) != nil) {
@@ -506,12 +513,9 @@ static BOOL       _singleStoreMode           = NO;

 - (NSString *)generateSQLWhereForInternalNames:(NSArray *)_names
 				    exactMatch:(BOOL)_beExact orDirectSubfolderMatch:(BOOL)_directSubs
-            withChannel: (EOAdaptorChannel*) channel
 {
  /* generates a WHERE qualifier for matching the "quick" entries */
  NSMutableString *sql;
-  EOAdaptorContext *adaptorContext;
-  EOAdaptor *adaptor;
  unsigned i, count;
  
  if ((count = [_names count]) == 0) {
@@ -519,13 +523,10 @@ static BOOL       _singleStoreMode           = NO;
 	  __PRETTY_FUNCTION__];
    return @"1 = 2";
  }
-
-  adaptorContext = [channel adaptorContext];
-  adaptor = [adaptorContext adaptor]; 
-  sql = [NSMutableString stringWithString:@""];
+  
+  sql = [NSMutableString stringWithCapacity:(count * 8)];
  for (i = 0; i < quickPathCount; i++) {
    NSString *pathColumn;
-    EOQualifier *qualifier;
    char buf[32];
    
    sprintf(buf, GCSPathColumnPattern, (i + 1));
@@ -536,11 +537,8 @@ static BOOL       _singleStoreMode           = NO;
    if (i < count) {
      /* exact match, regular column */
      if ([sql length] > 0) [sql appendString:@" AND "];
-
-      qualifier = [[EOKeyValueQualifier alloc] initWithKey: pathColumn
-                                              operatorSelector: EOQualifierOperatorEqual
-                                                         value: [_names objectAtIndex:i]];
-      [qualifier appendSQLToString: sql withAdaptor: adaptor];
+      [sql appendString:pathColumn];
+      [sql appendFormat:@" = '%@'", [_names objectAtIndex:i]];
    }
    else if (_beExact) {
      /* exact match, ensure that all additional quick-cols are NULL */
@@ -571,12 +569,9 @@ static BOOL       _singleStoreMode           = NO;
  }
  
  if (_beExact && (count > quickPathCount)) {
-    EOQualifier *qualifier;
-    [sql appendString:@" AND "];
-    qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_foldername"
-                                              operatorSelector: EOQualifierOperatorEqual
-                                                         value: [_names lastObject]];
-    [qualifier appendSQLToString: sql withAdaptor: adaptor];
+    [sql appendString:@" AND c_foldername = '"];
+    [sql appendString:[_names lastObject]];
+    [sql appendString:@"'"];
  }
  
  return sql;
@@ -584,15 +579,13 @@ static BOOL       _singleStoreMode           = NO;

 - (NSString *)generateSQLPathFetchForInternalNames:(NSArray *)_names
 					exactMatch:(BOOL)_beExact orDirectSubfolderMatch:(BOOL)_directSubs
-          withChannel: (EOAdaptorChannel*) channel
 {
  /* fetches the 'path' subset for a given quick-names */
  NSMutableString *sql;
  NSString *ws;
  
  ws = [self generateSQLWhereForInternalNames:_names 
-	     exactMatch:_beExact orDirectSubfolderMatch:_directSubs
-       withChannel: channel];
+	     exactMatch:_beExact orDirectSubfolderMatch:_directSubs];
  if ([ws length] == 0)
    return nil;
  
@@ -605,29 +598,6 @@ static BOOL       _singleStoreMode           = NO;
  return sql;
 }

- (NSString *)generateSQLPathAndNameFetchForInternalNames:(NSArray *)_names
-					exactMatch:(BOOL)_beExact orDirectSubfolderMatch:(BOOL)_directSubs
-          withChannel: (EOAdaptorChannel*) channel
-{
-  /* fetches the 'path' subset for a given quick-names */
-  NSMutableString *sql;
-  NSString *ws;
-  
-  ws = [self generateSQLWhereForInternalNames:_names 
-	     exactMatch:_beExact orDirectSubfolderMatch:_directSubs
-       withChannel: channel];
-  if ([ws length] == 0)
-    return nil;
-  
-  sql = [NSMutableString stringWithCapacity:256];
-  [sql appendString:@"SELECT c_path, c_foldername FROM "];
-  [sql appendString:[self folderInfoTableName]];
-  [sql appendString:@" WHERE "];
-  [sql appendString:ws];
-  if (debugSQLGen) [self logWithFormat:@"PathFetch-SQL: %@", sql];
-  return sql;
-}
-
 /* handling folder names */

 - (BOOL)_isStandardizedPath:(NSString *)_path {
@@ -735,7 +705,6 @@ static BOOL       _singleStoreMode           = NO;
  NSString *fname, *sname, *sql;
  NSArray  *fnames, *records;
  unsigned int count;
-  EOAdaptorChannel* channel;
  NSDictionary *record;
  BOOL result;
  
@@ -743,41 +712,36 @@ static BOOL       _singleStoreMode           = NO;

  fnames = [self internalNamesFromPath: _path];
  if (fnames)
-  {
-    if ((channel = [self acquireOpenChannel]) == nil) {
-      return [NSException exceptionWithName:@"GCSNoChannel"
-        reason:@"could not "
-        userInfo:nil];
-    }
-    sql = [self generateSQLPathFetchForInternalNames: fnames 
-                                          exactMatch: YES
-                              orDirectSubfolderMatch: NO
-                              withChannel: channel];
-    if ([sql length])
    {
-      records = [self performSQL: sql withChannel: channel];
-      if (records)
-      {
-        count = [records count];
-        if (count)
-        {
-          fname = [self internalNameFromPath: _path];
-          if (count == 1)
-          {
-            record = [records objectAtIndex: 0];
-            sname = [record objectForKey: GCSPathRecordName];
-            result = [fname isEqualToString: sname];
-          }
-          else
-            [self logWithFormat: @"records: %@", records];
-        }
-      }
+      sql = [self generateSQLPathFetchForInternalNames: fnames 
+		  exactMatch: YES
+		  orDirectSubfolderMatch: NO];
+      if ([sql length])
+	{
+	  records = [self performSQL: sql];
+	  if (records)
+	    {
+	      count = [records count];
+	      if (count)
+		{
+		  fname = [self internalNameFromPath: _path];
+		  if (count == 1)
+		    {
+		      record = [records objectAtIndex: 0];
+		      sname = [record objectForKey: GCSPathRecordName];
+		      result = [fname isEqualToString: sname];
+		    }
+		  else
+		    [self logWithFormat: @"records: %@", records];
+		}
+	    }
+	  else
+	    [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", 
+		  __PRETTY_FUNCTION__, sql];
+	}
      else
-        [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", __PRETTY_FUNCTION__, sql];
+	[self debugWithFormat:@"got no SQL for names: %@", fnames];
    }
-    else
-      [self debugWithFormat:@"got no SQL for names: %@", fnames];
-  }
  else
    [self debugWithFormat:@"got no internal names for path: '%@'", _path];
  
@@ -789,29 +753,21 @@ static BOOL       _singleStoreMode           = NO;
  NSString *fname;
  NSArray  *fnames, *records;
  NSString *sql;
-  EOAdaptorChannel *channel;
  unsigned i, count;
  
-
  if ((fnames = [self internalNamesFromPath:_path]) == nil) {
    [self debugWithFormat:@"got no internal names for path: '%@'", _path];
    return nil;
  }
  
-  if ((channel = [self acquireOpenChannel]) == nil) {
-    return [NSException exceptionWithName:@"GCSNoChannel"
-			reason:@"could not "
-			userInfo:nil];
-  }
  sql = [self generateSQLPathFetchForInternalNames:fnames 
-	      exactMatch:NO orDirectSubfolderMatch:(_recursive ? NO : YES) withChannel: channel];
+	      exactMatch:NO orDirectSubfolderMatch:(_recursive ? NO : YES)];
  if ([sql length] == 0) {
    [self debugWithFormat:@"got no SQL for names: %@", fnames];
-    [self releaseChannel: channel];
    return nil;
  }
  
-  if ((records = [self performSQL:sql withChannel: channel]) == nil) {
+  if ((records = [self performSQL:sql]) == nil) {
    [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", 
 	  __PRETTY_FUNCTION__, sql];
    return nil;
@@ -850,105 +806,22 @@ static BOOL       _singleStoreMode           = NO;
  return result;
 }

- (NSArray *)listSubFoldersAndNamesAtPath:(NSString *)_path recursive:(BOOL)_recursive{
-  NSMutableArray *result;
-  NSString *fname;
-  NSArray  *fnames, *records;
-  NSString *sql;
-  unsigned i, count;
-  EOAdaptorChannel *channel;
-
-
-  
-  if ((fnames = [self internalNamesFromPath:_path]) == nil) {
-    [self debugWithFormat:@"got no internal names for path: '%@'", _path];
-    return nil;
-  }
-  
-  if ((channel = [self acquireOpenChannel]) == nil) {
-    return [NSException exceptionWithName:@"GCSNoChannel"
-			reason:@"could not "
-			userInfo:nil];
-  }
-  sql = [self generateSQLPathAndNameFetchForInternalNames:fnames 
-	      exactMatch:NO orDirectSubfolderMatch:(_recursive ? NO : YES) withChannel: channel];
-  if ([sql length] == 0) {
-    [self debugWithFormat:@"got no SQL for names: %@", fnames];
-    [self releaseChannel: channel];
-    return nil;
-  }
-  
-  if ((records = [self performSQL:sql withChannel: channel]) == nil) {
-    [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", 
-	  __PRETTY_FUNCTION__, sql];
-    return nil;
-  }
-  
-  if ((count = [records count]) == 0) {
-    return emptyArray;
-  }
-
-  result = [NSMutableArray arrayWithCapacity:(count > 128 ? 128 : count)];
-  
-  fname = [self internalNameFromPath:_path];
-  fname = [fname stringByAppendingString:@"/"]; /* add slash */
-  for (i = 0; i < count; i++) {
-    NSDictionary *record, *folderInfo;
-    NSString *sname, *spath, *foldername;
-    
-    record = [records objectAtIndex:i];
-    sname  = [record objectForKey:GCSPathRecordName];
-    if (![sname hasPrefix:fname]) /* does not match at all ... */
-      continue;
-    
-    /* strip prefix and following slash */
-    sname = [sname substringFromIndex:[fname length]];
-    spath = [self pathPartFromInternalName:sname];
-    
-    if (_recursive) {
-      if ([spath length] > 0){
-        foldername = [record objectForKey: @"c_foldername"];
-        folderInfo = [NSDictionary dictionaryWithObjectsAndKeys: spath, @"path", foldername, @"name", nil];
-	      [result addObject:folderInfo];
-      } 
-    }
-    else {
-      /* direct children only, so exclude everything with a slash */
-      if ([sname rangeOfString:@"/"].length == 0 && [spath length] > 0)
-      {
-        foldername = [record objectForKey: @"c_foldername"];
-        folderInfo = [NSDictionary dictionaryWithObjectsAndKeys: spath, @"path", foldername, @"name", nil];
-	      [result addObject:folderInfo];
-      }
-    }
-  }
-  
-  return result;
-}
-
 - (NSDictionary *) recordAtPath: (NSString *) _path
 {
  NSMutableString *sql;
  NSArray      *fnames, *records;
  NSString     *ws;
  NSDictionary *record;
-  EOAdaptorChannel *channel;
-
-
+  
  if ((fnames = [self internalNamesFromPath:_path]) == nil) {
    [self debugWithFormat:@"got no internal names for path: '%@'", _path];
    return nil;
  }
  
  /* generate SQL to fetch folder attributes */
-  if ((channel = [self acquireOpenChannel]) == nil) {
-    return [NSException exceptionWithName:@"GCSNoChannel"
-			reason:@"could not "
-			userInfo:nil];
-  }
  
  ws = [self generateSQLWhereForInternalNames:fnames 
-	     exactMatch:YES orDirectSubfolderMatch:NO withChannel: channel];
+	     exactMatch:YES orDirectSubfolderMatch:NO];
  
  sql = [NSMutableString stringWithCapacity:256];
  [sql appendString:@"SELECT "];
@@ -965,7 +838,7 @@ static BOOL       _singleStoreMode           = NO;

  /* fetching */
  
-  if ((records = [self performSQL:sql withChannel: channel]) == nil) {
+  if ((records = [self performSQL:sql]) == nil) {
    [self logWithFormat:@"ERROR(%s): executing SQL failed: '%@'", 
 	  __PRETTY_FUNCTION__, sql];
    return nil;
@@ -1032,55 +905,44 @@ static BOOL       _singleStoreMode           = NO;
 				   andChannel: (EOAdaptorChannel *) channel
 				       atPath: (NSString *) path
 {
-  NSString *baseURL, *tableName, *quickTableName, *aclTableName, *createQuery, *sql, *safeFolderName, *safePath;
+  NSString *baseURL, *tableName, *quickTableName, *aclTableName, *createQuery, *sql;
  GCSSpecialQueries *specialQuery;
  EOAdaptorContext *aContext;
-  EOAdaptor *adaptor;
-  EOAttribute *attribute;
  NSMutableArray *paths;
  NSException *error;
  NSRange range;
  
-  aContext = [channel adaptorContext];
-  [aContext beginTransaction];
-
-  //escape foldername to avoid sql injection
-  adaptor = [aContext adaptor];
-
-  attribute = [EOAttribute new];
-  [attribute autorelease];
-  [attribute setExternalType: @"varchar"];
-
-  safeFolderName = [adaptor formatValue: folderName forAttribute: attribute];
-  safePath = [adaptor formatValue: path forAttribute: attribute];
-
-
-  paths = [NSMutableArray arrayWithArray: [safePath componentsSeparatedByString: @"/"]];
+  paths = [NSMutableArray arrayWithArray: [path componentsSeparatedByString: @"/"]];

  while ([paths count] < 5)
    [paths addObject: @"NULL"];
  
+  aContext = [channel adaptorContext];
+  [aContext beginTransaction];
+
  tableName = [self baseTableNameWithUID: [paths objectAtIndex: 2]];
  quickTableName = [tableName stringByAppendingString: @"_quick"];
  aclTableName = [tableName stringByAppendingString: @"_acl"];

+  // TBD: fix SQL injection issues.
+  // We no longer call stringByDeletingLastPathComponent since, since GNUstep 1.22,
+  // it'll replace // characters in the URL with /, so mysql:// becomes mysql:/
+  // This is to conform with recent Apple changes.
  baseURL = [folderInfoLocation absoluteString];
  range = [baseURL rangeOfString: @"/" options: NSBackwardsSearch];
  if (range.location != NSNotFound)
    baseURL = [baseURL substringToIndex: range.location];
-
-
-  //Mind the quote, safeFolderName and safePath already have them as they have been escaped, c_path4 already has one at the end
+  
  sql = [NSString stringWithFormat: @"INSERT INTO %@"
 		  @"        (c_path, c_path1, c_path2, c_path3, c_path4,"
 		  @"         c_foldername, c_location, c_quick_location,"
 		  @"         c_acl_location, c_folder_type)"
-		  @" VALUES (%@, '%@', '%@', '%@', '%@, %@, '%@/%@',"
+		  @" VALUES ('%@', '%@', '%@', '%@', '%@', '%@', '%@/%@',"
 		  @"         '%@/%@', '%@/%@', '%@')",
-		  [self folderInfoTableName], safePath,
+		  [self folderInfoTableName], path,
 		  [paths objectAtIndex: 1], [paths objectAtIndex: 2],
 		  [paths objectAtIndex: 3], [paths objectAtIndex: 4],
-		  safeFolderName,
+		  [folderName stringByReplacingString: @"'" withString: @"''"],
 		  baseURL, tableName,
 		  baseURL, quickTableName,
 		  baseURL, aclTableName,
@@ -1165,12 +1027,6 @@ static BOOL       _singleStoreMode           = NO;
  EOAdaptorChannel *channel;
  NSException *ex;

-  if ((channel = [self acquireOpenChannel]) == nil) {
-    return [NSException exceptionWithName:@"GCSNoChannel"
-			reason:@"could not "
-			userInfo:nil];
-  }
-
  if ((folder = [self folderAtPath:_path]) == nil) {
    return [NSException exceptionWithName:@"GCSMissingFolder"
 			reason:@"missing folder"
@@ -1183,11 +1039,15 @@ static BOOL       _singleStoreMode           = NO;
  }

  ws = [self generateSQLWhereForInternalNames:fnames 
-	     exactMatch:YES orDirectSubfolderMatch:NO withChannel: channel];
+	     exactMatch:YES orDirectSubfolderMatch:NO];

  sql = [NSString stringWithFormat: @"DELETE FROM %@ WHERE %@",
 		  [self folderInfoTableName], ws];
-
+  if ((channel = [self acquireOpenChannel]) == nil) {
+    return [NSException exceptionWithName:@"GCSNoChannel"
+			reason:@"could not "
+			userInfo:nil];
+  }

  [[channel adaptorContext] beginTransaction];

@@ -303,8 +303,8 @@ static NSString *openIdFolderURLString = nil;
    newRecord = [NSDictionary dictionaryWithObjectsAndKeys: _user_session, @"c_user_session",
                      _old_session, @"c_old_session",
                      [NSNumber numberWithInt:now], @"c_session_started",
-                      [NSNumber numberWithInt:nowExpire] , @"c_access_token_expires_in",
                      _refresh_token, @"c_refresh_token",
+                      [NSNumber numberWithInt:nowExpire] , @"c_access_token_expires_in",
                      [NSNumber numberWithInt:nowRefreshExpire] , @"c_refresh_token_expires_in",
                      nil];
    record = [self recordForSession: _user_session useOldSession: NO];
@@ -214,10 +214,10 @@
 {
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
-       @" c_user_session TEXT NOT NULL,"
-       @" c_old_session TEXT NULL,"
+       @" c_user_session VARCHAR(4096) NOT NULL,"
+       @" c_old_session VARCHAR(4096) NULL,"
       @" c_session_started INT4 NOT NULL,"
-       @" c_refresh_token TEXT NULL,"
+       @" c_refresh_token VARCHAR(4096) NULL,"
       @" c_access_token_expires_in INT4 NULL,"
       @" c_refresh_token_expires_in INT4 NULL)");

@@ -274,7 +274,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ ("
       @" c_id VARCHAR(255) PRIMARY KEY,"
-       @" c_value TEXT NOT NULL,"
+       @" c_value VARCHAR(4096) NOT NULL,"
       @" c_creationdate INT4 NOT NULL,"
       @" c_lastseen INT4 NOT NULL)");

@@ -375,10 +375,10 @@
 {
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
-       @" c_user_session TEXT NOT NULL,"
-       @" c_old_session TEXT NULL,"
+       @" c_user_session VARCHAR(4096) NOT NULL,"
+       @" c_old_session VARCHAR(4096) NULL,"
       @" c_session_started INT4 NOT NULL,"
-       @" c_refresh_token TEXT NULL,"
+       @" c_refresh_token VARCHAR(4096) NULL,"
       @" c_access_token_expires_in INT4 NULL,"
       @" c_refresh_token_expires_in INT4 NULL)");

@@ -435,7 +435,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
       @" c_id VARCHAR(255) PRIMARY KEY,"
-       @" c_value TEXT NOT NULL,"
+       @" c_value VARCHAR(4096) NOT NULL,"
       @" c_creationdate INT NOT NULL,"
       @" c_lastseen INT NOT NULL)");

@@ -536,10 +536,10 @@
 {
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
-       @" c_user_session VARCHAR2(8192) NOT NULL,"
-       @" c_old_session VARCHAR2(8192) NULL,"
+       @" c_user_session VARCHAR2(4096) NOT NULL,"
+       @" c_old_session VARCHAR2(4096) NULL,"
       @" c_session_started INTEGER NOT NULL,"
-       @" c_refresh_token VARCHAR2(8192) NULL,"
+       @" c_refresh_token VARCHAR2(4096) NULL,"
       @" c_access_token_expires_in INTEGER NULL,"
       @" c_refresh_token_expires_in INTEGER NULL)");

@@ -595,7 +595,7 @@
  static NSString *sqlFolderFormat
    = (@"CREATE TABLE %@ (" 
       @" c_id VARCHAR2(255) PRIMARY KEY,"
-       @" c_value VARCHAR2(8192) NOT NULL,"
+       @" c_value VARCHAR2(4096) NOT NULL,"
       @" c_creationdate INTEGER NOT NULL,"
       @" c_lastseen INTEGER NOT NULL)");

@@ -55,7 +55,7 @@
 - (NSArray *) recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
 {
  NSMutableArray *ranges;
-  NSCalendarDate *firStart, *firEnd, *startDate, *endDate, *currentStartDate, *currentEndDate;
+  NSCalendarDate *firStart, *startDate, *endDate, *currentStartDate, *currentEndDate;
  iCalByDayMask *dayMask;
  long i, count, repeatCount;
  unsigned interval;
@@ -63,7 +63,6 @@
  //[self logWithFormat: @"Recurrence rule is %@", rrule];

  firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
  startDate = [_r startDate];
  endDate = [_r endDate];
  dayMask = nil;
@@ -85,41 +84,34 @@
  // If rule is bound, check the bounds
  if (![rrule isInfinite])
    {
-      NSCalendarDate *until, *lastStartDate, *lastEndDate;
+      NSCalendarDate *until, *lastDate;

-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
      until = [rrule untilDate];
      if (until)
        {
-          lastStartDate = until;
-          lastEndDate = until;
+          lastDate = until;
        }
      else
        {
          repeatCount = [rrule repeatCount];
          if (dayMask == nil)
-          {
            // If there's no day mask, we can compute the date of the last
            // occurrence of the recurrent rule.
-            lastStartDate = [firStart dateByAddingYears: 0 months: 0
+            lastDate = [firStart dateByAddingYears: 0 months: 0
                                              days: (interval
                                                     * (repeatCount - 1))];
-            lastEndDate = [firEnd dateByAddingYears: 0 months: 0
-                                              days: (interval
-                                                     * (repeatCount - 1))];
-          }                                        
        }

-      if (lastStartDate != nil && lastEndDate != nil)
+      if (lastDate != nil)
        {
-          if ([lastEndDate compare: startDate] == NSOrderedAscending)
+          if ([lastDate compare: startDate] == NSOrderedAscending)
            // Range starts after last occurrence
            return nil;

-          if ([lastStartDate compare: endDate] == NSOrderedAscending)
+          if ([lastDate compare: endDate] == NSOrderedAscending)
            // Range ends after last occurence; adjust end date
-            endDate = lastStartDate;
+            endDate = lastDate;
        }
    }

@@ -86,13 +86,8 @@
  tzId = [self value: 0 ofAttribute: @"tzid"];
  if ([tzId length])
  {
-      //Hack, get timezone inf from sogo and not from the event VTIMEZONE as it can be incorrect/incomplete
-      timeZone = [iCalTimeZone timeZoneForName: tzId];
-      if(!timeZone)
-      {
-        calendar = (iCalCalendar *) [self searchParentOfClass: [iCalCalendar class]];
-        timeZone = [calendar timeZoneWithId: tzId];
-      }
+      calendar = (iCalCalendar *) [self searchParentOfClass: [iCalCalendar class]];
+      timeZone = [calendar timeZoneWithId: tzId];
      //if (!timeZone)
      //[self logWithFormat: @"timezone '%@' not found in calendar", tzId];
  }
@@ -185,7 +185,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)
  // TODO: check whether this is OK for multiday-events!
  NSMutableArray *ranges;
  NSTimeZone     *timeZone;
-  NSCalendarDate *eventStartDate, *eventEndDate, *rStart, *rEnd, *untilStart, *untilEnd, *referenceDate;
+  NSCalendarDate *eventStartDate, *rStart, *rEnd, *until, *referenceDate;
  int            eventDayOfMonth;
  unsigned       monthIdxInRange, numberOfMonthsInRange, interval, repeatCount;
  int            diff, count;
@@ -199,14 +199,12 @@ static inline unsigned iCalDoWForNSDoW (int dow)
  iCalByDayMask *byDayMask;
  
  eventStartDate  = [firstRange startDate];
-  eventEndDate  = [firstRange endDate];
  eventDayOfMonth = [eventStartDate dayOfMonth];
  timeZone        = [eventStartDate timeZone];
  rStart          = [_r startDate];
  rEnd            = [_r endDate];
  interval        = [rrule repeatInterval];
-  untilStart      = nil;
-  untilEnd        = nil;
+  until           = nil;
  repeatCount     = [rrule repeatCount];
  byMonth         = [rrule byMonth];
  byMonthDay      = [rrule byMonthDay];
@@ -220,28 +218,24 @@ static inline unsigned iCalDoWForNSDoW (int dow)
 	{
 	  // When there's no BYxxx mask, we can find the date of the last
 	  // occurrence.
-	  untilStart = [eventStartDate dateByAddingYears: 0
+	  until = [eventStartDate dateByAddingYears: 0
 					     months: (interval * (repeatCount - 1))
 					       days: 0];
-    untilEnd = [eventEndDate dateByAddingYears: 0
-            months: (interval * (repeatCount - 1))
-              days: 0];
 	}
      else
 	{
-	  untilStart = [rrule untilDate];
-    untilEnd = [rrule untilDate];
+	  until = [rrule untilDate];
 	}
    }

-  if (untilStart != nil && untilEnd != nil)
+  if (until != nil)
    {
-      if ([untilEnd compare: rStart] == NSOrderedAscending)
+      if ([until compare: rStart] == NSOrderedAscending)
 	// Range starts after last occurrence
 	return nil;
-      if ([untilStart compare: rEnd] == NSOrderedAscending)
+      if ([until compare: rEnd] == NSOrderedAscending)
 	// Range ends after last occurence; adjust end date
-	rEnd = untilStart;
+	rEnd = until;
    }
  
  if (byMonth && [byMonth count] > 0)
@@ -447,7 +441,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)

        start = [cursor dateByAddingYears: 0 months: 0 days: (dom - 1)];
        doCont = [self _addInstanceWithStartDate: start
-                                       limitDate: untilStart
+                                       limitDate: until
                                      limitRange: _r
                                         toArray: ranges];
        //NSLog(@"*** MONTHLY [%i/%i] adding %@%@ (count = %i)", dom, numDaysInMonth, start, (doCont?@"":@" .. NOT!"), count);
@@ -64,7 +64,7 @@
 - (NSArray *) recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
 {
  NSMutableArray *ranges;
-  NSCalendarDate *firStart, *firEnd, *startDate, *endDate, *currentStartDate, *currentEndDate;
+  NSCalendarDate *firStart, *startDate, *endDate, *currentStartDate, *currentEndDate;
  long i, repeatCount, count;
  unsigned interval;
  iCalByDayMask *dayMask;
@@ -73,7 +73,6 @@
  //[self logWithFormat: @"Recurrence rule is %@", rrule];

  firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
  startDate = [_r startDate];
  endDate = [_r endDate];
  dayMask = nil;
@@ -96,40 +95,31 @@
  // If rule is bound, check the bounds
  if (![rrule isInfinite])
    {
-      NSCalendarDate *until, *lastStartDate, *lastEndDate;
+      NSCalendarDate *until, *lastDate;

-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
      until = [rrule untilDate];
      if (until)
-      {
-        lastStartDate = until;
-        lastEndDate = until;
-      }
+        lastDate = until;
      else
        {
          repeatCount = [rrule repeatCount];
          if (dayMask == nil)
-          {
            // When there's no BYxxx mask, we can find the date of the last
            // occurrence.
-            lastStartDate = [firStart dateByAddingYears: 0 months: 0
+            lastDate = [firStart dateByAddingYears: 0 months: 0
                                              days: (interval
                                                     * (repeatCount - 1) * 7)];
-            lastEndDate = [firEnd dateByAddingYears: 0 months: 0
-                                              days: (interval
-                                                     * (repeatCount - 1) * 7)];
-          }
        }

-      if (lastStartDate != nil && lastEndDate != nil)
+      if (lastDate != nil)
        {
-          if ([lastEndDate compare: startDate] == NSOrderedAscending)
+          if ([lastDate compare: startDate] == NSOrderedAscending)
            // Range starts after last occurrence
            return nil;
-          if ([lastStartDate compare: endDate] == NSOrderedAscending)
+          if ([lastDate compare: endDate] == NSOrderedAscending)
            // Range ends after last occurence; adjust end date
-            endDate = [lastStartDate addTimeInterval: [firstRange duration]];
+            endDate = [lastDate addTimeInterval: [firstRange duration]];
        }
    }

@@ -44,14 +44,13 @@
 {
  NSMutableArray *ranges;
  NSArray *byMonth;
-  NSCalendarDate *firStart, *firEnd, *lastStartDate, *lastEndDate, *rStart, *rEnd, *until, *referenceDate, *rTemp;
+  NSCalendarDate *firStart, *lastDate, *rStart, *rEnd, *until, *referenceDate, *rTemp;
  NSInteger *hoursOfOffset;
  iCalMonthlyRecurrenceCalculator *monthlyCalc;
  unsigned j, yearIdxInRange, numberOfYearsInRange, count, interval, monthDiff;
  int diff, repeatCount, currentMonth, origNbDaysInMonth;

  firStart = [firstRange startDate];
-  firEnd = [firstRange endDate];
  rStart = [_r startDate];
  rEnd = [_r endDate];
  interval = [rrule repeatInterval];
@@ -72,40 +71,33 @@
  // If rule is bound, check the bounds
  if (![rrule isInfinite])
    {
-      lastStartDate = nil;
-      lastEndDate = nil;
+      lastDate = nil;
      until = [rrule untilDate];
      repeatCount = [rrule repeatCount];

      if (until)
        {
-          lastStartDate = until;
-          lastEndDate = until;
+          lastDate = until;
        }
      if (repeatCount > 0)
        {
-          if (lastStartDate == nil && ![rrule hasByMask])
-          {
+          if (lastDate == nil && ![rrule hasByMask])
            // When there's no BYxxx mask, we can find the date of the last
            // occurrence.
-            lastStartDate = [firStart dateByAddingYears: (interval * (repeatCount - 1))
+            lastDate = [firStart dateByAddingYears: (interval * (repeatCount - 1))
                                            months: 0
                                              days: 0];
-            lastEndDate = [firEnd dateByAddingYears: (interval * (repeatCount - 1))
-                                            months: 0
-                                              days: 0];
-          }
          referenceDate = firStart;
        }

-      if (lastStartDate != nil)
+      if (lastDate != nil)
        {
-          if ([lastEndDate compare: rStart] == NSOrderedAscending)
+          if ([lastDate compare: rStart] == NSOrderedAscending)
            // Range starts after last occurrence
            return nil;
-          if ([lastStartDate compare: rEnd] == NSOrderedAscending)
+          if ([lastDate compare: rEnd] == NSOrderedAscending)
            // Range ends after last occurence; adjust end date
-            rEnd = [lastStartDate addTimeInterval: [firstRange duration]];
+            rEnd = [lastDate addTimeInterval: [firstRange duration]];
        }
    }

@@ -142,7 +142,7 @@ CREATE TABLE sogo_quick_contact (

 CREATE TABLE sogo_sessions_folder (
 	c_id           varchar(255) NOT NULL,
-	c_value        text NOT NULL,
+	c_value        varchar(4096) NOT NULL,
 	c_creationdate int(11)      NOT NULL,
 	c_lastseen     int(11)      NOT NULL,
 	PRIMARY KEY (c_id)
@@ -166,10 +166,10 @@ CREATE TABLE sogo_admin (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;

 CREATE TABLE sogo_opend_id (
-	c_user_session              text NOT NULL,
-	c_old_session              text DEFAULT '',
+	c_user_session              varchar(4096) NOT NULL,
+	c_old_session              varchar(4096) DEFAULT '',
 	c_session_started           int(11)       NOT NULL,
-	c_refresh_token             text DEFAULT '',
+	c_refresh_token             varchar(4096) DEFAULT '',
 	c_access_token_expires_in    int(11)       DEFAULT '',
 	c_refresh_token_expires_in  int(11)       DEFAULT NULL,
 	PRIMARY KEY (c_user_session)
@@ -1,82 +0,0 @@
-"Inviting the following persons is prohibited:" = "Inviting the following persons is prohibited:";
-"Personal Calendar" = "Personal Calendar";
-vevent_class0 = "(Public event)";
-vevent_class1 = "(Private event)";
-vevent_class2 = "(Confidential event)";
-
-vtodo_class0 = "(Public task)";
-vtodo_class1 = "(Private task)";
-vtodo_class2 = "(Confidential task)";
-
-/* Receipts */
-"The event \"%{Summary}\" was created" = "The event \"%{Summary}\" was created";
-"The event \"%{Summary}\" was deleted" = "The event \"%{Summary}\" was deleted";
-"The event \"%{Summary}\" was updated" = "The event \"%{Summary}\" was updated";
-"The task \"%{Summary}\" was created" = "The task \"%{Summary}\" was created";
-"The task \"%{Summary}\" was deleted" = "The task \"%{Summary}\" was deleted";
-"The task \"%{Summary}\" was updated" = "The task \"%{Summary}\" was updated";
-"The following attendees(s) were notified" = "The following attendee(s) were notified";
-"The following attendees(s) were added" = "The following attendee(s) were added";
-"The following attendees(s) were removed" = "The following attendee(s) were removed";
-
-/* IMIP messages */
-"calendar_label" = "Calendar";
-"startDate_label" = "Start";
-"endDate_label" = "End";
-"time_label" = "Time";
-"to_label" = "to";
-"due_label" = "Due Date";
-"location_label" = "Location";
-"summary_label" = "Summary";
-"comment_label" = "Comment";
-"organizer_label" = "Organizer";
-"attendee_label" = "Attendee";
-
-/* Invitation */
-"Event Invitation: \"%{Summary}\"" = "Event Invitation: \"%{Summary}\"";
-"(sent by %{SentBy}) " = "(sent by %{SentBy}) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
-
-/* Deletion */
-"Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
-
-/* Update */
-"The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
-= "The appointment \"%{Summary}\" for the %{OldStartDate} has changed";
-"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
-= "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed";
-"The following parameters have changed in the \"%{Summary}\" meeting:"
-= "The following parameters have changed in the \"%{Summary}\" meeting:";
-"Please accept or decline those changes."
-= "Please accept or decline those changes.";
-
-/* Reply */
-"Accepted invitation: \"%{Summary}\"" = "Accepted invitation: \"%{Summary}\"";
-"Declined invitation: \"%{Summary}\"" = "Declined invitation: \"%{Summary}\"";
-"Delegated invitation: \"%{Summary}\"" = "Delegated invitation: \"%{Summary}\"";
-"Not yet decided on invitation: \"%{Summary}\"" = "Not yet decided on invitation: \"%{Summary}\"";
-"%{Attendee} %{SentByText}has accepted your event invitation."
-= "%{Attendee} %{SentByText}has accepted your event invitation.";
-"%{Attendee} %{SentByText}has declined your event invitation."
-= "%{Attendee} %{SentByText}has declined your event invitation.";
-"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
-= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
-"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
-= "%{Attendee} %{SentByText}has not yet decided upon your event invitation.";
-
-/* Reminder */
-"Reminder: \"%{Summary}\" - %{StartDate}" = "Reminder: \"%{Summary}\" - %{StartDate}";
-
-/* Resources */
-"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Cannot access resource: \"%{Cn} %{SystemEmail}\"";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}.";
-
-/* Participation role */
-"Your participation is required to this event" = "Your participation is required to this event";
-"Your participation is optional to this event" = "Your participation is optional to this event";
-"Your participation is not required to this event" = "Your participation is not required to this event";
@@ -26,7 +26,7 @@ vtodo_class2 = "(Bizalmas feladat)";
 "time_label" = "Idő";
 "to_label" = "-";
 "due_label" = "Lejárat napja:";
-"location_label" = "Helyszín";
+"location_label" = "Hely";
 "summary_label" = "Összegzés:";
 "comment_label" = "Megjegyzés:";
 "organizer_label" = "Szervező";
@@ -1,82 +0,0 @@
-"Inviting the following persons is prohibited:" = "다음 사람들을 초대하는 것은 금지되어 있습니다:";
-"Personal Calendar" = "개인 캘린더";
-vevent_class0 = "(공개 이벤트)";
-vevent_class1 = "(비공개 이벤트)";
-vevent_class2 = "(기밀 이벤트)";
-
-vtodo_class0 = "(공개 할 일)";
-vtodo_class1 = "(비공개 할 일)";
-vtodo_class2 = "(기밀 할 일)";
-
-/* Receipts */
-"The event \"%{Summary}\" was created" = "이벤트 \"%{Summary}\"가 생성되었습니다";
-"The event \"%{Summary}\" was deleted" = "이벤트 \"%{Summary}\"가 삭제되었습니다";
-"The event \"%{Summary}\" was updated" = "이벤트 \"%{Summary}\"가 업데이트되었습니다";
-"The task \"%{Summary}\" was created" = "할 일 \"%{Summary}\"이 생성되었습니다";
-"The task \"%{Summary}\" was deleted" = "할 일 \"%{Summary}\"이 삭제되었습니다";
-"The task \"%{Summary}\" was updated" = "할 일 \"%{Summary}\"이 업데이트되었습니다";
-"The following attendees(s) were notified" = "다음 참석자에게 알림이 전송되었습니다";
-"The following attendees(s) were added" = "다음 참석자가 추가되었습니다";
-"The following attendees(s) were removed" = "다음 참석자가 제거되었습니다";
-
-/* IMIP messages */
-"calendar_label" = "캘린더";
-"startDate_label" = "시작";
-"endDate_label" = "종료";
-"time_label" = "시간";
-"to_label" = "까지";
-"due_label" = "마감일";
-"location_label" = "장소";
-"summary_label" = "요약";
-"comment_label" = "설명";
-"organizer_label" = "주최자";
-"attendee_label" = "참석자";
-
-/* Invitation */
-"Event Invitation: \"%{Summary}\"" = "이벤트 초대: \"%{Summary}\"";
-"(sent by %{SentBy}) " = "(%{SentBy}님이 보냄) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText}님이 %{Summary}에 초대했습니다.\n\n시작: %{StartDate}\n종료: %{EndDate}\n설명: %{Description}";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}님이 %{Summary}에 초대했습니다.\n\n시작: %{StartDate} %{StartTime}\n종료: %{EndDate} %{EndTime}\n설명: %{Description}";
-
-/* Deletion */
-"Event Cancelled: \"%{Summary}\"" = "이벤트 취소됨: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}님이 이 이벤트를 취소했습니다: %{Summary}.\n\n시작: %{StartDate}\n종료: %{EndDate}\n설명: %{Description}";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}님이 이 이벤트를 취소했습니다: %{Summary}.\n\n시작: %{StartDate} %{StartTime}\n종료: %{EndDate} %{EndTime}\n설명: %{Description}";
-
-/* Update */
-"The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
-= "%{OldStartDate}에 예정된 약속 \"%{Summary}\"이 변경되었습니다";
-"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
-= "%{OldStartDate} %{OldStartTime}에 예정된 약속 \"%{Summary}\"이 변경되었습니다";
-"The following parameters have changed in the \"%{Summary}\" meeting:"
-= "모임 \"%{Summary}\"에서 다음 매개변수가 변경되었습니다:";
-"Please accept or decline those changes."
-= "이 변경 사항을 수락하거나 거절하십시오.";
-
-/* Reply */
-"Accepted invitation: \"%{Summary}\"" = "초대 수락: \"%{Summary}\"";
-"Declined invitation: \"%{Summary}\"" = "초대 거절: \"%{Summary}\"";
-"Delegated invitation: \"%{Summary}\"" = "초대 위임: \"%{Summary}\"";
-"Not yet decided on invitation: \"%{Summary}\"" = "초대에 대해 아직 결정하지 않음: \"%{Summary}\"";
-"%{Attendee} %{SentByText}has accepted your event invitation."
-= "%{Attendee} %{SentByText}님이 귀하의 이벤트 초대를 수락했습니다.";
-"%{Attendee} %{SentByText}has declined your event invitation."
-= "%{Attendee} %{SentByText}님이 귀하의 이벤트 초대를 거절했습니다.";
-"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
-= "%{Attendee} %{SentByText}님이 %{Delegate}에게 초대를 위임했습니다.";
-"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
-= "%{Attendee} %{SentByText}님이 귀하의 이벤트 초대에 대해 아직 결정하지 않았습니다.";
-
-/* Reminder */
-"Reminder: \"%{Summary}\" - %{StartDate}" = "알림: \"%{Summary}\" - %{StartDate}";
-
-/* Resources */
-"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "리소스에 접근할 수 없습니다: \"%{Cn} %{SystemEmail}\"";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "리소스 \"%{Cn} %{SystemEmail}\"에 대한 최대 동시 예약 수(%{NumberOfSimultaneousBookings})에 도달했습니다. 충돌하는 이벤트는 \"%{EventTitle}\"이며, %{StartDate}에 시작합니다.";
-
-/* Participation role */
-"Your participation is required to this event" = "이 이벤트에 귀하의 참여가 필수입니다";
-"Your participation is optional to this event" = "이 이벤트에 귀하의 참여는 선택 사항입니다";
-"Your participation is not required to this event" = "이 이벤트에 귀하의 참여는 필요하지 않습니다";
@@ -1133,8 +1133,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
  recordIndex = [self _indexOfRecordMatchingDate: recurrenceId inArray: ma];
  if ([dateRange doesIntersectWithDateRange: recurrenceIdRange] && recordIndex == -1) {
    [self warnWithFormat:
-                @"missing exception record for recurrence-id %@ (uid %@), dr = %@, rir = %@",
-              recurrenceId, [component uid], dateRange, recurrenceIdRange];
+                @"missing exception record for recurrence-id %@ (uid %@), ma = %@, dr = %@, rir = %@",
+              recurrenceId, [component uid], ma, dateRange, recurrenceIdRange];
  }
  if ([dateRange doesIntersectWithDateRange: recurrenceIdRange] && recordIndex != -1)
    {
@@ -3521,15 +3521,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
          timezone = nil;
          element = [components objectAtIndex: i];

-          //remove all attenddees, change organisator and change uid
-          //If we do not clean up, any user could impersonate someone by importing a malicious .ics
-          //and send notificaitons to attenddes or remove their event (as SOGo think the user has the rights to do so)
-          [element removeAllAttendees];
-          [element setOrganizer: nil];
-          [element setUid: [self globallyUniqueObjectId]];
-
-
-
          if ([element isKindOfClass: iCalEventK])
            {
              event = (iCalEvent *)element;
@@ -65,9 +65,6 @@
 #import "iCalRepeatableEntityObject+SOGo.h"
 #import "SOGoCalendarComponent.h"

-
-static NSArray *allowed_tags = nil;
-
@implementation SOGoCalendarComponent

 + (SOGoWebDAVAclManager *) webdavAclManager
@@ -213,6 +210,7 @@ static NSArray *allowed_tags = nil;
  SOGoUser *calendarOwner;
  NSEnumerator *children;
  CardElement *element;
+  NSArray *tags;

  int classification;

@@ -233,25 +231,22 @@ static NSArray *allowed_tags = nil;
  summary = [self labelForKey: [NSString stringWithFormat: @"%@_class%d",
                                         type, classification]
                    inContext: context];
-  if(!allowed_tags)
-      allowed_tags = [[NSArray arrayWithObjects: @"DTSTAMP", @"DTSTART", @"DTEND", @"DUE", @"EXDATE", @"EXRULE", @"RRULE", @"RECURRENCE-ID", nil] retain];
+
+  tags = [NSArray arrayWithObjects: @"DTSTAMP", @"DTSTART", @"DTEND", @"DUE", @"EXDATE", @"EXRULE", @"RRULE", @"RECURRENCE-ID", nil];
  uid = [[component uid] asCryptedPassUsingScheme: @"ssha256"
                                         withSalt: [[settings userPublicSalt] dataUsingEncoding: NSASCIIStringEncoding]
                                      andEncoding: encHex
                                          keyPath: nil];

-  children = [[component children] objectEnumerator];
-  NSMutableArray *to_remove = [NSMutableArray arrayWithCapacity: 8];
-  
+  children = [[[[component children] copy] autorelease] objectEnumerator];
+
  while ((element = [children nextObject]))
    {
      tag = [element tag];
-      if (![allowed_tags containsObject: [tag uppercaseString]])
-	  [to_remove addObject: element];
+      if (![tags containsObject: [tag uppercaseString]])
+        [component removeChild: element];
    }

-  [component removeChildren: to_remove];
-
  [component setSummary: summary];
  [component setUid: uid];
 }
@@ -890,7 +885,7 @@ static NSArray *allowed_tags = nil;
 		  mailDate = [[NSCalendarDate date] rfc822DateString];
 		  [headerMap setObject: mailDate forKey: @"date"];
 		  [headerMap setObject: subject forKey: @"subject"];
-                  [headerMap setObject: [NSString generateMessageID: senderEmail] forKey: @"message-id"];
+                  [headerMap setObject: [NSString generateMessageID] forKey: @"message-id"];
                  if ([msgType length] > 0)
                    [headerMap setObject: msgType forKey: @"x-sogo-message-type"];
 		  msg = [NGMimeMessage messageWithHeader: headerMap];
@@ -979,7 +974,7 @@ static NSArray *allowed_tags = nil;
  [headerMap setObject: mailDate forKey: @"date"];
  [headerMap setObject: [[p getSubject] asQPSubjectString: @"UTF-8"]
                forKey: @"subject"];
-  [headerMap setObject: [NSString generateMessageID: [[attendee mailAddress] pureEMailAddress]] forKey: @"message-id"];
+  [headerMap setObject: [NSString generateMessageID] forKey: @"message-id"];
  [headerMap setObject: @"1.0" forKey: @"MIME-Version"];

  if (textOnly)
@@ -1168,7 +1163,7 @@ static NSArray *allowed_tags = nil;
  mailDate = [[NSCalendarDate date] rfc822DateString];
  [headerMap setObject: mailDate forKey: @"date"];
  [headerMap setObject: [page getSubject] forKey: @"subject"];
-  [headerMap setObject: [NSString generateMessageID: senderEmail] forKey: @"message-id"];
+  [headerMap setObject: [NSString generateMessageID] forKey: @"message-id"];
  [headerMap setObject: @"1.0" forKey: @"MIME-Version"];
  [headerMap setObject: @"text/html; charset=utf-8"
 		forKey: @"content-type"];
@@ -184,10 +184,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
                  else
                    [result setObject: @"invalid-calendar-content" forKey: @"error"];
                }
-              else if (status == 401)
-              {
-                [result setObject: @"need-auth" forKey: @"error"];
-              }
              else
                [result setObject: @"http-error" forKey: @"error"];
            }
@@ -1,82 +0,0 @@
-"Inviting the following persons is prohibited:" = " ไม่เชิญบุคคลต่อไปนี้:";
-"Personal Calendar" = "ปฏิทินส่วนตัว";
-vevent_class0 = "(กิจกรรมสาธารณะ)";
-vevent_class1 = "(กิจกรรมส่วนตัว)";
-vevent_class2 = "(กิจกรรมลับ)";
-
-vtodo_class0 = "(งานสาธารณะ)";
-vtodo_class1 = "(งานส่วนตัว)";
-vtodo_class2 = "(งานลับ)";
-
-/* Receipts */
-"The event \"%{Summary}\" was created" = "กิจกรรม \"%{Summary}\" ถุกสร้างขึ้น";
-"The event \"%{Summary}\" was deleted" = "กิจกรรม \"%{Summary}\" ถูกลบ";
-"The event \"%{Summary}\" was updated" = "กิจกรรม \"%{Summary}\" ถูกอัพเดต";
-"The task \"%{Summary}\" was created" = "งาน \"%{Summary}\" ถูกสร้างขี้น";
-"The task \"%{Summary}\" was deleted" = "งาน \"%{Summary}\" ถูกลบ";
-"The task \"%{Summary}\" was updated" = "งาน \"%{Summary}\" ถูกอัพเดต";
-"The following attendees(s) were notified" = "ผู้เข้าร่วมต่อไปนี้ได้รับการแจ้งแล้ว";
-"The following attendees(s) were added" = "ผู้เข้าร่วมต่อไปนี้ถูกเพิ่มเข้ามา";
-"The following attendees(s) were removed" = "ผู้เข้าร่วมต่อไปนี้ถูกลบออก";
-
-/* IMIP messages */
-"calendar_label" = "ปฏิทิน";
-"startDate_label" = "เริ่ม";
-"endDate_label" = "สิ้นสุด";
-"time_label" = "เวลา";
-"to_label" = "ถึง";
-"due_label" = "วันครบกำหนด";
-"location_label" = "สถานที่";
-"summary_label" = "สรุป";
-"comment_label" = "ความคิดเห็น";
-"organizer_label" = "ผู้จัดงาน";
-"attendee_label" = "ผู้เข้าร่วม";
-
-/* Invitation */
-"Event Invitation: \"%{Summary}\"" = "คำเชิญร่วมกิจกรรม : \"%{Summary}\"";
-"(sent by %{SentBy}) " = "(ส่งโดย %{SentBy}) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText}ได้ทําการเชิญคุณไป %{Summary}.\n\nเริ่ม: %{StartDate}\nสิ้นสุด: %{EndDate}\nคำอธิบาย: %{Description}";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}ได้ทําการเชิญคุณไป %{Summary}.\n\nเริ่ม: %{StartDate} เวลา %{StartTime}\nสิ้นสุด: %{EndDate} เวลา %{EndTime}\nคำอธิบาย: %{Description}";
-
-/* Deletion */
-"Event Cancelled: \"%{Summary}\"" = "กิจกรรมถูกยกเลิกแล้ว: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}:ได้ยกเลิกกิจกรรม %{Summary}.\n\nเริ่ม: %{StartDate}\nสิ้นสุด: %{EndDate}\nคำอธิบาย: %{Description}";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}hasได้ยกเลิกกิจกรรม: %{Summary}.\n\nเริ่ม: %{StartDate} เวลา %{StartTime}\nสิ้นสุด: %{EndDate} เวลา %{EndTime}\nคำอธิบาย: %{Description}";
-
-/* Update */
-"The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
-= "นัดหมาย \"%{Summary}\" สำหรับวันที่ %{OldStartDate} มีการเปลี่ยนแปลง";
-"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
-= "นัดหมาย \"%{Summary}\" สำหรับวันที่ %{OldStartDate} เวลา %{OldStartTime} มีการเปลี่ยนแปลง";
-"The following parameters have changed in the \"%{Summary}\" meeting:"
-= "มีการเปลี่ยนแปลงใน \"%{Summary}\" :";
-"Please accept or decline those changes."
-= "กรุณาตอบรับหรือปฏิเสธการเปลี่ยนแปลงเหล่านั้น";
-
-/* Reply */
-"Accepted invitation: \"%{Summary}\"" = "ตอบรับคำเชิญ: \"%{Summary}\"";
-"Declined invitation: \"%{Summary}\"" = "ปฏิเสธคำเชิญ: \"%{Summary}\"";
-"Delegated invitation: \"%{Summary}\"" = "ลบคำเชิญ: \"%{Summary}\"";
-"Not yet decided on invitation: \"%{Summary}\"" = "ยังไม่ตัดสินใจเกี่ยวกับคำเชิญ: \"%{Summary}\"";
-"%{Attendee} %{SentByText}has accepted your event invitation."
-= "%{Attendee} %{SentByText} ได้ตอบรับคำเชิญกิจกรรมของคุณแล้ว";
-"%{Attendee} %{SentByText}has declined your event invitation."
-= "%{Attendee} %{SentByText} ได้ตอบปฏิเสธคำเชิญกิจกรรมของคุณแล้ว";
-"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
-= "%{Attendee} %{SentByText}ได้มอบหมายการเชิญให้ %{Delegate}.";
-"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
-= "%{Attendee} %{SentByText}ยังไม่ได้ตัดสินใจเกี่ยวกับคำเชิญงานของคุณ";
-
-/* Reminder */
-"Reminder: \"%{Summary}\" - %{StartDate}" = "สิ่งเตือนความจำ: \"%{Summary}\" - %{StartDate}";
-
-/* Resources */
-"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "ไม่สามารถเข้าถึงทรัพยากรได้: \"%{Cn} %{SystemEmail}\"";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "จำนวนการจองสูงสุดพร้อมกัน (%{NumberOfSimultaneousBookings}) ขอใช้ทรัพยากร \"%{Cn} %{SystemEmail}\". งานที่ขัดแย้งกัน \"%{EventTitle}\", and starts on %{StartDate}.";
-
-/* Participation role */
-"Your participation is required to this event" = "การเข้าร่วมของคุณจำเป็นสำหรับกิจกรรมนี้";
-"Your participation is optional to this event" = " การเข้าร่วมกิจกรรมนี้ไม่จำเป็น";
-"Your participation is not required to this event" = " การเข้าร่วมของคุณไม่จำเป็นสำหรับกิจกรรมนี้";
@@ -107,7 +107,6 @@
  BOOL isAllDayStartDate, isAllDayDueDate;
  NSCalendarDate *startDate, *dueDate, *completedDate;
  NSInteger percent;
-  NSString *owner;
  SOGoUserDefaults *ud;
  iCalDateTime *todoStartDate, *todoDueDate;
  iCalTimeZone *tz;
@@ -231,15 +230,6 @@
    }
  else
    [self setPercentComplete: @""];
-  
-  //To make an ics conforme with outlook live (bouh), valarm must be the last element of vevent
-  //Try to set it here
-  o = [data objectForKey: @"alarm"];
-  if ([o isKindOfClass: [NSDictionary class]])
-  {
-    owner = [data objectForKey: @"owner"];
-    [self _setAlarm: o forOwner: owner];
-  }
 }

 - (NSMutableDictionary *) quickRecordFromContent: (NSString *) theContent
@@ -1,2 +0,0 @@
-"Personal Address Book" = "Personal Address Book";
-"Collected Address Book" = "Collected Address Book";
@@ -1,2 +0,0 @@
-"Personal Address Book" = "개인 주소록";
-"Collected Address Book" = "받은/보낸 주소록";
@@ -1,2 +0,0 @@
-"Personal Address Book" = "สมุดที่อยู่ส่วนตัว";
-"Collected Address Book" = "สมุดที่อยู่ที่เก็บรวบรวม";
@@ -94,8 +94,6 @@ Mailer_RESOURCE_FILES += \
 	SOGoMailJapaneseReply.wo \
 	SOGoMailKazakhForward.wo \
 	SOGoMailKazakhReply.wo \
-	SOGoMailKoreanForward.wo \
-	SOGoMailKoreanReply.wo \
 	SOGoMailLatvianForward.wo \
 	SOGoMailLatvianReply.wo \
 	SOGoMailLithuanianForward.wo \
@@ -130,8 +128,6 @@ Mailer_RESOURCE_FILES += \
 	SOGoMailSpanishArgentinaReply.wo \
 	SOGoMailSwedishForward.wo \
 	SOGoMailSwedishReply.wo \
-	SOGoMailThaiForward.wo \
-	SOGoMailThaiReply.wo \
 	SOGoMailTurkishTurkeyForward.wo \
 	SOGoMailTurkishTurkeyReply.wo \
 	SOGoMailUkrainianForward.wo \
@@ -1,5 +0,0 @@
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
-
-"Report: Marked messages as junk" = "Report: Marked messages as junk";
-"Report: Marked messages as not junk" = "Report: Marked messages as not junk";
@@ -1,5 +0,0 @@
-"OtherUsersFolderName"   = "다른 사용자";
-"SharedFoldersName" = "공유 폴더";
-
-"Report: Marked messages as junk" = "보고서: 스팸으로 표시된 메시지";
-"Report: Marked messages as not junk" = "보고서: 스팸이 아닌 것으로 표시된 메시지";
@@ -25,7 +25,7 @@

@interface NSString (SOGoExtension)

-+ (NSString *) generateMessageID: (NSString *) mailOrDomain;
+ (NSString *) generateMessageID;
 - (NSString *) htmlToText;
 - (NSString *) htmlByExtractingImages: (NSMutableArray *) theImages;
 - (NSString *) stringByConvertingCRLNToHTML;
@@ -560,27 +560,15 @@

@implementation NSString (SOGoExtension)

-+ (NSString *) generateMessageID: (NSString *) mailOrDomain
+ (NSString *) generateMessageID
 {
  NSMutableString *messageID;
-  NSString *_domain;
-  NSRange r;
+  NSString *pGUID;

  messageID = [NSMutableString string];
-  [messageID appendFormat: @"<%@", [SOGoObject mailUniqueMessageId]];
-  if(mailOrDomain)
-  {
-    r = [mailOrDomain rangeOfString: @"@" options: NSBackwardsSearch];
-    if (r.location != NSNotFound)
-    {
-      //Its the full email not a domain
-      _domain = [mailOrDomain substringFromIndex: (r.location + r.length)];
-    }
-    else
-      _domain = mailOrDomain;
-    [messageID appendFormat: @"@%@>", _domain];
-  }
-    
+  [messageID appendFormat: @"<%@", [SOGoObject globallyUniqueObjectId]];
+  pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
+  [messageID appendFormat: @"@%u>", (unsigned int)[pGUID hash]];

  return [messageID lowercaseString];
 }
@@ -222,7 +222,7 @@ static NSString    *userAgent      = nil;
  messageID = [headers objectForKey: @"message-id"];
  if (!messageID)
    {
-      messageID = [NSString generateMessageID: [[newHeaders objectForKey: @"from"] pureEMailAddress]];
+      messageID = [NSString generateMessageID];
      [headers setObject: messageID forKey: @"message-id"];
    }

@@ -322,7 +322,7 @@ static NSString    *userAgent      = nil;

 - (void) setText: (NSString *) newText
 {
-  ASSIGN (text, [newText stringWithoutHTMLInjection: NO stripAngular: NO]);
+  ASSIGN (text, [newText stringWithoutHTMLInjection: NO]);
 }

 - (NSString *) text
@@ -142,10 +142,6 @@
  else
    imapAuthMech = nil;

-  //If ActiveSync, force the plain mech
-  if([[[[self context] request] requestHandlerKey] isEqualToString:@"Microsoft-Server-ActiveSync"])
-    imapAuthMech = @"plain";
-
  return [NGImap4ConnectionManager defaultConnectionManager: imapAuthMech];
 }

@@ -91,9 +91,6 @@
@interface SOGoMailGermanForward : SOGoMailForward
@end

-@interface SOGoMailGreekForward : SOGoMailForward
-@end
-
@interface SOGoMailHebrewForward : SOGoMailForward
@end

@@ -115,9 +112,6 @@
@interface SOGoMailKazakhForward : SOGoMailForward
@end

-@interface SOGoMailKoreanForward : SOGoMailForward
-@end
-
@interface SOGoMailLatvianForward : SOGoMailForward
@end

@@ -169,9 +163,6 @@
@interface SOGoMailSwedishForward : SOGoMailForward
@end

-@interface SOGoMailThaiForward : SOGoMailForward
-@end
-
@interface SOGoMailTurkishTurkeyForward : SOGoMailForward
@end

@@ -153,7 +153,7 @@
  NSString *rc;

  if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"organization"] stringByEscapingHTMLString]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"organization"]];
  else
    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"organization"]];

@@ -205,7 +205,7 @@
  NSString *rc;

  if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"newsgroups"] stringByEscapingHTMLString]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"newsgroups"]];
  else
    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"newsgroups"]];

@@ -222,7 +222,7 @@
  NSString *rc;

  if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"references"] stringByEscapingHTMLString]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"references"]];
  else
    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"references"]];

@@ -345,9 +345,6 @@
@implementation SOGoMailGermanForward
@end

-@implementation SOGoMailGreekForward
-@end
-
@implementation SOGoMailHebrewForward
@end

@@ -369,9 +366,6 @@
@implementation SOGoMailKazakhForward
@end

-@implementation SOGoMailKoreanForward
-@end
-
@implementation SOGoMailLatvianForward
@end

@@ -423,9 +417,6 @@
@implementation SOGoMailSwedishForward
@end

-@implementation SOGoMailThaiForward
-@end
-
@implementation SOGoMailTurkishTurkeyForward
@end

@@ -1,15 +0,0 @@
-<#newLine/><#newLine
-/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
->-------- Αρχικό Μήνυμα --------<#newLine
-/>Θέμα: <#subject/><#newLine
-/>Ημερομηνία: <#date/><#newLine
-/>Από: <#from/><#newLine
-/><#hasReplyTo>Απάντηση-Προς: <#replyTo/><#newLine/></#hasReplyTo
-><#hasOrganization>Οργανισμός: <#organization/><#newLine/></#hasOrganization
->Προς: <#to/><#newLine
-/><#hasCc>Κοιν.: <#cc/><#newLine/></#hasCc
-><#hasNewsGroups>Ομάδες ειδήσεων: <#newsgroups/><#newLine/></#hasNewsGroups
-><#hasReferences>Αναφορές: <#references/><#newLine/></#hasReferences
-><#newLine/><#newLine
-/><#messageBody
-/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,88 +0,0 @@
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -1,18 +0,0 @@
-<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
-><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
-><#outlookMode
->-------- Αρχικό Μήνυμα --------<#newLine
-/>Θέμα: <#subject/><#newLine
-/>Ημερομηνία: <#date/><#newLine
-/>Από: <#from/><#newLine
-/><#hasReplyTo>Απάντηση-Προς: <#replyTo/><#newLine/></#hasReplyTo
-><#hasOrganization>Οργανισμός: <#organization/><#newLine/></#hasOrganization
->Προς: <#to/><#newLine
-/><#hasCc>Κοιν.: <#cc/><#newLine/></#hasCc
-><#hasNewsGroups>Ομάδες ειδήσεων: <#newsgroups/><#newLine/></#hasNewsGroups
-><#hasReferences>Αναφορές: <#references/><#newLine/></#hasReferences
-></#outlookMode
-><#standardMode>Στις <#date/>, ο/η <#from/> έγραψε:</#standardMode
-><#newLine/><#newLine/><#messageBody
-/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
-><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,106 +0,0 @@
-outlookMode: WOConditional {
-  condition = outlookMode;
-}
-
-standardMode: WOConditional {
-  condition = outlookMode;
-  negate = YES;
-}
-
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-replyPlacementOnTop: WOConditional {
-  condition = replyPlacementOnTop;
-}
-
-replyPlacementOnBottom: WOConditional {
-  condition = replyPlacementOnTop;
-  negate = YES;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -1,15 +0,0 @@
-<#newLine/><#newLine
-/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
->-------- 원본 메시지 --------<#newLine
-/>제목: <#subject/><#newLine
-/>날짜: <#date/><#newLine
-/>보낸 사람: <#from/><#newLine
-/><#hasReplyTo>회신: <#replyTo/><#newLine/></#hasReplyTo>
-<#hasOrganization>조직: <#organization/><#newLine/></#hasOrganization>
-받는 사람: <#to/>
-<#hasCc>참조: <#cc/><#newLine/></#hasCc>
-<#hasNewsGroups>뉴스그룹: <#newsgroups/><#newLine/></#hasNewsGroups>
-<#hasReferences>참조: <#references/><#newLine/></#hasReferences>
-<#newLine/><#newLine
-/><#messageBody
-/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,88 +0,0 @@
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -1,20 +0,0 @@
-<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop>
-<#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop>
-<#outlookMode>
-------- 원본 메시지 --------
-제목: <#subject/><#newLine/>
-날짜: <#date/><#newLine/>
-보낸 사람: <#from/><#newLine/>
-<#hasReplyTo>회신: <#replyTo/><#newLine/></#hasReplyTo>
-<#hasOrganization>조직: <#organization/><#newLine/></#hasOrganization>
-받는 사람: <#to/><#newLine/>
-<#hasCc>참조: <#cc/><#newLine/></#hasCc>
-<#hasNewsGroups>뉴스그룹: <#newsgroups/><#newLine/></#hasNewsGroups>
-<#hasReferences>참조: <#references/><#newLine/></#hasReferences>
-</#outlookMode>
-<#standardMode>
-<#date/>에 <#from/>(이)가 작성했습니다:
-</#standardMode>
-<#newLine/><#newLine/><#messageBody/>
-<#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom>
-<#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,106 +0,0 @@
-outlookMode: WOConditional {
-  condition = outlookMode;
-}
-
-standardMode: WOConditional {
-  condition = outlookMode;
-  negate = YES;
-}
-
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-replyPlacementOnTop: WOConditional {
-  condition = replyPlacementOnTop;
-}
-
-replyPlacementOnBottom: WOConditional {
-  condition = replyPlacementOnTop;
-  negate = YES;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -108,9 +108,6 @@
@interface SOGoMailJapaneseReply : SOGoMailReply
@end

-@interface SOGoMailKoreanReply : SOGoMailReply
-@end
-
@interface SOGoMailKazakhReply : SOGoMailReply
@end

@@ -165,9 +162,6 @@
@interface SOGoMailSwedishReply : SOGoMailReply
@end

-@interface SOGoMailThaiReply : SOGoMailReply
-@end
-
@interface SOGoMailTurkishTurkeyReply : SOGoMailReply
@end

@@ -167,9 +167,6 @@
@implementation SOGoMailKazakhReply
@end

-@implementation SOGoMailKoreanReply
-@end
-
@implementation SOGoMailLatvianReply
@end

@@ -221,9 +218,6 @@
@implementation SOGoMailSwedishReply
@end

-@implementation SOGoMailThaiReply
-@end
-
@implementation SOGoMailTurkishTurkeyReply
@end

@@ -1,15 +0,0 @@
-<#newLine/><#newLine
-/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
->-------- ข้อความต้นทาง --------<#newLine
-/>หัวข้อ: <#subject/><#newLine
-/>วันที่: <#date/><#newLine
-/>จาก: <#from/><#newLine
-/><#hasReplyTo>ตอบกลับ: <#replyTo/><#newLine/></#hasReplyTo
-><#hasOrganization>องค์กร: <#organization/><#newLine/></#hasOrganization
->ถึง: <#to/><#newLine
-/><#hasCc>สำเนา: <#cc/><#newLine/></#hasCc
-><#hasNewsGroups>กลุ่มข่าว: <#newsgroups/><#newLine/></#hasNewsGroups
-><#hasReferences>การอ้างถึง: <#references/><#newLine/></#hasReferences
-><#newLine/><#newLine
-/><#messageBody
-/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,88 +0,0 @@
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -1,18 +0,0 @@
-<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
-><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
-><#outlookMode
->-------- ข้อความต้นทาง --------<#newLine
-/>หัวข้อ: <#subject/><#newLine
-/>วันที่: <#date/><#newLine
-/>จาก: <#from/><#newLine
-/><#hasReplyTo>ตอบกลับ: <#replyTo/><#newLine/></#hasReplyTo
-><#hasOrganization>องค์กร: <#organization/><#newLine/></#hasOrganization
->ถึง: <#to/><#newLine
-/><#hasCc>สำเนา: <#cc/><#newLine/></#hasCc
-><#hasNewsGroups>กลุ่มข่าว: <#newsgroups/><#newLine/></#hasNewsGroups
-><#hasReferences>การอ้างถึง: <#references/><#newLine/></#hasReferences
-></#outlookMode
-><#standardMode>บน <#date/>, <#from/> ขียน:</#standardMode
-><#newLine/><#newLine/><#messageBody
-/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
-><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
@@ -1,106 +0,0 @@
-outlookMode: WOConditional {
-  condition = outlookMode;
-}
-
-standardMode: WOConditional {
-  condition = outlookMode;
-  negate = YES;
-}
-
-subject: WOString {
-  value = subject;
-  escapeHTML = NO;
-}
-
-date: WOString {
-  value = date;
-  escapeHTML = NO;
-}
-
-from: WOString {
-  value = from;
-  escapeHTML = NO;
-}
-
-newLine: WOString {
-  value = newLine;
-  escapeHTML = NO;
-}
-
-hasReplyTo: WOConditional {
-  condition = hasReplyTo;
-}
-
-replyTo: WOString {
-  value = replyTo;
-  escapeHTML = NO;
-}
-
-hasOrganization: WOConditional {
-  condition = hasOrganization;
-}
-
-organization: WOString {
-  value = organization;
-  escapeHTML = NO;
-}
-
-to: WOString {
-  value = to;
-  escapeHTML = NO;
-}
-
-hasCc: WOConditional {
-  condition = hasCc;
-}
-
-cc: WOString {
-  value = cc;
-  escapeHTML = NO;
-}
-
-hasNewsGroups: WOConditional {
-  condition = hasNewsGroups;
-}
-
-newsgroups: WOString {
-  value = newsgroups;
-  escapeHTML = NO;
-}
-
-hasReferences: WOConditional {
-  condition = hasReferences;
-}
-
-references: WOString {
-  value = references;
-  escapeHTML = NO;
-}
-
-messageBody: WOString {
-  value = messageBody;
-  escapeHTML = NO;
-}
-
-signature: WOString {
-  value = signature;
-  escapeHTML = NO;
-}
-
-replyPlacementOnTop: WOConditional {
-  condition = replyPlacementOnTop;
-}
-
-replyPlacementOnBottom: WOConditional {
-  condition = replyPlacementOnTop;
-  negate = YES;
-}
-
-signaturePlacementOnTop: WOConditional {
-  condition = signaturePlacementOnTop;
-}
-
-signaturePlacementOnBottom: WOConditional {
-  condition = signaturePlacementOnTop;
-  negate = YES;
-}
@@ -1,5 +0,0 @@
-"OtherUsersFolderName"   = "ผู้ใช้งานอื่นๆ";
-"SharedFoldersName" = "โฟลเดอร์ที่แชร์";
-
-"Report: Marked messages as junk" = "รายงาน: ทำเครื่องหมายข้อความเป็นขยะ";
-"Report: Marked messages as not junk" = "รายงาน: ทำเครื่องหมายข้อความว่าไม่ใช่ขยะ";
@@ -231,7 +231,7 @@ endif
 ADDITIONAL_TOOL_LIBS += -Lobj -lSOGo$(LIBRARY_NAME_SUFFIX)
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -lmemcached -lzip -lytnef -lcurl
+ADDITIONAL_LDFLAGS += -lmemcached -lzip -lytnef

 -include GNUmakefile.preamble
 ifneq ($(FHS_INSTALL_ROOT),)
@@ -27,7 +27,6 @@
@class NSArray;
@class NSString;
@class WOContext;
-@class NSNull;

@interface NSObject (SOGoObjectUtilities)

@@ -33,9 +33,6 @@

 #import "NSObject+Utilities.h"

-static NSMutableDictionary *translationCache = nil;
-
-
@implementation NSObject (SOGoObjectUtilities)

 - (NSString *) jsonRepresentation
@@ -104,28 +101,19 @@ static NSMutableDictionary *translationCache = nil;
  if (!bundle)
    bundle = [NSBundle mainBundle];
  languages = [[self _languagesForLabelsInContext: context] objectEnumerator];
-  
-  if(!translationCache)
-    translationCache = [NSMutableDictionary new];

  while (!label && (language = [languages nextObject]))
    {
-      if (![translationCache objectForKey: language] || [[translationCache objectForKey: language] objectForKey: key] != [NSNull null]) {
-        paths = [bundle pathsForResourcesOfType: @"strings"
-          inDirectory: [NSString stringWithFormat: @"%@.lproj",
-                        language]
+      paths = [bundle pathsForResourcesOfType: @"strings"
+		      inDirectory: [NSString stringWithFormat: @"%@.lproj",
+					     language]
 		      forLocalization: language];
-        if ([paths count] > 0)
-	      {
-	        strings = [NSDictionary
-		                 dictionaryFromStringsFile: [paths objectAtIndex: 0]];
-	        [translationCache setObject: strings forKey: language];
-	        label = [strings objectForKey: key];
-	      }
-	    } else {
-	      strings = [translationCache objectForKey: language]; 
-	      label = [strings objectForKey: key];
-	    }
+      if ([paths count] > 0)
+	{
+	  strings = [NSDictionary
+		      dictionaryFromStringsFile: [paths objectAtIndex: 0]];
+	  label = [strings objectForKey: key];
+	}
    }
  if (!label)
    label = key;
@@ -78,8 +78,7 @@

 /* XSS protection */
 - (NSString *) removeHTMLTagsExceptAnchorTags;
- (NSString *) stringWithoutHTMLInjection: (BOOL)stripHTMLCode
-							 stripAngular: (BOOL)stripAngular;
+- (NSString *) stringWithoutHTMLInjection: (BOOL)stripHTMLCode;

 #ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue;
@@ -184,9 +184,6 @@ static int cssEscapingCount;
    {
      rangePtr->location += offset;
      urlText = [selfCopy substringFromRange: *rangePtr];
-      //If we try to detect mail, check if the first char is @, meaning this is not an email
-      if([prefix isEqualToString: @"mailto:"] && [urlText characterAtIndex: 0] == '@')
-        continue;
      newUrlText = [NSString stringWithFormat: @"<a rel=\"noopener\" href=\"%@%@\">%@</a>",
                          ([urlText hasPrefix: prefix]? @"" : prefix),
                             urlText, urlText];
@@ -936,19 +933,18 @@ static int cssEscapingCount;
 * @param stripHTMLCode Remove all HTML code from content
 * @return A safe string
 */
- (NSString *) stringWithoutHTMLInjection: (BOOL)stripHTMLCode stripAngular: (BOOL)stripAngular
+- (NSString *) stringWithoutHTMLInjection: (BOOL)stripHTMLCode
 {
  NSString *result, *text, *newResult;
  NSScanner *theScanner;
  NSError *error;
  NSUInteger numberOfMatches;
-  NSRegularExpression *regex, *importRegex;
+  NSRegularExpression *regex;

  text = nil;
  error = nil;
  result = [NSString stringWithString: self];
  regex = nil;
-  importRegex = nil;
  
  NS_DURING
  {
@@ -987,28 +983,20 @@ static int cssEscapingCount;
      // Remove javascript:
      regex = [NSRegularExpression regularExpressionWithPattern:@"j[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*a[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*v[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*a[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*c[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*:"
                                  options: NSRegularExpressionCaseInsensitive error:&error];
-      // loop until stable: a single pass lets nested tokens reconstruct
-      // the scheme, e.g. "javajavascript:script:" -> "javascript:"
-      while ([regex numberOfMatchesInString:result options:0 range:NSMakeRange(0, [result length])] > 0) {
-        newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
-        result = [NSString stringWithString: newResult];
-      }
+      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
+      result = [NSString stringWithString: newResult];

      // Remove vbscript:
      regex = [NSRegularExpression regularExpressionWithPattern:@"v[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*b[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*c[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*:"
                                  options: NSRegularExpressionCaseInsensitive error:&error];
-      while ([regex numberOfMatchesInString:result options:0 range:NSMakeRange(0, [result length])] > 0) {
-        newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
-        result = [NSString stringWithString: newResult];
-      }
+      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
+      result = [NSString stringWithString: newResult];

      // Remove livescript:
      regex = [NSRegularExpression regularExpressionWithPattern:@"l[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*v[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*e[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*c[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*:"
                                  options: NSRegularExpressionCaseInsensitive error:&error];
-      while ([regex numberOfMatchesInString:result options:0 range:NSMakeRange(0, [result length])] > 0) {
-        newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
-        result = [NSString stringWithString: newResult];
-      }
+      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@""];
+      result = [NSString stringWithString: newResult];

      // Remove <script
      regex = [NSRegularExpression regularExpressionWithPattern:@"<[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*c[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t" 
@@ -1040,41 +1028,24 @@ static int cssEscapingCount;
      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"</for*"];
      result = [NSString stringWithString: newResult];

-      // Remove ANY inline event handler (on...=) in one rule instead of an
-      // incomplete allow list. This also covers obfuscation by whitespace
-      // before the '=' ("onerror =") and handler names that were not listed
-      // before (onfocus, onbegin, onanimationstart, ...). With onfocus gone,
-      // a lone "autofocus" has no handler left to trigger.
-      regex = [NSRegularExpression regularExpressionWithPattern:@"\\bon(click|error|focus|load|mouseover|animationstart)[\\s\\u200B&#x09;&#x0A;&#x0D;\\r\\n\\t]*="
+      // Remove onload
+      regex = [NSRegularExpression regularExpressionWithPattern:@"onload=" 
                                  options: NSRegularExpressionCaseInsensitive error:&error];
-      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"data-blocked="];
+      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"onl***="];
      result = [NSString stringWithString: newResult];
-      
+
+      // Remove onmouseover
+      regex = [NSRegularExpression regularExpressionWithPattern:@"onmouseover=" 
+                                  options: NSRegularExpressionCaseInsensitive error:&error];
+      newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"onmouseo***="];
+      result = [NSString stringWithString: newResult];
+
      // Remove @import css (in style tags)
-      importRegex = [NSRegularExpression regularExpressionWithPattern:@"(<[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*y[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*l[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*e.*)([\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*@[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*m[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*o[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t)(.*<[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*\\/[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*y[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*l[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*e[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*>)" 
+      regex = [NSRegularExpression regularExpressionWithPattern:@"(<[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*y[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*l[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*e.*)([\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*@[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*i[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*m[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*p[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*o[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*r[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t)(.*<[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*\\/[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*s[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*t[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*y[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*l[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*e[\\s\\u200B&#x09;&#x0A;&#x0D;\\\\0]*>)" 
                                  options: NSRegularExpressionCaseInsensitive error:&error];
-      newResult = [importRegex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"$1@im****$3"];
-      result = [NSString stringWithString: newResult];
-
-
-      if(stripAngular) {
-        // Remove {{ and }} as they are interprated by angularJS with no way of escaping.
-        // Cover the literal form, the hex entity (&#x7b;) AND the decimal entity
-        // (&#123;), both with optional leading zeros, since the browser decodes
-        // any of them back to a brace before AngularJS parses the node.
-        regex = [NSRegularExpression regularExpressionWithPattern:@"(\\{\\{)|(&#x0*7b;&#x0*7b;)|(&#0*123;&#0*123;)"
-                                    options: NSRegularExpressionCaseInsensitive error:&error];
-        newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"{\\\\{"];
-        result = [NSString stringWithString: newResult];
-        regex = [NSRegularExpression regularExpressionWithPattern:@"(\\}\\})|(&#x0*7d;&#x0*7d;)|(&#0*125;&#0*125;)"
-                                    options: NSRegularExpressionCaseInsensitive error:&error];
-        newResult = [regex stringByReplacingMatchesInString:result options:0 range:NSMakeRange(0, [result length]) withTemplate:@"}/}"];
-        result = [NSString stringWithString: newResult];
-      }
-
      newResult = result;
-      while([importRegex numberOfMatchesInString:newResult options:0 range:NSMakeRange(0, [newResult length])] > 0) {
-        newResult = [importRegex stringByReplacingMatchesInString:newResult options:0 range:NSMakeRange(0, [newResult length]) withTemplate:@"$1@im****$3"];
+      while([regex numberOfMatchesInString:newResult options:0 range:NSMakeRange(0, [newResult length])] > 0) {
+        newResult = [regex stringByReplacingMatchesInString:newResult options:0 range:NSMakeRange(0, [newResult length]) withTemplate:@"$1@im****$3"];
      }
      result = [NSString stringWithString: newResult];
    }
@@ -1089,75 +1060,14 @@ static int cssEscapingCount;
 }

 - (NSString *) cleanInvalidHTMLTags {
-  // Clean HTML invalid tags as reported in https://bugs.sogo.nu/view.php?id=5755 and https://bugs.sogo.nu/view.php?id=6167
-  // libxml2 (HTML4) sees a standalone empty comment (<!--> or <!--->) as an
-  // unterminated comment and drops the rest of the document, so remove it.
-  // Only do it outside of comments: the Outlook "downlevel-revealed" pattern
-  // <!--[if !mso]><!--> ... <!--<![endif]--> ends its first comment with
-  // "<!-->", and removing it would hide the content in between.
-  NSString *result;
-  unichar *in, *out;
-  NSUInteger len, i, j, o;
+  // Clean HTML invalid tags as reported in https://bugs.sogo.nu/view.php?id=5755
+  NSString *s;
+  
+  s = [NSString stringWithString: self];
+  s = [s stringByReplacingOccurrencesOfString:@"<!-->" withString:@""];
+  s = [s stringByReplacingOccurrencesOfString:@"<!--<!" withString:@"<!--"];

-  len = [self length];
-  if (len == 0)
-    return [NSString string];
-
-  // Work on raw buffers: linear time, bounded memory (no per-comment objects)
-  in = NSZoneMalloc (NULL, len * sizeof (unichar));
-  out = NSZoneMalloc (NULL, len * sizeof (unichar));
-  [self getCharacters: in];
-  i = o = 0;
-
-  while (i < len)
-    {
-      if (i + 3 < len
-          && in[i] == '<' && in[i+1] == '!' && in[i+2] == '-' && in[i+3] == '-')
-        {
-          j = i + 4;
-          if (j < len && in[j] == '>')
-            {
-              // <!-->
-              i = j + 1;
-              continue;
-            }
-          if (j + 1 < len && in[j] == '-' && in[j+1] == '>')
-            {
-              // <!--->
-              i = j + 2;
-              continue;
-            }
-
-          // Regular comment: keep it untouched up to its end ("-->" or "--!>",
-          // as libxml2 accepts both), or up to the end if unterminated
-          while (j < len)
-            {
-              if (j + 2 < len && in[j] == '-' && in[j+1] == '-' && in[j+2] == '>')
-                {
-                  j += 3;
-                  break;
-                }
-              if (j + 3 < len && in[j] == '-' && in[j+1] == '-'
-                  && in[j+2] == '!' && in[j+3] == '>')
-                {
-                  j += 4;
-                  break;
-                }
-              j++;
-            }
-          memcpy (out + o, in + i, (j - i) * sizeof (unichar));
-          o += j - i;
-          i = j;
-        }
-      else
-        out[o++] = in[i++];
-    }
-
-  result = [NSString stringWithCharacters: out length: o];
-  NSZoneFree (NULL, in);
-  NSZoneFree (NULL, out);
-
-  return result;
+  return s;
 }

@end
@@ -93,7 +93,7 @@ static const NSString *kCacheMotdKey = @"admin-motd";
  NSException *error;
  NSString *safeMotd;

-  safeMotd = [motd stringWithoutHTMLInjection: NO stripAngular: NO];
+  safeMotd = [motd stringWithoutHTMLInjection: NO];
  error = [[[GCSFolderManager defaultFolderManager] adminFolder] writeMotd: safeMotd];
  if (!error) {
    [[SOGoCache sharedCache] setValue:safeMotd forKey:kCacheMotdKey];
@@ -289,7 +289,7 @@ static memcached_st *handle = NULL;
  NSData *keyData, *valueData;
  memcached_return error;

-  //[self logWithFormat: @"setValue: '%@' forKey: '%@'", value, key];
+  // [self logWithFormat: @"setValue: '%@' forKey: '%@'", value, key];
  if (handle)
    {
      keyData = [key dataUsingEncoding: NSUTF8StringEncoding];
@@ -30,7 +30,7 @@

    SOGoLDAPContactInfoAttribute = "description";

-    SOGoMailingMechanism = "smtp";
+    SOGoMailingMechanism = "sendmail";
    SOGoSMTPServer = "smtp://localhost";
    SOGoMailSpoolPath = "/var/spool/sogo";

@@ -59,7 +59,6 @@
        "French",
        "Galician",
        "German",
-        "Greek",
        "Hebrew",
        "Hungarian",
        "Icelandic",
@@ -67,7 +66,6 @@
        "Italian",
        "Japanese",
        "Kazakh",
-        "Korean",
        "Latvian",
        "Lithuanian",
        "Macedonian",
@@ -86,7 +84,6 @@
        "SpanishArgentina",
        "SpanishSpain",
        "Swedish",
-        "Thai",
        "TurkishTurkey",
        "Ukrainian",
        "Welsh"
@@ -130,7 +127,6 @@
    SOGoMailDisplayFullEmail = NO;
    SOGoMailDisplayRemoteInlineImages = "never";
    SOGoMailCertificateEnabled = YES;
-    SOGoMailDisplayAttachmentAbove = NO;

    SOGoMailAutoMarkAsReadDelay = "0";
    SOGoMailAutoSave = "5";
@@ -100,7 +100,6 @@
 - (BOOL) notifyOnExternalModifications;

 - (NSDictionary *) mailJunkSettings;
- (NSString *) mailJunkIcon;

 - (BOOL) createIdentitiesDisabled;

@@ -304,10 +304,11 @@
  NSString *mailingMechanism;

  mailingMechanism = [self stringForKey: @"SOGoMailingMechanism"];
-  if (![mailingMechanism isEqualToString: @"smtp"])
+  if (!([mailingMechanism isEqualToString: @"sendmail"]
+        || [mailingMechanism isEqualToString: @"smtp"]))
    {
      [self logWithFormat: @"mechanism '%@' is invalid and"
-            @" should be set to 'smtp' instead",
+            @" should be set to 'sendmail' or 'smtp' instead",
            mailingMechanism];
      mailingMechanism = nil;
    }
@@ -461,9 +462,7 @@

 - (int) searchMinimumWordLength
 {
-  int min = [self integerForKey: @"SOGoSearchMinimumWordLength"];
-  if(min<1) min=1;
-  return min;
+  return [self integerForKey: @"SOGoSearchMinimumWordLength"];
 }

 - (BOOL) notifyOnPersonalModifications
@@ -481,29 +480,6 @@
  return [self objectForKey: @"SOGoMailJunkSettings"];
 }

- (NSString *) mailJunkIcon
-{
-  NSArray *iconsList;
-  NSString *icon;
-
-  iconsList = [NSArray arrayWithObjects: @"thumb_down",
-                                          @"gpp_bad",
-                                          @"local_fire_department",
-                                          @"bug_report",
-                                          @"error",
-                                          @"warning",
-                                          @"dangerous",
-                                          @"report_gmailerrorred",
-                                          nil];
-  icon = [self objectForKey: @"mailJunkIcon"];
-  if (([icon length] && ![iconsList containsObject:icon]) || ![icon length])
-  {
-    icon = @"thumb_down";
-  }
-
-  return icon;
-}
-
 - (BOOL) createIdentitiesDisabled
 {
  return [self boolForKey: @"SOGoCreateIdentitiesDisabled"];
@@ -1859,76 +1859,27 @@ static NSArray *childRecordFields = nil;
  EOAdaptorChannel *channel;
  GCSFolder *folder;
  NSEnumerator *userRoles;
-  NSString *SQL, *currentRole, *sqlstr;
-  NSString *fieldName, *value;
-  EOAdaptorContext *adaptorCtx;
-  EOAdaptor *adaptor;
-  EOAttribute *attribute;
+  NSString *SQL, *currentRole;

  folder = [self ocsFolder];
  channel = [folder acquireAclChannel];
-  adaptorCtx = [channel adaptorContext];
-
-  [adaptorCtx beginTransaction];
+  [[channel adaptorContext] beginTransaction];
  userRoles = [roles objectEnumerator];
-  objectPath = [NSString stringWithFormat: @"/%@", objectPath];
  while ((currentRole = [userRoles nextObject]))
    {
-      int i = 0;
-      int count = 0;
-      adaptor = [adaptorCtx adaptor];
-      attribute = [EOAttribute new];
-      [attribute autorelease];
      if ([GCSFolderManager singleStoreMode])
-      {
-        sqlstr = [NSMutableString stringWithFormat: @"INSERT INTO %@"
-                                            @" (c_object, c_uid, c_role, c_folder_id)"
-                                            @" VALUES (",
-                                            [folder aclTableName]];
-        NSArray *keys = [NSArray arrayWithObjects: @"c_object", @"c_uid", @"c_role", @"c_folder_id", nil];
-        NSArray *values = [NSArray arrayWithObjects: objectPath, uid, currentRole, [folder folderId], nil];
-            
-        for (i = 0, count = [keys count]; i < count; i++) {
-          fieldName = [keys objectAtIndex: i];
-          if(i < 3)
-            [attribute setExternalType: @"varchar"];
-          else
-            [attribute setExternalType: @"int"];
-          value = [values objectAtIndex: i];
-          if (attribute)
-          {
-            value = [adaptor formatValue: value forAttribute: attribute];
-            [sqlstr appendString: value];
-            if(i < 3)
-              [sqlstr appendString:@", "];
-          }
-        }
-        [sqlstr appendString:@")"];
-      }
+        SQL = [NSString stringWithFormat: @"INSERT INTO %@"
+                        @" (c_object, c_uid, c_role, c_folder_id)"
+                        @" VALUES ('/%@', '%@', '%@', %@)",
+                        [folder aclTableName],
+                        objectPath, uid, currentRole, [folder folderId]];
      else
-      {
-        sqlstr = [NSMutableString stringWithFormat: @"INSERT INTO %@"
-                                            @" (c_object, c_uid, c_role)"
-                                            @" VALUES (",
-                                            [folder aclTableName]];
-        NSArray *keys = [NSArray arrayWithObjects: @"c_object", @"c_uid", @"c_role", nil];
-        NSArray *values = [NSArray arrayWithObjects: objectPath, uid, currentRole, nil];
-            
-        for (i = 0, count = [keys count]; i < count; i++) {
-          fieldName = [keys objectAtIndex: i];
-          [attribute setExternalType: @"varchar"];
-          value = [values objectAtIndex: i];
-          if (attribute)
-          {
-            value = [adaptor formatValue: value forAttribute: attribute];
-            [sqlstr appendString: value];
-            if(i < 2)
-              [sqlstr appendString:@", "];
-          }
-        }
-        [sqlstr appendString:@")"];
-      }
-      [channel evaluateExpressionX: sqlstr];
+        SQL = [NSString stringWithFormat: @"INSERT INTO %@"
+                        @" (c_object, c_uid, c_role)"
+                        @" VALUES ('/%@', '%@', '%@')",
+                        [folder aclTableName],
+                        objectPath, uid, currentRole];
+      [channel evaluateExpressionX: SQL];
    }

  [[channel adaptorContext] commitTransaction];
@@ -48,7 +48,6 @@
@class NSException;
@class NSTimeZone;
@class NSURL;
-@class NSUUID;

@class WOContext;
@class WORequest;
@@ -75,9 +74,6 @@
 + (NSString *) globallyUniqueObjectId;
 - (NSString *) globallyUniqueObjectId;

-+ (NSString *) mailUniqueMessageId;
- (NSString *) mailUniqueMessageId;
-
 + (id) objectWithName: (NSString *)_name inContainer:(id)_container;

 - (id) initWithName: (NSString *) _name inContainer:(id)_container;
@@ -21,6 +21,7 @@

 #import <unistd.h>

+
 #import <NGObjWeb/SoClass.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOApplication.h>
@@ -110,28 +111,11 @@
 		   pid, (int) f, sequence++, (int) rndm];
 }

-
 - (NSString *) globallyUniqueObjectId
 {
  return [[self class] globallyUniqueObjectId];
 }

-+ (NSString *) mailUniqueMessageId
-{
-  /*
-  843F8180-4E33-7B0B-6F1B-9847CAD3E6EB
-  */
-  return [[NSUUID UUID] UUIDString];
-}
-
- (NSString *) mailUniqueMessageId
-{
-  /*
-  843F8180-4E33-7B0B-6F1B-9847CAD3E6EB
-  */
-  return [[self class] mailUniqueMessageId];
-}
-
 /* containment */

 + (id) objectWithName: (NSString *)_name inContainer:(id)_container
@@ -33,25 +33,6 @@
@class NSURL;
@class NSJSONSerialization;

-size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
-
-@interface SimpleOpenIdResponse: NSObject
-{
-  unsigned int status;
-  NSString    *content;
-  NSString    *headers;
-}
-
- (id)initWithResponse: (NSString *)_data andHeaders: (NSString *)_headers andStatus:(unsigned int )_status;
-
- (void)setStatus:(unsigned int)_status;
- (unsigned int)status;
- (void)setContent:(NSString *)_data;
- (NSString *)contentString;
- (void)setHearders:(NSString *)_data;
- (NSString *)headers;
-
-@end

@interface SOGoOpenIdSession : SOGoObject
 {
@@ -99,12 +80,12 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
 - (void) initialize;
 - (void) initializeWithConfig: (NSDictionary *) _config;
 - (BOOL) sessionIsOK;
- (SimpleOpenIdResponse *) _performOpenIdRequest: (NSString *) endpoint
+- (WOResponse *) _performOpenIdRequest: (NSString *) endpoint
                        method: (NSString *) method
                       headers: (NSDictionary *) headers
                          body: (NSData *) body;
 - (NSMutableDictionary *) fecthConfiguration: (NSString *) _domain;
- (void) setAccessToken: (NSString* ) token;
+- (void) setAccessToken;
 - (NSString *) getRefreshToken; 
 - (NSString *) getToken;
 - (NSString *) getCurrentToken; 
@@ -18,11 +18,8 @@
 * Boston, MA 02111-1307, USA.
 */

-
 #import <Foundation/NSProcessInfo.h>

-#import <curl/curl.h>
-
 #import <NGObjWeb/WOHTTPConnection.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -30,12 +27,12 @@

 #import <SOGo/SOGoUser.h>

+
 #import <GDLContentStore/GCSOpenIdFolder.h>
 #import <GDLContentStore/GCSFolderManager.h>

 #import "NSDictionary+Utilities.h"
-#import <SOGo/NSString+Utilities.h>
-#import <SOGo/NSString+Crypto.h>
+#import "NSString+Utilities.h"
 #import "SOGoCache.h"
 #import "SOGoSystemDefaults.h"

@@ -43,87 +40,6 @@

 static BOOL SOGoOpenIDDebugEnabled = YES;

-
-size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
-{
-  size_t total;
-  
-  total = size * nmemb;
-  [(NSMutableData *)buffer appendBytes: ptr length: total];
-  
-  return total;
-}
-
-@implementation SimpleOpenIdResponse
-
- (id)init {
-  if ((self = [super init])) {
-  }
-  return self;
-}
-
- (id)initWithResponse: (NSString *)_data andHeaders: (NSString *)_headers andStatus:(unsigned int )_status{
-  if ((self = [self init])) {
-    [self setStatus: _status];
-    [self setContent: _data];
-    [self setHeaders: _headers];
-  }
-  return self;
-}
-
- (void)setStatus:(unsigned int)_status
-{
-  self->status = _status;
-}
-
- (unsigned int)status
-{
-  if(self->status)
-    return self->status;
-  return 0;
-}
-
- (void)setContent:(NSString *)_data
-{
-  self->content = _data;
-}
-
- (NSString *)contentString
-{
-  if(self->content)
-    return self->content;
-  return nil;
-}
-
- (void)setHeaders:(NSString *)_data
-{
-  self->headers = _data;
-}
-
- (NSString *)headers
-{
-  if(self->headers)
-    return self->headers;
-  return nil;
-}
-
- (NSString*)description {
-    NSString *co, *hd;
-    unsigned int st;
-    st = 0;
-    co = @"nil";
-    hd = @"nil";
-    if(self->status)
-      st = self->status;
-    if(self->headers)
-      hd = self->headers;
-    if(self->content)
-      co = self->content;
-    return [NSString stringWithFormat: @"<SimpleOpenIdResponse> <status: %d>, <headers: %@>, <content: %@>", st, hd, co];
-}
-
-@end
-
@implementation SOGoOpenIdSession

 /// Check if all required parameters to set up a OpenIdSession are in sogo.conf
@@ -151,7 +67,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (void) initializeWithConfig: (NSDictionary *) _config
 {
  SOGoSystemDefaults *sd;
-  id refreshTokenBool, domainInfo, intForKey;
+  id refreshTokenBool, domainInfo;

  if([_config objectForKey: @"SOGoOpenIdConfigUrl"] &&
      [_config objectForKey: @"SOGoOpenIdScope"] &&
@@ -174,12 +90,8 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
    if (domainInfo && [domainInfo respondsToSelector: @selector (boolValue)])
        sendDomainInfo = [domainInfo boolValue];

-    intForKey = [_config objectForKey: @"SOGoOpenIdTokenCheckInterval"];
-    if (intForKey && [intForKey respondsToSelector: @selector (intValue)])
-          userTokenInterval = [intForKey intValue];
-    else
-      userTokenInterval = 0;
-
+      
+    userTokenInterval        = [_config objectForKey: @"SOGoOpenIdTokenCheckInterval"];
    [self _loadSessionFromCache: forDomain];

    if(cacheUpdateNeeded)
@@ -244,150 +156,66 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
  }
 }

- (SimpleOpenIdResponse *) _performOpenIdRequest: (NSString *) endpoint
+
+- (WOResponse *) _performOpenIdRequest: (NSString *) endpoint
                        method: (NSString *) method
                       headers: (NSDictionary *) headers
                          body: (NSData *) body
 {
  NSURL *url;
-  NSMutableData *buffer, *buffHeaders;
-  SimpleOpenIdResponse *response;
-  
-  CURL *curl;
-  struct curl_slist *headerlist=NULL;
  NSUInteger status;
-  NSString *content, *headerResp;
-  CURLcode rc;
-  char error[CURL_ERROR_SIZE];
-
+  WORequest *request;
+  WOResponse *response;
+  WOHTTPConnection *httpConnection;
+  
+  
  url = [NSURL URLWithString: endpoint];
-  if(!url)
+  if (url)
  {
-    [self errorWithFormat: @"OpenID can't handle endpoint (not a url): '%@'", endpoint];
-    return nil;
-  }
-
-  if(SOGoOpenIDDebugEnabled)
-  {
-    NSLog(@"OpenId perform request: %@ %@", method, endpoint);
-    NSLog(@"OpenId perform request, headers %@", headers);
-  }
-  if(SOGoOpenIDDebugEnabled)
-    NSLog(@"OpenId perform request, body raw %@", body);
-
-  curl_global_init(CURL_GLOBAL_SSL);
-  curl = curl_easy_init();
-
-  if (curl)
-  {
-    error[0] = 0;
-    curl_easy_setopt(curl, CURLOPT_URL, [endpoint UTF8String]);
-
-    //add form
-    if(body)
+    if(SOGoOpenIDDebugEnabled)
    {
-      //Trick because sometimes NSData bytes don't add the \0 at the end and junk character may be added
-      const char *myBodyTmp = (const char*)[body bytes];
-      char myBody[[body length]+1];
-      strncpy(myBody, myBodyTmp, [body length]);
-      myBody[[body length]]='\0';
-
-      if(SOGoOpenIDDebugEnabled)
-        NSLog(@"OpenId perform request, myBodyTmp %s", myBodyTmp);
-
-      if(SOGoOpenIDDebugEnabled)
-        NSLog(@"OpenId perform request, myBody %s", myBody);
-
-      curl_easy_setopt(curl, CURLOPT_POST, 1);
-      curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, myBody);
+      NSLog(@"OpenId perform request: %@ %@", method, endpoint);
+      NSLog(@"OpenId perform request, headers %@", headers);
+      // if(body)
+      //   NSLog(@"OpenId perform request: content %@", [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding]);
    }
-    
-    //add headers
-    if(headers)
+      
+    httpConnection = [[WOHTTPConnection alloc] initWithURL: url];
+    [httpConnection autorelease];
+
+    request = [[WORequest alloc] initWithMethod: method
+                                            uri: [endpoint hostlessURL]
+                                    httpVersion: @"HTTP/1.1"
+                                        headers: headers content: body
+                                        userInfo: nil];
+    [request autorelease];
+    [httpConnection sendRequest: request];
+    response = [httpConnection readResponse];
+    status = [response status];
+    if(status >= 200 && status <500 && status != 404)
+      return response;
+    else if (status == 404)
    {
-      NSEnumerator *enumerator = [headers keyEnumerator];
-      NSString *key, *header;
-      while((key = [enumerator nextObject]))
-      {
-        header = [NSString stringWithFormat: @"%@: %@", key, [headers objectForKey: key]];
-        headerlist = curl_slist_append(headerlist, [header UTF8String]);
-      }
-    }
-    if(headerlist != NULL)
-      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
-    
-
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-
-    buffer = [NSMutableData data];
-    buffHeaders = [NSMutableData data];
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_body_function);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
-    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, curl_body_function);
-    curl_easy_setopt(curl, CURLOPT_HEADERDATA, buffHeaders);
-    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error);
-
-    // Perform SOAP request
-    rc = curl_easy_perform(curl);
-    if (rc == CURLE_OK)
-    {
-      curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status);
-
-      response = [SimpleOpenIdResponse alloc];
-      headerResp = [[NSString alloc] initWithData: buffHeaders
-                                        encoding: NSUTF8StringEncoding];
-
-      response = [response initWithResponse: nil andHeaders: headerResp andStatus: status];
-
-      if(status >= 200 && status <500 && status != 404)
-      {
-        content = [[NSString alloc] initWithData: buffer
-                                        encoding: NSUTF8StringEncoding];
-        if (!content)
-          content = [[NSString alloc] initWithData: buffer
-                                          encoding: NSISOLatin1StringEncoding];
-        [response setContent: content];
-
-        if(SOGoOpenIDDebugEnabled)
-          NSLog(@"OpenId perform request: response is: %@", response);
-
-        curl_easy_cleanup(curl);
-        return [response autorelease];
-      }
-      else if (status == 404)
-      {
-        [self errorWithFormat: @"OpenID endpoint not found (404): %@", endpoint];
-        curl_easy_cleanup(curl);
-        return nil; 
-      }
-      else
-      {
-        [self errorWithFormat: @"OpenID server internal error during %@: %@", endpoint, response];
-        curl_easy_cleanup(curl);
-        return nil;
-      }
+      [self errorWithFormat: @"OpenID endpoint not found (404): %@", endpoint];
+      return nil; 
    }
    else
    {
-      [self errorWithFormat: @"CURL error while accessing %@ (%d): %@", endpoint, rc,
-            [NSString stringWithCString: strlen(error) ? error : curl_easy_strerror(rc)]];
+      [self errorWithFormat: @"OpenID server internal error during %@: %@", endpoint, response];
+      return nil;
    }
-    curl_easy_cleanup(curl);
  }
  else
  {
-    [self errorWithFormat: @"OpenID error when setting curl request for: %@", endpoint];
-    return nil; 
+    [self errorWithFormat: @"OpenID can't handle endpoint (not a url): '%@'", endpoint];
+    return nil;
  }
 }

 - (NSMutableDictionary *) fecthConfiguration: (NSString*) _domain
 {
  NSString *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse * response;
+  WOResponse * response;
  NSUInteger status;
  NSMutableDictionary *result;
  NSDictionary *config, *headers;
@@ -677,8 +505,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) fetchToken: (NSString * ) code redirect: (NSString *) oldLocation
 {
  NSString *location, *form, *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
  NSUInteger status;
  NSMutableDictionary *result;
  NSDictionary *headers;
@@ -703,10 +530,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
                                                                self->forDomain, @"sogo-user-domain", nil];
    else
      headers = [NSDictionary dictionaryWithObject: @"application/x-www-form-urlencoded"  forKey: @"content-type"];
-
-    if(SOGoOpenIDDebugEnabled)
-      NSLog(@"OpenId fetch token, form %@", form);
-
+    
    response = [self _performOpenIdRequest: location
                      method: @"POST"
                      headers: headers
@@ -749,8 +573,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) refreshToken: (NSString * ) userRefreshToken
 {
  NSString *location, *form, *content;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
  NSUInteger status;
  NSMutableDictionary *result;
  NSDictionary *headers;
@@ -823,16 +646,12 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (NSMutableDictionary *) fetchUserInfo
 {
  NSString *location, *auth, *content;
-  SOGoSystemDefaults *sd;
-  SimpleOpenIdResponse *response;
-  // WOResponse *response;
+  WOResponse *response;
  NSUInteger status;
  NSMutableDictionary *result;
  NSDictionary *profile, *headers;
  NSURL *url;
-  NSString *email, *type, *user_domain;
-  NSRange r;
-  NSArray *domainsAllowed;
+  NSString *email;

  result = [NSMutableDictionary dictionary];
  [result setObject: @"ok" forKey: @"error"];
@@ -874,36 +693,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
                        "email":"myuser@user.com"}*/
          if (email = [profile objectForKey: self->openIdEmailParam])
          {
-            //Check the mail domain is ok
-            
-            r = [email rangeOfString: @"@"];
-            if (r.location != NSNotFound)
-              user_domain = [email substringFromIndex: r.location+1];
-            else
-            {
-              [self logWithFormat: @"Error mail from userInfo not a mail %@", email];
-              [result setObject: @"mail-error" forKey: @"error"];
-              return result;
-            }
-
-            sd = [SOGoSystemDefaults sharedSystemDefaults];
-            if(self->forDomain != nil && [sd doesLoginTypeByDomain])
-            {
-              type = [sd getLoginTypeForDomain: self->forDomain];
-              if(type != nil && [type isEqualToString: @"openid"] && ![user_domain isEqualToString: self->forDomain])
-              {
-                [self errorWithFormat: @"Openid userinfo email is not the right domain. Excpected: %@, Got %@", self->forDomain, user_domain];
-                [result setObject: @"mail-error" forKey: @"error"];
-                return result;
-              }
-            }
-            else if(((domainsAllowed = [sd domainsAllowed]) && [domainsAllowed count] > 0) && ![domainsAllowed containsObject: user_domain])
-            {
-              [self errorWithFormat: @"Openid userinfo email domain is not allowed. Got %@", user_domain];
-              [result setObject: @"mail-error" forKey: @"error"];
-              return result;
-            }
-
            if(self->userTokenInterval > 0)
              [self _saveUserToCache: email];
            [result setObject: email forKey: @"login"];
@@ -913,7 +702,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
        }
        else
        {
-          [self logWithFormat: @"Error fetching userInfo (status %d), response: %@", status, response];
+          [self logWithFormat: @"Error during fetching the token (status %d), response: %@", status, response];
          [result setObject: @"http-error" forKey: @"error"];
        }
    }
@@ -982,7 +771,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
      }
    }

-    //The access token hasn't work, delete the session in database if needed
+    //The acces token hasn't work, delete the session in database if needed
    if(self->accessToken)
    {
      [[[GCSFolderManager defaultFolderManager] openIdFolder] deleteOpenIdSessionFor: self->accessToken];
@@ -995,12 +784,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
    //remove old session
    [[[GCSFolderManager defaultFolderManager] openIdFolder] deleteOpenIdSessionFor: self->accessToken];
  }
-  if([[resultUserInfo objectForKey: @"error"] isEqualToString: @"mail-error"])
-  {
-    //Means there is a problem with the mail get from userInfo (logs wil explained)
-    //To avoid infinite loop -> openid -> redirect sogo -> useinfo fail -> rediretc to sogo index -> redirect to openid...
-    return nil;
-  }

  return @"anonymous";
 }
@@ -162,23 +162,11 @@

  // Get the key length and its bytes
  data = [theKey dataByDecodingBase64];
+  key = (char *)[data bytes];
  klen = [data length];

-
-  //value longer than the key, concatenate the key with itself until long enough
  if (klen < [theValue length])
-  {
-    NSMutableData *concatenatedData = [NSMutableData data];
-    int j;
-    int nbDuplication = [theValue length]/klen;
-    for(j=0; j <= nbDuplication; j++)
-      [concatenatedData appendData:data];
-    
-    data = [NSData dataWithData: concatenatedData];
-    klen = [data length];
-  }
-
-  key = (char *)[data bytes];
+    [self errorWithFormat: @"Value to be secured is too big (%i > %i) -- secured value will be corrupted", [theValue length], klen, [theKey length]];

  // Get the key - padding it with 0 with key length
  pass = (char *) calloc(klen, sizeof(char));
@@ -213,6 +201,7 @@

  // Get the key length and its bytes
  dataKey = [theKey dataByDecodingBase64];
+  key = (char *)[dataKey bytes];
  klen = [dataKey length];

  // Get the secured value length and its bytes
@@ -220,20 +209,6 @@
  value = (char *)[dataValue bytes];
  vlen = [dataValue length];

-  //If the key is shorer than the value, duplicate it with itself.
-  if(klen < vlen)
-  {
-    NSMutableData *concatenatedData = [NSMutableData data];
-    int j;
-    int nbDuplication = [dataValue length]/klen;
-    for(j=0; j <= nbDuplication; j++)
-      [concatenatedData appendData:dataKey];
-    
-    dataKey = [NSData dataWithData: concatenatedData];
-    klen = [dataKey length];
-  }
-  key = (char *)[dataKey bytes];
-
  // Target buffer
  buf = (char *) calloc(klen, sizeof(char));

@@ -496,7 +496,6 @@ static NSString *sieveScriptName = @"sogo";
 }

 - (NSString *) _extractSieveAction: (NSDictionary *) action
-                         withReq: (NSMutableDictionary *) req
                         delimiter: (NSString *) delimiter
 {
  NSString *sieveAction, *method, *requirement, *argument, *flag, *mailbox;
@@ -549,9 +548,7 @@ static NSString *sieveScriptName = @"sogo";
              {
                argument = [NSString stringWithFormat: @"mailto:%@", argument];
                sieveAction = [NSString stringWithFormat: @"%@ %@",
-                                        method, [argument asSieveQuotedString]];  
-                [req addObjectUniquely: @"enotify"];
-                [req addObjectUniquely: @"variables"];   
+                                        method, [argument asSieveQuotedString]];     
              }                                   
              else if ([method isEqualToString: @"reject"])
                sieveAction = [NSString stringWithFormat: @"%@ %@",
@@ -578,7 +575,6 @@ static NSString *sieveScriptName = @"sogo";
 }

 - (NSArray *) _extractSieveActions: (NSArray *) actions
-                         withReq: (NSMutableDictionary *) req
                         delimiter: (NSString *) delimiter
 {
  NSMutableArray *sieveActions;
@@ -590,7 +586,6 @@ static NSString *sieveScriptName = @"sogo";
  for (count = 0; !scriptError && count < max; count++)
    {
      sieveAction = [self _extractSieveAction: [actions objectAtIndex: count]
-                                    withReq: req
                                    delimiter: delimiter];
      if (!scriptError)
        [sieveActions addObject: sieveAction];
@@ -600,7 +595,6 @@ static NSString *sieveScriptName = @"sogo";
 }

 - (NSString *) _convertScriptToSieve: (NSDictionary *) newScript
-                           withReq: (NSMutableDictionary *) req
                           delimiter: (NSString *) delimiter
 {
  NSMutableString *sieveText;
@@ -630,7 +624,6 @@ static NSString *sieveScriptName = @"sogo";
        scriptError = [NSString stringWithFormat: @"Bad test: %@", match];
    }
  sieveActions = [self _extractSieveActions: [newScript objectForKey: @"actions"]
-                                  withReq: req
                                  delimiter: delimiter];
  if ([sieveActions count])
    [sieveText appendFormat: @"    %@;\r\n",
@@ -667,7 +660,6 @@ static NSString *sieveScriptName = @"sogo";
          if ([[currentScript objectForKey: @"active"] boolValue])
            {
              sieveText = [self _convertScriptToSieve: currentScript
-                                            withReq: newRequirements
                                            delimiter: delimiter];
              [sieveScript appendString: sieveText];
            }
@@ -790,10 +782,10 @@ static NSString *sieveScriptName = @"sogo";
  imapAuthMech = nil;
  if([sd doesLoginTypeByDomain])
  {
-    r = [authname rangeOfString: @"@"];
+    r = [theUsername rangeOfString: @"@"];
    if (r.location != NSNotFound)
    {
-      userDomain = [authname substringFromIndex: r.location+1];
+      userDomain = [theUsername substringFromIndex: r.location+1];
      imapAuthMech = [sd getImapAuthMechForDomain: userDomain];
    }
  }
@@ -149,7 +149,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 - (BOOL) isEasUIDisabled;

 - (BOOL)isPasswordRecoveryEnabled;
- (NSArray *) passwordRecoveryBaseURLs;
 - (NSArray *) passwordRecoveryDomains;
 - (NSString *) JWTSecret;

@@ -1082,11 +1082,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context)
  return [self boolForKey: @"SOGoPasswordRecoveryEnabled"];
 }

- (NSArray *) passwordRecoveryBaseURLs
-{
-  return [self stringArrayForKey: @"SOGoPasswordRecoveryBaseURLs"];
-}
-
 - (NSArray *) passwordRecoveryDomains
 {
  static NSArray *passwordRecoveryDomains = nil;
@@ -124,8 +124,7 @@

 - (BOOL) isSuperUser;
 - (BOOL) canAuthenticate;
- (NSString *) totpKey: (bool) isCheck;
- (NSString *) oldtotpKey;
+- (NSString *) totpKey;

 /* resource */
 - (BOOL) isResource;
@@ -47,6 +47,7 @@

 #import "SOGoUser.h"

+static const NSString *kEncryptedUserNamePrefix = @"uenc";

@implementation SoUser (SOGoExtension)

@@ -144,91 +145,92 @@
  realUID = nil;
  domain = nil;

-  if ([newLogin isEqualToString: @"anonymous"] || [newLogin isEqualToString: @"freebusy"])
+  if ([newLogin isEqualToString: @"anonymous"]
+      || [newLogin isEqualToString: @"freebusy"])
    realUID = newLogin;
  else
-  {
-    sd = [SOGoSystemDefaults sharedSystemDefaults];
-    if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
    {
-      r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
-      if (r.location != NSNotFound)
-      {
-        // The domain is probably appended to the username;
-        // make sure it is defined as a domain in the configuration.
-        domain = [newLogin substringFromIndex: (r.location + r.length)];
-        if ([[SOGoUserManager sharedUserManager] isDomainDefined: domain] &&
-            ![sd enableDomainBasedUID])
-          newLogin = [newLogin substringToIndex: r.location];
+      sd = [SOGoSystemDefaults sharedSystemDefaults];
+      if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
+        {
+          r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
+          if (r.location != NSNotFound)
+            {
+              // The domain is probably appended to the username;
+              // make sure it is defined as a domain in the configuration.
+              domain = [newLogin substringFromIndex: (r.location + r.length)];
+              if ([[SOGoUserManager sharedUserManager] isDomainDefined: domain] &&
+                  ![sd enableDomainBasedUID])
+                newLogin = [newLogin substringToIndex: r.location];

-        if (domain != nil && ![sd enableDomainBasedUID])
-          // Login domains are enabled (SOGoLoginDomains) but not
-          // domain-based UID (SOGoEnableDomainBasedUID).
-          // Drop the domain from the login name.
-          domain = nil;
-      }
+              if (domain != nil && ![sd enableDomainBasedUID])
+                // Login domains are enabled (SOGoLoginDomains) but not
+                // domain-based UID (SOGoEnableDomainBasedUID).
+                // Drop the domain from the login name.
+                domain = nil;
+            }
+        }
+
+      newLogin = [newLogin stringByReplacingString: @"%40"
+                                        withString: @"@"];
+      if (b)
+	realUID = newLogin;
+      else
+	{
+	  um = [SOGoUserManager sharedUserManager];
+          contactInfos = [um contactInfosForUserWithUIDorEmail: newLogin
+                                                      inDomain: domain];
+	  realUID = [contactInfos objectForKey: @"c_uid"];
+          if (domain == nil && [sd enableDomainBasedUID])
+            domain = [contactInfos objectForKey: @"c_domain"];
+	}
+
+      if ([realUID length] && [domain length])
+        {
+          // When the user is associated to a domain, the [SOGoUser login]
+          // method returns the combination login@domain while
+          // [SOGoUser loginInDomain] only returns the login.
+          r = [realUID rangeOfString: domain  options: NSBackwardsSearch|NSCaseInsensitiveSearch];
+
+          // Do NOT strip @domain.com if SOGoEnableDomainBasedUID is enabled since
+          // the real login most likely is the email address.
+          if (r.location != NSNotFound && ![sd enableDomainBasedUID])
+            uid = [realUID substringToIndex: r.location-1];
+          // If we don't have the domain in the UID but SOGoEnableDomainBasedUID is
+          // enabled, let's add it internally so so it becomes unique across
+          // all potential domains.
+          else if (r.location == NSNotFound && [sd enableDomainBasedUID])
+            {
+              uid = [NSString stringWithString: realUID];
+              realUID = [NSString stringWithFormat: @"%@@%@", realUID, domain];
+            }
+          // We found the domain and SOGoEnableDomainBasedUID is enabled,
+          // we keep realUID.. This would happen for example if the user
+          // authenticates with foo@bar.com and the UIDFieldName is also foo@bar.com
+          else if ([sd enableDomainBasedUID])
+            uid = [NSString stringWithString: realUID];
+        }
    }

-    newLogin = [newLogin stringByReplacingString: @"%40"
-                                      withString: @"@"];
-    if (b)
-      realUID = newLogin;
-    else
-    {
-      um = [SOGoUserManager sharedUserManager];
-            contactInfos = [um contactInfosForUserWithUIDorEmail: newLogin
-                                                        inDomain: domain];
-      realUID = [contactInfos objectForKey: @"c_uid"];
-      if (domain == nil && [sd enableDomainBasedUID])
-        domain = [contactInfos objectForKey: @"c_domain"];
-    }
-
-    if ([realUID length] && [domain length])
-    {
-      // When the user is associated to a domain, the [SOGoUser login]
-      // method returns the combination login@domain while
-      // [SOGoUser loginInDomain] only returns the login.
-      r = [realUID rangeOfString: domain  options: NSBackwardsSearch|NSCaseInsensitiveSearch];
-
-      // Do NOT strip @domain.com if SOGoEnableDomainBasedUID is enabled since
-      // the real login most likely is the email address.
-      if (r.location != NSNotFound && ![sd enableDomainBasedUID])
-        uid = [realUID substringToIndex: r.location-1];
-      // If we don't have the domain in the UID but SOGoEnableDomainBasedUID is
-      // enabled, let's add it internally so so it becomes unique across
-      // all potential domains.
-      else if (r.location == NSNotFound && [sd enableDomainBasedUID])
-      {
-        uid = [NSString stringWithString: realUID];
-        realUID = [NSString stringWithFormat: @"%@@%@", realUID, domain];
-      }
-      // We found the domain and SOGoEnableDomainBasedUID is enabled,
-      // we keep realUID.. This would happen for example if the user
-      // authenticates with foo@bar.com and the UIDFieldName is also foo@bar.com
-      else if ([sd enableDomainBasedUID])
-        uid = [NSString stringWithString: realUID];
-    }
-  }
-
  if ([realUID length])
-  {
-    if ((self = [super initWithLogin: realUID roles: newRoles]))
    {
-      allEmails = nil;
-      currentPassword = nil;
-      cn = nil;
-      ASSIGN (loginInDomain, (uid ? uid : realUID));
-      _defaults = nil;
-      _domainDefaults = nil;
-      _settings = nil;
-      mailAccounts = nil;
+      if ((self = [super initWithLogin: realUID roles: newRoles]))
+	{
+	  allEmails = nil;
+	  currentPassword = nil;
+	  cn = nil;
+          ASSIGN (loginInDomain, (uid ? uid : realUID));
+          _defaults = nil;
+          _domainDefaults = nil;
+          _settings = nil;
+          mailAccounts = nil;
+	}
    }
-  }
  else
-  {
-    [self release];
-    self = nil;
-  }
+    {
+      [self release];
+      self = nil;
+    }

  return self;
 }
@@ -263,14 +265,6 @@

 - (NSString *) loginInDomain
 {
-  SOGoSystemDefaults *sd;
-  NSString *_domain, *realLoginInDomain;
-  NSRange r;
-  sd = [SOGoSystemDefaults sharedSystemDefaults];
-  if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
-  {
-    return self->login;
-  }
  return loginInDomain;
 }

@@ -1298,7 +1292,7 @@
  return [authValue boolValue];
 }

- (NSString *) totpKey: (bool) isCheck
+- (NSString *) totpKey
 {
 #if defined(MFA_CONFIG)
  NSString *key, *result;
@@ -1307,51 +1301,6 @@

  size_t s_len, secret_len;

-  //Until 5.12.4, SOGo had two problems with totp:
-  // * It was not renew after a user disable it/renable it.
-  // * The length was too small: 12 instead of the recommanded 20
-
-  if(![_defaults totpEnabled])
-  {
-    //Totp was not enabled
-    //Only renew if this is not a check (happen when the user enable it for the first time and save its preferences
-    //the saveAction will check the totp code but [_defaults totpEnabled] is still False )
-    key = [[self userSettings] userCurrentTotpKey: !isCheck];
-  }
-  else
-  {
-    //Totp currently enabled
-    key = [[self userSettings] userCurrentTotpKey: NO];
-  }
-
-  s = [key UTF8String];
-  s_len = strlen(s);
-
-  oath_init();
-  oath_base32_encode(s,s_len, &secret, &secret_len);
-  oath_done();
-
-  result = [[NSString alloc] initWithBytesNoCopy: secret
-                                          length: secret_len
-                                        encoding: NSASCIIStringEncoding
-                                    freeWhenDone: YES];
-
-  return [result autorelease];
-#else
-  return nil;
-#endif
-}
-
- (NSString *) oldtotpKey
-{
-#if defined(MFA_CONFIG)
-  //Was used before 5.12.5, is to not make obsolete totp profile set before
-  NSString *key, *result;
-  const char *s;
-  char *secret;
-
-  size_t s_len, secret_len;
-
  key = [[[self userSettings] userPrivateSalt] substringToIndex: 12];
  s = [key UTF8String];
  s_len = strlen(s);
@@ -1415,7 +1364,7 @@
    return username;

  cache = [SOGoCache sharedCache];
-  cacheKey = [NSString stringWithFormat: @"encrypted_%@",username];
+  cacheKey = [NSString stringWithFormat: @"%@_%@", kEncryptedUserNamePrefix, username];
  
  exception = nil;
  tmp = nil;
@@ -1446,14 +1395,11 @@
  NSString *tmp, *cacheKey;
  SOGoCache *cache;

-  if (![[SOGoSystemDefaults sharedSystemDefaults] isURLEncryptionEnabled] || 
-              [username isEqualToString: @"anonymous"] || 
-              [[request requestHandlerKey] isEqualToString:@"dav"] ||
-              [[request requestHandlerPath] hasSuffix: @"freebusy.ifb/ajaxRead"])
+  if (![[SOGoSystemDefaults sharedSystemDefaults] isURLEncryptionEnabled] || [username isEqualToString: @"anonymous"] || [[request requestHandlerKey] isEqualToString:@"dav"])
    return username;

  cache = [SOGoCache sharedCache];
-  cacheKey = [NSString stringWithFormat: @"decrypted_%@", username];
+  cacheKey = [NSString stringWithFormat: @"%@_%@", kEncryptedUserNamePrefix, username];
  exception = nil;
  tmp = nil;
  
@@ -156,14 +156,12 @@ extern NSString *SOGoPasswordRecoverySecondaryEmail;
 - (void) setMailComposeFontSize: (int) newValue;
 - (int) mailComposeFontSize;

- (void) setMailDisplayFullEmail: (BOOL) newValue;
- (BOOL) mailDisplayFullEmail;
+- (void) setMailDisplayFullEmail: (BOOL *) newValue;
+- (BOOL *) mailDisplayFullEmail;

 - (void) setMailDisplayRemoteInlineImages: (NSString *) newValue;
 - (NSString *) mailDisplayRemoteInlineImages;

- (void) setMailDisplayAttachmentAbove: (BOOL) newValue;
- (BOOL) mailDisplayAttachmentAbove;

 - (void) setMailAutoMarkAsReadDelay: (int) newValue;
 - (int) mailAutoMarkAsReadDelay;
@@ -152,7 +152,7 @@ NSString *SOGoPasswordRecoverySecondaryEmail = @"SecondaryEmail";
      rc = NO;

      if ([fullName length])
-        [identity setObject: [fullName stringWithoutHTMLInjection: YES stripAngular:NO] forKey: @"fullName"];
+        [identity setObject: [fullName stringWithoutHTMLInjection: YES] forKey: @"fullName"];
      if ([email length])
        [identity setObject: email forKey: @"email"];
      if ([replyTo length])
@@ -634,12 +634,12 @@ NSString *SOGoPasswordRecoverySecondaryEmail = @"SecondaryEmail";
  return [self integerForKey: @"SOGoMailComposeFontSize"];
 }

- (void) setMailDisplayFullEmail: (BOOL) newValue
+- (void) setMailDisplayFullEmail: (BOOL *) newValue
 {
  [self setBool: newValue forKey: @"SOGoMailDisplayFullEmail"];
 }

- (BOOL) mailDisplayFullEmail;
+- (BOOL *) mailDisplayFullEmail;
 {
  return [self boolForKey: @"SOGoMailDisplayFullEmail"];
 }
@@ -654,16 +654,6 @@ NSString *SOGoPasswordRecoverySecondaryEmail = @"SecondaryEmail";
  return [self stringForKey: @"SOGoMailDisplayRemoteInlineImages"];
 }

- (void) setMailDisplayAttachmentAbove: (BOOL) newValue
-{
-  [self setBool: newValue forKey: @"SOGoMailDisplayAttachmentAbove"];
-}
-
- (BOOL) mailDisplayAttachmentAbove;
-{
-  return [self boolForKey: @"SOGoMailDisplayAttachmentAbove"];
-}
-
 - (void) setMailAutoMarkAsReadDelay: (int) newValue
 {
  [self setInteger: newValue forKey: @"SOGoMailAutoMarkAsReadDelay"];
@@ -864,7 +854,7 @@ NSString *SOGoPasswordRecoverySecondaryEmail = @"SecondaryEmail";
    if (mailIdentity && [mailIdentity objectForKey: @"fullName"]) {
      fullName = [NSString stringWithString: [mailIdentity objectForKey: @"fullName"]];
      if (fullName) {
-        [mailIdentity setObject: [fullName stringWithoutHTMLInjection: YES stripAngular:NO] forKey: @"fullName"];
+        [mailIdentity setObject: [fullName stringWithoutHTMLInjection: YES] forKey: @"fullName"];
        [mailIdentities setObject: mailIdentity atIndexedSubscript: i];
      }
    }
@@ -35,8 +35,6 @@
 - (NSArray *) subscribedCalendars;
 - (NSArray *) subscribedAddressBooks;
 - (NSString *) userPrivateSalt;
- (NSString *) userCurrentTotpKey: (bool) renew;
- (void) setTotpKey: (NSString* ) newKey;
 - (NSString *) userPublicSalt;
 - (void)enableForceResetPassword;
 - (void)disableForceResetPassword;
@@ -116,42 +116,6 @@ static Class SOGoUserProfileKlass = Nil;
  return salt;
 }

- (NSString *) userCurrentTotpKey: (bool) renew
-{
-  NSMutableDictionary *values;
-  NSString *key;
-
-  key = [[self dictionaryForKey: @"General"] objectForKey: @"totpKey"];
-
-  if (!key || renew)
-    {
-      key = [[[[NSProcessInfo processInfo] globallyUniqueString] asSHA1String] substringToIndex: 20];
-      values = [self objectForKey: @"General"];
-
-      if (!values)
-        values = [NSMutableDictionary dictionary];
-
-      [values setObject: key forKey: @"totpKey"];
-      [self setObject: values forKey: @"General"];
-      [self synchronize];
-    }
-
-  return key;
-}
-
- (void) setTotpKey: (NSString* ) newKey
-{
-  NSMutableDictionary *values;
-  values = [self objectForKey: @"General"];
-
-  if (!values)
-    values = [NSMutableDictionary dictionary];
-
-  [values setObject: newKey forKey: @"totpKey"];
-  [self setObject: values forKey: @"General"];
-  [self synchronize];
-}
-
 - (void) enableForceResetPassword
 {
  [self setObject: [NSNumber numberWithInt:1]  forKey: @"ForceResetPassword"];
@@ -225,7 +225,7 @@
 */
 - (NSString *) _encryptPassword: (NSString *) plainPassword
 {
-  NSString *pass, *passwordScheme;
+  NSString *pass;
  NSString* result;

  pass = [plainPassword asCryptedPassUsingScheme: _userPasswordAlgorithm
@@ -254,7 +254,7 @@
  return [self checkLogin: _login
                 password: _pwd
                     perr: _perr
-                   expire: _expire
+                   expire: _perr
                    grace: _grace
  disablepasswordPolicyCheck: NO];
 }
@@ -272,7 +272,6 @@
              grace: (int *) _grace
  disablepasswordPolicyCheck: (BOOL) _disablepasswordPolicyCheck
 {
-  EOAdaptor *adaptor;
  EOAdaptorChannel *channel;
  EOQualifier *qualifier;
  GCSChannelManager *cm;
@@ -282,13 +281,11 @@

  rc = NO;

+  _login = [_login stringByReplacingString: @"'"  withString: @"''"];
  cm = [GCSChannelManager defaultChannelManager];
  channel = [cm acquireOpenChannelForURL: _viewURL];
  if (channel)
    {
-      EOAdaptorContext *adaptorCtx;
-      adaptorCtx = [channel adaptorContext];
-      adaptor = [adaptorCtx adaptor];
      if (_loginFields)
        {
          NSMutableArray *qualifiers;
@@ -327,8 +324,7 @@
                                              nil];
          [qualifier autorelease];
        }
-      [qualifier appendSQLToString: sql
-                       withAdaptor: adaptor];
+      [qualifier appendSQLToString: sql];

      ex = [channel evaluateExpressionX: sql];
      if (!ex)
@@ -434,11 +430,9 @@
 {
  BOOL didChange, isOldPwdOk, isPolicyOk;
  EOAdaptorChannel *channel;
-  EOAdaptor *adaptor;
-  EOQualifier *qualifier_login, *qualifier_pwd;
  GCSChannelManager *cm;
  NSException *ex;
-  NSMutableString *sqlstr;
+  NSString *sqlstr;

  *perr = -1;
  isOldPwdOk = NO;
@@ -461,27 +455,16 @@
        return NO;

      // Save new password
+      login = [login stringByReplacingString: @"'"  withString: @"''"];
      cm = [GCSChannelManager defaultChannelManager];
      channel = [cm acquireOpenChannelForURL: _viewURL];
      if (channel)
        {
-          EOAdaptorContext *adaptorCtx;
-          adaptorCtx = [channel adaptorContext];
-          adaptor = [adaptorCtx adaptor];
-          sqlstr = [NSMutableString stringWithFormat: @"UPDATE %@ SET ",
-                                              [_viewURL gcsTableName]];
-                
-          qualifier_pwd = [[EOKeyValueQualifier alloc] initWithKey: @"c_password"
-                                              operatorSelector: EOQualifierOperatorEqual
-                                                         value: encryptedPassword];
-          [qualifier_pwd appendSQLToString: sqlstr
-                          withAdaptor: adaptor];
-          [sqlstr appendString: @" WHERE "];
-          qualifier_login = [[EOKeyValueQualifier alloc] initWithKey: @"c_uid"
-                                              operatorSelector: EOQualifierOperatorEqual
-                                                         value: login];
-          [qualifier_login appendSQLToString: sqlstr
-                          withAdaptor: adaptor];
+          sqlstr = [NSString stringWithFormat: (@"UPDATE %@"
+                                                @" SET c_password = '%@'"
+                                                @" WHERE c_uid = '%@'"),
+                             [_viewURL gcsTableName], encryptedPassword, login];
+
          ex = [channel evaluateExpressionX: sqlstr];
          if (!ex)
            {
@@ -1015,9 +998,7 @@
                          inDomain: (NSString *)domain
                             limit: (int)limit
 {
-  EOAdaptor *adaptor;
  EOAdaptorChannel *channel;
-  EOQualifier *qualifier;
  NSEnumerator *criteriaList;
  NSMutableArray *fields, *results;
  GCSChannelManager *cm;
@@ -1033,14 +1014,12 @@
      channel = [cm acquireOpenChannelForURL: _viewURL];
      if (channel)
        {
-          EOAdaptorContext *adaptorCtx;
-          adaptorCtx = [channel adaptorContext];
-          adaptor = [adaptorCtx adaptor];
          fields = [NSMutableArray array];
          if ([filter length])
            {
-              filter = [[filter asSafeSQLString] stringByReplacingString: @"\%" withString: @"%%"];
-              filterFormat = [NSString stringWithFormat: @"(%%@ isCaseInsensitiveLike: '*%@*')", filter];
+              lowerFilter = [filter lowercaseString];
+              lowerFilter = [lowerFilter asSafeSQLLikeString];
+              filterFormat = [NSString stringWithFormat: @"LOWER(%%@) LIKE '%%%%%@%%%%'", lowerFilter];
              if (criteria)
                criteriaList = [criteria objectEnumerator];
              else
@@ -1065,9 +1044,7 @@
          if ([fields count])
            {
              qs = [[[fields uniqueObjects] stringsWithFormat: filterFormat] componentsJoinedByString: @" OR "];
-              qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
-              [qualifier appendSQLToString: sql
-                             withAdaptor: adaptor];
+              [sql appendString: qs];
            }
          else
            [sql appendString: @"1 = 1"];
@@ -1131,7 +1108,7 @@
                          andSortOrdering: (EOSortOrdering *) ordering
                                 inDomain: (NSString *) domain
 {
-  EOAdaptor *adaptor;
+  static EOAdaptor *adaptor = nil;
  NSException *ex;
  NSMutableArray *results;
  NSMutableString *sql;
@@ -1146,9 +1123,12 @@
      channel = [cm acquireOpenChannelForURL: _viewURL];
      if (channel)
        {
-          EOAdaptorContext *adaptorCtx;
-          adaptorCtx = [channel adaptorContext];
-          adaptor = [adaptorCtx adaptor];
+          if (!adaptor)
+            {
+              EOAdaptorContext *adaptorCtx;
+              adaptorCtx = [channel adaptorContext];
+              adaptor = [adaptorCtx adaptor];
+            }
          sql = [NSMutableString stringWithFormat: @"SELECT c_name FROM %@ WHERE (", [_viewURL gcsTableName]];

          if (qualifier)
@@ -99,43 +99,23 @@

 - (void) test_stringWithoutHTMLInjection
 {
-  testEquals([[NSString stringWithString:@"<a href=\"\">foo</a>bar"] stringWithoutHTMLInjection: YES stripAngular: NO], @" foo bar");
-  testEquals([[NSString stringWithString:@"fb <foo@bar.com>"] stringWithoutHTMLInjection: YES stripAngular: NO], @"fb <foo@bar.com>");
-  testEquals([[NSString stringWithString:@"Test\n<script>alert(\"foobar\");"] stringWithoutHTMLInjection: NO stripAngular: NO], @"Test\n<scr***>alert(\"foobar\");");
-  testEquals([[NSString stringWithString:@"<img vbscript:test"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<img test");
-  testEquals([[NSString stringWithString:@"<img javascript:test"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<img test");
-  testEquals([[NSString stringWithString:@"<img livescript:test"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<img test");
-  testEquals([[NSString stringWithString:@"foobar <form action=\"\">bar</form>"] stringWithoutHTMLInjection: NO stripAngular: NO], @"foobar <for* action=\"\">bar</for*>");
-  testEquals([[NSString stringWithString:@"foobar <iframe src=\"\">bar</iframe>"] stringWithoutHTMLInjection: NO stripAngular: NO], @"foobar <ifr*** src=\"\">bar</iframe>");
-  testEquals([[NSString stringWithString:@"foobar <img onload=foo bar"] stringWithoutHTMLInjection: NO stripAngular: NO], @"foobar <img data-blocked=foo bar");
-  testEquals([[NSString stringWithString:@"foobar <img onmouseover=foo bar"] stringWithoutHTMLInjection: NO stripAngular: NO], @"foobar <img data-blocked=foo bar");
-  // any on...= handler is neutralised, including whitespace before '=' and names
-  // that were never in the old list
-  testEquals([[NSString stringWithString:@"<img src=x onerror =alert(1)>"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<img src=x data-blocked=alert(1)>");
-  testEquals([[NSString stringWithString:@"<input autofocus onfocus=alert(1)>"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<input autofocus data-blocked=alert(1)>");
-  // deletion filters loop until stable, so nesting cannot rebuild the scheme
-  testEquals([[NSString stringWithString:@"javajavascript:script:"] stringWithoutHTMLInjection: NO stripAngular: NO], @"");
-  testEquals([[NSString stringWithString:@"<!DOCTYPE html><html><head><style>@import url(https://foo.bar/malicious.css);.foo{background-color: red; @import url(https://bar.foo/malicious2.css);</style></head><body><table><tr><td>A</td><td>B</td><td>C</td></tr></table></body></html>"] stringWithoutHTMLInjection: NO stripAngular: NO], @"<!DOCTYPE html><html><head><style>@im**** url(https://foo.bar/malicious.css);.foo{background-color: red; @im**** url(https://bar.foo/malicious2.css);</style></head><body><table><tr><td>A</td><td>B</td><td>C</td></tr></table></body></html>");
-  // the @import cleanup must still run when angular interpolation is stripped as well
-  testEquals([[NSString stringWithString:@"<style>@import url(https://foo.bar/malicious.css);</style>"] stringWithoutHTMLInjection: NO stripAngular: YES], @"<style>@im**** url(https://foo.bar/malicious.css);</style>");
-  // literal braces are rewritten so AngularJS cannot interpolate them
-  testEquals([[NSString stringWithString:@"{{1337*1337}}"] stringWithoutHTMLInjection: NO stripAngular: YES], @"{\\{1337*1337}/}");
-  // ... and so are the decimal HTML entities the browser would decode back to braces
-  testEquals([[NSString stringWithString:@"&#123;&#123;1337*1337&#125;&#125;"] stringWithoutHTMLInjection: NO stripAngular: YES], @"{\\{1337*1337}/}");
+  testEquals([[NSString stringWithString:@"<a href=\"\">foo</a>bar"] stringWithoutHTMLInjection: YES], @" foo bar");
+  testEquals([[NSString stringWithString:@"fb <foo@bar.com>"] stringWithoutHTMLInjection: YES], @"fb <foo@bar.com>");
+  testEquals([[NSString stringWithString:@"Test\n<script>alert(\"foobar\");"] stringWithoutHTMLInjection: NO], @"Test\n<scr***>alert(\"foobar\");");
+  testEquals([[NSString stringWithString:@"<img vbscript:test"] stringWithoutHTMLInjection: NO], @"<img test");
+  testEquals([[NSString stringWithString:@"<img javascript:test"] stringWithoutHTMLInjection: NO], @"<img test");
+  testEquals([[NSString stringWithString:@"<img livescript:test"] stringWithoutHTMLInjection: NO], @"<img test");
+  testEquals([[NSString stringWithString:@"foobar <form action=\"\">bar</form>"] stringWithoutHTMLInjection: NO], @"foobar <for* action=\"\">bar</for*>");
+  testEquals([[NSString stringWithString:@"foobar <iframe src=\"\">bar</iframe>"] stringWithoutHTMLInjection: NO], @"foobar <ifr*** src=\"\">bar</iframe>");
+  testEquals([[NSString stringWithString:@"foobar <img onload=foo bar"] stringWithoutHTMLInjection: NO], @"foobar <img onl***=foo bar");
+  testEquals([[NSString stringWithString:@"foobar <img onmouseover=foo bar"] stringWithoutHTMLInjection: NO], @"foobar <img onmouseo***=foo bar");
+  testEquals([[NSString stringWithString:@"<!DOCTYPE html><html><head><style>@import url(https://foo.bar/malicious.css);.foo{background-color: red; @import url(https://bar.foo/malicious2.css);</style></head><body><table><tr><td>A</td><td>B</td><td>C</td></tr></table></body></html>"] stringWithoutHTMLInjection: NO], @"<!DOCTYPE html><html><head><style>@im**** url(https://foo.bar/malicious.css);.foo{background-color: red; @im**** url(https://bar.foo/malicious2.css);</style></head><body><table><tr><td>A</td><td>B</td><td>C</td></tr></table></body></html>");
 }

 - (void) test_stringCleanInvalidHTMLTags
 {
  testEquals([[NSString stringWithString:@"<div>Test<!--></div>"] cleanInvalidHTMLTags], @"<div>Test</div>");
-  testEquals([[NSString stringWithString:@"<div>Test<!---></div>"] cleanInvalidHTMLTags], @"<div>Test</div>");
-  testEquals([[NSString stringWithString:@"<div>A<!-->B<!-- c -->C<!-->D</div>"] cleanInvalidHTMLTags], @"<div>AB<!-- c -->CD</div>");
-  testEquals([[NSString stringWithString:@"<div><!--[if !mso]><span>Test</span><!--<![endif]--></div>"] cleanInvalidHTMLTags], @"<div><!--[if !mso]><span>Test</span><!--<![endif]--></div>");
-  // Outlook "downlevel-revealed" conditional comment: content must stay visible
-  testEquals([[NSString stringWithString:@"<a><!--[if !mso]><!--> <div><img src=\"x\"/></div> <!--<![endif]--><!--[if mso]><v:fill/><![endif]--></a>"] cleanInvalidHTMLTags], @"<a><!--[if !mso]><!--> <div><img src=\"x\"/></div> <!--<![endif]--><!--[if mso]><v:fill/><![endif]--></a>");
-  // libxml2 also ends a comment with "--!>"
-  testEquals([[NSString stringWithString:@"A<!-- x --!>B<!-->C"] cleanInvalidHTMLTags], @"A<!-- x --!>BC");
-  // unterminated comment is left as is
-  testEquals([[NSString stringWithString:@"<div>A<!-- B</div>"] cleanInvalidHTMLTags], @"<div>A<!-- B</div>");
+  testEquals([[NSString stringWithString:@"<div><!--[if !mso]><span>Test</span><!--<![endif]--></div>"] cleanInvalidHTMLTags], @"<div><!--[if !mso]><span>Test</span><!--[endif]--></div>");
 }

 - (void) test_stringRemoveHTMLTagsExceptAnchorTags
@@ -25,7 +25,6 @@ $(SOGO_TOOL)_OBJC_FILES += \
 	SOGoToolCleanupUser.m \
 	SOGoToolRestore.m \
 	SOGoToolCreateFolder.m \
-	SOGoToolInitUser.m \
 	SOGoToolUserPreferences.m \
 	SOGoToolManageACL.m \
 	SOGoToolManageEAS.m \
@@ -1,273 +0,0 @@
-/* SOGoToolInitUser.m - this file is part of SOGo
- *
- * Copyright (C) 2026 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 <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
-
-#import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOComponent.h>
-#import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WOContext+SoObjects.h>
-
-#import <SOGo/SOGoGCSFolder.h>
-#import <SOGo/SOGoParentFolder.h>
-#import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoUserFolder.h>
-
-#import "SOGoToolRestore.h"
-
-
-@interface NSObject (UIxJSONPreferences)
-
- (NSString *) jsonDefaults;
-
-@end
-
-@interface SOGoToolInitUser : SOGoToolRestore
-{
-  NSArray *usersToInit;
-  NSString *language;
-}
-
-@end
-
-@implementation SOGoToolInitUser
-
-+ (NSString *) command
-{
-  return @"init-user";
-}
-
-+ (NSString *) description
-{
-  return @"create the personal folders and preferences of user(s) without requiring a login";
-}
-
- (id) init
-{
-  if ((self = [super init]))
-    {
-      usersToInit = nil;
-      language = nil;
-    }
-
-  return self;
-}
-
- (void) dealloc
-{
-  [usersToInit release];
-  [language release];
-  [super dealloc];
-}
-
- (void) usage
-{
-  fprintf (stderr, "init-user [-l language] user1 [user2] ...\n\n"
-           "           user       the user whose personal folders must be created\n"
-           "           language   the language of the user's preferences, as chosen\n"
-           "                      at login (defaults to the domain or system one)\n\n"
-           "Creates the personal calendar and the personal address book of the\n"
-           "user(s) and initializes their preferences, as it would otherwise only\n"
-           "happen upon their first login.\n\n"
-           "Example:   sogo-tool init-user jdoe\n"
-           "           sogo-tool init-user -l French jdoe jsmith\n");
-}
-
- (BOOL) parseArguments
-{
-  NSArray *supportedLanguages;
-  NSString *requestedLanguage;
-
-  if ([sanitizedArguments count] < 1)
-    {
-      [self usage];
-      return NO;
-    }
-
-  requestedLanguage = [[NSUserDefaults standardUserDefaults] stringForKey: @"l"];
-  if ([requestedLanguage length])
-    {
-      supportedLanguages = [[SOGoSystemDefaults sharedSystemDefaults]
-                             supportedLanguages];
-      if (![supportedLanguages containsObject: requestedLanguage])
-        {
-          fprintf (stderr, "Unsupported language: %s\n",
-                   [requestedLanguage UTF8String]);
-          return NO;
-        }
-      ASSIGN (language, requestedLanguage);
-    }
-
-  ASSIGN (usersToInit, sanitizedArguments);
-
-  return YES;
-}
-
-/* The lookup of the "personal" folder triggers its creation when it does not
-   exist yet, provided the active user is the owner of the folder. */
- (BOOL) _initFolderOfType: (NSString *) folderType
-            withUserFolder: (SOGoUserFolder *) userFolder
-                 inContext: (WOContext *) localContext
-{
-  SOGoParentFolder *parentFolder;
-  id folder;
-
-  parentFolder = [userFolder lookupName: folderType
-                              inContext: localContext
-                                acquire: NO];
-  if (![parentFolder isKindOfClass: [SOGoParentFolder class]])
-    {
-      NSLog (@"module '%@' is not available for user '%@'", folderType, userID);
-      return NO;
-    }
-  [parentFolder setContext: localContext];
-
-  folder = [parentFolder lookupPersonalFolder: @"personal"
-                               ignoringRights: YES];
-  if (![folder isKindOfClass: [SOGoGCSFolder class]])
-    {
-      NSLog (@"personal folder of module '%@' could not be created for user"
-             @" '%@'", folderType, userID);
-      return NO;
-    }
-
-  if (verbose)
-    NSLog (@"personal folder of module '%@' is ready for user '%@'",
-           folderType, userID);
-
-  return YES;
-}
-
-/* Upon the first login, the c_defaults of the user are materialized when the
-   web interface loads: -[UIxJSONPreferences jsonDefaults] resolves every
-   default through the domain and system defaults, writes them into the user's
-   profile and synchronizes it. We invoke that very method so that an
-   initialized user is indistinguishable from a user who has logged in. */
- (BOOL) _initDefaultsOfUser: (SOGoUser *) user
-                   inContext: (WOContext *) localContext
-{
-  WOComponent *jsonPreferences;
-  Class jsonPreferencesKlass;
-
-  /* The language must be set before the component is built: -jsonDefaults only
-     materializes the defaults that are missing, and the labels it localizes
-     (the calendar and contacts categories) are looked up in the languages of
-     the context, which are those of the user. */
-  if (language)
-    [[user userDefaults] setLanguage: language];
-  
-  if (![WOApplication application])
-    [[WOApplication alloc] init];
-
-  jsonPreferencesKlass = NSClassFromString (@"UIxJSONPreferences");
-  if (!jsonPreferencesKlass)
-    {
-      NSLog (@"class 'UIxJSONPreferences' is unavailable, defaults of user"
-             @" '%@' cannot be initialized", userID);
-      return NO;
-    }
-
-  jsonPreferences = [[[jsonPreferencesKlass alloc]
-                       initWithContext: localContext] autorelease];
-
-  if (![jsonPreferences jsonDefaults])
-    {
-      NSLog (@"defaults of user '%@' could not be initialized", userID);
-      return NO;
-    }
-
-  if (verbose)
-    NSLog (@"defaults of user '%@' are ready", userID);
-
-  return YES;
-}
-
- (BOOL) _initUser
-{
-  SOGoUserFolder *userFolder;
-  WOContext *localContext;
-  SOGoUser *user;
-  BOOL rc;
-
-  user = [SOGoUser userWithLogin: userID];
-  if (!user)
-    {
-      NSLog (@"user '%@' could not be instantiated", userID);
-      return NO;
-    }
-
-  localContext = [WOContext context];
-  [localContext setActiveUser: user];
-
-  rc = [self _initDefaultsOfUser: user inContext: localContext];
-
-  userFolder = [SOGoUserFolder objectWithName: userID inContainer: nil];
-  [userFolder setContext: localContext];
-
-  rc = [self _initFolderOfType: @"Calendar"
-                withUserFolder: userFolder
-                     inContext: localContext] && rc;
-  rc = [self _initFolderOfType: @"Contacts"
-                withUserFolder: userFolder
-                     inContext: localContext] && rc;
-
-  return rc;
-}
-
- (BOOL) proceed
-{
-  NSAutoreleasePool *pool;
-  NSString *identifier;
-  NSUInteger count, max;
-  BOOL rc;
-
-  rc = YES;
-  max = [usersToInit count];
-  for (count = 0; count < max; count++)
-    {
-      pool = [NSAutoreleasePool new];
-      identifier = [usersToInit objectAtIndex: count];
-      if ([self fetchUserID: identifier])
-        {
-          if (![self _initUser])
-            rc = NO;
-        }
-      else
-        {
-          fprintf (stderr, "Invalid user: %s\n", [identifier UTF8String]);
-          rc = NO;
-        }
-      [pool release];
-    }
-
-  return rc;
-}
-
- (BOOL) run
-{
-  return ([self parseArguments] && [self proceed]);
-}
-
-@end
@@ -172,9 +172,6 @@
  EOAdaptorContext *ac;
  EOAdaptorChannel *fc;
  NSString *profileURL, *sql, *sqlFromUserID, *sqlToUserID;
-  NSString *old_c_default, *old_c_settings, *new_c_default, *new_c_settings;
-  NSArray *attrs;
-  NSDictionary *row;
  NSException *sqlError;
  SOGoSystemDefaults *sd;

@@ -191,22 +188,9 @@

  [ac beginTransaction];

-  sql = [NSString stringWithFormat: @"SELECT c_defaults, c_settings FROM %@"
+  sql = [NSString stringWithFormat: @"UPDATE %@ SET c_uid = '%@'"
                  @" WHERE c_uid = '%@'",
-                  [profileLocation gcsTableName], sqlFromUserID];
-  sqlError = [fc evaluateExpressionX: sql];
-  attrs = [fc describeResults: NO];
-  while ((row = [fc fetchAttributes: attrs withZone: NULL]))
-  {
-    old_c_default = [row objectForKey: @"c_defaults"];
-    old_c_settings = [row objectForKey: @"c_settings"];
-    new_c_default = [old_c_default stringByReplacingOccurrencesOfString:fromUserID withString:toUserID];
-    new_c_settings = [old_c_settings stringByReplacingOccurrencesOfString:fromUserID withString:toUserID];
-  }
-
-  sql = [NSString stringWithFormat: @"UPDATE %@ SET c_uid = '%@', c_defaults = '%@', "
-                  @"c_settings = '%@' WHERE c_uid = '%@'",
-                  [profileLocation gcsTableName], sqlToUserID, new_c_default, new_c_settings, sqlFromUserID];
+                  [profileLocation gcsTableName], sqlToUserID, sqlFromUserID];
  sqlError = [fc evaluateExpressionX: sql];
  if (sqlError)
    {
@@ -25,7 +25,7 @@
 "No resource" = "Cap recurs";
 "Any Authenticated User" = "Qualsevol usuari autenticat";
 "Public Access" = "Accés públic";
-"Save" = "Desar";
-"Clear" = "Esborrar";
-"Message of the day" = "Missatge del dia";
-"Message of the day has been saved" = "El missatge del dia s'ha desat";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Geen middelen";
 "Any Authenticated User" = "Elke geauthenticeerde gebruiker";
 "Public Access" = "Publieke toegang";
-"Save" = "Opslaan";
-"Clear" = "Leeg maken";
-"Message of the day" = "Bericht van de dag";
-"Message of the day has been saved" = "Bericht van de dag is opgeslagen";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -4,7 +4,7 @@
 "Close" = "Schließen";
 "Modules" = "Module";
 /* Modules short names */
-"ACLs" = "Zugriffsrechte";
+"ACLs" = "ACLs";
 /* Modules titles */
 "ACLs_title" = "Benutzerordner ACL-Management";
 /* Modules descriptions */
@@ -1,31 +0,0 @@
-/* this file is in UTF-8 format! */
-
-"Help" = "Help";
-"Close" = "Close";
-"Modules" = "Modules";
-/* Modules short names */
-"ACLs" = "ACLs";
-/* Modules titles */
-"ACLs_title" = "Users folders ACLs management";
-/* Modules descriptions */
-"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
-"Name or Email" = "Name or Email";
-"ACLs saved" = "ACLs saved";
-/* Rights module: initial search message */
-"Start a search to edit the rights" = "Start a search to edit the rights";
-/* Rights module: Empty search result */
-"No matching user" = "No matching user";
-/* Rights module: no selection */
-"No resource selected" = "No resource selected";
-"Add User" = "Add User";
-"Subscribe User" = "Subscribe User";
-"Rights" = "Rights";
-"Search Users" = "Search Users";
-"users found" = "users found";
-"No resource" = "No resource";
-"Any Authenticated User" = "Any Authenticated User";
-"Public Access" = "Public Access";
-"Save" = "Save";
-"Clear" = "Clear";
-"Message of the day" = "Message of the day";
-"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Nincs erőforrás";
 "Any Authenticated User" = "Bármely azonosított felhasználó";
 "Public Access" = "Nyilvános hozzáférés";
-"Save" = "Mentés";
-"Clear" = "Törlés";
-"Message of the day" = "A nap üzenete";
-"Message of the day has been saved" = "A nap üzenete mentésre került";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -1,31 +0,0 @@
-/* this file is in UTF-8 format! */
-
-"Help" = "도움말";
-"Close" = "닫기";
-"Modules" = "모듈";
-/* Modules short names */
-"ACLs" = "ACL";
-/* Modules titles */
-"ACLs_title" = "사용자 폴더 ACL 관리";
-/* Modules descriptions */
-"ACLs_description" = "<p>접근 제어 목록(ACL) 관리 모듈은 각 사용자의 캘린더 및 주소록의 ACL을 변경할 수 있도록 합니다.</p><p>사용자 폴더의 ACL을 수정하려면 창 상단의 검색 필드에 사용자 이름을 입력하고 원하는 폴더를 두 번 클릭하십시오.</p>";
-"Name or Email" = "이름 또는 이메일";
-"ACLs saved" = "ACL 저장됨";
-/* Rights module: initial search message */
-"Start a search to edit the rights" = "권한을 편집하려면 검색을 시작하십시오";
-/* Rights module: Empty search result */
-"No matching user" = "일치하는 사용자 없음";
-/* Rights module: no selection */
-"No resource selected" = "선택된 리소스 없음";
-"Add User" = "사용자 추가";
-"Subscribe User" = "사용자 구독";
-"Rights" = "권한";
-"Search Users" = "사용자 검색";
-"users found" = "사용자 발견";
-"No resource" = "리소스 없음";
-"Any Authenticated User" = "모든 인증된 사용자";
-"Public Access" = "공개 접근";
-"Save" = "저장";
-"Clear" = "지우기";
-"Message of the day" = "오늘의 메시지";
-"Message of the day has been saved" = "오늘의 메시지가 저장되었습니다";
@@ -1,31 +0,0 @@
-/* this file is in UTF-8 format! */
-
-"Help" = "ช่วยเหลือ";
-"Close" = "ปิด";
-"Modules" = "โมดูล";
-/* Modules short names */
-"ACLs" = "ACLs";
-/* Modules titles */
-"ACLs_title" = "Users folders ACLs management";
-/* Modules descriptions */
-"ACLs_description" = "<p>โมดูลการจัดการรายการควบคุมการเข้าถึงช่วยให้สามารถเปลี่ยนแปลง ACLs ของปฏิทินและสมุดที่อยู่ของผู้ใช้แต่ละคนได้</p><p>ในการแก้ไข ACLs ของโฟลเดอร์ของผู้ใช้ ให้พิมพ์ชื่อผู้ใช้ในช่องค้นหาที่ด้านบนของหน้าต่างและดับเบิลคลิกที่โฟลเดอร์ที่ต้องการ</p>";
-"Name or Email" = "ชื่อหรืออีเมล์";
-"ACLs saved" = "ACLs บันทึกแล้ว";
-/* Rights module: initial search message */
-"Start a search to edit the rights" = "เริ่มการค้นหาเพื่อแก้ไขสิทธิ์";
-/* Rights module: Empty search result */
-"No matching user" = "ไม่พบผู้ใช้ที่ตรงกัน";
-/* Rights module: no selection */
-"No resource selected" = "ไม่ได้เลือกทรัพยากร";
-"Add User" = "เพิ่มผู้ใช้";
-"Subscribe User" = "สมัครสมาชิกผู้ใช้";
-"Rights" = "สิทธิ์";
-"Search Users" = "ค้นหาผู้ใช้";
-"users found" = "ผู้ใช้พบ";
-"No resource" = "ไม่มีทรัพยากร";
-"Any Authenticated User" = "ผู้ใช้ที่ได้รับการยืนยันตัวตนใด ๆ";
-"Public Access" = "การเข้าถึงสาธารณะ";
-"Save" = "บันทึก";
-"Clear" = "ชัดเจน";
-"Message of the day" = "ข้อความของวันนี้";
-"Message of the day has been saved" = "ข้อความของวันนี้ถูกบันทึกแล้ว";
@@ -41,11 +41,11 @@
     = "Qualsevol usuari amb un compte en el sistema tindrà accés a la seua llibreta d'adreces \"%{0}\". Està segur de voler donar accés a qualsevol usuari en el sistema? ";
 "Give Access" = "Donar accés";
 "Keep Private" = "Mantenir en privat";
-"Expand" = "Expandir";
-"Reduce" = "Reduir";
+"Expand" = "Expand";
+"Reduce" = "Reduce";

 /* tooltip */
-"Refresh" = "Actualitzar";
+"Refresh" = "Refresh";

 /* generic.js */
 "Unable to subscribe to that folder!"
@@ -109,7 +109,7 @@
 "Personal" = "Personal";
 "To Do" = "Per fer";
 "Later" = "Més tard";
-"Forwarded" = "Reenviat";
+"Forwarded" = "Forwarded";
 "Return Receipt Sent" = "Justificant de recepció enviat";
 "a2_Sunday" = "dg";
 "a2_Monday" = "dl";
@@ -128,15 +128,15 @@
 "S/MIME Certificate" = "Certificat S/MIME";
 "Subject Name" = "Nom del subjecte";
 "Issuer" = "Emissor";
-"streetAddress" = "Carrer";
-"stateOrProvinceName" = "Estat o Província";
-"localityName" = "Localitat";
+"streetAddress" = "Street";
+"stateOrProvinceName" = "State or Province";
+"localityName" = "Locality";
 "countryName" = "País";
 "organizationName" = "Organització";
 "organizationalUnitName" = "Unitat organitzativa";
 "commonName" = "Nom comú";
-"surname" = "Cognoms";
-"givenName" = "Nom de pila";
+"surname" = "Surname";
+"givenName" = "Given Name";
 "emailAddress" = "Correu electrònic";


@@ -227,16 +227,16 @@
 "Move forward" = "Avançar";

 /* Password Recovery */
-"passwordRecovery_Disabled" = "Desactivat";
-"passwordRecovery_SecretQuestion" = "Pregunta secreta";
-"passwordRecovery_SecretQuestion1" = "Quin és el nom de la teva primera mascota?";
-"passwordRecovery_SecretQuestion2" = "Quin va ser el teu primer cotxe?";
-"passwordRecovery_SecretQuestion3" = "Quina és la teva pel·lícula preferida?";
-"passwordRecovery_SecondaryEmail" = "Correu electrònic secundari";
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";

 /* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Mínim de %{0} lletra minúscula";
-"POLICY_MIN_UPPERCASE_LETTER" = "Mínim de %{0} lletra majúscula";
-"POLICY_MIN_DIGIT" = "Mínim de %{0} dígit";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Mínim de %{0} símbols especials";
-"POLICY_MIN_LENGTH" = "Longitud mínima de %{0} caràcters";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
@@ -235,8 +235,8 @@
 "passwordRecovery_SecondaryEmail" = "Sekundární e-mail";

 /* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Minimum je %{0} malých znaků";
-"POLICY_MIN_UPPERCASE_LETTER" = "Minimum je %{0} velkých písmen";
-"POLICY_MIN_DIGIT" = "Minimum je %{0} číslic";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum je %{0} speciálních znaků";
-"POLICY_MIN_LENGTH" = "Minimální délka je %{0} znaků";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
@@ -45,7 +45,7 @@
 "Reduce" = "Verminderen";

 /* tooltip */
-"Refresh" = "Vernieuwen";
+"Refresh" = "Refresh";

 /* generic.js */
 "Unable to subscribe to that folder!"
@@ -109,7 +109,7 @@
 "Personal" = "Persoonlijk";
 "To Do" = "Te doen";
 "Later" = "Later";
-"Forwarded" = "Doorgestuurd";
+"Forwarded" = "Forwarded";
 "Return Receipt Sent" = "Ontvangstbewijs verzonden";
 "a2_Sunday" = "Zo";
 "a2_Monday" = "Ma";
@@ -122,7 +122,7 @@
 "Add User" = "Gebruiker toevoegen";
 "Loading" = "Laden";
 "No such user." = "Geen dergelijke gebruiker";
-"You cannot (un)subscribe to a folder that you own!" = "U kunt zich niet (af)melden voor een map waarvan u de eigenaar bent!";
+"You cannot (un)subscribe to a folder that you own!" = "Kan niet aan- of afmelden van eigen map!";

 /* SMIME Certificate field */
 "S/MIME Certificate" = "S/MIME Certificaat";
@@ -227,16 +227,16 @@
 "Move forward" = "Ga vooruit";

 /* Password Recovery */
-"passwordRecovery_Disabled" = "Uitgezet";
-"passwordRecovery_SecretQuestion" = "Geheime vraag";
-"passwordRecovery_SecretQuestion1" = "Hoe heet je eerste huisdier?";
-"passwordRecovery_SecretQuestion2" = "Wat was je eerste auto?";
-"passwordRecovery_SecretQuestion3" = "Wat is je favoriete film?";
-"passwordRecovery_SecondaryEmail" = "Secundair e-mailadres";
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";

 /* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Minimaal %{0} kleine letter";
-"POLICY_MIN_UPPERCASE_LETTER" = "Minimaal %{0} hoofdletter";
-"POLICY_MIN_DIGIT" = "Minimaal %{0} cijfer";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimaal %{0} speciale symbolen";
-"POLICY_MIN_LENGTH" = "Minimale lengte van %{0} tekens";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
@@ -9,7 +9,7 @@
 "Address Book"  = "Adressbuch";
 "Mail" = "E-Mail";
 "Preferences" = "Einstellungen";
-"Administration" = "Verwaltung";
+"Administration" = "Administration";
 "Disconnect" = "Beenden";
 "Toggle Menu" = "Menü umschalten";
 "Right Administration" = "Rechteadministration";
@@ -197,10 +197,10 @@
 "key_right" = "→";

 /* Shift and up arrow combo keys */
-"key_shift+up" = "Umschalt + ↑";
+"key_shift+up" = "shift + ↑";

 /* Shift and down arrow combo keys */
-"key_shift+down" = "Umschalt + ↓";
+"key_shift+down" = "shift + ↓";

 /* Backspace key */
 "key_backspace" = "⌫";
@@ -1,242 +0,0 @@
-/* this file is in UTF-8 format! */
-
-/* toolbars */
-"Save" = "Αποθήκευση";
-"Close" = "Κλείσιμο";
-"Edit User Rights" = "Επεξεργασία Δικαιωμάτων Χρήστη";
-"Home" = "Αρχική";
-"Calendar" = "Ημερολόγιο";
-"Address Book"  = "Επαφές";
-"Mail" = "Αλληλογραφία";
-"Preferences" = "Ρυθμίσεις";
-"Administration" = "Διαχείριση";
-"Disconnect" = "Αποσύνδεση";
-"Toggle Menu" = "Εναλλαγή Μενού";
-"Right Administration" = "Διαχείριση Δικαιωμάτων";
-"Log Console (dev.)" = "Κονσόλα Καταγραφής (dev.)";
-"User" = "Χρήστης";
-"Vacation message is enabled" = "Το μήνυμα απουσίας είναι ενεργοποιημένο";
-"Help" = "Βοήθεια";
-"noJavascriptError" = "Το SOGo απαιτεί JavaScript για να λειτουργήσει. Βεβαιωθείτε ότι αυτή η επιλογή είναι διαθέσιμη και ενεργοποιημένη στις ρυθμίσεις του προγράμματος περιήγησής σας.";
-"noJavascriptRetry" = "Επανάληψη";
-"Owner" = "Ιδιοκτήτης";
-"Publish the Free/Busy information" = "Δημοσίευση πληροφοριών Ελεύθερος/Απασχολημένος";
-"Add..." = "Προσθήκη...";
-"Remove" = "Αφαίρεση";
-"Subscribe User" = "Εγγραφή Χρήστη";
-"Any Authenticated User" = "Οποιοσδήποτε Πιστοποιημένος Χρήστης";
-"Public Access" = "Δημόσια Πρόσβαση";
-"Any user not listed above" = "Οποιοσδήποτε χρήστης δεν αναφέρεται παραπάνω";
-"Anybody accessing this resource from the public area" = "Οποιοσδήποτε που έχει πρόσβαση σε αυτόν τον πόρο από τη δημόσια περιοχή";
-"Sorry, the user rights can not be configured for that object." = "Λυπούμαστε, τα δικαιώματα χρήστη δεν μπορούν να ρυθμιστούν για αυτό το αντικείμενο.";
-"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?"
-     = "Οποιοσδήποτε χρήστης με λογαριασμό σε αυτό το σύστημα θα μπορεί να έχει πρόσβαση στο γραμματοκιβώτιό σας \"%{0}\". Είστε βέβαιοι ότι τους εμπιστεύεστε όλους;";
-"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?"
-     = "Οποιοσδήποτε χρήστης με λογαριασμό σε αυτό το σύστημα θα μπορεί να έχει πρόσβαση στο ημερολόγιό σας \"%{0}\". Είστε βέβαιοι ότι τους εμπιστεύεστε όλους;";
-"Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "Δυνητικά οποιοσδήποτε στο Διαδίκτυο θα μπορεί να έχει πρόσβαση στο ημερολόγιό σας \"%{0}\", ακόμα και αν δεν έχει λογαριασμό σε αυτό το σύστημα. Είναι αυτές οι πληροφορίες κατάλληλες για δημόσια δημοσίευση στο Διαδίκτυο;";
-"Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?"
-     = "Οποιοσδήποτε χρήστης με λογαριασμό σε αυτό το σύστημα θα μπορεί να έχει πρόσβαση στο βιβλίο διευθύνσεών σας \"%{0}\". Είστε βέβαιοι ότι τους εμπιστεύεστε όλους;";
-"Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "Δυνητικά οποιοσδήποτε στο Διαδίκτυο θα μπορεί να έχει πρόσβαση στο βιβλίο διευθύνσεών σας \"%{0}\", ακόμα και αν δεν έχει λογαριασμό σε αυτό το σύστημα. Είναι αυτές οι πληροφορίες κατάλληλες για δημόσια δημοσίευση στο Διαδίκτυο;";
-"Give Access" = "Παροχή Πρόσβασης";
-"Keep Private" = "Διατήρηση Ιδιωτικότητας";
-"Expand" = "Επέκταση";
-"Reduce" = "Σύμπτυξη";
-
-/* tooltip */
-"Refresh" = "Ανανέωση";
-
-/* generic.js */
-"Unable to subscribe to that folder!"
-        = "Αδυναμία εγγραφής σε αυτόν τον φάκελο!";
-"You cannot subscribe to a folder that you own!"
-        = "Δεν μπορείτε να εγγραφείτε σε φάκελο που σας ανήκει!";
-"Unable to unsubscribe from that folder!"
-        = "Αδυναμία κατάργησης εγγραφής από αυτόν τον φάκελο!";
-"You cannot unsubscribe from a folder that you own!"
-        = "Δεν μπορείτε να καταργήσετε την εγγραφή από φάκελο που σας ανήκει!";
-"Unable to rename that folder!" = "Αδυναμία μετονομασίας αυτού του φακέλου!";
-"You have already subscribed to that folder!"
-        = "Έχετε ήδη εγγραφεί σε αυτόν τον φάκελο!";
-"The user rights cannot be edited for this object!"
-        = "Τα δικαιώματα χρήστη δεν μπορούν να επεξεργαστούν για αυτό το αντικείμενο!";
-"A folder by that name already exists." = "Ένας φάκελος με αυτό το όνομα υπάρχει ήδη.";
-"You cannot create a list in a shared address book."
-        = "Δεν μπορείτε να δημιουργήσετε λίστα σε κοινόχρηστο βιβλίο διευθύνσεων.";
-"Warning" = "Προειδοποίηση";
-"Can't contact server" = "Προέκυψε σφάλμα κατά την επικοινωνία με τον διακομιστή. Παρακαλούμε δοκιμάστε ξανά αργότερα.";
-"You are not allowed to access this module or this system. Please contact your system administrator."
-= "Δεν σας επιτρέπεται η πρόσβαση σε αυτήν την ενότητα ή σε αυτό το σύστημα. Επικοινωνήστε με τον διαχειριστή του συστήματος.";
-"You don't have the required privileges to perform the operation."
-= "Δεν έχετε τα απαιτούμενα δικαιώματα για να εκτελέσετε αυτήν την ενέργεια.";
-"noEmailForDelegation" = "Πρέπει να καθορίσετε τη διεύθυνση στην οποία θέλετε να αναθέσετε την πρόσκλησή σας.";
-"delegate is organizer" = "Ο αντιπρόσωπος είναι ο διοργανωτής. Παρακαλούμε καθορίστε διαφορετικό αντιπρόσωπο.";
-"delegate is a participant" = "Ο αντιπρόσωπος είναι ήδη συμμετέχων.";
-"delegate is a group" = "Η καθορισμένη διεύθυνση αντιστοιχεί σε ομάδα. Μπορείτε να αναθέσετε μόνο σε μοναδικό άτομο.";
-
-/* common buttons */
-"OK" = "Εντάξει";
-"Cancel" = "Άκυρο";
-"Yes" = "Ναι";
-"No" = "Όχι";
-
-/* generic messages */
-"Error" = "Σφάλμα";
-"Success" = "Επιτυχία";
-
-/* confirmation dialog box */
-"Confirmation" = "Επιβεβαίωση";
-
-/* alarms */
-"Reminder" = "Υπενθύμιση";
-"Start" = "Έναρξη";
-"Due Date" = "Ημερομηνία Λήξης";
-"Location" = "Τοποθεσία";
-"Snooze" = "Αναβολή";
-"Snooze for " = "Αναβολή για ";
-"5 minutes" = "5 λεπτά";
-"10 minutes" = "10 λεπτά";
-"15 minutes" = "15 λεπτά";
-"30 minutes" = "30 λεπτά";
-"45 minutes" = "45 λεπτά";
-"1 hour" = "1 ώρα";
-"1 day" = "1 ημέρα";
-
-/* mail labels */
-"Important" = "Σημαντικό";
-"Work" = "Εργασία";
-"Personal" = "Προσωπικό";
-"To Do" = "Προς Εκτέλεση";
-"Later" = "Αργότερα";
-"Forwarded" = "Προωθήθηκε";
-"Return Receipt Sent" = "Απεστάλη Απόδειξη Παράδοσης";
-"a2_Sunday" = "Κυ";
-"a2_Monday" = "Δε";
-"a2_Tuesday" = "Τρ";
-"a2_Wednesday" = "Τε";
-"a2_Thursday" = "Πέ";
-"a2_Friday" = "Πα";
-"a2_Saturday" = "Σά";
-"Access Rights" = "Δικαιώματα Πρόσβασης";
-"Add User" = "Προσθήκη Χρήστη";
-"Loading" = "Φόρτωση";
-"No such user." = "Δεν υπάρχει τέτοιος χρήστης.";
-"You cannot (un)subscribe to a folder that you own!" = "Δεν μπορείτε να (απ)εγγραφείτε από φάκελο που σας ανήκει!";
-
-/* SMIME Certificate field */
-"S/MIME Certificate" = "Πιστοποιητικό S/MIME";
-"Subject Name" = "Όνομα Υποκειμένου";
-"Issuer" = "Εκδότης";
-"streetAddress" = "Οδός";
-"stateOrProvinceName" = "Πολιτεία ή Νομός";
-"localityName" = "Πόλη";
-"countryName" = "Χώρα";
-"organizationName" = "Οργανισμός";
-"organizationalUnitName" = "Μονάδα Οργανισμού";
-"commonName" = "Κοινό Όνομα";
-"surname" = "Επίθετο";
-"givenName" = "Όνομα";
-"emailAddress" = "Διεύθυνση Email";
-
-
-/* Authentication username */
-"Username" = "Όνομα Χρήστη";
-
-/* Authentication password */
-"Password" = "Κωδικός Πρόσβασης";
-
-/* Authentication failed */
-"Wrong username or password." = "Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης.";
-
-/* Error message displayed bellow search field when the search string has less than the required number of characters */
-"Enter at least %{minimumSearchLength} characters" = "Εισαγάγετε τουλάχιστον %{minimumSearchLength} χαρακτήρες";
-
-/* Error message displayed when a file upload exceeds WOMaxUploadSize */
-"File size upload limit reached" = "Ξεπεράστηκε το όριο μεγέθους αρχείου για μεταφόρτωση";
-
-/* Generic server error */
-"An error occured, please try again." = "Προέκυψε σφάλμα, παρακαλούμε δοκιμάστε ξανά.";
-
-/* Open datepicker */
-"Open Calendar" = "Άνοιγμα Ημερολογίου";
-
-/* Toggle visibility (ex: mail account in left navigation menu) */
-"Toggle visibility" = "Εναλλαγή ορατότητας";
-
-"Keyboard Shortcuts" = "Συντομεύσεις Πληκτρολογίου";
-
-/* Aria label for avatar button to select and unselect an item */
-"Toggle item" = "Εναλλαγή στοιχείου";
-
-/* Toggle multiple items at the same time (hotkeys cheatsheet) */
-"Toggle range of items" = "Εναλλαγή εύρους στοιχείων";
-
-/* Question mark shows list of hotkeys */
-"Show or hide this help" = "Εμφάνιση ή απόκρυψη αυτής της βοήθειας";
-
-/* Space key */
-"key_space" = "διάστημα";
-
-/* Delete key */
-"key_delete" = "delete";
-
-/* Shift and space key */
-"key_shift+space" = "shift + διάστημα";
-
-/* Up arrow key */
-"key_up" = "↑";
-
-/* Down arrow key */
-"key_down" = "↓";
-
-/* Left arrow key */
-"key_left" = "←";
-
-/* Right arrow key */
-"key_right" = "→";
-
-/* Shift and up arrow combo keys */
-"key_shift+up" = "shift + ↑";
-
-/* Shift and down arrow combo keys */
-"key_shift+down" = "shift + ↓";
-
-/* Backspace key */
-"key_backspace" = "⌫";
-
-/* Hotkey to start a search */
-"hotkey_search" = "s";
-
-/* Hotkey description to select next list item */
-"View next item" = "Προβολή επόμενου στοιχείου";
-
-/* Hotkey description to select previous list item */
-"View previous item" = "Προβολή προηγούμενου στοιχείου";
-
-/* Hotkey description to add next list item to selection */
-"Add next item to selection" = "Προσθήκη επόμενου στοιχείου στην επιλογή";
-
-/* Hotkey description to add previous list item to selection */
-"Add previous item to selection" = "Προσθήκη προηγούμενου στοιχείου στην επιλογή";
-
-/* Hotkey description to move backward in current view */
-"Move backward" = "Μετακίνηση προς τα πίσω";
-
-/* Hotkey description to move forward in current view */
-"Move forward" = "Μετακίνηση προς τα εμπρός";
-
-/* Password Recovery */
-"passwordRecovery_Disabled" = "Απενεργοποιημένο";
-"passwordRecovery_SecretQuestion" = "Μυστική ερώτηση";
-"passwordRecovery_SecretQuestion1" = "Ποιο είναι το όνομα του πρώτου σας κατοικίδιου;";
-"passwordRecovery_SecretQuestion2" = "Ποιο ήταν το πρώτο σας αυτοκίνητο;";
-"passwordRecovery_SecretQuestion3" = "Ποια είναι η αγαπημένη σας ταινία;";
-"passwordRecovery_SecondaryEmail" = "Δευτερεύον Email";
-
-/* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Τουλάχιστον %{0} πεζός χαρακτήρας";
-"POLICY_MIN_UPPERCASE_LETTER" = "Τουλάχιστον %{0} κεφαλαίος χαρακτήρας";
-"POLICY_MIN_DIGIT" = "Τουλάχιστον %{0} ψηφίο";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Τουλάχιστον %{0} ειδικός χαρακτήρας";
-"POLICY_MIN_LENGTH" = "Ελάχιστο μήκος %{0} χαρακτήρες";
@@ -176,13 +176,13 @@
 "Show or hide this help" = "Mutassa vagy elrejtse ezt a súgót";

 /* Space key */
-"key_space" = "szóköz";
+"key_space" = "space";

 /* Delete key */
 "key_delete" = "törlés";

 /* Shift and space key */
-"key_shift+space" = "shift + szóköz";
+"key_shift+space" = "shift + space";

 /* Up arrow key */
 "key_up" = "↑";
@@ -235,8 +235,8 @@
 "passwordRecovery_SecondaryEmail" = "Másodlagos email cím";

 /* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Legalább %{0} kisbetű";
-"POLICY_MIN_UPPERCASE_LETTER" = "Legalább %{0} nagybetű";
-"POLICY_MIN_DIGIT" = "Legalább %{0} szám";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Legalább %{0} különleges karakter";
-"POLICY_MIN_LENGTH" = "Legalább %{0} karakter";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
@@ -1,242 +0,0 @@
-/* this file is in UTF-8 format! */
-
-/* toolbars */
-"Save" = "저장";
-"Close" = "닫기";
-"Edit User Rights" = "사용자 권한 편집";
-"Home" = "홈";
-"Calendar" = "캘린더";
-"Address Book"  = "주소록";
-"Mail" = "메일";
-"Preferences" = "환경설정";
-"Administration" = "관리";
-"Disconnect" = "연결 끊기";
-"Toggle Menu" = "메뉴 전환";
-"Right Administration" = "권한 관리";
-"Log Console (dev.)" = "로그 콘솔 (개발)";
-"User" = "사용자";
-"Vacation message is enabled" = "부재중 메시지 활성화됨";
-"Help" = "도움말";
-"noJavascriptError" = "SOGo를 실행하려면 Javascript가 필요합니다. 브라우저 환경설정에서 이 옵션이 사용 가능하고 활성화되어 있는지 확인하세요.";
-"noJavascriptRetry" = "다시 시도";
-"Owner" = "소유자";
-"Publish the Free/Busy information" = "약속 가능/불가능 정보 게시";
-"Add..." = "추가...";
-"Remove" = "제거";
-"Subscribe User" = "사용자 구독";
-"Any Authenticated User" = "모든 인증된 사용자";
-"Public Access" = "공개 접근";
-"Any user not listed above" = "위에 나열되지 않은 모든 사용자";
-"Anybody accessing this resource from the public area" = "공개 영역에서 이 리소스에 접근하는 모든 사람";
-"Sorry, the user rights can not be configured for that object." = "죄송합니다, 해당 개체에 대한 사용자 권한은 설정할 수 없습니다.";
-"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?"
-     = "이 시스템에 계정이 있는 모든 사용자가 귀하의 사서함 \"%{0}\"에 접근할 수 있습니다. 그들 모두를 신뢰하십니까?";
-"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?"
-     = "이 시스템에 계정이 있는 모든 사용자가 귀하의 캘린더 \"%{0}\"에 접근할 수 있습니다. 그들 모두를 신뢰하십니까?";
-"Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "이 시스템에 계정이 없더라도 인터넷상의 누구나 귀하의 캘린더 \"%{0}\"에 접근할 수 있습니다. 이 정보는 공개 인터넷에 적합합니까?";
-"Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?"
-     = "이 시스템에 계정이 있는 모든 사용자가 귀하의 주소록 \"%{0}\"에 접근할 수 있습니다. 그들 모두를 신뢰하십니까?";
-"Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "이 시스템에 계정이 없더라도 인터넷상의 누구나 귀하의 주소록 \"%{0}\"에 접근할 수 있습니다. 이 정보는 공개 인터넷에 적합합니까?";
-"Give Access" = "접근 권한 부여";
-"Keep Private" = "비공개 유지";
-"Expand" = "확장";
-"Reduce" = "축소";
-
-/* tooltip */
-"Refresh" = "새로고침";
-
-/* generic.js */
-"Unable to subscribe to that folder!"
-        = "해당 폴더를 구독할 수 없습니다!";
-"You cannot subscribe to a folder that you own!"
-        = "소유하고 있는 폴더는 구독할 수 없습니다!";
-"Unable to unsubscribe from that folder!"
-        = "해당 폴더 구독을 취소할 수 없습니다!";
-"You cannot unsubscribe from a folder that you own!"
-        = "소유하고 있는 폴더는 구독을 취소할 수 없습니다!";
-"Unable to rename that folder!" = "해당 폴더 이름을 바꿀 수 없습니다!";
-"You have already subscribed to that folder!"
-        = "이미 해당 폴더를 구독했습니다!";
-"The user rights cannot be edited for this object!"
-        = "이 개체에 대한 사용자 권한은 편집할 수 없습니다!";
-"A folder by that name already exists." = "해당 이름의 폴더가 이미 존재합니다.";
-"You cannot create a list in a shared address book."
-        = "공유 주소록에서는 목록을 생성할 수 없습니다.";
-"Warning" = "경고";
-"Can't contact server" = "서버와 통신하는 중 오류가 발생했습니다. 나중에 다시 시도해 주세요.";
-"You are not allowed to access this module or this system. Please contact your system administrator."
-= "이 모듈 또는 이 시스템에 접근할 수 없습니다. 시스템 관리자에게 문의하십시오.";
-"You don't have the required privileges to perform the operation."
-= "이 작업을 수행하는 데 필요한 권한이 없습니다.";
-"noEmailForDelegation" = "초대를 위임할 주소를 지정해야 합니다.";
-"delegate is organizer" = "위임자가 주최자입니다. 다른 위임자를 지정하십시오.";
-"delegate is a participant" = "위임자가 이미 참가자입니다.";
-"delegate is a group" = "지정된 주소는 그룹에 해당합니다. 개별 사용자에게만 위임할 수 있습니다.";
-
-/* common buttons */
-"OK" = "확인";
-"Cancel" = "취소";
-"Yes" = "예";
-"No" = "아니요";
-
-/* generic messages */
-"Error" = "오류";
-"Success" = "성공";
-
-/* confirmation dialog box */
-"Confirmation" = "확인";
-
-/* alarms */
-"Reminder" = "알림";
-"Start" = "시작";
-"Due Date" = "마감일";
-"Location" = "장소";
-"Snooze" = "다시 알림";
-"Snooze for " = "다시 알림 ";
-"5 minutes" = "5분";
-"10 minutes" = "10분";
-"15 minutes" = "15분";
-"30 minutes" = "30분";
-"45 minutes" = "45분";
-"1 hour" = "1시간";
-"1 day" = "1일";
-
-/* mail labels */
-"Important" = "중요";
-"Work" = "업무";
-"Personal" = "개인";
-"To Do" = "할 일";
-"Later" = "나중에";
-"Forwarded" = "전달됨";
-"Return Receipt Sent" = "읽음 확인 전송됨";
-"a2_Sunday" = "일";
-"a2_Monday" = "월";
-"a2_Tuesday" = "화";
-"a2_Wednesday" = "수";
-"a2_Thursday" = "목";
-"a2_Friday" = "금";
-"a2_Saturday" = "토";
-"Access Rights" = "접근 권한";
-"Add User" = "사용자 추가";
-"Loading" = "로딩 중";
-"No such user." = "해당 사용자가 없습니다.";
-"You cannot (un)subscribe to a folder that you own!" = "소유하고 있는 폴더는 (구독/구독 취소)할 수 없습니다!";
-
-/* SMIME Certificate field */
-"S/MIME Certificate" = "S/MIME 인증서";
-"Subject Name" = "주체 이름";
-"Issuer" = "발급자";
-"streetAddress" = "거리 주소";
-"stateOrProvinceName" = "주 또는 시/도";
-"localityName" = "지역";
-"countryName" = "국가";
-"organizationName" = "기관명";
-"organizationalUnitName" = "조직 단위";
-"commonName" = "일반 이름";
-"surname" = "성";
-"givenName" = "이름";
-"emailAddress" = "이메일 주소";
-
-
-/* Authentication username */
-"Username" = "사용자명";
-
-/* Authentication password */
-"Password" = "비밀번호";
-
-/* Authentication failed */
-"Wrong username or password." = "잘못된 사용자명 또는 비밀번호입니다.";
-
-/* Error message displayed bellow search field when the search string has less than the required number of characters */
-"Enter at least %{minimumSearchLength} characters" = "최소 %{minimumSearchLength}자를 입력하세요";
-
-/* Error message displayed when a file upload exceeds WOMaxUploadSize */
-"File size upload limit reached" = "파일 크기 업로드 제한에 도달했습니다";
-
-/* Generic server error */
-"An error occured, please try again." = "An error occured, please try again.";
-
-/* Open datepicker */
-"Open Calendar" = "캘린더 열기";
-
-/* Toggle visibility (ex: mail account in left navigation menu) */
-"Toggle visibility" = "가시성 전환";
-
-"Keyboard Shortcuts" = "키보드 단축키";
-
-/* Aria label for avatar button to select and unselect an item */
-"Toggle item" = "항목 전환";
-
-/* Toggle multiple items at the same time (hotkeys cheatsheet) */
-"Toggle range of items" = "항목 범위 전환";
-
-/* Question mark shows list of hotkeys */
-"Show or hide this help" = "이 도움말 표시 또는 숨기기";
-
-/* Space key */
-"key_space" = "스페이스";
-
-/* Delete key */
-"key_delete" = "삭제";
-
-/* Shift and space key */
-"key_shift+space" = "시프트 + 스페이스";
-
-/* Up arrow key */
-"key_up" = "↑";
-
-/* Down arrow key */
-"key_down" = "↓";
-
-/* Left arrow key */
-"key_left" = "←";
-
-/* Right arrow key */
-"key_right" = "→";
-
-/* Shift and up arrow combo keys */
-"key_shift+up" = "시프트 + ↑";
-
-/* Shift and down arrow combo keys */
-"key_shift+down" = "시프트 + ↓";
-
-/* Backspace key */
-"key_backspace" = "⌫";
-
-/* Hotkey to start a search */
-"hotkey_search" = "s";
-
-/* Hotkey description to select next list item */
-"View next item" = "다음 항목 보기";
-
-/* Hotkey description to select previous list item */
-"View previous item" = "이전 항목 보기";
-
-/* Hotkey description to add next list item to selection */
-"Add next item to selection" = "선택 항목에 다음 항목 추가";
-
-/* Hotkey description to add previous list item to selection */
-"Add previous item to selection" = "선택 항목에 이전 항목 추가";
-
-/* Hotkey description to move backward in current view */
-"Move backward" = "뒤로 이동";
-
-/* Hotkey description to move forward in current view */
-"Move forward" = "앞으로 이동";
-
-/* Password Recovery */
-"passwordRecovery_Disabled" = "비활성화됨";
-"passwordRecovery_SecretQuestion" = "비밀 질문";
-"passwordRecovery_SecretQuestion1" = "첫 번째 반려동물의 이름은 무엇인가요?";
-"passwordRecovery_SecretQuestion2" = "첫 번째 자동차는 무엇이었나요?";
-"passwordRecovery_SecretQuestion3" = "가장 좋아하는 영화는 무엇인가요?";
-"passwordRecovery_SecondaryEmail" = "보조 이메일";
-
-/* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "최소 %{0}개의 소문자";
-"POLICY_MIN_UPPERCASE_LETTER" = "최소 %{0}개의 대문자";
-"POLICY_MIN_DIGIT" = "최소 %{0}개의 숫자";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "최소 %{0}개의 특수 기호";
-"POLICY_MIN_LENGTH" = "최소 길이 %{0}자";
@@ -176,7 +176,7 @@
 "Show or hide this help" = "Pokaż lub ukryj tę podpowiedź";

 /* Space key */
-"key_space" = "spacja";
+"key_space" = "space";

 /* Delete key */
 "key_delete" = "delete";
@@ -235,8 +235,8 @@
 "passwordRecovery_SecondaryEmail" = "Dodatkowy e-mail";

 /* Password */
-"POLICY_MIN_LOWERCASE_LETTER" = "Co najmniej %{0} małych liter";
-"POLICY_MIN_UPPERCASE_LETTER" = "Co najmniej %{0} dużych liter";
-"POLICY_MIN_DIGIT" = "Co najmniej %{0} cyfr";
-"POLICY_MIN_SPECIAL_SYMBOLS" = "Co najmniej %{0} znaków specjalnych";
-"POLICY_MIN_LENGTH" = "Długość co najmniej %{0} znaków";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
@@ -176,13 +176,13 @@
 "Show or hide this help" = "Mostrar ou ocultar esta ajuda";

 /* Space key */
-"key_space" = "espaço";
+"key_space" = "space";

 /* Delete key */
 "key_delete" = "delete";

 /* Shift and space key */
-"key_shift+space" = "shift + espaço";
+"key_shift+space" = "shift + space";

 /* Up arrow key */
 "key_up" = "↑";
Author	SHA1	Message	Date
Hivert Quentin	1a8273ead5	add openid auth bearer	2025-06-11 12:52:26 +02:00
Hivert Quentin	b5deb663ad	add user folder endpoint	2025-05-23 14:44:42 +02:00
Hivert Quentin	9aab41975d	first bacth	2025-05-22 17:03:24 +02:00
Hivert Quentin	fcb688723f	progress	2025-05-22 17:03:24 +02:00
Hivert Quentin	077ba07314	progress	2025-05-22 17:01:42 +02:00
Hivert Quentin	6bbe8100b9	start	2025-05-22 17:01:42 +02:00