From d18427a522a212dceae85a95c304fef8bca721b2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 3 Jul 2017 21:20:22 -0700
Subject: revert using channel_hash for cdav until we figure out how to do so
 cleanly

---
 Zotlabs/Module/Cdav.php | 10 +++++-----
 Zotlabs/Widget/Cdav.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index f91dead04..068ad2450 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -146,7 +146,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 			return;
 
 		$channel = \App::get_channel();
-		$principalUri = 'principals/' . $channel['channel_hash'];
+		$principalUri = 'principals/' . $channel['channel_address'];
 
 		if(!cdav_principal($principalUri))
 			return;
@@ -358,7 +358,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 
 				$sharee = new \Sabre\DAV\Xml\Element\Sharee();
 
-				$sharee->href = 'mailto:' . $sharee_arr['channel_hash'];
+				$sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
 				$sharee->principal = 'principals/' . $sharee_arr['channel_address'];
 				$sharee->access = intval($_REQUEST['access']);
 				$sharee->properties = ['{DAV:}displayname' => $channel['channel_name']];
@@ -749,7 +749,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 			return;
 
 		$channel = \App::get_channel();
-		$principalUri = 'principals/' . $channel['channel_hash'];
+		$principalUri = 'principals/' . $channel['channel_address'];
 
 
 		if(!cdav_principal($principalUri)) {
@@ -956,7 +956,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 
 			$sharee = new \Sabre\DAV\Xml\Element\Sharee();
 
-			$sharee->href = 'mailto:' . $sharee_arr['channel_hash'];
+			$sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
 			$sharee->principal = 'principals/' . $sharee_arr['channel_address'];
 			$sharee->access = 4;
 			$caldavBackend->updateInvites($id, [$sharee]);
@@ -1156,7 +1156,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 		if(! $channel)
 			return;
 
-		$uri = 'principals/' . $channel['channel_hash'];
+		$uri = 'principals/' . $channel['channel_address'];
 		
 
 		$r = q("select * from principals where uri = '%s' limit 1",
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php
index 1b33668ad..60a860f93 100644
--- a/Zotlabs/Widget/Cdav.php
+++ b/Zotlabs/Widget/Cdav.php
@@ -11,7 +11,7 @@ class Cdav {
 			return;
 
 		$channel = \App::get_channel();
-		$principalUri = 'principals/' . $channel['channel_hash'];
+		$principalUri = 'principals/' . $channel['channel_address'];
 
 		if(!cdav_principal($principalUri))
 			return;
-- 
cgit v1.2.3