From 4930737cc448bcff196a2e06065249c0ffc363d0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 20 Oct 2022 04:21:00 +0000
Subject: [PATCH] Legacy "include" fragments have been removed

---
 Doxyfile                                        |  2 +-
 src/Console/Extract.php                         |  1 -
 src/Console/Typo.php                            |  7 -------
 src/Core/Worker.php                             | 17 +----------------
 .../Notifications/Repository/Notify.php         |  2 +-
 5 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index dc89acd44d..50590bb6be 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-INPUT = README.md index.php update.php bin/ mod/ include/ view/ src/ VERSION
+INPUT = README.md index.php update.php bin/ mod/ view/ src/ VERSION
 RECURSIVE = YES
 PROJECT_NAME = "Friendica"
 PROJECT_LOGO = images/friendica-64.png
diff --git a/src/Console/Extract.php b/src/Console/Extract.php
index 23b2c3c546..4e6b1bff5a 100644
--- a/src/Console/Extract.php
+++ b/src/Console/Extract.php
@@ -77,7 +77,6 @@ HELP;
 		$files = array_merge(
 			['index.php'],
 			glob('mod/*'),
-			glob('include/*'),
 			glob('addon/*/*'),
 			$this->globRecursive('src')
 		);
diff --git a/src/Console/Typo.php b/src/Console/Typo.php
index 4414662e7f..e21b394c06 100644
--- a/src/Console/Typo.php
+++ b/src/Console/Typo.php
@@ -105,13 +105,6 @@ HELP;
 		$files = glob('mod/*.php');
 		$this->checkFiles($php_path, $files);
 
-		if ($this->getOption('v')) {
-			$this->out('Directory: include');
-		}
-
-		$files = glob('include/*.php');
-		$this->checkFiles($php_path, $files);
-
 		if ($this->getOption('v')) {
 			$this->out('Directory: addon');
 		}
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 9ec2f8f04a..96f3e7ae04 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -315,17 +315,7 @@ class Worker
 			return false;
 		}
 
-		$valid = false;
-		if (strpos($file, 'include/') === 0) {
-			$valid = true;
-		}
-
-		if (strpos($file, 'addon/') === 0) {
-			$valid = true;
-		}
-
-		// Simply return flag
-		return $valid;
+		return (strpos($file, 'addon/') === 0);
 	}
 
 	/**
@@ -406,11 +396,6 @@ class Worker
 			return true;
 		}
 
-		// The script could be provided as full path or only with the function name
-		if ($include == basename($include)) {
-			$include = 'include/' . $include . '.php';
-		}
-
 		if (!self::validateInclude($include)) {
 			Logger::warning('Include file is not valid', ['file' => $argv[0]]);
 			$stamp = (float)microtime(true);
diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index 315b2e084c..5a6bf66896 100644
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -585,7 +585,7 @@ class Notify extends BaseRepository
 					DBA::insert('notify-threads', $fields);
 
 					$emailBuilder->setHeader('Message-ID', $message_id);
-					$log_msg = "include/enotify: No previous notification found for this parent:\n" .
+					$log_msg = "No previous notification found for this parent:\n" .
 						"  parent: ${params['parent']}\n" . "  uid   : ${params['uid']}\n";
 					$this->logger->info($log_msg);
 				} else {
-- 
2.39.5