From a13e004df0d18c80fe8f6c84e3b7a1f179094005 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 14 Jul 2020 10:15:19 -0400 Subject: [PATCH] Delete include/items.php - Remove all references --- composer.json | 1 - doc/Addons.md | 4 ---- doc/Message-Flow.md | 2 -- doc/de/Addons.md | 4 ---- doc/de/Message-Flow.md | 2 -- include/items.php | 20 -------------------- mod/item.php | 2 -- src/Worker/Notifier.php | 2 -- 8 files changed, 37 deletions(-) delete mode 100644 include/items.php diff --git a/composer.json b/composer.json index 2cb863c980..b3dd0ec903 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,6 @@ "include/conversation.php", "include/dba.php", "include/enotify.php", - "include/items.php", "boot.php" ] }, diff --git a/doc/Addons.md b/doc/Addons.md index bff707fa83..54363cb1d7 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -518,10 +518,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep- Hook::callAll('item_photo_menu', $args); Hook::callAll('jot_tool', $jotplugins); -### include/items.php - - Hook::callAll('page_info_data', $data); - ### mod/directory.php Hook::callAll('directory_item', $arr); diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md index 69a10b2324..e967985695 100644 --- a/doc/Message-Flow.md +++ b/doc/Message-Flow.md @@ -6,8 +6,6 @@ There are multiple paths, using multiple protocols and message formats. Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub). -Most message passing involves the file include/items.php, which has functions for several feed-related import/export activities. - When a message is posted, all immediate deliveries to all networks are made using include/notifier.php, which chooses how (and to whom) to deliver the message. This file also invokes the local side of all deliveries including DFRN-notify. diff --git a/doc/de/Addons.md b/doc/de/Addons.md index b54f011bfe..745010ff4e 100644 --- a/doc/de/Addons.md +++ b/doc/de/Addons.md @@ -226,10 +226,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap Hook::callAll('item_photo_menu', $args); Hook::callAll('jot_tool', $jotplugins); -### include/items.php - - Hook::callAll('page_info_data', $data); - ### mod/directory.php Hook::callAll('directory_item', $arr); diff --git a/doc/de/Message-Flow.md b/doc/de/Message-Flow.md index 0a78d69173..ef2a0a2715 100644 --- a/doc/de/Message-Flow.md +++ b/doc/de/Message-Flow.md @@ -8,8 +8,6 @@ Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate n Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub). -Der Großteil der Nachrichtenverarbeitung nutzt die Datei include/items.php, welche Funktionen für verschiedene Feed-bezogene Import-/Exportaktivitäten liefert. - Wenn eine Nachricht veröffentlicht wird, werden alle Übermittlungen an alle Netzwerke mit include/notifier.php durchgeführt, welche entscheidet, wie und an wen die Nachricht geliefert wird. Diese Datei bindet dabei die lokale Bearbeitung aller Übertragungen ein inkl. dfrn-notify. diff --git a/include/items.php b/include/items.php deleted file mode 100644 index 23b63ec114..0000000000 --- a/include/items.php +++ /dev/null @@ -1,20 +0,0 @@ -. - * - */ diff --git a/mod/item.php b/mod/item.php index c30bbcc088..e2d47ae2fa 100644 --- a/mod/item.php +++ b/mod/item.php @@ -58,8 +58,6 @@ use Friendica\Util\Security; use Friendica\Util\Strings; use Friendica\Worker\Delivery; -require_once __DIR__ . '/../include/items.php'; - function item_post(App $a) { if (!Session::isAuthenticated()) { throw new HTTPException\ForbiddenException(); diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 8bcc0d3e35..c7b61dacca 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -42,8 +42,6 @@ use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; -require_once 'include/items.php'; - /* * The notifier is typically called with: *