From 9c256ad76f191149c0917719a59b019aa301dfa3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 31 Dec 2022 12:55:13 -0500 Subject: [PATCH] Remove obsolete OExchange module and reference - Protocol looks unsupported for a decade now --- mod/oexchange.php | 126 ------------------------------ src/Module/WellKnown/HostMeta.php | 7 -- 2 files changed, 133 deletions(-) delete mode 100644 mod/oexchange.php diff --git a/mod/oexchange.php b/mod/oexchange.php deleted file mode 100644 index 4fbf7ffeb..000000000 --- a/mod/oexchange.php +++ /dev/null @@ -1,126 +0,0 @@ -. - * - */ - -use Friendica\App; -use Friendica\Content\Text\BBCode; -use Friendica\Content\Text\HTML; -use Friendica\Core\System; -use Friendica\DI; -use Friendica\Module\Response; -use Friendica\Module\Security\Login; -use Friendica\Util\XML; - -function oexchange_init(App $a) -{ - if ((DI::args()->getArgc() <= 1) || (DI::args()->getArgv()[1] != 'xrd')) { - return; - } - - $baseURL = DI::baseUrl()->get(); - - $xmlString = XML::fromArray([ - 'XRD' => [ - '@attributes' => [ - 'xmlns' => 'http://docs.oasis-open.org/ns/xri/xrd-1.0', - ], - 'Subject' => $baseURL, - '1:Property' => [ - '@attributes' => [ - 'type' => 'http://www.oexchange.org/spec/0.8/prop/vendor', - ], - 'Friendica' - ], - '2:Property' => [ - '@attributes' => [ - 'type' => 'http://www.oexchange.org/spec/0.8/prop/title', - ], - 'Friendica Social Network' - ], - '3:Property' => [ - '@attributes' => [ - 'type' => 'http://www.oexchange.org/spec/0.8/prop/name', - ], - 'Friendica' - ], - '4:Property' => [ - '@attributes' => [ - 'type' => 'http://www.oexchange.org/spec/0.8/prop/prompt', - ], - 'Send to Friendica' - ], - '1:link' => [ - '@attributes' => [ - 'rel' => 'icon', - 'type' => 'image/png', - 'href' => $baseURL . '/images/friendica-16.png' - ] - ], - '2:link' => [ - '@attributes' => [ - 'rel' => 'icon32', - 'type' => 'image/png', - 'href' => $baseURL . '/images/friendica-32.png' - ] - ], - '3:link' => [ - '@attributes' => [ - 'rel' => 'http://www.oexchange.org/spec/0.8/rel/offer', - 'type' => 'text/html', - 'href' => $baseURL . '/oexchange' - ] - ], - ], - ]); - - System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml'); -} - -function oexchange_content(App $a) -{ - if (!DI::userSession()->getLocalUserId()) { - $o = Login::form(); - return $o; - } - - if ((DI::args()->getArgc() > 1) && DI::args()->getArgv()[1] === 'done') { - return; - } - - $url = !empty($_REQUEST['url']) ? trim($_REQUEST['url']) : ''; - $title = !empty($_REQUEST['title']) ? trim($_REQUEST['title']) : ''; - $description = !empty($_REQUEST['description']) ? trim($_REQUEST['description']) : ''; - $tags = !empty($_REQUEST['tags']) ? trim($_REQUEST['tags']) : ''; - - $s = BBCode::embedURL($url, true, $title, $description, $tags); - - if (!strlen($s)) { - return; - } - - $post = []; - - $post['return'] = '/oexchange/done'; - $post['body'] = HTML::toBBCode($s); - - $_REQUEST = $post; - require_once 'mod/item.php'; - item_post($a); -} diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php index fa6619920..512ff8dd0 100644 --- a/src/Module/WellKnown/HostMeta.php +++ b/src/Module/WellKnown/HostMeta.php @@ -80,13 +80,6 @@ class HostMeta extends BaseModule 'href' => $domain . '/amcd' ] ], - '5:link' => [ - '@attributes' => [ - 'rel' => 'http://oexchange.org/spec/0.8/rel/resident-target', - 'type' => 'application/xrd+xml', - 'href' => $domain . '/oexchange/xrd' - ] - ], 'Property' => [ '@attributes' => [ 'type' => 'http://salmon-protocol.org/ns/magic-key',