From ce89286f24719cc8d12908887a1f296c0b85d4ce Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Thu, 15 Nov 2018 00:17:47 +0100
Subject: [PATCH] fix: fix carddav url handle (#2054)

---
 app/Models/CardDAV/Backends/MonicaPrincipleBackend.php | 6 +++---
 public/.htaccess                                       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Models/CardDAV/Backends/MonicaPrincipleBackend.php b/app/Models/CardDAV/Backends/MonicaPrincipleBackend.php
index 44b7020a86f..bcfec368582 100644
--- a/app/Models/CardDAV/Backends/MonicaPrincipleBackend.php
+++ b/app/Models/CardDAV/Backends/MonicaPrincipleBackend.php
@@ -156,7 +156,7 @@ public function findByUri($uri, $principalPrefix)
      */
     public function getGroupMemberSet($principal)
     {
-        debug('getGroupMemberSet');
+        Log::debug(__CLASS__.' getGroupMemberSet', func_get_args());
 
         return [
             'principals/'.Auth::user()->email,
@@ -171,7 +171,7 @@ public function getGroupMemberSet($principal)
      */
     public function getGroupMembership($principal)
     {
-        debug('getGroupMembership');
+        Log::debug(__CLASS__.' getGroupMembership', func_get_args());
 
         return [
             'principals/'.Auth::user()->email,
@@ -189,6 +189,6 @@ public function getGroupMembership($principal)
      */
     public function setGroupMemberSet($principal, array $members)
     {
-        dd('setGroupMemberSet');
+        Log::debug(__CLASS__.' setGroupMemberSet', func_get_args());
     }
 }
diff --git a/public/.htaccess b/public/.htaccess
index b75525bedcd..e3a57257229 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -11,6 +11,7 @@
 
     # Redirect Trailing Slashes If Not A Folder...
     RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !carddav/*
     RewriteCond %{REQUEST_URI} (.+)/$
     RewriteRule ^ %1 [L,R=301]