diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-07-04 09:39:48 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-07-04 09:39:48 +0200 |
| commit | bf1a21e46ff9d9b3fa6e889f7b74f7deae1f8526 (patch) | |
| tree | fa5c58c95394fd017c2c5585595ac4d51a62d63e | |
| parent | 76850a73404d8366f085765cef850d12b5644f68 (diff) | |
| parent | d18427a522a212dceae85a95c304fef8bca721b2 (diff) | |
| download | volse-hubzilla-bf1a21e46ff9d9b3fa6e889f7b74f7deae1f8526.tar.gz volse-hubzilla-bf1a21e46ff9d9b3fa6e889f7b74f7deae1f8526.tar.bz2 volse-hubzilla-bf1a21e46ff9d9b3fa6e889f7b74f7deae1f8526.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Cdav.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Widget/Cdav.php | 2 |
2 files changed, 6 insertions, 6 deletions
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; |