Merge pull request #270 from phili67/phili67-webdav-update

Webdav update
phili67 · Apr 14, 2018 · d271706 · d271706
2 parents c368e30 + ff3cd87
commit d271706
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/EcclesiaCRM/model/EcclesiaCRM/User.php b/src/EcclesiaCRM/model/EcclesiaCRM/User.php
@@ -10,6 +10,7 @@
 use EcclesiaCRM\ListOptionQuery;
 use EcclesiaCRM\dto\SystemURLs;
 use EcclesiaCRM\Utils\MiscUtils;
+use EcclesiaCRM\NoteQuery;
 
 /**
  * Skeleton subclass for representing a row from the 'user_usr' table.
@@ -290,4 +291,13 @@ public function createTimeLineNote($type,$info = null)
 
         $note->save();
     }
+
+    public function deleteTimeLineNote($type,$info = null)
+    {
+      $notes = NoteQuery::Create ()->filterByPerId ($this->getPersonId())->findByText (str_replace("home/","",$info));
+
+      if (!empty($notes)) {
+        $notes->delete();
+      }
+    }
 }
diff --git a/src/EcclesiaCRM/sabre/EcclesiaCRMServer.php b/src/EcclesiaCRM/sabre/EcclesiaCRMServer.php
@@ -83,17 +83,17 @@ function getCopyAndMoveInfo(RequestInterface $request) {
     function updateProperties($path, array $properties) {
       $res = parent::updateProperties($path, $properties);
 
-    	return $res;
+      return $res;
     }
 
     function beforeUnbind($uri) {       
       if (strpos($uri,"._") == false && strpos($uri,".DS_Store") == false) {
            $currentUser = UserQuery::create()->findOneByUserName($this->authBackend->getLoginName());    
-           $currentUser->createTimeLineNote("dav-delete-file",$uri);
+           $currentUser->deleteTimeLineNote("dav-delete-file",$uri);
       }
 
-    	return true;
- 		}
+      return true;
+     }
 
 
 }