Fancybox is deprecated

.woodpecker/.code_standards_check.yml

@@ -1,6 +1,6 @@
 skip_clone: true
 
-steps:
+pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -56,10 +56,6 @@ steps:
       - /tmp/drone-cache:/tmp/cache
     when:
       event: pull_request
-  phpstan:
-    image: friendicaci/php8.3:php8.3.3
-    commands:
-      - ./bin/composer.phar run phpstan;
   check:
     image: friendicaci/php-cs
     commands:

.woodpecker/.continuous-deployment.yml

@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-steps:
+pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -48,7 +48,7 @@ steps:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php8.2:php8.2.28
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

.woodpecker/.messages.po_check.yml

@@ -1,6 +1,6 @@
 skip_clone: true
 
-steps:
+pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:

.woodpecker/.phpunit.yml

@@ -5,13 +5,11 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.31
+      PHP_VERSION: 8.1.27
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.28
+      PHP_VERSION: 8.2.16
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.17
-    - PHP_MAJOR_VERSION: 8.4
-      PHP_VERSION: 8.4.5
+      PHP_VERSION: 8.3.3
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
@@ -19,7 +17,7 @@ labels:
 
 skip_clone: true
 
-steps:
+pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -100,9 +98,9 @@ steps:
         - friendica/friendica-addons
     commands:
       - codecov -R '.' -Z -f 'clover.xml'
-    environment:
-      CODECOV_TOKEN:
-        from_secret: codecov-token
+    secrets:
+      - source: codecov-token
+        target: codecov_token
 
 services:
   mariadb:

.woodpecker/.releaser.yml

@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-steps:
+pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -45,7 +45,7 @@ steps:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php8.2:php8.2.28
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

advancedcontentfilter/advancedcontentfilter.php

@@ -33,13 +33,16 @@
  *
  */
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -61,7 +64,7 @@ function advancedcontentfilter_install()
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	DI::logger()->notice('installed advancedcontentfilter');
+	Logger::notice('installed advancedcontentfilter');
 }
 
 /*
@@ -120,22 +123,21 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
-	if (!$uid) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
 	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-	$rules = DI::cache()->get('rules_' . $uid);
+	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => $uid, 'active' => true]
+			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
 		));
 
-		DI::cache()->set('rules_' . $uid, $rules);
+		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
 	}
 
 	if ($rules) {
@@ -190,30 +192,9 @@ function advancedcontentfilter_init()
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
 		$slim = \Slim\Factory\AppFactory::create();
 
-		/**
-		 * The routing middleware should be added before the ErrorMiddleware
-		 * Otherwise exceptions thrown from it will not be handled
-		 */
-		$slim->addRoutingMiddleware();
-
-		$slim->addErrorMiddleware(true, true, true, DI::logger());
-
-		// register routes
-		$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
-			$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
-				$app->get('', 'advancedcontentfilter_get_rules');
-				$app->post('', 'advancedcontentfilter_post_rules');
-
-				$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
-				$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
-				$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
-			});
-
-			$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
-				$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
-			});
-		});
+		require __DIR__ . '/src/middlewares.php';
 
+		require __DIR__ . '/src/routes.php';
 		$slim->run();
 
 		exit;
@@ -271,7 +252,7 @@ function advancedcontentfilter_content()
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => DI::appHelper()->getCurrentTheme(),
+			'$current_theme' => DI::app()->getCurrentTheme(),
 			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);

advancedcontentfilter/src/middlewares.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+use Friendica\DI;
+
+/** @var $slim \Slim\App */
+
+/**
+ * The routing middleware should be added before the ErrorMiddleware
+ * Otherwise exceptions thrown from it will not be handled
+ */
+$slim->addRoutingMiddleware();
+
+$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());

advancedcontentfilter/src/routes.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/* @var $slim Slim\App */
+$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
+	$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
+		$app->get('', 'advancedcontentfilter_get_rules');
+		$app->post('', 'advancedcontentfilter_post_rules');
+
+		$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
+		$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
+		$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+	});
+
+	$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
+		$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+	});
+});

birdavatar/birdavatar.php

@@ -6,7 +6,9 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -26,7 +28,7 @@ function birdavatar_install()
 	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-	DI::logger()->info('registered birdavatar');
+	Logger::info('registered birdavatar');
 }
 
 /**

blackout/blackout.php

@@ -44,7 +44,9 @@
  * THE SOFTWARE.
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -76,7 +78,7 @@ function blackout_redirect ($b)
 	}
 
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		DI::logger()->notice('redirecting user to blackout page');
+		Logger::notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }

blockbot/blockbot.php

@@ -11,6 +11,7 @@
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -69,7 +70,7 @@ function blockbot_init_1()
 	}
 
 	if (empty($parts)) {
-		DI::logger()->debug('Known frontend found - accept', $logdata);
+		Logger::debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -79,66 +80,66 @@ function blockbot_init_1()
 	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
 	if (blockbot_is_crawler($parts)) {
-		DI::logger()->debug('Crawler found - reject', $logdata);
+		Logger::debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		DI::logger()->debug('Search bot found - reject', $logdata);
+		Logger::debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
+		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
 		if (!DI::config()->get('blockbot', 'security_checker')) {
-			DI::logger()->debug('Security checker found - reject', $logdata);
+			Logger::debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
-		DI::logger()->debug('Security checker found - accept', $logdata);
+		Logger::debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		DI::logger()->debug('Social media service found - accept', $logdata);
+		Logger::debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		DI::logger()->debug('Fediverse client found - accept', $logdata);
+		Logger::debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		DI::logger()->debug('Feed reader found - accept', $logdata);
+		Logger::debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		DI::logger()->debug('Fediverse tool found - accept', $logdata);
+		Logger::debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		DI::logger()->debug('Service agent found - accept', $logdata);
+		Logger::debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		DI::logger()->debug('Monitoring service found - accept', $logdata);
+		Logger::debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		DI::logger()->debug('Validation service found - accept', $logdata);
+		Logger::debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
+		Logger::debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
@@ -146,10 +147,10 @@ function blockbot_init_1()
 	if (blockbot_is_http_library($parts)) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 		if (!DI::config()->get('blockbot', 'http_libraries')) {
-			DI::logger()->debug('HTTP Library found - reject', $logdata);
+			Logger::debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
-		DI::logger()->debug('HTTP Library found - accept', $logdata);
+		Logger::debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -160,12 +161,12 @@ function blockbot_init_1()
 
 	if (!$isCrawler) {
 		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
-		DI::logger()->debug('Non-bot user agent detected', $logdata);
+		Logger::debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	DI::logger()->notice('Possible bot found - reject', $logdata);
+	Logger::notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -208,7 +209,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 		blockbot_save('activitypub-inbox-agents', $agent);
 	}
 
-	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER, false))) {
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
 		blockbot_save('activitypub-signature-agents', $agent);
 	}
 }
@@ -216,7 +217,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
-		DI::logger()->debug('Login attempt detected - reject', $logdata);
+		Logger::debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -442,7 +443,7 @@ function blockbot_is_monitor(array $parts): bool
 }
 
 /**
- * Services in the centralized and decentralized social media environment
+ * Services in the centralized and decentralized social media environment 
  *
  * @param array $parts
  * @return boolean

bluesky/bluesky.php

@@ -30,6 +30,7 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -72,7 +73,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)
@@ -96,25 +97,27 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (substr($hookData['uri'], 0, 5) != 'at://') {
-		if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-			return;
-		}
-
-		$did = DI::atProtocol()->getDid($matches[1]);
-		if (empty($did)) {
-			return;
-		}
-
-		DI::logger()->debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-
-		$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
-	} else {
-		$uri = $hookData['uri'];
+	$token = DI::atProtocol()->getUserToken($hookData['uid']);
+	if (empty($token)) {
+		return;
 	}
 
+	// @todo also support the URI format (at://did/app.bsky.feed.post/cid)
+	if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+		return;
+	}
+
+	$did = DI::atProtocol()->getDid($matches[1]);
+	if (empty($did)) {
+		return;
+	}
+
+	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
+
+	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
+
 	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	DI::logger()->debug('Got post', ['uri' => $uri]);
+	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[2], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -137,7 +140,7 @@ function bluesky_follow(array &$hook_data)
 		return;
 	}
 
-	DI::logger()->debug('Check if contact is bluesky', ['data' => $hook_data]);
+	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
 	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
 	if (empty($contact)) {
 		return;
@@ -158,7 +161,7 @@ function bluesky_follow(array &$hook_data)
 	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$hook_data['contact'] = $contact;
-		DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -212,7 +215,7 @@ function bluesky_block(array &$hook_data)
 		if ($ucid) {
 			Contact::remove($ucid);
 		}
-		DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -420,11 +423,11 @@ function bluesky_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			DI::logger()->notice('poll interval not reached');
+			Logger::notice('poll interval not reached');
 			return;
 		}
 	}
-	DI::logger()->notice('cron_start');
+	Logger::notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -436,19 +439,19 @@ function bluesky_cron()
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
-			DI::logger()->debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-		DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
+		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		DI::atProtocol()->getUserToken($pconfig['uid']);
 
 		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -462,32 +465,32 @@ function bluesky_cron()
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-			DI::logger()->debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
 			}
 		}
-		DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
+		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
-	DI::logger()->notice('Polling done for all users');
+	Logger::notice('Polling done for all users');
 
 	DI::keyValue()->set('bluesky_last_poll', time());
 
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		DI::logger()->notice('Start contact cleanup');
+		Logger::notice('Start contact cleanup');
 		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
 		while ($contact = DBA::fetch($contacts)) {
 			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
 		}
 		DBA::close($contacts);
 		DI::keyValue()->set('bluesky_last_clean', time());
-		DI::logger()->notice('Contact cleanup done');
+		Logger::notice('Contact cleanup done');
 	}
 
-	DI::logger()->notice('cron_end');
+	Logger::notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -507,7 +510,7 @@ function bluesky_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
 		// Don't post if it isn't a reply to a bluesky post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-			DI::logger()->notice('No bluesky parent found', ['item' => $post['id']]);
+			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -554,12 +557,12 @@ function bluesky_send(array &$b)
 	}
 
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		DI::logger()->debug('Got comment', ['item' => $b]);
+		Logger::debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
 			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
-				DI::logger()->debug('Not a bluesky post', ['uri' => $b['uri']]);
+				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
 				return;
 			}
 			bluesky_delete_post($b['uri'], $b['uid']);
@@ -570,12 +573,12 @@ function bluesky_send(array &$b)
 		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
-			DI::logger()->debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
 			bluesky_create_post($b, $root, $parent);
 			return;
 		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -602,8 +605,6 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
-	$post = [];
-
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,
@@ -634,10 +635,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	if (empty($activity->uri)) {
 		return;
 	}
-	DI::logger()->debug('Activity done', ['return' => $activity]);
+	Logger::debug('Activity done', ['return' => $activity]);
 	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-	DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
@@ -672,8 +673,6 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		}
 	}
 
-	$item['body'] = bluesky_set_mentions($item['body']);
-
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
@@ -723,53 +722,26 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 			return;
 		}
-		DI::logger()->debug('Posting done', ['return' => $parent]);
+		Logger::debug('Posting done', ['return' => $parent]);
 		if (empty($root)) {
 			$root = $parent;
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
 			$uri = DI::atpProcessor()->getUri($parent);
 			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-			DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
 }
 
-function bluesky_set_mentions(string $body): string
-{
-	// Remove all url based mention links
-	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
-
-	if (!preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		return $body;
-	}
-
-	foreach ($matches as $match) {
-		$contact = Contact::selectFirst(['addr'], ['nurl' => $match[1]]);
-		if (!empty($contact['addr'])) {
-			$body = str_replace($match[0], '@[url=' . $match[1] . ']' . $contact['addr'] . '[/url]', $body);
-		} else {
-			$body = str_replace($match[0], '@' . $match[2], $body);
-		}
-	}
-
-	return $body;
-}
-
 function bluesky_get_urls(string $body): array
 {
+	// Remove all hashtag and mention links
+	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
+
 	$body = BBCode::expandVideoLinks($body);
 	$urls = [];
 
-	// Search for Mentions
-	if (preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			$text = '@' . $match[2];
-			$urls[strpos($body, $match[0])] = ['mention' => $match[1], 'text' => $text, 'hash' => $text];
-			$body = str_replace($match[0], $text, $body);
-		}
-	}
-
 	// Search for hash tags
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
@@ -854,9 +826,6 @@ function bluesky_get_facets(string $body, array $urls): array
 		} elseif (!empty($url['url'])) {
 			$feature->uri = $url['url'];
 			$feature->$type = 'app.bsky.richtext.facet#link';
-		} elseif (!empty($url['mention'])) {
-			$feature->did = $url['mention'];
-			$feature->$type = 'app.bsky.richtext.facet#mention';
 		} else {
 			continue;
 		}
@@ -930,20 +899,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$new_size   = strlen($content);
 
 	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-		DI::logger()->warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		$content = Photo::getImageForPhoto($photo);
 	} else {
-		DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	}
 
 	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
-		DI::logger()->info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
 	}
 
 	Item::incrementOutbound(Protocol::BLUESKY);
-	DI::logger()->debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
 
@@ -951,11 +920,11 @@ function bluesky_delete_post(string $uri, int $uid)
 {
 	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
-		DI::logger()->debug('No uri delected', ['uri' => $uri]);
+		Logger::debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
 	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-	DI::logger()->debug('Deleted', ['parts' => $parts]);
+	Logger::debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
@@ -1037,10 +1006,6 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		return;
 	}
 
-	if (Post::exists(['uid' => $item['uid'], 'thr-parent' => $item['thr-parent'], 'verb' => $item['verb'], 'contact-id' => $item['contact-id']])) {
-		return;
-	}
-
 	$item['guid']         = Item::guidFromUri($item['uri'], $contact['alias']);
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
@@ -1061,10 +1026,10 @@ function bluesky_fetch_notifications(int $uid)
 	foreach ($data->notifications as $notification) {
 		$uri = DI::atpProcessor()->getUri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-			DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
 		}
-		DI::logger()->debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
 				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
@@ -1074,9 +1039,9 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
@@ -1088,37 +1053,37 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
 			case 'follow':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
-				DI::logger()->debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
 				break;
 
 			case 'mention':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
-				DI::logger()->debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
-				DI::logger()->debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
-				DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
-				DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
 				break;
 		}
 	}
@@ -1149,16 +1114,16 @@ function bluesky_fetch_feed(int $uid, string $feed)
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			DI::logger()->debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
 		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
 		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
 		} else {
-			DI::logger()->notice('Post not found', ['entry' => $entry]);
+			Logger::notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
@@ -1174,14 +1139,8 @@ function bluesky_get_feeds(int $uid): array
 		return [];
 	}
 	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPrefV2') {
-			$pinned = [];
-			foreach ($preference->items as $item) {
-				if (($item->type == 'feed') && $item->pinned) {
-					$pinned[] = $item->value;
-				}
-			}
-			return $pinned;
+		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
+			return $preference->pinned ?? [];
 		}
 	}
 	return [];

bluesky/bluesky_feed.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
 	bluesky_fetch_feed($argv[1], $argv[2]);
-	DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }

bluesky/bluesky_notifications.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
+	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
 	bluesky_fetch_notifications($argv[1]);
-	DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
+	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
 }

bluesky/bluesky_timeline.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
 		return;
 	}
 
-	DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
+	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
 	bluesky_fetch_timeline($argv[1]);
-	DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
+	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
 }

buglink/buglink.php

@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

calc/calc.php

@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -15,7 +16,7 @@ function calc_install() {
 
 function calc_app_menu(array &$b)
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>';
+	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
 }
 
 /**
@@ -295,7 +296,7 @@ $o .=  <<< EOT
 <h3>Calculator</h3>
 <br /><br />
 <table>
-<tbody><tr><td>
+<tbody><tr><td> 
 <table bgcolor="#af9999" border="1">
 <tbody><tr><td>
 <table border="1" cellpadding="2" cellspacing="2">
@@ -322,7 +323,7 @@ $o .=  <<< EOT
 	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
 	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
-	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td>
+	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
 	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
 	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
@@ -344,13 +345,13 @@ $o .=  <<< EOT
 </form>
 
 	<!--
-	<TD VALIGN=top>
+	<TD VALIGN=top> 
 		<B>NOTE:</B> All sine and cosine calculations are
 		<br>done in radians. Remember to convert first
 		<br>if using degrees.
 	</TD>
 	-->
-
+	
 </td></tr></tbody></table>
 
 

catavatar/catavatar.php

@@ -6,8 +6,11 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -26,7 +29,7 @@ function catavatar_install()
 	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-	DI::logger()->notice('registered catavatar');
+	Logger::notice('registered catavatar');
 }
 
 /**

cld/cld.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\DI;
 
 function cld_install()
@@ -17,17 +18,7 @@ function cld_install()
 function cld_detect_languages(array &$data)
 {
 	if (!in_array('cld2', get_loaded_extensions())) {
-		DI::logger()->warning('CLD2 is not installed.');
-		return;
-	}
-
-	if (!class_exists('CLD2Detector')) {
-		DI::logger()->warning('CLD2Detector class does not exist.');
-		return;
-	}
-
-	if (!class_exists('CLD2Encoding')) {
-		DI::logger()->warning('CLD2Encoding class does not exist.');
+		Logger::warning('CLD2 is not installed.');
 		return;
 	}
 
@@ -52,7 +43,7 @@ function cld_detect_languages(array &$data)
 	}
 
 	if (!$result['is_reliable']) {
-		DI::logger()->debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		if (($original == $detected) && ($data['detected'][$original] < $result['language_probability'] / 100)) {
 			$data['detected'][$original] = $result['language_probability'] / 100;
 		}
@@ -62,12 +53,12 @@ function cld_detect_languages(array &$data)
 	$available = array_keys(DI::l10n()->getLanguageCodes());
 
 	if (!in_array($detected, $available)) {
-		DI::logger()->debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		return;
 	}
 
 	if ($original != $detected) {
-		DI::logger()->debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		Logger::debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 	}
 
 	$length = count($data['detected']);

convert/UnitConvertor.php

@@ -169,6 +169,7 @@ class UnitConvertor
 	* @param    string    name of the source unit from which to convert
     * @param    string    name of the target unit to which we are converting
     * @param    integer   double precision of the end result
+    * @return   void
     * @access   public
     */
 	function convert($value, $from_unit, $to_unit, $precision)
