Page MenuHomePhorge
Differential D4719

Match default folders by regex with the dav backend
ClosedPublic
Actions

Authored by mollekopf on Wed, May 29, 4:16 PM.
Tags
None
Referenced Files
F12991464: D4719.id13563.diff
Wed, Jun 26, 4:17 AM
Unknown Object (File)
Mon, Jun 24, 9:03 AM
Unknown Object (File)
Sun, Jun 23, 5:53 AM
Unknown Object (File)
Sat, Jun 22, 9:31 PM
Unknown Object (File)
Sat, Jun 22, 9:09 PM
Unknown Object (File)
Sat, Jun 22, 2:45 PM
Unknown Object (File)
Sat, Jun 22, 8:11 AM
Unknown Object (File)
Thu, Jun 20, 10:55 PM
View All 71 Files
Subscribers
None

Details

Reviewers
machniak
Commits
rSbe0bd009cd56: Take the default property into account when translating types
Summary

This is required for outlook because a default folder is required.

Diff Detail

Repository
rS syncroton
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

mollekopf requested review of this revision.Wed, May 29, 4:16 PM
mollekopf created this revision.
Harbormaster completed remote builds in B47517: Diff 13563.Wed, May 29, 4:16 PM
mollekopf added a reviewer: machniak.Wed, May 29, 4:17 PM
mollekopf added a comment.Wed, May 29, 6:06 PM

This will require something like this:

diff --git a/plugins/libkolab/lib/kolab_storage_dav.php b/plugins/libkolab/lib/kolab_storage_dav.php
index 92b4196e..91eda738 100644
--- a/plugins/libkolab/lib/kolab_storage_dav.php
+++ b/plugins/libkolab/lib/kolab_storage_dav.php
@@ -554,6 +554,7 @@ class kolab_storage_dav
      */
     public static function get_dav_type($type)
     {
+        $type = preg_replace('/\.(default)$/i', '', $type);
         $types = [
             'event' => 'VEVENT',
             'task'  => 'VTODO',

I'm not sure if we should avoid modifying the type in the first place, or translate back someplace else.

mollekopf updated this revision to Diff 13569.Thu, May 30, 8:16 AM

Don't include the .default suffix in the folder id

Harbormaster completed remote builds in B47523: Diff 13569.Thu, May 30, 8:16 AM
mollekopf planned changes to this revision.Thu, May 30, 8:20 AM
mollekopf updated this revision to Diff 13572.Thu, May 30, 8:21 AM

...

Harbormaster completed remote builds in B47526: Diff 13572.Thu, May 30, 8:21 AM
machniak requested changes to this revision.Thu, May 30, 8:35 AM

A better place to do this is in the libkolab plugin. See https://git.kolab.org/rRPK905644dc6c5e256c42f3a6a422601759ea0a47cd

This revision now requires changes to proceed.Thu, May 30, 8:36 AM
mollekopf updated this revision to Diff 13575.Thu, May 30, 8:53 AM

Use the default flag

Harbormaster completed remote builds in B47532: Diff 13575.Thu, May 30, 8:53 AM
machniak accepted this revision.Thu, May 30, 9:14 AM
This revision is now accepted and ready to land.Thu, May 30, 9:14 AM
Closed by commit rSbe0bd009cd56: Take the default property into account when translating types (authored by mollekopf). · Explain WhyThu, May 30, 9:44 AM
This revision was automatically updated to reflect the committed changes.
mollekopf added a commit: rSbe0bd009cd56: Take the default property into account when translating types.

Revision Contents
Changeset List

PathSize
lib/
2 lines
tests/
Sync/
6 lines

Diff 13578

View Options

lib/kolab_sync_storage_kolab4.php

Loading...
View Options

tests/Sync/FoldersTest.php

Loading...