From 8c6df8f156fe28431c17a9d8c3cdb2180005090e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 8 Jan 2019 11:17:05 +0000
Subject: [PATCH] Issue 6149: Making OWA (hopefully) compatible with Hubzilla

---
 mod/xrd.php                   | 2 +-
 src/Module/Magic.php          | 2 +-
 src/Module/Owa.php            | 2 +-
 view/templates/xrd_person.tpl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/xrd.php b/mod/xrd.php
index 4b9b0ee8fb..1611540a6c 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -92,7 +92,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
 			['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
 			['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
 			['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
-			['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
+			['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-zot+json', 'href' => System::baseUrl().'/owa']
 		]
 	];
 
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index f0be114e3d..491ed31cbd 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -74,7 +74,7 @@ class Magic extends BaseModule
 				$basepath = $exp[0];
 
 				$headers = [];
-				$headers['Accept'] = 'application/x-dfrn+json';
+				$headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
 				$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
 
 				// Create a header that is signed with the local users private key.
diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index bfe108c842..7243c11134 100644
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -86,6 +86,6 @@ class Owa extends BaseModule
 				}
 			}
 		}
-		System::jsonExit($ret, 'application/x-dfrn+json');
+		System::jsonExit($ret, 'application/x-zot+json');
 	}
 }
diff --git a/view/templates/xrd_person.tpl b/view/templates/xrd_person.tpl
index aa402b1a8f..578698b46b 100644
--- a/view/templates/xrd_person.tpl
+++ b/view/templates/xrd_person.tpl
@@ -34,6 +34,6 @@
     <Link rel="magic-public-key" 
           href="{{$modexp}}" />
     <Link rel="http://purl.org/openwebauth/v1"
-          type="application/x-dfrn+json"
+          type="application/x-zot+json"
           href="{{$openwebauth}}" />
 </XRD>
-- 
2.39.5