@@ -279,4 +280,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
+?>

convert/convert.php

@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 
 function convert_install() {
@@ -25,7 +26,7 @@ function convert_content() {
 	// @TODO Let's one day rewrite this to a modern composer package
 	include 'UnitConvertor.php';
 
-	$conv = new class('en') extends UnitConvertor
+	class TP_Converter extends UnitConvertor
 	{
 		public function __construct(string $lang = 'en')
 		{
@@ -42,7 +43,7 @@ function convert_content() {
 
 		private function findBaseUnit($from, $to)
 		{
-			foreach ($this->bases as $skey => $sval) {
+			while (list($skey, $sval) = each($this->bases)) {
 				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
 					return $skey;
 				}
@@ -62,7 +63,7 @@ function convert_content() {
 				$cells[] = $cell;
 
 				// We now have the base unit and value now lets produce the table;
-				foreach ($this->bases[$base_unit] as $val) {
+				while (list($key, $val) = each($this->bases[$base_unit])) {
 					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
 					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
 					$cells[] = $cell;
@@ -85,7 +86,9 @@ function convert_content() {
 
 			return $string;
 		}
-	};
+	}
+
+	$conv = new TP_Converter('en');
 
 	$conversions = [
 		'Temperature' => ['base'  => 'Celsius',
@@ -173,15 +176,15 @@ function convert_content() {
 		]
 	];
 
-	foreach ($conversions as $key => $val) {
+	while (list($key, $val) = each($conversions)) {
 		$conv->addConversion($val['base'], $val['conv']);
 		$list[$key][] = $val['base'];
-		foreach ($val['conv'] as $ukey => $uval) {
+		while (list($ukey, $uval) = each($val['conv'])) {
 			$list[$key][] = $ukey;
 		}
 	}
 
-	$o = '<h3>Unit Conversions</h3>';
+	$o .= '<h3>Unit Conversions</h3>';
 
 	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
 		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
@@ -199,9 +202,10 @@ function convert_content() {
 	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
 	$o .= '<select name="from_unit" size="12">';
 
-	foreach ($list as $key => $val) {
+	reset($list);
+	while(list($key, $val) = each($list)) {
 		$o .=  "\n\t<optgroup label=\"$key\">";
-		foreach ($val as $ukey => $uval) {
+		while(list($ukey, $uval) = each($val)) {
 			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
 			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
 		}

cookienotice/cookienotice.php

@@ -7,6 +7,7 @@
  * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

curweather/curweather.php

@@ -29,10 +29,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	$now = new DateTime();
 
 	if (!is_null($cached)) {
-		$cdate = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
+		$cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
 		$cached = unserialize($cached);
 
-		if ($cdate + (int) $cachetime > $now->getTimestamp()) {
+		if ($cdate + $cachetime > $now->getTimestamp()) {
 			return $cached;
 		}
 	}

diaspora/Diaspora_Connection.php

@@ -33,6 +33,7 @@ class Diaspora_Connection {
 		}
 
 		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
+		return $this;
 	}
 
 	public function __destruct() {

diaspora/diasphp.php

@@ -9,8 +9,6 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
-	private $token_regex;
-	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

diaspora/diaspora.php

@@ -9,8 +9,10 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
@@ -185,7 +187,7 @@ function diaspora_send(array &$b)
 {
 	$hostname = DI::baseUrl()->getHost();
 
-	DI::logger()->notice('diaspora_send: invoked');
+	Logger::notice('diaspora_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -209,14 +211,14 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	DI::logger()->info('diaspora_send: prepare posting');
+	Logger::info('diaspora_send: prepare posting');
 
 	$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
 	$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
 	$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
 
 	if ($handle && $password) {
-		DI::logger()->info('diaspora_send: all values seem to be okay');
+		Logger::info('diaspora_send: all values seem to be okay');
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -247,20 +249,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			DI::logger()->info('diaspora_send: prepare');
+			Logger::info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			DI::logger()->info('diaspora_send: try to log in ' . $handle);
+			Logger::info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			DI::logger()->info('diaspora_send: try to send ' . $body);
+			Logger::info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			DI::logger()->notice('diaspora_send: success');
+			Logger::notice('diaspora_send: success');
 		} catch (Exception $e) {
-			DI::logger()->notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			DI::logger()->info('diaspora_send: requeueing ' . $b['uid']);
+			Logger::info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}

discourse/discourse.php

@@ -8,8 +8,10 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -78,13 +80,13 @@ function discourse_email_getmessage(&$message)
 	// We do assume that all Discourse servers are running with SSL
 	if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_post_from_api($message, $matches[2], $matches[3])) {
-		DI::logger()->info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
+		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
 		return;
 	}
 
 	if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) {
-		DI::logger()->info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
+		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
 		return;
 	}
 
@@ -94,16 +96,16 @@ function discourse_email_getmessage(&$message)
 	}
 
 	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		DI::logger()->info('This is no Discourse post');
+		Logger::info('This is no Discourse post');
 		return;
 	}
 
 	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		DI::logger()->info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
+		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
 		return;
 	}
 
-	DI::logger()->info('Fallback mode', ['plink' => $message['item']['plink']]);
+	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
 	// Search in the HTML part for the discourse entry and the author profile
 	if (!empty($message['html'])) {
 		$message = discourse_get_html($message);
@@ -120,7 +122,7 @@ function discourse_fetch_post($host, $topic, $pid)
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
 	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
-		DI::logger()->info('No success', ['url' => $url]);
+		Logger::info('No success', ['url' => $url]);
 		return false;
 	}
 
@@ -132,11 +134,11 @@ function discourse_fetch_post($host, $topic, $pid)
 			/// @todo Possibly fetch missing posts here
 			continue;
 		}
-		DI::logger()->info('Got post data from topic', $post);
+		Logger::info('Got post data from topic', $post);
 		return $post;
 	}
 
-	DI::logger()->info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
+	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
 	return false;
 }
 
@@ -168,7 +170,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 
 	$message = discourse_process_post($message, $data, $hostaddr);
 
-	DI::logger()->info('Got API data', $message);
+	Logger::info('Got API data', $message);
 	return true;
 }
 
@@ -201,7 +203,7 @@ function discourse_get_user($post, $hostaddr)
 	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
-	DI::logger()->info('Contact', $contact);
+	Logger::info('Contact', $contact);
 	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
@@ -267,11 +269,11 @@ function discourse_get_html($message)
 	$div = $doc2->importNode($result->item(0), true);
 	$doc2->appendChild($div);
 	$message['html'] = $doc2->saveHTML();
-	DI::logger()->info('Found html body', ['html' => $message['html']]);
+	Logger::info('Found html body', ['html' => $message['html']]);
 
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
-		DI::logger()->info('Found profile', $profile);
+		Logger::info('Found profile', $profile);
 		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
 		$message['item']['author-link'] = $profile['url'];
 		$message['item']['author-name'] = $profile['name'];
@@ -287,21 +289,21 @@ function discourse_get_text($message)
 	$text = str_replace("\r", '', $text);
 	$pos = strpos($text, "\n---\n");
 	if ($pos == 0) {
-		DI::logger()->info('No separator found', ['text' => $text]);
+		Logger::info('No separator found', ['text' => $text]);
 		return $message;
 	}
 
 	$message['text'] = trim(substr($text, 0, $pos));
 
-	DI::logger()->info('Found text body', ['text' => $message['text']]);
+	Logger::info('Found text body', ['text' => $message['text']]);
 
 	$message['text'] = Markdown::toBBCode($message['text']);
 
 	$text = substr($text, $pos);
-	DI::logger()->info('Found footer', ['text' => $text]);
+	Logger::info('Found footer', ['text' => $text]);
 	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
 		$message['item']['plink'] = $link[1];
-		DI::logger()->info('Found plink', ['plink' => $message['item']['plink']]);
+		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
 	}
 	return $message;
 }

dwpost/dwpost.php

@@ -8,8 +8,10 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -184,12 +186,12 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		DI::logger()->debug('dwpost: data: ' . $xml);
+		Logger::debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
 			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		DI::logger()->info('posted to dreamwidth: ' . ($x) ? $x : '');
+		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
 	}
 }

fancybox/.gitignore

@@ -1,2 +0,0 @@
-/dist/
-/test/

fancybox/CHANGELOG.md

@@ -1,27 +0,0 @@
-### Version 1.05
-
-* Added ALT and TITLE of original IMG to fancybox popup.
-
-### Version 1.04
-
-* Update supporting upcoming imnagegrid in posts
- 
-### Version 1.03
-
-* imgages in body-attach with title / alt attribute get them removed while adding fancy attributes
-* Added fancybox to image inlined in posts. Un-hooked the old lightbox from frio and vier and excahnged that with fancybox hooks.
-* Excluded images in "type-link" divs from being "fancied" as they have no images but pages linked to. 
-
-### Version 1.02
-
-* [MrPetovan](https://github.com/MrPetovan) optimized my noob regular expression code. 
-
-### Version 1.01
-
-* One gallery for each post
-* All media attached to a post are added to the posts gallery.
-* Loop scrolling: You can step from last media to first and vice versa.
-### Version 1.00
-
-* First test version released.
-* One fancybox per page displaying first media of each post.

fancybox/README.md

@@ -1,19 +0,0 @@
-# Post image gallery using fancybox
-
-Addon author: [Grischa Brockhaus](https://brockha.us)
-
-## Description
-
-This addon loads all media attachments of a post into a "fancybox" instead of linking directly to the media.
-
-Each post gets its own attachment library, when there are more than one media attached you can scroll through them.
-
-## Licenses
-
-### Fancybox Library
-
-This AddOn is using the jQuery library [fancybox](https://github.com/fancyapps/fancybox). 
-
-The fancyBox libryry is licensed under the GPLv3 license for all open source applications. A commercial license is required for all commercial applications (including sites, themes and apps you plan to sell).
-
-[Read more about fancyBox license](https://github.com/fancyapps/fancybox).

fancybox/asset/fancybox/README.md

@@ -1,62 +0,0 @@
-# fancyBox 3.5.7
-
-jQuery lightbox script for displaying images, videos and more.
-Touch enabled, responsive and fully customizable.
-
-See the [project page](http://fancyapps.com/fancybox/3/) for documentation and a demonstration.
-
-Follow [@thefancyapps](//twitter.com/thefancyapps) for updates.
-
-
-## Quick start
-
-1\.  Add latest jQuery and fancyBox files
-
-```html
-<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
-
-<link  href="/path/to/jquery.fancybox.min.css" rel="stylesheet">
-<script src="/path/to/jquery.fancybox.min.js"></script>
-```
-
-
-2\.  Create links
-
-```html
-<a data-fancybox="gallery" href="big_1.jpg">
-    <img src="small_1.jpg">
-</a>
-
-<a data-fancybox="gallery" href="big_2.jpg">
-    <img src="small_2.jpg">
-</a>
-```
-
-
-3\. Enjoy!
-
-
-## License
-
-fancyBox is licensed under the [GPLv3](http://choosealicense.com/licenses/gpl-3.0) license for all open source applications.
-A commercial license is required for all commercial applications (including sites, themes and apps you plan to sell).
-
-[Read more about fancyBox license](http://fancyapps.com/fancybox/3/#license).
-
-## Bugs and feature requests
-
-If you find a bug, please report it [here on Github](https://github.com/fancyapps/fancybox/issues).
-
-Guidelines for bug reports:
-
-1. Use the GitHub issue search — check if the issue has already been reported.
-2. Check if the issue has been fixed — try to reproduce it using the latest master or development branch in the repository.
-3. Isolate the problem — create a reduced test case and a live example. You can use CodePen to fork any demo found on documentation to use it as a template.
-
-A good bug report shouldn't leave others needing to chase you up for more information.
-Please try to be as detailed as possible in your report.
-
-
-Feature requests are welcome. Please look for existing ones and use GitHub's "reactions" feature to vote.
-
-Please do not use the issue tracker for personal support requests - use Stack Overflow ([fancybox-3](http://stackoverflow.com/questions/tagged/fancybox-3) tag) instead.

fancybox/asset/fancybox/fancybox.config.js

@@ -1,13 +0,0 @@
-$(document).ready(function() {
-    $.fancybox.defaults.loop = "true";
-    // this disables the colorbox hook found in frio/js/modal.js:34
-    $("body").off("click", ".wall-item-body a img");
-
-    // Adds ALT/TITLE text to fancybox
-    $('a[data-fancybox').fancybox({
-        afterLoad : function(instance, current) {
-            current.$image.attr('alt', current.opts.$orig.find('img').attr('alt') );
-            current.$image.attr('title', current.opts.$orig.find('img').attr('title') );
-        }
-    });
-});

fancybox/asset/fancybox/jquery.fancybox.css

@@ -1,895 +0,0 @@
-body.compensate-for-scrollbar {
-    overflow: hidden;
-}
-
-.fancybox-active {
-    height: auto;
-}
-
-.fancybox-is-hidden {
-    left: -9999px;
-    margin: 0;
-    position: absolute !important;
-    top: -9999px;
-    visibility: hidden;
-}
-
-.fancybox-container {
-    -webkit-backface-visibility: hidden;
-    height: 100%;
-    left: 0;
-    outline: none;
-    position: fixed;
-    -webkit-tap-highlight-color: transparent;
-    top: 0;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    transform: translateZ(0);
-    width: 100%;
-    z-index: 99992;
-}
-
-.fancybox-container * {
-    box-sizing: border-box;
-}
-
-.fancybox-outer,
-.fancybox-inner,
-.fancybox-bg,
-.fancybox-stage {
-    bottom: 0;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.fancybox-outer {
-    -webkit-overflow-scrolling: touch;
-    overflow-y: auto;
-}
-
-.fancybox-bg {
-    background: rgb(30, 30, 30);
-    opacity: 0;
-    transition-duration: inherit;
-    transition-property: opacity;
-    transition-timing-function: cubic-bezier(.47, 0, .74, .71);
-}
-
-.fancybox-is-open .fancybox-bg {
-    opacity: .9;
-    transition-timing-function: cubic-bezier(.22, .61, .36, 1);
-}
-
-.fancybox-infobar,
-.fancybox-toolbar,
-.fancybox-caption,
-.fancybox-navigation .fancybox-button {
-    direction: ltr;
-    opacity: 0;
-    position: absolute;
-    transition: opacity .25s ease, visibility 0s ease .25s;
-    visibility: hidden;
-    z-index: 99997;
-}
-
-.fancybox-show-infobar .fancybox-infobar,
-.fancybox-show-toolbar .fancybox-toolbar,
-.fancybox-show-caption .fancybox-caption,
-.fancybox-show-nav .fancybox-navigation .fancybox-button {
-    opacity: 1;
-    transition: opacity .25s ease 0s, visibility 0s ease 0s;
-    visibility: visible;
-}
-
-.fancybox-infobar {
-    color: #ccc;
-    font-size: 13px;
-    -webkit-font-smoothing: subpixel-antialiased;
-    height: 44px;
-    left: 0;
-    line-height: 44px;
-    min-width: 44px;
-    mix-blend-mode: difference;
-    padding: 0 10px;
-    pointer-events: none;
-    top: 0;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.fancybox-toolbar {
-    right: 0;
-    top: 0;
-}
-
-.fancybox-stage {
-    direction: ltr;
-    overflow: visible;
-    transform: translateZ(0);
-    z-index: 99994;
-}
-
-.fancybox-is-open .fancybox-stage {
-    overflow: hidden;
-}
-
-.fancybox-slide {
-    -webkit-backface-visibility: hidden;
-    /* Using without prefix would break IE11 */
-    display: none;
-    height: 100%;
-    left: 0;
-    outline: none;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-    padding: 44px;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    transition-property: transform, opacity;
-    white-space: normal;
-    width: 100%;
-    z-index: 99994;
-}
-
-.fancybox-slide::before {
-    content: '';
-    display: inline-block;
-    font-size: 0;
-    height: 100%;
-    vertical-align: middle;
-    width: 0;
-}
-
-.fancybox-is-sliding .fancybox-slide,
-.fancybox-slide--previous,
-.fancybox-slide--current,
-.fancybox-slide--next {
-    display: block;
-}
-
-.fancybox-slide--image {
-    overflow: hidden;
-    padding: 44px 0;
-}
-
-.fancybox-slide--image::before {
-    display: none;
-}
-
-.fancybox-slide--html {
-    padding: 6px;
-}
-
-.fancybox-content {
-    background: #fff;
-    display: inline-block;
-    margin: 0;
-    max-width: 100%;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-    padding: 44px;
-    position: relative;
-    text-align: left;
-    vertical-align: middle;
-}
-
-.fancybox-slide--image .fancybox-content {
-    animation-timing-function: cubic-bezier(.5, 0, .14, 1);
-    -webkit-backface-visibility: hidden;
-    background: transparent;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    left: 0;
-    max-width: none;
-    overflow: visible;
-    padding: 0;
-    position: absolute;
-    top: 0;
-    -ms-transform-origin: top left;
-    transform-origin: top left;
-    transition-property: transform, opacity;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    z-index: 99995;
-}
-
-.fancybox-can-zoomOut .fancybox-content {
-    cursor: zoom-out;
-}
-
-.fancybox-can-zoomIn .fancybox-content {
-    cursor: zoom-in;
-}
-
-.fancybox-can-swipe .fancybox-content,
-.fancybox-can-pan .fancybox-content {
-    cursor: -webkit-grab;
-    cursor: grab;
-}
-
-.fancybox-is-grabbing .fancybox-content {
-    cursor: -webkit-grabbing;
-    cursor: grabbing;
-}
-
-.fancybox-container [data-selectable='true'] {
-    cursor: text;
-}
-
-.fancybox-image,
-.fancybox-spaceball {
-    background: transparent;
-    border: 0;
-    height: 100%;
-    left: 0;
-    margin: 0;
-    max-height: none;
-    max-width: none;
-    padding: 0;
-    position: absolute;
-    top: 0;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    width: 100%;
-}
-
-.fancybox-spaceball {
-    z-index: 1;
-}
-
-.fancybox-slide--video .fancybox-content,
-.fancybox-slide--map .fancybox-content,
-.fancybox-slide--pdf .fancybox-content,
-.fancybox-slide--iframe .fancybox-content {
-    height: 100%;
-    overflow: visible;
-    padding: 0;
-    width: 100%;
-}
-
-.fancybox-slide--video .fancybox-content {
-    background: #000;
-}
-
-.fancybox-slide--map .fancybox-content {
-    background: #e5e3df;
-}
-
-.fancybox-slide--iframe .fancybox-content {
-    background: #fff;
-}
-
-.fancybox-video,
-.fancybox-iframe {
-    background: transparent;
-    border: 0;
-    display: block;
-    height: 100%;
-    margin: 0;
-    overflow: hidden;
-    padding: 0;
-    width: 100%;
-}
-
-/* Fix iOS */
-.fancybox-iframe {
-    left: 0;
-    position: absolute;
-    top: 0;
-}
-
-.fancybox-error {
-    background: #fff;
-    cursor: default;
-    max-width: 400px;
-    padding: 40px;
-    width: 100%;
-}
-
-.fancybox-error p {
-    color: #444;
-    font-size: 16px;
-    line-height: 20px;
-    margin: 0;
-    padding: 0;
-}
-
-/* Buttons */
-
-.fancybox-button {
-    background: rgba(30, 30, 30, .6);
-    border: 0;
-    border-radius: 0;
-    box-shadow: none;
-    cursor: pointer;
-    display: inline-block;
-    height: 44px;
-    margin: 0;
-    padding: 10px;
-    position: relative;
-    transition: color .2s;
-    vertical-align: top;
-    visibility: inherit;
-    width: 44px;
-}
-
-.fancybox-button,
-.fancybox-button:visited,
-.fancybox-button:link {
-    color: #ccc;
-}
-
-.fancybox-button:hover {
-    color: #fff;
-}
-
-.fancybox-button:focus {
-    outline: none;
-}
-
-.fancybox-button.fancybox-focus {
-    outline: 1px dotted;
-}
-
-.fancybox-button[disabled],
-.fancybox-button[disabled]:hover {
-    color: #888;
-    cursor: default;
-    outline: none;
-}
-
-/* Fix IE11 */
-.fancybox-button div {
-    height: 100%;
-}
-
-.fancybox-button svg {
-    display: block;
-    height: 100%;
-    overflow: visible;
-    position: relative;
-    width: 100%;
-}
-
-.fancybox-button svg path {
-    fill: currentColor;
-    stroke-width: 0;
-}
-
-.fancybox-button--play svg:nth-child(2),
-.fancybox-button--fsenter svg:nth-child(2) {
-    display: none;
-}
-
-.fancybox-button--pause svg:nth-child(1),
-.fancybox-button--fsexit svg:nth-child(1) {
-    display: none;
-}
-
-.fancybox-progress {
-    background: #ff5268;
-    height: 2px;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    -ms-transform: scaleX(0);
-    transform: scaleX(0);
-    -ms-transform-origin: 0;
-    transform-origin: 0;
-    transition-property: transform;
-    transition-timing-function: linear;
-    z-index: 99998;
-}
-
-/* Close button on the top right corner of html content */
-
-.fancybox-close-small {
-    background: transparent;
-    border: 0;
-    border-radius: 0;
-    color: #ccc;
-    cursor: pointer;
-    opacity: .8;
-    padding: 8px;
-    position: absolute;
-    right: -12px;
-    top: -44px;
-    z-index: 401;
-}
-
-.fancybox-close-small:hover {
-    color: #fff;
-    opacity: 1;
-}
-
-.fancybox-slide--html .fancybox-close-small {
-    color: currentColor;
-    padding: 10px;
-    right: 0;
-    top: 0;
-}
-
-.fancybox-slide--image.fancybox-is-scaling .fancybox-content {
-    overflow: hidden;
-}
-
-.fancybox-is-scaling .fancybox-close-small,
-.fancybox-is-zoomable.fancybox-can-pan .fancybox-close-small {
-    display: none;
-}
-
-/* Navigation arrows */
-
-.fancybox-navigation .fancybox-button {
-    background-clip: content-box;
-    height: 100px;
-    opacity: 0;
-    position: absolute;
-    top: calc(50% - 50px);
-    width: 70px;
-}
-
-.fancybox-navigation .fancybox-button div {
-    padding: 7px;
-}
-
-.fancybox-navigation .fancybox-button--arrow_left {
-    left: 0;
-    left: env(safe-area-inset-left);
-    padding: 31px 26px 31px 6px;
-}
-
-.fancybox-navigation .fancybox-button--arrow_right {
-    padding: 31px 6px 31px 26px;
-    right: 0;
-    right: env(safe-area-inset-right);
-}
-
-/* Caption */
-
-.fancybox-caption {
-    background: linear-gradient(to top,
-        rgba(0, 0, 0, .85) 0%,
-        rgba(0, 0, 0, .3) 50%,
-        rgba(0, 0, 0, .15) 65%,
-        rgba(0, 0, 0, .075) 75.5%,
-        rgba(0, 0, 0, .037) 82.85%,
-        rgba(0, 0, 0, .019) 88%,
-        rgba(0, 0, 0, 0) 100%);
-    bottom: 0;
-    color: #eee;
-    font-size: 14px;
-    font-weight: 400;
-    left: 0;
-    line-height: 1.5;
-    padding: 75px 44px 25px 44px;
-    pointer-events: none;
-    right: 0;
-    text-align: center;
-    z-index: 99996;
-}
-
-@supports (padding: max(0px)) {
-    .fancybox-caption {
-        padding: 75px max(44px, env(safe-area-inset-right)) max(25px, env(safe-area-inset-bottom)) max(44px, env(safe-area-inset-left));
-    }
-}
-
-.fancybox-caption--separate {
-    margin-top: -50px;
-}
-
-.fancybox-caption__body {
-    max-height: 50vh;
-    overflow: auto;
-    pointer-events: all;
-}
-
-.fancybox-caption a,
-.fancybox-caption a:link,
-.fancybox-caption a:visited {
-    color: #ccc;
-    text-decoration: none;
-}
-
-.fancybox-caption a:hover {
-    color: #fff;
-    text-decoration: underline;
-}
-
-/* Loading indicator */
-
-.fancybox-loading {
-    animation: fancybox-rotate 1s linear infinite;
-    background: transparent;
-    border: 4px solid #888;
-    border-bottom-color: #fff;
-    border-radius: 50%;
-    height: 50px;
-    left: 50%;
-    margin: -25px 0 0 -25px;
-    opacity: .7;
-    padding: 0;
-    position: absolute;
-    top: 50%;
-    width: 50px;
-    z-index: 99999;
-}
-
-@keyframes fancybox-rotate {
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-/* Transition effects */
-
-.fancybox-animated {
-    transition-timing-function: cubic-bezier(0, 0, .25, 1);
-}
-
-/* transitionEffect: slide */
-
-.fancybox-fx-slide.fancybox-slide--previous {
-    opacity: 0;
-    transform: translate3d(-100%, 0, 0);
-}
-
-.fancybox-fx-slide.fancybox-slide--next {
-    opacity: 0;
-    transform: translate3d(100%, 0, 0);
-}
-
-.fancybox-fx-slide.fancybox-slide--current {
-    opacity: 1;
-    transform: translate3d(0, 0, 0);
-}
-
-/* transitionEffect: fade */
-
-.fancybox-fx-fade.fancybox-slide--previous,
-.fancybox-fx-fade.fancybox-slide--next {
-    opacity: 0;
-    transition-timing-function: cubic-bezier(.19, 1, .22, 1);
-}
-
-.fancybox-fx-fade.fancybox-slide--current {
-    opacity: 1;
-}
-
-/* transitionEffect: zoom-in-out */
-
-.fancybox-fx-zoom-in-out.fancybox-slide--previous {
-    opacity: 0;
-    transform: scale3d(1.5, 1.5, 1.5);
-}
-
-.fancybox-fx-zoom-in-out.fancybox-slide--next {
-    opacity: 0;
-    transform: scale3d(.5, .5, .5);
-}
-
-.fancybox-fx-zoom-in-out.fancybox-slide--current {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-}
-
-/* transitionEffect: rotate */
-
-.fancybox-fx-rotate.fancybox-slide--previous {
-    opacity: 0;
-    -ms-transform: rotate(-360deg);
-    transform: rotate(-360deg);
-}
-
-.fancybox-fx-rotate.fancybox-slide--next {
-    opacity: 0;
-    -ms-transform: rotate(360deg);
-    transform: rotate(360deg);
-}
-
-.fancybox-fx-rotate.fancybox-slide--current {
-    opacity: 1;
-    -ms-transform: rotate(0deg);
-    transform: rotate(0deg);
-}
-
-/* transitionEffect: circular */
-
-.fancybox-fx-circular.fancybox-slide--previous {
-    opacity: 0;
-    transform: scale3d(0, 0, 0) translate3d(-100%, 0, 0);
-}
-
-.fancybox-fx-circular.fancybox-slide--next {
-    opacity: 0;
-    transform: scale3d(0, 0, 0) translate3d(100%, 0, 0);
-}
-
-.fancybox-fx-circular.fancybox-slide--current {
-    opacity: 1;
-    transform: scale3d(1, 1, 1) translate3d(0, 0, 0);
-}
-
-/* transitionEffect: tube */
-
-.fancybox-fx-tube.fancybox-slide--previous {
-    transform: translate3d(-100%, 0, 0) scale(.1) skew(-10deg);
-}
-
-.fancybox-fx-tube.fancybox-slide--next {
-    transform: translate3d(100%, 0, 0) scale(.1) skew(10deg);
-}
-
-.fancybox-fx-tube.fancybox-slide--current {
-    transform: translate3d(0, 0, 0) scale(1);
-}
-
-/* Styling for Small-Screen Devices */
-@media all and (max-height: 576px) {
-    .fancybox-slide {
-        padding-left: 6px;
-        padding-right: 6px;
-    }
-
-    .fancybox-slide--image {
-        padding: 6px 0;
-    }
-
-    .fancybox-close-small {
-        right: -6px;
-    }
-
-    .fancybox-slide--image .fancybox-close-small {
-        background: #4e4e4e;
-        color: #f2f4f6;
-        height: 36px;
-        opacity: 1;
-        padding: 6px;
-        right: 0;
-        top: 0;
-        width: 36px;
-    }
-
-    .fancybox-caption {
-        padding-left: 12px;
-        padding-right: 12px;
-    }
-
-    @supports (padding: max(0px)) {
-        .fancybox-caption {
-            padding-left: max(12px, env(safe-area-inset-left));
-            padding-right: max(12px, env(safe-area-inset-right));
-        }
-    }
-}
-/* Share */
-
-.fancybox-share {
-    background: #f4f4f4;
-    border-radius: 3px;
-    max-width: 90%;
-    padding: 30px;
-    text-align: center;
-}
-
-.fancybox-share h1 {
-    color: #222;
-    font-size: 35px;
-    font-weight: 700;
-    margin: 0 0 20px 0;
-}
-
-.fancybox-share p {
-    margin: 0;
-    padding: 0;
-}
-
-.fancybox-share__button {
-    border: 0;
-    border-radius: 3px;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: 700;
-    line-height: 40px;
-    margin: 0 5px 10px 5px;
-    min-width: 130px;
-    padding: 0 15px;
-    text-decoration: none;
-    transition: all .2s;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    white-space: nowrap;
-}
-
-.fancybox-share__button:visited,
-.fancybox-share__button:link {
-    color: #fff;
-}
-
-.fancybox-share__button:hover {
-    text-decoration: none;
-}
-
-.fancybox-share__button--fb {
-    background: #3b5998;
-}
-
-.fancybox-share__button--fb:hover {
-    background: #344e86;
-}
-
-.fancybox-share__button--pt {
-    background: #bd081d;
-}
-
-.fancybox-share__button--pt:hover {
-    background: #aa0719;
-}
-
-.fancybox-share__button--tw {
-    background: #1da1f2;
-}
-
-.fancybox-share__button--tw:hover {
-    background: #0d95e8;
-}
-
-.fancybox-share__button svg {
-    height: 25px;
-    margin-right: 7px;
-    position: relative;
-    top: -1px;
-    vertical-align: middle;
-    width: 25px;
-}
-
-.fancybox-share__button svg path {
-    fill: #fff;
-}
-
-.fancybox-share__input {
-    background: transparent;
-    border: 0;
-    border-bottom: 1px solid #d7d7d7;
-    border-radius: 0;
-    color: #5d5b5b;
-    font-size: 14px;
-    margin: 10px 0 0 0;
-    outline: none;
-    padding: 10px 15px;
-    width: 100%;
-}
-/* Thumbs */
-
-.fancybox-thumbs {
-    background: #ddd;
-    bottom: 0;
-    display: none;
-    margin: 0;
-    -webkit-overflow-scrolling: touch;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-    padding: 2px 2px 4px 2px;
-    position: absolute;
-    right: 0;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    top: 0;
-    width: 212px;
-    z-index: 99995;
-}
-
-.fancybox-thumbs-x {
-    overflow-x: auto;
-    overflow-y: hidden;
-}
-
-.fancybox-show-thumbs .fancybox-thumbs {
-    display: block;
-}
-
-.fancybox-show-thumbs .fancybox-inner {
-    right: 212px;
-}
-
-.fancybox-thumbs__list {
-    font-size: 0;
-    height: 100%;
-    list-style: none;
-    margin: 0;
-    overflow-x: hidden;
-    overflow-y: auto;
-    padding: 0;
-    position: absolute;
-    position: relative;
-    white-space: nowrap;
-    width: 100%;
-}
-
-.fancybox-thumbs-x .fancybox-thumbs__list {
-    overflow: hidden;
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar {
-    width: 7px;
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-track {
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-thumb {
-    background: #2a2a2a;
-    border-radius: 10px;
-}
-
-.fancybox-thumbs__list a {
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    background-color: rgba(0, 0, 0, .1);
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    cursor: pointer;
-    float: left;
-    height: 75px;
-    margin: 2px;
-    max-height: calc(100% - 8px);
-    max-width: calc(50% - 4px);
-    outline: none;
-    overflow: hidden;
-    padding: 0;
-    position: relative;
-    -webkit-tap-highlight-color: transparent;
-    width: 100px;
-}
-
-.fancybox-thumbs__list a::before {
-    border: 6px solid #ff5268;
-    bottom: 0;
-    content: '';
-    left: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    transition: all .2s cubic-bezier(.25, .46, .45, .94);
-    z-index: 99991;
-}
-
-.fancybox-thumbs__list a:focus::before {
-    opacity: .5;
-}
-
-.fancybox-thumbs__list a.fancybox-thumbs-active::before {
-    opacity: 1;
-}
-
-/* Styling for Small-Screen Devices */
-@media all and (max-width: 576px) {
-    .fancybox-thumbs {
-        width: 110px;
-    }
-
-    .fancybox-show-thumbs .fancybox-inner {
-        right: 110px;
-    }
-
-    .fancybox-thumbs__list a {
-        max-width: calc(100% - 10px);
-    }
-}

fancybox/createrelease

@@ -1,15 +0,0 @@
-MODULE=fancybox
-
-cd ..
-
-# old releases not needed anymore
-mkdir -p $MODULE/dist
-rm $MODULE/dist/*
-
-# create release for actual version
-zip -r9 $MODULE/dist/release.zip $MODULE/* -x $MODULE/dist/\* -x $MODULE/test/\* $MODULE/createrelease
-
-echo dist/release.zip created.
-
-cd $MODULE
-

fancybox/fancybox.php

@@ -1,60 +0,0 @@
-<?php
-/**
- * Name: Fancybox
- * Description: Open media attachments of posts into a fancybox overlay.
- * Version: 1.05
- * Author: Grischa Brockhaus <grischa@brockha.us>
- * Status: Unsupported
- */
-
-use Friendica\Core\Hook;
-use Friendica\DI;
-
-function fancybox_install()
-{
-	Hook::register('head', __FILE__, 'fancybox_head');
-	Hook::register('footer', __FILE__, 'fancybox_footer');
-	Hook::register('prepare_body_final', __FILE__, 'fancybox_render');
-}
-
-function fancybox_head(string &$b)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/asset/fancybox/jquery.fancybox.min.css');
-}
-
-function fancybox_footer(string &$str)
-{
-	DI::page()->registerFooterScript(__DIR__ . '/asset/fancybox/jquery.fancybox.min.js');
-	DI::page()->registerFooterScript(__DIR__ . '/asset/fancybox/fancybox.config.js');
-}
-
-function fancybox_render(array &$b){
-	$gallery = 'gallery-' . $b['item']['uri-id'] ?? random_int(1000000, 10000000);
-
-	// performWithEscapedBlocks escapes block defined with 2nd par pattern that won't be processed.
-	// We don't want to touch images in class="type-link":
-	$b['html'] = \Friendica\Util\Strings::performWithEscapedBlocks(
-		$b['html'],
-		'#<div class="type-link">.*?</div>#s',
-		function ($text) use ($gallery) {
-			// This processes images inlined in posts
-			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-			//if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
-			$text = preg_replace(
-				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
-				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
-				$text);
-
-			// Local content images attached:
-			$text = preg_replace_callback(
-				'#<div class="(body-attach|imagegrid-column)">.*?</div>#s',
-				function ($matches) use ($gallery) {
-					return str_replace('<a href', '<a data-fancybox="' . $gallery . '" href', $matches[0]);
-				},
-				$text
-			);
-
-			return $text;
-		}
-	);
-}

fromapp/fromapp.php

@@ -7,7 +7,9 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -16,7 +18,7 @@ function fromapp_install()
 	Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	DI::logger()->notice("installed fromapp");
+	Logger::notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)
@@ -74,6 +76,6 @@ function fromapp_post_hook(&$item)
 
 	$apps = explode(',', $app);
 	$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-
+	
 	return;
 }

geocoordinates/geocoordinates.php

@@ -6,7 +6,9 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -50,25 +52,25 @@ function geocoordinates_resolve_item(array &$item)
 	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
 
 	if (!$s) {
-		DI::logger()->info('API could not be queried');
+		Logger::info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != '200') {
-		DI::logger()->info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		DI::logger()->info('No results found for coordinates ' . $item['coord']);
+		Logger::info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
 	$item['location'] = $data->results[0]->formatted;
 
-	DI::logger()->info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
 
 	if ($item['location'] != '') {
 		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);

geonames/geonames.php

@@ -6,7 +6,9 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -33,7 +35,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)
@@ -44,7 +46,7 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	 DI::logger()->notice('geonames invoked');
+	Logger::notice('geonames invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
 		return;

gnot/gnot.php

@@ -4,11 +4,13 @@
  * Description: Thread email comment notifications on Gmail and anonymise them
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- *
+ * 
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -19,7 +21,7 @@ function gnot_install()
 	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	DI::logger()->notice("installed gnot");
+	Logger::notice("installed gnot");
 }
 
 /**
@@ -36,7 +38,7 @@ function gnot_settings_post($post) {
 }
 
 /**
- * Called from the Addon Setting form.
+ * Called from the Addon Setting form. 
  * Add our own settings info to the page.
  */
 function gnot_settings(array &$data)

googlemaps/googlemaps.php

@@ -7,14 +7,15 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\Logger;
 
 function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	DI::logger()->notice('installed googlemaps');
+	Logger::notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)

gravatar/gravatar.php

@@ -6,11 +6,15 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -19,12 +23,12 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	DI::logger()->notice("registered gravatar in avatar_lookup hook");
+	Logger::notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

group_text/group_text.php

@@ -8,7 +8,9 @@
  * Note: Please use Circle Text instead
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

highlightjs/highlightjs.php

@@ -6,6 +6,7 @@
  * Author: Hypolite Petovan <hypolite@mrpetovan.com>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -17,7 +18,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-	if (DI::appHelper()->getCurrentTheme() == 'frio') {
+	if (DI::app()->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';

ifttt/ifttt.php

@@ -6,8 +6,10 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+use Friendica\App;
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -85,16 +87,16 @@ function ifttt_post()
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		DI::logger()->info('User ' . $nickname . ' not found.');
+		Logger::info('User ' . $nickname . ' not found.');
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	DI::logger()->info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
 
 	if (!isset($_REQUEST['key'])) {
-		DI::logger()->notice('No key found.');
+		Logger::notice('No key found.');
 		return;
 	}
 
@@ -102,7 +104,7 @@ function ifttt_post()
 
 	// Check the key
 	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		DI::logger()->info('Invalid key for user ' . $uid);
+		Logger::info('Invalid key for user ' . $uid);
 		return;
 	}
 
@@ -113,7 +115,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		DI::logger()->info('Unknown item type ' . $item['type']);
+		Logger::info('Unknown item type ' . $item['type']);
 		return;
 	}
 

ijpost/ijpost.php

@@ -8,8 +8,10 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -177,11 +179,11 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		DI::logger()->debug('ijpost: data: ' . $xml);
+		Logger::debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
 			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
-		DI::logger()->info('posted to insanejournal: ' . $x ? $x : '');
+		Logger::info('posted to insanejournal: ' . $x ? $x : '');
 	}
 }

impressum/impressum.php

@@ -7,8 +7,10 @@
  * License: 3-clause BSD license
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -19,7 +21,7 @@ function impressum_install()
 	Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
 	Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
 	Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-	DI::logger()->notice("installed impressum Addon");
+	Logger::notice("installed impressum Addon");
 }
 
 /**
@@ -54,7 +56,7 @@ function impressum_footer(string &$body)
 
 function impressum_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(string &$body)

infiniteimprobabilitydrive/infiniteimprobabilitydrive.php

@@ -6,6 +6,7 @@
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

invidious/invidious.php

@@ -54,8 +54,8 @@ function invidious_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/invidious/');
 	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['invidious-enabled', DI::l10n()->t('Replace Youtube links with links to an Invidious server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Invidious server.')],
-		'$server'  => ['invidious-server', DI::l10n()->t('Invidious server'), $server, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
+		'$enabled' => ['enabled', DI::l10n()->t('Replace Youtube links with links to an Invidious server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Invidious server.')],
+		'$server'  => ['server', DI::l10n()->t('Invidious server'), $server, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
 	]);
 
 	$data = [
@@ -71,9 +71,9 @@ function invidious_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['invidious-enabled']);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['enabled']);
 
-	$server = trim($_POST['invidious-server'], " \n\r\t\v\x00/");
+	$server = trim($_POST['server'], " \n\r\t\v\x00/");
 	if ($server != DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT) && !empty($server)) {
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'server', $server);
 	} else {

irc/irc.php

@@ -7,6 +7,7 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

js_upload/file-uploader/server/php.php

@@ -77,10 +77,10 @@ class qqFileUploader {
 	public function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
 	{
 		$allowedExtensions = array_map('strtolower', $allowedExtensions);
-
+			
 		$this->allowedExtensions = $allowedExtensions;
 		$this->sizeLimit = $sizeLimit;
-
+		
 		$this->checkServerSettings();
 
 		if (isset($_GET['qqfile'])) {
@@ -88,7 +88,7 @@ class qqFileUploader {
 		} elseif (isset($_FILES['qqfile'])) {
 			$this->file = new qqUploadedFileForm();
 		} else {
-			$this->file = false;
+			$this->file = false; 
 		}
 	}
 
@@ -105,7 +105,7 @@ class qqFileUploader {
 
 	private function toBytes(string $str): int
 	{
-		$val = (int) trim($str);
+		$val = trim($str);
 		$last = strtolower($str[strlen($str) - 1]);
 
 		switch($last) {

js_upload/file-uploader/tests/action-acceptance.php

@@ -2,12 +2,12 @@
 
 usleep(100000);
 
-$fileName = '';
-$fileSize = 0;;
+$fileName;
+$fileSize;
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-
+    
 	// xhr request
 	$headers = apache_request_headers();
 	$fileSize = (int)$headers['Content-Length'];
@@ -34,13 +34,13 @@ if ($fileSize > 9 * 1024){
     die ('{error: "server-error file size is bigger than 9kB"}');
 }
 
-if (count($_GET)){
+if (count($_GET)){	
     array_merge($_GET, array('fileName'=>$fileName));
-
+    
     $response = array_merge($_GET, array('success'=>true, 'fileName'=>$fileName));
-
-    // to pass data through iframe you will need to encode all html tags
-	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);
+    
+    // to pass data through iframe you will need to encode all html tags		
+	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);	
 } else {
 	die ('{error: "server-error  query params not passed"}');
 }

js_upload/file-uploader/tests/action-handler-queue-test.php

@@ -2,11 +2,11 @@
 
 sleep(4);
 
-$fileName = '';
+$fileName;
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-
+    
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-
+    
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
     $_GET['success'] = true;
-	echo json_encode(array_merge($_GET));
+	echo json_encode(array_merge($_GET));	
 } else {
 	die ('{error: "query params not passed"}');
 }

js_upload/file-uploader/tests/action-handler-test.php

@@ -2,11 +2,11 @@
 
 usleep(300);
 
-$fileName = '';
+$fileName;
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-
+    
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-
+    
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
 	//return query params
-	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));
+	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));	
 } else {
 	die ('{error: "query params not passed"}');
 }

js_upload/js_upload.php

@@ -8,6 +8,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Images;
@@ -59,7 +60,7 @@ function js_upload_post_init(array &$b)
 	// max file size in bytes
 	$sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-	$uploader = new js_upload_qqFileUploader($allowedExtensions, $sizeLimit);
+	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
 	$result = $uploader->handleUpload();
 
@@ -67,7 +68,7 @@ function js_upload_post_init(array &$b)
 	$js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if (isset($result['error'])) {
-		DI::logger()->info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
+		Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
 		echo json_encode($result);
 		exit();
 	}
@@ -90,7 +91,7 @@ function js_upload_post_end(int &$b)
 {
 	global $js_upload_jsonresponse;
 
-	DI::logger()->notice('upload_post_end');
+	Logger::notice('upload_post_end');
 	if (!empty($js_upload_jsonresponse)) {
 		echo $js_upload_jsonresponse;
 		exit();
@@ -100,7 +101,7 @@ function js_upload_post_end(int &$b)
 /**
  * Handle file uploads via XMLHttpRequest
  */
-class js_upload_qqUploadedFileXhr
+class qqUploadedFileXhr
 {
 	private $pathnm = '';
 
@@ -154,7 +155,7 @@ class js_upload_qqUploadedFileXhr
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
-class js_upload_qqUploadedFileForm
+class qqUploadedFileForm
 {
 	/**
 	 * Save the file to the specified path
@@ -182,14 +183,10 @@ class js_upload_qqUploadedFileForm
 	}
 }
 
-class js_upload_qqFileUploader
+class qqFileUploader
 {
 	private $allowedExtensions;
 	private $sizeLimit;
-
-	/**
-	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm|false
-	 */
 	private $file;
 
 	function __construct(array $allowedExtensions = [], $sizeLimit)
@@ -200,9 +197,9 @@ class js_upload_qqFileUploader
 		$this->sizeLimit = $sizeLimit;
 
 		if (isset($_GET['qqfile'])) {
-			$this->file = new js_upload_qqUploadedFileXhr();
+			$this->file = new qqUploadedFileXhr();
 		} elseif (isset($_FILES['qqfile'])) {
-			$this->file = new js_upload_qqUploadedFileForm();
+			$this->file = new qqUploadedFileForm();
 		} else {
 			$this->file = false;
 		}
@@ -237,7 +234,7 @@ class js_upload_qqFileUploader
 		$filename = $pathinfo['filename'];
 
 		if (!isset($pathinfo['extension'])) {
-			DI::logger()->warning('extension isn\'t set.', ['filename' => $filename]);
+			Logger::warning('extension isn\'t set.', ['filename' => $filename]);
 		}
 		$ext = $pathinfo['extension'] ?? '';
 

keycloakpassword/keycloakpassword.php

@@ -6,7 +6,9 @@
  * Author: Ryan <https://verya.pe/profile/ryan>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -36,7 +38,7 @@ function keycloakpassword_request($client_id, $secret, $url, $params = [])
 	$res = curl_exec($ch);
 
 	if (curl_errno($ch)) {
-		DI::logger()->error(curl_error($ch));
+		Logger::error(curl_error($ch));
 	}
 	curl_close($ch);
 
@@ -90,7 +92,7 @@ function keycloakpassword_authenticate(array &$b)
 			$client_id,
 			$secret,
 			$endpoint . '/logout',
-			[ 'refresh_token' => $res['refresh_token'] ]
+			[ 'refresh_token' => res['refresh_token'] ]
 		);
 	}
 }

krynn/krynn.php

@@ -10,7 +10,9 @@
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -30,7 +32,7 @@ function krynn_install()
 	Hook::register('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
 	Hook::register('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
-	DI::logger()->notice("installed krynn");
+	Logger::notice("installed krynn");
 }
 
 function krynn_post_hook(&$item)

langfilter/langfilter.php

@@ -7,6 +7,7 @@
  * License: MIT
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
@@ -99,8 +100,8 @@ function langfilter_addon_settings_post(array &$b)
 
 function langfilter_prepare_body_content_filter(&$hook_data)
 {
-	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
-	if (!$uid) {
+	$logged_user = DI::userSession()->getLocalUserId();
+	if (!$logged_user) {
 		return;
 	}
 
@@ -112,8 +113,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	}
 
 	// Don't filter if language filter is disabled
-	if (!DI::pConfig()->get($uid, 'langfilter', 'enable',
-		!DI::pConfig()->get($uid, 'langfilter', 'disable'))
+	if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable',
+		!DI::pConfig()->get($logged_user, 'langfilter', 'disable'))
 	) {
 		return;
 	}
@@ -127,7 +128,7 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	$naked_body = preg_replace('#\s+#', ' ', trim($naked_body));
 
 	// Don't filter if body lenght is below minimum
-	$minlen = DI::pConfig()->get($uid, 'langfilter', 'minlength', 32);
+	$minlen = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
 	if (!$minlen) {
 		$minlen = 32;
 	}
@@ -136,8 +137,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 		return;
 	}
 
-	$read_languages_string = DI::pConfig()->get($uid, 'langfilter', 'languages');
-	$minconfidence = DI::pConfig()->get($uid, 'langfilter', 'minconfidence');
+	$read_languages_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
+	$minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence');
 
 	// Don't filter if no spoken languages are configured
 	if (!$read_languages_string) {
@@ -147,8 +148,6 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 
 	$iso639 = new Matriphe\ISO639\ISO639;
 
-	$confidence = null;
-
 	// Extract the language of the post
 	if (!empty($hook_data['item']['language'])) {
 		$languages = json_decode($hook_data['item']['language'], true);

ldapauth/ldapauth.php

@@ -29,7 +29,9 @@
  * The configuration options for this module are described in the config/ldapauth.config.php file
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -43,7 +45,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(array &$b)
@@ -68,54 +70,54 @@ function ldapauth_authenticate($username, $password)
 	$ldap_autocreateaccount_nameattribute  = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
 	if (!extension_loaded('ldap') || !strlen($ldap_server)) {
-		DI::logger()->error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
+		Logger::error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
 		return false;
 	}
 
 	if (!strlen($password)) {
-		DI::logger()->error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
+		Logger::error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
 		return false;
 	}
 
 	$connect = @ldap_connect($ldap_server);
 	if ($connect === false) {
-		DI::logger()->warning('Could not connect to LDAP server', ['server' => $ldap_server]);
+		Logger::warning('Could not connect to LDAP server', ['server' => $ldap_server]);
 		return false;
 	}
 
 	@ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($connect, LDAP_OPT_REFERRALS, 0);
 	if ((@ldap_bind($connect, $ldap_binddn, $ldap_bindpw)) === false) {
-		DI::logger()->warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$res = @ldap_search($connect, $ldap_searchdn, $ldap_userattr . '=' . $username);
 	if (!$res) {
-		DI::logger()->notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$id = @ldap_first_entry($connect, $res);
 	if (!$id) {
-		DI::logger()->notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$dn = @ldap_get_dn($connect, $id);
 	if (!@ldap_bind($connect, $dn, $password)) {
-		DI::logger()->notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	if (strlen($ldap_group) && @ldap_compare($connect, $ldap_group, 'member', $dn) !== true) {
 		$errno = @ldap_errno($connect);
 		if ($errno === 32) {
-			DI::logger()->notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			Logger::notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} elseif ($errno === 16) {
-			DI::logger()->notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			Logger::notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} else {
-			DI::logger()->notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
+			Logger::notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
 		}
 
 		@ldap_close($connect);
@@ -139,7 +141,7 @@ function ldapauth_authenticate($username, $password)
 		$authentication = User::getAuthenticationInfo($username);
 		return User::getById($authentication['uid']);
 	} catch (Exception $e) {
-		DI::logger()->notice('LDAP authentication error: ' . $e->getMessage());
+		Logger::notice('LDAP authentication error: ' . $e->getMessage());
 		return false;
 	}
 }
@@ -147,7 +149,7 @@ function ldapauth_authenticate($username, $password)
 function ldap_createaccount($username, $password, $email, $name)
 {
 	if (!strlen($email) || !strlen($name)) {
-		DI::logger()->notice('Could not create local user from LDAP data, no email or nickname provided');
+		Logger::notice('Could not create local user from LDAP data, no email or nickname provided');
 		return false;
 	}
 
@@ -159,10 +161,10 @@ function ldap_createaccount($username, $password, $email, $name)
 			'password' => $password,
 			'verified' => 1
 		]);
-		DI::logger()->info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
+		Logger::info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
 		return $user;
 	} catch (Exception $ex) {
-		DI::logger()->error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
+		Logger::error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
 	}
 
 	return false;

leistungsschutzrecht/leistungsschutzrecht.php

@@ -6,7 +6,9 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\DI;
 
 function leistungsschutzrecht_install()
@@ -147,7 +149,7 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 	$cleanedurlpart = explode('%', $urldata['host']);
 
 	$hostname = explode('.', $cleanedurlpart[0]);
-	if ($hostname === false || $hostname === '') {
+	if (empty($hostname)) {
 		return false;
 	}
 
@@ -167,7 +169,7 @@ function leistungsschutzrecht_cron($b)
 	if ($last) {
 		$next = $last + 86400;
 		if ($next > time()) {
-			DI::logger()->notice('poll intervall not reached');
+			Logger::notice('poll intervall not reached');
 			return;
 		}
 	}

libertree/libertree.php

@@ -6,8 +6,10 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -129,7 +131,7 @@ function libertree_post_local(array &$b)
 
 function libertree_send(array &$b)
 {
-	DI::logger()->notice('libertree_send: invoked');
+	Logger::notice('libertree_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -195,6 +197,6 @@ function libertree_send(array &$b)
 		];
 
 		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
-		DI::logger()->notice('libertree: ' . $result);
+		Logger::notice('libertree: ' . $result);
 	}
 }

libravatar/Services/Libravatar.php

@@ -217,7 +217,7 @@ class Services_Libravatar
      *
      * @param array $options Array of options for getUrl()
      *
-     * @return array
+     * @return void
      * @throws Exception When an invalid option is used
      */
     protected function checkOptionsArray($options)
@@ -361,7 +361,7 @@ class Services_Libravatar
     protected function domainGet($identifier)
     {
         if ($identifier === null) {
-            return '';
+            return null;
         }
 
         // What are we, email or openid? Split ourself up and get the
@@ -401,8 +401,9 @@ class Services_Libravatar
      */
     protected function srvGet($domain, $https = false)
     {
+
         // Are we going secure? Set up a fallback too.
-        if ($https === true) {
+        if (isset($https) && $https === true) {
             $subdomain = '_avatars-sec._tcp.';
             $fallback  = 'seccdn.';
         } else {
@@ -425,7 +426,6 @@ class Services_Libravatar
 
         $top = $srv[0];
         $sum = 0;
-        $pri = [];
 
         // Try to adhere to RFC2782's weighting algorithm, page 3
         // "arrange all SRV RRs (that have not been ordered yet) in any order,
@@ -462,8 +462,6 @@ class Services_Libravatar
                 return $v['target'];
             }
         }
-
-        return '';
     }
 
     /**

libravatar/libravatar.php

@@ -6,7 +6,10 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
+use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -18,12 +21,12 @@ function libravatar_install()
 {
 	Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	DI::logger()->notice("registered libravatar in avatar_lookup hook");
+	Logger::notice("registered libravatar in avatar_lookup hook");
 }
 
 function libravatar_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
@@ -70,9 +73,7 @@ function libravatar_addon_admin(string &$o)
 		'pagan' => DI::l10n()->t('retro adventure game character'),
 	];
 
-	$addonHelper = DI::addonHelper();
-
-	if ($addonHelper->isAddonEnabled('gravatar')) {
+	if (Addon::isEnabled('gravatar')) {
 		$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 

ljpost/ljpost.php

@@ -8,8 +8,10 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -199,14 +201,12 @@ function ljpost_send(array &$b)
 </methodCall>
 EOT;
 
-		DI::logger()->debug('ljpost: data: ' . $xml);
-
-		$x = '';
+		Logger::debug('ljpost: data: ' . $xml);
 
 		if ($lj_blog !== 'test') {
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		DI::logger()->info('posted to livejournal: ' . $x);
+		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
 	}
 }

mailstream/mailstream.php

@@ -8,6 +8,7 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -31,7 +32,7 @@ function mailstream_install()
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
-	DI::logger()->info("installed mailstream");
+	Logger::info("installed mailstream");
 }
 
 /**
@@ -85,7 +86,7 @@ function mailstream_generate_id(string $uri): string
 	$host = DI::baseUrl()->getHost();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	DI::logger()->debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
+	Logger::debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
 	return $message_id;
 }
 
@@ -94,20 +95,20 @@ function mailstream_send_hook(array $data)
 	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
 	$item = Post::selectFirst([], $criteria);
 	if (empty($item)) {
-		DI::logger()->error('could not find item');
+		Logger::error('could not find item');
 		return;
 	}
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-		DI::logger()->error('could not find user', ['uid' => $item['uid']]);
+		Logger::error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
 	if (!mailstream_send($data['message_id'], $item, $user)) {
-		DI::logger()->debug('send failed, will retry', $data);
+		Logger::debug('send failed, will retry', $data);
 		if (!Worker::defer()) {
-			DI::logger()->error('failed and could not defer', $data);
+			Logger::error('failed and could not defer', $data);
 		}
 	}
 }
@@ -123,32 +124,32 @@ function mailstream_send_hook(array $data)
 function mailstream_post_hook(array &$item)
 {
 	if ($item['uid'] === 0) {
-		DI::logger()->debug('mailstream: root user, skipping item ' . $item['id']);
+		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
 		return;
 	}
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		DI::logger()->debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
 	if (!$item['contact-id']) {
-		DI::logger()->debug('no contact-id', ['item' => $item['id']]);
+		Logger::debug('no contact-id', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['uri']) {
-		DI::logger()->debug('no uri', ['item' => $item['id']]);
+		Logger::debug('no uri', ['item' => $item['id']]);
 		return;
 	}
 	if ($item['verb'] == Activity::ANNOUNCE) {
-		DI::logger()->debug('ignoring announce', ['item' => $item['id']]);
+		Logger::debug('ignoring announce', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
-			DI::logger()->debug('ignoring like', ['item' => $item['id']]);
+			Logger::debug('ignoring like', ['item' => $item['id']]);
 			return;
 		}
 		if ($item['verb'] == Activity::DISLIKE) {
-			DI::logger()->debug('ignoring dislike', ['item' => $item['id']]);
+			Logger::debug('ignoring dislike', ['item' => $item['id']]);
 			return;
 		}
 	}
@@ -179,7 +180,7 @@ function mailstream_post_hook(array &$item)
 function mailstream_do_images(array &$item, array &$attachments)
 {
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
-		return $attachments;
+		return;
 	}
 
 	$attachments = [];
@@ -199,7 +200,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 		try {
 			$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 			if (!$curlResult->isSuccess()) {
-				DI::logger()->debug('mailstream: fetch image url failed', [
+				Logger::debug('mailstream: fetch image url failed', [
 					'url' => $url,
 					'item_id' => $item['id'],
 					'return_code' => $curlResult->getReturnCode()
@@ -207,7 +208,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 				continue;
 			}
 		} catch (InvalidArgumentException $e) {
-			DI::logger()->error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;
 		}
 		$attachments[$url] = [
@@ -308,7 +309,7 @@ function mailstream_subject(array $item): string
 	}
 	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
 	if (!DBA::isResult($contact)) {
-		DI::logger()->error('no contact', [
+		Logger::error('no contact', [
 			'item' => $item['id'],
 			'plink' => $item['plink'],
 			'contact id' => $item['contact-id'],
@@ -350,16 +351,16 @@ function mailstream_subject(array $item): string
 function mailstream_send(string $message_id, array $item, array $user): bool
 {
 	if (!is_array($item)) {
-		DI::logger()->error('item is empty', ['message_id' => $message_id]);
+		Logger::error('item is empty', ['message_id' => $message_id]);
 		return false;
 	}
 
 	if (!$item['visible']) {
-		DI::logger()->debug('item not yet visible', ['item uri' => $item['uri']]);
+		Logger::debug('item not yet visible', ['item uri' => $item['uri']]);
 		return false;
 	}
 	if (!$message_id) {
-		DI::logger()->error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
+		Logger::error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
 		return true;
 	}
 
@@ -377,7 +378,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 	if (!$address) {
 		$address = $user['email'];
 	}
-	$mail = new PHPMailer();
+	$mail = new PHPmailer();
 	try {
 		$mail->XMailer = 'Friendica Mailstream Addon';
 		$mail->SetFrom($frommail, mailstream_sender($item));
@@ -417,15 +418,15 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		DI::logger()->debug('sent message', [
+		Logger::debug('sent message', [
 			'message ID' => $mail->MessageID,
 			'subject' => $mail->Subject,
 			'address' => $address
 		]);
 	} catch (phpmailerException $e) {
-		DI::logger()->debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
+		Logger::debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
 	} catch (Exception $e) {
-		DI::logger()->debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
+		Logger::debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
 	}
 
 	return true;

mailstream/phpmailer/class.phpmailer.php

@@ -2690,10 +2690,10 @@ class PHPMailer
             if (!is_readable($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = false;
+            $magic_quotes = get_magic_quotes_runtime();
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    //set_magic_quotes_runtime(false);
+                    set_magic_quotes_runtime(false);
                 } else {
                     //Doesn't exist in PHP 5.4, but we don't need to check because
                     //get_magic_quotes_runtime always returns false in 5.4+
@@ -2705,7 +2705,7 @@ class PHPMailer
             $file_buffer = $this->encodeString($file_buffer, $encoding);
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    //set_magic_quotes_runtime($magic_quotes);
+                    set_magic_quotes_runtime($magic_quotes);
                 } else {
                     ini_set('magic_quotes_runtime', $magic_quotes);
                 }
@@ -3286,7 +3286,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (!empty($_SERVER['SERVER_NAME'])) {
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

markdown/markdown.php

@@ -5,6 +5,7 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
@@ -26,7 +27,7 @@ function markdown_addon_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
 	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['markdown-enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
+		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
 	]);
 
 	$data = [
@@ -42,7 +43,7 @@ function markdown_addon_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['markdown-enabled']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['enabled']));
 }
 
 function markdown_post_local_start(&$request) {

mathjax/mathjax.php

@@ -8,6 +8,7 @@
  * License: 3-clause BSD license
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

membersince/membersince.php

@@ -7,9 +7,9 @@
  * Status: Unsupported
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
-use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
 function membersince_install()
@@ -17,25 +17,9 @@ function membersince_install()
 	Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-/**
- * @param array|string|null $b
- * @return void
- */
-function membersince_display(&$b)
+function membersince_display(array &$b)
 {
-	$uid = DI::userSession()->getLocalUserId();
-
-	if ($uid === false) {
-		return;
-	}
-
-	$user = User::getById($uid, ['register_date']);
-
-	if ($user === false || !array_key_exists('register_date', $user)) {
-		return;
-	}
-
-	if (DI::appHelper()->getCurrentTheme() == 'frio') {
+	if (DI::app()->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
 		$doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8'));
@@ -55,7 +39,7 @@ function membersince_display(&$b)
 		$label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted');
 
 		// The div for the register date of the profile owner.
-		$entry = $doc->createElement('div', DateTimeFormat::local($user['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local(DI::app()->profile['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -63,9 +47,9 @@ function membersince_display(&$b)
 		$div->appendChild($entry);
 		$elm->parentNode->insertBefore($div, $elm->nextSibling);
 
-		$b = (string) $doc->saveHTML();
+		$b = $doc->saveHTML();
 	} else {
 		// Works in Vier.
-		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($user['register_date']) . "</dd>\n</dl>", $b, 1);
+		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local(DI::app()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }

monolog/README.md

@@ -1,4 +0,0 @@
-# Monolog Addon
-
-A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)).
-There are just Friendica additions inside the src directory.

monolog/monolog.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * Name: Monolog
- * Description: A Logging framework with lots of additions, customized for Friendica.
- * Version: 1.1
+ * Description: A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory
+ * Version: 1.0
  * Author: Philipp Holzer
  */

monolog/src/Factory/Monolog.php

@@ -4,8 +4,7 @@ namespace Friendica\Addon\monolog\src\Factory;
 
 use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
-use Friendica\Core\Logger\Factory\LoggerFactory;
+use Friendica\Core\Logger\Factory\AbstractLoggerTypeFactory;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
@@ -17,49 +16,32 @@ use Psr\Log\LogLevel;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-final class MonologFactory implements LoggerFactory
+class Monolog extends AbstractLoggerTypeFactory
 {
-	private IHaveCallIntrospections $introspection;
-
-	private IManageConfigValues $config;
-
-	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
-	{
-		$this->introspection = $introspection;
-		$this->config        = $config;
-	}
-
-	/**
-	 * Creates and returns a PSR-3 Logger instance.
-	 *
-	 * Calling this method multiple times with the same parameters SHOULD return the same object.
-	 *
-	 * @param \Psr\Log\LogLevel::* $logLevel The log level
-	 * @param \Friendica\Core\Logger\Capability\LogChannel::* $logChannel The log channel
-	 */
-	public function createLogger(string $logLevel, string $logChannel): LoggerInterface
+	public function create(IManageConfigValues $config, string $loglevel = null): LoggerInterface
 	{
 		$loggerTimeZone = new \DateTimeZone('UTC');
 
-		$logger = new Logger($logChannel);
+		$logger = new Logger($this->channel);
 		$logger->setTimezone($loggerTimeZone);
 		$logger->pushProcessor(new PsrLogMessageProcessor());
 		$logger->pushProcessor(new ProcessIdProcessor());
 		$logger->pushProcessor(new UidProcessor());
 		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
 
-		$logfile = $this->config->get('system', 'logfile');
+		$logfile = $config->get('system', 'logfile');
 
 		// just add a stream in case it's either writable or not file
 		if (is_writable($logfile)) {
-			$logLevel = Logger::toMonologLevel($logLevel);
+			$loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel'));
+			$loglevel = Logger::toMonologLevel($loglevel);
 
 			// fallback to notice if an invalid loglevel is set
-			if (!is_int($logLevel)) {
-				$logLevel = LogLevel::NOTICE;
+			if (!is_int($loglevel)) {
+				$loglevel = LogLevel::NOTICE;
 			}
 
-			$fileHandler = new StreamHandler($logfile, $logLevel);
+			$fileHandler = new StreamHandler($logfile, $loglevel);
 
 			$formatter = new LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
 			$fileHandler->setFormatter($formatter);

monolog/static/dependencies.config.php

@@ -20,8 +20,10 @@
  */
 
 return [
-	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
-		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
-		'call' => null,
+	\Monolog\Logger::class => [
+		'instanceOf' => \Friendica\Addon\monolog\src\Factory\Monolog::class,
+		'call' => [
+			['create', [], \Dice\Dice::CHAIN_CALL],
+		],
 	],
 ];

monolog/static/strategies.config.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+return [
+	\Psr\Log\LoggerInterface::class => [
+		\Monolog\Logger::class => ['monolog'],
+	],
+];

morechoice/morechoice.php

@@ -8,6 +8,7 @@
  * Status: Deprecated
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

morepokes/morepokes.php

@@ -7,6 +7,7 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

newmemberwidget/newmemberwidget.php

@@ -6,8 +6,10 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -15,7 +17,7 @@ use Friendica\Model\User;
 function newmemberwidget_install()
 {
 	Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-	DI::logger()->notice('newmemberwidget installed');
+	Logger::notice('newmemberwidget installed');
 }
 
 function newmemberwidget_network_mod_init ($b)

nitter/nitter.php

@@ -25,6 +25,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

nominatim/nominatim.php

@@ -6,7 +6,9 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -44,19 +46,19 @@ function nominatim_resolve_item(array &$item)
 
 	$s = DI::httpClient()->fetch('https://nominatim.openstreetmap.org/reverse?lat=' . $coords[0] . '&lon=' . $coords[1] . '&format=json&addressdetails=0&accept-language=' . $language);
 	if (empty($s)) {
-		DI::logger()->info('API could not be queried');
+		Logger::info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s, true);
 	if (empty($data['display_name'])) {
-		DI::logger()->info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
+		Logger::info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
 		return;
 	}
 
 	$item['location'] = $data['display_name'];
 
-	DI::logger()->info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
+	Logger::info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
 
 	if (!empty($item['location'])) {
 		DI::cache()->set('nominatim:' . $language . ':' . $coords[0] . '-' . $coords[1], $item['location']);

notifyall/notifyall.php

@@ -9,7 +9,9 @@
  */
 
 use Friendica\Addon\notifyall\NotifyAllEmail;
+use Friendica\App;
 use Friendica\Database\DBA;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -57,7 +59,7 @@ function notifyall_post()
 
 	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
 
-	foreach (DBA::toArray($recipients) as $recipient) {
+	foreach ($recipients as $recipient) {
 		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
 	}
 

nsfw/nsfw.php

@@ -8,6 +8,7 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -104,13 +105,12 @@ function nsfw_addon_settings_post(array &$b)
 function nsfw_prepare_body_content_filter(&$hook_data)
 {
 	$words = null;
-	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
-	if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
+	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable')) {
 		return;
 	}
 
-	if ($uid) {
-		$words = DI::pConfig()->get($uid, 'nsfw', 'words');
+	if (DI::userSession()->getLocalUserId()) {
+		$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words');
 	}
 
 	if ($words) {
@@ -119,9 +119,7 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 		$word_list = ['nsfw'];
 	}
 
-	$found      = false;
-	$tag_search = false;
-
+	$found = false;
 	if (count($word_list)) {
 		$body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
 
@@ -131,16 +129,17 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 				continue;
 			}
 
+			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
 					$found = @preg_match($word, $body);
 					break;
 				case '#': // Hashtag-only search
 					$tag_search = true;
-					$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'] ?? [], substr($word, 1));
+					$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1));
 					break;
 				default:
-					$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'] ?? [], $word);
+					$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
 					break;
 			}
 

numfriends/numfriends.php

@@ -6,7 +6,9 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -15,7 +17,7 @@ function numfriends_install() {
 	Hook::register('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
 	Hook::register('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
-	DI::logger()->notice("installed numfriends");
+	Logger::notice("installed numfriends");
 }
 
 /**
@@ -37,7 +39,7 @@ function numfriends_settings_post($post) {
 
 /**
  *
- * Called from the Addon Setting form.
+ * Called from the Addon Setting form. 
  * Add our own settings info to the page.
  *
  */
@@ -48,7 +50,7 @@ function numfriends_settings(array &$data)
 	}
 
 	$numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24);
-
+	
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
 	$html = Renderer::replaceMacros($t, [
 		'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],

openstreetmap/openstreetmap.php

@@ -9,8 +9,10 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -30,12 +32,12 @@ function openstreetmap_install()
 	Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	DI::logger()->notice("installed openstreetmap");
+	Logger::notice("installed openstreetmap");
 }
 
 function openstreetmap_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(&$navHtml)
@@ -153,8 +155,8 @@ function openstreetmap_generate_map(array &$b)
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	DI::logger()->debug('lat: ' . $lat);
-	DI::logger()->debug('lon: ' . $lon);
+	Logger::debug('lat: ' . $lat);
+	Logger::debug('lon: ' . $lon);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -172,7 +174,7 @@ function openstreetmap_generate_map(array &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	DI::logger()->debug('generate_map: ' . $b['html']);
+	Logger::debug('generate_map: ' . $b['html']);
 }
 
 function openstreetmap_addon_admin(string &$o)

opmlexport/opmlexport.php

@@ -8,7 +8,12 @@
  */
 
 use Friendica\DI;
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Network\HTTPException;
+use Friendica\Database\DBA;
+use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
@@ -17,7 +22,7 @@ function opmlexport_install()
 {
 	Hook::register('addon_settings',        __FILE__, 'opmlexport_addon_settings');
 	Hook::register('addon_settings_post',   __FILE__, 'opmlexport_addon_settings_post');
-	DI::logger()->notice('installed opmlexport Addon');
+	Logger::notice('installed opmlexport Addon');
 }
 
 

pageheader/pageheader.php

@@ -5,9 +5,10 @@
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
- *
+ * 
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

phpmailer/composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.10.0",
+            "version": "v6.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
-                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
                 "shasum": ""
             },
             "require": {
@@ -75,28 +75,24 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "support": {
-                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.10.0"
-            },
             "funding": [
                 {
                     "url": "https://github.com/Synchro",
                     "type": "github"
                 }
             ],
-            "time": "2025-04-24T15:19:31+00:00"
+            "time": "2023-11-25T22:23:28+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.0"
     },
-    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

phpmailer/phpmailer.php

@@ -7,6 +7,7 @@
  * Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
@@ -24,18 +25,14 @@ function phpmailer_install()
 
 function phpmailer_load_config(ConfigFileManager $loader)
 {
-	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
- * @param null|IEmail $email
+ * @param IEmail $email
  */
-function phpmailer_emailer_send_prepare(?IEmail &$email)
+function phpmailer_emailer_send_prepare(IEmail &$email)
 {
-	if ($email === null) {
-		return;
-	}
-
 	// Passing `true` enables exceptions
 	$mailer = new PHPMailer(true);
 	try {

phpmailer/vendor/autoload.php

@@ -2,24 +2,6 @@
 
 // autoload.php @generated by Composer
 
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
-
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitPhpMailerAddon::getLoader();

phpmailer/vendor/composer/ClassLoader.php

@@ -37,81 +37,26 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
-    /** @var string|null */
-    private $vendorDir;
-
     // PSR-4
-    /**
-     * @var array<string, array<string, int>>
-     */
     private $prefixLengthsPsr4 = array();
-    /**
-     * @var array<string, list<string>>
-     */
     private $prefixDirsPsr4 = array();
-    /**
-     * @var list<string>
-     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
-    /**
-     * List of PSR-0 prefixes
-     *
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
-     */
     private $prefixesPsr0 = array();
-    /**
-     * @var list<string>
-     */
     private $fallbackDirsPsr0 = array();
 
-    /** @var bool */
     private $useIncludePath = false;
-
-    /**
-     * @var array<string, string>
-     */
     private $classMap = array();
-
-    /** @var bool */
     private $classMapAuthoritative = false;
-
-    /**
-     * @var array<string, bool>
-     */
     private $missingClasses = array();
-
-    /** @var string|null */
     private $apcuPrefix;
 
-    /**
-     * @var array<string, self>
-     */
-    private static $registeredLoaders = array();
-
-    /**
-     * @param string|null $vendorDir
-     */
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
-    }
-
-    /**
-     * @return array<string, list<string>>
-     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -121,42 +66,28 @@ class ClassLoader
         return array();
     }
 
-    /**
-     * @return array<string, list<string>>
-     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
-    /**
-     * @return list<string>
-     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
-    /**
-     * @return list<string>
-     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
-    /**
-     * @return array<string, string> Array of classname => path
-     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array<string, string> $classMap Class to filename map
-     *
-     * @return void
+     * @param array $classMap Class to filename map
      */
     public function addClassMap(array $classMap)
     {
@@ -171,25 +102,22 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string              $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
-     *
-     * @return void
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    $paths
+                    (array) $paths
                 );
             }
 
@@ -198,19 +126,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -219,28 +147,25 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
-     *
-     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    $paths
+                    (array) $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -250,18 +175,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -270,10 +195,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string              $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
-     *
-     * @return void
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
      */
     public function set($prefix, $paths)
     {
@@ -288,12 +211,10 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
-     *
-     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -313,8 +234,6 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
-     *
-     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -337,8 +256,6 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
-     *
-     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -359,8 +276,6 @@ class ClassLoader
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
-     *
-     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -381,55 +296,33 @@ class ClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
-     *
-     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
+     * @return bool|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
-            $includeFile($file);
+            includeFile($file);
 
             return true;
         }
-
-        return null;
     }
 
     /**
@@ -474,21 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
-     *
-     * @return array<string, self>
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -554,26 +432,14 @@ class ClassLoader
 
         return false;
     }
-
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
 }

phpmailer/vendor/composer/InstalledVersions.php

@@ -1,359 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer;
-
-use Composer\Autoload\ClassLoader;
-use Composer\Semver\VersionParser;
-
-/**
- * This class is copied in every Composer installed project and available to all
- *
- * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
- *
- * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
- */
-class InstalledVersions
-{
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
-    private static $installed;
-
-    /**
-     * @var bool|null
-     */
-    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static $installedByVendor = array();
-
-    /**
-     * Returns a list of all package names which are present, either by being installed, replaced or provided
-     *
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackages()
-    {
-        $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
-        }
-
-        if (1 === \count($packages)) {
-            return $packages[0];
-        }
-
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-    }
-
-    /**
-     * Returns a list of all package names with a specific type e.g. 'library'
-     *
-     * @param  string   $type
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackagesByType($type)
-    {
-        $packagesByType = array();
-
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
-                }
-            }
-        }
-
-        return $packagesByType;
-    }
-
-    /**
-     * Checks whether the given package is installed
-     *
-     * This also returns true if the package name is provided or replaced by another package
-     *
-     * @param  string $packageName
-     * @param  bool   $includeDevRequirements
-     * @return bool
-     */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given package satisfies a version constraint
-     *
-     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
-     *
-     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
-     *
-     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
-     * @param  string        $packageName
-     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
-     * @return bool
-     */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
-        $constraint = $parser->parseConstraints((string) $constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-        return $provided->matches($constraint);
-    }
-
-    /**
-     * Returns a version constraint representing all the range(s) which are installed for a given package
-     *
-     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
-     * whether a given version of a package is installed, and not just whether it exists
-     *
-     * @param  string $packageName
-     * @return string Version constraint usable with composer/semver
-     */
-    public static function getVersionRanges($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
-            }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-            }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-            }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-            }
-
-            return implode(' || ', $ranges);
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getPrettyVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['pretty_version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
-     */
-    public static function getReference($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['reference'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['reference'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
-     */
-    public static function getInstallPath($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
-     */
-    public static function getRootPackage()
-    {
-        $installed = self::getInstalled();
-
-        return $installed[0]['root'];
-    }
-
-    /**
-     * Returns the raw installed.php data for custom implementations
-     *
-     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
-     * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
-     */
-    public static function getRawData()
-    {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        return self::$installed;
-    }
-
-    /**
-     * Returns the raw data of all installed.php which are currently loaded for custom implementations
-     *
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    public static function getAllRawData()
-    {
-        return self::getInstalled();
-    }
-
-    /**
-     * Lets you reload the static array from another file
-     *
-     * This is only useful for complex integrations in which a project needs to use
-     * this class but then also needs to execute another project's autoloader in process,
-     * and wants to ensure both projects have access to their version of installed.php.
-     *
-     * A typical case would be PHPUnit, where it would need to make sure it reads all
-     * the data it needs from this class, then call reload() with
-     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
-     * the project in which it runs can then also use this class safely, without
-     * interference between PHPUnit's dependencies and the project's dependencies.
-     *
-     * @param  array[] $data A vendor/composer/installed.php data set
-     * @return void
-     *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
-     */
-    public static function reload($data)
-    {
-        self::$installed = $data;
-        self::$installedByVendor = array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static function getInstalled()
-    {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-        }
-
-        $installed = array();
-
-        if (self::$canGetVendors) {
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                    $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
-                    }
-                }
-            }
-        }
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                $required = require __DIR__ . '/installed.php';
-                self::$installed = $required;
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        if (self::$installed !== array()) {
-            $installed[] = self::$installed;
-        }
-
-        return $installed;
-    }
-}

phpmailer/vendor/composer/autoload_classmap.php

@@ -2,11 +2,10 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'PHPMailer\\PHPMailer\\DSNConfigurator' => $vendorDir . '/phpmailer/phpmailer/src/DSNConfigurator.php',
     'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
     'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',

phpmailer/vendor/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

phpmailer/vendor/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

phpmailer/vendor/composer/autoload_real.php

@@ -22,14 +22,31 @@ class ComposerAutoloaderInitPhpMailerAddon
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
-
         spl_autoload_register(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
 
         $loader->register(true);
 

phpmailer/vendor/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitPhpMailerAddon
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'PHPMailer\\PHPMailer\\DSNConfigurator' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/DSNConfigurator.php',
         'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
         'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',

phpmailer/vendor/composer/installed.json

@@ -1,90 +1,81 @@
-{
-        "packages": [
-                {
-                        "name": "phpmailer/phpmailer",
-                        "version": "v6.10.0",
-                        "version_normalized": "6.10.0.0",
-                        "source": {
-                                "type": "git",
-                                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
-                        },
-                        "dist": {
-                                "type": "zip",
-                                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
-                                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
-                                "shasum": ""
-                        },
-                        "require": {
-                                "ext-ctype": "*",
-                                "ext-filter": "*",
-                                "ext-hash": "*",
-                                "php": ">=5.5.0"
-                        },
-                        "require-dev": {
-                                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                                "doctrine/annotations": "^1.2.6 || ^1.13.3",
-                                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                                "phpcompatibility/php-compatibility": "^9.3.5",
-                                "roave/security-advisories": "dev-latest",
-                                "squizlabs/php_codesniffer": "^3.7.2",
-                                "yoast/phpunit-polyfills": "^1.0.4"
-                        },
-                        "suggest": {
-                                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-                                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-                                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-                                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-                                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-                                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-                                "psr/log": "For optional PSR-3 debug logging",
-                                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-                                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-                        },
-                        "time": "2025-04-24T15:19:31+00:00",
-                        "type": "library",
-                        "installation-source": "dist",
-                        "autoload": {
-                                "psr-4": {
-                                        "PHPMailer\\PHPMailer\\": "src/"
-                                }
-                        },
-                        "notification-url": "https://packagist.org/downloads/",
-                        "license": [
-                                "LGPL-2.1-only"
-                        ],
-                        "authors": [
-                                {
-                                        "name": "Marcus Bointon",
-                                        "email": "phpmailer@synchromedia.co.uk"
-                                },
-                                {
-                                        "name": "Jim Jagielski",
-                                        "email": "jimjag@gmail.com"
-                                },
-                                {
-                                        "name": "Andy Prevost",
-                                        "email": "codeworxtech@users.sourceforge.net"
-                                },
-                                {
-                                        "name": "Brent R. Matzelle"
-                                }
-                        ],
-                        "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-                        "support": {
-                                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.10.0"
-                        },
-                        "funding": [
-                                {
-                                        "url": "https://github.com/Synchro",
-                                        "type": "github"
-                                }
-                        ],
-                        "install-path": "../phpmailer/phpmailer"
-                }
+[
+    {
+        "name": "phpmailer/phpmailer",
+        "version": "v6.9.1",
+        "version_normalized": "6.9.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/PHPMailer/PHPMailer.git",
+            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
+            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-filter": "*",
+            "ext-hash": "*",
+            "php": ">=5.5.0"
+        },
+        "require-dev": {
+            "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+            "doctrine/annotations": "^1.2.6 || ^1.13.3",
+            "php-parallel-lint/php-console-highlighter": "^1.0.0",
+            "php-parallel-lint/php-parallel-lint": "^1.3.2",
+            "phpcompatibility/php-compatibility": "^9.3.5",
+            "roave/security-advisories": "dev-latest",
+            "squizlabs/php_codesniffer": "^3.7.2",
+            "yoast/phpunit-polyfills": "^1.0.4"
+        },
+        "suggest": {
+            "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
+            "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+            "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+            "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
+            "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+            "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+            "psr/log": "For optional PSR-3 debug logging",
+            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+            "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
+        },
+        "time": "2023-11-25T22:23:28+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "PHPMailer\\PHPMailer\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "LGPL-2.1-only"
         ],
-        "dev": true,
-        "dev-package-names": []
-}
+        "authors": [
+            {
+                "name": "Marcus Bointon",
+                "email": "phpmailer@synchromedia.co.uk"
+            },
+            {
+                "name": "Jim Jagielski",
+                "email": "jimjag@gmail.com"
+            },
+            {
+                "name": "Andy Prevost",
+                "email": "codeworxtech@users.sourceforge.net"
+            },
+            {
+                "name": "Brent R. Matzelle"
+            }
+        ],
+        "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+        "funding": [
+            {
+                "url": "https://github.com/Synchro",
+                "type": "github"
+            }
+        ]
+    }
+]

phpmailer/vendor/composer/installed.php

@@ -1,32 +0,0 @@
-<?php return array(
-    'root' => array(
-        'name' => 'friendica-addons/phpmailer',
-        'pretty_version' => 'dev-2025.07-rc',
-        'version' => 'dev-2025.07-rc',
-        'reference' => '715f70032330ad14f710284104c8593c7800e125',
-        'type' => 'friendica-addon',
-        'install_path' => __DIR__ . '/../../',
-        'aliases' => array(),
-        'dev' => true,
-    ),
-    'versions' => array(
-        'friendica-addons/phpmailer' => array(
-            'pretty_version' => 'dev-2025.07-rc',
-            'version' => 'dev-2025.07-rc',
-            'reference' => '715f70032330ad14f710284104c8593c7800e125',
-            'type' => 'friendica-addon',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-        'phpmailer/phpmailer' => array(
-            'pretty_version' => 'v6.10.0',
-            'version' => '6.10.0.0',
-            'reference' => 'bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../phpmailer/phpmailer',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-    ),
-);