From 2ea40dc897c90d65c7be085fbd66fb5cc8d70c96 Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 22:28:59 +0100
Subject: [PATCH 001/161] Remove unused App paramter in securemail addon

---
 securemail/securemail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 5390ebd1..61125587 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -82,7 +82,7 @@ function securemail_settings_post(array &$b)
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
 
 		if (!empty($_POST['securemail-test'])) {
-			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
+			$res = DI::emailer()->send(new SecureTestEmail(DI::config(), DI::pConfig(), DI::baseUrl()));
 
 			// revert to saved value
 			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);

From ecf0edb520c50edca5512f0c450761c5d9d56121 Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:32:43 +0100
Subject: [PATCH 002/161] Remove unused parameter webdav_storage addon

---
 webdav_storage/webdav_storage.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webdav_storage/webdav_storage.php b/webdav_storage/webdav_storage.php
index adcbea29..fd2eb0d9 100644
--- a/webdav_storage/webdav_storage.php
+++ b/webdav_storage/webdav_storage.php
@@ -8,11 +8,10 @@
 
 use Friendica\Addon\webdav_storage\src\WebDav;
 use Friendica\Addon\webdav_storage\src\WebDavConfig;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
-function webdav_storage_install($a)
+function webdav_storage_install()
 {
 	Hook::register('storage_instance' , __FILE__, 'webdav_storage_instance');
 	Hook::register('storage_config' , __FILE__, 'webdav_storage_config');

From bf679262b0b238378a75ed0c7f7436cfe999ac7d Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 22:42:52 +0100
Subject: [PATCH 003/161] Remove unused parameter in saml addon

---
 saml/saml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/saml/saml.php b/saml/saml.php
index 56dd0f5d..9f065355 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -161,7 +161,7 @@ function saml_sso_reply()
 	}
 
 	if (!empty($user['uid'])) {
-		DI::auth()->setForUser(DI::app(), $user);
+		DI::auth()->setForUser($user);
 	}
 
 	if (isset($_POST['RelayState']) && Utils::getSelfURL() != $_POST['RelayState']) {

From 348c44c972e54090f329511e992c7ea5618dd862 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 15:36:37 +0000
Subject: [PATCH 004/161] inline slim routes and middlewares into
 advancedcontentfilter addon

---
 .../advancedcontentfilter.php                 | 25 +++++++++++--
 advancedcontentfilter/src/middlewares.php     | 32 -----------------
 advancedcontentfilter/src/routes.php          | 36 -------------------
 3 files changed, 23 insertions(+), 70 deletions(-)
 delete mode 100644 advancedcontentfilter/src/middlewares.php
 delete mode 100644 advancedcontentfilter/src/routes.php

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 418b253e..84eb468c 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -192,9 +192,30 @@ function advancedcontentfilter_init()
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
 		$slim = \Slim\Factory\AppFactory::create();
 
-		require __DIR__ . '/src/middlewares.php';
+		/**
+		 * 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/routes.php';
 		$slim->run();
 
 		exit;
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
deleted file mode 100644
index 2b831473..00000000
--- a/advancedcontentfilter/src/middlewares.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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());
diff --git a/advancedcontentfilter/src/routes.php b/advancedcontentfilter/src/routes.php
deleted file mode 100644
index a46f1b4b..00000000
--- a/advancedcontentfilter/src/routes.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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');
-	});
-});

From e9d3afb483eff053d0e53d2f55d9d59cd6d7f29e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 19:51:37 +0000
Subject: [PATCH 005/161] Fix errors in tictac addon

---
 tictac/tictac.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 0f9f4fb6..dc9f0348 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -70,6 +70,7 @@ class tictac {
   private $dimen;
   private $first_move = true;
   private $handicap = 0;
+  private $mefirst;
   private $yours;
   private $mine;
   private $winning_play;
@@ -161,10 +162,10 @@ class tictac {
 
   ];
 
-  function __construct($dimen,$handicap,$mefirst,$yours,$mine) {
+  function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
     $this->dimen = 3;
-    $this->handicap = (($handicap) ? 1 : 0);
-    $this->mefirst = (($mefirst) ? 1 : 0);
+    $this->handicap = $handicap ? 1 : 0;
+    $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
     $this->mine  = $mine;
     $this->you = $this->parse_moves('you');
@@ -175,6 +176,7 @@ class tictac {
   }
 
   function play() {
+     $o = '';
 
      if($this->first_move) {
        if(rand(0,1) == 1) {

From 6df91dd37bd96bac74a2e347640b0a81684c3028 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 19:55:54 +0000
Subject: [PATCH 006/161] Fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 7 +++----
 tictac/tictac.php                | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 020c69c4..325bcb07 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -762,13 +762,13 @@ class CodebirdSN
      * @param string $method  The API method to call
      * @param array  $params  The parameters to send along
      *
-     * @return void
+     * @return string
      */
     protected function _buildMultipart($method, $params)
     {
         // well, files will only work in multipart methods
         if (! $this->_detectMultipart($method)) {
-            return;
+            return '';
         }
 
         // only check specific parameters
@@ -783,7 +783,7 @@ class CodebirdSN
         );
         // method might have files?
         if (! in_array($method, array_keys($possible_files))) {
-            return;
+            return '';
         }
 
         $possible_files = explode(' ', $possible_files[$method]);
@@ -794,7 +794,6 @@ class CodebirdSN
             // is it an array?
             if (is_array($value)) {
                 throw new \Exception('Using URL-encoded parameters is not supported for uploading media.');
-                continue;
             }
 
             // check for filenames
diff --git a/tictac/tictac.php b/tictac/tictac.php
index dc9f0348..10103835 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -631,7 +631,7 @@ function winning_move() {
   function draw_board() {
     if(! strlen($this->yours))
       $this->yours = 'XXX';
-    $o .=  "<form action=\"tictac/{$this->handicap}/{$this->mefirst}/{$this->dimen}/{$this->yours}/{$this->mine}\" method=\"post\" />";
+    $o =  "<form action=\"tictac/{$this->handicap}/{$this->mefirst}/{$this->dimen}/{$this->yours}/{$this->mine}\" method=\"post\" />";
     for($x = 0; $x < $this->dimen; $x ++) {
       $o .=  '<table>';
       for($y = 0; $y < $this->dimen; $y ++) {

From d7d6a43655734a1ebeb0d70481452447baf5a80e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 07:55:01 +0000
Subject: [PATCH 007/161] Add checks for CLD2Detector ans CLD2Encoding classes

---
 cld/cld.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cld/cld.php b/cld/cld.php
index 5ca4c932..83361e2b 100644
--- a/cld/cld.php
+++ b/cld/cld.php
@@ -22,6 +22,16 @@ function cld_detect_languages(array &$data)
 		return;
 	}
 
+	if (!class_exists('CLD2Detector')) {
+		Logger::warning('CLD2Detector class does not exist.');
+		return;
+	}
+
+	if (!class_exists('CLD2Encoding')) {
+		Logger::warning('CLD2Encoding class does not exist.');
+		return;
+	}
+
 	$cld2 = new \CLD2Detector();
 
 	$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding

From fc0dda0cd9b607dc8d87f73644108f922f6bb1e1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 08:23:27 +0000
Subject: [PATCH 008/161] refactor convert addon, replace each() calls with
 foreach loop

---
 convert/convert.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

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

From 90ffd40d58814cb815aef4cf4d0e3077301cdbd4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:38:55 +0000
Subject: [PATCH 009/161] remove wrong return tag

---
 convert/UnitConvertor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/convert/UnitConvertor.php b/convert/UnitConvertor.php
index d7933a8f..a3650e9b 100644
--- a/convert/UnitConvertor.php
+++ b/convert/UnitConvertor.php
@@ -169,7 +169,6 @@ 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)
@@ -280,4 +279,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
\ No newline at end of file
+?>

From 9117626c6a5f1c16ca7e17efa26c8f4aa164ae10 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:40:45 +0000
Subject: [PATCH 010/161] Fix errors in diaspora addon

---
 diaspora/diasphp.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index 1588b582..266b9899 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -9,6 +9,8 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
+	private $token_regex;
+	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

From 1346a92505d234a1a695c871c3a17913bff927d3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:43:21 +0000
Subject: [PATCH 011/161] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 18aa5c90..70fcfe39 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -217,7 +217,7 @@ class Services_Libravatar
      *
      * @param array $options Array of options for getUrl()
      *
-     * @return void
+     * @return array
      * @throws Exception When an invalid option is used
      */
     protected function checkOptionsArray($options)
@@ -462,6 +462,8 @@ class Services_Libravatar
                 return $v['target'];
             }
         }
+
+        return '';
     }
 
     /**

From e488f597bec009385f3232e3e1d7ab92a62b34cb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:52:59 +0000
Subject: [PATCH 012/161] Fix errors in mailstream addon

---
 mailstream/mailstream.php                | 2 +-
 mailstream/phpmailer/class.phpmailer.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index ae57c4dd..9910a63d 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -378,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));
diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ab7fe030..a47b13f7 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,6 +1519,7 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
+            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
@@ -2705,7 +2706,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);
                 }

From 7453c6f41ab4a2fbc3cec72f38dcfcbdde359080 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:33:12 +0000
Subject: [PATCH 013/161] fix error in PHPMailer

---
 mailstream/phpmailer/class.phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index a47b13f7..ff3d81e3 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -2691,10 +2691,10 @@ class PHPMailer
             if (!is_readable($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = get_magic_quotes_runtime();
+            $magic_quotes = false;
             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+

From a5aaea5211ff4cc5ee17dcd9e80fb09c39ce334c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:55:15 +0000
Subject: [PATCH 014/161] fix errors in pnut addon, add support for PHP 7.4

---
 pnut/lib/phpnut.php | 173 +++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 81 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 303a860b..5794d795 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2,6 +2,8 @@
 
 namespace phpnut;
 
+use CURLFile;
+
 /**
  * phpnut.php
  * pnut.io PHP library
@@ -99,6 +101,10 @@ class phpnut
     // if processing stream_markers or any fast stream, decrease $sleepFor
     public $streamingSleepFor = 20000;
 
+    private $_clientId;
+
+    private $_clientSecret;
+
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
@@ -162,7 +168,7 @@ class phpnut
      * from the user. If you don't specify anything, you'll only receive
      * access to the user's basic profile (the default).
      */
-    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
+    public function getAuthUrl(?string $callback_uri=null, array $scope=null): string
     {
         if (empty($this->_clientId)) {
             throw new phpnutException('You must specify your pnut client ID');
@@ -256,8 +262,10 @@ class phpnut
     /**
      * Check the scope of current token to see if it has required scopes
      * has to be done after a check
+     *
+     * @return int|array
      */
-    public function checkScopes(array $app_scopes): int|array
+    public function checkScopes(array $app_scopes)
     {
         if (count($this->_scopes) === 0) {
             return -1; // _scope is empty
@@ -303,7 +311,7 @@ class phpnut
     {
         return $this->httpReq('delete', "{$this->_baseUrl}token");
     }
-    
+
     /**
      * Retrieve an app access token from the app.net API. This allows you
      * to access the API without going through the user access flow if you
@@ -314,7 +322,7 @@ class phpnut
      * @return string The app access token
      */
     public function getAppAccessToken()
-    {    
+    {
         if (empty($this->_clientId) || empty($this->_clientSecret)) {
             throw new phpnutException('You must specify your Pnut client ID and client secret');
         }
@@ -450,8 +458,10 @@ class phpnut
     /**
      * Internal function to handle all
      * HTTP requests (POST,PUT,GET,DELETE)
+     *
+     * @param string|array $params
      */
-    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
+    protected function httpReq(string $act, string $req, $params = [], string $contentType='application/x-www-form-urlencoded')
     {
         $ch = curl_init($req);
         $headers = [];
@@ -520,7 +530,7 @@ class phpnut
                     } else {
                         throw new phpnutException($response['error']);
                     }
-                } 
+                }
 
                 // look for response migration errors
                 elseif (isset($response['meta'], $response['meta']['error_message'])) {
@@ -588,7 +598,7 @@ class phpnut
     {
         return $this->_last_request;
     }
-    
+
     public function getLastResponse()
     {
         return $this->_last_response;
@@ -752,7 +762,7 @@ class phpnut
      * Retrieve the Posts that are 'in reply to' a specific Post.
      * @param integer $post_id The ID of the post you want to retrieve replies for.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostThread(int $post_id, array $params=[])
     {
@@ -767,7 +777,7 @@ class phpnut
      * Retrieve revisions of a post. Currently only one can be created.
      * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostRevisions(int $post_id, array $params=[])
     {
@@ -781,13 +791,13 @@ class phpnut
     /**
      * Get the most recent Posts created by a specific User in reverse
      * chronological order (most recent first).
-     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
+     * @param string|int $user_id $user_id Either the ID of the user you wish to retrieve posts by,
      * or the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserPosts(string|int $user_id='me', array $params=[])
+    public function getUserPosts($user_id = 'me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -799,13 +809,13 @@ class phpnut
     /**
      * Get the most recent Posts mentioning by a specific User in reverse
      * chronological order (newest first).
-     * @param mixed $user_id Either the ID of the user who is being mentioned, or
+     * @param string|int $user_id Either the ID of the user who is being mentioned, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserMentions(string|int $user_id='me', array $params=[])
+    public function getUserMentions($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -817,7 +827,7 @@ class phpnut
     /**
      * Get the currently authenticated user's recent messages
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserMessages(array $params=[])
     {
@@ -832,7 +842,7 @@ class phpnut
      * Return the 20 most recent posts from the current User and
      * the Users they follow.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserStream(array $params=[])
     {
@@ -847,7 +857,7 @@ class phpnut
      * Retrieve a list of all public Posts on pnut.io, often referred to as the
      * global stream.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPublicPosts(array $params=[])
     {
@@ -860,7 +870,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getPostExploreStreams()
     {
@@ -874,7 +884,7 @@ class phpnut
      * Retrieve a list of posts from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostExploreStream(string $slug, array $params=[])
     {
@@ -916,10 +926,11 @@ class phpnut
     * are:    count, before_id, since_id, include_muted, include_deleted,
     * and include_post_raw.
     * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
+    * @param string|int $user_id
     * @return array An array of associative arrays, each representing a single
     * user who has bookmarked a post
     */
-    public function getBookmarked(string|int $user_id='me', array $params=[])
+    public function getBookmarked($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -967,7 +978,7 @@ class phpnut
     /**
      * Repost an existing Post object.
      * @param integer $post_id The id of the post
-     * @return the reposted post
+     * @return mixed the reposted post
      */
     public function repost(int $post_id)
     {
@@ -980,7 +991,7 @@ class phpnut
     /**
      * Delete a post that the user has reposted.
      * @param integer $post_id The id of the post
-     * @return the un-reposted post
+     * @return mixed the un-reposted post
      */
     public function deleteRepost(int $post_id)
     {
@@ -997,7 +1008,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * include_directed_posts, and include_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function searchHashtags(string $hashtag, array $params=[])
     {
@@ -1044,7 +1055,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * and include_post_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserPersonalStream(array $params=[])
     {
@@ -1063,7 +1074,7 @@ class phpnut
             );
         }
     }
-    
+
     /**
     * Return the 20 most recent Posts from the current User's personalized stream
     * and mentions stream merged into one stream.
@@ -1071,7 +1082,7 @@ class phpnut
     * This will likely change as the API evolves, as of this writing allowed keys
     * are: count, before_id, since_id, include_muted, include_deleted,
     * include_directed_posts, and include_raw.
-    * @return An array of associative arrays, each representing a single post.
+    * @return array An array of associative arrays, each representing a single post.
     */
     public function getUserUnifiedStream(array $params=[])
     {
@@ -1096,14 +1107,14 @@ class phpnut
 
     /**
      * Returns a specific user object.
-     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
+     * @param string|int $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
      * "me" to retrieve data for the users you're currently authenticated as.
      * @param array $params An associative array of optional general parameters.
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: include_raw|include_user_raw.
      * @return array An associative array representing the user data.
      */
-    public function getUser(string|int $user_id='me', array $params=[])
+    public function getUser($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1131,10 +1142,10 @@ class phpnut
     /**
      * Add the specified user ID to the list of users followed.
      * Returns the User object of the user being followed.
-     * @param integer $user_id The user ID of the user to follow.
+     * @param string|int $user_id The user ID of the user to follow.
      * @return array An associative array representing the user you just followed.
      */
-    public function followUser(string|int $user_id)
+    public function followUser($user_id)
     {
         return $this->httpReq(
             'put',
@@ -1145,10 +1156,10 @@ class phpnut
     /**
      * Removes the specified user ID to the list of users followed.
      * Returns the User object of the user being unfollowed.
-     * @param integer $user_id The user ID of the user to unfollow.
+     * @param string|int $user_id The user ID of the user to unfollow.
      * @return array An associative array representing the user you just unfollowed.
      */
-    public function unfollowUser(string|int $user_id)
+    public function unfollowUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1158,13 +1169,13 @@ class phpnut
 
     /**
      * Returns an array of User objects the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowing(string|int $user_id='me', array $params=[])
+    public function getFollowing($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1172,31 +1183,31 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids the specified user is following.
      */
-    public function getFollowingIDs(string|int $user_id='me')
+    public function getFollowingIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
             "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
         );
     }
-    
+
     /**
      * Returns an array of User objects for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowers(string|int $user_id='me', array $params=[])
+    public function getFollowers($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1204,15 +1215,15 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids for users following the specified user
      */
-    public function getFollowersIDs(string|int $user_id='me')
+    public function getFollowersIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
@@ -1236,9 +1247,9 @@ class phpnut
 
     /**
      * Mute a user
-     * @param integer $user_id The user ID to mute
+     * @param string|int $user_id The user ID to mute
      */
-    public function muteUser(string|int $user_id)
+    public function muteUser($user_id)
     {
          return $this->httpReq(
             'put',
@@ -1248,9 +1259,9 @@ class phpnut
 
     /**
      * Unmute a user
-     * @param integer $user_id The user ID to unmute
+     * @param string|int $user_id The user ID to unmute
      */
-    public function unmuteUser(string|int $user_id)
+    public function unmuteUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1288,7 +1299,7 @@ class phpnut
      * @param string $search The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
-     * @return array An array of associative arrays, each representing one user.
+     * @return array|false An array of associative arrays, each representing one user.
      */
     public function searchUsers(array $params=[], string $query='')
     {
@@ -1333,7 +1344,7 @@ class phpnut
             $mimeType = $test['mime'];
         }
         $data = [
-            $which => new CurlFile($image, $mimeType)
+            $which => new CURLFile($image, $mimeType)
         ];
         return $this->httpReq(
             'post-raw',
@@ -1445,10 +1456,10 @@ class phpnut
 
     /**
      * get an existing private message channel between multiple users
-     * @param mixed $users Can be a comma- or space-separated string, or an array.
+     * @param string|array $users Can be a comma- or space-separated string, or an array.
      * Usernames with @-symbol, or user ids.
      */
-    public function getExistingPM(string|array $users, array $params=[])
+    public function getExistingPM($users, array $params=[])
     {
         if (is_string($users)) {
             $users = explode(',', str_replace(' ', ',', $users));
@@ -1561,7 +1572,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getChannelExploreStreams()
     {
@@ -1575,7 +1586,7 @@ class phpnut
      * Retrieve a list of channels from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single channel.
+     * @return array An array of associative arrays, each representing a single channel.
      */
     public function getChannelExploreStream(string $slug, array $params=[])
     {
@@ -1585,7 +1596,7 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * mark channel inactive
      */
@@ -1685,11 +1696,11 @@ class phpnut
 
     /**
      * create message
-     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
+     * @param string|int $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
      * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
      * @param array $params query parameters
      */
-    public function createMessage(string|int $channelid, array $data, array $params=[])
+    public function createMessage($channelid, array $data, array $params=[])
     {
         if (isset($data['destinations'])) {
             if (is_string($data['destinations'])) {
@@ -1802,16 +1813,16 @@ class phpnut
     public function createFile($file, array $data, array $params=[])
     {
         if (!$file) {
-            throw new PhpnutException('You must specify a path to a file');
+            throw new phpnutException('You must specify a path to a file');
         }
         if (!file_exists($file)) {
-            throw new PhpnutException('File path specified does not exist');
+            throw new phpnutException('File path specified does not exist');
         }
         if (!is_readable($file)) {
-            throw new PhpnutException('File path specified is not readable');
+            throw new phpnutException('File path specified is not readable');
         }
         if (!array_key_exists('type', $data) || !$data['type']) {
-            throw new PhpnutException('Type is required when creating a file');
+            throw new phpnutException('Type is required when creating a file');
         }
         if (!array_key_exists('name', $data)) {
             $data['name'] = basename($file);
@@ -1823,7 +1834,7 @@ class phpnut
             $mimeType = null;
         }
         if (!array_key_exists('kind', $data)) {
-            $test = @getimagesize($path);
+            $test = @getimagesize($file);
             if ($test && array_key_exists('mime', $test)) {
                 $data['kind'] = 'image';
                 if (!$mimeType) {
@@ -1840,7 +1851,7 @@ class phpnut
             finfo_close($finfo);
         }
         if (!$mimeType) {
-            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
+            throw new phpnutException('Unable to determine mime type of file, try specifying it explicitly');
         }
         $data['content'] = new \CurlFile($file, $mimeType);
         return $this->httpReq(
@@ -2001,7 +2012,7 @@ class phpnut
         $json = json_encode($data);
         return $this->httpReq(
             'post',
-            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
+            $this->_baseUrl.'polls?'.$this->buildQueryString($params),
             $json,
             'application/json'
         );
@@ -2019,7 +2030,7 @@ class phpnut
         return $this->httpReq(
             'put',
             $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
-            $json, 
+            $json,
             'application/json'
         );
     }
@@ -2118,7 +2129,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get User Information
      */
@@ -2129,7 +2140,7 @@ class phpnut
             "{$this->_baseUrl}token"
         );
     }
-    
+
     /**
      * Get Application Authorized User IDs
      */
@@ -2147,7 +2158,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get Application Authorized User Tokens
      */
@@ -2181,7 +2192,7 @@ class phpnut
     {
         $this->_streamCallback = $function;
     }
-    
+
     /**
      * Opens a stream that's been created for this user/app and starts sending
      * events/objects to your defined callback functions. You must define at
@@ -2231,7 +2242,7 @@ class phpnut
         );
         return true;
     }
-    
+
     /**
      * Close the currently open stream.
      * @return true;
@@ -2251,7 +2262,7 @@ class phpnut
         $this->_currentStream = null;
         $this->_multiStream = null;
     }
-    
+
     /**
      * Retrieve all streams for the current access token.
      * @return array An array of stream definitions.
@@ -2263,7 +2274,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Returns a single stream specified by a stream ID. The stream must have been
      * created with the current access token.
@@ -2276,7 +2287,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Creates a stream for the current app access token.
      *
@@ -2307,7 +2318,7 @@ class phpnut
         );
         return $response;
     }
-    
+
     /**
      * Update stream for the current app access token
      *
@@ -2338,7 +2349,7 @@ class phpnut
         );
         return $response;
     }
-     
+
     /**
      * Deletes a stream if you no longer need it.
      *
@@ -2352,7 +2363,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Deletes all streams created by the current access token.
      */
@@ -2363,7 +2374,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Internal function used to process incoming chunks from the stream. This is only
      * public because it needs to be accessed by CURL. Do not call or use this function
@@ -2394,7 +2405,7 @@ class phpnut
         }
         return strlen($data);
     }
-    
+
     /**
      * Opens a long lived HTTP connection to the pnut.io servers, and sends data
      * received to the httpStreamReceive function. As a general rule you should not
@@ -2426,7 +2437,7 @@ class phpnut
         $this->_lastStreamActivity = time();
         curl_multi_add_handle($this->_multiStream, $this->_currentStream);
     }
-    
+
     public function reconnectStream(): void
     {
         $this->closeStream();
@@ -2442,7 +2453,7 @@ class phpnut
         }
         $this->httpStream('get', $this->_streamUrl);
     }
-    
+
     /**
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
@@ -2487,7 +2498,7 @@ class phpnut
             }
         } while ($timeSoFar+$sleepFor < $microseconds);
     }
-    
+
     /**
      * Process an open stream forever. This function will never return, if you
      * want to perform other actions while consuming the stream, you should use

From 787240046751b39f635af33c6e5a6c4162d02e68 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:14:01 +0000
Subject: [PATCH 015/161] Fix errors in pumpio addon

---
 pumpio/oauth/http.php | 86 ++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/pumpio/oauth/http.php b/pumpio/oauth/http.php
index 5d5e23f0..3045e509 100644
--- a/pumpio/oauth/http.php
+++ b/pumpio/oauth/http.php
@@ -109,9 +109,11 @@ class http_class
 	var $connected_port = -1;
 	var $connected_ssl = 0;
 
+	private $content_length_set;
+
 	/* Private methods - DO NOT CALL */
 
-	Function Tokenize($string,$separator="")
+	private function Tokenize($string,$separator="")
 	{
 		if(!strcmp($separator,""))
 		{
@@ -135,18 +137,18 @@ class http_class
 		}
 	}
 
-	Function CookieEncode($value, $name)
+	private function CookieEncode($value, $name)
 	{
 		return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
 	}
 
-	Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		$this->error_code = $error_code;
 		return($this->error=$error);
 	}
 
-	Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		if(IsSet($php_error_message)
 		&& strlen($php_error_message))
@@ -154,7 +156,7 @@ class http_class
 		return($this->SetError($error, $error_code));
 	}
 
-	Function SetDataAccessError($error,$check_connection=0)
+	private function SetDataAccessError($error,$check_connection=0)
 	{
 		$this->error=$error;
 		$this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
@@ -174,7 +176,7 @@ class http_class
 		}
 	}
 
-	Function OutputDebug($message)
+	private function OutputDebug($message)
 	{
 		if($this->log_debug)
 			error_log($message);
@@ -188,7 +190,7 @@ class http_class
 		}
 	}
 
-	Function GetLine()
+	private function GetLine()
 	{
 		for($line="";;)
 		{
@@ -227,7 +229,7 @@ class http_class
 		}
 	}
 
-	Function PutLine($line)
+	private function PutLine($line)
 	{
 		if($this->debug)
 			$this->OutputDebug("C $line");
@@ -239,7 +241,7 @@ class http_class
 		return(1);
 	}
 
-	Function PutData($data)
+	private function PutData($data)
 	{
 		if(strlen($data))
 		{
@@ -254,7 +256,7 @@ class http_class
 		return(1);
 	}
 
-	Function FlushData()
+	private function FlushData()
 	{
 		if(!fflush($this->connection))
 		{
@@ -264,7 +266,7 @@ class http_class
 		return(1);
 	}
 
-	Function ReadChunkSize()
+	private function ReadChunkSize()
 	{
 		if($this->remaining_chunk==0)
 		{
@@ -289,7 +291,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadBytes($length)
+	private function ReadBytes($length)
 	{
 		if($this->use_curl)
 		{
@@ -356,7 +358,7 @@ class http_class
 		return($bytes);
 	}
 
-	Function EndOfInput()
+	private function EndOfInput()
 	{
 		if($this->use_curl)
 			return($this->read_response>=strlen($this->response));
@@ -367,7 +369,7 @@ class http_class
 		return(feof($this->connection));
 	}
 
-	Function Resolve($domain, &$ip, $server_type)
+	private function Resolve($domain, &$ip, $server_type)
 	{
 		if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
 			$ip=$domain;
@@ -385,7 +387,7 @@ class http_class
 		return('');
 	}
 
-	Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
+	private function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
 	{
 		$domain=$host_name;
 		$port = $host_port;
@@ -552,7 +554,7 @@ class http_class
 		}
 	}
 
-	Function Disconnect()
+	private function Disconnect()
 	{
 		if($this->debug)
 			$this->OutputDebug("Disconnected from ".$this->connected_host);
@@ -569,7 +571,7 @@ class http_class
 
 	/* Public methods */
 
-	Function GetRequestArguments($url, &$arguments)
+	public function GetRequestArguments($url, &$arguments)
 	{
 		$this->error = '';
 		$this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
@@ -621,7 +623,7 @@ class http_class
 		return("");
 	}
 
-	Function Open($arguments)
+	public function Open($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -750,7 +752,7 @@ class http_class
 		return("");
 	}
 
-	Function Close($force = 0)
+	public function Close($force = 0)
 	{
 		if($this->state=="Disconnected")
 			return("1 already disconnected");
@@ -767,7 +769,7 @@ class http_class
 		return($this->Disconnect());
 	}
 
-	Function PickCookies(&$cookies,$secure)
+	private function PickCookies(&$cookies,$secure)
 	{
 		if(IsSet($this->cookies[$secure]))
 		{
@@ -803,7 +805,7 @@ class http_class
 		}
 	}
 
-	Function GetFileDefinition($file, &$definition)
+	private function GetFileDefinition($file, &$definition)
 	{
 		$name="";
 		if(IsSet($file["FileName"]))
@@ -990,9 +992,6 @@ class http_class
 			if(GetType($length=@filesize($file["FileName"]))!="integer")
 			{
 				$error="it was not possible to determine the length of the file ".$file["FileName"];
-				if(IsSet($php_errormsg)
-				&& strlen($php_errormsg))
-					$error.=": ".$php_errormsg;
 				if(!file_exists($file["FileName"]))
 					$error="it was not possible to access the file ".$file["FileName"];
 				return($error);
@@ -1007,7 +1006,7 @@ class http_class
 		return("");
 	}
 
-	Function ConnectFromProxy($arguments, &$headers)
+	private function ConnectFromProxy($arguments, &$headers)
 	{
 		if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
 		|| (strlen($this->user_agent)
@@ -1052,7 +1051,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequest($arguments)
+	public function SendRequest($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1440,7 +1439,7 @@ class http_class
 		return("");
 	}
 
-	Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
+	private function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1472,7 +1471,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequestBody($data, $end_of_data)
+	private function SendRequestBody($data, $end_of_data)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1508,7 +1507,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyHeadersResponse(&$headers)
+	private function ReadReplyHeadersResponse(&$headers)
 	{
 		$headers=array();
 		if(strlen($this->error))
@@ -1635,7 +1634,7 @@ class http_class
 		return("");
 	}
 
-	Function Redirect(&$headers)
+	private function Redirect(&$headers)
 	{
 		if($this->follow_redirect)
 		{
@@ -1678,7 +1677,7 @@ class http_class
 		return("");
 	}
 
-	Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
+	private function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
 	{
 		if($proxy)
 		{
@@ -1697,9 +1696,10 @@ class http_class
 		if(IsSet($headers[$authenticate_header])
 		&& $this->sasl_authenticate)
 		{
-			if(function_exists("class_exists")
-			&& !class_exists("sasl_client_class"))
+			if(!class_exists('sasl_client_class'))
+			{
 				return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
+			}
 			if(GetType($headers[$authenticate_header])=="array")
 				$authenticate=$headers[$authenticate_header];
 			else
@@ -1719,7 +1719,7 @@ class http_class
 				else
 					$mechanisms[]=$mechanism;
 			}
-			$sasl=new sasl_client_class;
+			$sasl=new \sasl_client_class();
 			if(IsSet($user))
 				$sasl->SetCredential("user",$user);
 			if(IsSet($password))
@@ -1731,6 +1731,8 @@ class http_class
 			$sasl->SetCredential("uri",$this->request_uri);
 			$sasl->SetCredential("method",$this->request_method);
 			$sasl->SetCredential("session",$this->session);
+			$message = '';
+			$interactions = [];
 			do
 			{
 				$status=$sasl->Start($mechanisms,$message,$interactions);
@@ -1906,8 +1908,8 @@ class http_class
 		}
 		return("");
 	}
-	
-	Function ReadReplyHeaders(&$headers)
+
+	public function ReadReplyHeaders(&$headers)
 	{
 		if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
 			return($error);
@@ -1938,7 +1940,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyBody(&$body,$length)
+	private function ReadReplyBody(&$body,$length)
 	{
 		$body="";
 		if(strlen($this->error))
@@ -1980,7 +1982,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadWholeReplyBody(&$body)
+	public function ReadWholeReplyBody(&$body)
 	{
 		$body = '';
 		for(;;)
@@ -1993,7 +1995,7 @@ class http_class
 		}
 	}
 
-	Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
+	private function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
 	{
 		$now=gmdate("Y-m-d H-i-s");
 		$cookies=array();
@@ -2034,17 +2036,17 @@ class http_class
 		}
 	}
 
-	Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SaveCookies($cookies, $domain, $secure_only, 1);
 	}
 
-	Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SavePersistentCookies($cookies, $domain, $secure_only);
 	}
 
-	Function RestoreCookies($cookies, $clear=1)
+	private function RestoreCookies($cookies, $clear=1)
 	{
 		$new_cookies=($clear ? array() : $this->cookies);
 		for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++)

From 23227e5b0f6c53c2608004753dbb71e2cc488ae9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:18:20 +0000
Subject: [PATCH 016/161] Fix classes in s3_storage addon

---
 s3_storage/src/S3Client.php | 8 ++++----
 s3_storage/src/S3Config.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/s3_storage/src/S3Client.php b/s3_storage/src/S3Client.php
index 643df2b0..613eda97 100644
--- a/s3_storage/src/S3Client.php
+++ b/s3_storage/src/S3Client.php
@@ -4,10 +4,10 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile;
-use Akeeba\Engine\Postproc\Connector\S3v4\Input;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
+use Akeeba\S3\Exception\CannotDeleteFile;
+use Akeeba\S3\Input;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Util\Strings;
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
index 809cdd28..1831c666 100644
--- a/s3_storage/src/S3Config.php
+++ b/s3_storage/src/S3Config.php
@@ -4,8 +4,8 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;

From 5f2a9e9891e4524708116d598170e9172b30ffa3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 29 Nov 2024 22:36:05 +0000
Subject: [PATCH 017/161] Fix error in bluesky addon

---
 bluesky/bluesky.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 74d4fee8..c91823e3 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1563,7 +1563,7 @@ function bluesky_get_uri_class(string $uri): ?stdClass
 	}
 
 	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
+	if ($elements[0] !== 'at') {
 		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
 		return bluesky_get_uri_class($post['extid'] ?? '');
 	}

From 5664bc84fba5c8cd206b43f87685a1cbcb3b7a92 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:27:45 +0000
Subject: [PATCH 018/161] Fix errors in bluesky addon

---
 bluesky/bluesky.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 8e2c1ca0..91e524fe 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -683,6 +683,8 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
+	$post = [];
+
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,

From bee780552ddf974e6cb3a8788a81a7e88a782697 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:28:38 +0000
Subject: [PATCH 019/161] Fix errors in convert addon

---
 convert/convert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/convert/convert.php b/convert/convert.php
index 2c97e2aa..2545974c 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -181,7 +181,7 @@ function convert_content() {
 		}
 	}
 
-	$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>';

From 07993f70985713ac692d73fa0ad78fecffbb2432 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:30:39 +0000
Subject: [PATCH 020/161] Fix errors in js_upload addon

---
 .../file-uploader/tests/action-acceptance.php    | 16 ++++++++--------
 .../tests/action-handler-queue-test.php          |  8 ++++----
 .../file-uploader/tests/action-handler-test.php  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/js_upload/file-uploader/tests/action-acceptance.php b/js_upload/file-uploader/tests/action-acceptance.php
index fc9583f2..172b8857 100644
--- a/js_upload/file-uploader/tests/action-acceptance.php
+++ b/js_upload/file-uploader/tests/action-acceptance.php
@@ -2,12 +2,12 @@
 
 usleep(100000);
 
-$fileName;
-$fileSize;
+$fileName = '';
+$fileSize = 0;;
 
 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"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-queue-test.php b/js_upload/file-uploader/tests/action-handler-queue-test.php
index ff13576d..78760d64 100644
--- a/js_upload/file-uploader/tests/action-handler-queue-test.php
+++ b/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"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-test.php b/js_upload/file-uploader/tests/action-handler-test.php
index 24466b12..9fa72023 100644
--- a/js_upload/file-uploader/tests/action-handler-test.php
+++ b/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"}');
 }

From 04afbe36e3e62625debec212ec1f6782edbb8bd4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:32:07 +0000
Subject: [PATCH 021/161] Fix errors in keycloakpassword addon

---
 keycloakpassword/keycloakpassword.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index bfff4ea4..e9809f86 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -6,7 +6,6 @@
  * Author: Ryan <https://verya.pe/profile/ryan>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -92,7 +91,7 @@ function keycloakpassword_authenticate(array &$b)
 			$client_id,
 			$secret,
 			$endpoint . '/logout',
-			[ 'refresh_token' => res['refresh_token'] ]
+			[ 'refresh_token' => $res['refresh_token'] ]
 		);
 	}
 }

From fcec1a3d836b2134e318003bbd49e7a9a85cee30 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:35:19 +0000
Subject: [PATCH 022/161] Fix errors in langfilter addon

---
 langfilter/langfilter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index e5efa8fb..2bf986f0 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -7,7 +7,6 @@
  * License: MIT
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
@@ -148,6 +147,8 @@ 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);

From ace19814d7a934e46ef5303be3ff05cc6279ddc2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:37:58 +0000
Subject: [PATCH 023/161] Fix errors in leistungsschutzrecht addon

---
 leistungsschutzrecht/leistungsschutzrecht.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f6c65399..ec8091ac 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
@@ -149,7 +148,7 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 	$cleanedurlpart = explode('%', $urldata['host']);
 
 	$hostname = explode('.', $cleanedurlpart[0]);
-	if (empty($hostname)) {
+	if ($hostname === false || $hostname === '') {
 		return false;
 	}
 

From e86d15993b6794ea581624b34c0631685e8d14aa Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:41:11 +0000
Subject: [PATCH 024/161] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 70fcfe39..e51ef070 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -401,9 +401,8 @@ class Services_Libravatar
      */
     protected function srvGet($domain, $https = false)
     {
-
         // Are we going secure? Set up a fallback too.
-        if (isset($https) && $https === true) {
+        if ($https === true) {
             $subdomain = '_avatars-sec._tcp.';
             $fallback  = 'seccdn.';
         } else {
@@ -426,6 +425,7 @@ 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,

From 5f6f374f09f8c186422d245d523644020694395b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:42:40 +0000
Subject: [PATCH 025/161] Fix errors in ljpost addon

---
 ljpost/ljpost.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 7acc6589..b416c605 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,7 +8,6 @@
  * 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;
@@ -203,10 +202,12 @@ EOT;
 
 		Logger::debug('ljpost: data: ' . $xml);
 
+		$x = '';
+
 		if ($lj_blog !== 'test') {
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+		Logger::info('posted to livejournal: ' . $x);
 	}
 }

From c04016b7d3b4e24adfa8f43e9420c004e9b7d36f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:48:49 +0000
Subject: [PATCH 026/161] fix errors in mailstream addon

---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ff3d81e3..dcf02361 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From 50912fdc173dbb5f82f6dc8414d0d5d40f7b0879 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:50:06 +0000
Subject: [PATCH 027/161] Fix errors in nsfw addon

---
 nsfw/nsfw.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4a54d899..674fc201 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -119,7 +118,9 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 		$word_list = ['nsfw'];
 	}
 
-	$found = false;
+	$found      = false;
+	$tag_search = false;
+
 	if (count($word_list)) {
 		$body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
 
@@ -129,7 +130,6 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 				continue;
 			}
 
-			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
 					$found = @preg_match($word, $body);

From 3f89aa180610b0ce0ead35c082ad43e3c702bcde Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:51:18 +0000
Subject: [PATCH 028/161] Fix errors in pnut addon

---
 pnut/lib/phpnut.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 5794d795..89d5e5f8 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1339,6 +1339,8 @@ class phpnut
      */
     protected function updateUserImage(string $image, string $which='avatar')
     {
+        $mimeType = '';
+
         $test = @getimagesize($image);
         if ($test && array_key_exists('mime', $test)) {
             $mimeType = $test['mime'];

From 43ee267d38c1084cdac54f0872a902d788897631 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:12:23 +0000
Subject: [PATCH 029/161] fix errors in pumpio addon

---
 pumpio/pumpio.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5e053d7c..d7c2ac32 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -582,6 +581,8 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 		$uri = $orig_post['uri'];
 	}
 
+	$objectType = '';
+
 	if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
 		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
 	} elseif (strstr($uri, '/api/comment/')) {
@@ -827,6 +828,7 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	}
 
 	$contactid = 0;
+	$contact   = [];
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
 		$contactid = $self['id'];
@@ -1430,6 +1432,8 @@ function pumpio_fetchallcomments($uid, $id)
 
 	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
+	$item = new \stdClass();
+
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $item);
 	} else {

From fccf361ef121492aaf486ffca72eafbf4e558536 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:13:41 +0000
Subject: [PATCH 030/161] fix errors in ratioed addon

---
 ratioed/RatioedPanel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index e25c7f34..bd9b44dc 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -26,6 +26,7 @@ class RatioedPanel extends Active
 
 		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
+		$user   = [];
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);

From a41f8c13fea5cb52687fc35c1756c04c0620b510 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:27:57 +0000
Subject: [PATCH 031/161] fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 13 +++++++------
 statusnet/statusnet.php          |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 325bcb07..91e256be 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -31,11 +31,10 @@ use Friendica\Core\System;
 /**
  * Define constants
  */
-$constants = explode(' ', 'OBJECT ARRAY JSON');
-foreach ($constants as $i => $id) {
-    $id = 'CODEBIRD_RETURNFORMAT_' . $id;
-    defined($id) or define($id, $i);
-}
+defined('CODEBIRD_RETURNFORMAT_ARRAY') or define('CODEBIRD_RETURNFORMAT_ARRAY', 0);
+defined('CODEBIRD_RETURNFORMAT_JSON') or define('CODEBIRD_RETURNFORMAT_JSON', 1);
+defined('CODEBIRD_RETURNFORMAT_OBJECT') or define('CODEBIRD_RETURNFORMAT_OBJECT', 2);
+
 $constants = array(
     'CURLE_SSL_CERTPROBLEM' => 58,
     'CURLE_SSL_CACERT' => 60,
@@ -788,6 +787,8 @@ class CodebirdSN
 
         $possible_files = explode(' ', $possible_files[$method]);
 
+        $data = '';
+
         $multipart_border = '--------------------' . $this->_nonce();
         $multipart_request = '';
         foreach ($params as $key => $value) {
@@ -917,7 +918,7 @@ class CodebirdSN
             $authorization = 'Authorization: Bearer ' . self::$_oauth_bearer_token;
         }
         $request_headers = array();
-        if (isset($authorization)) {
+        if ($authorization !== '') {
             $request_headers[] = $authorization;
             $request_headers[] = 'Expect:';
         }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4bc32050..48f9c254 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -366,6 +366,8 @@ function statusnet_post_hook(array &$b)
 	$otoken  = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken');
 	$osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret');
 
+	$iscomment = null;
+
 	if ($ckey && $csecret && $otoken && $osecret) {
 		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent

From b6a47699bfc68e3c57af797053cf79efe4d96e78 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:07 +0000
Subject: [PATCH 032/161] fix errors in tictac addon

---
 tictac/tictac.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 10103835..082b58c1 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -7,7 +7,6 @@
  * Status: unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -30,7 +29,12 @@ function tictac_module() {}
 
 function tictac_content() {
 
-	$o = '';
+  $o        = '';
+  $dimen    = 3;
+  $handicap = 0;
+  $mefirst  = 0;
+  $yours    = '';
+  $mine     = '';
 
   if($_POST['move']) {
     $handicap = DI::args()->get(1);
@@ -45,9 +49,6 @@ function tictac_content() {
     $handicap = DI::args()->get(1);
     $dimen = 3;
   }
-  else {
-   $dimen = 3;
-  }
 
   $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
 
@@ -163,7 +164,7 @@ class tictac {
   ];
 
   function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
-    $this->dimen = 3;
+    $this->dimen = $dimen;
     $this->handicap = $handicap ? 1 : 0;
     $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
@@ -228,6 +229,8 @@ class tictac {
   }
 
   function parse_moves($player) {
+    $str = '';
+
     if($player == 'me')
       $str = $this->mine;
     if($player == 'you')

From 15c21cebb1bccd48a598c61d06b25d6fd8a43eb9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:58 +0000
Subject: [PATCH 033/161] Fix errors in wppost addon

---
 wppost/wppost.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index dba738de..f2ee5d21 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -259,9 +259,11 @@ EOT;
 
 		Logger::debug('wppost: data: ' . $xml);
 
+		$x = '';
+
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
+		Logger::info('posted to wordpress: ' . $x);
 	}
 }

From 4527df602fcc7efdf400ab1fecbcad78fa54a870 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 07:55:01 +0000
Subject: [PATCH 034/161] Add checks for CLD2Detector ans CLD2Encoding classes

---
 cld/cld.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cld/cld.php b/cld/cld.php
index 5ca4c932..83361e2b 100644
--- a/cld/cld.php
+++ b/cld/cld.php
@@ -22,6 +22,16 @@ function cld_detect_languages(array &$data)
 		return;
 	}
 
+	if (!class_exists('CLD2Detector')) {
+		Logger::warning('CLD2Detector class does not exist.');
+		return;
+	}
+
+	if (!class_exists('CLD2Encoding')) {
+		Logger::warning('CLD2Encoding class does not exist.');
+		return;
+	}
+
 	$cld2 = new \CLD2Detector();
 
 	$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding

From 9d172b70822ef58fcea267b05691c4a2afbad143 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 08:23:27 +0000
Subject: [PATCH 035/161] refactor convert addon, replace each() calls with
 foreach loop

---
 convert/convert.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

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

From 4a2fc7884c4315ca356efbfdf57f23a643b697a6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:38:55 +0000
Subject: [PATCH 036/161] remove wrong return tag

---
 convert/UnitConvertor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/convert/UnitConvertor.php b/convert/UnitConvertor.php
index d7933a8f..a3650e9b 100644
--- a/convert/UnitConvertor.php
+++ b/convert/UnitConvertor.php
@@ -169,7 +169,6 @@ 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)
@@ -280,4 +279,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
\ No newline at end of file
+?>

From 922bace555039e9fb6a79f482b672b639284cb3c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:40:45 +0000
Subject: [PATCH 037/161] Fix errors in diaspora addon

---
 diaspora/diasphp.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index 1588b582..266b9899 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -9,6 +9,8 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
+	private $token_regex;
+	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

From b6614483447a6ea2b4147b1ca9d719d691fa34e5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:43:21 +0000
Subject: [PATCH 038/161] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 18aa5c90..70fcfe39 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -217,7 +217,7 @@ class Services_Libravatar
      *
      * @param array $options Array of options for getUrl()
      *
-     * @return void
+     * @return array
      * @throws Exception When an invalid option is used
      */
     protected function checkOptionsArray($options)
@@ -462,6 +462,8 @@ class Services_Libravatar
                 return $v['target'];
             }
         }
+
+        return '';
     }
 
     /**

From def43f3167cd6746495e04389259d8adfbaaf2e0 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:52:59 +0000
Subject: [PATCH 039/161] Fix errors in mailstream addon

---
 mailstream/mailstream.php                | 2 +-
 mailstream/phpmailer/class.phpmailer.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index ae57c4dd..9910a63d 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -378,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));
diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ab7fe030..a47b13f7 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,6 +1519,7 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
+            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
@@ -2705,7 +2706,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);
                 }

From 1bd7cd6e71a99e891b570778ab90311f1a09b131 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:33:12 +0000
Subject: [PATCH 040/161] fix error in PHPMailer

---
 mailstream/phpmailer/class.phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index a47b13f7..ff3d81e3 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -2691,10 +2691,10 @@ class PHPMailer
             if (!is_readable($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = get_magic_quotes_runtime();
+            $magic_quotes = false;
             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+

From b5c647bd5ddea43f98b49ac773bc222ec208e1a8 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:55:15 +0000
Subject: [PATCH 041/161] fix errors in pnut addon, add support for PHP 7.4

---
 pnut/lib/phpnut.php | 173 +++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 81 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 303a860b..5794d795 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2,6 +2,8 @@
 
 namespace phpnut;
 
+use CURLFile;
+
 /**
  * phpnut.php
  * pnut.io PHP library
@@ -99,6 +101,10 @@ class phpnut
     // if processing stream_markers or any fast stream, decrease $sleepFor
     public $streamingSleepFor = 20000;
 
+    private $_clientId;
+
+    private $_clientSecret;
+
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
@@ -162,7 +168,7 @@ class phpnut
      * from the user. If you don't specify anything, you'll only receive
      * access to the user's basic profile (the default).
      */
-    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
+    public function getAuthUrl(?string $callback_uri=null, array $scope=null): string
     {
         if (empty($this->_clientId)) {
             throw new phpnutException('You must specify your pnut client ID');
@@ -256,8 +262,10 @@ class phpnut
     /**
      * Check the scope of current token to see if it has required scopes
      * has to be done after a check
+     *
+     * @return int|array
      */
-    public function checkScopes(array $app_scopes): int|array
+    public function checkScopes(array $app_scopes)
     {
         if (count($this->_scopes) === 0) {
             return -1; // _scope is empty
@@ -303,7 +311,7 @@ class phpnut
     {
         return $this->httpReq('delete', "{$this->_baseUrl}token");
     }
-    
+
     /**
      * Retrieve an app access token from the app.net API. This allows you
      * to access the API without going through the user access flow if you
@@ -314,7 +322,7 @@ class phpnut
      * @return string The app access token
      */
     public function getAppAccessToken()
-    {    
+    {
         if (empty($this->_clientId) || empty($this->_clientSecret)) {
             throw new phpnutException('You must specify your Pnut client ID and client secret');
         }
@@ -450,8 +458,10 @@ class phpnut
     /**
      * Internal function to handle all
      * HTTP requests (POST,PUT,GET,DELETE)
+     *
+     * @param string|array $params
      */
-    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
+    protected function httpReq(string $act, string $req, $params = [], string $contentType='application/x-www-form-urlencoded')
     {
         $ch = curl_init($req);
         $headers = [];
@@ -520,7 +530,7 @@ class phpnut
                     } else {
                         throw new phpnutException($response['error']);
                     }
-                } 
+                }
 
                 // look for response migration errors
                 elseif (isset($response['meta'], $response['meta']['error_message'])) {
@@ -588,7 +598,7 @@ class phpnut
     {
         return $this->_last_request;
     }
-    
+
     public function getLastResponse()
     {
         return $this->_last_response;
@@ -752,7 +762,7 @@ class phpnut
      * Retrieve the Posts that are 'in reply to' a specific Post.
      * @param integer $post_id The ID of the post you want to retrieve replies for.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostThread(int $post_id, array $params=[])
     {
@@ -767,7 +777,7 @@ class phpnut
      * Retrieve revisions of a post. Currently only one can be created.
      * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostRevisions(int $post_id, array $params=[])
     {
@@ -781,13 +791,13 @@ class phpnut
     /**
      * Get the most recent Posts created by a specific User in reverse
      * chronological order (most recent first).
-     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
+     * @param string|int $user_id $user_id Either the ID of the user you wish to retrieve posts by,
      * or the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserPosts(string|int $user_id='me', array $params=[])
+    public function getUserPosts($user_id = 'me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -799,13 +809,13 @@ class phpnut
     /**
      * Get the most recent Posts mentioning by a specific User in reverse
      * chronological order (newest first).
-     * @param mixed $user_id Either the ID of the user who is being mentioned, or
+     * @param string|int $user_id Either the ID of the user who is being mentioned, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserMentions(string|int $user_id='me', array $params=[])
+    public function getUserMentions($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -817,7 +827,7 @@ class phpnut
     /**
      * Get the currently authenticated user's recent messages
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserMessages(array $params=[])
     {
@@ -832,7 +842,7 @@ class phpnut
      * Return the 20 most recent posts from the current User and
      * the Users they follow.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserStream(array $params=[])
     {
@@ -847,7 +857,7 @@ class phpnut
      * Retrieve a list of all public Posts on pnut.io, often referred to as the
      * global stream.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPublicPosts(array $params=[])
     {
@@ -860,7 +870,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getPostExploreStreams()
     {
@@ -874,7 +884,7 @@ class phpnut
      * Retrieve a list of posts from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostExploreStream(string $slug, array $params=[])
     {
@@ -916,10 +926,11 @@ class phpnut
     * are:    count, before_id, since_id, include_muted, include_deleted,
     * and include_post_raw.
     * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
+    * @param string|int $user_id
     * @return array An array of associative arrays, each representing a single
     * user who has bookmarked a post
     */
-    public function getBookmarked(string|int $user_id='me', array $params=[])
+    public function getBookmarked($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -967,7 +978,7 @@ class phpnut
     /**
      * Repost an existing Post object.
      * @param integer $post_id The id of the post
-     * @return the reposted post
+     * @return mixed the reposted post
      */
     public function repost(int $post_id)
     {
@@ -980,7 +991,7 @@ class phpnut
     /**
      * Delete a post that the user has reposted.
      * @param integer $post_id The id of the post
-     * @return the un-reposted post
+     * @return mixed the un-reposted post
      */
     public function deleteRepost(int $post_id)
     {
@@ -997,7 +1008,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * include_directed_posts, and include_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function searchHashtags(string $hashtag, array $params=[])
     {
@@ -1044,7 +1055,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * and include_post_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserPersonalStream(array $params=[])
     {
@@ -1063,7 +1074,7 @@ class phpnut
             );
         }
     }
-    
+
     /**
     * Return the 20 most recent Posts from the current User's personalized stream
     * and mentions stream merged into one stream.
@@ -1071,7 +1082,7 @@ class phpnut
     * This will likely change as the API evolves, as of this writing allowed keys
     * are: count, before_id, since_id, include_muted, include_deleted,
     * include_directed_posts, and include_raw.
-    * @return An array of associative arrays, each representing a single post.
+    * @return array An array of associative arrays, each representing a single post.
     */
     public function getUserUnifiedStream(array $params=[])
     {
@@ -1096,14 +1107,14 @@ class phpnut
 
     /**
      * Returns a specific user object.
-     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
+     * @param string|int $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
      * "me" to retrieve data for the users you're currently authenticated as.
      * @param array $params An associative array of optional general parameters.
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: include_raw|include_user_raw.
      * @return array An associative array representing the user data.
      */
-    public function getUser(string|int $user_id='me', array $params=[])
+    public function getUser($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1131,10 +1142,10 @@ class phpnut
     /**
      * Add the specified user ID to the list of users followed.
      * Returns the User object of the user being followed.
-     * @param integer $user_id The user ID of the user to follow.
+     * @param string|int $user_id The user ID of the user to follow.
      * @return array An associative array representing the user you just followed.
      */
-    public function followUser(string|int $user_id)
+    public function followUser($user_id)
     {
         return $this->httpReq(
             'put',
@@ -1145,10 +1156,10 @@ class phpnut
     /**
      * Removes the specified user ID to the list of users followed.
      * Returns the User object of the user being unfollowed.
-     * @param integer $user_id The user ID of the user to unfollow.
+     * @param string|int $user_id The user ID of the user to unfollow.
      * @return array An associative array representing the user you just unfollowed.
      */
-    public function unfollowUser(string|int $user_id)
+    public function unfollowUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1158,13 +1169,13 @@ class phpnut
 
     /**
      * Returns an array of User objects the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowing(string|int $user_id='me', array $params=[])
+    public function getFollowing($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1172,31 +1183,31 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids the specified user is following.
      */
-    public function getFollowingIDs(string|int $user_id='me')
+    public function getFollowingIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
             "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
         );
     }
-    
+
     /**
      * Returns an array of User objects for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowers(string|int $user_id='me', array $params=[])
+    public function getFollowers($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1204,15 +1215,15 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids for users following the specified user
      */
-    public function getFollowersIDs(string|int $user_id='me')
+    public function getFollowersIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
@@ -1236,9 +1247,9 @@ class phpnut
 
     /**
      * Mute a user
-     * @param integer $user_id The user ID to mute
+     * @param string|int $user_id The user ID to mute
      */
-    public function muteUser(string|int $user_id)
+    public function muteUser($user_id)
     {
          return $this->httpReq(
             'put',
@@ -1248,9 +1259,9 @@ class phpnut
 
     /**
      * Unmute a user
-     * @param integer $user_id The user ID to unmute
+     * @param string|int $user_id The user ID to unmute
      */
-    public function unmuteUser(string|int $user_id)
+    public function unmuteUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1288,7 +1299,7 @@ class phpnut
      * @param string $search The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
-     * @return array An array of associative arrays, each representing one user.
+     * @return array|false An array of associative arrays, each representing one user.
      */
     public function searchUsers(array $params=[], string $query='')
     {
@@ -1333,7 +1344,7 @@ class phpnut
             $mimeType = $test['mime'];
         }
         $data = [
-            $which => new CurlFile($image, $mimeType)
+            $which => new CURLFile($image, $mimeType)
         ];
         return $this->httpReq(
             'post-raw',
@@ -1445,10 +1456,10 @@ class phpnut
 
     /**
      * get an existing private message channel between multiple users
-     * @param mixed $users Can be a comma- or space-separated string, or an array.
+     * @param string|array $users Can be a comma- or space-separated string, or an array.
      * Usernames with @-symbol, or user ids.
      */
-    public function getExistingPM(string|array $users, array $params=[])
+    public function getExistingPM($users, array $params=[])
     {
         if (is_string($users)) {
             $users = explode(',', str_replace(' ', ',', $users));
@@ -1561,7 +1572,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getChannelExploreStreams()
     {
@@ -1575,7 +1586,7 @@ class phpnut
      * Retrieve a list of channels from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single channel.
+     * @return array An array of associative arrays, each representing a single channel.
      */
     public function getChannelExploreStream(string $slug, array $params=[])
     {
@@ -1585,7 +1596,7 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * mark channel inactive
      */
@@ -1685,11 +1696,11 @@ class phpnut
 
     /**
      * create message
-     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
+     * @param string|int $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
      * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
      * @param array $params query parameters
      */
-    public function createMessage(string|int $channelid, array $data, array $params=[])
+    public function createMessage($channelid, array $data, array $params=[])
     {
         if (isset($data['destinations'])) {
             if (is_string($data['destinations'])) {
@@ -1802,16 +1813,16 @@ class phpnut
     public function createFile($file, array $data, array $params=[])
     {
         if (!$file) {
-            throw new PhpnutException('You must specify a path to a file');
+            throw new phpnutException('You must specify a path to a file');
         }
         if (!file_exists($file)) {
-            throw new PhpnutException('File path specified does not exist');
+            throw new phpnutException('File path specified does not exist');
         }
         if (!is_readable($file)) {
-            throw new PhpnutException('File path specified is not readable');
+            throw new phpnutException('File path specified is not readable');
         }
         if (!array_key_exists('type', $data) || !$data['type']) {
-            throw new PhpnutException('Type is required when creating a file');
+            throw new phpnutException('Type is required when creating a file');
         }
         if (!array_key_exists('name', $data)) {
             $data['name'] = basename($file);
@@ -1823,7 +1834,7 @@ class phpnut
             $mimeType = null;
         }
         if (!array_key_exists('kind', $data)) {
-            $test = @getimagesize($path);
+            $test = @getimagesize($file);
             if ($test && array_key_exists('mime', $test)) {
                 $data['kind'] = 'image';
                 if (!$mimeType) {
@@ -1840,7 +1851,7 @@ class phpnut
             finfo_close($finfo);
         }
         if (!$mimeType) {
-            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
+            throw new phpnutException('Unable to determine mime type of file, try specifying it explicitly');
         }
         $data['content'] = new \CurlFile($file, $mimeType);
         return $this->httpReq(
@@ -2001,7 +2012,7 @@ class phpnut
         $json = json_encode($data);
         return $this->httpReq(
             'post',
-            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
+            $this->_baseUrl.'polls?'.$this->buildQueryString($params),
             $json,
             'application/json'
         );
@@ -2019,7 +2030,7 @@ class phpnut
         return $this->httpReq(
             'put',
             $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
-            $json, 
+            $json,
             'application/json'
         );
     }
@@ -2118,7 +2129,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get User Information
      */
@@ -2129,7 +2140,7 @@ class phpnut
             "{$this->_baseUrl}token"
         );
     }
-    
+
     /**
      * Get Application Authorized User IDs
      */
@@ -2147,7 +2158,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get Application Authorized User Tokens
      */
@@ -2181,7 +2192,7 @@ class phpnut
     {
         $this->_streamCallback = $function;
     }
-    
+
     /**
      * Opens a stream that's been created for this user/app and starts sending
      * events/objects to your defined callback functions. You must define at
@@ -2231,7 +2242,7 @@ class phpnut
         );
         return true;
     }
-    
+
     /**
      * Close the currently open stream.
      * @return true;
@@ -2251,7 +2262,7 @@ class phpnut
         $this->_currentStream = null;
         $this->_multiStream = null;
     }
-    
+
     /**
      * Retrieve all streams for the current access token.
      * @return array An array of stream definitions.
@@ -2263,7 +2274,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Returns a single stream specified by a stream ID. The stream must have been
      * created with the current access token.
@@ -2276,7 +2287,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Creates a stream for the current app access token.
      *
@@ -2307,7 +2318,7 @@ class phpnut
         );
         return $response;
     }
-    
+
     /**
      * Update stream for the current app access token
      *
@@ -2338,7 +2349,7 @@ class phpnut
         );
         return $response;
     }
-     
+
     /**
      * Deletes a stream if you no longer need it.
      *
@@ -2352,7 +2363,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Deletes all streams created by the current access token.
      */
@@ -2363,7 +2374,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Internal function used to process incoming chunks from the stream. This is only
      * public because it needs to be accessed by CURL. Do not call or use this function
@@ -2394,7 +2405,7 @@ class phpnut
         }
         return strlen($data);
     }
-    
+
     /**
      * Opens a long lived HTTP connection to the pnut.io servers, and sends data
      * received to the httpStreamReceive function. As a general rule you should not
@@ -2426,7 +2437,7 @@ class phpnut
         $this->_lastStreamActivity = time();
         curl_multi_add_handle($this->_multiStream, $this->_currentStream);
     }
-    
+
     public function reconnectStream(): void
     {
         $this->closeStream();
@@ -2442,7 +2453,7 @@ class phpnut
         }
         $this->httpStream('get', $this->_streamUrl);
     }
-    
+
     /**
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
@@ -2487,7 +2498,7 @@ class phpnut
             }
         } while ($timeSoFar+$sleepFor < $microseconds);
     }
-    
+
     /**
      * Process an open stream forever. This function will never return, if you
      * want to perform other actions while consuming the stream, you should use

From 7d02c9b53ce095a8736f5f8dc190fefddad4e13a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:14:01 +0000
Subject: [PATCH 042/161] Fix errors in pumpio addon

---
 pumpio/oauth/http.php | 86 ++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/pumpio/oauth/http.php b/pumpio/oauth/http.php
index 5d5e23f0..3045e509 100644
--- a/pumpio/oauth/http.php
+++ b/pumpio/oauth/http.php
@@ -109,9 +109,11 @@ class http_class
 	var $connected_port = -1;
 	var $connected_ssl = 0;
 
+	private $content_length_set;
+
 	/* Private methods - DO NOT CALL */
 
-	Function Tokenize($string,$separator="")
+	private function Tokenize($string,$separator="")
 	{
 		if(!strcmp($separator,""))
 		{
@@ -135,18 +137,18 @@ class http_class
 		}
 	}
 
-	Function CookieEncode($value, $name)
+	private function CookieEncode($value, $name)
 	{
 		return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
 	}
 
-	Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		$this->error_code = $error_code;
 		return($this->error=$error);
 	}
 
-	Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		if(IsSet($php_error_message)
 		&& strlen($php_error_message))
@@ -154,7 +156,7 @@ class http_class
 		return($this->SetError($error, $error_code));
 	}
 
-	Function SetDataAccessError($error,$check_connection=0)
+	private function SetDataAccessError($error,$check_connection=0)
 	{
 		$this->error=$error;
 		$this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
@@ -174,7 +176,7 @@ class http_class
 		}
 	}
 
-	Function OutputDebug($message)
+	private function OutputDebug($message)
 	{
 		if($this->log_debug)
 			error_log($message);
@@ -188,7 +190,7 @@ class http_class
 		}
 	}
 
-	Function GetLine()
+	private function GetLine()
 	{
 		for($line="";;)
 		{
@@ -227,7 +229,7 @@ class http_class
 		}
 	}
 
-	Function PutLine($line)
+	private function PutLine($line)
 	{
 		if($this->debug)
 			$this->OutputDebug("C $line");
@@ -239,7 +241,7 @@ class http_class
 		return(1);
 	}
 
-	Function PutData($data)
+	private function PutData($data)
 	{
 		if(strlen($data))
 		{
@@ -254,7 +256,7 @@ class http_class
 		return(1);
 	}
 
-	Function FlushData()
+	private function FlushData()
 	{
 		if(!fflush($this->connection))
 		{
@@ -264,7 +266,7 @@ class http_class
 		return(1);
 	}
 
-	Function ReadChunkSize()
+	private function ReadChunkSize()
 	{
 		if($this->remaining_chunk==0)
 		{
@@ -289,7 +291,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadBytes($length)
+	private function ReadBytes($length)
 	{
 		if($this->use_curl)
 		{
@@ -356,7 +358,7 @@ class http_class
 		return($bytes);
 	}
 
-	Function EndOfInput()
+	private function EndOfInput()
 	{
 		if($this->use_curl)
 			return($this->read_response>=strlen($this->response));
@@ -367,7 +369,7 @@ class http_class
 		return(feof($this->connection));
 	}
 
-	Function Resolve($domain, &$ip, $server_type)
+	private function Resolve($domain, &$ip, $server_type)
 	{
 		if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
 			$ip=$domain;
@@ -385,7 +387,7 @@ class http_class
 		return('');
 	}
 
-	Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
+	private function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
 	{
 		$domain=$host_name;
 		$port = $host_port;
@@ -552,7 +554,7 @@ class http_class
 		}
 	}
 
-	Function Disconnect()
+	private function Disconnect()
 	{
 		if($this->debug)
 			$this->OutputDebug("Disconnected from ".$this->connected_host);
@@ -569,7 +571,7 @@ class http_class
 
 	/* Public methods */
 
-	Function GetRequestArguments($url, &$arguments)
+	public function GetRequestArguments($url, &$arguments)
 	{
 		$this->error = '';
 		$this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
@@ -621,7 +623,7 @@ class http_class
 		return("");
 	}
 
-	Function Open($arguments)
+	public function Open($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -750,7 +752,7 @@ class http_class
 		return("");
 	}
 
-	Function Close($force = 0)
+	public function Close($force = 0)
 	{
 		if($this->state=="Disconnected")
 			return("1 already disconnected");
@@ -767,7 +769,7 @@ class http_class
 		return($this->Disconnect());
 	}
 
-	Function PickCookies(&$cookies,$secure)
+	private function PickCookies(&$cookies,$secure)
 	{
 		if(IsSet($this->cookies[$secure]))
 		{
@@ -803,7 +805,7 @@ class http_class
 		}
 	}
 
-	Function GetFileDefinition($file, &$definition)
+	private function GetFileDefinition($file, &$definition)
 	{
 		$name="";
 		if(IsSet($file["FileName"]))
@@ -990,9 +992,6 @@ class http_class
 			if(GetType($length=@filesize($file["FileName"]))!="integer")
 			{
 				$error="it was not possible to determine the length of the file ".$file["FileName"];
-				if(IsSet($php_errormsg)
-				&& strlen($php_errormsg))
-					$error.=": ".$php_errormsg;
 				if(!file_exists($file["FileName"]))
 					$error="it was not possible to access the file ".$file["FileName"];
 				return($error);
@@ -1007,7 +1006,7 @@ class http_class
 		return("");
 	}
 
-	Function ConnectFromProxy($arguments, &$headers)
+	private function ConnectFromProxy($arguments, &$headers)
 	{
 		if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
 		|| (strlen($this->user_agent)
@@ -1052,7 +1051,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequest($arguments)
+	public function SendRequest($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1440,7 +1439,7 @@ class http_class
 		return("");
 	}
 
-	Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
+	private function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1472,7 +1471,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequestBody($data, $end_of_data)
+	private function SendRequestBody($data, $end_of_data)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1508,7 +1507,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyHeadersResponse(&$headers)
+	private function ReadReplyHeadersResponse(&$headers)
 	{
 		$headers=array();
 		if(strlen($this->error))
@@ -1635,7 +1634,7 @@ class http_class
 		return("");
 	}
 
-	Function Redirect(&$headers)
+	private function Redirect(&$headers)
 	{
 		if($this->follow_redirect)
 		{
@@ -1678,7 +1677,7 @@ class http_class
 		return("");
 	}
 
-	Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
+	private function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
 	{
 		if($proxy)
 		{
@@ -1697,9 +1696,10 @@ class http_class
 		if(IsSet($headers[$authenticate_header])
 		&& $this->sasl_authenticate)
 		{
-			if(function_exists("class_exists")
-			&& !class_exists("sasl_client_class"))
+			if(!class_exists('sasl_client_class'))
+			{
 				return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
+			}
 			if(GetType($headers[$authenticate_header])=="array")
 				$authenticate=$headers[$authenticate_header];
 			else
@@ -1719,7 +1719,7 @@ class http_class
 				else
 					$mechanisms[]=$mechanism;
 			}
-			$sasl=new sasl_client_class;
+			$sasl=new \sasl_client_class();
 			if(IsSet($user))
 				$sasl->SetCredential("user",$user);
 			if(IsSet($password))
@@ -1731,6 +1731,8 @@ class http_class
 			$sasl->SetCredential("uri",$this->request_uri);
 			$sasl->SetCredential("method",$this->request_method);
 			$sasl->SetCredential("session",$this->session);
+			$message = '';
+			$interactions = [];
 			do
 			{
 				$status=$sasl->Start($mechanisms,$message,$interactions);
@@ -1906,8 +1908,8 @@ class http_class
 		}
 		return("");
 	}
-	
-	Function ReadReplyHeaders(&$headers)
+
+	public function ReadReplyHeaders(&$headers)
 	{
 		if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
 			return($error);
@@ -1938,7 +1940,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyBody(&$body,$length)
+	private function ReadReplyBody(&$body,$length)
 	{
 		$body="";
 		if(strlen($this->error))
@@ -1980,7 +1982,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadWholeReplyBody(&$body)
+	public function ReadWholeReplyBody(&$body)
 	{
 		$body = '';
 		for(;;)
@@ -1993,7 +1995,7 @@ class http_class
 		}
 	}
 
-	Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
+	private function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
 	{
 		$now=gmdate("Y-m-d H-i-s");
 		$cookies=array();
@@ -2034,17 +2036,17 @@ class http_class
 		}
 	}
 
-	Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SaveCookies($cookies, $domain, $secure_only, 1);
 	}
 
-	Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SavePersistentCookies($cookies, $domain, $secure_only);
 	}
 
-	Function RestoreCookies($cookies, $clear=1)
+	private function RestoreCookies($cookies, $clear=1)
 	{
 		$new_cookies=($clear ? array() : $this->cookies);
 		for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++)

From 1e684172788b13cbdd723a2a56b0529f69dfe0d5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:18:20 +0000
Subject: [PATCH 043/161] Fix classes in s3_storage addon

---
 s3_storage/src/S3Client.php | 8 ++++----
 s3_storage/src/S3Config.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/s3_storage/src/S3Client.php b/s3_storage/src/S3Client.php
index 643df2b0..613eda97 100644
--- a/s3_storage/src/S3Client.php
+++ b/s3_storage/src/S3Client.php
@@ -4,10 +4,10 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile;
-use Akeeba\Engine\Postproc\Connector\S3v4\Input;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
+use Akeeba\S3\Exception\CannotDeleteFile;
+use Akeeba\S3\Input;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Util\Strings;
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
index 809cdd28..1831c666 100644
--- a/s3_storage/src/S3Config.php
+++ b/s3_storage/src/S3Config.php
@@ -4,8 +4,8 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;

From 82ed43f5076f8d14f7562ab68daf97b8ce8a0afa Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 7 Dec 2024 22:08:59 +0000
Subject: [PATCH 044/161] Fix errors

---
 curweather/curweather.php              | 4 ++--
 js_upload/file-uploader/server/php.php | 8 ++++----
 membersince/membersince.php            | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 9aa8584a..e5e2710d 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -29,10 +29,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	$now = new DateTime();
 
 	if (!is_null($cached)) {
-		$cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
+		$cdate = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
 		$cached = unserialize($cached);
 
-		if ($cdate + $cachetime > $now->getTimestamp()) {
+		if ($cdate + (int) $cachetime > $now->getTimestamp()) {
 			return $cached;
 		}
 	}
diff --git a/js_upload/file-uploader/server/php.php b/js_upload/file-uploader/server/php.php
index 2248c8f0..ff485dec 100644
--- a/js_upload/file-uploader/server/php.php
+++ b/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 = trim($str);
+		$val = (int) trim($str);
 		$last = strtolower($str[strlen($str) - 1]);
 
 		switch($last) {
diff --git a/membersince/membersince.php b/membersince/membersince.php
index f8128eb7..20e41ac9 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
@@ -19,7 +18,7 @@ function membersince_install()
 
 function membersince_display(array &$b)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
 		$doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8'));
@@ -39,7 +38,7 @@ function membersince_display(array &$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(DI::app()->profile['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local(DI::appHelper()->profile['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -50,6 +49,6 @@ function membersince_display(array &$b)
 		$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(DI::app()->profile['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::appHelper()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }

From 5b13274bed5c7f944a35b5b63739aba140e4bb1c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 21:02:07 +0000
Subject: [PATCH 045/161] Fix class name collision

---
 js_upload/js_upload.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 0d045dee..f1d85aa3 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -60,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 qqFileUploader($allowedExtensions, $sizeLimit);
+	$uploader = new js_upload_qqFileUploader($allowedExtensions, $sizeLimit);
 
 	$result = $uploader->handleUpload();
 
@@ -101,7 +101,7 @@ function js_upload_post_end(int &$b)
 /**
  * Handle file uploads via XMLHttpRequest
  */
-class qqUploadedFileXhr
+class js_upload_qqUploadedFileXhr
 {
 	private $pathnm = '';
 
@@ -155,7 +155,7 @@ class qqUploadedFileXhr
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
-class qqUploadedFileForm
+class js_upload_qqUploadedFileForm
 {
 	/**
 	 * Save the file to the specified path
@@ -183,7 +183,7 @@ class qqUploadedFileForm
 	}
 }
 
-class qqFileUploader
+class js_upload_qqFileUploader
 {
 	private $allowedExtensions;
 	private $sizeLimit;
@@ -197,9 +197,9 @@ class qqFileUploader
 		$this->sizeLimit = $sizeLimit;
 
 		if (isset($_GET['qqfile'])) {
-			$this->file = new qqUploadedFileXhr();
+			$this->file = new js_upload_qqUploadedFileXhr();
 		} elseif (isset($_FILES['qqfile'])) {
-			$this->file = new qqUploadedFileForm();
+			$this->file = new js_upload_qqUploadedFileForm();
 		} else {
 			$this->file = false;
 		}

From 2fe37c6d4a26a795b5c06cf15a90b6b4a2d363fb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 21:24:03 +0000
Subject: [PATCH 046/161] Fix errors in pnut addon

---
 mailstream/phpmailer/class.phpmailer.php |  1 -
 pnut/lib/phpnut.php                      | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index dcf02361..3aec2255 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,7 +1519,6 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
-            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 89d5e5f8..a8e97db4 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -108,7 +108,7 @@ class phpnut
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
-     * @param string $client_id The client ID you received from pnut.io when
+     * @param string $client_id_or_token The client ID you received from pnut.io when
      * creating your app.
      * @param string $client_secret The client secret you received from
      * pnut.io when creating your app.
@@ -161,7 +161,7 @@ class phpnut
      * or not access to your app. Usually you would place this as a link for
      * the user to client, or a redirect to send them to the auth URL.
      * Also can be called after authentication for additional scopes
-     * @param string $callbackUri Where you want the user to be directed
+     * @param string $callback_uri Where you want the user to be directed
      * after authenticating with pnut.io. This must be one of the URIs
      * allowed by your pnut.io application settings.
      * @param array $scope An array of scopes (permissions) you wish to obtain
@@ -748,7 +748,7 @@ class phpnut
      * Delete a Post. The current user must be the same user who created the Post.
      * It returns the deleted Post on success.
      * @param integer $post_id The ID of the post to delete
-     * @param array An associative array representing the post that was deleted
+     * @return array An associative array representing the post that was deleted
      */
     public function deletePost(int $post_id)
     {
@@ -1296,7 +1296,7 @@ class phpnut
 
     /**
      * List the users who match a specific search term
-     * @param string $search The search query. Supports @username or #tag searches as
+     * @param string $query The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
      * @return array|false An array of associative arrays, each representing one user.
@@ -2023,7 +2023,7 @@ class phpnut
     /**
      * Responds to a poll.
      * @param integer $poll_id The ID of the poll to respond to
-     * @param array list of positions for the poll response
+     * @param array $positions list of positions for the poll response
      * @param array $params An associative array of optional general parameters.
      */
     public function respondToPoll(int $poll_id, array $positions, array $params=[])
@@ -2098,8 +2098,6 @@ class phpnut
      * List the polls that match a specific search term
      * @param array $params a list of filter, search query, and general Poll parameters
      * see: https://docs.pnut.io/resources/channels/search
-     * @param string $query The search query. Supports
-     * normal search terms.
      * @return array An array of associative arrays, each representing one poll.
      * or false on error
      */
@@ -2186,7 +2184,7 @@ class phpnut
      * whenever an event is received via an open pnut.io stream. Your function
      * will receive a single parameter, which is the object wrapper containing
      * the meta and data.
-     * @param mixed A PHP callback (either a string containing the function name,
+     * @param mixed $fuction A PHP callback (either a string containing the function name,
      * or an array where the first element is the class/object and the second
      * is the method).
      */
@@ -2247,7 +2245,6 @@ class phpnut
 
     /**
      * Close the currently open stream.
-     * @return true;
      */
     public function closeStream(): void
     {
@@ -2460,7 +2457,7 @@ class phpnut
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
      * consume the stream without other actions, you can call processForever() instead.
-     * @param float @microseconds The number of microseconds to process for before
+     * @param null|float $microseconds The number of microseconds to process for before
      * returning. There are 1,000,000 microseconds in a second.
      *
      * @return void

From 89a673cc11f840a856d2e4f703f12d0f383fd252 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 22:19:58 +0000
Subject: [PATCH 047/161] Fix typo

---
 pnut/lib/phpnut.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index a8e97db4..ff765243 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2177,14 +2177,12 @@ class phpnut
         );
     }
 
-
-
     /**
      * Registers your function (or an array of object and method) to be called
      * whenever an event is received via an open pnut.io stream. Your function
      * will receive a single parameter, which is the object wrapper containing
      * the meta and data.
-     * @param mixed $fuction A PHP callback (either a string containing the function name,
+     * @param mixed $function A PHP callback (either a string containing the function name,
      * or an array where the first element is the class/object and the second
      * is the method).
      */

From b99ac65c0bbca1b5c8c94922fe1114b3501c953e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 22:49:23 +0000
Subject: [PATCH 048/161] Fix errors in membersince addon

---
 membersince/membersince.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/membersince/membersince.php b/membersince/membersince.php
index 20e41ac9..448b8cf2 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -9,6 +9,7 @@
 
 use Friendica\Core\Hook;
 use Friendica\DI;
+use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
 function membersince_install()
@@ -18,6 +19,18 @@ function membersince_install()
 
 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') {
 		// Works in Frio.
 		$doc = new DOMDocument();
@@ -38,7 +51,7 @@ function membersince_display(array &$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(DI::appHelper()->profile['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local($user['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -49,6 +62,6 @@ function membersince_display(array &$b)
 		$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(DI::appHelper()->profile['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($user['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }

From cfb6b3123f9a3e593c4316967ebefc78e01c4bba Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 23:06:51 +0000
Subject: [PATCH 049/161] Fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php     | 24 +++++++++++++-----------
 statusnet/library/statusnetoauth.php |  5 -----
 statusnet/library/twitteroauth.php   |  4 +---
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 91e256be..70743356 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -116,7 +116,7 @@ class CodebirdSN
      * Returns singleton class instance
      * Always use this method unless you're working with multiple authenticated users at once
      *
-     * @return Codebird The instance
+     * @return CodebirdSN The instance
      */
     public static function getInstance()
     {
@@ -420,6 +420,7 @@ class CodebirdSN
                 }
                 break;
             case CODEBIRD_RETURNFORMAT_OBJECT:
+                /** @var object $reply */
                 $reply->httpstatus = $httpstatus;
                 if ($httpstatus == 200) {
                     self::setBearerToken($reply->access_token);
@@ -490,7 +491,7 @@ class CodebirdSN
     /**
      * Generates a (hopefully) unique random string
      *
-     * @param int optional $length The length of the string to generate
+     * @param int $length The optional length of the string to generate
      *
      * @return string The random string
      */
@@ -505,9 +506,9 @@ class CodebirdSN
     /**
      * Generates an OAuth signature
      *
-     * @param string          $httpmethod Usually either 'GET' or 'POST' or 'DELETE'
-     * @param string          $method     The API method to call
-     * @param array  optional $params     The API call parameters, associative
+     * @param string $httpmethod Usually either 'GET' or 'POST' or 'DELETE'
+     * @param string $method     The API method to call
+     * @param array  $params     optional The API call parameters, associative
      *
      * @return string Authorization HTTP header
      */
@@ -871,12 +872,12 @@ class CodebirdSN
     /**
      * Calls the API using cURL
      *
-     * @param string          $httpmethod      The HTTP method to use for making the request
-     * @param string          $method          The API method to call
-     * @param string          $method_template The templated API method to call
-     * @param array  optional $params          The parameters to send along
-     * @param bool   optional $multipart       Whether to use multipart/form-data
-     * @param bool   optional $app_only_auth   Whether to use app-only bearer authentication
+     * @param string $httpmethod      The HTTP method to use for making the request
+     * @param string $method          The API method to call
+     * @param string $method_template The templated API method to call
+     * @param array  $params          optional The parameters to send along
+     * @param bool   $multipart       optional Whether to use multipart/form-data
+     * @param bool   $app_only_auth   optional Whether to use app-only bearer authentication
      *
      * @return mixed The API reply, encoded in the set return_format
      */
@@ -959,6 +960,7 @@ class CodebirdSN
         $httpstatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         $reply = $this->_parseApiReply($method_template, $reply);
         if ($this->_return_format == CODEBIRD_RETURNFORMAT_OBJECT) {
+            /** @var object $reply */
             $reply->httpstatus = $httpstatus;
         } elseif ($this->_return_format == CODEBIRD_RETURNFORMAT_ARRAY) {
             $reply['httpstatus'] = $httpstatus;
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index c9bb0163..c32b2b4f 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -52,11 +52,6 @@ class StatusNetOAuth extends TwitterOAuth
 	 *
 	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
 	 *
-	 * @param string $method
-	 * @param string $host
-	 * @param string $path
-	 * @param array  $parameters
-	 *
 	 * @return array|object API results
 	 */
 	function http($url, $method, $postfields = NULL)
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index b33b5f9d..bf413d23 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -93,7 +93,7 @@ class TwitterOAuth
 	/**
 	 * Get a request_token
 	 *
-	 * @param callback $oauth_callback
+	 * @param callable $oauth_callback
 	 * @return array
 	 */
 	function getRequestToken($oauth_callback = null)
@@ -112,8 +112,6 @@ class TwitterOAuth
 	/**
 	 * Get the authorize URL
 	 *
-	 * @param array $token
-	 * @param bool $sign_in_with_tumblr
 	 * @return string
 	 */
 	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)

From fff140ad4360376df6b2e9cb58ac4d2986baee73 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 9 Dec 2024 23:08:31 +0000
Subject: [PATCH 050/161] Fix last 3 errors

---
 showmore/showmore.php            | 2 +-
 statusnet/library/codebirdsn.php | 2 ++
 tesseract/tesseract.php          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 8e85925a..e326aa98 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -79,6 +78,7 @@ function get_body_length($body)
 	 * Checking any possible syntax of the style attribute with xpath is impossible
 	 * So we just get any element with a style attribute, and check them with a regexp
 	 */
+	/** @var DOMNodeList $xr */
 	$xr = $xpath->query('//*[@style]');
 	foreach ($xr as $node) {
 		if (preg_match('/.*display: *none *;.*/',$node->getAttribute('style'))) {
diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 70743356..9807d97f 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -54,6 +54,8 @@ unset($id);
  *
  * @package codebird
  * @subpackage codebird-php
+ *
+ * @method object statuses_update(array $postdata)
  */
 class CodebirdSN
 {
diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index b3e1feb6..4c630dbb 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -26,6 +26,7 @@ function tesseract_ocr_detection(&$media)
 	try {
 		$languages = $ocr->availableLanguages();
 		if ($languages) {
+			/** @phpstan-ignore-next-line ignore call of \thiagoalessio\TesseractOCR\Option::lang() */
 			$ocr->lang(implode('+', $languages));
 		}
 		$ocr->tempDir(System::getTempPath());
@@ -33,5 +34,5 @@ function tesseract_ocr_detection(&$media)
 		$media['description'] = $ocr->run();
 	} catch (\Throwable $th) {
 		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
-	}			
+	}
 }

From 5f7482d081b4f41164c9e9c07ad65f6c65880fb7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 11 Dec 2024 21:42:48 +0000
Subject: [PATCH 051/161] Remove unused use statements for App

---
 .../advancedcontentfilter.php                 |  2 --
 birdavatar/birdavatar.php                     |  1 -
 blackout/blackout.php                         |  1 -
 buglink/buglink.php                           |  1 -
 calc/calc.php                                 | 11 +++++-----
 catavatar/catavatar.php                       |  2 --
 cookienotice/cookienotice.php                 |  1 -
 diaspora/diaspora.php                         |  1 -
 discourse/discourse.php                       |  1 -
 dwpost/dwpost.php                             |  1 -
 fancybox/fancybox.php                         |  1 -
 fromapp/fromapp.php                           |  3 +--
 geocoordinates/geocoordinates.php             |  1 -
 geonames/geonames.php                         |  1 -
 gnot/gnot.php                                 |  5 ++---
 googlemaps/googlemaps.php                     |  1 -
 gravatar/gravatar.php                         |  3 ---
 group_text/group_text.php                     |  2 --
 highlightjs/highlightjs.php                   |  1 -
 ifttt/ifttt.php                               |  1 -
 ijpost/ijpost.php                             |  1 -
 impressum/impressum.php                       |  1 -
 .../infiniteimprobabilitydrive.php            |  1 -
 irc/irc.php                                   |  1 -
 krynn/krynn.php                               |  1 -
 ldapauth/ldapauth.php                         |  1 -
 libertree/libertree.php                       |  1 -
 libravatar/libravatar.php                     |  1 -
 markdown/markdown.php                         |  1 -
 mathjax/mathjax.php                           |  1 -
 morechoice/morechoice.php                     |  1 -
 morepokes/morepokes.php                       |  1 -
 newmemberwidget/newmemberwidget.php           |  1 -
 nitter/nitter.php                             |  1 -
 nominatim/nominatim.php                       |  1 -
 notifyall/notifyall.php                       |  2 --
 numfriends/numfriends.php                     |  5 ++---
 openstreetmap/openstreetmap.php               |  1 -
 opmlexport/opmlexport.php                     |  4 ----
 pageheader/pageheader.php                     |  3 +--
 phpmailer/phpmailer.php                       |  1 -
 piwik/piwik.php                               |  3 +--
 planets/planets.php                           |  1 -
 public_server/public_server.php               |  1 -
 qcomment/qcomment.php                         |  1 -
 randplace/randplace.php                       |  1 -
 rendertime/rendertime.php                     |  1 -
 s3_storage/s3_storage.php                     |  1 -
 securemail/SecureTestEmail.php                |  1 -
 securemail/securemail.php                     |  7 -------
 showmore_dyn/showmore_dyn.php                 |  4 ----
 .../lang/smiley_pack_es/smiley_pack_es.php    | 21 +++++++++----------
 .../lang/smiley_pack_fr/smiley_pack_fr.php    | 19 ++++++++---------
 smileybutton/smileybutton.php                 |  1 -
 smilies_adult/smilies_adult.php               |  5 ++---
 startpage/startpage.php                       |  1 -
 statusnet/statusnet.php                       |  1 -
 testdrive/testdrive.php                       |  1 -
 unicode_smilies/unicode_smilies.php           |  7 +++----
 viewsrc/viewsrc.php                           |  1 -
 webrtc/webrtc.php                             |  1 -
 61 files changed, 36 insertions(+), 115 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 84eb468c..329156f1 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -33,7 +33,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
@@ -42,7 +41,6 @@ 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;
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 4841ba52..9a9dce0a 100644
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -6,7 +6,6 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 55fb8d32..a3f806ff 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,7 +44,6 @@
  * THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/buglink/buglink.php b/buglink/buglink.php
index 78fb8bef..b7dd6504 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/calc/calc.php b/calc/calc.php
index a8a340c4..76d1805c 100644
--- a/calc/calc.php
+++ b/calc/calc.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -16,7 +15,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>';
 }
 
 /**
@@ -296,7 +295,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">
@@ -323,7 +322,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">
@@ -345,13 +344,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>
 
 
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2116ac44..2bdf0cca 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -6,11 +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\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 2bd6f9b1..bc9d2416 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -7,7 +7,6 @@
  * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 979204ba..d6c98e34 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -9,7 +9,6 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/discourse/discourse.php b/discourse/discourse.php
index 298b3f3e..e97a4fd8 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1ecd9764..7ce30086 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -8,7 +8,6 @@
  * 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;
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 73bbdab9..8608bcd7 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 0d5a5b16..8bd27606 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -76,6 +75,6 @@ function fromapp_post_hook(&$item)
 
 	$apps = explode(',', $app);
 	$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-	
+
 	return;
 }
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 5cb90efd..eb56f093 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/geonames/geonames.php b/geonames/geonames.php
index dcbd65f8..668eb0e7 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 15fb4da0..5d0919cb 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -4,11 +4,10 @@
  * 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;
@@ -38,7 +37,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)
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index 356ce68c..b83a9cf9 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 83a8fbb9..ca5eaaf0 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -6,15 +6,12 @@
  * 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
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 02e9fd0a..e5067fb5 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -8,9 +8,7 @@
  * Note: Please use Circle Text instead
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index 097d34c7..c1c2aac8 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -6,7 +6,6 @@
  * Author: Hypolite Petovan <hypolite@mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 6d4f402c..51fa8db8 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -6,7 +6,6 @@
  * 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;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index f22dfff2..37c3cd45 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -8,7 +8,6 @@
  * 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;
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 754cb828..19ade933 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -7,7 +7,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index aff7aec0..9eb6ab36 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -6,7 +6,6 @@
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/irc/irc.php b/irc/irc.php
index d4435851..db808a99 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -7,7 +7,6 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/krynn/krynn.php b/krynn/krynn.php
index f7e77c26..fa9db133 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -10,7 +10,6 @@
  *"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;
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 38e2d6a1..14686e99 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -29,7 +29,6 @@
  * 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;
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 1d997123..c138e597 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -6,7 +6,6 @@
  * 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;
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 54594b88..b0b2c214 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 6f459244..0822ac83 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -5,7 +5,6 @@
  * 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;
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index d0046cf7..e96aaddf 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -8,7 +8,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index fe726d27..fbb88ce1 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -8,7 +8,6 @@
  * Status: Deprecated
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php
index abe59a6e..2ac09a73 100644
--- a/morepokes/morepokes.php
+++ b/morepokes/morepokes.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 01977d0c..d3b68807 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -6,7 +6,6 @@
  * 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;
diff --git a/nitter/nitter.php b/nitter/nitter.php
index 946b18c0..adbfd6b0 100644
--- a/nitter/nitter.php
+++ b/nitter/nitter.php
@@ -25,7 +25,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
index 6ad4a8a3..a3d14af5 100644
--- a/nominatim/nominatim.php
+++ b/nominatim/nominatim.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 966a9184..d37bac56 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,9 +9,7 @@
  */
 
 use Friendica\Addon\notifyall\NotifyAllEmail;
-use Friendica\App;
 use Friendica\Database\DBA;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 538a4a3e..66c9b74a 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -39,7 +38,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.
  *
  */
@@ -50,7 +49,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],
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ae22aff0..c520514c 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index fdfacc3e..3df71275 100644
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -8,12 +8,8 @@
  */
 
 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;
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 057bb863..d729acc1 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -5,10 +5,9 @@
  * 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;
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 4c12709d..5e137b94 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fd6d5fc9..b7b49bd4 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -35,7 +35,6 @@
  *     setting.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -76,7 +75,7 @@ function piwik_analytics(string &$b)
 	 *   Add the Piwik tracking code for the site.
 	 *   If async is set to true use asynchronous tracking
 	 */
-	
+
 	$scriptAsyncValue = $async ? 'true' : 'false';
 	$scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php';
 	$scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js';
diff --git a/planets/planets.php b/planets/planets.php
index 8a206fb5..d96e33a6 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -7,7 +7,6 @@
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7591c7d0..5834f42a 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -6,7 +6,6 @@
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 1b8bfcbf..f7126531 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -18,7 +18,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 34f48c6c..5cb07597 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -19,7 +19,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 731cf003..1cce5b1b 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/s3_storage/s3_storage.php b/s3_storage/s3_storage.php
index 361577be..c08c3172 100644
--- a/s3_storage/s3_storage.php
+++ b/s3_storage/s3_storage.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\s3_storage\src\S3Client;
 use Friendica\Addon\s3_storage\src\S3Config;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
index c614104f..32510091 100644
--- a/securemail/SecureTestEmail.php
+++ b/securemail/SecureTestEmail.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Addon\securemail;
 
-use Friendica\App;
 use Friendica\App\BaseURL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 61125587..b56c0cbc 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Addon\securemail\SecureTestEmail;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -32,8 +31,6 @@ function securemail_install()
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
  * @param array $data
- *
- * @see   App
  */
 function securemail_settings(array &$data)
 {
@@ -67,8 +64,6 @@ function securemail_settings(array &$data)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
  * @param array $b hook data
- *
- * @see   App
  */
 function securemail_settings_post(array &$b)
 {
@@ -102,8 +97,6 @@ function securemail_settings_post(array &$b)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
  *
  * @param IEmail $email Email
- *
- * @see   App
  */
 function securemail_emailer_send_prepare(IEmail &$email)
 {
diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
index 7cb64bcc..4c2e62f5 100644
--- a/showmore_dyn/showmore_dyn.php
+++ b/showmore_dyn/showmore_dyn.php
@@ -7,12 +7,8 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 
 function showmore_dyn_install()
diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
index 38b208da..0f41101d 100644
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -3,11 +3,10 @@
  * Name: Smiley Pack (Español)
  * Description: Pack of smileys that make master too AOLish.
  * Version: 1.02
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -19,7 +18,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -49,7 +48,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':vaca';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
-    
+
 	$b['texts'][] = ':cangrejo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
@@ -70,7 +69,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':caballo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
-  
+
 	$b['texts'][] = ':loro';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
@@ -107,7 +106,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':cuna';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
-	
+
 
 	$b['texts'][] = ':embarazada';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
@@ -116,10 +115,10 @@ function smiley_pack_smilies_es(array &$b) {
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':confundido';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
-    
+
 	$b['texts'][] = ':encogehombros';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
@@ -154,13 +153,13 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':diabólico';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
-	
+
 	$b['texts'][] = ':adbalancín';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
 	$b['texts'][] = ':vuelvedemonio';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
-	
+
 	$b['texts'][] = ':santo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
@@ -242,7 +241,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':billar';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
-  
+
 	$b['texts'][] = ':tenis';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 63cf613e..c5474e3c 100644
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -23,7 +22,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -56,7 +55,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':vache';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
-    
+
 	$b['texts'][] = ':crabe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
@@ -74,7 +73,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':cheval';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
-  
+
 	$b['texts'][] = ':perroquet';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
@@ -108,7 +107,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':litbébé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
-	
+
 
 	$b['texts'][] = ':enceinte';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
@@ -117,10 +116,10 @@ function smiley_pack_fr_smilies(array &$b)
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':paumé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
-    
+
 	$b['texts'][] = ':hausseépaules';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
@@ -152,13 +151,13 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':démoniaque';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
-	
+
 	$b['texts'][] = ':bascule';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
 	$b['texts'][] = ':possédé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
-	
+
 	$b['texts'][] = ':tombe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
@@ -225,7 +224,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':billard';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
-  
+
 	$b['texts'][] = ':équitation';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index 1df717b7..ae0e783b 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index e8af21e1..4a80168d 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -4,12 +4,11 @@
  * Description: Smily icons that could or should not be included in core
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  * This is a template for how to extend the "smily" code.
- * 
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/startpage/startpage.php b/startpage/startpage.php
index e4d80c0c..558af473 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 48f9c254..bd115115 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -38,7 +38,6 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
 
 use CodebirdSN\CodebirdSN;
-use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 55645284..40f22e0a 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 22ee3439..b39c6f10 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -7,7 +7,6 @@
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
 
@@ -691,7 +690,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':custard:', '&#x1F36E');
 	Smilies::add($b, ':honey pot:', '&#x1F36F');
 
-// drink  
+// drink
 	Smilies::add($b, ':baby bottle:', '&#x1F37C');
 	Smilies::add($b, ':glass of milk:', '&#x1F95B');
 	Smilies::add($b, ':hot beverage:', '&#x2615');
@@ -1123,7 +1122,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':control knobs:', '&#x1F39B');
 	Smilies::add($b, ':microphone:', '&#x1F3A4');
 	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
+	Smilies::add($b, ':radio:', '&#x1F4FB');
 
 // musical-instrument
 	Smilies::add($b, ':saxophone:', '&#x1F3B7');
@@ -1529,7 +1528,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
 	Smilies::add($b, ':OK button:', '&#x1F197');
 	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
+	Smilies::add($b, ':SOS button:', '&#x1F198');
 	Smilies::add($b, ':UP! button:', '&#x1F199');
 	Smilies::add($b, ':VS button:', '&#x1F19A');
 	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index c4d21ccb..bd07b541 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index e142b374..e5d4ce6e 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -7,7 +7,6 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

From 84659fc1ad339b0f7cee0b8d11ede9ea9aafba07 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 11 Dec 2024 21:47:10 +0000
Subject: [PATCH 052/161] Replace DI::app() with DI::appHelper()

---
 advancedcontentfilter/advancedcontentfilter.php | 2 +-
 bluesky/bluesky.php                             | 2 +-
 fancybox/fancybox.php                           | 2 +-
 geonames/geonames.php                           | 2 +-
 gravatar/gravatar.php                           | 2 +-
 highlightjs/highlightjs.php                     | 2 +-
 impressum/impressum.php                         | 2 +-
 ldapauth/ldapauth.php                           | 2 +-
 libravatar/libravatar.php                       | 2 +-
 openstreetmap/openstreetmap.php                 | 2 +-
 phpmailer/phpmailer.php                         | 2 +-
 piwik/piwik.php                                 | 2 +-
 pnut/pnut.php                                   | 2 +-
 public_server/public_server.php                 | 2 +-
 pumpio/pumpio.php                               | 2 +-
 smileybutton/smileybutton.php                   | 6 +++---
 testdrive/testdrive.php                         | 2 +-
 tumblr/tumblr.php                               | 2 +-
 twitter/twitter.php                             | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 329156f1..c03034cd 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -271,7 +271,7 @@ function advancedcontentfilter_content()
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
+			'$current_theme' => DI::appHelper()->getCurrentTheme(),
 			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 91e524fe..aa4bc340 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -98,7 +98,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 8608bcd7..b1a1ff35 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -39,7 +39,7 @@ function fancybox_render(array &$b){
 		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::app()->getCurrentTheme(),['vier','frio']))
+			//if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
 			$text = preg_replace(
 				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
 				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
diff --git a/geonames/geonames.php b/geonames/geonames.php
index 668eb0e7..d14b1e8f 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -34,7 +34,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index ca5eaaf0..6007c433 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -25,7 +25,7 @@ function gravatar_install() {
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index c1c2aac8..762f4117 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -17,7 +17,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 19ade933..f61d7182 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -55,7 +55,7 @@ function impressum_footer(string &$body)
 
 function impressum_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(string &$body)
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 14686e99..f834b4d5 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -44,7 +44,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(array &$b)
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index b0b2c214..4cd72c83 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -25,7 +25,7 @@ function libravatar_install()
 
 function libravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index c520514c..fc5ebbbe 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -36,7 +36,7 @@ function openstreetmap_install()
 
 function openstreetmap_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(&$navHtml)
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 5e137b94..f4bb7753 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -24,7 +24,7 @@ function phpmailer_install()
 
 function phpmailer_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/piwik/piwik.php b/piwik/piwik.php
index b7b49bd4..fc459a87 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -50,7 +50,7 @@ function piwik_install() {
 
 function piwik_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(string &$b)
diff --git a/pnut/pnut.php b/pnut/pnut.php
index 32f60f6d..f298997b 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -90,7 +90,7 @@ function pnut_connect()
 
 function pnut_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pnut_addon_admin(string &$o)
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 5834f42a..eb7af1e7 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -28,7 +28,7 @@ function public_server_install()
 
 function public_server_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account($b)
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d7c2ac32..ffe5f187 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -319,7 +319,7 @@ function pumpio_settings_post(array &$b)
 
 function pumpio_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(array &$b)
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index ae0e783b..4d0a8d42 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -19,7 +19,7 @@ function smileybutton_install()
 function smileybutton_jot_tool(string &$body)
 {
 	// Disable if theme is quattro
-	if (DI::app()->getCurrentTheme() == 'quattro') {
+	if (DI::appHelper()->getCurrentTheme() == 'quattro') {
 		return;
 	}
 
@@ -96,7 +96,7 @@ function smileybutton_jot_tool(string &$body)
 	$s .= '</tr></table>';
 
 	//Add css to header
-	$css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css';
+	$css_file = __DIR__ . '/view/' . DI::appHelper()->getCurrentTheme() . '.css';
 	if (!file_exists($css_file)) {
 		$css_file = __DIR__ . '/view/default.css';
 	}
@@ -104,7 +104,7 @@ function smileybutton_jot_tool(string &$body)
 	DI::page()->registerStylesheet($css_file);
 
 	//Get the correct image for the theme
-	$image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png';
+	$image = 'addon/smileybutton/view/' . DI::appHelper()->getCurrentTheme() . '.png';
 	if (!file_exists($image)) {
 		$image = 'addon/smileybutton/view/default.png';
 	}
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 40f22e0a..90fb5918 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -26,7 +26,7 @@ function testdrive_install()
 
 function testdrive_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(array &$b)
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 1e9f5c7f..580d73e6 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -65,7 +65,7 @@ function tumblr_install()
 
 function tumblr_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function tumblr_check_item_notification(array &$notification_data)
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 10f8a2fb..ea4ae356 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -67,7 +67,7 @@ function twitter_install()
 
 function twitter_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_jot_nets(array &$jotnets_fields)

From 31198294c787497d0c5cb4bcf081e5a15db084e5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 29 Nov 2024 22:36:05 +0000
Subject: [PATCH 053/161] Fix error in bluesky addon

---
 bluesky/bluesky.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 38934feb..8e2c1ca0 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1563,7 +1563,7 @@ function bluesky_get_uri_class(string $uri): ?stdClass
 	}
 
 	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
+	if ($elements[0] !== 'at') {
 		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
 		return bluesky_get_uri_class($post['extid'] ?? '');
 	}

From cf8a7870f3765db549ec961cf28f7fc7b8e466ad Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:27:45 +0000
Subject: [PATCH 054/161] Fix errors in bluesky addon

---
 bluesky/bluesky.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 8e2c1ca0..91e524fe 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -683,6 +683,8 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
+	$post = [];
+
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,

From 1860e732aee24ee9b1f6677e7b8f5c503f226db6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:28:38 +0000
Subject: [PATCH 055/161] Fix errors in convert addon

---
 convert/convert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/convert/convert.php b/convert/convert.php
index 2c97e2aa..2545974c 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -181,7 +181,7 @@ function convert_content() {
 		}
 	}
 
-	$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>';

From 81f232d57e8991ca342751d0db2d2680ec7bc7c8 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:30:39 +0000
Subject: [PATCH 056/161] Fix errors in js_upload addon

---
 .../file-uploader/tests/action-acceptance.php    | 16 ++++++++--------
 .../tests/action-handler-queue-test.php          |  8 ++++----
 .../file-uploader/tests/action-handler-test.php  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/js_upload/file-uploader/tests/action-acceptance.php b/js_upload/file-uploader/tests/action-acceptance.php
index fc9583f2..172b8857 100644
--- a/js_upload/file-uploader/tests/action-acceptance.php
+++ b/js_upload/file-uploader/tests/action-acceptance.php
@@ -2,12 +2,12 @@
 
 usleep(100000);
 
-$fileName;
-$fileSize;
+$fileName = '';
+$fileSize = 0;;
 
 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"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-queue-test.php b/js_upload/file-uploader/tests/action-handler-queue-test.php
index ff13576d..78760d64 100644
--- a/js_upload/file-uploader/tests/action-handler-queue-test.php
+++ b/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"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-test.php b/js_upload/file-uploader/tests/action-handler-test.php
index 24466b12..9fa72023 100644
--- a/js_upload/file-uploader/tests/action-handler-test.php
+++ b/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"}');
 }

From 3cf53a334d3d04df83b35423f31a916eea0ab492 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:32:07 +0000
Subject: [PATCH 057/161] Fix errors in keycloakpassword addon

---
 keycloakpassword/keycloakpassword.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index bfff4ea4..e9809f86 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -6,7 +6,6 @@
  * Author: Ryan <https://verya.pe/profile/ryan>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -92,7 +91,7 @@ function keycloakpassword_authenticate(array &$b)
 			$client_id,
 			$secret,
 			$endpoint . '/logout',
-			[ 'refresh_token' => res['refresh_token'] ]
+			[ 'refresh_token' => $res['refresh_token'] ]
 		);
 	}
 }

From a53d5ae29b1ec11d4063d636ec6c27074855576b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:35:19 +0000
Subject: [PATCH 058/161] Fix errors in langfilter addon

---
 langfilter/langfilter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index e5efa8fb..2bf986f0 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -7,7 +7,6 @@
  * License: MIT
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
@@ -148,6 +147,8 @@ 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);

From ee1a917612fb1c014eecce9d37b7dbcfa166aaa9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:37:58 +0000
Subject: [PATCH 059/161] Fix errors in leistungsschutzrecht addon

---
 leistungsschutzrecht/leistungsschutzrecht.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f6c65399..ec8091ac 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
@@ -149,7 +148,7 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 	$cleanedurlpart = explode('%', $urldata['host']);
 
 	$hostname = explode('.', $cleanedurlpart[0]);
-	if (empty($hostname)) {
+	if ($hostname === false || $hostname === '') {
 		return false;
 	}
 

From d08a280ba6d51ea1671b62a65ee72f221f83106c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:41:11 +0000
Subject: [PATCH 060/161] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 70fcfe39..e51ef070 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -401,9 +401,8 @@ class Services_Libravatar
      */
     protected function srvGet($domain, $https = false)
     {
-
         // Are we going secure? Set up a fallback too.
-        if (isset($https) && $https === true) {
+        if ($https === true) {
             $subdomain = '_avatars-sec._tcp.';
             $fallback  = 'seccdn.';
         } else {
@@ -426,6 +425,7 @@ 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,

From 984e7c5e5d133ab4305c766a924d2517a03bbd2c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:42:40 +0000
Subject: [PATCH 061/161] Fix errors in ljpost addon

---
 ljpost/ljpost.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 7acc6589..b416c605 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,7 +8,6 @@
  * 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;
@@ -203,10 +202,12 @@ EOT;
 
 		Logger::debug('ljpost: data: ' . $xml);
 
+		$x = '';
+
 		if ($lj_blog !== 'test') {
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+		Logger::info('posted to livejournal: ' . $x);
 	}
 }

From 6b1b043dd8fc48511f9288249cd18322b8a709b4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:48:49 +0000
Subject: [PATCH 062/161] fix errors in mailstream addon

---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ff3d81e3..dcf02361 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From c0971779c6091f0d3621c38df30d77f4f1b7e021 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:50:06 +0000
Subject: [PATCH 063/161] Fix errors in nsfw addon

---
 nsfw/nsfw.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4a54d899..674fc201 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -119,7 +118,9 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 		$word_list = ['nsfw'];
 	}
 
-	$found = false;
+	$found      = false;
+	$tag_search = false;
+
 	if (count($word_list)) {
 		$body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
 
@@ -129,7 +130,6 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 				continue;
 			}
 
-			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
 					$found = @preg_match($word, $body);

From 7fa2dfc608d9ac30253ac257c020dfda3061ec8b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:51:18 +0000
Subject: [PATCH 064/161] Fix errors in pnut addon

---
 pnut/lib/phpnut.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 5794d795..89d5e5f8 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1339,6 +1339,8 @@ class phpnut
      */
     protected function updateUserImage(string $image, string $which='avatar')
     {
+        $mimeType = '';
+
         $test = @getimagesize($image);
         if ($test && array_key_exists('mime', $test)) {
             $mimeType = $test['mime'];

From bda683c56b1800d1c2b3847e44074d554ac34c4b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:12:23 +0000
Subject: [PATCH 065/161] fix errors in pumpio addon

---
 pumpio/pumpio.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5e053d7c..d7c2ac32 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -582,6 +581,8 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 		$uri = $orig_post['uri'];
 	}
 
+	$objectType = '';
+
 	if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
 		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
 	} elseif (strstr($uri, '/api/comment/')) {
@@ -827,6 +828,7 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	}
 
 	$contactid = 0;
+	$contact   = [];
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
 		$contactid = $self['id'];
@@ -1430,6 +1432,8 @@ function pumpio_fetchallcomments($uid, $id)
 
 	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
+	$item = new \stdClass();
+
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $item);
 	} else {

From 5b623c83686b1ac4ac72d15f2072cb380b872ee2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:13:41 +0000
Subject: [PATCH 066/161] fix errors in ratioed addon

---
 ratioed/RatioedPanel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index e25c7f34..bd9b44dc 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -26,6 +26,7 @@ class RatioedPanel extends Active
 
 		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
+		$user   = [];
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);

From 8e778593ca014916297ad234587f5cbfb426f4f2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:27:57 +0000
Subject: [PATCH 067/161] fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 13 +++++++------
 statusnet/statusnet.php          |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 325bcb07..91e256be 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -31,11 +31,10 @@ use Friendica\Core\System;
 /**
  * Define constants
  */
-$constants = explode(' ', 'OBJECT ARRAY JSON');
-foreach ($constants as $i => $id) {
-    $id = 'CODEBIRD_RETURNFORMAT_' . $id;
-    defined($id) or define($id, $i);
-}
+defined('CODEBIRD_RETURNFORMAT_ARRAY') or define('CODEBIRD_RETURNFORMAT_ARRAY', 0);
+defined('CODEBIRD_RETURNFORMAT_JSON') or define('CODEBIRD_RETURNFORMAT_JSON', 1);
+defined('CODEBIRD_RETURNFORMAT_OBJECT') or define('CODEBIRD_RETURNFORMAT_OBJECT', 2);
+
 $constants = array(
     'CURLE_SSL_CERTPROBLEM' => 58,
     'CURLE_SSL_CACERT' => 60,
@@ -788,6 +787,8 @@ class CodebirdSN
 
         $possible_files = explode(' ', $possible_files[$method]);
 
+        $data = '';
+
         $multipart_border = '--------------------' . $this->_nonce();
         $multipart_request = '';
         foreach ($params as $key => $value) {
@@ -917,7 +918,7 @@ class CodebirdSN
             $authorization = 'Authorization: Bearer ' . self::$_oauth_bearer_token;
         }
         $request_headers = array();
-        if (isset($authorization)) {
+        if ($authorization !== '') {
             $request_headers[] = $authorization;
             $request_headers[] = 'Expect:';
         }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4bc32050..48f9c254 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -366,6 +366,8 @@ function statusnet_post_hook(array &$b)
 	$otoken  = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken');
 	$osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret');
 
+	$iscomment = null;
+
 	if ($ckey && $csecret && $otoken && $osecret) {
 		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent

From 2f89827deaa09de0cf8bf2a803645441f424cd9a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:07 +0000
Subject: [PATCH 068/161] fix errors in tictac addon

---
 tictac/tictac.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 10103835..082b58c1 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -7,7 +7,6 @@
  * Status: unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -30,7 +29,12 @@ function tictac_module() {}
 
 function tictac_content() {
 
-	$o = '';
+  $o        = '';
+  $dimen    = 3;
+  $handicap = 0;
+  $mefirst  = 0;
+  $yours    = '';
+  $mine     = '';
 
   if($_POST['move']) {
     $handicap = DI::args()->get(1);
@@ -45,9 +49,6 @@ function tictac_content() {
     $handicap = DI::args()->get(1);
     $dimen = 3;
   }
-  else {
-   $dimen = 3;
-  }
 
   $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
 
@@ -163,7 +164,7 @@ class tictac {
   ];
 
   function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
-    $this->dimen = 3;
+    $this->dimen = $dimen;
     $this->handicap = $handicap ? 1 : 0;
     $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
@@ -228,6 +229,8 @@ class tictac {
   }
 
   function parse_moves($player) {
+    $str = '';
+
     if($player == 'me')
       $str = $this->mine;
     if($player == 'you')

From a71db771d9473852786cc7435e9b1178b842880f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:58 +0000
Subject: [PATCH 069/161] Fix errors in wppost addon

---
 wppost/wppost.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index dba738de..f2ee5d21 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -259,9 +259,11 @@ EOT;
 
 		Logger::debug('wppost: data: ' . $xml);
 
+		$x = '';
+
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
+		Logger::info('posted to wordpress: ' . $x);
 	}
 }

From 729b6e52107dd1f3ce870b2fa45b7a8e1f60cc4d Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Thu, 5 Dec 2024 18:23:51 +0100
Subject: [PATCH 070/161] Update mailstream/phpmailer/class.phpmailer.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index dcf02361..1d9df9af 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (!empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From db7b2d352c586cc06a48fcb51ba7f9c54afd9383 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 9 Nov 2024 18:25:25 +0000
Subject: [PATCH 071/161] Fancybox is deprecated

---
 fancybox/.gitignore                           |    2 -
 fancybox/CHANGELOG.md                         |   27 -
 fancybox/README.md                            |   19 -
 fancybox/asset/fancybox/README.md             |   62 -
 fancybox/asset/fancybox/fancybox.config.js    |   13 -
 fancybox/asset/fancybox/jquery.fancybox.css   |  895 ---
 fancybox/asset/fancybox/jquery.fancybox.js    | 5632 -----------------
 .../asset/fancybox/jquery.fancybox.min.css    |    1 -
 .../asset/fancybox/jquery.fancybox.min.js     |   13 -
 fancybox/createrelease                        |   15 -
 fancybox/fancybox.php                         |   61 -
 11 files changed, 6740 deletions(-)
 delete mode 100644 fancybox/.gitignore
 delete mode 100644 fancybox/CHANGELOG.md
 delete mode 100644 fancybox/README.md
 delete mode 100644 fancybox/asset/fancybox/README.md
 delete mode 100644 fancybox/asset/fancybox/fancybox.config.js
 delete mode 100644 fancybox/asset/fancybox/jquery.fancybox.css
 delete mode 100644 fancybox/asset/fancybox/jquery.fancybox.js
 delete mode 100644 fancybox/asset/fancybox/jquery.fancybox.min.css
 delete mode 100644 fancybox/asset/fancybox/jquery.fancybox.min.js
 delete mode 100755 fancybox/createrelease
 delete mode 100644 fancybox/fancybox.php

diff --git a/fancybox/.gitignore b/fancybox/.gitignore
deleted file mode 100644
index fff07933..00000000
--- a/fancybox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dist/
-/test/
diff --git a/fancybox/CHANGELOG.md b/fancybox/CHANGELOG.md
deleted file mode 100644
index d597e0bf..00000000
--- a/fancybox/CHANGELOG.md
+++ /dev/null
@@ -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.
\ No newline at end of file
diff --git a/fancybox/README.md b/fancybox/README.md
deleted file mode 100644
index 3e342ee9..00000000
--- a/fancybox/README.md
+++ /dev/null
@@ -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).
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/README.md b/fancybox/asset/fancybox/README.md
deleted file mode 100644
index e32b89e1..00000000
--- a/fancybox/asset/fancybox/README.md
+++ /dev/null
@@ -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.
diff --git a/fancybox/asset/fancybox/fancybox.config.js b/fancybox/asset/fancybox/fancybox.config.js
deleted file mode 100644
index 233b423f..00000000
--- a/fancybox/asset/fancybox/fancybox.config.js
+++ /dev/null
@@ -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') );
-        }
-    });
-});
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.css b/fancybox/asset/fancybox/jquery.fancybox.css
deleted file mode 100644
index 16b01254..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.css
+++ /dev/null
@@ -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);
-    }
-}
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.js b/fancybox/asset/fancybox/jquery.fancybox.js
deleted file mode 100644
index 806b2703..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.js
+++ /dev/null
@@ -1,5632 +0,0 @@
-// ==================================================
-// fancyBox v3.5.7
-//
-// Licensed GPLv3 for open source use
-// or fancyBox Commercial License for commercial use
-//
-// http://fancyapps.com/fancybox/
-// Copyright 2019 fancyApps
-//
-// ==================================================
-(function (window, document, $, undefined) {
-  "use strict";
-
-  window.console = window.console || {
-    info: function (stuff) {}
-  };
-
-  // If there's no jQuery, fancyBox can't work
-  // =========================================
-
-  if (!$) {
-    return;
-  }
-
-  // Check if fancyBox is already initialized
-  // ========================================
-
-  if ($.fn.fancybox) {
-    console.info("fancyBox already initialized");
-
-    return;
-  }
-
-  // Private default settings
-  // ========================
-
-  var defaults = {
-    // Close existing modals
-    // Set this to false if you do not need to stack multiple instances
-    closeExisting: false,
-
-    // Enable infinite gallery navigation
-    loop: false,
-
-    // Horizontal space between slides
-    gutter: 50,
-
-    // Enable keyboard navigation
-    keyboard: true,
-
-    // Should allow caption to overlap the content
-    preventCaptionOverlap: true,
-
-    // Should display navigation arrows at the screen edges
-    arrows: true,
-
-    // Should display counter at the top left corner
-    infobar: true,
-
-    // Should display close button (using `btnTpl.smallBtn` template) over the content
-    // Can be true, false, "auto"
-    // If "auto" - will be automatically enabled for "html", "inline" or "ajax" items
-    smallBtn: "auto",
-
-    // Should display toolbar (buttons at the top)
-    // Can be true, false, "auto"
-    // If "auto" - will be automatically hidden if "smallBtn" is enabled
-    toolbar: "auto",
-
-    // What buttons should appear in the top right corner.
-    // Buttons will be created using templates from `btnTpl` option
-    // and they will be placed into toolbar (class="fancybox-toolbar"` element)
-    buttons: [
-      "zoom",
-      //"share",
-      "slideShow",
-      //"fullScreen",
-      //"download",
-      "thumbs",
-      "close"
-    ],
-
-    // Detect "idle" time in seconds
-    idleTime: 3,
-
-    // Disable right-click and use simple image protection for images
-    protect: false,
-
-    // Shortcut to make content "modal" - disable keyboard navigtion, hide buttons, etc
-    modal: false,
-
-    image: {
-      // Wait for images to load before displaying
-      //   true  - wait for image to load and then display;
-      //   false - display thumbnail and load the full-sized image over top,
-      //           requires predefined image dimensions (`data-width` and `data-height` attributes)
-      preload: false
-    },
-
-    ajax: {
-      // Object containing settings for ajax request
-      settings: {
-        // This helps to indicate that request comes from the modal
-        // Feel free to change naming
-        data: {
-          fancybox: true
-        }
-      }
-    },
-
-    iframe: {
-      // Iframe template
-      tpl: '<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" allowfullscreen="allowfullscreen" allow="autoplay; fullscreen" src=""></iframe>',
-
-      // Preload iframe before displaying it
-      // This allows to calculate iframe content width and height
-      // (note: Due to "Same Origin Policy", you can't get cross domain data).
-      preload: true,
-
-      // Custom CSS styling for iframe wrapping element
-      // You can use this to set custom iframe dimensions
-      css: {},
-
-      // Iframe tag attributes
-      attr: {
-        scrolling: "auto"
-      }
-    },
-
-    // For HTML5 video only
-    video: {
-      tpl: '<video class="fancybox-video" controls controlsList="nodownload" poster="{{poster}}">' +
-        '<source src="{{src}}" type="{{format}}" />' +
-        'Sorry, your browser doesn\'t support embedded videos, <a href="{{src}}">download</a> and watch with your favorite video player!' +
-        "</video>",
-      format: "", // custom video format
-      autoStart: true
-    },
-
-    // Default content type if cannot be detected automatically
-    defaultType: "image",
-
-    // Open/close animation type
-    // Possible values:
-    //   false            - disable
-    //   "zoom"           - zoom images from/to thumbnail
-    //   "fade"
-    //   "zoom-in-out"
-    //
-    animationEffect: "zoom",
-
-    // Duration in ms for open/close animation
-    animationDuration: 366,
-
-    // Should image change opacity while zooming
-    // If opacity is "auto", then opacity will be changed if image and thumbnail have different aspect ratios
-    zoomOpacity: "auto",
-
-    // Transition effect between slides
-    //
-    // Possible values:
-    //   false            - disable
-    //   "fade'
-    //   "slide'
-    //   "circular'
-    //   "tube'
-    //   "zoom-in-out'
-    //   "rotate'
-    //
-    transitionEffect: "fade",
-
-    // Duration in ms for transition animation
-    transitionDuration: 366,
-
-    // Custom CSS class for slide element
-    slideClass: "",
-
-    // Custom CSS class for layout
-    baseClass: "",
-
-    // Base template for layout
-    baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' +
-      '<div class="fancybox-bg"></div>' +
-      '<div class="fancybox-inner">' +
-      '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' +
-      '<div class="fancybox-toolbar">{{buttons}}</div>' +
-      '<div class="fancybox-navigation">{{arrows}}</div>' +
-      '<div class="fancybox-stage"></div>' +
-      '<div class="fancybox-caption"><div class="fancybox-caption__body"></div></div>' +
-      "</div>" +
-      "</div>",
-
-    // Loading indicator template
-    spinnerTpl: '<div class="fancybox-loading"></div>',
-
-    // Error message template
-    errorTpl: '<div class="fancybox-error"><p>{{ERROR}}</p></div>',
-
-    btnTpl: {
-      download: '<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}" href="javascript:;">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.62 17.09V19H5.38v-1.91zm-2.97-6.96L17 11.45l-5 4.87-5-4.87 1.36-1.32 2.68 2.64V5h1.92v7.77z"/></svg>' +
-        "</a>",
-
-      zoom: '<button data-fancybox-zoom class="fancybox-button fancybox-button--zoom" title="{{ZOOM}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.7 17.3l-3-3a5.9 5.9 0 0 0-.6-7.6 5.9 5.9 0 0 0-8.4 0 5.9 5.9 0 0 0 0 8.4 5.9 5.9 0 0 0 7.7.7l3 3a1 1 0 0 0 1.3 0c.4-.5.4-1 0-1.5zM8.1 13.8a4 4 0 0 1 0-5.7 4 4 0 0 1 5.7 0 4 4 0 0 1 0 5.7 4 4 0 0 1-5.7 0z"/></svg>' +
-        "</button>",
-
-      close: '<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.6L6.6 5.2 5.2 6.6l5.4 5.4-5.4 5.4 1.4 1.4 5.4-5.4 5.4 5.4 1.4-1.4-5.4-5.4 5.4-5.4-1.4-1.4-5.4 5.4z"/></svg>' +
-        "</button>",
-
-      // Arrows
-      arrowLeft: '<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}">' +
-        '<div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.28 15.7l-1.34 1.37L5 12l4.94-5.07 1.34 1.38-2.68 2.72H19v1.94H8.6z"/></svg></div>' +
-        "</button>",
-
-      arrowRight: '<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}">' +
-        '<div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.4 12.97l-2.68 2.72 1.34 1.38L19 12l-4.94-5.07-1.34 1.38 2.68 2.72H5v1.94z"/></svg></div>' +
-        "</button>",
-
-      // This small close button will be appended to your html/inline/ajax content by default,
-      // if "smallBtn" option is not set to false
-      smallBtn: '<button type="button" data-fancybox-close class="fancybox-button fancybox-close-small" title="{{CLOSE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 24 24"><path d="M13 12l5-5-1-1-5 5-5-5-1 1 5 5-5 5 1 1 5-5 5 5 1-1z"/></svg>' +
-        "</button>"
-    },
-
-    // Container is injected into this element
-    parentEl: "body",
-
-    // Hide browser vertical scrollbars; use at your own risk
-    hideScrollbar: true,
-
-    // Focus handling
-    // ==============
-
-    // Try to focus on the first focusable element after opening
-    autoFocus: true,
-
-    // Put focus back to active element after closing
-    backFocus: true,
-
-    // Do not let user to focus on element outside modal content
-    trapFocus: true,
-
-    // Module specific options
-    // =======================
-
-    fullScreen: {
-      autoStart: false
-    },
-
-    // Set `touch: false` to disable panning/swiping
-    touch: {
-      vertical: true, // Allow to drag content vertically
-      momentum: true // Continue movement after releasing mouse/touch when panning
-    },
-
-    // Hash value when initializing manually,
-    // set `false` to disable hash change
-    hash: null,
-
-    // Customize or add new media types
-    // Example:
-    /*
-      media : {
-        youtube : {
-          params : {
-            autoplay : 0
-          }
-        }
-      }
-    */
-    media: {},
-
-    slideShow: {
-      autoStart: false,
-      speed: 3000
-    },
-
-    thumbs: {
-      autoStart: false, // Display thumbnails on opening
-      hideOnClose: true, // Hide thumbnail grid when closing animation starts
-      parentEl: ".fancybox-container", // Container is injected into this element
-      axis: "y" // Vertical (y) or horizontal (x) scrolling
-    },
-
-    // Use mousewheel to navigate gallery
-    // If 'auto' - enabled for images only
-    wheel: "auto",
-
-    // Callbacks
-    //==========
-
-    // See Documentation/API/Events for more information
-    // Example:
-    /*
-      afterShow: function( instance, current ) {
-        console.info( 'Clicked element:' );
-        console.info( current.opts.$orig );
-      }
-    */
-
-    onInit: $.noop, // When instance has been initialized
-
-    beforeLoad: $.noop, // Before the content of a slide is being loaded
-    afterLoad: $.noop, // When the content of a slide is done loading
-
-    beforeShow: $.noop, // Before open animation starts
-    afterShow: $.noop, // When content is done loading and animating
-
-    beforeClose: $.noop, // Before the instance attempts to close. Return false to cancel the close.
-    afterClose: $.noop, // After instance has been closed
-
-    onActivate: $.noop, // When instance is brought to front
-    onDeactivate: $.noop, // When other instance has been activated
-
-    // Interaction
-    // ===========
-
-    // Use options below to customize taken action when user clicks or double clicks on the fancyBox area,
-    // each option can be string or method that returns value.
-    //
-    // Possible values:
-    //   "close"           - close instance
-    //   "next"            - move to next gallery item
-    //   "nextOrClose"     - move to next gallery item or close if gallery has only one item
-    //   "toggleControls"  - show/hide controls
-    //   "zoom"            - zoom image (if loaded)
-    //   false             - do nothing
-
-    // Clicked on the content
-    clickContent: function (current, event) {
-      return current.type === "image" ? "zoom" : false;
-    },
-
-    // Clicked on the slide
-    clickSlide: "close",
-
-    // Clicked on the background (backdrop) element;
-    // if you have not changed the layout, then most likely you need to use `clickSlide` option
-    clickOutside: "close",
-
-    // Same as previous two, but for double click
-    dblclickContent: false,
-    dblclickSlide: false,
-    dblclickOutside: false,
-
-    // Custom options when mobile device is detected
-    // =============================================
-
-    mobile: {
-      preventCaptionOverlap: false,
-      idleTime: false,
-      clickContent: function (current, event) {
-        return current.type === "image" ? "toggleControls" : false;
-      },
-      clickSlide: function (current, event) {
-        return current.type === "image" ? "toggleControls" : "close";
-      },
-      dblclickContent: function (current, event) {
-        return current.type === "image" ? "zoom" : false;
-      },
-      dblclickSlide: function (current, event) {
-        return current.type === "image" ? "zoom" : false;
-      }
-    },
-
-    // Internationalization
-    // ====================
-
-    lang: "en",
-    i18n: {
-      en: {
-        CLOSE: "Close",
-        NEXT: "Next",
-        PREV: "Previous",
-        ERROR: "The requested content cannot be loaded. <br/> Please try again later.",
-        PLAY_START: "Start slideshow",
-        PLAY_STOP: "Pause slideshow",
-        FULL_SCREEN: "Full screen",
-        THUMBS: "Thumbnails",
-        DOWNLOAD: "Download",
-        SHARE: "Share",
-        ZOOM: "Zoom"
-      },
-      de: {
-        CLOSE: "Schlie&szlig;en",
-        NEXT: "Weiter",
-        PREV: "Zur&uuml;ck",
-        ERROR: "Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es sp&auml;ter nochmal.",
-        PLAY_START: "Diaschau starten",
-        PLAY_STOP: "Diaschau beenden",
-        FULL_SCREEN: "Vollbild",
-        THUMBS: "Vorschaubilder",
-        DOWNLOAD: "Herunterladen",
-        SHARE: "Teilen",
-        ZOOM: "Vergr&ouml;&szlig;ern"
-      }
-    }
-  };
-
-  // Few useful variables and methods
-  // ================================
-
-  var $W = $(window);
-  var $D = $(document);
-
-  var called = 0;
-
-  // Check if an object is a jQuery object and not a native JavaScript object
-  // ========================================================================
-  var isQuery = function (obj) {
-    return obj && obj.hasOwnProperty && obj instanceof $;
-  };
-
-  // Handle multiple browsers for "requestAnimationFrame" and "cancelAnimationFrame"
-  // ===============================================================================
-  var requestAFrame = (function () {
-    return (
-      window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.oRequestAnimationFrame ||
-      // if all else fails, use setTimeout
-      function (callback) {
-        return window.setTimeout(callback, 1000 / 60);
-      }
-    );
-  })();
-
-  var cancelAFrame = (function () {
-    return (
-      window.cancelAnimationFrame ||
-      window.webkitCancelAnimationFrame ||
-      window.mozCancelAnimationFrame ||
-      window.oCancelAnimationFrame ||
-      function (id) {
-        window.clearTimeout(id);
-      }
-    );
-  })();
-
-  // Detect the supported transition-end event property name
-  // =======================================================
-  var transitionEnd = (function () {
-    var el = document.createElement("fakeelement"),
-      t;
-
-    var transitions = {
-      transition: "transitionend",
-      OTransition: "oTransitionEnd",
-      MozTransition: "transitionend",
-      WebkitTransition: "webkitTransitionEnd"
-    };
-
-    for (t in transitions) {
-      if (el.style[t] !== undefined) {
-        return transitions[t];
-      }
-    }
-
-    return "transitionend";
-  })();
-
-  // Force redraw on an element.
-  // This helps in cases where the browser doesn't redraw an updated element properly
-  // ================================================================================
-  var forceRedraw = function ($el) {
-    return $el && $el.length && $el[0].offsetHeight;
-  };
-
-  // Exclude array (`buttons`) options from deep merging
-  // ===================================================
-  var mergeOpts = function (opts1, opts2) {
-    var rez = $.extend(true, {}, opts1, opts2);
-
-    $.each(opts2, function (key, value) {
-      if ($.isArray(value)) {
-        rez[key] = value;
-      }
-    });
-
-    return rez;
-  };
-
-  // How much of an element is visible in viewport
-  // =============================================
-
-  var inViewport = function (elem) {
-    var elemCenter, rez;
-
-    if (!elem || elem.ownerDocument !== document) {
-      return false;
-    }
-
-    $(".fancybox-container").css("pointer-events", "none");
-
-    elemCenter = {
-      x: elem.getBoundingClientRect().left + elem.offsetWidth / 2,
-      y: elem.getBoundingClientRect().top + elem.offsetHeight / 2
-    };
-
-    rez = document.elementFromPoint(elemCenter.x, elemCenter.y) === elem;
-
-    $(".fancybox-container").css("pointer-events", "");
-
-    return rez;
-  };
-
-  // Class definition
-  // ================
-
-  var FancyBox = function (content, opts, index) {
-    var self = this;
-
-    self.opts = mergeOpts({
-      index: index
-    }, $.fancybox.defaults);
-
-    if ($.isPlainObject(opts)) {
-      self.opts = mergeOpts(self.opts, opts);
-    }
-
-    if ($.fancybox.isMobile) {
-      self.opts = mergeOpts(self.opts, self.opts.mobile);
-    }
-
-    self.id = self.opts.id || ++called;
-
-    self.currIndex = parseInt(self.opts.index, 10) || 0;
-    self.prevIndex = null;
-
-    self.prevPos = null;
-    self.currPos = 0;
-
-    self.firstRun = true;
-
-    // All group items
-    self.group = [];
-
-    // Existing slides (for current, next and previous gallery items)
-    self.slides = {};
-
-    // Create group elements
-    self.addContent(content);
-
-    if (!self.group.length) {
-      return;
-    }
-
-    self.init();
-  };
-
-  $.extend(FancyBox.prototype, {
-    // Create DOM structure
-    // ====================
-
-    init: function () {
-      var self = this,
-        firstItem = self.group[self.currIndex],
-        firstItemOpts = firstItem.opts,
-        $container,
-        buttonStr;
-
-      if (firstItemOpts.closeExisting) {
-        $.fancybox.close(true);
-      }
-
-      // Hide scrollbars
-      // ===============
-
-      $("body").addClass("fancybox-active");
-
-      if (
-        !$.fancybox.getInstance() &&
-        firstItemOpts.hideScrollbar !== false &&
-        !$.fancybox.isMobile &&
-        document.body.scrollHeight > window.innerHeight
-      ) {
-        $("head").append(
-          '<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar{margin-right:' +
-          (window.innerWidth - document.documentElement.clientWidth) +
-          "px;}</style>"
-        );
-
-        $("body").addClass("compensate-for-scrollbar");
-      }
-
-      // Build html markup and set references
-      // ====================================
-
-      // Build html code for buttons and insert into main template
-      buttonStr = "";
-
-      $.each(firstItemOpts.buttons, function (index, value) {
-        buttonStr += firstItemOpts.btnTpl[value] || "";
-      });
-
-      // Create markup from base template, it will be initially hidden to
-      // avoid unnecessary work like painting while initializing is not complete
-      $container = $(
-          self.translate(
-            self,
-            firstItemOpts.baseTpl
-            .replace("{{buttons}}", buttonStr)
-            .replace("{{arrows}}", firstItemOpts.btnTpl.arrowLeft + firstItemOpts.btnTpl.arrowRight)
-          )
-        )
-        .attr("id", "fancybox-container-" + self.id)
-        .addClass(firstItemOpts.baseClass)
-        .data("FancyBox", self)
-        .appendTo(firstItemOpts.parentEl);
-
-      // Create object holding references to jQuery wrapped nodes
-      self.$refs = {
-        container: $container
-      };
-
-      ["bg", "inner", "infobar", "toolbar", "stage", "caption", "navigation"].forEach(function (item) {
-        self.$refs[item] = $container.find(".fancybox-" + item);
-      });
-
-      self.trigger("onInit");
-
-      // Enable events, deactive previous instances
-      self.activate();
-
-      // Build slides, load and reveal content
-      self.jumpTo(self.currIndex);
-    },
-
-    // Simple i18n support - replaces object keys found in template
-    // with corresponding values
-    // ============================================================
-
-    translate: function (obj, str) {
-      var arr = obj.opts.i18n[obj.opts.lang] || obj.opts.i18n.en;
-
-      return str.replace(/\{\{(\w+)\}\}/g, function (match, n) {
-        return arr[n] === undefined ? match : arr[n];
-      });
-    },
-
-    // Populate current group with fresh content
-    // Check if each object has valid type and content
-    // ===============================================
-
-    addContent: function (content) {
-      var self = this,
-        items = $.makeArray(content),
-        thumbs;
-
-      $.each(items, function (i, item) {
-        var obj = {},
-          opts = {},
-          $item,
-          type,
-          found,
-          src,
-          srcParts;
-
-        // Step 1 - Make sure we have an object
-        // ====================================
-
-        if ($.isPlainObject(item)) {
-          // We probably have manual usage here, something like
-          // $.fancybox.open( [ { src : "image.jpg", type : "image" } ] )
-
-          obj = item;
-          opts = item.opts || item;
-        } else if ($.type(item) === "object" && $(item).length) {
-          // Here we probably have jQuery collection returned by some selector
-          $item = $(item);
-
-          // Support attributes like `data-options='{"touch" : false}'` and `data-touch='false'`
-          opts = $item.data() || {};
-          opts = $.extend(true, {}, opts, opts.options);
-
-          // Here we store clicked element
-          opts.$orig = $item;
-
-          obj.src = self.opts.src || opts.src || $item.attr("href");
-
-          // Assume that simple syntax is used, for example:
-          //   `$.fancybox.open( $("#test"), {} );`
-          if (!obj.type && !obj.src) {
-            obj.type = "inline";
-            obj.src = item;
-          }
-        } else {
-          // Assume we have a simple html code, for example:
-          //   $.fancybox.open( '<div><h1>Hi!</h1></div>' );
-          obj = {
-            type: "html",
-            src: item + ""
-          };
-        }
-
-        // Each gallery object has full collection of options
-        obj.opts = $.extend(true, {}, self.opts, opts);
-
-        // Do not merge buttons array
-        if ($.isArray(opts.buttons)) {
-          obj.opts.buttons = opts.buttons;
-        }
-
-        if ($.fancybox.isMobile && obj.opts.mobile) {
-          obj.opts = mergeOpts(obj.opts, obj.opts.mobile);
-        }
-
-        // Step 2 - Make sure we have content type, if not - try to guess
-        // ==============================================================
-
-        type = obj.type || obj.opts.type;
-        src = obj.src || "";
-
-        if (!type && src) {
-          if ((found = src.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))) {
-            type = "video";
-
-            if (!obj.opts.video.format) {
-              obj.opts.video.format = "video/" + (found[1] === "ogv" ? "ogg" : found[1]);
-            }
-          } else if (src.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)) {
-            type = "image";
-          } else if (src.match(/\.(pdf)((\?|#).*)?$/i)) {
-            type = "iframe";
-            obj = $.extend(true, obj, {
-              contentType: "pdf",
-              opts: {
-                iframe: {
-                  preload: false
-                }
-              }
-            });
-          } else if (src.charAt(0) === "#") {
-            type = "inline";
-          }
-        }
-
-        if (type) {
-          obj.type = type;
-        } else {
-          self.trigger("objectNeedsType", obj);
-        }
-
-        if (!obj.contentType) {
-          obj.contentType = $.inArray(obj.type, ["html", "inline", "ajax"]) > -1 ? "html" : obj.type;
-        }
-
-        // Step 3 - Some adjustments
-        // =========================
-
-        obj.index = self.group.length;
-
-        if (obj.opts.smallBtn == "auto") {
-          obj.opts.smallBtn = $.inArray(obj.type, ["html", "inline", "ajax"]) > -1;
-        }
-
-        if (obj.opts.toolbar === "auto") {
-          obj.opts.toolbar = !obj.opts.smallBtn;
-        }
-
-        // Find thumbnail image, check if exists and if is in the viewport
-        obj.$thumb = obj.opts.$thumb || null;
-
-        if (obj.opts.$trigger && obj.index === self.opts.index) {
-          obj.$thumb = obj.opts.$trigger.find("img:first");
-
-          if (obj.$thumb.length) {
-            obj.opts.$orig = obj.opts.$trigger;
-          }
-        }
-
-        if (!(obj.$thumb && obj.$thumb.length) && obj.opts.$orig) {
-          obj.$thumb = obj.opts.$orig.find("img:first");
-        }
-
-        if (obj.$thumb && !obj.$thumb.length) {
-          obj.$thumb = null;
-        }
-
-        obj.thumb = obj.opts.thumb || (obj.$thumb ? obj.$thumb[0].src : null);
-
-        // "caption" is a "special" option, it can be used to customize caption per gallery item
-        if ($.type(obj.opts.caption) === "function") {
-          obj.opts.caption = obj.opts.caption.apply(item, [self, obj]);
-        }
-
-        if ($.type(self.opts.caption) === "function") {
-          obj.opts.caption = self.opts.caption.apply(item, [self, obj]);
-        }
-
-        // Make sure we have caption as a string or jQuery object
-        if (!(obj.opts.caption instanceof $)) {
-          obj.opts.caption = obj.opts.caption === undefined ? "" : obj.opts.caption + "";
-        }
-
-        // Check if url contains "filter" used to filter the content
-        // Example: "ajax.html #something"
-        if (obj.type === "ajax") {
-          srcParts = src.split(/\s+/, 2);
-
-          if (srcParts.length > 1) {
-            obj.src = srcParts.shift();
-
-            obj.opts.filter = srcParts.shift();
-          }
-        }
-
-        // Hide all buttons and disable interactivity for modal items
-        if (obj.opts.modal) {
-          obj.opts = $.extend(true, obj.opts, {
-            trapFocus: true,
-            // Remove buttons
-            infobar: 0,
-            toolbar: 0,
-
-            smallBtn: 0,
-
-            // Disable keyboard navigation
-            keyboard: 0,
-
-            // Disable some modules
-            slideShow: 0,
-            fullScreen: 0,
-            thumbs: 0,
-            touch: 0,
-
-            // Disable click event handlers
-            clickContent: false,
-            clickSlide: false,
-            clickOutside: false,
-            dblclickContent: false,
-            dblclickSlide: false,
-            dblclickOutside: false
-          });
-        }
-
-        // Step 4 - Add processed object to group
-        // ======================================
-
-        self.group.push(obj);
-      });
-
-      // Update controls if gallery is already opened
-      if (Object.keys(self.slides).length) {
-        self.updateControls();
-
-        // Update thumbnails, if needed
-        thumbs = self.Thumbs;
-
-        if (thumbs && thumbs.isActive) {
-          thumbs.create();
-
-          thumbs.focus();
-        }
-      }
-    },
-
-    // Attach an event handler functions for:
-    //   - navigation buttons
-    //   - browser scrolling, resizing;
-    //   - focusing
-    //   - keyboard
-    //   - detecting inactivity
-    // ======================================
-
-    addEvents: function () {
-      var self = this;
-
-      self.removeEvents();
-
-      // Make navigation elements clickable
-      // ==================================
-
-      self.$refs.container
-        .on("click.fb-close", "[data-fancybox-close]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.close(e);
-        })
-        .on("touchstart.fb-prev click.fb-prev", "[data-fancybox-prev]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.previous();
-        })
-        .on("touchstart.fb-next click.fb-next", "[data-fancybox-next]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.next();
-        })
-        .on("click.fb", "[data-fancybox-zoom]", function (e) {
-          // Click handler for zoom button
-          self[self.isScaledDown() ? "scaleToActual" : "scaleToFit"]();
-        });
-
-      // Handle page scrolling and browser resizing
-      // ==========================================
-
-      $W.on("orientationchange.fb resize.fb", function (e) {
-        if (e && e.originalEvent && e.originalEvent.type === "resize") {
-          if (self.requestId) {
-            cancelAFrame(self.requestId);
-          }
-
-          self.requestId = requestAFrame(function () {
-            self.update(e);
-          });
-        } else {
-          if (self.current && self.current.type === "iframe") {
-            self.$refs.stage.hide();
-          }
-
-          setTimeout(
-            function () {
-              self.$refs.stage.show();
-
-              self.update(e);
-            },
-            $.fancybox.isMobile ? 600 : 250
-          );
-        }
-      });
-
-      $D.on("keydown.fb", function (e) {
-        var instance = $.fancybox ? $.fancybox.getInstance() : null,
-          current = instance.current,
-          keycode = e.keyCode || e.which;
-
-        // Trap keyboard focus inside of the modal
-        // =======================================
-
-        if (keycode == 9) {
-          if (current.opts.trapFocus) {
-            self.focus(e);
-          }
-
-          return;
-        }
-
-        // Enable keyboard navigation
-        // ==========================
-
-        if (!current.opts.keyboard || e.ctrlKey || e.altKey || e.shiftKey || $(e.target).is("input,textarea,video,audio,select")) {
-          return;
-        }
-
-        // Backspace and Esc keys
-        if (keycode === 8 || keycode === 27) {
-          e.preventDefault();
-
-          self.close(e);
-
-          return;
-        }
-
-        // Left arrow and Up arrow
-        if (keycode === 37 || keycode === 38) {
-          e.preventDefault();
-
-          self.previous();
-
-          return;
-        }
-
-        // Righ arrow and Down arrow
-        if (keycode === 39 || keycode === 40) {
-          e.preventDefault();
-
-          self.next();
-
-          return;
-        }
-
-        self.trigger("afterKeydown", e, keycode);
-      });
-
-      // Hide controls after some inactivity period
-      if (self.group[self.currIndex].opts.idleTime) {
-        self.idleSecondsCounter = 0;
-
-        $D.on(
-          "mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",
-          function (e) {
-            self.idleSecondsCounter = 0;
-
-            if (self.isIdle) {
-              self.showControls();
-            }
-
-            self.isIdle = false;
-          }
-        );
-
-        self.idleInterval = window.setInterval(function () {
-          self.idleSecondsCounter++;
-
-          if (self.idleSecondsCounter >= self.group[self.currIndex].opts.idleTime && !self.isDragging) {
-            self.isIdle = true;
-            self.idleSecondsCounter = 0;
-
-            self.hideControls();
-          }
-        }, 1000);
-      }
-    },
-
-    // Remove events added by the core
-    // ===============================
-
-    removeEvents: function () {
-      var self = this;
-
-      $W.off("orientationchange.fb resize.fb");
-      $D.off("keydown.fb .fb-idle");
-
-      this.$refs.container.off(".fb-close .fb-prev .fb-next");
-
-      if (self.idleInterval) {
-        window.clearInterval(self.idleInterval);
-
-        self.idleInterval = null;
-      }
-    },
-
-    // Change to previous gallery item
-    // ===============================
-
-    previous: function (duration) {
-      return this.jumpTo(this.currPos - 1, duration);
-    },
-
-    // Change to next gallery item
-    // ===========================
-
-    next: function (duration) {
-      return this.jumpTo(this.currPos + 1, duration);
-    },
-
-    // Switch to selected gallery item
-    // ===============================
-
-    jumpTo: function (pos, duration) {
-      var self = this,
-        groupLen = self.group.length,
-        firstRun,
-        isMoved,
-        loop,
-        current,
-        previous,
-        slidePos,
-        stagePos,
-        prop,
-        diff;
-
-      if (self.isDragging || self.isClosing || (self.isAnimating && self.firstRun)) {
-        return;
-      }
-
-      // Should loop?
-      pos = parseInt(pos, 10);
-      loop = self.current ? self.current.opts.loop : self.opts.loop;
-
-      if (!loop && (pos < 0 || pos >= groupLen)) {
-        return false;
-      }
-
-      // Check if opening for the first time; this helps to speed things up
-      firstRun = self.firstRun = !Object.keys(self.slides).length;
-
-      // Create slides
-      previous = self.current;
-
-      self.prevIndex = self.currIndex;
-      self.prevPos = self.currPos;
-
-      current = self.createSlide(pos);
-
-      if (groupLen > 1) {
-        if (loop || current.index < groupLen - 1) {
-          self.createSlide(pos + 1);
-        }
-
-        if (loop || current.index > 0) {
-          self.createSlide(pos - 1);
-        }
-      }
-
-      self.current = current;
-      self.currIndex = current.index;
-      self.currPos = current.pos;
-
-      self.trigger("beforeShow", firstRun);
-
-      self.updateControls();
-
-      // Validate duration length
-      current.forcedDuration = undefined;
-
-      if ($.isNumeric(duration)) {
-        current.forcedDuration = duration;
-      } else {
-        duration = current.opts[firstRun ? "animationDuration" : "transitionDuration"];
-      }
-
-      duration = parseInt(duration, 10);
-
-      // Check if user has swiped the slides or if still animating
-      isMoved = self.isMoved(current);
-
-      // Make sure current slide is visible
-      current.$slide.addClass("fancybox-slide--current");
-
-      // Fresh start - reveal container, current slide and start loading content
-      if (firstRun) {
-        if (current.opts.animationEffect && duration) {
-          self.$refs.container.css("transition-duration", duration + "ms");
-        }
-
-        self.$refs.container.addClass("fancybox-is-open").trigger("focus");
-
-        // Attempt to load content into slide
-        // This will later call `afterLoad` -> `revealContent`
-        self.loadSlide(current);
-
-        self.preload("image");
-
-        return;
-      }
-
-      // Get actual slide/stage positions (before cleaning up)
-      slidePos = $.fancybox.getTranslate(previous.$slide);
-      stagePos = $.fancybox.getTranslate(self.$refs.stage);
-
-      // Clean up all slides
-      $.each(self.slides, function (index, slide) {
-        $.fancybox.stop(slide.$slide, true);
-      });
-
-      if (previous.pos !== current.pos) {
-        previous.isComplete = false;
-      }
-
-      previous.$slide.removeClass("fancybox-slide--complete fancybox-slide--current");
-
-      // If slides are out of place, then animate them to correct position
-      if (isMoved) {
-        // Calculate horizontal swipe distance
-        diff = slidePos.left - (previous.pos * slidePos.width + previous.pos * previous.opts.gutter);
-
-        $.each(self.slides, function (index, slide) {
-          slide.$slide.removeClass("fancybox-animated").removeClass(function (index, className) {
-            return (className.match(/(^|\s)fancybox-fx-\S+/g) || []).join(" ");
-          });
-
-          // Make sure that each slide is in equal distance
-          // This is mostly needed for freshly added slides, because they are not yet positioned
-          var leftPos = slide.pos * slidePos.width + slide.pos * slide.opts.gutter;
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: 0,
-            left: leftPos - stagePos.left + diff
-          });
-
-          if (slide.pos !== current.pos) {
-            slide.$slide.addClass("fancybox-slide--" + (slide.pos > current.pos ? "next" : "previous"));
-          }
-
-          // Redraw to make sure that transition will start
-          forceRedraw(slide.$slide);
-
-          // Animate the slide
-          $.fancybox.animate(
-            slide.$slide, {
-              top: 0,
-              left: (slide.pos - current.pos) * slidePos.width + (slide.pos - current.pos) * slide.opts.gutter
-            },
-            duration,
-            function () {
-              slide.$slide
-                .css({
-                  transform: "",
-                  opacity: ""
-                })
-                .removeClass("fancybox-slide--next fancybox-slide--previous");
-
-              if (slide.pos === self.currPos) {
-                self.complete();
-              }
-            }
-          );
-        });
-      } else if (duration && current.opts.transitionEffect) {
-        // Set transition effect for previously active slide
-        prop = "fancybox-animated fancybox-fx-" + current.opts.transitionEffect;
-
-        previous.$slide.addClass("fancybox-slide--" + (previous.pos > current.pos ? "next" : "previous"));
-
-        $.fancybox.animate(
-          previous.$slide,
-          prop,
-          duration,
-          function () {
-            previous.$slide.removeClass(prop).removeClass("fancybox-slide--next fancybox-slide--previous");
-          },
-          false
-        );
-      }
-
-      if (current.isLoaded) {
-        self.revealContent(current);
-      } else {
-        self.loadSlide(current);
-      }
-
-      self.preload("image");
-    },
-
-    // Create new "slide" element
-    // These are gallery items  that are actually added to DOM
-    // =======================================================
-
-    createSlide: function (pos) {
-      var self = this,
-        $slide,
-        index;
-
-      index = pos % self.group.length;
-      index = index < 0 ? self.group.length + index : index;
-
-      if (!self.slides[pos] && self.group[index]) {
-        $slide = $('<div class="fancybox-slide"></div>').appendTo(self.$refs.stage);
-
-        self.slides[pos] = $.extend(true, {}, self.group[index], {
-          pos: pos,
-          $slide: $slide,
-          isLoaded: false
-        });
-
-        self.updateSlide(self.slides[pos]);
-      }
-
-      return self.slides[pos];
-    },
-
-    // Scale image to the actual size of the image;
-    // x and y values should be relative to the slide
-    // ==============================================
-
-    scaleToActual: function (x, y, duration) {
-      var self = this,
-        current = self.current,
-        $content = current.$content,
-        canvasWidth = $.fancybox.getTranslate(current.$slide).width,
-        canvasHeight = $.fancybox.getTranslate(current.$slide).height,
-        newImgWidth = current.width,
-        newImgHeight = current.height,
-        imgPos,
-        posX,
-        posY,
-        scaleX,
-        scaleY;
-
-      if (self.isAnimating || self.isMoved() || !$content || !(current.type == "image" && current.isLoaded && !current.hasError)) {
-        return;
-      }
-
-      self.isAnimating = true;
-
-      $.fancybox.stop($content);
-
-      x = x === undefined ? canvasWidth * 0.5 : x;
-      y = y === undefined ? canvasHeight * 0.5 : y;
-
-      imgPos = $.fancybox.getTranslate($content);
-
-      imgPos.top -= $.fancybox.getTranslate(current.$slide).top;
-      imgPos.left -= $.fancybox.getTranslate(current.$slide).left;
-
-      scaleX = newImgWidth / imgPos.width;
-      scaleY = newImgHeight / imgPos.height;
-
-      // Get center position for original image
-      posX = canvasWidth * 0.5 - newImgWidth * 0.5;
-      posY = canvasHeight * 0.5 - newImgHeight * 0.5;
-
-      // Make sure image does not move away from edges
-      if (newImgWidth > canvasWidth) {
-        posX = imgPos.left * scaleX - (x * scaleX - x);
-
-        if (posX > 0) {
-          posX = 0;
-        }
-
-        if (posX < canvasWidth - newImgWidth) {
-          posX = canvasWidth - newImgWidth;
-        }
-      }
-
-      if (newImgHeight > canvasHeight) {
-        posY = imgPos.top * scaleY - (y * scaleY - y);
-
-        if (posY > 0) {
-          posY = 0;
-        }
-
-        if (posY < canvasHeight - newImgHeight) {
-          posY = canvasHeight - newImgHeight;
-        }
-      }
-
-      self.updateCursor(newImgWidth, newImgHeight);
-
-      $.fancybox.animate(
-        $content, {
-          top: posY,
-          left: posX,
-          scaleX: scaleX,
-          scaleY: scaleY
-        },
-        duration || 366,
-        function () {
-          self.isAnimating = false;
-        }
-      );
-
-      // Stop slideshow
-      if (self.SlideShow && self.SlideShow.isActive) {
-        self.SlideShow.stop();
-      }
-    },
-
-    // Scale image to fit inside parent element
-    // ========================================
-
-    scaleToFit: function (duration) {
-      var self = this,
-        current = self.current,
-        $content = current.$content,
-        end;
-
-      if (self.isAnimating || self.isMoved() || !$content || !(current.type == "image" && current.isLoaded && !current.hasError)) {
-        return;
-      }
-
-      self.isAnimating = true;
-
-      $.fancybox.stop($content);
-
-      end = self.getFitPos(current);
-
-      self.updateCursor(end.width, end.height);
-
-      $.fancybox.animate(
-        $content, {
-          top: end.top,
-          left: end.left,
-          scaleX: end.width / $content.width(),
-          scaleY: end.height / $content.height()
-        },
-        duration || 366,
-        function () {
-          self.isAnimating = false;
-        }
-      );
-    },
-
-    // Calculate image size to fit inside viewport
-    // ===========================================
-
-    getFitPos: function (slide) {
-      var self = this,
-        $content = slide.$content,
-        $slide = slide.$slide,
-        width = slide.width || slide.opts.width,
-        height = slide.height || slide.opts.height,
-        maxWidth,
-        maxHeight,
-        minRatio,
-        aspectRatio,
-        rez = {};
-
-      if (!slide.isLoaded || !$content || !$content.length) {
-        return false;
-      }
-
-      maxWidth = $.fancybox.getTranslate(self.$refs.stage).width;
-      maxHeight = $.fancybox.getTranslate(self.$refs.stage).height;
-
-      maxWidth -=
-        parseFloat($slide.css("paddingLeft")) +
-        parseFloat($slide.css("paddingRight")) +
-        parseFloat($content.css("marginLeft")) +
-        parseFloat($content.css("marginRight"));
-
-      maxHeight -=
-        parseFloat($slide.css("paddingTop")) +
-        parseFloat($slide.css("paddingBottom")) +
-        parseFloat($content.css("marginTop")) +
-        parseFloat($content.css("marginBottom"));
-
-      if (!width || !height) {
-        width = maxWidth;
-        height = maxHeight;
-      }
-
-      minRatio = Math.min(1, maxWidth / width, maxHeight / height);
-
-      width = minRatio * width;
-      height = minRatio * height;
-
-      // Adjust width/height to precisely fit into container
-      if (width > maxWidth - 0.5) {
-        width = maxWidth;
-      }
-
-      if (height > maxHeight - 0.5) {
-        height = maxHeight;
-      }
-
-      if (slide.type === "image") {
-        rez.top = Math.floor((maxHeight - height) * 0.5) + parseFloat($slide.css("paddingTop"));
-        rez.left = Math.floor((maxWidth - width) * 0.5) + parseFloat($slide.css("paddingLeft"));
-      } else if (slide.contentType === "video") {
-        // Force aspect ratio for the video
-        // "I say the whole world must learn of our peaceful ways… by force!"
-        aspectRatio = slide.opts.width && slide.opts.height ? width / height : slide.opts.ratio || 16 / 9;
-
-        if (height > width / aspectRatio) {
-          height = width / aspectRatio;
-        } else if (width > height * aspectRatio) {
-          width = height * aspectRatio;
-        }
-      }
-
-      rez.width = width;
-      rez.height = height;
-
-      return rez;
-    },
-
-    // Update content size and position for all slides
-    // ==============================================
-
-    update: function (e) {
-      var self = this;
-
-      $.each(self.slides, function (key, slide) {
-        self.updateSlide(slide, e);
-      });
-    },
-
-    // Update slide content position and size
-    // ======================================
-
-    updateSlide: function (slide, e) {
-      var self = this,
-        $content = slide && slide.$content,
-        width = slide.width || slide.opts.width,
-        height = slide.height || slide.opts.height,
-        $slide = slide.$slide;
-
-      // First, prevent caption overlap, if needed
-      self.adjustCaption(slide);
-
-      // Then resize content to fit inside the slide
-      if ($content && (width || height || slide.contentType === "video") && !slide.hasError) {
-        $.fancybox.stop($content);
-
-        $.fancybox.setTranslate($content, self.getFitPos(slide));
-
-        if (slide.pos === self.currPos) {
-          self.isAnimating = false;
-
-          self.updateCursor();
-        }
-      }
-
-      // Then some adjustments
-      self.adjustLayout(slide);
-
-      if ($slide.length) {
-        $slide.trigger("refresh");
-
-        if (slide.pos === self.currPos) {
-          self.$refs.toolbar
-            .add(self.$refs.navigation.find(".fancybox-button--arrow_right"))
-            .toggleClass("compensate-for-scrollbar", $slide.get(0).scrollHeight > $slide.get(0).clientHeight);
-        }
-      }
-
-      self.trigger("onUpdate", slide, e);
-    },
-
-    // Horizontally center slide
-    // =========================
-
-    centerSlide: function (duration) {
-      var self = this,
-        current = self.current,
-        $slide = current.$slide;
-
-      if (self.isClosing || !current) {
-        return;
-      }
-
-      $slide.siblings().css({
-        transform: "",
-        opacity: ""
-      });
-
-      $slide
-        .parent()
-        .children()
-        .removeClass("fancybox-slide--previous fancybox-slide--next");
-
-      $.fancybox.animate(
-        $slide, {
-          top: 0,
-          left: 0,
-          opacity: 1
-        },
-        duration === undefined ? 0 : duration,
-        function () {
-          // Clean up
-          $slide.css({
-            transform: "",
-            opacity: ""
-          });
-
-          if (!current.isComplete) {
-            self.complete();
-          }
-        },
-        false
-      );
-    },
-
-    // Check if current slide is moved (swiped)
-    // ========================================
-
-    isMoved: function (slide) {
-      var current = slide || this.current,
-        slidePos,
-        stagePos;
-
-      if (!current) {
-        return false;
-      }
-
-      stagePos = $.fancybox.getTranslate(this.$refs.stage);
-      slidePos = $.fancybox.getTranslate(current.$slide);
-
-      return (
-        !current.$slide.hasClass("fancybox-animated") &&
-        (Math.abs(slidePos.top - stagePos.top) > 0.5 || Math.abs(slidePos.left - stagePos.left) > 0.5)
-      );
-    },
-
-    // Update cursor style depending if content can be zoomed
-    // ======================================================
-
-    updateCursor: function (nextWidth, nextHeight) {
-      var self = this,
-        current = self.current,
-        $container = self.$refs.container,
-        canPan,
-        isZoomable;
-
-      if (!current || self.isClosing || !self.Guestures) {
-        return;
-      }
-
-      $container.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan");
-
-      canPan = self.canPan(nextWidth, nextHeight);
-
-      isZoomable = canPan ? true : self.isZoomable();
-
-      $container.toggleClass("fancybox-is-zoomable", isZoomable);
-
-      $("[data-fancybox-zoom]").prop("disabled", !isZoomable);
-
-      if (canPan) {
-        $container.addClass("fancybox-can-pan");
-      } else if (
-        isZoomable &&
-        (current.opts.clickContent === "zoom" || ($.isFunction(current.opts.clickContent) && current.opts.clickContent(current) == "zoom"))
-      ) {
-        $container.addClass("fancybox-can-zoomIn");
-      } else if (current.opts.touch && (current.opts.touch.vertical || self.group.length > 1) && current.contentType !== "video") {
-        $container.addClass("fancybox-can-swipe");
-      }
-    },
-
-    // Check if current slide is zoomable
-    // ==================================
-
-    isZoomable: function () {
-      var self = this,
-        current = self.current,
-        fitPos;
-
-      // Assume that slide is zoomable if:
-      //   - image is still loading
-      //   - actual size of the image is smaller than available area
-      if (current && !self.isClosing && current.type === "image" && !current.hasError) {
-        if (!current.isLoaded) {
-          return true;
-        }
-
-        fitPos = self.getFitPos(current);
-
-        if (fitPos && (current.width > fitPos.width || current.height > fitPos.height)) {
-          return true;
-        }
-      }
-
-      return false;
-    },
-
-    // Check if current image dimensions are smaller than actual
-    // =========================================================
-
-    isScaledDown: function (nextWidth, nextHeight) {
-      var self = this,
-        rez = false,
-        current = self.current,
-        $content = current.$content;
-
-      if (nextWidth !== undefined && nextHeight !== undefined) {
-        rez = nextWidth < current.width && nextHeight < current.height;
-      } else if ($content) {
-        rez = $.fancybox.getTranslate($content);
-        rez = rez.width < current.width && rez.height < current.height;
-      }
-
-      return rez;
-    },
-
-    // Check if image dimensions exceed parent element
-    // ===============================================
-
-    canPan: function (nextWidth, nextHeight) {
-      var self = this,
-        current = self.current,
-        pos = null,
-        rez = false;
-
-      if (current.type === "image" && (current.isComplete || (nextWidth && nextHeight)) && !current.hasError) {
-        rez = self.getFitPos(current);
-
-        if (nextWidth !== undefined && nextHeight !== undefined) {
-          pos = {
-            width: nextWidth,
-            height: nextHeight
-          };
-        } else if (current.isComplete) {
-          pos = $.fancybox.getTranslate(current.$content);
-        }
-
-        if (pos && rez) {
-          rez = Math.abs(pos.width - rez.width) > 1.5 || Math.abs(pos.height - rez.height) > 1.5;
-        }
-      }
-
-      return rez;
-    },
-
-    // Load content into the slide
-    // ===========================
-
-    loadSlide: function (slide) {
-      var self = this,
-        type,
-        $slide,
-        ajaxLoad;
-
-      if (slide.isLoading || slide.isLoaded) {
-        return;
-      }
-
-      slide.isLoading = true;
-
-      if (self.trigger("beforeLoad", slide) === false) {
-        slide.isLoading = false;
-
-        return false;
-      }
-
-      type = slide.type;
-      $slide = slide.$slide;
-
-      $slide
-        .off("refresh")
-        .trigger("onReset")
-        .addClass(slide.opts.slideClass);
-
-      // Create content depending on the type
-      switch (type) {
-        case "image":
-          self.setImage(slide);
-
-          break;
-
-        case "iframe":
-          self.setIframe(slide);
-
-          break;
-
-        case "html":
-          self.setContent(slide, slide.src || slide.content);
-
-          break;
-
-        case "video":
-          self.setContent(
-            slide,
-            slide.opts.video.tpl
-            .replace(/\{\{src\}\}/gi, slide.src)
-            .replace("{{format}}", slide.opts.videoFormat || slide.opts.video.format || "")
-            .replace("{{poster}}", slide.thumb || "")
-          );
-
-          break;
-
-        case "inline":
-          if ($(slide.src).length) {
-            self.setContent(slide, $(slide.src));
-          } else {
-            self.setError(slide);
-          }
-
-          break;
-
-        case "ajax":
-          self.showLoading(slide);
-
-          ajaxLoad = $.ajax(
-            $.extend({}, slide.opts.ajax.settings, {
-              url: slide.src,
-              success: function (data, textStatus) {
-                if (textStatus === "success") {
-                  self.setContent(slide, data);
-                }
-              },
-              error: function (jqXHR, textStatus) {
-                if (jqXHR && textStatus !== "abort") {
-                  self.setError(slide);
-                }
-              }
-            })
-          );
-
-          $slide.one("onReset", function () {
-            ajaxLoad.abort();
-          });
-
-          break;
-
-        default:
-          self.setError(slide);
-
-          break;
-      }
-
-      return true;
-    },
-
-    // Use thumbnail image, if possible
-    // ================================
-
-    setImage: function (slide) {
-      var self = this,
-        ghost;
-
-      // Check if need to show loading icon
-      setTimeout(function () {
-        var $img = slide.$image;
-
-        if (!self.isClosing && slide.isLoading && (!$img || !$img.length || !$img[0].complete) && !slide.hasError) {
-          self.showLoading(slide);
-        }
-      }, 50);
-
-      //Check if image has srcset
-      self.checkSrcset(slide);
-
-      // This will be wrapper containing both ghost and actual image
-      slide.$content = $('<div class="fancybox-content"></div>')
-        .addClass("fancybox-is-hidden")
-        .appendTo(slide.$slide.addClass("fancybox-slide--image"));
-
-      // If we have a thumbnail, we can display it while actual image is loading
-      // Users will not stare at black screen and actual image will appear gradually
-      if (slide.opts.preload !== false && slide.opts.width && slide.opts.height && slide.thumb) {
-        slide.width = slide.opts.width;
-        slide.height = slide.opts.height;
-
-        ghost = document.createElement("img");
-
-        ghost.onerror = function () {
-          $(this).remove();
-
-          slide.$ghost = null;
-        };
-
-        ghost.onload = function () {
-          self.afterLoad(slide);
-        };
-
-        slide.$ghost = $(ghost)
-          .addClass("fancybox-image")
-          .appendTo(slide.$content)
-          .attr("src", slide.thumb);
-      }
-
-      // Start loading actual image
-      self.setBigImage(slide);
-    },
-
-    // Check if image has srcset and get the source
-    // ============================================
-    checkSrcset: function (slide) {
-      var srcset = slide.opts.srcset || slide.opts.image.srcset,
-        found,
-        temp,
-        pxRatio,
-        windowWidth;
-
-      // If we have "srcset", then we need to find first matching "src" value.
-      // This is necessary, because when you set an src attribute, the browser will preload the image
-      // before any javascript or even CSS is applied.
-      if (srcset) {
-        pxRatio = window.devicePixelRatio || 1;
-        windowWidth = window.innerWidth * pxRatio;
-
-        temp = srcset.split(",").map(function (el) {
-          var ret = {};
-
-          el.trim()
-            .split(/\s+/)
-            .forEach(function (el, i) {
-              var value = parseInt(el.substring(0, el.length - 1), 10);
-
-              if (i === 0) {
-                return (ret.url = el);
-              }
-
-              if (value) {
-                ret.value = value;
-                ret.postfix = el[el.length - 1];
-              }
-            });
-
-          return ret;
-        });
-
-        // Sort by value
-        temp.sort(function (a, b) {
-          return a.value - b.value;
-        });
-
-        // Ok, now we have an array of all srcset values
-        for (var j = 0; j < temp.length; j++) {
-          var el = temp[j];
-
-          if ((el.postfix === "w" && el.value >= windowWidth) || (el.postfix === "x" && el.value >= pxRatio)) {
-            found = el;
-            break;
-          }
-        }
-
-        // If not found, take the last one
-        if (!found && temp.length) {
-          found = temp[temp.length - 1];
-        }
-
-        if (found) {
-          slide.src = found.url;
-
-          // If we have default width/height values, we can calculate height for matching source
-          if (slide.width && slide.height && found.postfix == "w") {
-            slide.height = (slide.width / slide.height) * found.value;
-            slide.width = found.value;
-          }
-
-          slide.opts.srcset = srcset;
-        }
-      }
-    },
-
-    // Create full-size image
-    // ======================
-
-    setBigImage: function (slide) {
-      var self = this,
-        img = document.createElement("img"),
-        $img = $(img);
-
-      slide.$image = $img
-        .one("error", function () {
-          self.setError(slide);
-        })
-        .one("load", function () {
-          var sizes;
-
-          if (!slide.$ghost) {
-            self.resolveImageSlideSize(slide, this.naturalWidth, this.naturalHeight);
-
-            self.afterLoad(slide);
-          }
-
-          if (self.isClosing) {
-            return;
-          }
-
-          if (slide.opts.srcset) {
-            sizes = slide.opts.sizes;
-
-            if (!sizes || sizes === "auto") {
-              sizes =
-                (slide.width / slide.height > 1 && $W.width() / $W.height() > 1 ? "100" : Math.round((slide.width / slide.height) * 100)) +
-                "vw";
-            }
-
-            $img.attr("sizes", sizes).attr("srcset", slide.opts.srcset);
-          }
-
-          // Hide temporary image after some delay
-          if (slide.$ghost) {
-            setTimeout(function () {
-              if (slide.$ghost && !self.isClosing) {
-                slide.$ghost.hide();
-              }
-            }, Math.min(300, Math.max(1000, slide.height / 1600)));
-          }
-
-          self.hideLoading(slide);
-        })
-        .addClass("fancybox-image")
-        .attr("src", slide.src)
-        .appendTo(slide.$content);
-
-      if ((img.complete || img.readyState == "complete") && $img.naturalWidth && $img.naturalHeight) {
-        $img.trigger("load");
-      } else if (img.error) {
-        $img.trigger("error");
-      }
-    },
-
-    // Computes the slide size from image size and maxWidth/maxHeight
-    // ==============================================================
-
-    resolveImageSlideSize: function (slide, imgWidth, imgHeight) {
-      var maxWidth = parseInt(slide.opts.width, 10),
-        maxHeight = parseInt(slide.opts.height, 10);
-
-      // Sets the default values from the image
-      slide.width = imgWidth;
-      slide.height = imgHeight;
-
-      if (maxWidth > 0) {
-        slide.width = maxWidth;
-        slide.height = Math.floor((maxWidth * imgHeight) / imgWidth);
-      }
-
-      if (maxHeight > 0) {
-        slide.width = Math.floor((maxHeight * imgWidth) / imgHeight);
-        slide.height = maxHeight;
-      }
-    },
-
-    // Create iframe wrapper, iframe and bindings
-    // ==========================================
-
-    setIframe: function (slide) {
-      var self = this,
-        opts = slide.opts.iframe,
-        $slide = slide.$slide,
-        $iframe;
-
-      slide.$content = $('<div class="fancybox-content' + (opts.preload ? " fancybox-is-hidden" : "") + '"></div>')
-        .css(opts.css)
-        .appendTo($slide);
-
-      $slide.addClass("fancybox-slide--" + slide.contentType);
-
-      slide.$iframe = $iframe = $(opts.tpl.replace(/\{rnd\}/g, new Date().getTime()))
-        .attr(opts.attr)
-        .appendTo(slide.$content);
-
-      if (opts.preload) {
-        self.showLoading(slide);
-
-        // Unfortunately, it is not always possible to determine if iframe is successfully loaded
-        // (due to browser security policy)
-
-        $iframe.on("load.fb error.fb", function (e) {
-          this.isReady = 1;
-
-          slide.$slide.trigger("refresh");
-
-          self.afterLoad(slide);
-        });
-
-        // Recalculate iframe content size
-        // ===============================
-
-        $slide.on("refresh.fb", function () {
-          var $content = slide.$content,
-            frameWidth = opts.css.width,
-            frameHeight = opts.css.height,
-            $contents,
-            $body;
-
-          if ($iframe[0].isReady !== 1) {
-            return;
-          }
-
-          try {
-            $contents = $iframe.contents();
-            $body = $contents.find("body");
-          } catch (ignore) {}
-
-          // Calculate content dimensions, if it is accessible
-          if ($body && $body.length && $body.children().length) {
-            // Avoid scrolling to top (if multiple instances)
-            $slide.css("overflow", "visible");
-
-            $content.css({
-              width: "100%",
-              "max-width": "100%",
-              height: "9999px"
-            });
-
-            if (frameWidth === undefined) {
-              frameWidth = Math.ceil(Math.max($body[0].clientWidth, $body.outerWidth(true)));
-            }
-
-            $content.css("width", frameWidth ? frameWidth : "").css("max-width", "");
-
-            if (frameHeight === undefined) {
-              frameHeight = Math.ceil(Math.max($body[0].clientHeight, $body.outerHeight(true)));
-            }
-
-            $content.css("height", frameHeight ? frameHeight : "");
-
-            $slide.css("overflow", "auto");
-          }
-
-          $content.removeClass("fancybox-is-hidden");
-        });
-      } else {
-        self.afterLoad(slide);
-      }
-
-      $iframe.attr("src", slide.src);
-
-      // Remove iframe if closing or changing gallery item
-      $slide.one("onReset", function () {
-        // This helps IE not to throw errors when closing
-        try {
-          $(this)
-            .find("iframe")
-            .hide()
-            .unbind()
-            .attr("src", "//about:blank");
-        } catch (ignore) {}
-
-        $(this)
-          .off("refresh.fb")
-          .empty();
-
-        slide.isLoaded = false;
-        slide.isRevealed = false;
-      });
-    },
-
-    // Wrap and append content to the slide
-    // ======================================
-
-    setContent: function (slide, content) {
-      var self = this;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      self.hideLoading(slide);
-
-      if (slide.$content) {
-        $.fancybox.stop(slide.$content);
-      }
-
-      slide.$slide.empty();
-
-      // If content is a jQuery object, then it will be moved to the slide.
-      // The placeholder is created so we will know where to put it back.
-      if (isQuery(content) && content.parent().length) {
-        // Make sure content is not already moved to fancyBox
-        if (content.hasClass("fancybox-content") || content.parent().hasClass("fancybox-content")) {
-          content.parents(".fancybox-slide").trigger("onReset");
-        }
-
-        // Create temporary element marking original place of the content
-        slide.$placeholder = $("<div>")
-          .hide()
-          .insertAfter(content);
-
-        // Make sure content is visible
-        content.css("display", "inline-block");
-      } else if (!slide.hasError) {
-        // If content is just a plain text, try to convert it to html
-        if ($.type(content) === "string") {
-          content = $("<div>")
-            .append($.trim(content))
-            .contents();
-        }
-
-        // If "filter" option is provided, then filter content
-        if (slide.opts.filter) {
-          content = $("<div>")
-            .html(content)
-            .find(slide.opts.filter);
-        }
-      }
-
-      slide.$slide.one("onReset", function () {
-        // Pause all html5 video/audio
-        $(this)
-          .find("video,audio")
-          .trigger("pause");
-
-        // Put content back
-        if (slide.$placeholder) {
-          slide.$placeholder.after(content.removeClass("fancybox-content").hide()).remove();
-
-          slide.$placeholder = null;
-        }
-
-        // Remove custom close button
-        if (slide.$smallBtn) {
-          slide.$smallBtn.remove();
-
-          slide.$smallBtn = null;
-        }
-
-        // Remove content and mark slide as not loaded
-        if (!slide.hasError) {
-          $(this).empty();
-
-          slide.isLoaded = false;
-          slide.isRevealed = false;
-        }
-      });
-
-      $(content).appendTo(slide.$slide);
-
-      if ($(content).is("video,audio")) {
-        $(content).addClass("fancybox-video");
-
-        $(content).wrap("<div></div>");
-
-        slide.contentType = "video";
-
-        slide.opts.width = slide.opts.width || $(content).attr("width");
-        slide.opts.height = slide.opts.height || $(content).attr("height");
-      }
-
-      slide.$content = slide.$slide
-        .children()
-        .filter("div,form,main,video,audio,article,.fancybox-content")
-        .first();
-
-      slide.$content.siblings().hide();
-
-      // Re-check if there is a valid content
-      // (in some cases, ajax response can contain various elements or plain text)
-      if (!slide.$content.length) {
-        slide.$content = slide.$slide
-          .wrapInner("<div></div>")
-          .children()
-          .first();
-      }
-
-      slide.$content.addClass("fancybox-content");
-
-      slide.$slide.addClass("fancybox-slide--" + slide.contentType);
-
-      self.afterLoad(slide);
-    },
-
-    // Display error message
-    // =====================
-
-    setError: function (slide) {
-      slide.hasError = true;
-
-      slide.$slide
-        .trigger("onReset")
-        .removeClass("fancybox-slide--" + slide.contentType)
-        .addClass("fancybox-slide--error");
-
-      slide.contentType = "html";
-
-      this.setContent(slide, this.translate(slide, slide.opts.errorTpl));
-
-      if (slide.pos === this.currPos) {
-        this.isAnimating = false;
-      }
-    },
-
-    // Show loading icon inside the slide
-    // ==================================
-
-    showLoading: function (slide) {
-      var self = this;
-
-      slide = slide || self.current;
-
-      if (slide && !slide.$spinner) {
-        slide.$spinner = $(self.translate(self, self.opts.spinnerTpl))
-          .appendTo(slide.$slide)
-          .hide()
-          .fadeIn("fast");
-      }
-    },
-
-    // Remove loading icon from the slide
-    // ==================================
-
-    hideLoading: function (slide) {
-      var self = this;
-
-      slide = slide || self.current;
-
-      if (slide && slide.$spinner) {
-        slide.$spinner.stop().remove();
-
-        delete slide.$spinner;
-      }
-    },
-
-    // Adjustments after slide content has been loaded
-    // ===============================================
-
-    afterLoad: function (slide) {
-      var self = this;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      slide.isLoading = false;
-      slide.isLoaded = true;
-
-      self.trigger("afterLoad", slide);
-
-      self.hideLoading(slide);
-
-      // Add small close button
-      if (slide.opts.smallBtn && (!slide.$smallBtn || !slide.$smallBtn.length)) {
-        slide.$smallBtn = $(self.translate(slide, slide.opts.btnTpl.smallBtn)).appendTo(slide.$content);
-      }
-
-      // Disable right click
-      if (slide.opts.protect && slide.$content && !slide.hasError) {
-        slide.$content.on("contextmenu.fb", function (e) {
-          if (e.button == 2) {
-            e.preventDefault();
-          }
-
-          return true;
-        });
-
-        // Add fake element on top of the image
-        // This makes a bit harder for user to select image
-        if (slide.type === "image") {
-          $('<div class="fancybox-spaceball"></div>').appendTo(slide.$content);
-        }
-      }
-
-      self.adjustCaption(slide);
-
-      self.adjustLayout(slide);
-
-      if (slide.pos === self.currPos) {
-        self.updateCursor();
-      }
-
-      self.revealContent(slide);
-    },
-
-    // Prevent caption overlap,
-    // fix css inconsistency across browsers
-    // =====================================
-
-    adjustCaption: function (slide) {
-      var self = this,
-        current = slide || self.current,
-        caption = current.opts.caption,
-        preventOverlap = current.opts.preventCaptionOverlap,
-        $caption = self.$refs.caption,
-        $clone,
-        captionH = false;
-
-      $caption.toggleClass("fancybox-caption--separate", preventOverlap);
-
-      if (preventOverlap && caption && caption.length) {
-        if (current.pos !== self.currPos) {
-          $clone = $caption.clone().appendTo($caption.parent());
-
-          $clone
-            .children()
-            .eq(0)
-            .empty()
-            .html(caption);
-
-          captionH = $clone.outerHeight(true);
-
-          $clone.empty().remove();
-        } else if (self.$caption) {
-          captionH = self.$caption.outerHeight(true);
-        }
-
-        current.$slide.css("padding-bottom", captionH || "");
-      }
-    },
-
-    // Simple hack to fix inconsistency across browsers, described here (affects Edge, too):
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=748518
-    // ====================================================================================
-
-    adjustLayout: function (slide) {
-      var self = this,
-        current = slide || self.current,
-        scrollHeight,
-        marginBottom,
-        inlinePadding,
-        actualPadding;
-
-      if (current.isLoaded && current.opts.disableLayoutFix !== true) {
-        current.$content.css("margin-bottom", "");
-
-        // If we would always set margin-bottom for the content,
-        // then it would potentially break vertical align
-        if (current.$content.outerHeight() > current.$slide.height() + 0.5) {
-          inlinePadding = current.$slide[0].style["padding-bottom"];
-          actualPadding = current.$slide.css("padding-bottom");
-
-          if (parseFloat(actualPadding) > 0) {
-            scrollHeight = current.$slide[0].scrollHeight;
-
-            current.$slide.css("padding-bottom", 0);
-
-            if (Math.abs(scrollHeight - current.$slide[0].scrollHeight) < 1) {
-              marginBottom = actualPadding;
-            }
-
-            current.$slide.css("padding-bottom", inlinePadding);
-          }
-        }
-
-        current.$content.css("margin-bottom", marginBottom);
-      }
-    },
-
-    // Make content visible
-    // This method is called right after content has been loaded or
-    // user navigates gallery and transition should start
-    // ============================================================
-
-    revealContent: function (slide) {
-      var self = this,
-        $slide = slide.$slide,
-        end = false,
-        start = false,
-        isMoved = self.isMoved(slide),
-        isRevealed = slide.isRevealed,
-        effect,
-        effectClassName,
-        duration,
-        opacity;
-
-      slide.isRevealed = true;
-
-      effect = slide.opts[self.firstRun ? "animationEffect" : "transitionEffect"];
-      duration = slide.opts[self.firstRun ? "animationDuration" : "transitionDuration"];
-
-      duration = parseInt(slide.forcedDuration === undefined ? duration : slide.forcedDuration, 10);
-
-      if (isMoved || slide.pos !== self.currPos || !duration) {
-        effect = false;
-      }
-
-      // Check if can zoom
-      if (effect === "zoom") {
-        if (slide.pos === self.currPos && duration && slide.type === "image" && !slide.hasError && (start = self.getThumbPos(slide))) {
-          end = self.getFitPos(slide);
-        } else {
-          effect = "fade";
-        }
-      }
-
-      // Zoom animation
-      // ==============
-      if (effect === "zoom") {
-        self.isAnimating = true;
-
-        end.scaleX = end.width / start.width;
-        end.scaleY = end.height / start.height;
-
-        // Check if we need to animate opacity
-        opacity = slide.opts.zoomOpacity;
-
-        if (opacity == "auto") {
-          opacity = Math.abs(slide.width / slide.height - start.width / start.height) > 0.1;
-        }
-
-        if (opacity) {
-          start.opacity = 0.1;
-          end.opacity = 1;
-        }
-
-        // Draw image at start position
-        $.fancybox.setTranslate(slide.$content.removeClass("fancybox-is-hidden"), start);
-
-        forceRedraw(slide.$content);
-
-        // Start animation
-        $.fancybox.animate(slide.$content, end, duration, function () {
-          self.isAnimating = false;
-
-          self.complete();
-        });
-
-        return;
-      }
-
-      self.updateSlide(slide);
-
-      // Simply show content if no effect
-      // ================================
-      if (!effect) {
-        slide.$content.removeClass("fancybox-is-hidden");
-
-        if (!isRevealed && isMoved && slide.type === "image" && !slide.hasError) {
-          slide.$content.hide().fadeIn("fast");
-        }
-
-        if (slide.pos === self.currPos) {
-          self.complete();
-        }
-
-        return;
-      }
-
-      // Prepare for CSS transiton
-      // =========================
-      $.fancybox.stop($slide);
-
-      //effectClassName = "fancybox-animated fancybox-slide--" + (slide.pos >= self.prevPos ? "next" : "previous") + " fancybox-fx-" + effect;
-      effectClassName = "fancybox-slide--" + (slide.pos >= self.prevPos ? "next" : "previous") + " fancybox-animated fancybox-fx-" + effect;
-
-      $slide.addClass(effectClassName).removeClass("fancybox-slide--current"); //.addClass(effectClassName);
-
-      slide.$content.removeClass("fancybox-is-hidden");
-
-      // Force reflow
-      forceRedraw($slide);
-
-      if (slide.type !== "image") {
-        slide.$content.hide().show(0);
-      }
-
-      $.fancybox.animate(
-        $slide,
-        "fancybox-slide--current",
-        duration,
-        function () {
-          $slide.removeClass(effectClassName).css({
-            transform: "",
-            opacity: ""
-          });
-
-          if (slide.pos === self.currPos) {
-            self.complete();
-          }
-        },
-        true
-      );
-    },
-
-    // Check if we can and have to zoom from thumbnail
-    //================================================
-
-    getThumbPos: function (slide) {
-      var rez = false,
-        $thumb = slide.$thumb,
-        thumbPos,
-        btw,
-        brw,
-        bbw,
-        blw;
-
-      if (!$thumb || !inViewport($thumb[0])) {
-        return false;
-      }
-
-      thumbPos = $.fancybox.getTranslate($thumb);
-
-      btw = parseFloat($thumb.css("border-top-width") || 0);
-      brw = parseFloat($thumb.css("border-right-width") || 0);
-      bbw = parseFloat($thumb.css("border-bottom-width") || 0);
-      blw = parseFloat($thumb.css("border-left-width") || 0);
-
-      rez = {
-        top: thumbPos.top + btw,
-        left: thumbPos.left + blw,
-        width: thumbPos.width - brw - blw,
-        height: thumbPos.height - btw - bbw,
-        scaleX: 1,
-        scaleY: 1
-      };
-
-      return thumbPos.width > 0 && thumbPos.height > 0 ? rez : false;
-    },
-
-    // Final adjustments after current gallery item is moved to position
-    // and it`s content is loaded
-    // ==================================================================
-
-    complete: function () {
-      var self = this,
-        current = self.current,
-        slides = {},
-        $el;
-
-      if (self.isMoved() || !current.isLoaded) {
-        return;
-      }
-
-      if (!current.isComplete) {
-        current.isComplete = true;
-
-        current.$slide.siblings().trigger("onReset");
-
-        self.preload("inline");
-
-        // Trigger any CSS transiton inside the slide
-        forceRedraw(current.$slide);
-
-        current.$slide.addClass("fancybox-slide--complete");
-
-        // Remove unnecessary slides
-        $.each(self.slides, function (key, slide) {
-          if (slide.pos >= self.currPos - 1 && slide.pos <= self.currPos + 1) {
-            slides[slide.pos] = slide;
-          } else if (slide) {
-            $.fancybox.stop(slide.$slide);
-
-            slide.$slide.off().remove();
-          }
-        });
-
-        self.slides = slides;
-      }
-
-      self.isAnimating = false;
-
-      self.updateCursor();
-
-      self.trigger("afterShow");
-
-      // Autoplay first html5 video/audio
-      if (!!current.opts.video.autoStart) {
-        current.$slide
-          .find("video,audio")
-          .filter(":visible:first")
-          .trigger("play")
-          .one("ended", function () {
-            if (Document.exitFullscreen) {
-              Document.exitFullscreen();
-            } else if (this.webkitExitFullscreen) {
-              this.webkitExitFullscreen();
-            }
-
-            self.next();
-          });
-      }
-
-      // Try to focus on the first focusable element
-      if (current.opts.autoFocus && current.contentType === "html") {
-        // Look for the first input with autofocus attribute
-        $el = current.$content.find("input[autofocus]:enabled:visible:first");
-
-        if ($el.length) {
-          $el.trigger("focus");
-        } else {
-          self.focus(null, true);
-        }
-      }
-
-      // Avoid jumping
-      current.$slide.scrollTop(0).scrollLeft(0);
-    },
-
-    // Preload next and previous slides
-    // ================================
-
-    preload: function (type) {
-      var self = this,
-        prev,
-        next;
-
-      if (self.group.length < 2) {
-        return;
-      }
-
-      next = self.slides[self.currPos + 1];
-      prev = self.slides[self.currPos - 1];
-
-      if (prev && prev.type === type) {
-        self.loadSlide(prev);
-      }
-
-      if (next && next.type === type) {
-        self.loadSlide(next);
-      }
-    },
-
-    // Try to find and focus on the first focusable element
-    // ====================================================
-
-    focus: function (e, firstRun) {
-      var self = this,
-        focusableStr = [
-          "a[href]",
-          "area[href]",
-          'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',
-          "select:not([disabled]):not([aria-hidden])",
-          "textarea:not([disabled]):not([aria-hidden])",
-          "button:not([disabled]):not([aria-hidden])",
-          "iframe",
-          "object",
-          "embed",
-          "video",
-          "audio",
-          "[contenteditable]",
-          '[tabindex]:not([tabindex^="-"])'
-        ].join(","),
-        focusableItems,
-        focusedItemIndex;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      if (e || !self.current || !self.current.isComplete) {
-        // Focus on any element inside fancybox
-        focusableItems = self.$refs.container.find("*:visible");
-      } else {
-        // Focus inside current slide
-        focusableItems = self.current.$slide.find("*:visible" + (firstRun ? ":not(.fancybox-close-small)" : ""));
-      }
-
-      focusableItems = focusableItems.filter(focusableStr).filter(function () {
-        return $(this).css("visibility") !== "hidden" && !$(this).hasClass("disabled");
-      });
-
-      if (focusableItems.length) {
-        focusedItemIndex = focusableItems.index(document.activeElement);
-
-        if (e && e.shiftKey) {
-          // Back tab
-          if (focusedItemIndex < 0 || focusedItemIndex == 0) {
-            e.preventDefault();
-
-            focusableItems.eq(focusableItems.length - 1).trigger("focus");
-          }
-        } else {
-          // Outside or Forward tab
-          if (focusedItemIndex < 0 || focusedItemIndex == focusableItems.length - 1) {
-            if (e) {
-              e.preventDefault();
-            }
-
-            focusableItems.eq(0).trigger("focus");
-          }
-        }
-      } else {
-        self.$refs.container.trigger("focus");
-      }
-    },
-
-    // Activates current instance - brings container to the front and enables keyboard,
-    // notifies other instances about deactivating
-    // =================================================================================
-
-    activate: function () {
-      var self = this;
-
-      // Deactivate all instances
-      $(".fancybox-container").each(function () {
-        var instance = $(this).data("FancyBox");
-
-        // Skip self and closing instances
-        if (instance && instance.id !== self.id && !instance.isClosing) {
-          instance.trigger("onDeactivate");
-
-          instance.removeEvents();
-
-          instance.isVisible = false;
-        }
-      });
-
-      self.isVisible = true;
-
-      if (self.current || self.isIdle) {
-        self.update();
-
-        self.updateControls();
-      }
-
-      self.trigger("onActivate");
-
-      self.addEvents();
-    },
-
-    // Start closing procedure
-    // This will start "zoom-out" animation if needed and clean everything up afterwards
-    // =================================================================================
-
-    close: function (e, d) {
-      var self = this,
-        current = self.current,
-        effect,
-        duration,
-        $content,
-        domRect,
-        opacity,
-        start,
-        end;
-
-      var done = function () {
-        self.cleanUp(e);
-      };
-
-      if (self.isClosing) {
-        return false;
-      }
-
-      self.isClosing = true;
-
-      // If beforeClose callback prevents closing, make sure content is centered
-      if (self.trigger("beforeClose", e) === false) {
-        self.isClosing = false;
-
-        requestAFrame(function () {
-          self.update();
-        });
-
-        return false;
-      }
-
-      // Remove all events
-      // If there are multiple instances, they will be set again by "activate" method
-      self.removeEvents();
-
-      $content = current.$content;
-      effect = current.opts.animationEffect;
-      duration = $.isNumeric(d) ? d : effect ? current.opts.animationDuration : 0;
-
-      current.$slide.removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated");
-
-      if (e !== true) {
-        $.fancybox.stop(current.$slide);
-      } else {
-        effect = false;
-      }
-
-      // Remove other slides
-      current.$slide
-        .siblings()
-        .trigger("onReset")
-        .remove();
-
-      // Trigger animations
-      if (duration) {
-        self.$refs.container
-          .removeClass("fancybox-is-open")
-          .addClass("fancybox-is-closing")
-          .css("transition-duration", duration + "ms");
-      }
-
-      // Clean up
-      self.hideLoading(current);
-
-      self.hideControls(true);
-
-      self.updateCursor();
-
-      // Check if possible to zoom-out
-      if (
-        effect === "zoom" &&
-        !($content && duration && current.type === "image" && !self.isMoved() && !current.hasError && (end = self.getThumbPos(current)))
-      ) {
-        effect = "fade";
-      }
-
-      if (effect === "zoom") {
-        $.fancybox.stop($content);
-
-        domRect = $.fancybox.getTranslate($content);
-
-        start = {
-          top: domRect.top,
-          left: domRect.left,
-          scaleX: domRect.width / end.width,
-          scaleY: domRect.height / end.height,
-          width: end.width,
-          height: end.height
-        };
-
-        // Check if we need to animate opacity
-        opacity = current.opts.zoomOpacity;
-
-        if (opacity == "auto") {
-          opacity = Math.abs(current.width / current.height - end.width / end.height) > 0.1;
-        }
-
-        if (opacity) {
-          end.opacity = 0;
-        }
-
-        $.fancybox.setTranslate($content, start);
-
-        forceRedraw($content);
-
-        $.fancybox.animate($content, end, duration, done);
-
-        return true;
-      }
-
-      if (effect && duration) {
-        $.fancybox.animate(
-          current.$slide.addClass("fancybox-slide--previous").removeClass("fancybox-slide--current"),
-          "fancybox-animated fancybox-fx-" + effect,
-          duration,
-          done
-        );
-      } else {
-        // If skip animation
-        if (e === true) {
-          setTimeout(done, duration);
-        } else {
-          done();
-        }
-      }
-
-      return true;
-    },
-
-    // Final adjustments after removing the instance
-    // =============================================
-
-    cleanUp: function (e) {
-      var self = this,
-        instance,
-        $focus = self.current.opts.$orig,
-        x,
-        y;
-
-      self.current.$slide.trigger("onReset");
-
-      self.$refs.container.empty().remove();
-
-      self.trigger("afterClose", e);
-
-      // Place back focus
-      if (!!self.current.opts.backFocus) {
-        if (!$focus || !$focus.length || !$focus.is(":visible")) {
-          $focus = self.$trigger;
-        }
-
-        if ($focus && $focus.length) {
-          x = window.scrollX;
-          y = window.scrollY;
-
-          $focus.trigger("focus");
-
-          $("html, body")
-            .scrollTop(y)
-            .scrollLeft(x);
-        }
-      }
-
-      self.current = null;
-
-      // Check if there are other instances
-      instance = $.fancybox.getInstance();
-
-      if (instance) {
-        instance.activate();
-      } else {
-        $("body").removeClass("fancybox-active compensate-for-scrollbar");
-
-        $("#fancybox-style-noscroll").remove();
-      }
-    },
-
-    // Call callback and trigger an event
-    // ==================================
-
-    trigger: function (name, slide) {
-      var args = Array.prototype.slice.call(arguments, 1),
-        self = this,
-        obj = slide && slide.opts ? slide : self.current,
-        rez;
-
-      if (obj) {
-        args.unshift(obj);
-      } else {
-        obj = self;
-      }
-
-      args.unshift(self);
-
-      if ($.isFunction(obj.opts[name])) {
-        rez = obj.opts[name].apply(obj, args);
-      }
-
-      if (rez === false) {
-        return rez;
-      }
-
-      if (name === "afterClose" || !self.$refs) {
-        $D.trigger(name + ".fb", args);
-      } else {
-        self.$refs.container.trigger(name + ".fb", args);
-      }
-    },
-
-    // Update infobar values, navigation button states and reveal caption
-    // ==================================================================
-
-    updateControls: function () {
-      var self = this,
-        current = self.current,
-        index = current.index,
-        $container = self.$refs.container,
-        $caption = self.$refs.caption,
-        caption = current.opts.caption;
-
-      // Recalculate content dimensions
-      current.$slide.trigger("refresh");
-
-      // Set caption
-      if (caption && caption.length) {
-        self.$caption = $caption;
-
-        $caption
-          .children()
-          .eq(0)
-          .html(caption);
-      } else {
-        self.$caption = null;
-      }
-
-      if (!self.hasHiddenControls && !self.isIdle) {
-        self.showControls();
-      }
-
-      // Update info and navigation elements
-      $container.find("[data-fancybox-count]").html(self.group.length);
-      $container.find("[data-fancybox-index]").html(index + 1);
-
-      $container.find("[data-fancybox-prev]").prop("disabled", !current.opts.loop && index <= 0);
-      $container.find("[data-fancybox-next]").prop("disabled", !current.opts.loop && index >= self.group.length - 1);
-
-      if (current.type === "image") {
-        // Re-enable buttons; update download button source
-        $container
-          .find("[data-fancybox-zoom]")
-          .show()
-          .end()
-          .find("[data-fancybox-download]")
-          .attr("href", current.opts.image.src || current.src)
-          .show();
-      } else if (current.opts.toolbar) {
-        $container.find("[data-fancybox-download],[data-fancybox-zoom]").hide();
-      }
-
-      // Make sure focus is not on disabled button/element
-      if ($(document.activeElement).is(":hidden,[disabled]")) {
-        self.$refs.container.trigger("focus");
-      }
-    },
-
-    // Hide toolbar and caption
-    // ========================
-
-    hideControls: function (andCaption) {
-      var self = this,
-        arr = ["infobar", "toolbar", "nav"];
-
-      if (andCaption || !self.current.opts.preventCaptionOverlap) {
-        arr.push("caption");
-      }
-
-      this.$refs.container.removeClass(
-        arr
-        .map(function (i) {
-          return "fancybox-show-" + i;
-        })
-        .join(" ")
-      );
-
-      this.hasHiddenControls = true;
-    },
-
-    showControls: function () {
-      var self = this,
-        opts = self.current ? self.current.opts : self.opts,
-        $container = self.$refs.container;
-
-      self.hasHiddenControls = false;
-      self.idleSecondsCounter = 0;
-
-      $container
-        .toggleClass("fancybox-show-toolbar", !!(opts.toolbar && opts.buttons))
-        .toggleClass("fancybox-show-infobar", !!(opts.infobar && self.group.length > 1))
-        .toggleClass("fancybox-show-caption", !!self.$caption)
-        .toggleClass("fancybox-show-nav", !!(opts.arrows && self.group.length > 1))
-        .toggleClass("fancybox-is-modal", !!opts.modal);
-    },
-
-    // Toggle toolbar and caption
-    // ==========================
-
-    toggleControls: function () {
-      if (this.hasHiddenControls) {
-        this.showControls();
-      } else {
-        this.hideControls();
-      }
-    }
-  });
-
-  $.fancybox = {
-    version: "3.5.7",
-    defaults: defaults,
-
-    // Get current instance and execute a command.
-    //
-    // Examples of usage:
-    //
-    //   $instance = $.fancybox.getInstance();
-    //   $.fancybox.getInstance().jumpTo( 1 );
-    //   $.fancybox.getInstance( 'jumpTo', 1 );
-    //   $.fancybox.getInstance( function() {
-    //       console.info( this.currIndex );
-    //   });
-    // ======================================================
-
-    getInstance: function (command) {
-      var instance = $('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),
-        args = Array.prototype.slice.call(arguments, 1);
-
-      if (instance instanceof FancyBox) {
-        if ($.type(command) === "string") {
-          instance[command].apply(instance, args);
-        } else if ($.type(command) === "function") {
-          command.apply(instance, args);
-        }
-
-        return instance;
-      }
-
-      return false;
-    },
-
-    // Create new instance
-    // ===================
-
-    open: function (items, opts, index) {
-      return new FancyBox(items, opts, index);
-    },
-
-    // Close current or all instances
-    // ==============================
-
-    close: function (all) {
-      var instance = this.getInstance();
-
-      if (instance) {
-        instance.close();
-
-        // Try to find and close next instance
-        if (all === true) {
-          this.close(all);
-        }
-      }
-    },
-
-    // Close all instances and unbind all events
-    // =========================================
-
-    destroy: function () {
-      this.close(true);
-
-      $D.add("body").off("click.fb-start", "**");
-    },
-
-    // Try to detect mobile devices
-    // ============================
-
-    isMobile: /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
-
-    // Detect if 'translate3d' support is available
-    // ============================================
-
-    use3d: (function () {
-      var div = document.createElement("div");
-
-      return (
-        window.getComputedStyle &&
-        window.getComputedStyle(div) &&
-        window.getComputedStyle(div).getPropertyValue("transform") &&
-        !(document.documentMode && document.documentMode < 11)
-      );
-    })(),
-
-    // Helper function to get current visual state of an element
-    // returns array[ top, left, horizontal-scale, vertical-scale, opacity ]
-    // =====================================================================
-
-    getTranslate: function ($el) {
-      var domRect;
-
-      if (!$el || !$el.length) {
-        return false;
-      }
-
-      domRect = $el[0].getBoundingClientRect();
-
-      return {
-        top: domRect.top || 0,
-        left: domRect.left || 0,
-        width: domRect.width,
-        height: domRect.height,
-        opacity: parseFloat($el.css("opacity"))
-      };
-    },
-
-    // Shortcut for setting "translate3d" properties for element
-    // Can set be used to set opacity, too
-    // ========================================================
-
-    setTranslate: function ($el, props) {
-      var str = "",
-        css = {};
-
-      if (!$el || !props) {
-        return;
-      }
-
-      if (props.left !== undefined || props.top !== undefined) {
-        str =
-          (props.left === undefined ? $el.position().left : props.left) +
-          "px, " +
-          (props.top === undefined ? $el.position().top : props.top) +
-          "px";
-
-        if (this.use3d) {
-          str = "translate3d(" + str + ", 0px)";
-        } else {
-          str = "translate(" + str + ")";
-        }
-      }
-
-      if (props.scaleX !== undefined && props.scaleY !== undefined) {
-        str += " scale(" + props.scaleX + ", " + props.scaleY + ")";
-      } else if (props.scaleX !== undefined) {
-        str += " scaleX(" + props.scaleX + ")";
-      }
-
-      if (str.length) {
-        css.transform = str;
-      }
-
-      if (props.opacity !== undefined) {
-        css.opacity = props.opacity;
-      }
-
-      if (props.width !== undefined) {
-        css.width = props.width;
-      }
-
-      if (props.height !== undefined) {
-        css.height = props.height;
-      }
-
-      return $el.css(css);
-    },
-
-    // Simple CSS transition handler
-    // =============================
-
-    animate: function ($el, to, duration, callback, leaveAnimationName) {
-      var self = this,
-        from;
-
-      if ($.isFunction(duration)) {
-        callback = duration;
-        duration = null;
-      }
-
-      self.stop($el);
-
-      from = self.getTranslate($el);
-
-      $el.on(transitionEnd, function (e) {
-        // Skip events from child elements and z-index change
-        if (e && e.originalEvent && (!$el.is(e.originalEvent.target) || e.originalEvent.propertyName == "z-index")) {
-          return;
-        }
-
-        self.stop($el);
-
-        if ($.isNumeric(duration)) {
-          $el.css("transition-duration", "");
-        }
-
-        if ($.isPlainObject(to)) {
-          if (to.scaleX !== undefined && to.scaleY !== undefined) {
-            self.setTranslate($el, {
-              top: to.top,
-              left: to.left,
-              width: from.width * to.scaleX,
-              height: from.height * to.scaleY,
-              scaleX: 1,
-              scaleY: 1
-            });
-          }
-        } else if (leaveAnimationName !== true) {
-          $el.removeClass(to);
-        }
-
-        if ($.isFunction(callback)) {
-          callback(e);
-        }
-      });
-
-      if ($.isNumeric(duration)) {
-        $el.css("transition-duration", duration + "ms");
-      }
-
-      // Start animation by changing CSS properties or class name
-      if ($.isPlainObject(to)) {
-        if (to.scaleX !== undefined && to.scaleY !== undefined) {
-          delete to.width;
-          delete to.height;
-
-          if ($el.parent().hasClass("fancybox-slide--image")) {
-            $el.parent().addClass("fancybox-is-scaling");
-          }
-        }
-
-        $.fancybox.setTranslate($el, to);
-      } else {
-        $el.addClass(to);
-      }
-
-      // Make sure that `transitionend` callback gets fired
-      $el.data(
-        "timer",
-        setTimeout(function () {
-          $el.trigger(transitionEnd);
-        }, duration + 33)
-      );
-    },
-
-    stop: function ($el, callCallback) {
-      if ($el && $el.length) {
-        clearTimeout($el.data("timer"));
-
-        if (callCallback) {
-          $el.trigger(transitionEnd);
-        }
-
-        $el.off(transitionEnd).css("transition-duration", "");
-
-        $el.parent().removeClass("fancybox-is-scaling");
-      }
-    }
-  };
-
-  // Default click handler for "fancyboxed" links
-  // ============================================
-
-  function _run(e, opts) {
-    var items = [],
-      index = 0,
-      $target,
-      value,
-      instance;
-
-    // Avoid opening multiple times
-    if (e && e.isDefaultPrevented()) {
-      return;
-    }
-
-    e.preventDefault();
-
-    opts = opts || {};
-
-    if (e && e.data) {
-      opts = mergeOpts(e.data.options, opts);
-    }
-
-    $target = opts.$target || $(e.currentTarget).trigger("blur");
-    instance = $.fancybox.getInstance();
-
-    if (instance && instance.$trigger && instance.$trigger.is($target)) {
-      return;
-    }
-
-    if (opts.selector) {
-      items = $(opts.selector);
-    } else {
-      // Get all related items and find index for clicked one
-      value = $target.attr("data-fancybox") || "";
-
-      if (value) {
-        items = e.data ? e.data.items : [];
-        items = items.length ? items.filter('[data-fancybox="' + value + '"]') : $('[data-fancybox="' + value + '"]');
-      } else {
-        items = [$target];
-      }
-    }
-
-    index = $(items).index($target);
-
-    // Sometimes current item can not be found
-    if (index < 0) {
-      index = 0;
-    }
-
-    instance = $.fancybox.open(items, opts, index);
-
-    // Save last active element
-    instance.$trigger = $target;
-  }
-
-  // Create a jQuery plugin
-  // ======================
-
-  $.fn.fancybox = function (options) {
-    var selector;
-
-    options = options || {};
-    selector = options.selector || false;
-
-    if (selector) {
-      // Use body element instead of document so it executes first
-      $("body")
-        .off("click.fb-start", selector)
-        .on("click.fb-start", selector, {
-          options: options
-        }, _run);
-    } else {
-      this.off("click.fb-start").on(
-        "click.fb-start", {
-          items: this,
-          options: options
-        },
-        _run
-      );
-    }
-
-    return this;
-  };
-
-  // Self initializing plugin for all elements having `data-fancybox` attribute
-  // ==========================================================================
-
-  $D.on("click.fb-start", "[data-fancybox]", _run);
-
-  // Enable "trigger elements"
-  // =========================
-
-  $D.on("click.fb-start", "[data-fancybox-trigger]", function (e) {
-    $('[data-fancybox="' + $(this).attr("data-fancybox-trigger") + '"]')
-      .eq($(this).attr("data-fancybox-index") || 0)
-      .trigger("click.fb-start", {
-        $trigger: $(this)
-      });
-  });
-
-  // Track focus event for better accessibility styling
-  // ==================================================
-  (function () {
-    var buttonStr = ".fancybox-button",
-      focusStr = "fancybox-focus",
-      $pressed = null;
-
-    $D.on("mousedown mouseup focus blur", buttonStr, function (e) {
-      switch (e.type) {
-        case "mousedown":
-          $pressed = $(this);
-          break;
-        case "mouseup":
-          $pressed = null;
-          break;
-        case "focusin":
-          $(buttonStr).removeClass(focusStr);
-
-          if (!$(this).is($pressed) && !$(this).is("[disabled]")) {
-            $(this).addClass(focusStr);
-          }
-          break;
-        case "focusout":
-          $(buttonStr).removeClass(focusStr);
-          break;
-      }
-    });
-  })();
-})(window, document, jQuery);
-// ==========================================================================
-//
-// Media
-// Adds additional media type support
-//
-// ==========================================================================
-(function ($) {
-  "use strict";
-
-  // Object containing properties for each media type
-  var defaults = {
-    youtube: {
-      matcher: /(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,
-      params: {
-        autoplay: 1,
-        autohide: 1,
-        fs: 1,
-        rel: 0,
-        hd: 1,
-        wmode: "transparent",
-        enablejsapi: 1,
-        html5: 1
-      },
-      paramPlace: 8,
-      type: "iframe",
-      url: "https://www.youtube-nocookie.com/embed/$4",
-      thumb: "https://img.youtube.com/vi/$4/hqdefault.jpg"
-    },
-
-    vimeo: {
-      matcher: /^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,
-      params: {
-        autoplay: 1,
-        hd: 1,
-        show_title: 1,
-        show_byline: 1,
-        show_portrait: 0,
-        fullscreen: 1
-      },
-      paramPlace: 3,
-      type: "iframe",
-      url: "//player.vimeo.com/video/$2"
-    },
-
-    instagram: {
-      matcher: /(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,
-      type: "image",
-      url: "//$1/p/$2/media/?size=l"
-    },
-
-    // Examples:
-    // http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16
-    // https://www.google.com/maps/@37.7852006,-122.4146355,14.65z
-    // https://www.google.com/maps/@52.2111123,2.9237542,6.61z?hl=en
-    // https://www.google.com/maps/place/Googleplex/@37.4220041,-122.0833494,17z/data=!4m5!3m4!1s0x0:0x6c296c66619367e0!8m2!3d37.4219998!4d-122.0840572
-    gmap_place: {
-      matcher: /(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,
-      type: "iframe",
-      url: function (rez) {
-        return (
-          "//maps.google." +
-          rez[2] +
-          "/?ll=" +
-          (rez[9] ? rez[9] + "&z=" + Math.floor(rez[10]) + (rez[12] ? rez[12].replace(/^\//, "&") : "") : rez[12] + "").replace(/\?/, "&") +
-          "&output=" +
-          (rez[12] && rez[12].indexOf("layer=c") > 0 ? "svembed" : "embed")
-        );
-      }
-    },
-
-    // Examples:
-    // https://www.google.com/maps/search/Empire+State+Building/
-    // https://www.google.com/maps/search/?api=1&query=centurylink+field
-    // https://www.google.com/maps/search/?api=1&query=47.5951518,-122.3316393
-    gmap_search: {
-      matcher: /(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,
-      type: "iframe",
-      url: function (rez) {
-        return "//maps.google." + rez[2] + "/maps?q=" + rez[5].replace("query=", "q=").replace("api=1", "") + "&output=embed";
-      }
-    }
-  };
-
-  // Formats matching url to final form
-  var format = function (url, rez, params) {
-    if (!url) {
-      return;
-    }
-
-    params = params || "";
-
-    if ($.type(params) === "object") {
-      params = $.param(params, true);
-    }
-
-    $.each(rez, function (key, value) {
-      url = url.replace("$" + key, value || "");
-    });
-
-    if (params.length) {
-      url += (url.indexOf("?") > 0 ? "&" : "?") + params;
-    }
-
-    return url;
-  };
-
-  $(document).on("objectNeedsType.fb", function (e, instance, item) {
-    var url = item.src || "",
-      type = false,
-      media,
-      thumb,
-      rez,
-      params,
-      urlParams,
-      paramObj,
-      provider;
-
-    media = $.extend(true, {}, defaults, item.opts.media);
-
-    // Look for any matching media type
-    $.each(media, function (providerName, providerOpts) {
-      rez = url.match(providerOpts.matcher);
-
-      if (!rez) {
-        return;
-      }
-
-      type = providerOpts.type;
-      provider = providerName;
-      paramObj = {};
-
-      if (providerOpts.paramPlace && rez[providerOpts.paramPlace]) {
-        urlParams = rez[providerOpts.paramPlace];
-
-        if (urlParams[0] == "?") {
-          urlParams = urlParams.substring(1);
-        }
-
-        urlParams = urlParams.split("&");
-
-        for (var m = 0; m < urlParams.length; ++m) {
-          var p = urlParams[m].split("=", 2);
-
-          if (p.length == 2) {
-            paramObj[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
-          }
-        }
-      }
-
-      params = $.extend(true, {}, providerOpts.params, item.opts[providerName], paramObj);
-
-      url =
-        $.type(providerOpts.url) === "function" ? providerOpts.url.call(this, rez, params, item) : format(providerOpts.url, rez, params);
-
-      thumb =
-        $.type(providerOpts.thumb) === "function" ? providerOpts.thumb.call(this, rez, params, item) : format(providerOpts.thumb, rez);
-
-      if (providerName === "youtube") {
-        url = url.replace(/&t=((\d+)m)?(\d+)s/, function (match, p1, m, s) {
-          return "&start=" + ((m ? parseInt(m, 10) * 60 : 0) + parseInt(s, 10));
-        });
-      } else if (providerName === "vimeo") {
-        url = url.replace("&%23", "#");
-      }
-
-      return false;
-    });
-
-    // If it is found, then change content type and update the url
-
-    if (type) {
-      if (!item.opts.thumb && !(item.opts.$thumb && item.opts.$thumb.length)) {
-        item.opts.thumb = thumb;
-      }
-
-      if (type === "iframe") {
-        item.opts = $.extend(true, item.opts, {
-          iframe: {
-            preload: false,
-            attr: {
-              scrolling: "no"
-            }
-          }
-        });
-      }
-
-      $.extend(item, {
-        type: type,
-        src: url,
-        origSrc: item.src,
-        contentSource: provider,
-        contentType: type === "image" ? "image" : provider == "gmap_place" || provider == "gmap_search" ? "map" : "video"
-      });
-    } else if (url) {
-      item.type = item.opts.defaultType;
-    }
-  });
-
-  // Load YouTube/Video API on request to detect when video finished playing
-  var VideoAPILoader = {
-    youtube: {
-      src: "https://www.youtube.com/iframe_api",
-      class: "YT",
-      loading: false,
-      loaded: false
-    },
-
-    vimeo: {
-      src: "https://player.vimeo.com/api/player.js",
-      class: "Vimeo",
-      loading: false,
-      loaded: false
-    },
-
-    load: function (vendor) {
-      var _this = this,
-        script;
-
-      if (this[vendor].loaded) {
-        setTimeout(function () {
-          _this.done(vendor);
-        });
-        return;
-      }
-
-      if (this[vendor].loading) {
-        return;
-      }
-
-      this[vendor].loading = true;
-
-      script = document.createElement("script");
-      script.type = "text/javascript";
-      script.src = this[vendor].src;
-
-      if (vendor === "youtube") {
-        window.onYouTubeIframeAPIReady = function () {
-          _this[vendor].loaded = true;
-          _this.done(vendor);
-        };
-      } else {
-        script.onload = function () {
-          _this[vendor].loaded = true;
-          _this.done(vendor);
-        };
-      }
-
-      document.body.appendChild(script);
-    },
-    done: function (vendor) {
-      var instance, $el, player;
-
-      if (vendor === "youtube") {
-        delete window.onYouTubeIframeAPIReady;
-      }
-
-      instance = $.fancybox.getInstance();
-
-      if (instance) {
-        $el = instance.current.$content.find("iframe");
-
-        if (vendor === "youtube" && YT !== undefined && YT) {
-          player = new YT.Player($el.attr("id"), {
-            events: {
-              onStateChange: function (e) {
-                if (e.data == 0) {
-                  instance.next();
-                }
-              }
-            }
-          });
-        } else if (vendor === "vimeo" && Vimeo !== undefined && Vimeo) {
-          player = new Vimeo.Player($el);
-
-          player.on("ended", function () {
-            instance.next();
-          });
-        }
-      }
-    }
-  };
-
-  $(document).on({
-    "afterShow.fb": function (e, instance, current) {
-      if (instance.group.length > 1 && (current.contentSource === "youtube" || current.contentSource === "vimeo")) {
-        VideoAPILoader.load(current.contentSource);
-      }
-    }
-  });
-})(jQuery);
-// ==========================================================================
-//
-// Guestures
-// Adds touch guestures, handles click and tap events
-//
-// ==========================================================================
-(function (window, document, $) {
-  "use strict";
-
-  var requestAFrame = (function () {
-    return (
-      window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.oRequestAnimationFrame ||
-      // if all else fails, use setTimeout
-      function (callback) {
-        return window.setTimeout(callback, 1000 / 60);
-      }
-    );
-  })();
-
-  var cancelAFrame = (function () {
-    return (
-      window.cancelAnimationFrame ||
-      window.webkitCancelAnimationFrame ||
-      window.mozCancelAnimationFrame ||
-      window.oCancelAnimationFrame ||
-      function (id) {
-        window.clearTimeout(id);
-      }
-    );
-  })();
-
-  var getPointerXY = function (e) {
-    var result = [];
-
-    e = e.originalEvent || e || window.e;
-    e = e.touches && e.touches.length ? e.touches : e.changedTouches && e.changedTouches.length ? e.changedTouches : [e];
-
-    for (var key in e) {
-      if (e[key].pageX) {
-        result.push({
-          x: e[key].pageX,
-          y: e[key].pageY
-        });
-      } else if (e[key].clientX) {
-        result.push({
-          x: e[key].clientX,
-          y: e[key].clientY
-        });
-      }
-    }
-
-    return result;
-  };
-
-  var distance = function (point2, point1, what) {
-    if (!point1 || !point2) {
-      return 0;
-    }
-
-    if (what === "x") {
-      return point2.x - point1.x;
-    } else if (what === "y") {
-      return point2.y - point1.y;
-    }
-
-    return Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
-  };
-
-  var isClickable = function ($el) {
-    if (
-      $el.is('a,area,button,[role="button"],input,label,select,summary,textarea,video,audio,iframe') ||
-      $.isFunction($el.get(0).onclick) ||
-      $el.data("selectable")
-    ) {
-      return true;
-    }
-
-    // Check for attributes like data-fancybox-next or data-fancybox-close
-    for (var i = 0, atts = $el[0].attributes, n = atts.length; i < n; i++) {
-      if (atts[i].nodeName.substr(0, 14) === "data-fancybox-") {
-        return true;
-      }
-    }
-
-    return false;
-  };
-
-  var hasScrollbars = function (el) {
-    var overflowY = window.getComputedStyle(el)["overflow-y"],
-      overflowX = window.getComputedStyle(el)["overflow-x"],
-      vertical = (overflowY === "scroll" || overflowY === "auto") && el.scrollHeight > el.clientHeight,
-      horizontal = (overflowX === "scroll" || overflowX === "auto") && el.scrollWidth > el.clientWidth;
-
-    return vertical || horizontal;
-  };
-
-  var isScrollable = function ($el) {
-    var rez = false;
-
-    while (true) {
-      rez = hasScrollbars($el.get(0));
-
-      if (rez) {
-        break;
-      }
-
-      $el = $el.parent();
-
-      if (!$el.length || $el.hasClass("fancybox-stage") || $el.is("body")) {
-        break;
-      }
-    }
-
-    return rez;
-  };
-
-  var Guestures = function (instance) {
-    var self = this;
-
-    self.instance = instance;
-
-    self.$bg = instance.$refs.bg;
-    self.$stage = instance.$refs.stage;
-    self.$container = instance.$refs.container;
-
-    self.destroy();
-
-    self.$container.on("touchstart.fb.touch mousedown.fb.touch", $.proxy(self, "ontouchstart"));
-  };
-
-  Guestures.prototype.destroy = function () {
-    var self = this;
-
-    self.$container.off(".fb.touch");
-
-    $(document).off(".fb.touch");
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-      self.requestId = null;
-    }
-
-    if (self.tapped) {
-      clearTimeout(self.tapped);
-      self.tapped = null;
-    }
-  };
-
-  Guestures.prototype.ontouchstart = function (e) {
-    var self = this,
-      $target = $(e.target),
-      instance = self.instance,
-      current = instance.current,
-      $slide = current.$slide,
-      $content = current.$content,
-      isTouchDevice = e.type == "touchstart";
-
-    // Do not respond to both (touch and mouse) events
-    if (isTouchDevice) {
-      self.$container.off("mousedown.fb.touch");
-    }
-
-    // Ignore right click
-    if (e.originalEvent && e.originalEvent.button == 2) {
-      return;
-    }
-
-    // Ignore taping on links, buttons, input elements
-    if (!$slide.length || !$target.length || isClickable($target) || isClickable($target.parent())) {
-      return;
-    }
-    // Ignore clicks on the scrollbar
-    if (!$target.is("img") && e.originalEvent.clientX > $target[0].clientWidth + $target.offset().left) {
-      return;
-    }
-
-    // Ignore clicks while zooming or closing
-    if (!current || instance.isAnimating || current.$slide.hasClass("fancybox-animated")) {
-      e.stopPropagation();
-      e.preventDefault();
-
-      return;
-    }
-
-    self.realPoints = self.startPoints = getPointerXY(e);
-
-    if (!self.startPoints.length) {
-      return;
-    }
-
-    // Allow other scripts to catch touch event if "touch" is set to false
-    if (current.touch) {
-      e.stopPropagation();
-    }
-
-    self.startEvent = e;
-
-    self.canTap = true;
-    self.$target = $target;
-    self.$content = $content;
-    self.opts = current.opts.touch;
-
-    self.isPanning = false;
-    self.isSwiping = false;
-    self.isZooming = false;
-    self.isScrolling = false;
-    self.canPan = instance.canPan();
-
-    self.startTime = new Date().getTime();
-    self.distanceX = self.distanceY = self.distance = 0;
-
-    self.canvasWidth = Math.round($slide[0].clientWidth);
-    self.canvasHeight = Math.round($slide[0].clientHeight);
-
-    self.contentLastPos = null;
-    self.contentStartPos = $.fancybox.getTranslate(self.$content) || {
-      top: 0,
-      left: 0
-    };
-    self.sliderStartPos = $.fancybox.getTranslate($slide);
-
-    // Since position will be absolute, but we need to make it relative to the stage
-    self.stagePos = $.fancybox.getTranslate(instance.$refs.stage);
-
-    self.sliderStartPos.top -= self.stagePos.top;
-    self.sliderStartPos.left -= self.stagePos.left;
-
-    self.contentStartPos.top -= self.stagePos.top;
-    self.contentStartPos.left -= self.stagePos.left;
-
-    $(document)
-      .off(".fb.touch")
-      .on(isTouchDevice ? "touchend.fb.touch touchcancel.fb.touch" : "mouseup.fb.touch mouseleave.fb.touch", $.proxy(self, "ontouchend"))
-      .on(isTouchDevice ? "touchmove.fb.touch" : "mousemove.fb.touch", $.proxy(self, "ontouchmove"));
-
-    if ($.fancybox.isMobile) {
-      document.addEventListener("scroll", self.onscroll, true);
-    }
-
-    // Skip if clicked outside the sliding area
-    if (!(self.opts || self.canPan) || !($target.is(self.$stage) || self.$stage.find($target).length)) {
-      if ($target.is(".fancybox-image")) {
-        e.preventDefault();
-      }
-
-      if (!($.fancybox.isMobile && $target.parents(".fancybox-caption").length)) {
-        return;
-      }
-    }
-
-    self.isScrollable = isScrollable($target) || isScrollable($target.parent());
-
-    // Check if element is scrollable and try to prevent default behavior (scrolling)
-    if (!($.fancybox.isMobile && self.isScrollable)) {
-      e.preventDefault();
-    }
-
-    // One finger or mouse click - swipe or pan an image
-    if (self.startPoints.length === 1 || current.hasError) {
-      if (self.canPan) {
-        $.fancybox.stop(self.$content);
-
-        self.isPanning = true;
-      } else {
-        self.isSwiping = true;
-      }
-
-      self.$container.addClass("fancybox-is-grabbing");
-    }
-
-    // Two fingers - zoom image
-    if (self.startPoints.length === 2 && current.type === "image" && (current.isLoaded || current.$ghost)) {
-      self.canTap = false;
-      self.isSwiping = false;
-      self.isPanning = false;
-
-      self.isZooming = true;
-
-      $.fancybox.stop(self.$content);
-
-      self.centerPointStartX = (self.startPoints[0].x + self.startPoints[1].x) * 0.5 - $(window).scrollLeft();
-      self.centerPointStartY = (self.startPoints[0].y + self.startPoints[1].y) * 0.5 - $(window).scrollTop();
-
-      self.percentageOfImageAtPinchPointX = (self.centerPointStartX - self.contentStartPos.left) / self.contentStartPos.width;
-      self.percentageOfImageAtPinchPointY = (self.centerPointStartY - self.contentStartPos.top) / self.contentStartPos.height;
-
-      self.startDistanceBetweenFingers = distance(self.startPoints[0], self.startPoints[1]);
-    }
-  };
-
-  Guestures.prototype.onscroll = function (e) {
-    var self = this;
-
-    self.isScrolling = true;
-
-    document.removeEventListener("scroll", self.onscroll, true);
-  };
-
-  Guestures.prototype.ontouchmove = function (e) {
-    var self = this;
-
-    // Make sure user has not released over iframe or disabled element
-    if (e.originalEvent.buttons !== undefined && e.originalEvent.buttons === 0) {
-      self.ontouchend(e);
-      return;
-    }
-
-    if (self.isScrolling) {
-      self.canTap = false;
-      return;
-    }
-
-    self.newPoints = getPointerXY(e);
-
-    if (!(self.opts || self.canPan) || !self.newPoints.length || !self.newPoints.length) {
-      return;
-    }
-
-    if (!(self.isSwiping && self.isSwiping === true)) {
-      e.preventDefault();
-    }
-
-    self.distanceX = distance(self.newPoints[0], self.startPoints[0], "x");
-    self.distanceY = distance(self.newPoints[0], self.startPoints[0], "y");
-
-    self.distance = distance(self.newPoints[0], self.startPoints[0]);
-
-    // Skip false ontouchmove events (Chrome)
-    if (self.distance > 0) {
-      if (self.isSwiping) {
-        self.onSwipe(e);
-      } else if (self.isPanning) {
-        self.onPan();
-      } else if (self.isZooming) {
-        self.onZoom();
-      }
-    }
-  };
-
-  Guestures.prototype.onSwipe = function (e) {
-    var self = this,
-      instance = self.instance,
-      swiping = self.isSwiping,
-      left = self.sliderStartPos.left || 0,
-      angle;
-
-    // If direction is not yet determined
-    if (swiping === true) {
-      // We need at least 10px distance to correctly calculate an angle
-      if (Math.abs(self.distance) > 10) {
-        self.canTap = false;
-
-        if (instance.group.length < 2 && self.opts.vertical) {
-          self.isSwiping = "y";
-        } else if (instance.isDragging || self.opts.vertical === false || (self.opts.vertical === "auto" && $(window).width() > 800)) {
-          self.isSwiping = "x";
-        } else {
-          angle = Math.abs((Math.atan2(self.distanceY, self.distanceX) * 180) / Math.PI);
-
-          self.isSwiping = angle > 45 && angle < 135 ? "y" : "x";
-        }
-
-        if (self.isSwiping === "y" && $.fancybox.isMobile && self.isScrollable) {
-          self.isScrolling = true;
-
-          return;
-        }
-
-        instance.isDragging = self.isSwiping;
-
-        // Reset points to avoid jumping, because we dropped first swipes to calculate the angle
-        self.startPoints = self.newPoints;
-
-        $.each(instance.slides, function (index, slide) {
-          var slidePos, stagePos;
-
-          $.fancybox.stop(slide.$slide);
-
-          slidePos = $.fancybox.getTranslate(slide.$slide);
-          stagePos = $.fancybox.getTranslate(instance.$refs.stage);
-
-          slide.$slide
-            .css({
-              transform: "",
-              opacity: "",
-              "transition-duration": ""
-            })
-            .removeClass("fancybox-animated")
-            .removeClass(function (index, className) {
-              return (className.match(/(^|\s)fancybox-fx-\S+/g) || []).join(" ");
-            });
-
-          if (slide.pos === instance.current.pos) {
-            self.sliderStartPos.top = slidePos.top - stagePos.top;
-            self.sliderStartPos.left = slidePos.left - stagePos.left;
-          }
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: slidePos.top - stagePos.top,
-            left: slidePos.left - stagePos.left
-          });
-        });
-
-        // Stop slideshow
-        if (instance.SlideShow && instance.SlideShow.isActive) {
-          instance.SlideShow.stop();
-        }
-      }
-
-      return;
-    }
-
-    // Sticky edges
-    if (swiping == "x") {
-      if (
-        self.distanceX > 0 &&
-        (self.instance.group.length < 2 || (self.instance.current.index === 0 && !self.instance.current.opts.loop))
-      ) {
-        left = left + Math.pow(self.distanceX, 0.8);
-      } else if (
-        self.distanceX < 0 &&
-        (self.instance.group.length < 2 ||
-          (self.instance.current.index === self.instance.group.length - 1 && !self.instance.current.opts.loop))
-      ) {
-        left = left - Math.pow(-self.distanceX, 0.8);
-      } else {
-        left = left + self.distanceX;
-      }
-    }
-
-    self.sliderLastPos = {
-      top: swiping == "x" ? 0 : self.sliderStartPos.top + self.distanceY,
-      left: left
-    };
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-
-      self.requestId = null;
-    }
-
-    self.requestId = requestAFrame(function () {
-      if (self.sliderLastPos) {
-        $.each(self.instance.slides, function (index, slide) {
-          var pos = slide.pos - self.instance.currPos;
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: self.sliderLastPos.top,
-            left: self.sliderLastPos.left + pos * self.canvasWidth + pos * slide.opts.gutter
-          });
-        });
-
-        self.$container.addClass("fancybox-is-sliding");
-      }
-    });
-  };
-
-  Guestures.prototype.onPan = function () {
-    var self = this;
-
-    // Prevent accidental movement (sometimes, when tapping casually, finger can move a bit)
-    if (distance(self.newPoints[0], self.realPoints[0]) < ($.fancybox.isMobile ? 10 : 5)) {
-      self.startPoints = self.newPoints;
-      return;
-    }
-
-    self.canTap = false;
-
-    self.contentLastPos = self.limitMovement();
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-    }
-
-    self.requestId = requestAFrame(function () {
-      $.fancybox.setTranslate(self.$content, self.contentLastPos);
-    });
-  };
-
-  // Make panning sticky to the edges
-  Guestures.prototype.limitMovement = function () {
-    var self = this;
-
-    var canvasWidth = self.canvasWidth;
-    var canvasHeight = self.canvasHeight;
-
-    var distanceX = self.distanceX;
-    var distanceY = self.distanceY;
-
-    var contentStartPos = self.contentStartPos;
-
-    var currentOffsetX = contentStartPos.left;
-    var currentOffsetY = contentStartPos.top;
-
-    var currentWidth = contentStartPos.width;
-    var currentHeight = contentStartPos.height;
-
-    var minTranslateX, minTranslateY, maxTranslateX, maxTranslateY, newOffsetX, newOffsetY;
-
-    if (currentWidth > canvasWidth) {
-      newOffsetX = currentOffsetX + distanceX;
-    } else {
-      newOffsetX = currentOffsetX;
-    }
-
-    newOffsetY = currentOffsetY + distanceY;
-
-    // Slow down proportionally to traveled distance
-    minTranslateX = Math.max(0, canvasWidth * 0.5 - currentWidth * 0.5);
-    minTranslateY = Math.max(0, canvasHeight * 0.5 - currentHeight * 0.5);
-
-    maxTranslateX = Math.min(canvasWidth - currentWidth, canvasWidth * 0.5 - currentWidth * 0.5);
-    maxTranslateY = Math.min(canvasHeight - currentHeight, canvasHeight * 0.5 - currentHeight * 0.5);
-
-    //   ->
-    if (distanceX > 0 && newOffsetX > minTranslateX) {
-      newOffsetX = minTranslateX - 1 + Math.pow(-minTranslateX + currentOffsetX + distanceX, 0.8) || 0;
-    }
-
-    //    <-
-    if (distanceX < 0 && newOffsetX < maxTranslateX) {
-      newOffsetX = maxTranslateX + 1 - Math.pow(maxTranslateX - currentOffsetX - distanceX, 0.8) || 0;
-    }
-
-    //   \/
-    if (distanceY > 0 && newOffsetY > minTranslateY) {
-      newOffsetY = minTranslateY - 1 + Math.pow(-minTranslateY + currentOffsetY + distanceY, 0.8) || 0;
-    }
-
-    //   /\
-    if (distanceY < 0 && newOffsetY < maxTranslateY) {
-      newOffsetY = maxTranslateY + 1 - Math.pow(maxTranslateY - currentOffsetY - distanceY, 0.8) || 0;
-    }
-
-    return {
-      top: newOffsetY,
-      left: newOffsetX
-    };
-  };
-
-  Guestures.prototype.limitPosition = function (newOffsetX, newOffsetY, newWidth, newHeight) {
-    var self = this;
-
-    var canvasWidth = self.canvasWidth;
-    var canvasHeight = self.canvasHeight;
-
-    if (newWidth > canvasWidth) {
-      newOffsetX = newOffsetX > 0 ? 0 : newOffsetX;
-      newOffsetX = newOffsetX < canvasWidth - newWidth ? canvasWidth - newWidth : newOffsetX;
-    } else {
-      // Center horizontally
-      newOffsetX = Math.max(0, canvasWidth / 2 - newWidth / 2);
-    }
-
-    if (newHeight > canvasHeight) {
-      newOffsetY = newOffsetY > 0 ? 0 : newOffsetY;
-      newOffsetY = newOffsetY < canvasHeight - newHeight ? canvasHeight - newHeight : newOffsetY;
-    } else {
-      // Center vertically
-      newOffsetY = Math.max(0, canvasHeight / 2 - newHeight / 2);
-    }
-
-    return {
-      top: newOffsetY,
-      left: newOffsetX
-    };
-  };
-
-  Guestures.prototype.onZoom = function () {
-    var self = this;
-
-    // Calculate current distance between points to get pinch ratio and new width and height
-    var contentStartPos = self.contentStartPos;
-
-    var currentWidth = contentStartPos.width;
-    var currentHeight = contentStartPos.height;
-
-    var currentOffsetX = contentStartPos.left;
-    var currentOffsetY = contentStartPos.top;
-
-    var endDistanceBetweenFingers = distance(self.newPoints[0], self.newPoints[1]);
-
-    var pinchRatio = endDistanceBetweenFingers / self.startDistanceBetweenFingers;
-
-    var newWidth = Math.floor(currentWidth * pinchRatio);
-    var newHeight = Math.floor(currentHeight * pinchRatio);
-
-    // This is the translation due to pinch-zooming
-    var translateFromZoomingX = (currentWidth - newWidth) * self.percentageOfImageAtPinchPointX;
-    var translateFromZoomingY = (currentHeight - newHeight) * self.percentageOfImageAtPinchPointY;
-
-    // Point between the two touches
-    var centerPointEndX = (self.newPoints[0].x + self.newPoints[1].x) / 2 - $(window).scrollLeft();
-    var centerPointEndY = (self.newPoints[0].y + self.newPoints[1].y) / 2 - $(window).scrollTop();
-
-    // And this is the translation due to translation of the centerpoint
-    // between the two fingers
-    var translateFromTranslatingX = centerPointEndX - self.centerPointStartX;
-    var translateFromTranslatingY = centerPointEndY - self.centerPointStartY;
-
-    // The new offset is the old/current one plus the total translation
-    var newOffsetX = currentOffsetX + (translateFromZoomingX + translateFromTranslatingX);
-    var newOffsetY = currentOffsetY + (translateFromZoomingY + translateFromTranslatingY);
-
-    var newPos = {
-      top: newOffsetY,
-      left: newOffsetX,
-      scaleX: pinchRatio,
-      scaleY: pinchRatio
-    };
-
-    self.canTap = false;
-
-    self.newWidth = newWidth;
-    self.newHeight = newHeight;
-
-    self.contentLastPos = newPos;
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-    }
-
-    self.requestId = requestAFrame(function () {
-      $.fancybox.setTranslate(self.$content, self.contentLastPos);
-    });
-  };
-
-  Guestures.prototype.ontouchend = function (e) {
-    var self = this;
-
-    var swiping = self.isSwiping;
-    var panning = self.isPanning;
-    var zooming = self.isZooming;
-    var scrolling = self.isScrolling;
-
-    self.endPoints = getPointerXY(e);
-    self.dMs = Math.max(new Date().getTime() - self.startTime, 1);
-
-    self.$container.removeClass("fancybox-is-grabbing");
-
-    $(document).off(".fb.touch");
-
-    document.removeEventListener("scroll", self.onscroll, true);
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-
-      self.requestId = null;
-    }
-
-    self.isSwiping = false;
-    self.isPanning = false;
-    self.isZooming = false;
-    self.isScrolling = false;
-
-    self.instance.isDragging = false;
-
-    if (self.canTap) {
-      return self.onTap(e);
-    }
-
-    self.speed = 100;
-
-    // Speed in px/ms
-    self.velocityX = (self.distanceX / self.dMs) * 0.5;
-    self.velocityY = (self.distanceY / self.dMs) * 0.5;
-
-    if (panning) {
-      self.endPanning();
-    } else if (zooming) {
-      self.endZooming();
-    } else {
-      self.endSwiping(swiping, scrolling);
-    }
-
-    return;
-  };
-
-  Guestures.prototype.endSwiping = function (swiping, scrolling) {
-    var self = this,
-      ret = false,
-      len = self.instance.group.length,
-      distanceX = Math.abs(self.distanceX),
-      canAdvance = swiping == "x" && len > 1 && ((self.dMs > 130 && distanceX > 10) || distanceX > 50),
-      speedX = 300;
-
-    self.sliderLastPos = null;
-
-    // Close if swiped vertically / navigate if horizontally
-    if (swiping == "y" && !scrolling && Math.abs(self.distanceY) > 50) {
-      // Continue vertical movement
-      $.fancybox.animate(
-        self.instance.current.$slide, {
-          top: self.sliderStartPos.top + self.distanceY + self.velocityY * 150,
-          opacity: 0
-        },
-        200
-      );
-      ret = self.instance.close(true, 250);
-    } else if (canAdvance && self.distanceX > 0) {
-      ret = self.instance.previous(speedX);
-    } else if (canAdvance && self.distanceX < 0) {
-      ret = self.instance.next(speedX);
-    }
-
-    if (ret === false && (swiping == "x" || swiping == "y")) {
-      self.instance.centerSlide(200);
-    }
-
-    self.$container.removeClass("fancybox-is-sliding");
-  };
-
-  // Limit panning from edges
-  // ========================
-  Guestures.prototype.endPanning = function () {
-    var self = this,
-      newOffsetX,
-      newOffsetY,
-      newPos;
-
-    if (!self.contentLastPos) {
-      return;
-    }
-
-    if (self.opts.momentum === false || self.dMs > 350) {
-      newOffsetX = self.contentLastPos.left;
-      newOffsetY = self.contentLastPos.top;
-    } else {
-      // Continue movement
-      newOffsetX = self.contentLastPos.left + self.velocityX * 500;
-      newOffsetY = self.contentLastPos.top + self.velocityY * 500;
-    }
-
-    newPos = self.limitPosition(newOffsetX, newOffsetY, self.contentStartPos.width, self.contentStartPos.height);
-
-    newPos.width = self.contentStartPos.width;
-    newPos.height = self.contentStartPos.height;
-
-    $.fancybox.animate(self.$content, newPos, 366);
-  };
-
-  Guestures.prototype.endZooming = function () {
-    var self = this;
-
-    var current = self.instance.current;
-
-    var newOffsetX, newOffsetY, newPos, reset;
-
-    var newWidth = self.newWidth;
-    var newHeight = self.newHeight;
-
-    if (!self.contentLastPos) {
-      return;
-    }
-
-    newOffsetX = self.contentLastPos.left;
-    newOffsetY = self.contentLastPos.top;
-
-    reset = {
-      top: newOffsetY,
-      left: newOffsetX,
-      width: newWidth,
-      height: newHeight,
-      scaleX: 1,
-      scaleY: 1
-    };
-
-    // Reset scalex/scaleY values; this helps for perfomance and does not break animation
-    $.fancybox.setTranslate(self.$content, reset);
-
-    if (newWidth < self.canvasWidth && newHeight < self.canvasHeight) {
-      self.instance.scaleToFit(150);
-    } else if (newWidth > current.width || newHeight > current.height) {
-      self.instance.scaleToActual(self.centerPointStartX, self.centerPointStartY, 150);
-    } else {
-      newPos = self.limitPosition(newOffsetX, newOffsetY, newWidth, newHeight);
-
-      $.fancybox.animate(self.$content, newPos, 150);
-    }
-  };
-
-  Guestures.prototype.onTap = function (e) {
-    var self = this;
-    var $target = $(e.target);
-
-    var instance = self.instance;
-    var current = instance.current;
-
-    var endPoints = (e && getPointerXY(e)) || self.startPoints;
-
-    var tapX = endPoints[0] ? endPoints[0].x - $(window).scrollLeft() - self.stagePos.left : 0;
-    var tapY = endPoints[0] ? endPoints[0].y - $(window).scrollTop() - self.stagePos.top : 0;
-
-    var where;
-
-    var process = function (prefix) {
-      var action = current.opts[prefix];
-
-      if ($.isFunction(action)) {
-        action = action.apply(instance, [current, e]);
-      }
-
-      if (!action) {
-        return;
-      }
-
-      switch (action) {
-        case "close":
-          instance.close(self.startEvent);
-
-          break;
-
-        case "toggleControls":
-          instance.toggleControls();
-
-          break;
-
-        case "next":
-          instance.next();
-
-          break;
-
-        case "nextOrClose":
-          if (instance.group.length > 1) {
-            instance.next();
-          } else {
-            instance.close(self.startEvent);
-          }
-
-          break;
-
-        case "zoom":
-          if (current.type == "image" && (current.isLoaded || current.$ghost)) {
-            if (instance.canPan()) {
-              instance.scaleToFit();
-            } else if (instance.isScaledDown()) {
-              instance.scaleToActual(tapX, tapY);
-            } else if (instance.group.length < 2) {
-              instance.close(self.startEvent);
-            }
-          }
-
-          break;
-      }
-    };
-
-    // Ignore right click
-    if (e.originalEvent && e.originalEvent.button == 2) {
-      return;
-    }
-
-    // Skip if clicked on the scrollbar
-    if (!$target.is("img") && tapX > $target[0].clientWidth + $target.offset().left) {
-      return;
-    }
-
-    // Check where is clicked
-    if ($target.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container")) {
-      where = "Outside";
-    } else if ($target.is(".fancybox-slide")) {
-      where = "Slide";
-    } else if (
-      instance.current.$content &&
-      instance.current.$content
-      .find($target)
-      .addBack()
-      .filter($target).length
-    ) {
-      where = "Content";
-    } else {
-      return;
-    }
-
-    // Check if this is a double tap
-    if (self.tapped) {
-      // Stop previously created single tap
-      clearTimeout(self.tapped);
-      self.tapped = null;
-
-      // Skip if distance between taps is too big
-      if (Math.abs(tapX - self.tapX) > 50 || Math.abs(tapY - self.tapY) > 50) {
-        return this;
-      }
-
-      // OK, now we assume that this is a double-tap
-      process("dblclick" + where);
-    } else {
-      // Single tap will be processed if user has not clicked second time within 300ms
-      // or there is no need to wait for double-tap
-      self.tapX = tapX;
-      self.tapY = tapY;
-
-      if (current.opts["dblclick" + where] && current.opts["dblclick" + where] !== current.opts["click" + where]) {
-        self.tapped = setTimeout(function () {
-          self.tapped = null;
-
-          if (!instance.isAnimating) {
-            process("click" + where);
-          }
-        }, 500);
-      } else {
-        process("click" + where);
-      }
-    }
-
-    return this;
-  };
-
-  $(document)
-    .on("onActivate.fb", function (e, instance) {
-      if (instance && !instance.Guestures) {
-        instance.Guestures = new Guestures(instance);
-      }
-    })
-    .on("beforeClose.fb", function (e, instance) {
-      if (instance && instance.Guestures) {
-        instance.Guestures.destroy();
-      }
-    });
-})(window, document, jQuery);
-// ==========================================================================
-//
-// SlideShow
-// Enables slideshow functionality
-//
-// Example of usage:
-// $.fancybox.getInstance().SlideShow.start()
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  $.extend(true, $.fancybox.defaults, {
-    btnTpl: {
-      slideShow: '<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.5 5.4v13.2l11-6.6z"/></svg>' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8.33 5.75h2.2v12.5h-2.2V5.75zm5.15 0h2.2v12.5h-2.2V5.75z"/></svg>' +
-        "</button>"
-    },
-    slideShow: {
-      autoStart: false,
-      speed: 3000,
-      progress: true
-    }
-  });
-
-  var SlideShow = function (instance) {
-    this.instance = instance;
-    this.init();
-  };
-
-  $.extend(SlideShow.prototype, {
-    timer: null,
-    isActive: false,
-    $button: null,
-
-    init: function () {
-      var self = this,
-        instance = self.instance,
-        opts = instance.group[instance.currIndex].opts.slideShow;
-
-      self.$button = instance.$refs.toolbar.find("[data-fancybox-play]").on("click", function () {
-        self.toggle();
-      });
-
-      if (instance.group.length < 2 || !opts) {
-        self.$button.hide();
-      } else if (opts.progress) {
-        self.$progress = $('<div class="fancybox-progress"></div>').appendTo(instance.$refs.inner);
-      }
-    },
-
-    set: function (force) {
-      var self = this,
-        instance = self.instance,
-        current = instance.current;
-
-      // Check if reached last element
-      if (current && (force === true || current.opts.loop || instance.currIndex < instance.group.length - 1)) {
-        if (self.isActive && current.contentType !== "video") {
-          if (self.$progress) {
-            $.fancybox.animate(self.$progress.show(), {
-              scaleX: 1
-            }, current.opts.slideShow.speed);
-          }
-
-          self.timer = setTimeout(function () {
-            if (!instance.current.opts.loop && instance.current.index == instance.group.length - 1) {
-              instance.jumpTo(0);
-            } else {
-              instance.next();
-            }
-          }, current.opts.slideShow.speed);
-        }
-      } else {
-        self.stop();
-        instance.idleSecondsCounter = 0;
-        instance.showControls();
-      }
-    },
-
-    clear: function () {
-      var self = this;
-
-      clearTimeout(self.timer);
-
-      self.timer = null;
-
-      if (self.$progress) {
-        self.$progress.removeAttr("style").hide();
-      }
-    },
-
-    start: function () {
-      var self = this,
-        current = self.instance.current;
-
-      if (current) {
-        self.$button
-          .attr("title", (current.opts.i18n[current.opts.lang] || current.opts.i18n.en).PLAY_STOP)
-          .removeClass("fancybox-button--play")
-          .addClass("fancybox-button--pause");
-
-        self.isActive = true;
-
-        if (current.isComplete) {
-          self.set(true);
-        }
-
-        self.instance.trigger("onSlideShowChange", true);
-      }
-    },
-
-    stop: function () {
-      var self = this,
-        current = self.instance.current;
-
-      self.clear();
-
-      self.$button
-        .attr("title", (current.opts.i18n[current.opts.lang] || current.opts.i18n.en).PLAY_START)
-        .removeClass("fancybox-button--pause")
-        .addClass("fancybox-button--play");
-
-      self.isActive = false;
-
-      self.instance.trigger("onSlideShowChange", false);
-
-      if (self.$progress) {
-        self.$progress.removeAttr("style").hide();
-      }
-    },
-
-    toggle: function () {
-      var self = this;
-
-      if (self.isActive) {
-        self.stop();
-      } else {
-        self.start();
-      }
-    }
-  });
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      if (instance && !instance.SlideShow) {
-        instance.SlideShow = new SlideShow(instance);
-      }
-    },
-
-    "beforeShow.fb": function (e, instance, current, firstRun) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (firstRun) {
-        if (SlideShow && current.opts.slideShow.autoStart) {
-          SlideShow.start();
-        }
-      } else if (SlideShow && SlideShow.isActive) {
-        SlideShow.clear();
-      }
-    },
-
-    "afterShow.fb": function (e, instance, current) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (SlideShow && SlideShow.isActive) {
-        SlideShow.set();
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      var SlideShow = instance && instance.SlideShow;
-
-      // "P" or Spacebar
-      if (SlideShow && current.opts.slideShow && (keycode === 80 || keycode === 32) && !$(document.activeElement).is("button,a,input")) {
-        keypress.preventDefault();
-
-        SlideShow.toggle();
-      }
-    },
-
-    "beforeClose.fb onDeactivate.fb": function (e, instance) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (SlideShow) {
-        SlideShow.stop();
-      }
-    }
-  });
-
-  // Page Visibility API to pause slideshow when window is not active
-  $(document).on("visibilitychange", function () {
-    var instance = $.fancybox.getInstance(),
-      SlideShow = instance && instance.SlideShow;
-
-    if (SlideShow && SlideShow.isActive) {
-      if (document.hidden) {
-        SlideShow.clear();
-      } else {
-        SlideShow.set();
-      }
-    }
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// FullScreen
-// Adds fullscreen functionality
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  // Collection of methods supported by user browser
-  var fn = (function () {
-    var fnMap = [
-      ["requestFullscreen", "exitFullscreen", "fullscreenElement", "fullscreenEnabled", "fullscreenchange", "fullscreenerror"],
-      // new WebKit
-      [
-        "webkitRequestFullscreen",
-        "webkitExitFullscreen",
-        "webkitFullscreenElement",
-        "webkitFullscreenEnabled",
-        "webkitfullscreenchange",
-        "webkitfullscreenerror"
-      ],
-      // old WebKit (Safari 5.1)
-      [
-        "webkitRequestFullScreen",
-        "webkitCancelFullScreen",
-        "webkitCurrentFullScreenElement",
-        "webkitCancelFullScreen",
-        "webkitfullscreenchange",
-        "webkitfullscreenerror"
-      ],
-      [
-        "mozRequestFullScreen",
-        "mozCancelFullScreen",
-        "mozFullScreenElement",
-        "mozFullScreenEnabled",
-        "mozfullscreenchange",
-        "mozfullscreenerror"
-      ],
-      ["msRequestFullscreen", "msExitFullscreen", "msFullscreenElement", "msFullscreenEnabled", "MSFullscreenChange", "MSFullscreenError"]
-    ];
-
-    var ret = {};
-
-    for (var i = 0; i < fnMap.length; i++) {
-      var val = fnMap[i];
-
-      if (val && val[1] in document) {
-        for (var j = 0; j < val.length; j++) {
-          ret[fnMap[0][j]] = val[j];
-        }
-
-        return ret;
-      }
-    }
-
-    return false;
-  })();
-
-  if (fn) {
-    var FullScreen = {
-      request: function (elem) {
-        elem = elem || document.documentElement;
-
-        elem[fn.requestFullscreen](elem.ALLOW_KEYBOARD_INPUT);
-      },
-      exit: function () {
-        document[fn.exitFullscreen]();
-      },
-      toggle: function (elem) {
-        elem = elem || document.documentElement;
-
-        if (this.isFullscreen()) {
-          this.exit();
-        } else {
-          this.request(elem);
-        }
-      },
-      isFullscreen: function () {
-        return Boolean(document[fn.fullscreenElement]);
-      },
-      enabled: function () {
-        return Boolean(document[fn.fullscreenEnabled]);
-      }
-    };
-
-    $.extend(true, $.fancybox.defaults, {
-      btnTpl: {
-        fullScreen: '<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fsenter" title="{{FULL_SCREEN}}">' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg>' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z"/></svg>' +
-          "</button>"
-      },
-      fullScreen: {
-        autoStart: false
-      }
-    });
-
-    $(document).on(fn.fullscreenchange, function () {
-      var isFullscreen = FullScreen.isFullscreen(),
-        instance = $.fancybox.getInstance();
-
-      if (instance) {
-        // If image is zooming, then force to stop and reposition properly
-        if (instance.current && instance.current.type === "image" && instance.isAnimating) {
-          instance.isAnimating = false;
-
-          instance.update(true, true, 0);
-
-          if (!instance.isComplete) {
-            instance.complete();
-          }
-        }
-
-        instance.trigger("onFullscreenChange", isFullscreen);
-
-        instance.$refs.container.toggleClass("fancybox-is-fullscreen", isFullscreen);
-
-        instance.$refs.toolbar
-          .find("[data-fancybox-fullscreen]")
-          .toggleClass("fancybox-button--fsenter", !isFullscreen)
-          .toggleClass("fancybox-button--fsexit", isFullscreen);
-      }
-    });
-  }
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      var $container;
-
-      if (!fn) {
-        instance.$refs.toolbar.find("[data-fancybox-fullscreen]").remove();
-
-        return;
-      }
-
-      if (instance && instance.group[instance.currIndex].opts.fullScreen) {
-        $container = instance.$refs.container;
-
-        $container.on("click.fb-fullscreen", "[data-fancybox-fullscreen]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          FullScreen.toggle();
-        });
-
-        if (instance.opts.fullScreen && instance.opts.fullScreen.autoStart === true) {
-          FullScreen.request();
-        }
-
-        // Expose API
-        instance.FullScreen = FullScreen;
-      } else if (instance) {
-        instance.$refs.toolbar.find("[data-fancybox-fullscreen]").hide();
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      // "F"
-      if (instance && instance.FullScreen && keycode === 70) {
-        keypress.preventDefault();
-
-        instance.FullScreen.toggle();
-      }
-    },
-
-    "beforeClose.fb": function (e, instance) {
-      if (instance && instance.FullScreen && instance.$refs.container.hasClass("fancybox-is-fullscreen")) {
-        FullScreen.exit();
-      }
-    }
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// Thumbs
-// Displays thumbnails in a grid
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  var CLASS = "fancybox-thumbs",
-    CLASS_ACTIVE = CLASS + "-active";
-
-  // Make sure there are default values
-  $.fancybox.defaults = $.extend(
-    true, {
-      btnTpl: {
-        thumbs: '<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}">' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 14.59h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76H5.65V5.65z"/></svg>' +
-          "</button>"
-      },
-      thumbs: {
-        autoStart: false, // Display thumbnails on opening
-        hideOnClose: true, // Hide thumbnail grid when closing animation starts
-        parentEl: ".fancybox-container", // Container is injected into this element
-        axis: "y" // Vertical (y) or horizontal (x) scrolling
-      }
-    },
-    $.fancybox.defaults
-  );
-
-  var FancyThumbs = function (instance) {
-    this.init(instance);
-  };
-
-  $.extend(FancyThumbs.prototype, {
-    $button: null,
-    $grid: null,
-    $list: null,
-    isVisible: false,
-    isActive: false,
-
-    init: function (instance) {
-      var self = this,
-        group = instance.group,
-        enabled = 0;
-
-      self.instance = instance;
-      self.opts = group[instance.currIndex].opts.thumbs;
-
-      instance.Thumbs = self;
-
-      self.$button = instance.$refs.toolbar.find("[data-fancybox-thumbs]");
-
-      // Enable thumbs if at least two group items have thumbnails
-      for (var i = 0, len = group.length; i < len; i++) {
-        if (group[i].thumb) {
-          enabled++;
-        }
-
-        if (enabled > 1) {
-          break;
-        }
-      }
-
-      if (enabled > 1 && !!self.opts) {
-        self.$button.removeAttr("style").on("click", function () {
-          self.toggle();
-        });
-
-        self.isActive = true;
-      } else {
-        self.$button.hide();
-      }
-    },
-
-    create: function () {
-      var self = this,
-        instance = self.instance,
-        parentEl = self.opts.parentEl,
-        list = [],
-        src;
-
-      if (!self.$grid) {
-        // Create main element
-        self.$grid = $('<div class="' + CLASS + " " + CLASS + "-" + self.opts.axis + '"></div>').appendTo(
-          instance.$refs.container
-          .find(parentEl)
-          .addBack()
-          .filter(parentEl)
-        );
-
-        // Add "click" event that performs gallery navigation
-        self.$grid.on("click", "a", function () {
-          instance.jumpTo($(this).attr("data-index"));
-        });
-      }
-
-      // Build the list
-      if (!self.$list) {
-        self.$list = $('<div class="' + CLASS + '__list">').appendTo(self.$grid);
-      }
-
-      $.each(instance.group, function (i, item) {
-        src = item.thumb;
-
-        if (!src && item.type === "image") {
-          src = item.src;
-        }
-
-        list.push(
-          '<a href="javascript:;" tabindex="0" data-index="' +
-          i +
-          '"' +
-          (src && src.length ? ' style="background-image:url(' + src + ')"' : 'class="fancybox-thumbs-missing"') +
-          "></a>"
-        );
-      });
-
-      self.$list[0].innerHTML = list.join("");
-
-      if (self.opts.axis === "x") {
-        // Set fixed width for list element to enable horizontal scrolling
-        self.$list.width(
-          parseInt(self.$grid.css("padding-right"), 10) +
-          instance.group.length *
-          self.$list
-          .children()
-          .eq(0)
-          .outerWidth(true)
-        );
-      }
-    },
-
-    focus: function (duration) {
-      var self = this,
-        $list = self.$list,
-        $grid = self.$grid,
-        thumb,
-        thumbPos;
-
-      if (!self.instance.current) {
-        return;
-      }
-
-      thumb = $list
-        .children()
-        .removeClass(CLASS_ACTIVE)
-        .filter('[data-index="' + self.instance.current.index + '"]')
-        .addClass(CLASS_ACTIVE);
-
-      thumbPos = thumb.position();
-
-      // Check if need to scroll to make current thumb visible
-      if (self.opts.axis === "y" && (thumbPos.top < 0 || thumbPos.top > $list.height() - thumb.outerHeight())) {
-        $list.stop().animate({
-            scrollTop: $list.scrollTop() + thumbPos.top
-          },
-          duration
-        );
-      } else if (
-        self.opts.axis === "x" &&
-        (thumbPos.left < $grid.scrollLeft() || thumbPos.left > $grid.scrollLeft() + ($grid.width() - thumb.outerWidth()))
-      ) {
-        $list
-          .parent()
-          .stop()
-          .animate({
-              scrollLeft: thumbPos.left
-            },
-            duration
-          );
-      }
-    },
-
-    update: function () {
-      var that = this;
-      that.instance.$refs.container.toggleClass("fancybox-show-thumbs", this.isVisible);
-
-      if (that.isVisible) {
-        if (!that.$grid) {
-          that.create();
-        }
-
-        that.instance.trigger("onThumbsShow");
-
-        that.focus(0);
-      } else if (that.$grid) {
-        that.instance.trigger("onThumbsHide");
-      }
-
-      // Update content position
-      that.instance.update();
-    },
-
-    hide: function () {
-      this.isVisible = false;
-      this.update();
-    },
-
-    show: function () {
-      this.isVisible = true;
-      this.update();
-    },
-
-    toggle: function () {
-      this.isVisible = !this.isVisible;
-      this.update();
-    }
-  });
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      var Thumbs;
-
-      if (instance && !instance.Thumbs) {
-        Thumbs = new FancyThumbs(instance);
-
-        if (Thumbs.isActive && Thumbs.opts.autoStart === true) {
-          Thumbs.show();
-        }
-      }
-    },
-
-    "beforeShow.fb": function (e, instance, item, firstRun) {
-      var Thumbs = instance && instance.Thumbs;
-
-      if (Thumbs && Thumbs.isVisible) {
-        Thumbs.focus(firstRun ? 0 : 250);
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      var Thumbs = instance && instance.Thumbs;
-
-      // "G"
-      if (Thumbs && Thumbs.isActive && keycode === 71) {
-        keypress.preventDefault();
-
-        Thumbs.toggle();
-      }
-    },
-
-    "beforeClose.fb": function (e, instance) {
-      var Thumbs = instance && instance.Thumbs;
-
-      if (Thumbs && Thumbs.isVisible && Thumbs.opts.hideOnClose !== false) {
-        Thumbs.$grid.hide();
-      }
-    }
-  });
-})(document, jQuery);
-//// ==========================================================================
-//
-// Share
-// Displays simple form for sharing current url
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  $.extend(true, $.fancybox.defaults, {
-    btnTpl: {
-      share: '<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.55 19c1.4-8.4 9.1-9.8 11.9-9.8V5l7 7-7 6.3v-3.5c-2.8 0-10.5 2.1-11.9 4.2z"/></svg>' +
-        "</button>"
-    },
-    share: {
-      url: function (instance, item) {
-        return (
-          (!instance.currentHash && !(item.type === "inline" || item.type === "html") ? item.origSrc || item.src : false) || window.location
-        );
-      },
-      tpl: '<div class="fancybox-share">' +
-        "<h1>{{SHARE}}</h1>" +
-        "<p>" +
-        '<a class="fancybox-share__button fancybox-share__button--fb" href="https://www.facebook.com/sharer/sharer.php?u={{url}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m287 456v-299c0-21 6-35 35-35h38v-63c-7-1-29-3-55-3-54 0-91 33-91 94v306m143-254h-205v72h196" /></svg>' +
-        "<span>Facebook</span>" +
-        "</a>" +
-        '<a class="fancybox-share__button fancybox-share__button--tw" href="https://twitter.com/intent/tweet?url={{url}}&text={{descr}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m456 133c-14 7-31 11-47 13 17-10 30-27 37-46-15 10-34 16-52 20-61-62-157-7-141 75-68-3-129-35-169-85-22 37-11 86 26 109-13 0-26-4-37-9 0 39 28 72 65 80-12 3-25 4-37 2 10 33 41 57 77 57-42 30-77 38-122 34 170 111 378-32 359-208 16-11 30-25 41-42z" /></svg>' +
-        "<span>Twitter</span>" +
-        "</a>" +
-        '<a class="fancybox-share__button fancybox-share__button--pt" href="https://www.pinterest.com/pin/create/button/?url={{url}}&description={{descr}}&media={{media}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m265 56c-109 0-164 78-164 144 0 39 15 74 47 87 5 2 10 0 12-5l4-19c2-6 1-8-3-13-9-11-15-25-15-45 0-58 43-110 113-110 62 0 96 38 96 88 0 67-30 122-73 122-24 0-42-19-36-44 6-29 20-60 20-81 0-19-10-35-31-35-25 0-44 26-44 60 0 21 7 36 7 36l-30 125c-8 37-1 83 0 87 0 3 4 4 5 2 2-3 32-39 42-75l16-64c8 16 31 29 56 29 74 0 124-67 124-157 0-69-58-132-146-132z" fill="#fff"/></svg>' +
-        "<span>Pinterest</span>" +
-        "</a>" +
-        "</p>" +
-        '<p><input class="fancybox-share__input" type="text" value="{{url_raw}}" onclick="select()" /></p>' +
-        "</div>"
-    }
-  });
-
-  function escapeHtml(string) {
-    var entityMap = {
-      "&": "&amp;",
-      "<": "&lt;",
-      ">": "&gt;",
-      '"': "&quot;",
-      "'": "&#39;",
-      "/": "&#x2F;",
-      "`": "&#x60;",
-      "=": "&#x3D;"
-    };
-
-    return String(string).replace(/[&<>"'`=\/]/g, function (s) {
-      return entityMap[s];
-    });
-  }
-
-  $(document).on("click", "[data-fancybox-share]", function () {
-    var instance = $.fancybox.getInstance(),
-      current = instance.current || null,
-      url,
-      tpl;
-
-    if (!current) {
-      return;
-    }
-
-    if ($.type(current.opts.share.url) === "function") {
-      url = current.opts.share.url.apply(current, [instance, current]);
-    }
-
-    tpl = current.opts.share.tpl
-      .replace(/\{\{media\}\}/g, current.type === "image" ? encodeURIComponent(current.src) : "")
-      .replace(/\{\{url\}\}/g, encodeURIComponent(url))
-      .replace(/\{\{url_raw\}\}/g, escapeHtml(url))
-      .replace(/\{\{descr\}\}/g, instance.$caption ? encodeURIComponent(instance.$caption.text()) : "");
-
-    $.fancybox.open({
-      src: instance.translate(instance, tpl),
-      type: "html",
-      opts: {
-        touch: false,
-        animationEffect: false,
-        afterLoad: function (shareInstance, shareCurrent) {
-          // Close self if parent instance is closing
-          instance.$refs.container.one("beforeClose.fb", function () {
-            shareInstance.close(null, 0);
-          });
-
-          // Opening links in a popup window
-          shareCurrent.$content.find(".fancybox-share__button").click(function () {
-            window.open(this.href, "Share", "width=550, height=450");
-            return false;
-          });
-        },
-        mobile: {
-          autoFocus: false
-        }
-      }
-    });
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// Hash
-// Enables linking to each modal
-//
-// ==========================================================================
-(function (window, document, $) {
-  "use strict";
-
-  // Simple $.escapeSelector polyfill (for jQuery prior v3)
-  if (!$.escapeSelector) {
-    $.escapeSelector = function (sel) {
-      var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
-      var fcssescape = function (ch, asCodePoint) {
-        if (asCodePoint) {
-          // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-          if (ch === "\0") {
-            return "\uFFFD";
-          }
-
-          // Control characters and (dependent upon position) numbers get escaped as code points
-          return ch.slice(0, -1) + "\\" + ch.charCodeAt(ch.length - 1).toString(16) + " ";
-        }
-
-        // Other potentially-special ASCII characters get backslash-escaped
-        return "\\" + ch;
-      };
-
-      return (sel + "").replace(rcssescape, fcssescape);
-    };
-  }
-
-  // Get info about gallery name and current index from url
-  function parseUrl() {
-    var hash = window.location.hash.substr(1),
-      rez = hash.split("-"),
-      index = rez.length > 1 && /^\+?\d+$/.test(rez[rez.length - 1]) ? parseInt(rez.pop(-1), 10) || 1 : 1,
-      gallery = rez.join("-");
-
-    return {
-      hash: hash,
-      /* Index is starting from 1 */
-      index: index < 1 ? 1 : index,
-      gallery: gallery
-    };
-  }
-
-  // Trigger click evnt on links to open new fancyBox instance
-  function triggerFromUrl(url) {
-    if (url.gallery !== "") {
-      // If we can find element matching 'data-fancybox' atribute,
-      // then triggering click event should start fancyBox
-      $("[data-fancybox='" + $.escapeSelector(url.gallery) + "']")
-        .eq(url.index - 1)
-        .focus()
-        .trigger("click.fb-start");
-    }
-  }
-
-  // Get gallery name from current instance
-  function getGalleryID(instance) {
-    var opts, ret;
-
-    if (!instance) {
-      return false;
-    }
-
-    opts = instance.current ? instance.current.opts : instance.opts;
-    ret = opts.hash || (opts.$orig ? opts.$orig.data("fancybox") || opts.$orig.data("fancybox-trigger") : "");
-
-    return ret === "" ? false : ret;
-  }
-
-  // Start when DOM becomes ready
-  $(function () {
-    // Check if user has disabled this module
-    if ($.fancybox.defaults.hash === false) {
-      return;
-    }
-
-    // Update hash when opening/closing fancyBox
-    $(document).on({
-      "onInit.fb": function (e, instance) {
-        var url, gallery;
-
-        if (instance.group[instance.currIndex].opts.hash === false) {
-          return;
-        }
-
-        url = parseUrl();
-        gallery = getGalleryID(instance);
-
-        // Make sure gallery start index matches index from hash
-        if (gallery && url.gallery && gallery == url.gallery) {
-          instance.currIndex = url.index - 1;
-        }
-      },
-
-      "beforeShow.fb": function (e, instance, current, firstRun) {
-        var gallery;
-
-        if (!current || current.opts.hash === false) {
-          return;
-        }
-
-        // Check if need to update window hash
-        gallery = getGalleryID(instance);
-
-        if (!gallery) {
-          return;
-        }
-
-        // Variable containing last hash value set by fancyBox
-        // It will be used to determine if fancyBox needs to close after hash change is detected
-        instance.currentHash = gallery + (instance.group.length > 1 ? "-" + (current.index + 1) : "");
-
-        // If current hash is the same (this instance most likely is opened by hashchange), then do nothing
-        if (window.location.hash === "#" + instance.currentHash) {
-          return;
-        }
-
-        if (firstRun && !instance.origHash) {
-          instance.origHash = window.location.hash;
-        }
-
-        if (instance.hashTimer) {
-          clearTimeout(instance.hashTimer);
-        }
-
-        // Update hash
-        instance.hashTimer = setTimeout(function () {
-          if ("replaceState" in window.history) {
-            window.history[firstRun ? "pushState" : "replaceState"]({},
-              document.title,
-              window.location.pathname + window.location.search + "#" + instance.currentHash
-            );
-
-            if (firstRun) {
-              instance.hasCreatedHistory = true;
-            }
-          } else {
-            window.location.hash = instance.currentHash;
-          }
-
-          instance.hashTimer = null;
-        }, 300);
-      },
-
-      "beforeClose.fb": function (e, instance, current) {
-        if (!current || current.opts.hash === false) {
-          return;
-        }
-
-        clearTimeout(instance.hashTimer);
-
-        // Goto previous history entry
-        if (instance.currentHash && instance.hasCreatedHistory) {
-          window.history.back();
-        } else if (instance.currentHash) {
-          if ("replaceState" in window.history) {
-            window.history.replaceState({}, document.title, window.location.pathname + window.location.search + (instance.origHash || ""));
-          } else {
-            window.location.hash = instance.origHash;
-          }
-        }
-
-        instance.currentHash = null;
-      }
-    });
-
-    // Check if need to start/close after url has changed
-    $(window).on("hashchange.fb", function () {
-      var url = parseUrl(),
-        fb = null;
-
-      // Find last fancyBox instance that has "hash"
-      $.each(
-        $(".fancybox-container")
-        .get()
-        .reverse(),
-        function (index, value) {
-          var tmp = $(value).data("FancyBox");
-
-          if (tmp && tmp.currentHash) {
-            fb = tmp;
-            return false;
-          }
-        }
-      );
-
-      if (fb) {
-        // Now, compare hash values
-        if (fb.currentHash !== url.gallery + "-" + url.index && !(url.index === 1 && fb.currentHash == url.gallery)) {
-          fb.currentHash = null;
-
-          fb.close();
-        }
-      } else if (url.gallery !== "") {
-        triggerFromUrl(url);
-      }
-    });
-
-    // Check current hash and trigger click event on matching element to start fancyBox, if needed
-    setTimeout(function () {
-      if (!$.fancybox.getInstance()) {
-        triggerFromUrl(parseUrl());
-      }
-    }, 50);
-  });
-})(window, document, jQuery);
-// ==========================================================================
-//
-// Wheel
-// Basic mouse weheel support for gallery navigation
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  var prevTime = new Date().getTime();
-
-  $(document).on({
-    "onInit.fb": function (e, instance, current) {
-      instance.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll", function (e) {
-        var current = instance.current,
-          currTime = new Date().getTime();
-
-        if (instance.group.length < 2 || current.opts.wheel === false || (current.opts.wheel === "auto" && current.type !== "image")) {
-          return;
-        }
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (current.$slide.hasClass("fancybox-animated")) {
-          return;
-        }
-
-        e = e.originalEvent || e;
-
-        if (currTime - prevTime < 250) {
-          return;
-        }
-
-        prevTime = currTime;
-
-        instance[(-e.deltaY || -e.deltaX || e.wheelDelta || -e.detail) < 0 ? "next" : "previous"]();
-      });
-    }
-  });
-})(document, jQuery);
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.min.css b/fancybox/asset/fancybox/jquery.fancybox.min.css
deleted file mode 100644
index 7cc60b29..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.min.css
+++ /dev/null
@@ -1 +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-bg,.fancybox-inner,.fancybox-outer,.fancybox-stage{bottom:0;left:0;position:absolute;right:0;top:0}.fancybox-outer{-webkit-overflow-scrolling:touch;overflow-y:auto}.fancybox-bg{background:#1e1e1e;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-caption,.fancybox-infobar,.fancybox-navigation .fancybox-button,.fancybox-toolbar{direction:ltr;opacity:0;position:absolute;transition:opacity .25s ease,visibility 0s ease .25s;visibility:hidden;z-index:99997}.fancybox-show-caption .fancybox-caption,.fancybox-show-infobar .fancybox-infobar,.fancybox-show-nav .fancybox-navigation .fancybox-button,.fancybox-show-toolbar .fancybox-toolbar{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;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--current,.fancybox-slide--next,.fancybox-slide--previous{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;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-pan .fancybox-content,.fancybox-can-swipe .fancybox-content{cursor:grab}.fancybox-is-grabbing .fancybox-content{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--iframe .fancybox-content,.fancybox-slide--map .fancybox-content,.fancybox-slide--pdf .fancybox-content,.fancybox-slide--video .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-iframe,.fancybox-video{background:transparent;border:0;display:block;height:100%;margin:0;overflow:hidden;padding:0;width:100%}.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}.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:link,.fancybox-button:visited{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}.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--fsenter svg:nth-child(2),.fancybox-button--fsexit svg:first-child,.fancybox-button--pause svg:first-child,.fancybox-button--play svg:nth-child(2){display:none}.fancybox-progress{background:#ff5268;height:2px;left:0;position:absolute;right:0;top:0;transform:scaleX(0);transform-origin:0;transition-property:transform;transition-timing-function:linear;z-index:99998}.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}.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)}.fancybox-caption{background:linear-gradient(0deg,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%,transparent);bottom:0;color:#eee;font-size:14px;font-weight:400;left:0;line-height:1.5;padding:75px 44px 25px;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}.fancybox-loading{animation:a 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 a{to{transform:rotate(1turn)}}.fancybox-animated{transition-timing-function:cubic-bezier(0,0,.25,1)}.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:translateZ(0)}.fancybox-fx-fade.fancybox-slide--next,.fancybox-fx-fade.fancybox-slide--previous{opacity:0;transition-timing-function:cubic-bezier(.19,1,.22,1)}.fancybox-fx-fade.fancybox-slide--current{opacity:1}.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:scaleX(1)}.fancybox-fx-rotate.fancybox-slide--previous{opacity:0;transform:rotate(-1turn)}.fancybox-fx-rotate.fancybox-slide--next{opacity:0;transform:rotate(1turn)}.fancybox-fx-rotate.fancybox-slide--current{opacity:1;transform:rotate(0deg)}.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:scaleX(1) translateZ(0)}.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:translateZ(0) scale(1)}@media (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))}}}.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}.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;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:link,.fancybox-share__button:visited{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;outline:none;padding:10px 15px;width:100%}.fancybox-thumbs{background:#ddd;bottom:0;display:none;margin:0;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;padding:2px 2px 4px;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:50%;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}@media (max-width:576px){.fancybox-thumbs{width:110px}.fancybox-show-thumbs .fancybox-inner{right:110px}.fancybox-thumbs__list a{max-width:calc(100% - 10px)}}
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.min.js b/fancybox/asset/fancybox/jquery.fancybox.min.js
deleted file mode 100644
index d5d10f6b..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// ==================================================
-// fancyBox v3.5.7
-//
-// Licensed GPLv3 for open source use
-// or fancyBox Commercial License for commercial use
-//
-// http://fancyapps.com/fancybox/
-// Copyright 2019 fancyApps
-//
-// ==================================================
-!function(t,e,n,o){"use strict";function i(t,e){var o,i,a,s=[],r=0;t&&t.isDefaultPrevented()||(t.preventDefault(),e=e||{},t&&t.data&&(e=h(t.data.options,e)),o=e.$target||n(t.currentTarget).trigger("blur"),(a=n.fancybox.getInstance())&&a.$trigger&&a.$trigger.is(o)||(e.selector?s=n(e.selector):(i=o.attr("data-fancybox")||"",i?(s=t.data?t.data.items:[],s=s.length?s.filter('[data-fancybox="'+i+'"]'):n('[data-fancybox="'+i+'"]')):s=[o]),r=n(s).index(o),r<0&&(r=0),a=n.fancybox.open(s,e,r),a.$trigger=o))}if(t.console=t.console||{info:function(t){}},n){if(n.fn.fancybox)return void console.info("fancyBox already initialized");var a={closeExisting:!1,loop:!1,gutter:50,keyboard:!0,preventCaptionOverlap:!0,arrows:!0,infobar:!0,smallBtn:"auto",toolbar:"auto",buttons:["zoom","slideShow","thumbs","close"],idleTime:3,protect:!1,modal:!1,image:{preload:!1},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" allowfullscreen="allowfullscreen" allow="autoplay; fullscreen" src=""></iframe>',preload:!0,css:{},attr:{scrolling:"auto"}},video:{tpl:'<video class="fancybox-video" controls controlsList="nodownload" poster="{{poster}}"><source src="{{src}}" type="{{format}}" />Sorry, your browser doesn\'t support embedded videos, <a href="{{src}}">download</a> and watch with your favorite video player!</video>',format:"",autoStart:!0},defaultType:"image",animationEffect:"zoom",animationDuration:366,zoomOpacity:"auto",transitionEffect:"fade",transitionDuration:366,slideClass:"",baseClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-inner"><div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div><div class="fancybox-toolbar">{{buttons}}</div><div class="fancybox-navigation">{{arrows}}</div><div class="fancybox-stage"></div><div class="fancybox-caption"><div class="fancybox-caption__body"></div></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>{{ERROR}}</p></div>',btnTpl:{download:'<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}" href="javascript:;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.62 17.09V19H5.38v-1.91zm-2.97-6.96L17 11.45l-5 4.87-5-4.87 1.36-1.32 2.68 2.64V5h1.92v7.77z"/></svg></a>',zoom:'<button data-fancybox-zoom class="fancybox-button fancybox-button--zoom" title="{{ZOOM}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.7 17.3l-3-3a5.9 5.9 0 0 0-.6-7.6 5.9 5.9 0 0 0-8.4 0 5.9 5.9 0 0 0 0 8.4 5.9 5.9 0 0 0 7.7.7l3 3a1 1 0 0 0 1.3 0c.4-.5.4-1 0-1.5zM8.1 13.8a4 4 0 0 1 0-5.7 4 4 0 0 1 5.7 0 4 4 0 0 1 0 5.7 4 4 0 0 1-5.7 0z"/></svg></button>',close:'<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.6L6.6 5.2 5.2 6.6l5.4 5.4-5.4 5.4 1.4 1.4 5.4-5.4 5.4 5.4 1.4-1.4-5.4-5.4 5.4-5.4-1.4-1.4-5.4 5.4z"/></svg></button>',arrowLeft:'<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.28 15.7l-1.34 1.37L5 12l4.94-5.07 1.34 1.38-2.68 2.72H19v1.94H8.6z"/></svg></div></button>',arrowRight:'<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.4 12.97l-2.68 2.72 1.34 1.38L19 12l-4.94-5.07-1.34 1.38 2.68 2.72H5v1.94z"/></svg></div></button>',smallBtn:'<button type="button" data-fancybox-close class="fancybox-button fancybox-close-small" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 24 24"><path d="M13 12l5-5-1-1-5 5-5-5-1 1 5 5-5 5 1 1 5-5 5 5 1-1z"/></svg></button>'},parentEl:"body",hideScrollbar:!0,autoFocus:!0,backFocus:!0,trapFocus:!0,fullScreen:{autoStart:!1},touch:{vertical:!0,momentum:!0},hash:null,media:{},slideShow:{autoStart:!1,speed:3e3},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"},wheel:"auto",onInit:n.noop,beforeLoad:n.noop,afterLoad:n.noop,beforeShow:n.noop,afterShow:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop,clickContent:function(t,e){return"image"===t.type&&"zoom"},clickSlide:"close",clickOutside:"close",dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1,mobile:{preventCaptionOverlap:!1,idleTime:!1,clickContent:function(t,e){return"image"===t.type&&"toggleControls"},clickSlide:function(t,e){return"image"===t.type?"toggleControls":"close"},dblclickContent:function(t,e){return"image"===t.type&&"zoom"},dblclickSlide:function(t,e){return"image"===t.type&&"zoom"}},lang:"en",i18n:{en:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",ERROR:"The requested content cannot be loaded. <br/> Please try again later.",PLAY_START:"Start slideshow",PLAY_STOP:"Pause slideshow",FULL_SCREEN:"Full screen",THUMBS:"Thumbnails",DOWNLOAD:"Download",SHARE:"Share",ZOOM:"Zoom"},de:{CLOSE:"Schlie&szlig;en",NEXT:"Weiter",PREV:"Zur&uuml;ck",ERROR:"Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es sp&auml;ter nochmal.",PLAY_START:"Diaschau starten",PLAY_STOP:"Diaschau beenden",FULL_SCREEN:"Vollbild",THUMBS:"Vorschaubilder",DOWNLOAD:"Herunterladen",SHARE:"Teilen",ZOOM:"Vergr&ouml;&szlig;ern"}}},s=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},d=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),u=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),f=function(){var t,n=e.createElement("fakeelement"),o={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(t in o)if(void 0!==n.style[t])return o[t];return"transitionend"}(),p=function(t){return t&&t.length&&t[0].offsetHeight},h=function(t,e){var o=n.extend(!0,{},t,e);return n.each(e,function(t,e){n.isArray(e)&&(o[t]=e)}),o},g=function(t){var o,i;return!(!t||t.ownerDocument!==e)&&(n(".fancybox-container").css("pointer-events","none"),o={x:t.getBoundingClientRect().left+t.offsetWidth/2,y:t.getBoundingClientRect().top+t.offsetHeight/2},i=e.elementFromPoint(o.x,o.y)===t,n(".fancybox-container").css("pointer-events",""),i)},b=function(t,e,o){var i=this;i.opts=h({index:o},n.fancybox.defaults),n.isPlainObject(e)&&(i.opts=h(i.opts,e)),n.fancybox.isMobile&&(i.opts=h(i.opts,i.opts.mobile)),i.id=i.opts.id||++c,i.currIndex=parseInt(i.opts.index,10)||0,i.prevIndex=null,i.prevPos=null,i.currPos=0,i.firstRun=!0,i.group=[],i.slides={},i.addContent(t),i.group.length&&i.init()};n.extend(b.prototype,{init:function(){var o,i,a=this,s=a.group[a.currIndex],r=s.opts;r.closeExisting&&n.fancybox.close(!0),n("body").addClass("fancybox-active"),!n.fancybox.getInstance()&&!1!==r.hideScrollbar&&!n.fancybox.isMobile&&e.body.scrollHeight>t.innerHeight&&(n("head").append('<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar{margin-right:'+(t.innerWidth-e.documentElement.clientWidth)+"px;}</style>"),n("body").addClass("compensate-for-scrollbar")),i="",n.each(r.buttons,function(t,e){i+=r.btnTpl[e]||""}),o=n(a.translate(a,r.baseTpl.replace("{{buttons}}",i).replace("{{arrows}}",r.btnTpl.arrowLeft+r.btnTpl.arrowRight))).attr("id","fancybox-container-"+a.id).addClass(r.baseClass).data("FancyBox",a).appendTo(r.parentEl),a.$refs={container:o},["bg","inner","infobar","toolbar","stage","caption","navigation"].forEach(function(t){a.$refs[t]=o.find(".fancybox-"+t)}),a.trigger("onInit"),a.activate(),a.jumpTo(a.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang]||t.opts.i18n.en;return e.replace(/\{\{(\w+)\}\}/g,function(t,e){return void 0===n[e]?t:n[e]})},addContent:function(t){var e,o=this,i=n.makeArray(t);n.each(i,function(t,e){var i,a,s,r,c,l={},d={};n.isPlainObject(e)?(l=e,d=e.opts||e):"object"===n.type(e)&&n(e).length?(i=n(e),d=i.data()||{},d=n.extend(!0,{},d,d.options),d.$orig=i,l.src=o.opts.src||d.src||i.attr("href"),l.type||l.src||(l.type="inline",l.src=e)):l={type:"html",src:e+""},l.opts=n.extend(!0,{},o.opts,d),n.isArray(d.buttons)&&(l.opts.buttons=d.buttons),n.fancybox.isMobile&&l.opts.mobile&&(l.opts=h(l.opts,l.opts.mobile)),a=l.type||l.opts.type,r=l.src||"",!a&&r&&((s=r.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))?(a="video",l.opts.video.format||(l.opts.video.format="video/"+("ogv"===s[1]?"ogg":s[1]))):r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?a="image":r.match(/\.(pdf)((\?|#).*)?$/i)?(a="iframe",l=n.extend(!0,l,{contentType:"pdf",opts:{iframe:{preload:!1}}})):"#"===r.charAt(0)&&(a="inline")),a?l.type=a:o.trigger("objectNeedsType",l),l.contentType||(l.contentType=n.inArray(l.type,["html","inline","ajax"])>-1?"html":l.type),l.index=o.group.length,"auto"==l.opts.smallBtn&&(l.opts.smallBtn=n.inArray(l.type,["html","inline","ajax"])>-1),"auto"===l.opts.toolbar&&(l.opts.toolbar=!l.opts.smallBtn),l.$thumb=l.opts.$thumb||null,l.opts.$trigger&&l.index===o.opts.index&&(l.$thumb=l.opts.$trigger.find("img:first"),l.$thumb.length&&(l.opts.$orig=l.opts.$trigger)),l.$thumb&&l.$thumb.length||!l.opts.$orig||(l.$thumb=l.opts.$orig.find("img:first")),l.$thumb&&!l.$thumb.length&&(l.$thumb=null),l.thumb=l.opts.thumb||(l.$thumb?l.$thumb[0].src:null),"function"===n.type(l.opts.caption)&&(l.opts.caption=l.opts.caption.apply(e,[o,l])),"function"===n.type(o.opts.caption)&&(l.opts.caption=o.opts.caption.apply(e,[o,l])),l.opts.caption instanceof n||(l.opts.caption=void 0===l.opts.caption?"":l.opts.caption+""),"ajax"===l.type&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.filter=c.shift())),l.opts.modal&&(l.opts=n.extend(!0,l.opts,{trapFocus:!0,infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),o.group.push(l)}),Object.keys(o.slides).length&&(o.updateControls(),(e=o.Thumbs)&&e.isActive&&(e.create(),e.focus()))},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("touchstart.fb-prev click.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("touchstart.fb-next click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}).on("click.fb","[data-fancybox-zoom]",function(t){e[e.isScaledDown()?"scaleToActual":"scaleToFit"]()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?(e.requestId&&u(e.requestId),e.requestId=d(function(){e.update(t)})):(e.current&&"iframe"===e.current.type&&e.$refs.stage.hide(),setTimeout(function(){e.$refs.stage.show(),e.update(t)},n.fancybox.isMobile?600:250))}),r.on("keydown.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null,i=o.current,a=t.keyCode||t.which;if(9==a)return void(i.opts.trapFocus&&e.focus(t));if(!(!i.opts.keyboard||t.ctrlKey||t.altKey||t.shiftKey||n(t.target).is("input,textarea,video,audio,select")))return 8===a||27===a?(t.preventDefault(),void e.close(t)):37===a||38===a?(t.preventDefault(),void e.previous()):39===a||40===a?(t.preventDefault(),void e.next()):void e.trigger("afterKeydown",t,a)}),e.group[e.currIndex].opts.idleTime&&(e.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(t){e.idleSecondsCounter=0,e.isIdle&&e.showControls(),e.isIdle=!1}),e.idleInterval=t.setInterval(function(){++e.idleSecondsCounter>=e.group[e.currIndex].opts.idleTime&&!e.isDragging&&(e.isIdle=!0,e.idleSecondsCounter=0,e.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e){var o,i,a,s,r,c,l,d,u,f=this,h=f.group.length;if(!(f.isDragging||f.isClosing||f.isAnimating&&f.firstRun)){if(t=parseInt(t,10),!(a=f.current?f.current.opts.loop:f.opts.loop)&&(t<0||t>=h))return!1;if(o=f.firstRun=!Object.keys(f.slides).length,r=f.current,f.prevIndex=f.currIndex,f.prevPos=f.currPos,s=f.createSlide(t),h>1&&((a||s.index<h-1)&&f.createSlide(t+1),(a||s.index>0)&&f.createSlide(t-1)),f.current=s,f.currIndex=s.index,f.currPos=s.pos,f.trigger("beforeShow",o),f.updateControls(),s.forcedDuration=void 0,n.isNumeric(e)?s.forcedDuration=e:e=s.opts[o?"animationDuration":"transitionDuration"],e=parseInt(e,10),i=f.isMoved(s),s.$slide.addClass("fancybox-slide--current"),o)return s.opts.animationEffect&&e&&f.$refs.container.css("transition-duration",e+"ms"),f.$refs.container.addClass("fancybox-is-open").trigger("focus"),f.loadSlide(s),void f.preload("image");c=n.fancybox.getTranslate(r.$slide),l=n.fancybox.getTranslate(f.$refs.stage),n.each(f.slides,function(t,e){n.fancybox.stop(e.$slide,!0)}),r.pos!==s.pos&&(r.isComplete=!1),r.$slide.removeClass("fancybox-slide--complete fancybox-slide--current"),i?(u=c.left-(r.pos*c.width+r.pos*r.opts.gutter),n.each(f.slides,function(t,o){o.$slide.removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")});var i=o.pos*c.width+o.pos*o.opts.gutter;n.fancybox.setTranslate(o.$slide,{top:0,left:i-l.left+u}),o.pos!==s.pos&&o.$slide.addClass("fancybox-slide--"+(o.pos>s.pos?"next":"previous")),p(o.$slide),n.fancybox.animate(o.$slide,{top:0,left:(o.pos-s.pos)*c.width+(o.pos-s.pos)*o.opts.gutter},e,function(){o.$slide.css({transform:"",opacity:""}).removeClass("fancybox-slide--next fancybox-slide--previous"),o.pos===f.currPos&&f.complete()})})):e&&s.opts.transitionEffect&&(d="fancybox-animated fancybox-fx-"+s.opts.transitionEffect,r.$slide.addClass("fancybox-slide--"+(r.pos>s.pos?"next":"previous")),n.fancybox.animate(r.$slide,d,e,function(){r.$slide.removeClass(d).removeClass("fancybox-slide--next fancybox-slide--previous")},!1)),s.isLoaded?f.revealContent(s):f.loadSlide(s),f.preload("image")}},createSlide:function(t){var e,o,i=this;return o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]&&(e=n('<div class="fancybox-slide"></div>').appendTo(i.$refs.stage),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isLoaded:!1}),i.updateSlide(i.slides[t])),i.slides[t]},scaleToActual:function(t,e,o){var i,a,s,r,c,l=this,d=l.current,u=d.$content,f=n.fancybox.getTranslate(d.$slide).width,p=n.fancybox.getTranslate(d.$slide).height,h=d.width,g=d.height;l.isAnimating||l.isMoved()||!u||"image"!=d.type||!d.isLoaded||d.hasError||(l.isAnimating=!0,n.fancybox.stop(u),t=void 0===t?.5*f:t,e=void 0===e?.5*p:e,i=n.fancybox.getTranslate(u),i.top-=n.fancybox.getTranslate(d.$slide).top,i.left-=n.fancybox.getTranslate(d.$slide).left,r=h/i.width,c=g/i.height,a=.5*f-.5*h,s=.5*p-.5*g,h>f&&(a=i.left*r-(t*r-t),a>0&&(a=0),a<f-h&&(a=f-h)),g>p&&(s=i.top*c-(e*c-e),s>0&&(s=0),s<p-g&&(s=p-g)),l.updateCursor(h,g),n.fancybox.animate(u,{top:s,left:a,scaleX:r,scaleY:c},o||366,function(){l.isAnimating=!1}),l.SlideShow&&l.SlideShow.isActive&&l.SlideShow.stop())},scaleToFit:function(t){var e,o=this,i=o.current,a=i.$content;o.isAnimating||o.isMoved()||!a||"image"!=i.type||!i.isLoaded||i.hasError||(o.isAnimating=!0,n.fancybox.stop(a),e=o.getFitPos(i),o.updateCursor(e.width,e.height),n.fancybox.animate(a,{top:e.top,left:e.left,scaleX:e.width/a.width(),scaleY:e.height/a.height()},t||366,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,i,a,s=this,r=t.$content,c=t.$slide,l=t.width||t.opts.width,d=t.height||t.opts.height,u={};return!!(t.isLoaded&&r&&r.length)&&(e=n.fancybox.getTranslate(s.$refs.stage).width,o=n.fancybox.getTranslate(s.$refs.stage).height,e-=parseFloat(c.css("paddingLeft"))+parseFloat(c.css("paddingRight"))+parseFloat(r.css("marginLeft"))+parseFloat(r.css("marginRight")),o-=parseFloat(c.css("paddingTop"))+parseFloat(c.css("paddingBottom"))+parseFloat(r.css("marginTop"))+parseFloat(r.css("marginBottom")),l&&d||(l=e,d=o),i=Math.min(1,e/l,o/d),l*=i,d*=i,l>e-.5&&(l=e),d>o-.5&&(d=o),"image"===t.type?(u.top=Math.floor(.5*(o-d))+parseFloat(c.css("paddingTop")),u.left=Math.floor(.5*(e-l))+parseFloat(c.css("paddingLeft"))):"video"===t.contentType&&(a=t.opts.width&&t.opts.height?l/d:t.opts.ratio||16/9,d>l/a?d=l/a:l>d*a&&(l=d*a)),u.width=l,u.height=d,u)},update:function(t){var e=this;n.each(e.slides,function(n,o){e.updateSlide(o,t)})},updateSlide:function(t,e){var o=this,i=t&&t.$content,a=t.width||t.opts.width,s=t.height||t.opts.height,r=t.$slide;o.adjustCaption(t),i&&(a||s||"video"===t.contentType)&&!t.hasError&&(n.fancybox.stop(i),n.fancybox.setTranslate(i,o.getFitPos(t)),t.pos===o.currPos&&(o.isAnimating=!1,o.updateCursor())),o.adjustLayout(t),r.length&&(r.trigger("refresh"),t.pos===o.currPos&&o.$refs.toolbar.add(o.$refs.navigation.find(".fancybox-button--arrow_right")).toggleClass("compensate-for-scrollbar",r.get(0).scrollHeight>r.get(0).clientHeight)),o.trigger("onUpdate",t,e)},centerSlide:function(t){var e=this,o=e.current,i=o.$slide;!e.isClosing&&o&&(i.siblings().css({transform:"",opacity:""}),i.parent().children().removeClass("fancybox-slide--previous fancybox-slide--next"),n.fancybox.animate(i,{top:0,left:0,opacity:1},void 0===t?0:t,function(){i.css({transform:"",opacity:""}),o.isComplete||e.complete()},!1))},isMoved:function(t){var e,o,i=t||this.current;return!!i&&(o=n.fancybox.getTranslate(this.$refs.stage),e=n.fancybox.getTranslate(i.$slide),!i.$slide.hasClass("fancybox-animated")&&(Math.abs(e.top-o.top)>.5||Math.abs(e.left-o.left)>.5))},updateCursor:function(t,e){var o,i,a=this,s=a.current,r=a.$refs.container;s&&!a.isClosing&&a.Guestures&&(r.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan"),o=a.canPan(t,e),i=!!o||a.isZoomable(),r.toggleClass("fancybox-is-zoomable",i),n("[data-fancybox-zoom]").prop("disabled",!i),o?r.addClass("fancybox-can-pan"):i&&("zoom"===s.opts.clickContent||n.isFunction(s.opts.clickContent)&&"zoom"==s.opts.clickContent(s))?r.addClass("fancybox-can-zoomIn"):s.opts.touch&&(s.opts.touch.vertical||a.group.length>1)&&"video"!==s.contentType&&r.addClass("fancybox-can-swipe"))},isZoomable:function(){var t,e=this,n=e.current;if(n&&!e.isClosing&&"image"===n.type&&!n.hasError){if(!n.isLoaded)return!0;if((t=e.getFitPos(n))&&(n.width>t.width||n.height>t.height))return!0}return!1},isScaledDown:function(t,e){var o=this,i=!1,a=o.current,s=a.$content;return void 0!==t&&void 0!==e?i=t<a.width&&e<a.height:s&&(i=n.fancybox.getTranslate(s),i=i.width<a.width&&i.height<a.height),i},canPan:function(t,e){var o=this,i=o.current,a=null,s=!1;return"image"===i.type&&(i.isComplete||t&&e)&&!i.hasError&&(s=o.getFitPos(i),void 0!==t&&void 0!==e?a={width:t,height:e}:i.isComplete&&(a=n.fancybox.getTranslate(i.$content)),a&&s&&(s=Math.abs(a.width-s.width)>1.5||Math.abs(a.height-s.height)>1.5)),s},loadSlide:function(t){var e,o,i,a=this;if(!t.isLoading&&!t.isLoaded){if(t.isLoading=!0,!1===a.trigger("beforeLoad",t))return t.isLoading=!1,!1;switch(e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass(t.opts.slideClass),e){case"image":a.setImage(t);break;case"iframe":a.setIframe(t);break;case"html":a.setContent(t,t.src||t.content);break;case"video":a.setContent(t,t.opts.video.tpl.replace(/\{\{src\}\}/gi,t.src).replace("{{format}}",t.opts.videoFormat||t.opts.video.format||"").replace("{{poster}}",t.thumb||""));break;case"inline":n(t.src).length?a.setContent(t,n(t.src)):a.setError(t);break;case"ajax":a.showLoading(t),i=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&a.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&a.setError(t)}})),o.one("onReset",function(){i.abort()});break;default:a.setError(t)}return!0}},setImage:function(t){var o,i=this;setTimeout(function(){var e=t.$image;i.isClosing||!t.isLoading||e&&e.length&&e[0].complete||t.hasError||i.showLoading(t)},50),i.checkSrcset(t),t.$content=n('<div class="fancybox-content"></div>').addClass("fancybox-is-hidden").appendTo(t.$slide.addClass("fancybox-slide--image")),!1!==t.opts.preload&&t.opts.width&&t.opts.height&&t.thumb&&(t.width=t.opts.width,t.height=t.opts.height,o=e.createElement("img"),o.onerror=function(){n(this).remove(),t.$ghost=null},o.onload=function(){i.afterLoad(t)},t.$ghost=n(o).addClass("fancybox-image").appendTo(t.$content).attr("src",t.thumb)),i.setBigImage(t)},checkSrcset:function(e){var n,o,i,a,s=e.opts.srcset||e.opts.image.srcset;if(s){i=t.devicePixelRatio||1,a=t.innerWidth*i,o=s.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);if(0===n)return e.url=t;o&&(e.value=o,e.postfix=t[t.length-1])}),e}),o.sort(function(t,e){return t.value-e.value});for(var r=0;r<o.length;r++){var c=o[r];if("w"===c.postfix&&c.value>=a||"x"===c.postfix&&c.value>=i){n=c;break}}!n&&o.length&&(n=o[o.length-1]),n&&(e.src=n.url,e.width&&e.height&&"w"==n.postfix&&(e.height=e.width/e.height*n.value,e.width=n.value),e.opts.srcset=s)}},setBigImage:function(t){var o=this,i=e.createElement("img"),a=n(i);t.$image=a.one("error",function(){o.setError(t)}).one("load",function(){var e;t.$ghost||(o.resolveImageSlideSize(t,this.naturalWidth,this.naturalHeight),o.afterLoad(t)),o.isClosing||(t.opts.srcset&&(e=t.opts.sizes,e&&"auto"!==e||(e=(t.width/t.height>1&&s.width()/s.height()>1?"100":Math.round(t.width/t.height*100))+"vw"),a.attr("sizes",e).attr("srcset",t.opts.srcset)),t.$ghost&&setTimeout(function(){t.$ghost&&!o.isClosing&&t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))),o.hideLoading(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),(i.complete||"complete"==i.readyState)&&a.naturalWidth&&a.naturalHeight?a.trigger("load"):i.error&&a.trigger("error")},resolveImageSlideSize:function(t,e,n){var o=parseInt(t.opts.width,10),i=parseInt(t.opts.height,10);t.width=e,t.height=n,o>0&&(t.width=o,t.height=Math.floor(o*n/e)),i>0&&(t.width=Math.floor(i*e/n),t.height=i)},setIframe:function(t){var e,o=this,i=t.opts.iframe,a=t.$slide;t.$content=n('<div class="fancybox-content'+(i.preload?" fancybox-is-hidden":"")+'"></div>').css(i.css).appendTo(a),a.addClass("fancybox-slide--"+t.contentType),t.$iframe=e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(i.attr).appendTo(t.$content),i.preload?(o.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),o.afterLoad(t)}),a.on("refresh.fb",function(){var n,o,s=t.$content,r=i.css.width,c=i.css.height;if(1===e[0].isReady){try{n=e.contents(),o=n.find("body")}catch(t){}o&&o.length&&o.children().length&&(a.css("overflow","visible"),s.css({width:"100%","max-width":"100%",height:"9999px"}),void 0===r&&(r=Math.ceil(Math.max(o[0].clientWidth,o.outerWidth(!0)))),s.css("width",r||"").css("max-width",""),void 0===c&&(c=Math.ceil(Math.max(o[0].clientHeight,o.outerHeight(!0)))),s.css("height",c||""),a.css("overflow","auto")),s.removeClass("fancybox-is-hidden")}})):o.afterLoad(t),e.attr("src",t.src),a.one("onReset",function(){try{n(this).find("iframe").hide().unbind().attr("src","//about:blank")}catch(t){}n(this).off("refresh.fb").empty(),t.isLoaded=!1,t.isRevealed=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$content&&n.fancybox.stop(t.$content),t.$slide.empty(),l(e)&&e.parent().length?((e.hasClass("fancybox-content")||e.parent().hasClass("fancybox-content"))&&e.parents(".fancybox-slide").trigger("onReset"),t.$placeholder=n("<div>").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("<div>").append(n.trim(e)).contents()),t.opts.filter&&(e=n("<div>").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){n(this).find("video,audio").trigger("pause"),t.$placeholder&&(t.$placeholder.after(e.removeClass("fancybox-content").hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1,t.isRevealed=!1)}),n(e).appendTo(t.$slide),n(e).is("video,audio")&&(n(e).addClass("fancybox-video"),n(e).wrap("<div></div>"),t.contentType="video",t.opts.width=t.opts.width||n(e).attr("width"),t.opts.height=t.opts.height||n(e).attr("height")),t.$content=t.$slide.children().filter("div,form,main,video,audio,article,.fancybox-content").first(),t.$content.siblings().hide(),t.$content.length||(t.$content=t.$slide.wrapInner("<div></div>").children().first()),t.$content.addClass("fancybox-content"),t.$slide.addClass("fancybox-slide--"+t.contentType),o.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.trigger("onReset").removeClass("fancybox-slide--"+t.contentType).addClass("fancybox-slide--error"),t.contentType="html",this.setContent(t,this.translate(t,t.opts.errorTpl)),t.pos===this.currPos&&(this.isAnimating=!1)},showLoading:function(t){var e=this;(t=t||e.current)&&!t.$spinner&&(t.$spinner=n(e.translate(e,e.opts.spinnerTpl)).appendTo(t.$slide).hide().fadeIn("fast"))},hideLoading:function(t){var e=this;(t=t||e.current)&&t.$spinner&&(t.$spinner.stop().remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),!t.opts.smallBtn||t.$smallBtn&&t.$smallBtn.length||(t.$smallBtn=n(e.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content)),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$content)),e.adjustCaption(t),e.adjustLayout(t),t.pos===e.currPos&&e.updateCursor(),e.revealContent(t))},adjustCaption:function(t){var e,n=this,o=t||n.current,i=o.opts.caption,a=o.opts.preventCaptionOverlap,s=n.$refs.caption,r=!1;s.toggleClass("fancybox-caption--separate",a),a&&i&&i.length&&(o.pos!==n.currPos?(e=s.clone().appendTo(s.parent()),e.children().eq(0).empty().html(i),r=e.outerHeight(!0),e.empty().remove()):n.$caption&&(r=n.$caption.outerHeight(!0)),o.$slide.css("padding-bottom",r||""))},adjustLayout:function(t){var e,n,o,i,a=this,s=t||a.current;s.isLoaded&&!0!==s.opts.disableLayoutFix&&(s.$content.css("margin-bottom",""),s.$content.outerHeight()>s.$slide.height()+.5&&(o=s.$slide[0].style["padding-bottom"],i=s.$slide.css("padding-bottom"),parseFloat(i)>0&&(e=s.$slide[0].scrollHeight,s.$slide.css("padding-bottom",0),Math.abs(e-s.$slide[0].scrollHeight)<1&&(n=i),s.$slide.css("padding-bottom",o))),s.$content.css("margin-bottom",n))},revealContent:function(t){var e,o,i,a,s=this,r=t.$slide,c=!1,l=!1,d=s.isMoved(t),u=t.isRevealed;return t.isRevealed=!0,e=t.opts[s.firstRun?"animationEffect":"transitionEffect"],i=t.opts[s.firstRun?"animationDuration":"transitionDuration"],i=parseInt(void 0===t.forcedDuration?i:t.forcedDuration,10),!d&&t.pos===s.currPos&&i||(e=!1),"zoom"===e&&(t.pos===s.currPos&&i&&"image"===t.type&&!t.hasError&&(l=s.getThumbPos(t))?c=s.getFitPos(t):e="fade"),"zoom"===e?(s.isAnimating=!0,c.scaleX=c.width/l.width,c.scaleY=c.height/l.height,a=t.opts.zoomOpacity,"auto"==a&&(a=Math.abs(t.width/t.height-l.width/l.height)>.1),a&&(l.opacity=.1,c.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),l),p(t.$content),void n.fancybox.animate(t.$content,c,i,function(){s.isAnimating=!1,s.complete()})):(s.updateSlide(t),e?(n.fancybox.stop(r),o="fancybox-slide--"+(t.pos>=s.prevPos?"next":"previous")+" fancybox-animated fancybox-fx-"+e,r.addClass(o).removeClass("fancybox-slide--current"),t.$content.removeClass("fancybox-is-hidden"),p(r),"image"!==t.type&&t.$content.hide().show(0),void n.fancybox.animate(r,"fancybox-slide--current",i,function(){r.removeClass(o).css({transform:"",opacity:""}),t.pos===s.currPos&&s.complete()},!0)):(t.$content.removeClass("fancybox-is-hidden"),u||!d||"image"!==t.type||t.hasError||t.$content.hide().fadeIn("fast"),void(t.pos===s.currPos&&s.complete())))},getThumbPos:function(t){var e,o,i,a,s,r=!1,c=t.$thumb;return!(!c||!g(c[0]))&&(e=n.fancybox.getTranslate(c),o=parseFloat(c.css("border-top-width")||0),i=parseFloat(c.css("border-right-width")||0),a=parseFloat(c.css("border-bottom-width")||0),s=parseFloat(c.css("border-left-width")||0),r={top:e.top+o,left:e.left+s,width:e.width-i-s,height:e.height-o-a,scaleX:1,scaleY:1},e.width>0&&e.height>0&&r)},complete:function(){var t,e=this,o=e.current,i={};!e.isMoved()&&o.isLoaded&&(o.isComplete||(o.isComplete=!0,o.$slide.siblings().trigger("onReset"),e.preload("inline"),p(o.$slide),o.$slide.addClass("fancybox-slide--complete"),n.each(e.slides,function(t,o){o.pos>=e.currPos-1&&o.pos<=e.currPos+1?i[o.pos]=o:o&&(n.fancybox.stop(o.$slide),o.$slide.off().remove())}),e.slides=i),e.isAnimating=!1,e.updateCursor(),e.trigger("afterShow"),o.opts.video.autoStart&&o.$slide.find("video,audio").filter(":visible:first").trigger("play").one("ended",function(){Document.exitFullscreen?Document.exitFullscreen():this.webkitExitFullscreen&&this.webkitExitFullscreen(),e.next()}),o.opts.autoFocus&&"html"===o.contentType&&(t=o.$content.find("input[autofocus]:enabled:visible:first"),t.length?t.trigger("focus"):e.focus(null,!0)),o.$slide.scrollTop(0).scrollLeft(0))},preload:function(t){var e,n,o=this;o.group.length<2||(n=o.slides[o.currPos+1],e=o.slides[o.currPos-1],e&&e.type===t&&o.loadSlide(e),n&&n.type===t&&o.loadSlide(n))},focus:function(t,o){var i,a,s=this,r=["a[href]","area[href]",'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',"select:not([disabled]):not([aria-hidden])","textarea:not([disabled]):not([aria-hidden])","button:not([disabled]):not([aria-hidden])","iframe","object","embed","video","audio","[contenteditable]",'[tabindex]:not([tabindex^="-"])'].join(",");s.isClosing||(i=!t&&s.current&&s.current.isComplete?s.current.$slide.find("*:visible"+(o?":not(.fancybox-close-small)":"")):s.$refs.container.find("*:visible"),i=i.filter(r).filter(function(){return"hidden"!==n(this).css("visibility")&&!n(this).hasClass("disabled")}),i.length?(a=i.index(e.activeElement),t&&t.shiftKey?(a<0||0==a)&&(t.preventDefault(),i.eq(i.length-1).trigger("focus")):(a<0||a==i.length-1)&&(t&&t.preventDefault(),i.eq(0).trigger("focus"))):s.$refs.container.trigger("focus"))},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.id!==t.id&&!e.isClosing&&(e.trigger("onDeactivate"),e.removeEvents(),e.isVisible=!1)}),t.isVisible=!0,(t.current||t.isIdle)&&(t.update(),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t,e){var o,i,a,s,r,c,l,u=this,f=u.current,h=function(){u.cleanUp(t)};return!u.isClosing&&(u.isClosing=!0,!1===u.trigger("beforeClose",t)?(u.isClosing=!1,d(function(){u.update()}),!1):(u.removeEvents(),a=f.$content,o=f.opts.animationEffect,i=n.isNumeric(e)?e:o?f.opts.animationDuration:0,f.$slide.removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated"),!0!==t?n.fancybox.stop(f.$slide):o=!1,f.$slide.siblings().trigger("onReset").remove(),i&&u.$refs.container.removeClass("fancybox-is-open").addClass("fancybox-is-closing").css("transition-duration",i+"ms"),u.hideLoading(f),u.hideControls(!0),u.updateCursor(),"zoom"!==o||a&&i&&"image"===f.type&&!u.isMoved()&&!f.hasError&&(l=u.getThumbPos(f))||(o="fade"),"zoom"===o?(n.fancybox.stop(a),s=n.fancybox.getTranslate(a),c={top:s.top,left:s.left,scaleX:s.width/l.width,scaleY:s.height/l.height,width:l.width,height:l.height},r=f.opts.zoomOpacity,
-"auto"==r&&(r=Math.abs(f.width/f.height-l.width/l.height)>.1),r&&(l.opacity=0),n.fancybox.setTranslate(a,c),p(a),n.fancybox.animate(a,l,i,h),!0):(o&&i?n.fancybox.animate(f.$slide.addClass("fancybox-slide--previous").removeClass("fancybox-slide--current"),"fancybox-animated fancybox-fx-"+o,i,h):!0===t?setTimeout(h,i):h(),!0)))},cleanUp:function(e){var o,i,a,s=this,r=s.current.opts.$orig;s.current.$slide.trigger("onReset"),s.$refs.container.empty().remove(),s.trigger("afterClose",e),s.current.opts.backFocus&&(r&&r.length&&r.is(":visible")||(r=s.$trigger),r&&r.length&&(i=t.scrollX,a=t.scrollY,r.trigger("focus"),n("html, body").scrollTop(a).scrollLeft(i))),s.current=null,o=n.fancybox.getInstance(),o?o.activate():(n("body").removeClass("fancybox-active compensate-for-scrollbar"),n("#fancybox-style-noscroll").remove())},trigger:function(t,e){var o,i=Array.prototype.slice.call(arguments,1),a=this,s=e&&e.opts?e:a.current;if(s?i.unshift(s):s=a,i.unshift(a),n.isFunction(s.opts[t])&&(o=s.opts[t].apply(s,i)),!1===o)return o;"afterClose"!==t&&a.$refs?a.$refs.container.trigger(t+".fb",i):r.trigger(t+".fb",i)},updateControls:function(){var t=this,o=t.current,i=o.index,a=t.$refs.container,s=t.$refs.caption,r=o.opts.caption;o.$slide.trigger("refresh"),r&&r.length?(t.$caption=s,s.children().eq(0).html(r)):t.$caption=null,t.hasHiddenControls||t.isIdle||t.showControls(),a.find("[data-fancybox-count]").html(t.group.length),a.find("[data-fancybox-index]").html(i+1),a.find("[data-fancybox-prev]").prop("disabled",!o.opts.loop&&i<=0),a.find("[data-fancybox-next]").prop("disabled",!o.opts.loop&&i>=t.group.length-1),"image"===o.type?a.find("[data-fancybox-zoom]").show().end().find("[data-fancybox-download]").attr("href",o.opts.image.src||o.src).show():o.opts.toolbar&&a.find("[data-fancybox-download],[data-fancybox-zoom]").hide(),n(e.activeElement).is(":hidden,[disabled]")&&t.$refs.container.trigger("focus")},hideControls:function(t){var e=this,n=["infobar","toolbar","nav"];!t&&e.current.opts.preventCaptionOverlap||n.push("caption"),this.$refs.container.removeClass(n.map(function(t){return"fancybox-show-"+t}).join(" ")),this.hasHiddenControls=!0},showControls:function(){var t=this,e=t.current?t.current.opts:t.opts,n=t.$refs.container;t.hasHiddenControls=!1,t.idleSecondsCounter=0,n.toggleClass("fancybox-show-toolbar",!(!e.toolbar||!e.buttons)).toggleClass("fancybox-show-infobar",!!(e.infobar&&t.group.length>1)).toggleClass("fancybox-show-caption",!!t.$caption).toggleClass("fancybox-show-nav",!!(e.arrows&&t.group.length>1)).toggleClass("fancybox-is-modal",!!e.modal)},toggleControls:function(){this.hasHiddenControls?this.showControls():this.hideControls()}}),n.fancybox={version:"3.5.7",defaults:a,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof b&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new b(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),!0===t&&this.close(t))},destroy:function(){this.close(!0),r.add("body").off("click.fb-start","**")},isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle&&t.getComputedStyle(n)&&t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<11)}(),getTranslate:function(t){var e;return!(!t||!t.length)&&(e=t[0].getBoundingClientRect(),{top:e.top||0,left:e.left||0,width:e.width,height:e.height,opacity:parseFloat(t.css("opacity"))})},setTranslate:function(t,e){var n="",o={};if(t&&e)return void 0===e.left&&void 0===e.top||(n=(void 0===e.left?t.position().left:e.left)+"px, "+(void 0===e.top?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),void 0!==e.scaleX&&void 0!==e.scaleY?n+=" scale("+e.scaleX+", "+e.scaleY+")":void 0!==e.scaleX&&(n+=" scaleX("+e.scaleX+")"),n.length&&(o.transform=n),void 0!==e.opacity&&(o.opacity=e.opacity),void 0!==e.width&&(o.width=e.width),void 0!==e.height&&(o.height=e.height),t.css(o)},animate:function(t,e,o,i,a){var s,r=this;n.isFunction(o)&&(i=o,o=null),r.stop(t),s=r.getTranslate(t),t.on(f,function(c){(!c||!c.originalEvent||t.is(c.originalEvent.target)&&"z-index"!=c.originalEvent.propertyName)&&(r.stop(t),n.isNumeric(o)&&t.css("transition-duration",""),n.isPlainObject(e)?void 0!==e.scaleX&&void 0!==e.scaleY&&r.setTranslate(t,{top:e.top,left:e.left,width:s.width*e.scaleX,height:s.height*e.scaleY,scaleX:1,scaleY:1}):!0!==a&&t.removeClass(e),n.isFunction(i)&&i(c))}),n.isNumeric(o)&&t.css("transition-duration",o+"ms"),n.isPlainObject(e)?(void 0!==e.scaleX&&void 0!==e.scaleY&&(delete e.width,delete e.height,t.parent().hasClass("fancybox-slide--image")&&t.parent().addClass("fancybox-is-scaling")),n.fancybox.setTranslate(t,e)):t.addClass(e),t.data("timer",setTimeout(function(){t.trigger(f)},o+33))},stop:function(t,e){t&&t.length&&(clearTimeout(t.data("timer")),e&&t.trigger(f),t.off(f).css("transition-duration",""),t.parent().removeClass("fancybox-is-scaling"))}},n.fn.fancybox=function(t){var e;return t=t||{},e=t.selector||!1,e?n("body").off("click.fb-start",e).on("click.fb-start",e,{options:t},i):this.off("click.fb-start").on("click.fb-start",{items:this,options:t},i),this},r.on("click.fb-start","[data-fancybox]",i),r.on("click.fb-start","[data-fancybox-trigger]",function(t){n('[data-fancybox="'+n(this).attr("data-fancybox-trigger")+'"]').eq(n(this).attr("data-fancybox-index")||0).trigger("click.fb-start",{$trigger:n(this)})}),function(){var t=null;r.on("mousedown mouseup focus blur",".fancybox-button",function(e){switch(e.type){case"mousedown":t=n(this);break;case"mouseup":t=null;break;case"focusin":n(".fancybox-button").removeClass("fancybox-focus"),n(this).is(t)||n(this).is("[disabled]")||n(this).addClass("fancybox-focus");break;case"focusout":n(".fancybox-button").removeClass("fancybox-focus")}})}()}}(window,document,jQuery),function(t){"use strict";var e={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"https://www.youtube-nocookie.com/embed/$4",thumb:"https://img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},gmap_place:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12]+"").replace(/\?/,"&")+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}},gmap_search:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/maps?q="+t[5].replace("query=","q=").replace("api=1","")+"&output=embed"}}},n=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e};t(document).on("objectNeedsType.fb",function(o,i,a){var s,r,c,l,d,u,f,p=a.src||"",h=!1;s=t.extend(!0,{},e,a.opts.media),t.each(s,function(e,o){if(c=p.match(o.matcher)){if(h=o.type,f=e,u={},o.paramPlace&&c[o.paramPlace]){d=c[o.paramPlace],"?"==d[0]&&(d=d.substring(1)),d=d.split("&");for(var i=0;i<d.length;++i){var s=d[i].split("=",2);2==s.length&&(u[s[0]]=decodeURIComponent(s[1].replace(/\+/g," ")))}}return l=t.extend(!0,{},o.params,a.opts[e],u),p="function"===t.type(o.url)?o.url.call(this,c,l,a):n(o.url,c,l),r="function"===t.type(o.thumb)?o.thumb.call(this,c,l,a):n(o.thumb,c),"youtube"===e?p=p.replace(/&t=((\d+)m)?(\d+)s/,function(t,e,n,o){return"&start="+((n?60*parseInt(n,10):0)+parseInt(o,10))}):"vimeo"===e&&(p=p.replace("&%23","#")),!1}}),h?(a.opts.thumb||a.opts.$thumb&&a.opts.$thumb.length||(a.opts.thumb=r),"iframe"===h&&(a.opts=t.extend(!0,a.opts,{iframe:{preload:!1,attr:{scrolling:"no"}}})),t.extend(a,{type:h,src:p,origSrc:a.src,contentSource:f,contentType:"image"===h?"image":"gmap_place"==f||"gmap_search"==f?"map":"video"})):p&&(a.type=a.opts.defaultType)});var o={youtube:{src:"https://www.youtube.com/iframe_api",class:"YT",loading:!1,loaded:!1},vimeo:{src:"https://player.vimeo.com/api/player.js",class:"Vimeo",loading:!1,loaded:!1},load:function(t){var e,n=this;if(this[t].loaded)return void setTimeout(function(){n.done(t)});this[t].loading||(this[t].loading=!0,e=document.createElement("script"),e.type="text/javascript",e.src=this[t].src,"youtube"===t?window.onYouTubeIframeAPIReady=function(){n[t].loaded=!0,n.done(t)}:e.onload=function(){n[t].loaded=!0,n.done(t)},document.body.appendChild(e))},done:function(e){var n,o,i;"youtube"===e&&delete window.onYouTubeIframeAPIReady,(n=t.fancybox.getInstance())&&(o=n.current.$content.find("iframe"),"youtube"===e&&void 0!==YT&&YT?i=new YT.Player(o.attr("id"),{events:{onStateChange:function(t){0==t.data&&n.next()}}}):"vimeo"===e&&void 0!==Vimeo&&Vimeo&&(i=new Vimeo.Player(o),i.on("ended",function(){n.next()})))}};t(document).on({"afterShow.fb":function(t,e,n){e.group.length>1&&("youtube"===n.contentSource||"vimeo"===n.contentSource)&&o.load(n.contentSource)}})}(jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),i=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),a=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},s=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},r=function(t){if(t.is('a,area,button,[role="button"],input,label,select,summary,textarea,video,audio,iframe')||n.isFunction(t.get(0).onclick)||t.data("selectable"))return!0;for(var e=0,o=t[0].attributes,i=o.length;e<i;e++)if("data-fancybox-"===o[e].nodeName.substr(0,14))return!0;return!1},c=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],i=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,a=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return i||a},l=function(t){for(var e=!1;;){if(e=c(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-stage")||t.is("body"))break}return e},d=function(t){var e=this;e.instance=t,e.$bg=t.$refs.bg,e.$stage=t.$refs.stage,e.$container=t.$refs.container,e.destroy(),e.$container.on("touchstart.fb.touch mousedown.fb.touch",n.proxy(e,"ontouchstart"))};d.prototype.destroy=function(){var t=this;t.$container.off(".fb.touch"),n(e).off(".fb.touch"),t.requestId&&(i(t.requestId),t.requestId=null),t.tapped&&(clearTimeout(t.tapped),t.tapped=null)},d.prototype.ontouchstart=function(o){var i=this,c=n(o.target),d=i.instance,u=d.current,f=u.$slide,p=u.$content,h="touchstart"==o.type;if(h&&i.$container.off("mousedown.fb.touch"),(!o.originalEvent||2!=o.originalEvent.button)&&f.length&&c.length&&!r(c)&&!r(c.parent())&&(c.is("img")||!(o.originalEvent.clientX>c[0].clientWidth+c.offset().left))){if(!u||d.isAnimating||u.$slide.hasClass("fancybox-animated"))return o.stopPropagation(),void o.preventDefault();i.realPoints=i.startPoints=a(o),i.startPoints.length&&(u.touch&&o.stopPropagation(),i.startEvent=o,i.canTap=!0,i.$target=c,i.$content=p,i.opts=u.opts.touch,i.isPanning=!1,i.isSwiping=!1,i.isZooming=!1,i.isScrolling=!1,i.canPan=d.canPan(),i.startTime=(new Date).getTime(),i.distanceX=i.distanceY=i.distance=0,i.canvasWidth=Math.round(f[0].clientWidth),i.canvasHeight=Math.round(f[0].clientHeight),i.contentLastPos=null,i.contentStartPos=n.fancybox.getTranslate(i.$content)||{top:0,left:0},i.sliderStartPos=n.fancybox.getTranslate(f),i.stagePos=n.fancybox.getTranslate(d.$refs.stage),i.sliderStartPos.top-=i.stagePos.top,i.sliderStartPos.left-=i.stagePos.left,i.contentStartPos.top-=i.stagePos.top,i.contentStartPos.left-=i.stagePos.left,n(e).off(".fb.touch").on(h?"touchend.fb.touch touchcancel.fb.touch":"mouseup.fb.touch mouseleave.fb.touch",n.proxy(i,"ontouchend")).on(h?"touchmove.fb.touch":"mousemove.fb.touch",n.proxy(i,"ontouchmove")),n.fancybox.isMobile&&e.addEventListener("scroll",i.onscroll,!0),((i.opts||i.canPan)&&(c.is(i.$stage)||i.$stage.find(c).length)||(c.is(".fancybox-image")&&o.preventDefault(),n.fancybox.isMobile&&c.parents(".fancybox-caption").length))&&(i.isScrollable=l(c)||l(c.parent()),n.fancybox.isMobile&&i.isScrollable||o.preventDefault(),(1===i.startPoints.length||u.hasError)&&(i.canPan?(n.fancybox.stop(i.$content),i.isPanning=!0):i.isSwiping=!0,i.$container.addClass("fancybox-is-grabbing")),2===i.startPoints.length&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(i.canTap=!1,i.isSwiping=!1,i.isPanning=!1,i.isZooming=!0,n.fancybox.stop(i.$content),i.centerPointStartX=.5*(i.startPoints[0].x+i.startPoints[1].x)-n(t).scrollLeft(),i.centerPointStartY=.5*(i.startPoints[0].y+i.startPoints[1].y)-n(t).scrollTop(),i.percentageOfImageAtPinchPointX=(i.centerPointStartX-i.contentStartPos.left)/i.contentStartPos.width,i.percentageOfImageAtPinchPointY=(i.centerPointStartY-i.contentStartPos.top)/i.contentStartPos.height,i.startDistanceBetweenFingers=s(i.startPoints[0],i.startPoints[1]))))}},d.prototype.onscroll=function(t){var n=this;n.isScrolling=!0,e.removeEventListener("scroll",n.onscroll,!0)},d.prototype.ontouchmove=function(t){var e=this;return void 0!==t.originalEvent.buttons&&0===t.originalEvent.buttons?void e.ontouchend(t):e.isScrolling?void(e.canTap=!1):(e.newPoints=a(t),void((e.opts||e.canPan)&&e.newPoints.length&&e.newPoints.length&&(e.isSwiping&&!0===e.isSwiping||t.preventDefault(),e.distanceX=s(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=s(e.newPoints[0],e.startPoints[0],"y"),e.distance=s(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe(t):e.isPanning?e.onPan():e.isZooming&&e.onZoom()))))},d.prototype.onSwipe=function(e){var a,s=this,r=s.instance,c=s.isSwiping,l=s.sliderStartPos.left||0;if(!0!==c)"x"==c&&(s.distanceX>0&&(s.instance.group.length<2||0===s.instance.current.index&&!s.instance.current.opts.loop)?l+=Math.pow(s.distanceX,.8):s.distanceX<0&&(s.instance.group.length<2||s.instance.current.index===s.instance.group.length-1&&!s.instance.current.opts.loop)?l-=Math.pow(-s.distanceX,.8):l+=s.distanceX),s.sliderLastPos={top:"x"==c?0:s.sliderStartPos.top+s.distanceY,left:l},s.requestId&&(i(s.requestId),s.requestId=null),s.requestId=o(function(){s.sliderLastPos&&(n.each(s.instance.slides,function(t,e){var o=e.pos-s.instance.currPos;n.fancybox.setTranslate(e.$slide,{top:s.sliderLastPos.top,left:s.sliderLastPos.left+o*s.canvasWidth+o*e.opts.gutter})}),s.$container.addClass("fancybox-is-sliding"))});else if(Math.abs(s.distance)>10){if(s.canTap=!1,r.group.length<2&&s.opts.vertical?s.isSwiping="y":r.isDragging||!1===s.opts.vertical||"auto"===s.opts.vertical&&n(t).width()>800?s.isSwiping="x":(a=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),s.isSwiping=a>45&&a<135?"y":"x"),"y"===s.isSwiping&&n.fancybox.isMobile&&s.isScrollable)return void(s.isScrolling=!0);r.isDragging=s.isSwiping,s.startPoints=s.newPoints,n.each(r.slides,function(t,e){var o,i;n.fancybox.stop(e.$slide),o=n.fancybox.getTranslate(e.$slide),i=n.fancybox.getTranslate(r.$refs.stage),e.$slide.css({transform:"",opacity:"","transition-duration":""}).removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")}),e.pos===r.current.pos&&(s.sliderStartPos.top=o.top-i.top,s.sliderStartPos.left=o.left-i.left),n.fancybox.setTranslate(e.$slide,{top:o.top-i.top,left:o.left-i.left})}),r.SlideShow&&r.SlideShow.isActive&&r.SlideShow.stop()}},d.prototype.onPan=function(){var t=this;if(s(t.newPoints[0],t.realPoints[0])<(n.fancybox.isMobile?10:5))return void(t.startPoints=t.newPoints);t.canTap=!1,t.contentLastPos=t.limitMovement(),t.requestId&&i(t.requestId),t.requestId=o(function(){n.fancybox.setTranslate(t.$content,t.contentLastPos)})},d.prototype.limitMovement=function(){var t,e,n,o,i,a,s=this,r=s.canvasWidth,c=s.canvasHeight,l=s.distanceX,d=s.distanceY,u=s.contentStartPos,f=u.left,p=u.top,h=u.width,g=u.height;return i=h>r?f+l:f,a=p+d,t=Math.max(0,.5*r-.5*h),e=Math.max(0,.5*c-.5*g),n=Math.min(r-h,.5*r-.5*h),o=Math.min(c-g,.5*c-.5*g),l>0&&i>t&&(i=t-1+Math.pow(-t+f+l,.8)||0),l<0&&i<n&&(i=n+1-Math.pow(n-f-l,.8)||0),d>0&&a>e&&(a=e-1+Math.pow(-e+p+d,.8)||0),d<0&&a<o&&(a=o+1-Math.pow(o-p-d,.8)||0),{top:a,left:i}},d.prototype.limitPosition=function(t,e,n,o){var i=this,a=i.canvasWidth,s=i.canvasHeight;return n>a?(t=t>0?0:t,t=t<a-n?a-n:t):t=Math.max(0,a/2-n/2),o>s?(e=e>0?0:e,e=e<s-o?s-o:e):e=Math.max(0,s/2-o/2),{top:e,left:t}},d.prototype.onZoom=function(){var e=this,a=e.contentStartPos,r=a.width,c=a.height,l=a.left,d=a.top,u=s(e.newPoints[0],e.newPoints[1]),f=u/e.startDistanceBetweenFingers,p=Math.floor(r*f),h=Math.floor(c*f),g=(r-p)*e.percentageOfImageAtPinchPointX,b=(c-h)*e.percentageOfImageAtPinchPointY,m=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),v=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),y=m-e.centerPointStartX,x=v-e.centerPointStartY,w=l+(g+y),$=d+(b+x),S={top:$,left:w,scaleX:f,scaleY:f};e.canTap=!1,e.newWidth=p,e.newHeight=h,e.contentLastPos=S,e.requestId&&i(e.requestId),e.requestId=o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},d.prototype.ontouchend=function(t){var o=this,s=o.isSwiping,r=o.isPanning,c=o.isZooming,l=o.isScrolling;if(o.endPoints=a(t),o.dMs=Math.max((new Date).getTime()-o.startTime,1),o.$container.removeClass("fancybox-is-grabbing"),n(e).off(".fb.touch"),e.removeEventListener("scroll",o.onscroll,!0),o.requestId&&(i(o.requestId),o.requestId=null),o.isSwiping=!1,o.isPanning=!1,o.isZooming=!1,o.isScrolling=!1,o.instance.isDragging=!1,o.canTap)return o.onTap(t);o.speed=100,o.velocityX=o.distanceX/o.dMs*.5,o.velocityY=o.distanceY/o.dMs*.5,r?o.endPanning():c?o.endZooming():o.endSwiping(s,l)},d.prototype.endSwiping=function(t,e){var o=this,i=!1,a=o.instance.group.length,s=Math.abs(o.distanceX),r="x"==t&&a>1&&(o.dMs>130&&s>10||s>50);o.sliderLastPos=null,"y"==t&&!e&&Math.abs(o.distanceY)>50?(n.fancybox.animate(o.instance.current.$slide,{top:o.sliderStartPos.top+o.distanceY+150*o.velocityY,opacity:0},200),i=o.instance.close(!0,250)):r&&o.distanceX>0?i=o.instance.previous(300):r&&o.distanceX<0&&(i=o.instance.next(300)),!1!==i||"x"!=t&&"y"!=t||o.instance.centerSlide(200),o.$container.removeClass("fancybox-is-sliding")},d.prototype.endPanning=function(){var t,e,o,i=this;i.contentLastPos&&(!1===i.opts.momentum||i.dMs>350?(t=i.contentLastPos.left,e=i.contentLastPos.top):(t=i.contentLastPos.left+500*i.velocityX,e=i.contentLastPos.top+500*i.velocityY),o=i.limitPosition(t,e,i.contentStartPos.width,i.contentStartPos.height),o.width=i.contentStartPos.width,o.height=i.contentStartPos.height,n.fancybox.animate(i.$content,o,366))},d.prototype.endZooming=function(){var t,e,o,i,a=this,s=a.instance.current,r=a.newWidth,c=a.newHeight;a.contentLastPos&&(t=a.contentLastPos.left,e=a.contentLastPos.top,i={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(a.$content,i),r<a.canvasWidth&&c<a.canvasHeight?a.instance.scaleToFit(150):r>s.width||c>s.height?a.instance.scaleToActual(a.centerPointStartX,a.centerPointStartY,150):(o=a.limitPosition(t,e,r,c),n.fancybox.animate(a.$content,o,150)))},d.prototype.onTap=function(e){var o,i=this,s=n(e.target),r=i.instance,c=r.current,l=e&&a(e)||i.startPoints,d=l[0]?l[0].x-n(t).scrollLeft()-i.stagePos.left:0,u=l[0]?l[0].y-n(t).scrollTop()-i.stagePos.top:0,f=function(t){var o=c.opts[t];if(n.isFunction(o)&&(o=o.apply(r,[c,e])),o)switch(o){case"close":r.close(i.startEvent);break;case"toggleControls":r.toggleControls();break;case"next":r.next();break;case"nextOrClose":r.group.length>1?r.next():r.close(i.startEvent);break;case"zoom":"image"==c.type&&(c.isLoaded||c.$ghost)&&(r.canPan()?r.scaleToFit():r.isScaledDown()?r.scaleToActual(d,u):r.group.length<2&&r.close(i.startEvent))}};if((!e.originalEvent||2!=e.originalEvent.button)&&(s.is("img")||!(d>s[0].clientWidth+s.offset().left))){if(s.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container"))o="Outside";else if(s.is(".fancybox-slide"))o="Slide";else{if(!r.current.$content||!r.current.$content.find(s).addBack().filter(s).length)return;o="Content"}if(i.tapped){if(clearTimeout(i.tapped),i.tapped=null,Math.abs(d-i.tapX)>50||Math.abs(u-i.tapY)>50)return this;f("dblclick"+o)}else i.tapX=d,i.tapY=u,c.opts["dblclick"+o]&&c.opts["dblclick"+o]!==c.opts["click"+o]?i.tapped=setTimeout(function(){i.tapped=null,r.isAnimating||f("click"+o)},500):f("click"+o);return this}},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new d(e))}).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{slideShow:'<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.5 5.4v13.2l11-6.6z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8.33 5.75h2.2v12.5h-2.2V5.75zm5.15 0h2.2v12.5h-2.2V5.75z"/></svg></button>'},slideShow:{autoStart:!1,speed:3e3,progress:!0}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,init:function(){var t=this,n=t.instance,o=n.group[n.currIndex].opts.slideShow;t.$button=n.$refs.toolbar.find("[data-fancybox-play]").on("click",function(){t.toggle()}),n.group.length<2||!o?t.$button.hide():o.progress&&(t.$progress=e('<div class="fancybox-progress"></div>').appendTo(n.$refs.inner))},set:function(t){var n=this,o=n.instance,i=o.current;i&&(!0===t||i.opts.loop||o.currIndex<o.group.length-1)?n.isActive&&"video"!==i.contentType&&(n.$progress&&e.fancybox.animate(n.$progress.show(),{scaleX:1},i.opts.slideShow.speed),n.timer=setTimeout(function(){o.current.opts.loop||o.current.index!=o.group.length-1?o.next():o.jumpTo(0)},i.opts.slideShow.speed)):(n.stop(),o.idleSecondsCounter=0,o.showControls())},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null,t.$progress&&t.$progress.removeAttr("style").hide()},start:function(){var t=this,e=t.instance.current;e&&(t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_STOP).removeClass("fancybox-button--play").addClass("fancybox-button--pause"),t.isActive=!0,e.isComplete&&t.set(!0),t.instance.trigger("onSlideShowChange",!0))},stop:function(){var t=this,e=t.instance.current;t.clear(),t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_START).removeClass("fancybox-button--pause").addClass("fancybox-button--play"),t.isActive=!1,t.instance.trigger("onSlideShowChange",!1),t.$progress&&t.$progress.removeAttr("style").hide()},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on({"onInit.fb":function(t,e){e&&!e.SlideShow&&(e.SlideShow=new n(e))},"beforeShow.fb":function(t,e,n,o){var i=e&&e.SlideShow;o?i&&n.opts.slideShow.autoStart&&i.start():i&&i.isActive&&i.clear()},"afterShow.fb":function(t,e,n){var o=e&&e.SlideShow;o&&o.isActive&&o.set()},"afterKeydown.fb":function(n,o,i,a,s){var r=o&&o.SlideShow;!r||!i.opts.slideShow||80!==s&&32!==s||e(t.activeElement).is("button,a,input")||(a.preventDefault(),r.toggle())},"beforeClose.fb onDeactivate.fb":function(t,e){var n=e&&e.SlideShow;n&&n.stop()}}),e(t).on("visibilitychange",function(){var n=e.fancybox.getInstance(),o=n&&n.SlideShow;o&&o.isActive&&(t.hidden?o.clear():o.set())})}(document,jQuery),function(t,e){"use strict";var n=function(){for(var e=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],n={},o=0;o<e.length;o++){var i=e[o];if(i&&i[1]in t){for(var a=0;a<i.length;a++)n[e[0][a]]=i[a];return n}}return!1}();if(n){var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(e){e=e||t.documentElement,this.isFullscreen()?this.exit():this.request(e)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e.extend(!0,e.fancybox.defaults,{btnTpl:{fullScreen:'<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fsenter" title="{{FULL_SCREEN}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z"/></svg></button>'},fullScreen:{autoStart:!1}}),e(t).on(n.fullscreenchange,function(){var t=o.isFullscreen(),n=e.fancybox.getInstance();n&&(n.current&&"image"===n.current.type&&n.isAnimating&&(n.isAnimating=!1,n.update(!0,!0,0),n.isComplete||n.complete()),n.trigger("onFullscreenChange",t),n.$refs.container.toggleClass("fancybox-is-fullscreen",t),n.$refs.toolbar.find("[data-fancybox-fullscreen]").toggleClass("fancybox-button--fsenter",!t).toggleClass("fancybox-button--fsexit",t))})}e(t).on({"onInit.fb":function(t,e){var i;if(!n)return void e.$refs.toolbar.find("[data-fancybox-fullscreen]").remove();e&&e.group[e.currIndex].opts.fullScreen?(i=e.$refs.container,i.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle()}),e.opts.fullScreen&&!0===e.opts.fullScreen.autoStart&&o.request(),e.FullScreen=o):e&&e.$refs.toolbar.find("[data-fancybox-fullscreen]").hide()},"afterKeydown.fb":function(t,e,n,o,i){e&&e.FullScreen&&70===i&&(o.preventDefault(),e.FullScreen.toggle())},"beforeClose.fb":function(t,e){e&&e.FullScreen&&e.$refs.container.hasClass("fancybox-is-fullscreen")&&o.exit()}})}(document,jQuery),function(t,e){"use strict";var n="fancybox-thumbs";e.fancybox.defaults=e.extend(!0,{btnTpl:{thumbs:'<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 14.59h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76H5.65V5.65z"/></svg></button>'},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"}},e.fancybox.defaults);var o=function(t){this.init(t)};e.extend(o.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,isActive:!1,init:function(t){var e=this,n=t.group,o=0;e.instance=t,e.opts=n[t.currIndex].opts.thumbs,t.Thumbs=e,e.$button=t.$refs.toolbar.find("[data-fancybox-thumbs]");for(var i=0,a=n.length;i<a&&(n[i].thumb&&o++,!(o>1));i++);o>1&&e.opts?(e.$button.removeAttr("style").on("click",function(){e.toggle()}),e.isActive=!0):e.$button.hide()},create:function(){var t,o=this,i=o.instance,a=o.opts.parentEl,s=[];o.$grid||(o.$grid=e('<div class="'+n+" "+n+"-"+o.opts.axis+'"></div>').appendTo(i.$refs.container.find(a).addBack().filter(a)),o.$grid.on("click","a",function(){i.jumpTo(e(this).attr("data-index"))})),o.$list||(o.$list=e('<div class="'+n+'__list">').appendTo(o.$grid)),e.each(i.group,function(e,n){t=n.thumb,t||"image"!==n.type||(t=n.src),s.push('<a href="javascript:;" tabindex="0" data-index="'+e+'"'+(t&&t.length?' style="background-image:url('+t+')"':'class="fancybox-thumbs-missing"')+"></a>")}),o.$list[0].innerHTML=s.join(""),"x"===o.opts.axis&&o.$list.width(parseInt(o.$grid.css("padding-right"),10)+i.group.length*o.$list.children().eq(0).outerWidth(!0))},focus:function(t){var e,n,o=this,i=o.$list,a=o.$grid;o.instance.current&&(e=i.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+o.instance.current.index+'"]').addClass("fancybox-thumbs-active"),n=e.position(),"y"===o.opts.axis&&(n.top<0||n.top>i.height()-e.outerHeight())?i.stop().animate({scrollTop:i.scrollTop()+n.top},t):"x"===o.opts.axis&&(n.left<a.scrollLeft()||n.left>a.scrollLeft()+(a.width()-e.outerWidth()))&&i.parent().stop().animate({scrollLeft:n.left},t))},update:function(){var t=this;t.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),t.isVisible?(t.$grid||t.create(),t.instance.trigger("onThumbsShow"),t.focus(0)):t.$grid&&t.instance.trigger("onThumbsHide"),t.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){var n;e&&!e.Thumbs&&(n=new o(e),n.isActive&&!0===n.opts.autoStart&&n.show())},"beforeShow.fb":function(t,e,n,o){var i=e&&e.Thumbs;i&&i.isVisible&&i.focus(o?0:250)},"afterKeydown.fb":function(t,e,n,o,i){var a=e&&e.Thumbs;a&&a.isActive&&71===i&&(o.preventDefault(),a.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&!1!==n.opts.hideOnClose&&n.$grid.hide()}})}(document,jQuery),function(t,e){"use strict";function n(t){var e={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;","`":"&#x60;","=":"&#x3D;"};return String(t).replace(/[&<>"'`=\/]/g,function(t){return e[t]})}e.extend(!0,e.fancybox.defaults,{btnTpl:{share:'<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.55 19c1.4-8.4 9.1-9.8 11.9-9.8V5l7 7-7 6.3v-3.5c-2.8 0-10.5 2.1-11.9 4.2z"/></svg></button>'},share:{url:function(t,e){return!t.currentHash&&"inline"!==e.type&&"html"!==e.type&&(e.origSrc||e.src)||window.location},
-tpl:'<div class="fancybox-share"><h1>{{SHARE}}</h1><p><a class="fancybox-share__button fancybox-share__button--fb" href="https://www.facebook.com/sharer/sharer.php?u={{url}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m287 456v-299c0-21 6-35 35-35h38v-63c-7-1-29-3-55-3-54 0-91 33-91 94v306m143-254h-205v72h196" /></svg><span>Facebook</span></a><a class="fancybox-share__button fancybox-share__button--tw" href="https://twitter.com/intent/tweet?url={{url}}&text={{descr}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m456 133c-14 7-31 11-47 13 17-10 30-27 37-46-15 10-34 16-52 20-61-62-157-7-141 75-68-3-129-35-169-85-22 37-11 86 26 109-13 0-26-4-37-9 0 39 28 72 65 80-12 3-25 4-37 2 10 33 41 57 77 57-42 30-77 38-122 34 170 111 378-32 359-208 16-11 30-25 41-42z" /></svg><span>Twitter</span></a><a class="fancybox-share__button fancybox-share__button--pt" href="https://www.pinterest.com/pin/create/button/?url={{url}}&description={{descr}}&media={{media}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m265 56c-109 0-164 78-164 144 0 39 15 74 47 87 5 2 10 0 12-5l4-19c2-6 1-8-3-13-9-11-15-25-15-45 0-58 43-110 113-110 62 0 96 38 96 88 0 67-30 122-73 122-24 0-42-19-36-44 6-29 20-60 20-81 0-19-10-35-31-35-25 0-44 26-44 60 0 21 7 36 7 36l-30 125c-8 37-1 83 0 87 0 3 4 4 5 2 2-3 32-39 42-75l16-64c8 16 31 29 56 29 74 0 124-67 124-157 0-69-58-132-146-132z" fill="#fff"/></svg><span>Pinterest</span></a></p><p><input class="fancybox-share__input" type="text" value="{{url_raw}}" onclick="select()" /></p></div>'}}),e(t).on("click","[data-fancybox-share]",function(){var t,o,i=e.fancybox.getInstance(),a=i.current||null;a&&("function"===e.type(a.opts.share.url)&&(t=a.opts.share.url.apply(a,[i,a])),o=a.opts.share.tpl.replace(/\{\{media\}\}/g,"image"===a.type?encodeURIComponent(a.src):"").replace(/\{\{url\}\}/g,encodeURIComponent(t)).replace(/\{\{url_raw\}\}/g,n(t)).replace(/\{\{descr\}\}/g,i.$caption?encodeURIComponent(i.$caption.text()):""),e.fancybox.open({src:i.translate(i,o),type:"html",opts:{touch:!1,animationEffect:!1,afterLoad:function(t,e){i.$refs.container.one("beforeClose.fb",function(){t.close(null,0)}),e.$content.find(".fancybox-share__button").click(function(){return window.open(this.href,"Share","width=550, height=450"),!1})},mobile:{autoFocus:!1}}}))})}(document,jQuery),function(t,e,n){"use strict";function o(){var e=t.location.hash.substr(1),n=e.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,i=n.join("-");return{hash:e,index:o<1?1:o,gallery:i}}function i(t){""!==t.gallery&&n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1).focus().trigger("click.fb-start")}function a(t){var e,n;return!!t&&(e=t.current?t.current.opts:t.opts,""!==(n=e.hash||(e.$orig?e.$orig.data("fancybox")||e.$orig.data("fancybox-trigger"):""))&&n)}n.escapeSelector||(n.escapeSelector=function(t){return(t+"").replace(/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t})}),n(function(){!1!==n.fancybox.defaults.hash&&(n(e).on({"onInit.fb":function(t,e){var n,i;!1!==e.group[e.currIndex].opts.hash&&(n=o(),(i=a(e))&&n.gallery&&i==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,i,s){var r;i&&!1!==i.opts.hash&&(r=a(o))&&(o.currentHash=r+(o.group.length>1?"-"+(i.index+1):""),t.location.hash!=="#"+o.currentHash&&(s&&!o.origHash&&(o.origHash=t.location.hash),o.hashTimer&&clearTimeout(o.hashTimer),o.hashTimer=setTimeout(function(){"replaceState"in t.history?(t.history[s?"pushState":"replaceState"]({},e.title,t.location.pathname+t.location.search+"#"+o.currentHash),s&&(o.hasCreatedHistory=!0)):t.location.hash=o.currentHash,o.hashTimer=null},300)))},"beforeClose.fb":function(n,o,i){i&&!1!==i.opts.hash&&(clearTimeout(o.hashTimer),o.currentHash&&o.hasCreatedHistory?t.history.back():o.currentHash&&("replaceState"in t.history?t.history.replaceState({},e.title,t.location.pathname+t.location.search+(o.origHash||"")):t.location.hash=o.origHash),o.currentHash=null)}}),n(t).on("hashchange.fb",function(){var t=o(),e=null;n.each(n(".fancybox-container").get().reverse(),function(t,o){var i=n(o).data("FancyBox");if(i&&i.currentHash)return e=i,!1}),e?e.currentHash===t.gallery+"-"+t.index||1===t.index&&e.currentHash==t.gallery||(e.currentHash=null,e.close()):""!==t.gallery&&i(t)}),setTimeout(function(){n.fancybox.getInstance()||i(o())},50))})}(window,document,jQuery),function(t,e){"use strict";var n=(new Date).getTime();e(t).on({"onInit.fb":function(t,e,o){e.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll",function(t){var o=e.current,i=(new Date).getTime();e.group.length<2||!1===o.opts.wheel||"auto"===o.opts.wheel&&"image"!==o.type||(t.preventDefault(),t.stopPropagation(),o.$slide.hasClass("fancybox-animated")||(t=t.originalEvent||t,i-n<250||(n=i,e[(-t.deltaY||-t.deltaX||t.wheelDelta||-t.detail)<0?"next":"previous"]())))})}})}(document,jQuery);
\ No newline at end of file
diff --git a/fancybox/createrelease b/fancybox/createrelease
deleted file mode 100755
index d31f3a63..00000000
--- a/fancybox/createrelease
+++ /dev/null
@@ -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
-
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
deleted file mode 100644
index 73bbdab9..00000000
--- a/fancybox/fancybox.php
+++ /dev/null
@@ -1,61 +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\App;
-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::app()->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;
-		}
-	);
-}

From 16e06f9b2b85dba28a109ec85aaccc75509f2209 Mon Sep 17 00:00:00 2001
From: loma-one <loma-one@noreply.git.friendi.ca>
Date: Sun, 17 Nov 2024 08:20:49 +0100
Subject: [PATCH 072/161] Small bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close the Uni-Code Smilies link with a ’;’
---
 unicode_smilies/unicode_smilies.php | 3099 +++++++++++++--------------
 1 file changed, 1548 insertions(+), 1551 deletions(-)

diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 22ee3439..8d55c4be 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -2,7 +2,7 @@
 /*
  * Name: Unicode Smilies
  * Description: Smilies based on the unicode emojis - On Linux use https://github.com/eosrei/emojione-color-font to see them in color and http://www.unicode.org/emoji/charts/full-emoji-list.html
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
@@ -25,7 +25,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':-D', '&#x1F601;');
 	Smilies::add($b, ':D', '&#x1F601;');
 	Smilies::add($b, ';-)', '&#x1F609;');
-	// Smilies::add($b, ';)', '&#x1F609;');  // Deactivated since this leads to disturbed html entities
+// Smilies::add($b, ';)', '&#x1F609;');  // Deactivated since this leads to disturbed html entities
 	Smilies::add($b, ':-P', '&#x1F61B;');
 	Smilies::add($b, ':-p', '&#x1F61B;');
 	Smilies::add($b, ':P', '&#x1F61B;');
@@ -54,353 +54,350 @@ function unicode_smilies_smilies(array &$b)
 //	Smilies::add($b, 'O_o', '&#x;');
 
 // face-smiling
-	Smilies::add($b, ':grinning face:', '&#x1F600');
-	Smilies::add($b, ':grinning face with big eyes:', '&#x1F603');
-	Smilies::add($b, ':grinning face with smiling eyes:', '&#x1F604');
-	Smilies::add($b, ':beaming face with smiling eyes:', '&#x1F601');
-	Smilies::add($b, ':grinning squinting face:', '&#x1F606');
-	Smilies::add($b, ':laughing:', '&#x1F606');
-	Smilies::add($b, ':grinning face with sweat:', '&#x1F605');
-	Smilies::add($b, ':rolling on the floor laughing:', '&#x1F923');
+	Smilies::add($b, ':grinning face:', '&#x1F600;');
+	Smilies::add($b, ':grinning face with big eyes:', '&#x1F603;');
+	Smilies::add($b, ':grinning face with smiling eyes:', '&#x1F604;');
+	Smilies::add($b, ':beaming face with smiling eyes:', '&#x1F601;');
+	Smilies::add($b, ':grinning squinting face:', '&#x1F606;');
+	Smilies::add($b, ':laughing:', '&#x1F606;');
+	Smilies::add($b, ':grinning face with sweat:', '&#x1F605;');
+	Smilies::add($b, ':rolling on the floor laughing:', '&#x1F923;');
 	Smilies::add($b, ':rofl:', '&#x1F923;');
-	Smilies::add($b, ':face with tears of joy:', '&#x1F602');
+	Smilies::add($b, ':face with tears of joy:', '&#x1F602;');
 	Smilies::add($b, ':tearsofjoy:', '&#x1F602;');
-	Smilies::add($b, ':slightly smiling face:', '&#x1F642');
-	Smilies::add($b, ':upside-down face:', '&#x1F643');
-	Smilies::add($b, ':winking face:', '&#x1F609');
-	Smilies::add($b, ':smiling face with smiling eyes:', '&#x1F60A');
-	Smilies::add($b, ':smiling face with halo:', '&#x1F607');
+	Smilies::add($b, ':slightly smiling face:', '&#x1F642;');
+	Smilies::add($b, ':upside-down face:', '&#x1F643;');
+	Smilies::add($b, ':winking face:', '&#x1F609;');
+	Smilies::add($b, ':smiling face with smiling eyes:', '&#x1F60A;');
+	Smilies::add($b, ':smiling face with halo:', '&#x1F607;');
 
 // face-affection
-	Smilies::add($b, ':smiling face with hearts:', '&#x1F970');
-	Smilies::add($b, ':smiling face with heart-eyes:', '&#x1F60D');
-	Smilies::add($b, ':star-struck:', '&#x1F929');
-	Smilies::add($b, ':face blowing a kiss:', '&#x1F618');
-	Smilies::add($b, ':kissing face:', '&#x1F617');
-	Smilies::add($b, ':smiling face:', '&#x263A');
-	Smilies::add($b, ':kissing face with closed eyes:', '&#x1F61A');
-	Smilies::add($b, ':kissing face with smiling eyes:', '&#x1F619');
+	Smilies::add($b, ':smiling face with hearts:', '&#x1F970;');
+	Smilies::add($b, ':smiling face with heart-eyes:', '&#x1F60D;');
+	Smilies::add($b, ':star-struck:', '&#x1F929;');
+	Smilies::add($b, ':face blowing a kiss:', '&#x1F618;');
+	Smilies::add($b, ':kissing face:', '&#x1F617;');
+	Smilies::add($b, ':smiling face:', '&#x263A;');
+	Smilies::add($b, ':kissing face with closed eyes:', '&#x1F61A;');
+	Smilies::add($b, ':kissing face with smiling eyes:', '&#x1F619;');
 
 // face-tongue
-	Smilies::add($b, ':face savoring food:', '&#x1F60B');
-	Smilies::add($b, ':face with tongue:', '&#x1F61B');
-	Smilies::add($b, ':winking face with tongue:', '&#x1F61C');
-	Smilies::add($b, ':zany face:', '&#x1F92A');
-	Smilies::add($b, ':squinting face with tongue:', '&#x1F61D');
-	Smilies::add($b, ':money-mouth face:', '&#x1F911');
+	Smilies::add($b, ':face savoring food:', '&#x1F60B;');
+	Smilies::add($b, ':face with tongue:', '&#x1F61B;');
+	Smilies::add($b, ':winking face with tongue:', '&#x1F61C;');
+	Smilies::add($b, ':zany face:', '&#x1F92A;');
+	Smilies::add($b, ':squinting face with tongue:', '&#x1F61D;');
+	Smilies::add($b, ':money-mouth face:', '&#x1F911;');
 
 // face-hand
-	Smilies::add($b, ':hugging face:', '&#x1F917');
-	Smilies::add($b, ':face with hand over mouth:', '&#x1F92D');
-	Smilies::add($b, ':shushing face:', '&#x1F92B');
-	Smilies::add($b, ':thinking face:', '&#x1F914');
+	Smilies::add($b, ':hugging face:', '&#x1F917;');
+	Smilies::add($b, ':face with hand over mouth:', '&#x1F92D;');
+	Smilies::add($b, ':shushing face:', '&#x1F92B;');
+	Smilies::add($b, ':thinking face:', '&#x1F914;');
 
 // face-neutral-skeptical
-	Smilies::add($b, ':zipper-mouth face:', '&#x1F910');
-	Smilies::add($b, ':face with raised eyebrow:', '&#x1F928');
-	Smilies::add($b, ':neutral face:', '&#x1F610');
-	Smilies::add($b, ':expressionless face:', '&#x1F611');
-	Smilies::add($b, ':face without mouth:', '&#x1F636');
-	Smilies::add($b, ':smirking face:', '&#x1F60F');
-	Smilies::add($b, ':unamused face:', '&#x1F612');
-	Smilies::add($b, ':face with rolling eyes:', '&#x1F644');
-	Smilies::add($b, ':grimacing face:', '&#x1F62C');
-	Smilies::add($b, ':lying face:', '&#x1F925');
+	Smilies::add($b, ':zipper-mouth face:', '&#x1F910;');
+	Smilies::add($b, ':face with raised eyebrow:', '&#x1F928;');
+	Smilies::add($b, ':neutral face:', '&#x1F610;');
+	Smilies::add($b, ':expressionless face:', '&#x1F611;');
+	Smilies::add($b, ':face without mouth:', '&#x1F636;');
+	Smilies::add($b, ':smirking face:', '&#x1F60F;');
+	Smilies::add($b, ':unamused face:', '&#x1F612;');
+	Smilies::add($b, ':face with rolling eyes:', '&#x1F644;');
+	Smilies::add($b, ':grimacing face:', '&#x1F62C;');
+	Smilies::add($b, ':lying face:', '&#x1F925;');
 
 // face-sleepy
-	Smilies::add($b, ':relieved face:', '&#x1F60C');
-	Smilies::add($b, ':pensive face:', '&#x1F614');
-	Smilies::add($b, ':sleepy face:', '&#x1F62A');
-	Smilies::add($b, ':drooling face:', '&#x1F924');
+	Smilies::add($b, ':relieved face:', '&#x1F60C;');
+	Smilies::add($b, ':pensive face:', '&#x1F614;');
+	Smilies::add($b, ':sleepy face:', '&#x1F62A;');
+	Smilies::add($b, ':drooling face:', '&#x1F924;');
 	Smilies::add($b, ':drool:', '&#x1F924;');
-	Smilies::add($b, ':sleeping face:', '&#x1F634');
+	Smilies::add($b, ':sleeping face:', '&#x1F634;');
 
 // face-unwell
-	Smilies::add($b, ':face with medical mask:', '&#x1F637');
-	Smilies::add($b, ':face with thermometer:', '&#x1F912');
-	Smilies::add($b, ':face with head-bandage:', '&#x1F915');
-	Smilies::add($b, ':nauseated face:', '&#x1F922');
-	Smilies::add($b, ':face vomiting:', '&#x1F92E');
+	Smilies::add($b, ':face with medical mask:', '&#x1F637;');
+	Smilies::add($b, ':face with thermometer:', '&#x1F912;');
+	Smilies::add($b, ':face with head-bandage:', '&#x1F915;');
+	Smilies::add($b, ':nauseated face:', '&#x1F922;');
+	Smilies::add($b, ':face vomiting:', '&#x1F92E;');
 	Smilies::add($b, ':vomit:', '&#x1F92E;');
-	Smilies::add($b, ':sneezing face:', '&#x1F927');
-	Smilies::add($b, ':hot face:', '&#x1F975');
-	Smilies::add($b, ':cold face:', '&#x1F976');
-	Smilies::add($b, ':woozy face:', '&#x1F974');
-	Smilies::add($b, ':dizzy face:', '&#x1F635');
+	Smilies::add($b, ':sneezing face:', '&#x1F927;');
+	Smilies::add($b, ':hot face:', '&#x1F975;');
+	Smilies::add($b, ':cold face:', '&#x1F976;');
+	Smilies::add($b, ':woozy face:', '&#x1F974;');
+	Smilies::add($b, ':dizzy face:', '&#x1F635;');
 	Smilies::add($b, ':dead:', '&#x1F635;');
-	Smilies::add($b, ':exploding head:', '&#x1F92F');
+	Smilies::add($b, ':exploding head:', '&#x1F92F;');
 
 // face-hat
-	Smilies::add($b, ':cowboy hat face:', '&#x1F920');
-	Smilies::add($b, ':partying face:', '&#x1F973');
+	Smilies::add($b, ':cowboy hat face:', '&#x1F920;');
+	Smilies::add($b, ':partying face:', '&#x1F973;');
 
 // face-glasses
-	Smilies::add($b, ':smiling face with sunglasses:', '&#x1F60E');
-	Smilies::add($b, ':nerd face:', '&#x1F913');
-	Smilies::add($b, ':face with monocle:', '&#x1F9D0');
+	Smilies::add($b, ':smiling face with sunglasses:', '&#x1F60E;');
+	Smilies::add($b, ':nerd face:', '&#x1F913;');
+	Smilies::add($b, ':face with monocle:', '&#x1F9D0;');
 
 // face-concerned
-	Smilies::add($b, ':confused face:', '&#x1F615');
-	Smilies::add($b, ':worried face:', '&#x1F61F');
-	Smilies::add($b, ':slightly frowning face:', '&#x1F641');
-	Smilies::add($b, ':frowning face:', '&#x2639');
-	Smilies::add($b, ':face with open mouth:', '&#x1F62E');
-	Smilies::add($b, ':hushed face:', '&#x1F62F');
-	Smilies::add($b, ':astonished face:', '&#x1F632');
-	Smilies::add($b, ':flushed face:', '&#x1F633');
+	Smilies::add($b, ':confused face:', '&#x1F615;');
+	Smilies::add($b, ':worried face:', '&#x1F61F;');
+	Smilies::add($b, ':slightly frowning face:', '&#x1F641;');
+	Smilies::add($b, ':frowning face:', '&#x2639;');
+	Smilies::add($b, ':face with open mouth:', '&#x1F62E;');
+	Smilies::add($b, ':hushed face:', '&#x1F62F;');
+	Smilies::add($b, ':astonished face:', '&#x1F632;');
+	Smilies::add($b, ':flushed face:', '&#x1F633;');
 	Smilies::add($b, ':dazed:', '&#x1F633;');
-	Smilies::add($b, ':pleading face:', '&#x1F97A');
-	Smilies::add($b, ':frowning face with open mouth:', '&#x1F626');
-	Smilies::add($b, ':anguished face:', '&#x1F627');
-	Smilies::add($b, ':fearful face:', '&#x1F628');
-	Smilies::add($b, ':anxious face with sweat:', '&#x1F630');
-	Smilies::add($b, ':sad but relieved face:', '&#x1F625');
-	Smilies::add($b, ':crying face:', '&#x1F622');
-	Smilies::add($b, ':loudly crying face:', '&#x1F62D');
-	Smilies::add($b, ':face screaming in fear:', '&#x1F631');
-	Smilies::add($b, ':confounded face:', '&#x1F616');
-	Smilies::add($b, ':persevering face:', '&#x1F623');
-	Smilies::add($b, ':disappointed face:', '&#x1F61E');
+	Smilies::add($b, ':pleading face:', '&#x1F97A;');
+	Smilies::add($b, ':frowning face with open mouth:', '&#x1F626;');
+	Smilies::add($b, ':anguished face:', '&#x1F627;');
+	Smilies::add($b, ':fearful face:', '&#x1F628;');
+	Smilies::add($b, ':anxious face with sweat:', '&#x1F630;');
+	Smilies::add($b, ':sad but relieved face:', '&#x1F625;');
+	Smilies::add($b, ':crying face:', '&#x1F622;');
+	Smilies::add($b, ':loudly crying face:', '&#x1F62D;');
+	Smilies::add($b, ':face screaming in fear:', '&#x1F631;');
+	Smilies::add($b, ':confounded face:', '&#x1F616;');
+	Smilies::add($b, ':persevering face:', '&#x1F623;');
+	Smilies::add($b, ':disappointed face:', '&#x1F61E;');
 
 // face-negative
-	Smilies::add($b, ':face with steam from nose:', '&#x1F624');
-	Smilies::add($b, ':pouting face:', '&#x1F621');
-	Smilies::add($b, ':angry face:', '&#x1F620');
-	Smilies::add($b, ':face with symbols on mouth:', '&#x1F92C');
-	Smilies::add($b, ':smiling face with horns:', '&#x1F608');
-	Smilies::add($b, ':angry face with horns:', '&#x1F47F');
-	Smilies::add($b, ':skull:', '&#x1F480');
-	Smilies::add($b, ':skull and crossbones:', '&#x2620');
+	Smilies::add($b, ':face with steam from nose:', '&#x1F624;');
+	Smilies::add($b, ':pouting face:', '&#x1F621;');
+	Smilies::add($b, ':angry face:', '&#x1F620;');
+	Smilies::add($b, ':face with symbols on mouth:', '&#x1F92C;');
+	Smilies::add($b, ':smiling face with horns:', '&#x1F608;');
+	Smilies::add($b, ':angry face with horns:', '&#x1F47F;');
+	Smilies::add($b, ':skull:', '&#x1F480;');
+	Smilies::add($b, ':skull and crossbones:', '&#x2620;');
 
 // face-costume
-	Smilies::add($b, ':pile of poo:', '&#x1F4A9');
-	Smilies::add($b, ':clown face:', '&#x1F921');
-	Smilies::add($b, ':ogre:', '&#x1F479');
-	Smilies::add($b, ':goblin:', '&#x1F47A');
-	Smilies::add($b, ':ghost:', '&#x1F47B');
-	Smilies::add($b, ':alien:', '&#x1F47D');
-	Smilies::add($b, ':alien monster:', '&#x1F47E');
-	Smilies::add($b, ':robot:', '&#x1F916');
+	Smilies::add($b, ':pile of poo:', '&#x1F4A9;');
+	Smilies::add($b, ':clown face:', '&#x1F921;');
+	Smilies::add($b, ':ogre:', '&#x1F479;');
+	Smilies::add($b, ':goblin:', '&#x1F47A;');
+	Smilies::add($b, ':ghost:', '&#x1F47B;');
+	Smilies::add($b, ':alien:', '&#x1F47D;');
+	Smilies::add($b, ':alien monster:', '&#x1F47E;');
+	Smilies::add($b, ':robot:', '&#x1F916;');
 
 // cat-face
-	Smilies::add($b, ':grinning cat:', '&#x1F63A');
-	Smilies::add($b, ':grinning cat with smiling eyes:', '&#x1F638');
-	Smilies::add($b, ':cat with tears of joy:', '&#x1F639');
-	Smilies::add($b, ':smiling cat with heart-eyes:', '&#x1F63B');
-	Smilies::add($b, ':cat with wry smile:', '&#x1F63C');
-	Smilies::add($b, ':kissing cat:', '&#x1F63D');
-	Smilies::add($b, ':weary cat:', '&#x1F640');
-	Smilies::add($b, ':crying cat:', '&#x1F63F');
-	Smilies::add($b, ':pouting cat:', '&#x1F63E');
+	Smilies::add($b, ':grinning cat:', '&#x1F63A;');
+	Smilies::add($b, ':grinning cat with smiling eyes:', '&#x1F638;');
+	Smilies::add($b, ':cat with tears of joy:', '&#x1F639;');
+	Smilies::add($b, ':smiling cat with heart-eyes:', '&#x1F63B;');
+	Smilies::add($b, ':cat with wry smile:', '&#x1F63C;');
+	Smilies::add($b, ':kissing cat:', '&#x1F63D;');
+	Smilies::add($b, ':weary cat:', '&#x1F640;');
+	Smilies::add($b, ':crying cat:', '&#x1F63F;');
+	Smilies::add($b, ':pouting cat:', '&#x1F63E;');
 
 // monkey-face
-	Smilies::add($b, ':see-no-evil monkey:', '&#x1F648');
-	Smilies::add($b, ':hear-no-evil monkey:', '&#x1F649');
-	Smilies::add($b, ':speak-no-evil monkey:', '&#x1F64A');
+	Smilies::add($b, ':see-no-evil monkey:', '&#x1F648;');
+	Smilies::add($b, ':hear-no-evil monkey:', '&#x1F649;');
+	Smilies::add($b, ':speak-no-evil monkey:', '&#x1F64A;');
 
 //emotion
-	Smilies::add($b, ':kiss mark:', '&#x1F48B');
-	Smilies::add($b, ':love letter:', '&#x1F48C');
-	Smilies::add($b, ':heart with arrow:', '&#x1F498');
-	Smilies::add($b, ':heart with ribbon:', '&#x1F49D');
-	Smilies::add($b, ':sparkling heart:', '&#x1F496');
-    Smilies::add($b, ':loveheart:', '&#x1F496;');
-	Smilies::add($b, ':growing heart:', '&#x1F497');
-	Smilies::add($b, ':beating heart:', '&#x1F493');
-	Smilies::add($b, ':revolving hearts:', '&#x1F49E');
-	Smilies::add($b, ':two hearts:', '&#x1F495');
-	Smilies::add($b, ':heart decoration:', '&#x1F49F');
-	Smilies::add($b, ':heart exclamation:', '&#x2763');
-	Smilies::add($b, ':broken heart:', '&#x1F494');
-	Smilies::add($b, ':red heart:', '&#x2764');
-	Smilies::add($b, ':orange heart:', '&#x1F9E1');
-	Smilies::add($b, ':yellow heart:', '&#x1F49B');
-	Smilies::add($b, ':green heart:', '&#x1F49A');
-	Smilies::add($b, ':blue heart:', '&#x1F499');
-	Smilies::add($b, ':purple heart:', '&#x1F49C');
-	Smilies::add($b, ':brown heart:', '&#x1F90E');
-	Smilies::add($b, ':black heart:', '&#x1F5A4');
-	Smilies::add($b, ':white heart:', '&#x1F90D');
-	Smilies::add($b, ':hundred points:', '&#x1F4AF');
-	Smilies::add($b, ':anger symbol:', '&#x1F4A2');
-	Smilies::add($b, ':collision:', '&#x1F4A5');
-	Smilies::add($b, ':dizzy:', '&#x1F4AB');
-	Smilies::add($b, ':sweat droplets:', '&#x1F4A6');
-	Smilies::add($b, ':dashing away:', '&#x1F4A8');
-	Smilies::add($b, ':hole:', '&#x1F573');
-	Smilies::add($b, ':bomb:', '&#x1F4A3');
-	Smilies::add($b, ':speech balloon:', '&#x1F4AC');
-	Smilies::add($b, ':left speech bubble:', '&#x1F5E8');
-	Smilies::add($b, ':right anger bubble:', '&#x1F5EF');
-	Smilies::add($b, ':thought balloon:', '&#x1F4AD');
-	Smilies::add($b, ':zzz:', '&#x1F4A4');
+	Smilies::add($b, ':kiss mark:', '&#x1F48B;');
+	Smilies::add($b, ':love letter:', '&#x1F48C;');
+	Smilies::add($b, ':heart with arrow:', '&#x1F498;');
+	Smilies::add($b, ':heart with ribbon:', '&#x1F49D;');
+	Smilies::add($b, ':sparkling heart:', '&#x1F496;');
+	Smilies::add($b, ':loveheart:', '&#x1F496;');
+	Smilies::add($b, ':growing heart:', '&#x1F497;');
+	Smilies::add($b, ':beating heart:', '&#x1F493;');
+	Smilies::add($b, ':revolving hearts:', '&#x1F49E;');
+	Smilies::add($b, ':two hearts:', '&#x1F495;');
+	Smilies::add($b, ':heart decoration:', '&#x1F49F;');
+	Smilies::add($b, ':heart exclamation:', '&#x2763;');
+	Smilies::add($b, ':broken heart:', '&#x1F494;');
+	Smilies::add($b, ':red heart:', '&#x2764;');
+	Smilies::add($b, ':orange heart:', '&#x1F9E1;');
+	Smilies::add($b, ':yellow heart:', '&#x1F49B;');
+	Smilies::add($b, ':green heart:', '&#x1F49A;');
+	Smilies::add($b, ':blue heart:', '&#x1F499;');
+	Smilies::add($b, ':purple heart:', '&#x1F49C;');
+	Smilies::add($b, ':brown heart:', '&#x1F90E;');
+	Smilies::add($b, ':black heart:', '&#x1F5A4;');
+	Smilies::add($b, ':white heart:', '&#x1F90D;');
+	Smilies::add($b, ':hundred points:', '&#x1F4AF;');
+	Smilies::add($b, ':anger symbol:', '&#x1F4A2;');
+	Smilies::add($b, ':collision:', '&#x1F4A5;');
+	Smilies::add($b, ':dizzy:', '&#x1F4AB;');
+	Smilies::add($b, ':sweat droplets:', '&#x1F4A6;');
+	Smilies::add($b, ':dashing away:', '&#x1F4A8;');
+	Smilies::add($b, ':hole:', '&#x1F573;');
+	Smilies::add($b, ':bomb:', '&#x1F4A3;');
+	Smilies::add($b, ':speech balloon:', '&#x1F4AC;');
+	Smilies::add($b, ':left speech bubble:', '&#x1F5E8;');
+	Smilies::add($b, ':right anger bubble:', '&#x1F5EF;');
+	Smilies::add($b, ':thought balloon:', '&#x1F4AD;');
+	Smilies::add($b, ':zzz:', '&#x1F4A4;');
 
 // People & Body
 // hand-fingers-open
-	Smilies::add($b, ':waving hand:', '&#x1F44B');
-	Smilies::add($b, ':raised back of hand:', '&#x1F91A');
-	Smilies::add($b, ':hand with fingers splayed:', '&#x1F590');
-	Smilies::add($b, ':raised hand:', '&#x270B');
-	Smilies::add($b, ':vulcan salute:', '&#x1F596');
+	Smilies::add($b, ':waving hand:', '&#x1F44B;');
+	Smilies::add($b, ':raised back of hand:', '&#x1F91A;');
+	Smilies::add($b, ':hand with fingers splayed:', '&#x1F590;');
+	Smilies::add($b, ':raised hand:', '&#x270B;');
+	Smilies::add($b, ':vulcan salute:', '&#x1F596;');
 
 // hand-fingers-partial
-	Smilies::add($b, ':OK hand:', '&#x1F44C');
-//	Smilies::add($b, ':pinching hand:', '&#x1F90F');
-	Smilies::add($b, ':victory hand:', '&#x270C');
-	Smilies::add($b, ':crossed fingers:', '&#x1F91E');
-	Smilies::add($b, ':love-you gesture:', '&#x1F91F');
-	Smilies::add($b, ':sign of the horns:', '&#x1F918');
-	Smilies::add($b, ':call me hand:', '&#x1F919');
+	Smilies::add($b, ':OK hand:', '&#x1F44C;');
+	Smilies::add($b, ':victory hand:', '&#x270C;');
+	Smilies::add($b, ':crossed fingers:', '&#x1F91E;');
+	Smilies::add($b, ':love-you gesture:', '&#x1F91F;');
+	Smilies::add($b, ':sign of the horns:', '&#x1F918;');
+	Smilies::add($b, ':call me hand:', '&#x1F919;');
 
 // hand-single-finger
-	Smilies::add($b, ':backhand index pointing left:', '&#x1F448');
-	Smilies::add($b, ':backhand index pointing right:', '&#x1F449');
-	Smilies::add($b, ':backhand index pointing up:', '&#x1F446');
-	Smilies::add($b, ':middle finger:', '&#x1F595');
-	Smilies::add($b, ':backhand index pointing down:', '&#x1F447');
-	Smilies::add($b, ':index pointing up:', '&#x261D');
+	Smilies::add($b, ':backhand index pointing left:', '&#x1F448;');
+	Smilies::add($b, ':backhand index pointing right:', '&#x1F449;');
+	Smilies::add($b, ':backhand index pointing up:', '&#x1F446;');
+	Smilies::add($b, ':middle finger:', '&#x1F595;');
+	Smilies::add($b, ':backhand index pointing down:', '&#x1F447;');
+	Smilies::add($b, ':index pointing up:', '&#x261D;');
 
 // hand-fingers-closed
-	Smilies::add($b, ':thumbs up:', '&#x1F44D');
+	Smilies::add($b, ':thumbs up:', '&#x1F44D;');
 	Smilies::add($b, ':like:', '&#x1F44D;');
 	Smilies::add($b, '\\o/', '&#x1F44D;');
-	Smilies::add($b, ':thumbs down:', '&#x1F44E');
+	Smilies::add($b, ':thumbs down:', '&#x1F44E;');
 	Smilies::add($b, ':dislike:', '&#x1F44E;');
-	Smilies::add($b, ':raised fist:', '&#x270A');
-	Smilies::add($b, ':oncoming fist:', '&#x1F44A');
-	Smilies::add($b, ':left-facing fist:', '&#x1F91B');
-	Smilies::add($b, ':right-facing fist:', '&#x1F91C');
+	Smilies::add($b, ':raised fist:', '&#x270A;');
+	Smilies::add($b, ':oncoming fist:', '&#x1F44A;');
+	Smilies::add($b, ':left-facing fist:', '&#x1F91B;');
+	Smilies::add($b, ':right-facing fist:', '&#x1F91C;');
 
 // hands
-	Smilies::add($b, ':clapping hands:', '&#x1F44F');
-	Smilies::add($b, ':raising hands:', '&#x1F64C');
-	Smilies::add($b, ':open hands:', '&#x1F450');
-	Smilies::add($b, ':palms up together:', '&#x1F932');
-	Smilies::add($b, ':handshake:', '&#x1F91D');
-	Smilies::add($b, ':folded hands:', '&#x1F64F');
+	Smilies::add($b, ':clapping hands:', '&#x1F44F;');
+	Smilies::add($b, ':raising hands:', '&#x1F64C;');
+	Smilies::add($b, ':open hands:', '&#x1F450;');
+	Smilies::add($b, ':palms up together:', '&#x1F932;');
+	Smilies::add($b, ':handshake:', '&#x1F91D;');
+	Smilies::add($b, ':folded hands:', '&#x1F64F;');
 
 // hand-prop
-	Smilies::add($b, ':writing hand:', '&#x270D');
-	Smilies::add($b, ':nail polish:', '&#x1F485');
-	Smilies::add($b, ':selfie:', '&#x1F933');
+	Smilies::add($b, ':writing hand:', '&#x270D;');
+	Smilies::add($b, ':nail polish:', '&#x1F485;');
+	Smilies::add($b, ':selfie:', '&#x1F933;');
 
 // body-parts
-	Smilies::add($b, ':flexed biceps:', '&#x1F4AA');
-	Smilies::add($b, ':mechanical arm:', '&#x1F9BE');
-	Smilies::add($b, ':mechanical leg:', '&#x1F9BF');
-	Smilies::add($b, ':leg:', '&#x1F9B5');
-	Smilies::add($b, ':foot:', '&#x1F9B6');
-	Smilies::add($b, ':ear:', '&#x1F442');
-//	Smilies::add($b, ':ear with hearing aid:', '&#x1F9BB');
-	Smilies::add($b, ':nose:', '&#x1F443');
-	Smilies::add($b, ':brain:', '&#x1F9E0');
-	Smilies::add($b, ':tooth:', '&#x1F9B7');
-	Smilies::add($b, ':bone:', '&#x1F9B4');
-	Smilies::add($b, ':eyes:', '&#x1F440');
-	Smilies::add($b, ':eye:', '&#x1F441');
-	Smilies::add($b, ':tongue:', '&#x1F445');
-	Smilies::add($b, ':mouth:', '&#x1F444');
+	Smilies::add($b, ':flexed biceps:', '&#x1F4AA;');
+	Smilies::add($b, ':mechanical arm:', '&#x1F9BE;');
+	Smilies::add($b, ':mechanical leg:', '&#x1F9BF;');
+	Smilies::add($b, ':leg:', '&#x1F9B5;');
+	Smilies::add($b, ':foot:', '&#x1F9B6;');
+	Smilies::add($b, ':ear:', '&#x1F442;');
+	Smilies::add($b, ':brain:', '&#x1F9E0;');
+	Smilies::add($b, ':tooth:', '&#x1F9B7;');
+	Smilies::add($b, ':bone:', '&#x1F9B4;');
+	Smilies::add($b, ':eyes:', '&#x1F440;');
+	Smilies::add($b, ':eye:', '&#x1F441;');
+	Smilies::add($b, ':tongue:', '&#x1F445;');
+	Smilies::add($b, ':mouth:', '&#x1F444;');
 
 // person
-	Smilies::add($b, ':baby:', '&#x1F476');
-	Smilies::add($b, ':child:', '&#x1F9D2');
-	Smilies::add($b, ':boy:', '&#x1F466');
-	Smilies::add($b, ':girl:', '&#x1F467');
-	Smilies::add($b, ':person:', '&#x1F9D1');
-	Smilies::add($b, ':person: blond hair:', '&#x1F471');
-	Smilies::add($b, ':man:', '&#x1F468');
-	Smilies::add($b, ':man: beard:', '&#x1F9D4');
+	Smilies::add($b, ':baby:', '&#x1F476;');
+	Smilies::add($b, ':child:', '&#x1F9D2;');
+	Smilies::add($b, ':boy:', '&#x1F466;');
+	Smilies::add($b, ':girl:', '&#x1F467;');
+	Smilies::add($b, ':person:', '&#x1F9D1;');
+	Smilies::add($b, ':person: blond hair:', '&#x1F471;');
+	Smilies::add($b, ':man:', '&#x1F468;');
+	Smilies::add($b, ':man: beard:', '&#x1F9D4;');
 	Smilies::add($b, ':beard:', '&#x1F9D4;');
-	Smilies::add($b, ':man: red hair:', '&#x1F468&#x200D&#x1F9B0');
-	Smilies::add($b, ':man: curly hair:', '&#x1F468&#x200D&#x1F9B1');
-	Smilies::add($b, ':man: white hair:', '&#x1F468&#x200D&#x1F9B3');
-	Smilies::add($b, ':man: bald:', '&#x1F468&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman:', '&#x1F469');
-	Smilies::add($b, ':woman: red hair:', '&#x1F469&#x200D&#x1F9B0');
-	Smilies::add($b, ':person: red hair:', '&#x1F9D1&#x200D&#x1F9B0');
-	Smilies::add($b, ':woman: curly hair:', '&#x1F469&#x200D&#x1F9B1');
-	Smilies::add($b, ':person: curly hair:', '&#x1F9D1&#x200D&#x1F9B1');
-	Smilies::add($b, ':woman: white hair:', '&#x1F469&#x200D&#x1F9B3');
-	Smilies::add($b, ':person: white hair:', '&#x1F9D1&#x200D&#x1F9B3');
-	Smilies::add($b, ':woman: bald:', '&#x1F469&#x200D&#x1F9B2');
-	Smilies::add($b, ':bald::', '&#x1F9D1&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman: blond hair:', '&#x1F471&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':man: blond hair:', '&#x1F471&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':older person:', '&#x1F9D3');
-	Smilies::add($b, ':old man:', '&#x1F474');
-	Smilies::add($b, ':old woman:', '&#x1F475');
+	Smilies::add($b, ':man: red hair:', '&#x1F468;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':man: curly hair:', '&#x1F468;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':man: white hair:', '&#x1F468;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':man: bald:', '&#x1F468;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':woman:', '&#x1F469;');
+	Smilies::add($b, ':woman: red hair:', '&#x1F469;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':person: red hair:', '&#x1F9D1;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':woman: curly hair:', '&#x1F469;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':person: curly hair:', '&#x1F9D1;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':woman: white hair:', '&#x1F469;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':person: white hair:', '&#x1F9D1;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':woman: bald:', '&#x1F469;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':bald::', '&#x1F9D1;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':woman: blond hair:', '&#x1F471;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':man: blond hair:', '&#x1F471;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':older person:', '&#x1F9D3;');
+	Smilies::add($b, ':old man:', '&#x1F474;');
+	Smilies::add($b, ':old woman:', '&#x1F475;');
 	Smilies::add($b, ':pregnant:', '&#x1F930;');
 
 // person-gesture
-	Smilies::add($b, ':person frowning:', '&#x1F64D');
-	Smilies::add($b, ':man frowning:', '&#x1F64D&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman frowning:', '&#x1F64D&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person pouting:', '&#x1F64E');
-	Smilies::add($b, ':man pouting:', '&#x1F64E&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman pouting:', '&#x1F64E&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing NO:', '&#x1F645');
-	Smilies::add($b, ':man gesturing NO:', '&#x1F645&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing NO:', '&#x1F645&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing OK:', '&#x1F646');
-	Smilies::add($b, ':man gesturing OK:', '&#x1F646&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing OK:', '&#x1F646&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person tipping hand:', '&#x1F481');
-	Smilies::add($b, ':man tipping hand:', '&#x1F481&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman tipping hand:', '&#x1F481&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person raising hand:', '&#x1F64B');
-	Smilies::add($b, ':man raising hand:', '&#x1F64B&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman raising hand', '&#x1F64B&#x200D&#x2640&#xFE0F');
-//	Smilies::add($b, ':deaf person:', '&#x1F9CF');
-//	Smilies::add($b, ':deaf man:', '&#x1F9CF&#x200D&#x2642&#xFE0F');
-//	Smilies::add($b, ':deaf woman:', '&#x1F9CF&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person bowing:', '&#x1F647');
+	Smilies::add($b, ':person frowning:', '&#x1F64D;');
+	Smilies::add($b, ':man frowning:', '&#x1F64D;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman frowning:', '&#x1F64D;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person pouting:', '&#x1F64E;');
+	Smilies::add($b, ':man pouting:', '&#x1F64E;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman pouting:', '&#x1F64E;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person gesturing NO:', '&#x1F645;');
+	Smilies::add($b, ':man gesturing NO:', '&#x1F645;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman gesturing NO:', '&#x1F645;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person gesturing OK:', '&#x1F646;');
+	Smilies::add($b, ':man gesturing OK:', '&#x1F646;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman gesturing OK:', '&#x1F646;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person tipping hand:', '&#x1F481;');
+	Smilies::add($b, ':man tipping hand:', '&#x1F481;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman tipping hand:', '&#x1F481;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person raising hand:', '&#x1F64B;');
+	Smilies::add($b, ':man raising hand:', '&#x1F64B;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman raising hand', '&#x1F64B;&#x200D;&#x2640;&#xFE0F;');
+//	Smilies::add($b, ':deaf person:', '&#x1F9CF;');
+//	Smilies::add($b, ':deaf man:', '&#x1F9CF;&#x200D;&#x2642;&#xFE0F;');
+//	Smilies::add($b, ':deaf woman:', '&#x1F9CF;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person bowing:', '&#x1F647;');
 	Smilies::add($b, ':bow:', '&#x1F647;');
-	Smilies::add($b, ':man bowing:', '&#x1F647&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman bowing:', '&#x1F647&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person facepalming:', '&#x1F926');
+	Smilies::add($b, ':man bowing:', '&#x1F647;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman bowing:', '&#x1F647;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person facepalming:', '&#x1F926;');
 	Smilies::add($b, ':facepalm:', '&#x1F926;');
-	Smilies::add($b, ':man facepalming:', '&#x1F926&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman facepalming:', '&#x1F926&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person shrugging:', '&#x1F937');
+	Smilies::add($b, ':man facepalming:', '&#x1F926;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman facepalming:', '&#x1F926;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person shrugging:', '&#x1F937;');
 	Smilies::add($b, ':shrug:', '&#x1F937;');
-	Smilies::add($b, ':man shrugging:', '&#x1F937&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman shrugging:', '&#x1F937&#x200D&#x2640&#xFE0F');
+	Smilies::add($b, ':man shrugging:', '&#x1F937;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman shrugging:', '&#x1F937;&#x200D;&#x2640;&#xFE0F;');
 
 // person-role
 
 // person-fantasy
-	Smilies::add($b, ':baby angel:', '&#x1F47C');
+	Smilies::add($b, ':baby angel:', '&#x1F47C;');
 	Smilies::add($b, ':angel:', '&#x1F47C;');
 	Smilies::add($b, ':cherub:', '&#x1F47C;');
-	Smilies::add($b, ':Santa Claus:', '&#x1F385');
-	Smilies::add($b, ':Mrs. Claus:', '&#x1F936');
-	Smilies::add($b, ':superhero:', '&#x1F9B8');
-	Smilies::add($b, ':man superhero:', '&#x1F9B8&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman superhero:', '&#x1F9B8&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':supervillain:', '&#x1F9B9');
-	Smilies::add($b, ':man supervillain:', '&#x1F9B9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman supervillain:', '&#x1F9B9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':mage:', '&#x1F9D9');
-	Smilies::add($b, ':man mage:', '&#x1F9D9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman mage:', '&#x1F9D9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':fairy:', '&#x1F9DA');
-	Smilies::add($b, ':man fairy:', '&#x1F9DA&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman fairy:', '&#x1F9DA&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':vampire:', '&#x1F9DB');
-	Smilies::add($b, ':man vampire:', '&#x1F9DB&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman vampire:', '&#x1F9DB&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':merperson:', '&#x1F9DC');
-	Smilies::add($b, ':merman:', '&#x1F9DC&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':mermaid:', '&#x1F9DC&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':elf:', '&#x1F9DD');
-	Smilies::add($b, ':man elf:', '&#x1F9DD&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman elf:', '&#x1F9DD&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':genie:', '&#x1F9DE');
-	Smilies::add($b, ':man genie:', '&#x1F9DE&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman genie:', '&#x1F9DE&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':zombie:', '&#x1F9DF');
-	Smilies::add($b, ':man zombie:', '&#x1F9DF&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman zombie:', '&#x1F9DF&#x200D&#x2640&#xFE0F');
+	Smilies::add($b, ':Santa Claus:', '&#x1F385;');
+	Smilies::add($b, ':Mrs. Claus:', '&#x1F936;');
+	Smilies::add($b, ':superhero:', '&#x1F9B8;');
+	Smilies::add($b, ':man superhero:', '&#x1F9B8;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman superhero:', '&#x1F9B8;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':supervillain:', '&#x1F9B9;');
+	Smilies::add($b, ':man supervillain:', '&#x1F9B9;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman supervillain:', '&#x1F9B9;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':mage:', '&#x1F9D9;');
+	Smilies::add($b, ':man mage:', '&#x1F9D9;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman mage:', '&#x1F9D9;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':fairy:', '&#x1F9DA;');
+	Smilies::add($b, ':man fairy:', '&#x1F9DA;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman fairy:', '&#x1F9DA;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':vampire:', '&#x1F9DB;');
+	Smilies::add($b, ':man vampire:', '&#x1F9DB;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman vampire:', '&#x1F9DB;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':merperson:', '&#x1F9DC;');
+	Smilies::add($b, ':merman:', '&#x1F9DC;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':mermaid:', '&#x1F9DC;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':elf:', '&#x1F9DD;');
+	Smilies::add($b, ':man elf:', '&#x1F9DD;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman elf:', '&#x1F9DD;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':genie:', '&#x1F9DE;');
+	Smilies::add($b, ':man genie:', '&#x1F9DE;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman genie:', '&#x1F9DE;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':zombie:', '&#x1F9DF;');
+	Smilies::add($b, ':man zombie:', '&#x1F9DF;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman zombie:', '&#x1F9DF;&#x200D;&#x2640;&#xFE0F;');
 
 // person-activity
 
@@ -411,83 +408,83 @@ function unicode_smilies_smilies(array &$b)
 // person-resting
 
 // family
-	Smilies::add($b, ':people holding hands:', '&#x1F9D1&#x200D&#x1F91D&#x200D&#x1F9D1');
-	Smilies::add($b, ':women holding hands:', '&#x1F46D');
-	Smilies::add($b, ':woman and man holding hands:', '&#x1F46B');
-	Smilies::add($b, ':men holding hands:', '&#x1F46C');
-	Smilies::add($b, ':kiss:', '&#x1F48F');
-	Smilies::add($b, ':couple with heart:', '&#x1F491');
-	Smilies::add($b, ':family:', '&#x1F46A');
+	Smilies::add($b, ':people holding hands:', '&#x1F9D1;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;');
+	Smilies::add($b, ':women holding hands:', '&#x1F46D;');
+	Smilies::add($b, ':woman and man holding hands:', '&#x1F46B;');
+	Smilies::add($b, ':men holding hands:', '&#x1F46C;');
+	Smilies::add($b, ':kiss:', '&#x1F48F;');
+	Smilies::add($b, ':couple with heart:', '&#x1F491;');
+	Smilies::add($b, ':family:', '&#x1F46A;');
 
 // person-symbol
-	Smilies::add($b, ':speaking head:', '&#x1F5E3');
-	Smilies::add($b, ':bust in silhouette:', '&#x1F464');
-	Smilies::add($b, ':busts in silhouette:', '&#x1F465');
-	Smilies::add($b, ':footprints:', '&#x1F463');
+	Smilies::add($b, ':speaking head:', '&#x1F5E3;');
+	Smilies::add($b, ':bust in silhouette:', '&#x1F464;');
+	Smilies::add($b, ':busts in silhouette:', '&#x1F465;');
+	Smilies::add($b, ':footprints:', '&#x1F463;');
 
 // Component
 // hair-style
 
 // Animals & Nature
 // animal-mammal
-	Smilies::add($b, ':monkey face:', '&#x1F435');
-	Smilies::add($b, ':monkey:', '&#x1F412');
-	Smilies::add($b, ':gorilla:', '&#x1F98D');
-	Smilies::add($b, ':orangutan:', '&#x1F9A7');
-	Smilies::add($b, ':dog face:', '&#x1F436');
-	Smilies::add($b, ':dog:', '&#x1F415');
-	Smilies::add($b, ':guide dog:', '&#x1F9AE');
-	Smilies::add($b, ':poodle:', '&#x1F429');
-	Smilies::add($b, ':wolf:', '&#x1F43A');
-	Smilies::add($b, ':fox:', '&#x1F98A');
-	Smilies::add($b, ':raccoon:', '&#x1F99D');
-	Smilies::add($b, ':cat face:', '&#x1F431');
-	Smilies::add($b, ':cat:', '&#x1F408');
-	Smilies::add($b, ':lion:', '&#x1F981');
-	Smilies::add($b, ':tiger face:', '&#x1F42F');
-	Smilies::add($b, ':tiger:', '&#x1F405');
-	Smilies::add($b, ':leopard:', '&#x1F406');
-	Smilies::add($b, ':horse face:', '&#x1F434');
-	Smilies::add($b, ':horse:', '&#x1F40E');
-	Smilies::add($b, ':unicorn:', '&#x1F984');
-	Smilies::add($b, ':zebra:', '&#x1F993');
-	Smilies::add($b, ':deer:', '&#x1F98C');
-	Smilies::add($b, ':cow face:', '&#x1F42E');
-	Smilies::add($b, ':ox:', '&#x1F402');
-	Smilies::add($b, ':water buffalo:', '&#x1F403');
-	Smilies::add($b, ':cow:', '&#x1F404');
-	Smilies::add($b, ':pig face:', '&#x1F437');
-	Smilies::add($b, ':pig:', '&#x1F416');
+	Smilies::add($b, ':monkey face:', '&#x1F435;');
+	Smilies::add($b, ':monkey:', '&#x1F412;');
+	Smilies::add($b, ':gorilla:', '&#x1F98D;');
+	Smilies::add($b, ':orangutan:', '&#x1F9A7;');
+	Smilies::add($b, ':dog face:', '&#x1F436;');
+	Smilies::add($b, ':dog:', '&#x1F415;');
+	Smilies::add($b, ':guide dog:', '&#x1F9AE;');
+	Smilies::add($b, ':poodle:', '&#x1F429;');
+	Smilies::add($b, ':wolf:', '&#x1F43A;');
+	Smilies::add($b, ':fox:', '&#x1F98A;');
+	Smilies::add($b, ':raccoon:', '&#x1F99D;');
+	Smilies::add($b, ':cat face:', '&#x1F431;');
+	Smilies::add($b, ':cat:', '&#x1F408;');
+	Smilies::add($b, ':lion:', '&#x1F981;');
+	Smilies::add($b, ':tiger face:', '&#x1F42F;');
+	Smilies::add($b, ':tiger:', '&#x1F405;');
+	Smilies::add($b, ':leopard:', '&#x1F406;');
+	Smilies::add($b, ':horse face:', '&#x1F434;');
+	Smilies::add($b, ':horse:', '&#x1F40E;');
+	Smilies::add($b, ':unicorn:', '&#x1F984;');
+	Smilies::add($b, ':zebra:', '&#x1F993;');
+	Smilies::add($b, ':deer:', '&#x1F98C;');
+	Smilies::add($b, ':cow face:', '&#x1F42E;');
+	Smilies::add($b, ':ox:', '&#x1F402;');
+	Smilies::add($b, ':water buffalo:', '&#x1F403;');
+	Smilies::add($b, ':cow:', '&#x1F404;');
+	Smilies::add($b, ':pig face:', '&#x1F437;');
+	Smilies::add($b, ':pig:', '&#x1F416;');
 	Smilies::add($b, ':boar:', '&#x1F417');
-	Smilies::add($b, ':pig nose:', '&#x1F43D');
-	Smilies::add($b, ':ram:', '&#x1F40F');
-	Smilies::add($b, ':sheep:', '&#x1F411');
-	Smilies::add($b, ':goat:', '&#x1F410');
+	Smilies::add($b, ':pig nose:', '&#x1F43D;');
+	Smilies::add($b, ':ram:', '&#x1F40F;');
+	Smilies::add($b, ':sheep:', '&#x1F411;');
+	Smilies::add($b, ':goat:', '&#x1F410;');
 	Smilies::add($b, ':camel:', '&#x1F42A');
-	Smilies::add($b, ':two-hump camel:', '&#x1F42B');
-	Smilies::add($b, ':llama:', '&#x1F999');
-	Smilies::add($b, ':giraffe:', '&#x1F992');
-	Smilies::add($b, ':elephant:', '&#x1F418');
-	Smilies::add($b, ':rhinoceros:', '&#x1F98F');
-	Smilies::add($b, ':hippopotamus:', '&#x1F99B');
-	Smilies::add($b, ':mouse face:', '&#x1F42D');
-	Smilies::add($b, ':mouse:', '&#x1F401');
-	Smilies::add($b, ':rat:', '&#x1F400');
-	Smilies::add($b, ':hamster:', '&#x1F439');
-	Smilies::add($b, ':rabbit face:', '&#x1F430');
-	Smilies::add($b, ':rabbit:', '&#x1F407');
-	Smilies::add($b, ':chipmunk:', '&#x1F43F');
-	Smilies::add($b, ':hedgehog:', '&#x1F994');
-	Smilies::add($b, ':bat:', '&#x1F987');
-	Smilies::add($b, ':bear:', '&#x1F43B');
-	Smilies::add($b, ':koala:', '&#x1F428');
-	Smilies::add($b, ':panda:', '&#x1F43C');
-	Smilies::add($b, ':sloth:', '&#x1F9A5');
-	Smilies::add($b, ':otter:', '&#x1F9A6');
-	Smilies::add($b, ':skunk:', '&#x1F9A8');
-	Smilies::add($b, ':kangaroo:', '&#x1F998');
-	Smilies::add($b, ':badger:', '&#x1F9A1');
-	Smilies::add($b, ':paw prints:', '&#x1F43E');
+	Smilies::add($b, ':two-hump camel:', '&#x1F42B;');
+	Smilies::add($b, ':llama:', '&#x1F999;');
+	Smilies::add($b, ':giraffe:', '&#x1F992;');
+	Smilies::add($b, ':elephant:', '&#x1F418;');
+	Smilies::add($b, ':rhinoceros:', '&#x1F98F;');
+	Smilies::add($b, ':hippopotamus:', '&#x1F99B;');
+	Smilies::add($b, ':mouse face:', '&#x1F42D;');
+	Smilies::add($b, ':mouse:', '&#x1F401;');
+	Smilies::add($b, ':rat:', '&#x1F400;');
+	Smilies::add($b, ':hamster:', '&#x1F439;');
+	Smilies::add($b, ':rabbit face:', '&#x1F430;');
+	Smilies::add($b, ':rabbit:', '&#x1F407;');
+	Smilies::add($b, ':chipmunk:', '&#x1F43F;');
+	Smilies::add($b, ':hedgehog:', '&#x1F994;');
+	Smilies::add($b, ':bat:', '&#x1F987;');
+	Smilies::add($b, ':bear:', '&#x1F43B;');
+	Smilies::add($b, ':koala:', '&#x1F428;');
+	Smilies::add($b, ':panda:', '&#x1F43C;');
+	Smilies::add($b, ':sloth:', '&#x1F9A5;');
+	Smilies::add($b, ':otter:', '&#x1F9A6;');
+	Smilies::add($b, ':skunk:', '&#x1F9A8;');
+	Smilies::add($b, ':kangaroo:', '&#x1F998;');
+	Smilies::add($b, ':badger:', '&#x1F9A1;');
+	Smilies::add($b, ':paw prints:', '&#x1F43E;');
 //	Smilies::add($b, ':bunnyflowers:', '&#x;');
 	Smilies::add($b, ':chick:', '&#x1F424;');
 	Smilies::add($b, ':ladybird:', '&#x1F41E;');
@@ -495,959 +492,958 @@ function unicode_smilies_smilies(array &$b)
 //	Smilies::add($b, ':dragonfly:', '&#x;');
 
 // animal-bird
-	Smilies::add($b, ':turkey:', '&#x1F983');
-	Smilies::add($b, ':chicken:', '&#x1F414');
-	Smilies::add($b, ':rooster:', '&#x1F413');
-	Smilies::add($b, ':hatching chick:', '&#x1F423');
-	Smilies::add($b, ':baby chick:', '&#x1F424');
-	Smilies::add($b, ':front-facing baby chick:', '&#x1F425');
-	Smilies::add($b, ':bird:', '&#x1F426');
-	Smilies::add($b, ':tux:', '&#x1F427');
-	Smilies::add($b, ':dove:', '&#x1F54A');
-	Smilies::add($b, ':eagle:', '&#x1F985');
-	Smilies::add($b, ':duck:', '&#x1F986');
-	Smilies::add($b, ':swan:', '&#x1F9A2');
-	Smilies::add($b, ':owl:', '&#x1F989');
-	Smilies::add($b, ':flamingo:', '&#x1F9A9');
-	Smilies::add($b, ':peacock:', '&#x1F99A');
-	Smilies::add($b, ':parrot:', '&#x1F99C');
+	Smilies::add($b, ':turkey:', '&#x1F983;');
+	Smilies::add($b, ':chicken:', '&#x1F414;');
+	Smilies::add($b, ':rooster:', '&#x1F413;');
+	Smilies::add($b, ':hatching chick:', '&#x1F423;');
+	Smilies::add($b, ':baby chick:', '&#x1F424;');
+	Smilies::add($b, ':front-facing baby chick:', '&#x1F425;');
+	Smilies::add($b, ':bird:', '&#x1F426;');
+	Smilies::add($b, ':tux:', '&#x1F427;');
+	Smilies::add($b, ':dove:', '&#x1F54A;');
+	Smilies::add($b, ':eagle:', '&#x1F985;');
+	Smilies::add($b, ':duck:', '&#x1F986;');
+	Smilies::add($b, ':swan:', '&#x1F9A2;');
+	Smilies::add($b, ':owl:', '&#x1F989;');
+	Smilies::add($b, ':flamingo:', '&#x1F9A9;');
+	Smilies::add($b, ':peacock:', '&#x1F99A;');
+	Smilies::add($b, ':parrot:', '&#x1F99C;');
 
 // animal-amphibian
-	Smilies::add($b, ':frog:', '&#x1F438');
+	Smilies::add($b, ':frog:', '&#x1F438;');
 
 // animal-reptile
-	Smilies::add($b, ':crocodile:', '&#x1F40A');
-	Smilies::add($b, ':turtle:', '&#x1F422');
-	Smilies::add($b, ':lizard:', '&#x1F98E');
-	Smilies::add($b, ':snake:', '&#x1F40D');
-	Smilies::add($b, ':dragon face:', '&#x1F432');
-	Smilies::add($b, ':dragon:', '&#x1F409');
+	Smilies::add($b, ':crocodile:', '&#x1F40A;');
+	Smilies::add($b, ':turtle:', '&#x1F422;');
+	Smilies::add($b, ':lizard:', '&#x1F98E;');
+	Smilies::add($b, ':snake:', '&#x1F40D;');
+	Smilies::add($b, ':dragon face:', '&#x1F432;');
+	Smilies::add($b, ':dragon:', '&#x1F409;');
 	Smilies::add($b, ':draco:', '&#x1F409;');
-	Smilies::add($b, ':sauropod:', '&#x1F995');
-	Smilies::add($b, ':T-Rex:', '&#x1F996');
+	Smilies::add($b, ':sauropod:', '&#x1F995;');
+	Smilies::add($b, ':T-Rex:', '&#x1F996;');
 
 // animal-marine
-	Smilies::add($b, ':spouting whale:', '&#x1F433');
-	Smilies::add($b, ':whale:', '&#x1F40B');
-	Smilies::add($b, ':dolphin:', '&#x1F42C');
-	Smilies::add($b, ':fish:', '&#x1F41F');
-	Smilies::add($b, ':tropical fish:', '&#x1F420');
-	Smilies::add($b, ':blowfish:', '&#x1F421');
-	Smilies::add($b, ':shark:', '&#x1F988');
-	Smilies::add($b, ':octopus:', '&#x1F419');
-	Smilies::add($b, ':spiral shell:', '&#x1F41A');
+	Smilies::add($b, ':spouting whale:', '&#x1F433;');
+	Smilies::add($b, ':whale:', '&#x1F40B;');
+	Smilies::add($b, ':dolphin:', '&#x1F42C;');
+	Smilies::add($b, ':fish:', '&#x1F41F;');
+	Smilies::add($b, ':tropical fish:', '&#x1F420;');
+	Smilies::add($b, ':blowfish:', '&#x1F421;');
+	Smilies::add($b, ':shark:', '&#x1F988;');
+	Smilies::add($b, ':octopus:', '&#x1F419;');
+	Smilies::add($b, ':spiral shell:', '&#x1F41A;');
 
 // animal-bug
-	Smilies::add($b, ':snail:', '&#x1F40C');
-	Smilies::add($b, ':butterfly:', '&#x1F98B');
-	Smilies::add($b, ':bug:', '&#x1F41B');
-	Smilies::add($b, ':ant:', '&#x1F41C');
-	Smilies::add($b, ':honeybee:', '&#x1F41D');
-	Smilies::add($b, ':lady beetle:', '&#x1F41E');
-	Smilies::add($b, ':cricket:', '&#x1F997');
-	Smilies::add($b, ':spider:', '&#x1F577');
-	Smilies::add($b, ':spider web:', '&#x1F578');
-	Smilies::add($b, ':scorpion:', '&#x1F982');
-	Smilies::add($b, ':mosquito:', '&#x1F99F');
-	Smilies::add($b, ':microbe:', '&#x1F9A0');
+	Smilies::add($b, ':snail:', '&#x1F40C;');
+	Smilies::add($b, ':butterfly:', '&#x1F98B;');
+	Smilies::add($b, ':bug:', '&#x1F41B;');
+	Smilies::add($b, ':ant:', '&#x1F41C;');
+	Smilies::add($b, ':honeybee:', '&#x1F41D;');
+	Smilies::add($b, ':lady beetle:', '&#x1F41E;');
+	Smilies::add($b, ':cricket:', '&#x1F997;');
+	Smilies::add($b, ':spider:', '&#x1F577;');
+	Smilies::add($b, ':spider web:', '&#x1F578;');
+	Smilies::add($b, ':scorpion:', '&#x1F982;');
+	Smilies::add($b, ':mosquito:', '&#x1F99F;');
+	Smilies::add($b, ':microbe:', '&#x1F9A0;');
 
 // plant-flower
-	Smilies::add($b, ':bouquet:', '&#x1F490');
-	Smilies::add($b, ':cherry blossom:', '&#x1F338');
-	Smilies::add($b, ':white flower:', '&#x1F4AE');
-	Smilies::add($b, ':rosette:', '&#x1F3F5');
-	Smilies::add($b, ':rose:', '&#x1F339');
-	Smilies::add($b, ':wilted flower:', '&#x1F940');
-	Smilies::add($b, ':hibiscus:', '&#x1F33A');
-	Smilies::add($b, ':sunflower:', '&#x1F33B');
-	Smilies::add($b, ':blossom:', '&#x1F33C');
-	Smilies::add($b, ':tulip:', '&#x1F337');
+	Smilies::add($b, ':bouquet:', '&#x1F490;');
+	Smilies::add($b, ':cherry blossom:', '&#x1F338;');
+	Smilies::add($b, ':white flower:', '&#x1F4AE;');
+	Smilies::add($b, ':rosette:', '&#x1F3F5;');
+	Smilies::add($b, ':rose:', '&#x1F339;');
+	Smilies::add($b, ':wilted flower:', '&#x1F940;');
+	Smilies::add($b, ':hibiscus:', '&#x1F33A;');
+	Smilies::add($b, ':sunflower:', '&#x1F33B;');
+	Smilies::add($b, ':blossom:', '&#x1F33C;');
+	Smilies::add($b, ':tulip:', '&#x1F337;');
 
 // plant-other
-	Smilies::add($b, ':seedling:', '&#x1F331');
-	Smilies::add($b, ':evergreen tree:', '&#x1F332');
-	Smilies::add($b, ':deciduous tree:', '&#x1F333');
-	Smilies::add($b, ':palm tree:', '&#x1F334');
-	Smilies::add($b, ':cactus:', '&#x1F335');
-	Smilies::add($b, ':sheaf of rice:', '&#x1F33E');
-	Smilies::add($b, ':herb:', '&#x1F33F');
-	Smilies::add($b, ':shamrock:', '&#x2618');
-	Smilies::add($b, ':four leaf clover:', '&#x1F340');
-	Smilies::add($b, ':maple leaf:', '&#x1F341');
-	Smilies::add($b, ':fallen leaf:', '&#x1F342');
-	Smilies::add($b, ':leaf fluttering in wind:', '&#x1F343');
+	Smilies::add($b, ':seedling:', '&#x1F331;');
+	Smilies::add($b, ':evergreen tree:', '&#x1F332;');
+	Smilies::add($b, ':deciduous tree:', '&#x1F333;');
+	Smilies::add($b, ':palm tree:', '&#x1F334;');
+	Smilies::add($b, ':cactus:', '&#x1F335;');
+	Smilies::add($b, ':sheaf of rice:', '&#x1F33E;');
+	Smilies::add($b, ':herb:', '&#x1F33F;');
+	Smilies::add($b, ':shamrock:', '&#x2618;');
+	Smilies::add($b, ':four leaf clover:', '&#x1F340;');
+	Smilies::add($b, ':maple leaf:', '&#x1F341;');
+	Smilies::add($b, ':fallen leaf:', '&#x1F342;');
+	Smilies::add($b, ':leaf fluttering in wind:', '&#x1F343;');
 
 // Food & Drink
 // food-fruit
-	Smilies::add($b, ':grapes:', '&#x1F347');
-	Smilies::add($b, ':melon:', '&#x1F348');
-	Smilies::add($b, ':watermelon:', '&#x1F349');
-	Smilies::add($b, ':tangerine:', '&#x1F34A');
-	Smilies::add($b, ':lemon:', '&#x1F34B');
-	Smilies::add($b, ':banana:', '&#x1F34C');
-	Smilies::add($b, ':pineapple:', '&#x1F34D');
-	Smilies::add($b, ':mango:', '&#x1F96D');
-	Smilies::add($b, ':red apple:', '&#x1F34E');
+	Smilies::add($b, ':grapes:', '&#x1F347;');
+	Smilies::add($b, ':melon:', '&#x1F348;');
+	Smilies::add($b, ':watermelon:', '&#x1F349;');
+	Smilies::add($b, ':tangerine:', '&#x1F34A;');
+	Smilies::add($b, ':lemon:', '&#x1F34B;');
+	Smilies::add($b, ':banana:', '&#x1F34C;');
+	Smilies::add($b, ':pineapple:', '&#x1F34D;');
+	Smilies::add($b, ':mango:', '&#x1F96D;');
+	Smilies::add($b, ':red apple:', '&#x1F34E;');
 	Smilies::add($b, ':apple:', '&#x1F34E;');
-	Smilies::add($b, ':green apple:', '&#x1F34F');
-	Smilies::add($b, ':pear:', '&#x1F350');
-	Smilies::add($b, ':peach:', '&#x1F351');
-	Smilies::add($b, ':cherries:', '&#x1F352');
-	Smilies::add($b, ':strawberry:', '&#x1F353');
-	Smilies::add($b, ':kiwi fruit:', '&#x1F95D');
-	Smilies::add($b, ':tomato:', '&#x1F345');
-	Smilies::add($b, ':coconut:', '&#x1F965');
+	Smilies::add($b, ':green apple:', '&#x1F34F;');
+	Smilies::add($b, ':pear:', '&#x1F350;');
+	Smilies::add($b, ':peach:', '&#x1F351;');
+	Smilies::add($b, ':cherries:', '&#x1F352;');
+	Smilies::add($b, ':strawberry:', '&#x1F353;');
+	Smilies::add($b, ':kiwi fruit:', '&#x1F95D;');
+	Smilies::add($b, ':tomato:', '&#x1F345;');
+	Smilies::add($b, ':coconut:', '&#x1F965;');
 
 // food-vegetable
-	Smilies::add($b, ':avocado:', '&#x1F951');
-	Smilies::add($b, ':eggplant:', '&#x1F346');
-	Smilies::add($b, ':potato:', '&#x1F954');
-	Smilies::add($b, ':carrot:', '&#x1F955');
-	Smilies::add($b, ':ear of corn:', '&#x1F33D');
-	Smilies::add($b, ':hot pepper:', '&#x1F336');
-	Smilies::add($b, ':cucumber:', '&#x1F952');
-	Smilies::add($b, ':leafy green:', '&#x1F96C');
-	Smilies::add($b, ':broccoli:', '&#x1F966');
-	Smilies::add($b, ':garlic:', '&#x1F9C4');
-	Smilies::add($b, ':onion:', '&#x1F9C5');
-	Smilies::add($b, ':mushroom:', '&#x1F344');
-	Smilies::add($b, ':peanuts:', '&#x1F95C');
-	Smilies::add($b, ':chestnut:', '&#x1F330');
+	Smilies::add($b, ':avocado:', '&#x1F951;');
+	Smilies::add($b, ':eggplant:', '&#x1F346;');
+	Smilies::add($b, ':potato:', '&#x1F954;');
+	Smilies::add($b, ':carrot:', '&#x1F955;');
+	Smilies::add($b, ':ear of corn:', '&#x1F33D;');
+	Smilies::add($b, ':hot pepper:', '&#x1F336;');
+	Smilies::add($b, ':cucumber:', '&#x1F952;');
+	Smilies::add($b, ':leafy green:', '&#x1F96C;');
+	Smilies::add($b, ':broccoli:', '&#x1F966;');
+	Smilies::add($b, ':garlic:', '&#x1F9C4;');
+	Smilies::add($b, ':onion:', '&#x1F9C5;');
+	Smilies::add($b, ':mushroom:', '&#x1F344;');
+	Smilies::add($b, ':peanuts:', '&#x1F95C;');
+	Smilies::add($b, ':chestnut:', '&#x1F330;');
 
 // food-prepared
-	Smilies::add($b, ':bread:', '&#x1F35E');
-	Smilies::add($b, ':croissant:', '&#x1F950');
-	Smilies::add($b, ':baguette bread:', '&#x1F956');
-	Smilies::add($b, ':pretzel:', '&#x1F968');
-	Smilies::add($b, ':bagel:', '&#x1F96F');
-	Smilies::add($b, ':pancakes:', '&#x1F95E');
-	Smilies::add($b, ':waffle:', '&#x1F9C7');
-	Smilies::add($b, ':cheese wedge:', '&#x1F9C0');
-	Smilies::add($b, ':meat on bone:', '&#x1F356');
-	Smilies::add($b, ':poultry leg:', '&#x1F357');
-	Smilies::add($b, ':cut of meat:', '&#x1F969');
-	Smilies::add($b, ':bacon:', '&#x1F953');
-	Smilies::add($b, ':hamburger:', '&#x1F354');
-	Smilies::add($b, ':french fries:', '&#x1F35F');
-	Smilies::add($b, ':pizza:', '&#x1F355');
-	Smilies::add($b, ':hot dog:', '&#x1F32D');
-	Smilies::add($b, ':sandwich:', '&#x1F96A');
-	Smilies::add($b, ':taco:', '&#x1F32E');
-	Smilies::add($b, ':burrito:', '&#x1F32F');
-	Smilies::add($b, ':stuffed flatbread:', '&#x1F959');
-	Smilies::add($b, ':falafel:', '&#x1F9C6');
-	Smilies::add($b, ':egg:', '&#x1F95A');
-	Smilies::add($b, ':cooking:', '&#x1F373');
+	Smilies::add($b, ':bread:', '&#x1F35E;');
+	Smilies::add($b, ':croissant:', '&#x1F950;');
+	Smilies::add($b, ':baguette bread:', '&#x1F956;');
+	Smilies::add($b, ':pretzel:', '&#x1F968;');
+	Smilies::add($b, ':bagel:', '&#x1F96F;');
+	Smilies::add($b, ':pancakes:', '&#x1F95E;');
+	Smilies::add($b, ':waffle:', '&#x1F9C7;');
+	Smilies::add($b, ':cheese wedge:', '&#x1F9C0;');
+	Smilies::add($b, ':meat on bone:', '&#x1F356;');
+	Smilies::add($b, ':poultry leg:', '&#x1F357;');
+	Smilies::add($b, ':cut of meat:', '&#x1F969;');
+	Smilies::add($b, ':bacon:', '&#x1F953;');
+	Smilies::add($b, ':hamburger:', '&#x1F354;');
+	Smilies::add($b, ':french fries:', '&#x1F35F;');
+	Smilies::add($b, ':pizza:', '&#x1F355;');
+	Smilies::add($b, ':hot dog:', '&#x1F32D;');
+	Smilies::add($b, ':sandwich:', '&#x1F96A;');
+	Smilies::add($b, ':taco:', '&#x1F32E;');
+	Smilies::add($b, ':burrito:', '&#x1F32F;');
+	Smilies::add($b, ':stuffed flatbread:', '&#x1F959;');
+	Smilies::add($b, ':falafel:', '&#x1F9C6;');
+	Smilies::add($b, ':egg:', '&#x1F95A;');
+	Smilies::add($b, ':cooking:', '&#x1F373;');
 	Smilies::add($b, ':fryegg:', '&#x1F373;');
-	Smilies::add($b, ':shallow pan of food:', '&#x1F958');
-	Smilies::add($b, ':pot of food:', '&#x1F372');
-	Smilies::add($b, ':bowl with spoon:', '&#x1F963');
-	Smilies::add($b, ':green salad:', '&#x1F957');
-	Smilies::add($b, ':popcorn:', '&#x1F37F');
-	Smilies::add($b, ':butter:', '&#x1F9C8');
-	Smilies::add($b, ':salt:', '&#x1F9C2');
-	Smilies::add($b, ':canned food:', '&#x1F96B');
+	Smilies::add($b, ':shallow pan of food:', '&#x1F958;');
+	Smilies::add($b, ':pot of food:', '&#x1F372;');
+	Smilies::add($b, ':bowl with spoon:', '&#x1F963;');
+	Smilies::add($b, ':green salad:', '&#x1F957;');
+	Smilies::add($b, ':popcorn:', '&#x1F37F;');
+	Smilies::add($b, ':butter:', '&#x1F9C8;');
+	Smilies::add($b, ':salt:', '&#x1F9C2;');
+	Smilies::add($b, ':canned food:', '&#x1F96B;');
 
 // food-asian
-	Smilies::add($b, ':bento box:', '&#x1F371');
-	Smilies::add($b, ':rice cracker:', '&#x1F358');
-	Smilies::add($b, ':rice ball:', '&#x1F359');
-	Smilies::add($b, ':cooked rice:', '&#x1F35A');
-	Smilies::add($b, ':curry rice:', '&#x1F35B');
-	Smilies::add($b, ':steaming bowl:', '&#x1F35C');
-	Smilies::add($b, ':spaghetti:', '&#x1F35D');
-	Smilies::add($b, ':roasted sweet potato:', '&#x1F360');
-	Smilies::add($b, ':oden:', '&#x1F362');
-	Smilies::add($b, ':sushi:', '&#x1F363');
-	Smilies::add($b, ':fried shrimp:', '&#x1F364');
-	Smilies::add($b, ':fish cake with swirl:', '&#x1F365');
-	Smilies::add($b, ':moon cake:', '&#x1F96E');
-	Smilies::add($b, ':dango:', '&#x1F361');
-	Smilies::add($b, ':dumpling:', '&#x1F95F');
-	Smilies::add($b, ':fortune cookie:', '&#x1F960');
-	Smilies::add($b, ':takeout box:', '&#x1F961');
+	Smilies::add($b, ':bento box:', '&#x1F371;');
+	Smilies::add($b, ':rice cracker:', '&#x1F358;');
+	Smilies::add($b, ':rice ball:', '&#x1F359;');
+	Smilies::add($b, ':cooked rice:', '&#x1F35A;');
+	Smilies::add($b, ':curry rice:', '&#x1F35B;');
+	Smilies::add($b, ':steaming bowl:', '&#x1F35C;');
+	Smilies::add($b, ':spaghetti:', '&#x1F35D;');
+	Smilies::add($b, ':roasted sweet potato:', '&#x1F360;');
+	Smilies::add($b, ':oden:', '&#x1F362;');
+	Smilies::add($b, ':sushi:', '&#x1F363;');
+	Smilies::add($b, ':fried shrimp:', '&#x1F364;');
+	Smilies::add($b, ':fish cake with swirl:', '&#x1F365;');
+	Smilies::add($b, ':moon cake:', '&#x1F96E;');
+	Smilies::add($b, ':dango:', '&#x1F361;');
+	Smilies::add($b, ':dumpling:', '&#x1F95F;');
+	Smilies::add($b, ':fortune cookie:', '&#x1F960;');
+	Smilies::add($b, ':takeout box:', '&#x1F961;');
 
 // food-marine
-	Smilies::add($b, ':crab:', '&#x1F980');
-	Smilies::add($b, ':lobster:', '&#x1F99E');
-	Smilies::add($b, ':shrimp:', '&#x1F990');
-	Smilies::add($b, ':squid:', '&#x1F991');
-// 	Smilies::add($b, ':oyster:', '&#x1F9AA');
+	Smilies::add($b, ':crab:', '&#x1F980;');
+	Smilies::add($b, ':lobster:', '&#x1F99E;');
+	Smilies::add($b, ':shrimp:', '&#x1F990;');
+	Smilies::add($b, ':squid:', '&#x1F991;');
+// Smilies::add($b, ':oyster:', '&#x1F9AA;');
 
 // food-sweet
-	Smilies::add($b, ':soft ice cream:', '&#x1F366');
-	Smilies::add($b, ':shaved ice:', '&#x1F367');
-	Smilies::add($b, ':ice cream:', '&#x1F368');
-	Smilies::add($b, ':doughnut:', '&#x1F369');
-	Smilies::add($b, ':cookie:', '&#x1F36A');
-	Smilies::add($b, ':birthday cake:', '&#x1F382');
-	Smilies::add($b, ':shortcake:', '&#x1F370');
+	Smilies::add($b, ':soft ice cream:', '&#x1F366;');
+	Smilies::add($b, ':shaved ice:', '&#x1F367;');
+	Smilies::add($b, ':ice cream:', '&#x1F368;');
+	Smilies::add($b, ':doughnut:', '&#x1F369;');
+	Smilies::add($b, ':cookie:', '&#x1F36A;');
+	Smilies::add($b, ':birthday cake:', '&#x1F382;');
+	Smilies::add($b, ':shortcake:', '&#x1F370;');
 	Smilies::add($b, ':cake:', '&#x1F370;');
-	Smilies::add($b, ':cupcake:', '&#x1F9C1');
-	Smilies::add($b, ':pie:', '&#x1F967');
-	Smilies::add($b, ':chocolate bar:', '&#x1F36B');
-	Smilies::add($b, ':candy:', '&#x1F36C');
-	Smilies::add($b, ':lollipop:', '&#x1F36D');
-	Smilies::add($b, ':custard:', '&#x1F36E');
-	Smilies::add($b, ':honey pot:', '&#x1F36F');
+	Smilies::add($b, ':cupcake:', '&#x1F9C1;');
+	Smilies::add($b, ':pie:', '&#x1F967;');
+	Smilies::add($b, ':chocolate bar:', '&#x1F36B;');
+	Smilies::add($b, ':candy:', '&#x1F36C;');
+	Smilies::add($b, ':lollipop:', '&#x1F36D;');
+	Smilies::add($b, ':custard:', '&#x1F36E;');
+	Smilies::add($b, ':honey pot:', '&#x1F36F;');
 
-// drink  
-	Smilies::add($b, ':baby bottle:', '&#x1F37C');
-	Smilies::add($b, ':glass of milk:', '&#x1F95B');
-	Smilies::add($b, ':hot beverage:', '&#x2615');
+// drink
+	Smilies::add($b, ':baby bottle:', '&#x1F37C;');
+	Smilies::add($b, ':glass of milk:', '&#x1F95B;');
+	Smilies::add($b, ':hot beverage:', '&#x2615;');
 	Smilies::add($b, ':coffee:', '&#x2615;');
 	Smilies::add($b, ':tea:', '&#x2615;');
 	Smilies::add($b, ':tee:', '&#x2615;');
-	Smilies::add($b, ':teacup without handle:', '&#x1F375');
-	Smilies::add($b, ':sake:', '&#x1F376');
-	Smilies::add($b, ':bottle with popping cork:', '&#x1F37E');
-	Smilies::add($b, ':wine glass:', '&#x1F377');
-	Smilies::add($b, ':cocktail glass:', '&#x1F378');
-	Smilies::add($b, ':tropical drink:', '&#x1F379');
-	Smilies::add($b, ':beer mug:', '&#x1F37A');
+	Smilies::add($b, ':teacup without handle:', '&#x1F375;');
+	Smilies::add($b, ':sake:', '&#x1F376;');
+	Smilies::add($b, ':bottle with popping cork:', '&#x1F37E;');
+	Smilies::add($b, ':wine glass:', '&#x1F377;');
+	Smilies::add($b, ':cocktail glass:', '&#x1F378;');
+	Smilies::add($b, ':tropical drink:', '&#x1F379;');
+	Smilies::add($b, ':beer mug:', '&#x1F37A;');
 	Smilies::add($b, ':beer:', '&#x1F37A;');
 	Smilies::add($b, ':homebrew:', '&#x1F37A;');
-	Smilies::add($b, ':clinking beer mugs:', '&#x1F37B');
-	Smilies::add($b, ':clinking glasses:', '&#x1F942');
-	Smilies::add($b, ':tumbler glass:', '&#x1F943');
-	Smilies::add($b, ':cup with straw:', '&#x1F964');
-//	Smilies::add($b, ':beverage box:', '&#x1F9C3');
-	Smilies::add($b, ':mate:', '&#x1F9C9');
-	Smilies::add($b, ':ice:', '&#x1F9CA');
+	Smilies::add($b, ':clinking beer mugs:', '&#x1F37B;');
+	Smilies::add($b, ':clinking glasses:', '&#x1F942;');
+	Smilies::add($b, ':tumbler glass:', '&#x1F943;');
+	Smilies::add($b, ':cup with straw:', '&#x1F964;');
+//  Smilies::add($b, ':beverage box:', '&#x1F9C3;');
+	Smilies::add($b, ':mate:', '&#x1F9C9;');
+	Smilies::add($b, ':ice:', '&#x1F9CA;');
 
 // dishware
-	Smilies::add($b, ':chopsticks:', '&#x1F962');
-	Smilies::add($b, ':fork and knife with plate:', '&#x1F37D');
-	Smilies::add($b, ':fork and knife:', '&#x1F374');
-	Smilies::add($b, ':spoon:', '&#x1F944');
-	Smilies::add($b, ':kitchen knife:', '&#x1F52A');
-	Smilies::add($b, ':amphora:', '&#x1F3FA');
+	Smilies::add($b, ':chopsticks:', '&#x1F962;');
+	Smilies::add($b, ':fork and knife with plate:', '&#x1F37D;');
+	Smilies::add($b, ':fork and knife:', '&#x1F374;');
+	Smilies::add($b, ':spoon:', '&#x1F944;');
+	Smilies::add($b, ':kitchen knife:', '&#x1F52A;');
+	Smilies::add($b, ':amphora:', '&#x1F3FA;');
 
 // Travel & Places
 // place-map
-	Smilies::add($b, ':globe showing Europe-Africa:', '&#x1F30D');
-	Smilies::add($b, ':globe showing Americas:', '&#x1F30E');
-	Smilies::add($b, ':globe showing Asia-Australia:', '&#x1F30F');
-	Smilies::add($b, ':globe with meridians:', '&#x1F310');
-	Smilies::add($b, ':world map:', '&#x1F5FA');
-	Smilies::add($b, ':map of Japan:', '&#x1F5FE');
-	Smilies::add($b, ':compass:', '&#x1F9ED');
+	Smilies::add($b, ':globe showing Europe-Africa:', '&#x1F30D;');
+	Smilies::add($b, ':globe showing Americas:', '&#x1F30E;');
+	Smilies::add($b, ':globe showing Asia-Australia:', '&#x1F30F;');
+	Smilies::add($b, ':globe with meridians:', '&#x1F310;');
+	Smilies::add($b, ':world map:', '&#x1F5FA;');
+	Smilies::add($b, ':map of Japan:', '&#x1F5FE;');
+	Smilies::add($b, ':compass:', '&#x1F9ED;');
 
 // place-geographic
-	Smilies::add($b, ':snow-capped mountain:', '&#x1F3D4');
-	Smilies::add($b, ':mountain:', '&#x26F0');
-	Smilies::add($b, ':volcano:', '&#x1F30B');
-	Smilies::add($b, ':mount fuji:', '&#x1F5FB');
-	Smilies::add($b, ':camping:', '&#x1F3D5');
-	Smilies::add($b, ':beach with umbrella:', '&#x1F3D6');
-	Smilies::add($b, ':desert:', '&#x1F3DC');
-	Smilies::add($b, ':desert island:', '&#x1F3DD');
-	Smilies::add($b, ':national park:', '&#x1F3DE');
+	Smilies::add($b, ':snow-capped mountain:', '&#x1F3D4;');
+	Smilies::add($b, ':mountain:', '&#x26F0;');
+	Smilies::add($b, ':volcano:', '&#x1F30B;');
+	Smilies::add($b, ':mount fuji:', '&#x1F5FB;');
+	Smilies::add($b, ':camping:', '&#x1F3D5;');
+	Smilies::add($b, ':beach with umbrella:', '&#x1F3D6;');
+	Smilies::add($b, ':desert:', '&#x1F3DC;');
+	Smilies::add($b, ':desert island:', '&#x1F3DD;');
+	Smilies::add($b, ':national park:', '&#x1F3DE;');
 
 // place-building
-	Smilies::add($b, ':stadium:', '&#x1F3DF');
-	Smilies::add($b, ':classical building:', '&#x1F3DB');
-	Smilies::add($b, ':building construction:', '&#x1F3D7');
-	Smilies::add($b, ':brick:', '&#x1F9F1');
-	Smilies::add($b, ':houses:', '&#x1F3D8');
-	Smilies::add($b, ':derelict house:', '&#x1F3DA');
-	Smilies::add($b, ':house:', '&#x1F3E0');
-	Smilies::add($b, ':house with garden:', '&#x1F3E1');
-	Smilies::add($b, ':office building:', '&#x1F3E2');
-	Smilies::add($b, ':Japanese post office:', '&#x1F3E3');
-	Smilies::add($b, ':post office:', '&#x1F3E4');
-	Smilies::add($b, ':hospital:', '&#x1F3E5');
-	Smilies::add($b, ':bank:', '&#x1F3E6');
-	Smilies::add($b, ':hotel:', '&#x1F3E8');
-	Smilies::add($b, ':love hotel:', '&#x1F3E9');
-	Smilies::add($b, ':convenience store:', '&#x1F3EA');
-	Smilies::add($b, ':school:', '&#x1F3EB');
-	Smilies::add($b, ':department store:', '&#x1F3EC');
-	Smilies::add($b, ':factory:', '&#x1F3ED');
-	Smilies::add($b, ':Japanese castle:', '&#x1F3EF');
-	Smilies::add($b, ':castle:', '&#x1F3F0');
-	Smilies::add($b, ':wedding:', '&#x1F492');
-	Smilies::add($b, ':Tokyo tower:', '&#x1F5FC');
-	Smilies::add($b, ':Statue of Liberty:', '&#x1F5FD');
-
+	Smilies::add($b, ':stadium:', '&#x1F3DF;');
+	Smilies::add($b, ':classical building:', '&#x1F3DB;');
+	Smilies::add($b, ':building construction:', '&#x1F3D7;');
+	Smilies::add($b, ':brick:', '&#x1F9F1;');
+	Smilies::add($b, ':houses:', '&#x1F3D8;');
+	Smilies::add($b, ':derelict house:', '&#x1F3DA;');
+	Smilies::add($b, ':house:', '&#x1F3E0;');
+	Smilies::add($b, ':house with garden:', '&#x1F3E1;');
+	Smilies::add($b, ':office building:', '&#x1F3E2;');
+	Smilies::add($b, ':Japanese post office:', '&#x1F3E3;');
+	Smilies::add($b, ':post office:', '&#x1F3E4;');
+	Smilies::add($b, ':hospital:', '&#x1F3E5;');
+	Smilies::add($b, ':bank:', '&#x1F3E6;');
+	Smilies::add($b, ':hotel:', '&#x1F3E8;');
+	Smilies::add($b, ':love hotel:', '&#x1F3E9;');
+	Smilies::add($b, ':convenience store:', '&#x1F3EA;');
+	Smilies::add($b, ':school:', '&#x1F3EB;');
+	Smilies::add($b, ':department store:', '&#x1F3EC;');
+	Smilies::add($b, ':factory:', '&#x1F3ED;');
+	Smilies::add($b, ':Japanese castle:', '&#x1F3EF;');
+	Smilies::add($b, ':castle:', '&#x1F3F0;');
+	Smilies::add($b, ':wedding:', '&#x1F492;');
+	Smilies::add($b, ':Tokyo tower:', '&#x1F5FC;');
+	Smilies::add($b, ':Statue of Liberty:', '&#x1F5FD;');
 
 // place-religious
-	Smilies::add($b, ':church:', '&#x26EA');
-	Smilies::add($b, ':mosque:', '&#x1F54C');
-// 	Smilies::add($b, ':hindu temple:', '&#x1F6D5');
-	Smilies::add($b, ':synagogue:', '&#x1F54D');
-	Smilies::add($b, ':shinto shrine:', '&#x26E9');
-	Smilies::add($b, ':kaaba:', '&#x1F54B');
+	Smilies::add($b, ':church:', '&#x26EA;');
+	Smilies::add($b, ':mosque:', '&#x1F54C;');
+//  Smilies::add($b, ':hindu temple:', '&#x1F6D5;');
+	Smilies::add($b, ':synagogue:', '&#x1F54D;');
+	Smilies::add($b, ':shinto shrine:', '&#x26E9;');
+	Smilies::add($b, ':kaaba:', '&#x1F54B;');
 
 // place-other
-	Smilies::add($b, ':fountain:', '&#x26F2');
-	Smilies::add($b, ':tent:', '&#x26FA');
-	Smilies::add($b, ':foggy:', '&#x1F301');
-	Smilies::add($b, ':night with stars:', '&#x1F303');
-	Smilies::add($b, ':cityscape:', '&#x1F3D9');
-	Smilies::add($b, ':sunrise over mountains:', '&#x1F304');
-	Smilies::add($b, ':sunrise:', '&#x1F305');
-	Smilies::add($b, ':cityscape at dusk:', '&#x1F306');
-	Smilies::add($b, ':sunset:', '&#x1F307');
-	Smilies::add($b, ':bridge at night:', '&#x1F309');
-	Smilies::add($b, ':hot springs:', '&#x2668');
-	Smilies::add($b, ':carousel horse:', '&#x1F3A0');
-	Smilies::add($b, ':ferris wheel:', '&#x1F3A1');
-	Smilies::add($b, ':roller coaster:', '&#x1F3A2');
-	Smilies::add($b, ':barber pole:', '&#x1F488');
-	Smilies::add($b, ':circus tent:', '&#x1F3AA');
+	Smilies::add($b, ':fountain:', '&#x26F2;');
+	Smilies::add($b, ':tent:', '&#x26FA;');
+	Smilies::add($b, ':foggy:', '&#x1F301;');
+	Smilies::add($b, ':night with stars:', '&#x1F303;');
+	Smilies::add($b, ':cityscape:', '&#x1F3D9;');
+	Smilies::add($b, ':sunrise over mountains:', '&#x1F304;');
+	Smilies::add($b, ':sunrise:', '&#x1F305;');
+	Smilies::add($b, ':cityscape at dusk:', '&#x1F306;');
+	Smilies::add($b, ':sunset:', '&#x1F307;');
+	Smilies::add($b, ':bridge at night:', '&#x1F309;');
+	Smilies::add($b, ':hot springs:', '&#x2668;');
+	Smilies::add($b, ':carousel horse:', '&#x1F3A0;');
+	Smilies::add($b, ':ferris wheel:', '&#x1F3A1;');
+	Smilies::add($b, ':roller coaster:', '&#x1F3A2;');
+	Smilies::add($b, ':barber pole:', '&#x1F488;');
+	Smilies::add($b, ':circus tent:', '&#x1F3AA;');
 
 // transport-ground
-	Smilies::add($b, ':locomotive:', '&#x1F682');
-	Smilies::add($b, ':railway car:', '&#x1F683');
-	Smilies::add($b, ':high-speed train:', '&#x1F684');
-	Smilies::add($b, ':bullet train:', '&#x1F685');
-	Smilies::add($b, ':train:', '&#x1F686');
-	Smilies::add($b, ':metro:', '&#x1F687');
-	Smilies::add($b, ':light rail:', '&#x1F688');
-	Smilies::add($b, ':station:', '&#x1F689');
-	Smilies::add($b, ':tram:', '&#x1F68A');
-	Smilies::add($b, ':monorail:', '&#x1F69D');
-	Smilies::add($b, ':mountain railway:', '&#x1F69E');
-	Smilies::add($b, ':tram car:', '&#x1F68B');
-	Smilies::add($b, ':bus:', '&#x1F68C');
-	Smilies::add($b, ':oncoming bus:', '&#x1F68D');
-	Smilies::add($b, ':trolleybus:', '&#x1F68E');
-	Smilies::add($b, ':minibus:', '&#x1F690');
-	Smilies::add($b, ':ambulance:', '&#x1F691');
-	Smilies::add($b, ':fire engine:', '&#x1F692');
-	Smilies::add($b, ':police car:', '&#x1F693');
-	Smilies::add($b, ':oncoming police car:', '&#x1F694');
-	Smilies::add($b, ':taxi:', '&#x1F695');
-	Smilies::add($b, ':oncoming taxi:', '&#x1F696');
-	Smilies::add($b, ':automobile:', '&#x1F697');
-	Smilies::add($b, ':oncoming automobile:', '&#x1F698');
-	Smilies::add($b, ':sport utility vehicle:', '&#x1F699');
-	Smilies::add($b, ':delivery truck:', '&#x1F69A');
-	Smilies::add($b, ':articulated lorry:', '&#x1F69B');
-	Smilies::add($b, ':tractor:', '&#x1F69C');
-	Smilies::add($b, ':racing car:', '&#x1F3CE');
-	Smilies::add($b, ':motorcycle:', '&#x1F3CD');
-	Smilies::add($b, ':motor scooter:', '&#x1F6F5');
-//	Smilies::add($b, ':manual wheelchair:', '&#x1F9BD');
-//	Smilies::add($b, ':motorized wheelchair:', '&#x1F9BC');
-//	Smilies::add($b, ':auto rickshaw:', '&#x1F6FA');
-	Smilies::add($b, ':bicycle:', '&#x1F6B2');
-	Smilies::add($b, ':kick scooter:', '&#x1F6F4');
-	Smilies::add($b, ':skateboard:', '&#x1F6F9');
-	Smilies::add($b, ':bus stop:', '&#x1F68F');
-	Smilies::add($b, ':motorway:', '&#x1F6E3');
-	Smilies::add($b, ':railway track:', '&#x1F6E4');
-	Smilies::add($b, ':oil drum:', '&#x1F6E2');
-	Smilies::add($b, ':fuel pump:', '&#x26FD');
-	Smilies::add($b, ':police car light:', '&#x1F6A8');
-	Smilies::add($b, ':horizontal traffic light:', '&#x1F6A5');
-	Smilies::add($b, ':vertical traffic light:', '&#x1F6A6');
-	Smilies::add($b, ':stop sign:', '&#x1F6D1');
-	Smilies::add($b, ':construction:', '&#x1F6A7');
+	Smilies::add($b, ':locomotive:', '&#x1F682;');
+	Smilies::add($b, ':railway car:', '&#x1F683;');
+	Smilies::add($b, ':high-speed train:', '&#x1F684;');
+	Smilies::add($b, ':bullet train:', '&#x1F685;');
+	Smilies::add($b, ':train:', '&#x1F686;');
+	Smilies::add($b, ':metro:', '&#x1F687;');
+	Smilies::add($b, ':light rail:', '&#x1F688;');
+	Smilies::add($b, ':station:', '&#x1F689;');
+	Smilies::add($b, ':tram:', '&#x1F68A;');
+	Smilies::add($b, ':monorail:', '&#x1F69D;');
+	Smilies::add($b, ':mountain railway:', '&#x1F69E;');
+	Smilies::add($b, ':tram car:', '&#x1F68B;');
+	Smilies::add($b, ':bus:', '&#x1F68C;');
+	Smilies::add($b, ':oncoming bus:', '&#x1F68D;');
+	Smilies::add($b, ':trolleybus:', '&#x1F68E;');
+	Smilies::add($b, ':minibus:', '&#x1F690;');
+	Smilies::add($b, ':ambulance:', '&#x1F691;');
+	Smilies::add($b, ':fire engine:', '&#x1F692;');
+	Smilies::add($b, ':police car:', '&#x1F693;');
+	Smilies::add($b, ':oncoming police car:', '&#x1F694;');
+	Smilies::add($b, ':taxi:', '&#x1F695;');
+	Smilies::add($b, ':oncoming taxi:', '&#x1F696;');
+	Smilies::add($b, ':automobile:', '&#x1F697;');
+	Smilies::add($b, ':oncoming automobile:', '&#x1F698;');
+	Smilies::add($b, ':sport utility vehicle:', '&#x1F699;');
+	Smilies::add($b, ':delivery truck:', '&#x1F69A;');
+	Smilies::add($b, ':articulated lorry:', '&#x1F69B;');
+	Smilies::add($b, ':tractor:', '&#x1F69C;');
+	Smilies::add($b, ':racing car:', '&#x1F3CE;');
+	Smilies::add($b, ':motorcycle:', '&#x1F3CD;');
+	Smilies::add($b, ':motor scooter:', '&#x1F6F5;');
+//  Smilies::add($b, ':manual wheelchair:', '&#x1F9BD;');
+//  Smilies::add($b, ':motorized wheelchair:', '&#x1F9BC;');
+//  Smilies::add($b, ':auto rickshaw:', '&#x1F6FA;');
+	Smilies::add($b, ':bicycle:', '&#x1F6B2;');
+	Smilies::add($b, ':kick scooter:', '&#x1F6F4;');
+	Smilies::add($b, ':skateboard:', '&#x1F6F9;');
+	Smilies::add($b, ':bus stop:', '&#x1F68F;');
+	Smilies::add($b, ':motorway:', '&#x1F6E3;');
+	Smilies::add($b, ':railway track:', '&#x1F6E4;');
+	Smilies::add($b, ':oil drum:', '&#x1F6E2;');
+	Smilies::add($b, ':fuel pump:', '&#x26FD;');
+	Smilies::add($b, ':police car light:', '&#x1F6A8;');
+	Smilies::add($b, ':horizontal traffic light:', '&#x1F6A5;');
+	Smilies::add($b, ':vertical traffic light:', '&#x1F6A6;');
+	Smilies::add($b, ':stop sign:', '&#x1F6D1;');
+	Smilies::add($b, ':construction:', '&#x1F6A7;');
 
 // transport-water
-	Smilies::add($b, ':anchor:', '&#x2693');
-	Smilies::add($b, ':sailboat:', '&#x26F5');
-	Smilies::add($b, ':canoe:', '&#x1F6F6');
-	Smilies::add($b, ':speedboat:', '&#x1F6A4');
-	Smilies::add($b, ':passenger ship:', '&#x1F6F3');
-	Smilies::add($b, ':ferry:', '&#x26F4');
-	Smilies::add($b, ':motor boat:', '&#x1F6E5');
-	Smilies::add($b, ':ship:', '&#x1F6A2');
+	Smilies::add($b, ':anchor:', '&#x2693;');
+	Smilies::add($b, ':sailboat:', '&#x26F5;');
+	Smilies::add($b, ':canoe:', '&#x1F6F6;');
+	Smilies::add($b, ':speedboat:', '&#x1F6A4;');
+	Smilies::add($b, ':passenger ship:', '&#x1F6F3;');
+	Smilies::add($b, ':ferry:', '&#x26F4;');
+	Smilies::add($b, ':motor boat:', '&#x1F6E5;');
+	Smilies::add($b, ':ship:', '&#x1F6A2;');
 
 // transport-air
-	Smilies::add($b, ':airplane:', '&#x2708');
-	Smilies::add($b, ':small airplane:', '&#x1F6E9');
-	Smilies::add($b, ':airplane departure:', '&#x1F6EB');
-	Smilies::add($b, ':airplane arrival:', '&#x1F6EC');
-	Smilies::add($b, ':parachute:', '&#x1FA82');
-	Smilies::add($b, ':seat:', '&#x1F4BA');
-	Smilies::add($b, ':helicopter:', '&#x1F681');
-	Smilies::add($b, ':suspension railway:', '&#x1F69F');
-	Smilies::add($b, ':mountain cableway:', '&#x1F6A0');
-	Smilies::add($b, ':aerial tramway:', '&#x1F6A1');
-	Smilies::add($b, ':satellite:', '&#x1F6F0');
-	Smilies::add($b, ':rocket:', '&#x1F680');
-	Smilies::add($b, ':flying saucer:', '&#x1F6F8');
+	Smilies::add($b, ':airplane:', '&#x2708;');
+	Smilies::add($b, ':small airplane:', '&#x1F6E9;');
+	Smilies::add($b, ':airplane departure:', '&#x1F6EB;');
+	Smilies::add($b, ':airplane arrival:', '&#x1F6EC;');
+	Smilies::add($b, ':parachute:', '&#x1FA82;');
+	Smilies::add($b, ':seat:', '&#x1F4BA;');
+	Smilies::add($b, ':helicopter:', '&#x1F681;');
+	Smilies::add($b, ':suspension railway:', '&#x1F69F;');
+	Smilies::add($b, ':mountain cableway:', '&#x1F6A0;');
+	Smilies::add($b, ':aerial tramway:', '&#x1F6A1;');
+	Smilies::add($b, ':satellite:', '&#x1F6F0;');
+	Smilies::add($b, ':rocket:', '&#x1F680;');
+	Smilies::add($b, ':flying saucer:', '&#x1F6F8;');
 
 // hotel
-	Smilies::add($b, ':bellhop bell:', '&#x1F6CE');
-	Smilies::add($b, ':luggage:', '&#x1F9F3');
+	Smilies::add($b, ':bellhop bell:', '&#x1F6CE;');
+	Smilies::add($b, ':luggage:', '&#x1F9F3;');
 
 // time
-	Smilies::add($b, ':hourglass done:', '&#x231B');
-	Smilies::add($b, ':hourglass not done:', '&#x23F3');
-	Smilies::add($b, ':watch:', '&#x231A');
-	Smilies::add($b, ':alarm clock:', '&#x23F0');
-	Smilies::add($b, ':stopwatch:', '&#x23F1');
-	Smilies::add($b, ':timer clock:', '&#x23F2');
-	Smilies::add($b, ':mantelpiece clock:', '&#x1F570');
-	Smilies::add($b, ':twelve o’clock:', '&#x1F55B');
-	Smilies::add($b, ':twelve-thirty:', '&#x1F567');
-	Smilies::add($b, ':one o’clock:', '&#x1F550');
-	Smilies::add($b, ':one-thirty:', '&#x1F55C');
-	Smilies::add($b, ':two o’clock:', '&#x1F551');
-	Smilies::add($b, ':two-thirty:', '&#x1F55D');
-	Smilies::add($b, ':three o’clock:', '&#x1F552');
-	Smilies::add($b, ':three-thirty:', '&#x1F55E');
-	Smilies::add($b, ':four o’clock:', '&#x1F553');
-	Smilies::add($b, ':four-thirty:', '&#x1F55F');
-	Smilies::add($b, ':five o’clock:', '&#x1F554');
-	Smilies::add($b, ':five-thirty:', '&#x1F560');
-	Smilies::add($b, ':six o’clock:', '&#x1F555');
-	Smilies::add($b, ':six-thirty:', '&#x1F561');
-	Smilies::add($b, ':seven o’clock:', '&#x1F556');
-	Smilies::add($b, ':seven-thirty:', '&#x1F562');
-	Smilies::add($b, ':eight o’clock:', '&#x1F557');
-	Smilies::add($b, ':eight-thirty:', '&#x1F563');
-	Smilies::add($b, ':nine o’clock:', '&#x1F558');
-	Smilies::add($b, ':nine-thirty:', '&#x1F564');
-	Smilies::add($b, ':ten o’clock:', '&#x1F559');
-	Smilies::add($b, ':ten-thirty:', '&#x1F565');
-	Smilies::add($b, ':eleven o’clock:', '&#x1F55A');
-	Smilies::add($b, ':eleven-thirty:', '&#x1F566');
+	Smilies::add($b, ':hourglass done:', '&#x231B;');
+	Smilies::add($b, ':hourglass not done:', '&#x23F3;');
+	Smilies::add($b, ':watch:', '&#x231A;');
+	Smilies::add($b, ':alarm clock:', '&#x23F0;');
+	Smilies::add($b, ':stopwatch:', '&#x23F1;');
+	Smilies::add($b, ':timer clock:', '&#x23F2;');
+	Smilies::add($b, ':mantelpiece clock:', '&#x1F570;');
+	Smilies::add($b, ':twelve o’clock:', '&#x1F55B;');
+	Smilies::add($b, ':twelve-thirty:', '&#x1F567;');
+	Smilies::add($b, ':one o’clock:', '&#x1F550;');
+	Smilies::add($b, ':one-thirty:', '&#x1F55C;');
+	Smilies::add($b, ':two o’clock:', '&#x1F551;');
+	Smilies::add($b, ':two-thirty:', '&#x1F55D;');
+	Smilies::add($b, ':three o’clock:', '&#x1F552;');
+	Smilies::add($b, ':three-thirty:', '&#x1F55E;');
+	Smilies::add($b, ':four o’clock:', '&#x1F553;');
+	Smilies::add($b, ':four-thirty:', '&#x1F55F;');
+	Smilies::add($b, ':five o’clock:', '&#x1F554;');
+	Smilies::add($b, ':five-thirty:', '&#x1F560;');
+	Smilies::add($b, ':six o’clock:', '&#x1F555;');
+	Smilies::add($b, ':six-thirty:', '&#x1F561;');
+	Smilies::add($b, ':seven o’clock:', '&#x1F556;');
+	Smilies::add($b, ':seven-thirty:', '&#x1F562;');
+	Smilies::add($b, ':eight o’clock:', '&#x1F557;');
+	Smilies::add($b, ':eight-thirty:', '&#x1F563;');
+	Smilies::add($b, ':nine o’clock:', '&#x1F558;');
+	Smilies::add($b, ':nine-thirty:', '&#x1F564;');
+	Smilies::add($b, ':ten o’clock:', '&#x1F559;');
+	Smilies::add($b, ':ten-thirty:', '&#x1F565;');
+	Smilies::add($b, ':eleven o’clock:', '&#x1F55A;');
+	Smilies::add($b, ':eleven-thirty:', '&#x1F566;');
 
 // sky & weather
-	Smilies::add($b, ':new moon:', '&#x1F311');
-	Smilies::add($b, ':waxing crescent moon:', '&#x1F312');
-	Smilies::add($b, ':first quarter moon:', '&#x1F313');
-	Smilies::add($b, ':waxing gibbous moon:', '&#x1F314');
-	Smilies::add($b, ':full moon:', '&#x1F315');
-	Smilies::add($b, ':waning gibbous moon:', '&#x1F316');
-	Smilies::add($b, ':last quarter moon:', '&#x1F317');
-	Smilies::add($b, ':waning crescent moon:', '&#x1F318');
-	Smilies::add($b, ':crescent moon:', '&#x1F319');
-	Smilies::add($b, ':new moon face:', '&#x1F31A');
-	Smilies::add($b, ':first quarter moon face:', '&#x1F31B');
-	Smilies::add($b, ':last quarter moon face:', '&#x1F31C');
-	Smilies::add($b, ':thermometer:', '&#x1F321');
-	Smilies::add($b, ':sun:', '&#x2600');
-	Smilies::add($b, ':full moon face:', '&#x1F31D');
-	Smilies::add($b, ':sun with face:', '&#x1F31E');
-	Smilies::add($b, ':ringed planet:', '&#x1FA90');
-	Smilies::add($b, ':star:', '&#x2B50');
-	Smilies::add($b, ':glowing star:', '&#x1F31F');
-	Smilies::add($b, ':shooting star:', '&#x1F320');
-	Smilies::add($b, ':milky way:', '&#x1F30C');
-	Smilies::add($b, ':cloud:', '&#x2601');
-	Smilies::add($b, ':sun behind cloud:', '&#x26C5');
-	Smilies::add($b, ':cloud with lightning and rain:', '&#x26C8');
-	Smilies::add($b, ':sun behind small cloud:', '&#x1F324');
-	Smilies::add($b, ':sun behind large cloud:', '&#x1F325');
-	Smilies::add($b, ':sun behind rain cloud:', '&#x1F326');
-	Smilies::add($b, ':cloud with rain:', '&#x1F327');
-	Smilies::add($b, ':cloud with snow:', '&#x1F328');
-	Smilies::add($b, ':cloud with lightning:', '&#x1F329');
-	Smilies::add($b, ':tornado:', '&#x1F32A');
-	Smilies::add($b, ':fog:', '&#x1F32B');
-	Smilies::add($b, ':wind face:', '&#x1F32C');
-	Smilies::add($b, ':cyclone:', '&#x1F300');
-	Smilies::add($b, ':rainbow:', '&#x1F308');
-	Smilies::add($b, ':closed umbrella:', '&#x1F302');
-	Smilies::add($b, ':umbrella:', '&#x2602');
-	Smilies::add($b, ':umbrella with rain drops:', '&#x2614');
-	Smilies::add($b, ':umbrella on ground:', '&#x26F1');
-	Smilies::add($b, ':high voltage:', '&#x26A1');
-	Smilies::add($b, ':snowflake:', '&#x2744');
-	Smilies::add($b, ':snowman:', '&#x2603');
-	Smilies::add($b, ':snowman without snow:', '&#x26C4');
-	Smilies::add($b, ':comet:', '&#x2604');
-	Smilies::add($b, ':fire:', '&#x1F525');
-	Smilies::add($b, ':droplet:', '&#x1F4A7');
-	Smilies::add($b, ':water wave:', '&#x1F30A');
+	Smilies::add($b, ':new moon:', '&#x1F311;');
+	Smilies::add($b, ':waxing crescent moon:', '&#x1F312;');
+	Smilies::add($b, ':first quarter moon:', '&#x1F313;');
+	Smilies::add($b, ':waxing gibbous moon:', '&#x1F314;');
+	Smilies::add($b, ':full moon:', '&#x1F315;');
+	Smilies::add($b, ':waning gibbous moon:', '&#x1F316;');
+	Smilies::add($b, ':last quarter moon:', '&#x1F317;');
+	Smilies::add($b, ':waning crescent moon:', '&#x1F318;');
+	Smilies::add($b, ':crescent moon:', '&#x1F319;');
+	Smilies::add($b, ':new moon face:', '&#x1F31A;');
+	Smilies::add($b, ':first quarter moon face:', '&#x1F31B;');
+	Smilies::add($b, ':last quarter moon face:', '&#x1F31C;');
+	Smilies::add($b, ':thermometer:', '&#x1F321;');
+	Smilies::add($b, ':sun:', '&#x2600;');
+	Smilies::add($b, ':full moon face:', '&#x1F31D;');
+	Smilies::add($b, ':sun with face:', '&#x1F31E;');
+	Smilies::add($b, ':ringed planet:', '&#x1FA90;');
+	Smilies::add($b, ':star:', '&#x2B50;');
+	Smilies::add($b, ':glowing star:', '&#x1F31F;');
+	Smilies::add($b, ':shooting star:', '&#x1F320;');
+	Smilies::add($b, ':milky way:', '&#x1F30C;');
+	Smilies::add($b, ':cloud:', '&#x2601;');
+	Smilies::add($b, ':sun behind cloud:', '&#x26C5;');
+	Smilies::add($b, ':cloud with lightning and rain:', '&#x26C8;');
+	Smilies::add($b, ':sun behind small cloud:', '&#x1F324;');
+	Smilies::add($b, ':sun behind large cloud:', '&#x1F325;');
+	Smilies::add($b, ':sun behind rain cloud:', '&#x1F326;');
+	Smilies::add($b, ':cloud with rain:', '&#x1F327;');
+	Smilies::add($b, ':cloud with snow:', '&#x1F328;');
+	Smilies::add($b, ':cloud with lightning:', '&#x1F329;');
+	Smilies::add($b, ':tornado:', '&#x1F32A;');
+	Smilies::add($b, ':fog:', '&#x1F32B;');
+	Smilies::add($b, ':wind face:', '&#x1F32C;');
+	Smilies::add($b, ':cyclone:', '&#x1F300;');
+	Smilies::add($b, ':rainbow:', '&#x1F308;');
+	Smilies::add($b, ':closed umbrella:', '&#x1F302;');
+	Smilies::add($b, ':umbrella:', '&#x2602;');
+	Smilies::add($b, ':umbrella with rain drops:', '&#x2614;');
+	Smilies::add($b, ':umbrella on ground:', '&#x26F1;');
+	Smilies::add($b, ':high voltage:', '&#x26A1;');
+	Smilies::add($b, ':snowflake:', '&#x2744;');
+	Smilies::add($b, ':snowman:', '&#x2603;');
+	Smilies::add($b, ':snowman without snow:', '&#x26C4;');
+	Smilies::add($b, ':comet:', '&#x2604;');
+	Smilies::add($b, ':fire:', '&#x1F525;');
+	Smilies::add($b, ':droplet:', '&#x1F4A7;');
+	Smilies::add($b, ':water wave:', '&#x1F30A;');
 
 // Activities
 // event
-	Smilies::add($b, ':jack-o-lantern:', '&#x1F383');
-	Smilies::add($b, ':Christmas tree:', '&#x1F384');
-	Smilies::add($b, ':fireworks:', '&#x1F386');
-	Smilies::add($b, ':sparkler:', '&#x1F387');
-	Smilies::add($b, ':firecracker:', '&#x1F9E8');
-	Smilies::add($b, ':sparkles:', '&#x2728');
-	Smilies::add($b, ':balloon:', '&#x1F388');
-	Smilies::add($b, ':party popper:', '&#x1F389');
-	Smilies::add($b, ':confetti ball:', '&#x1F38A');
-	Smilies::add($b, ':tanabata tree:', '&#x1F38B');
-	Smilies::add($b, ':pine decoration:', '&#x1F38D');
-	Smilies::add($b, ':Japanese dolls:', '&#x1F38E');
-	Smilies::add($b, ':carp streamer:', '&#x1F38F');
-	Smilies::add($b, ':wind chime:', '&#x1F390');
-	Smilies::add($b, ':moon viewing ceremony:', '&#x1F391');
-	Smilies::add($b, ':red envelope:', '&#x1F9E7');
-	Smilies::add($b, ':ribbon:', '&#x1F380');
-	Smilies::add($b, ':wrapped gift:', '&#x1F381');
-	Smilies::add($b, ':reminder ribbon:', '&#x1F397');
-	Smilies::add($b, ':admission tickets:', '&#x1F39F');
-	Smilies::add($b, ':ticket:', '&#x1F3AB');
+	Smilies::add($b, ':jack-o-lantern:', '&#x1F383;');
+	Smilies::add($b, ':Christmas tree:', '&#x1F384;');
+	Smilies::add($b, ':fireworks:', '&#x1F386;');
+	Smilies::add($b, ':sparkler:', '&#x1F387;');
+	Smilies::add($b, ':firecracker:', '&#x1F9E8;');
+	Smilies::add($b, ':sparkles:', '&#x2728;');
+	Smilies::add($b, ':balloon:', '&#x1F388;');
+	Smilies::add($b, ':party popper:', '&#x1F389;');
+	Smilies::add($b, ':confetti ball:', '&#x1F38A;');
+	Smilies::add($b, ':tanabata tree:', '&#x1F38B;');
+	Smilies::add($b, ':pine decoration:', '&#x1F38D;');
+	Smilies::add($b, ':Japanese dolls:', '&#x1F38E;');
+	Smilies::add($b, ':carp streamer:', '&#x1F38F;');
+	Smilies::add($b, ':wind chime:', '&#x1F390;');
+	Smilies::add($b, ':moon viewing ceremony:', '&#x1F391;');
+	Smilies::add($b, ':red envelope:', '&#x1F9E7;');
+	Smilies::add($b, ':ribbon:', '&#x1F380;');
+	Smilies::add($b, ':wrapped gift:', '&#x1F381;');
+	Smilies::add($b, ':reminder ribbon:', '&#x1F397;');
+	Smilies::add($b, ':admission tickets:', '&#x1F39F;');
+	Smilies::add($b, ':ticket:', '&#x1F3AB;');
 
 // award-medal
-	Smilies::add($b, ':military medal:', '&#x1F396');
-	Smilies::add($b, ':trophy:', '&#x1F3C6');
-	Smilies::add($b, ':sports medal:', '&#x1F3C5');
-	Smilies::add($b, ':1st place medal:', '&#x1F947');
-	Smilies::add($b, ':2nd place medal:', '&#x1F948');
-	Smilies::add($b, ':3rd place medal:', '&#x1F949');
+	Smilies::add($b, ':military medal:', '&#x1F396;');
+	Smilies::add($b, ':trophy:', '&#x1F3C6;');
+	Smilies::add($b, ':sports medal:', '&#x1F3C5;');
+	Smilies::add($b, ':1st place medal:', '&#x1F947;');
+	Smilies::add($b, ':2nd place medal:', '&#x1F948;');
+	Smilies::add($b, ':3rd place medal:', '&#x1F949;');
 
 // sport
-	Smilies::add($b, ':soccer ball:', '&#x26BD');
-	Smilies::add($b, ':baseball:', '&#x26BE');
-	Smilies::add($b, ':softball:', '&#x1F94E');
-	Smilies::add($b, ':basketball:', '&#x1F3C0');
-	Smilies::add($b, ':volleyball:', '&#x1F3D0');
-	Smilies::add($b, ':american football:', '&#x1F3C8');
+	Smilies::add($b, ':soccer ball:', '&#x26BD;');
+	Smilies::add($b, ':baseball:', '&#x26BE;');
+	Smilies::add($b, ':softball:', '&#x1F94E;');
+	Smilies::add($b, ':basketball:', '&#x1F3C0;');
+	Smilies::add($b, ':volleyball:', '&#x1F3D0;');
+	Smilies::add($b, ':american football:', '&#x1F3C8;');
 	Smilies::add($b, ':football:', '&#x1F3C8;');
-	Smilies::add($b, ':rugby football:', '&#x1F3C9');
-	Smilies::add($b, ':tennis:', '&#x1F3BE');
-	Smilies::add($b, ':flying disc:', '&#x1F94F');
-	Smilies::add($b, ':bowling:', '&#x1F3B3');
-	Smilies::add($b, ':cricket game:', '&#x1F3CF');
-	Smilies::add($b, ':field hockey:', '&#x1F3D1');
-	Smilies::add($b, ':ice hockey:', '&#x1F3D2');
-	Smilies::add($b, ':lacrosse:', '&#x1F94D');
-	Smilies::add($b, ':ping pong:', '&#x1F3D3');
-	Smilies::add($b, ':badminton:', '&#x1F3F8');
-	Smilies::add($b, ':boxing glove:', '&#x1F94A');
-	Smilies::add($b, ':martial arts uniform:', '&#x1F94B');
-	Smilies::add($b, ':goal net:', '&#x1F945');
-	Smilies::add($b, ':flag in hole:', '&#x26F3');
-	Smilies::add($b, ':ice skate:', '&#x26F8');
-	Smilies::add($b, ':fishing pole:', '&#x1F3A3');
-//	Smilies::add($b, ':diving mask:', '&#x1F93F');
-	Smilies::add($b, ':running shirt:', '&#x1F3BD');
-	Smilies::add($b, ':skis:', '&#x1F3BF');
-	Smilies::add($b, ':sled:', '&#x1F6F7');
-	Smilies::add($b, ':curling stone:', '&#x1F94C');
+	Smilies::add($b, ':rugby football:', '&#x1F3C9;');
+	Smilies::add($b, ':tennis:', '&#x1F3BE;');
+	Smilies::add($b, ':flying disc:', '&#x1F94F;');
+	Smilies::add($b, ':bowling:', '&#x1F3B3;');
+	Smilies::add($b, ':cricket game:', '&#x1F3CF;');
+	Smilies::add($b, ':field hockey:', '&#x1F3D1;');
+	Smilies::add($b, ':ice hockey:', '&#x1F3D2;');
+	Smilies::add($b, ':lacrosse:', '&#x1F94D;');
+	Smilies::add($b, ':ping pong:', '&#x1F3D3;');
+	Smilies::add($b, ':badminton:', '&#x1F3F8;');
+	Smilies::add($b, ':boxing glove:', '&#x1F94A;');
+	Smilies::add($b, ':martial arts uniform:', '&#x1F94B;');
+	Smilies::add($b, ':goal net:', '&#x1F945;');
+	Smilies::add($b, ':flag in hole:', '&#x26F3;');
+	Smilies::add($b, ':ice skate:', '&#x26F8;');
+	Smilies::add($b, ':fishing pole:', '&#x1F3A3;');
+//  Smilies::add($b, ':diving mask:', '&#x1F93F;');
+	Smilies::add($b, ':running shirt:', '&#x1F3BD;');
+	Smilies::add($b, ':skis:', '&#x1F3BF;');
+	Smilies::add($b, ':sled:', '&#x1F6F7;');
+	Smilies::add($b, ':curling stone:', '&#x1F94C;');
 	Smilies::add($b, ':cycling:', '&#x1F6B4;');
 	Smilies::add($b, ':darts:', '&#x1F3AF;');
 	Smilies::add($b, ':fencing:', '&#x1F93A;');
 	Smilies::add($b, ':juggling:', '&#x1F939;');
-//	Smilies::add($b, ':skipping:', '&#x;');
-//	Smilies::add($b, ':archery:', '&#x;');
+//  Smilies::add($b, ':skipping:', '&#x;');
+//  Smilies::add($b, ':archery:', '&#x;');
 	Smilies::add($b, ':surfing:', '&#x1F3C4;');
 	Smilies::add($b, ':snooker:', '&#x1F3B1;');
 	Smilies::add($b, ':horseriding:', '&#x1F3C7;');
 
 // game
-	Smilies::add($b, ':direct hit:', '&#x1F3AF');
-	Smilies::add($b, ':yo-yo:', '&#x1FA80');
-	Smilies::add($b, ':kite:', '&#x1FA81');
-	Smilies::add($b, ':pool 8 ball:', '&#x1F3B1');
-	Smilies::add($b, ':crystal ball:', '&#x1F52E');
-	Smilies::add($b, ':nazar amulet:', '&#x1F9FF');
-	Smilies::add($b, ':video game:', '&#x1F3AE');
-	Smilies::add($b, ':joystick:', '&#x1F579');
-	Smilies::add($b, ':slot machine:', '&#x1F3B0');
-	Smilies::add($b, ':game die:', '&#x1F3B2');
-	Smilies::add($b, ':puzzle piece:', '&#x1F9E9');
-	Smilies::add($b, ':teddy bear:', '&#x1F9F8');
-	Smilies::add($b, ':spade suit:', '&#x2660');
-	Smilies::add($b, ':heart suit:', '&#x2665');
-	Smilies::add($b, ':diamond suit:', '&#x2666');
-	Smilies::add($b, ':club suit:', '&#x2663');
-	Smilies::add($b, ':chess pawn:', '&#x265F');
-	Smilies::add($b, ':joker:', '&#x1F0CF');
-	Smilies::add($b, ':mahjong red dragon:', '&#x1F004');
-	Smilies::add($b, ':flower playing cards:', '&#x1F3B4');
+	Smilies::add($b, ':direct hit:', '&#x1F3AF;');
+	Smilies::add($b, ':yo-yo:', '&#x1FA80;');
+	Smilies::add($b, ':kite:', '&#x1FA81;');
+	Smilies::add($b, ':pool 8 ball:', '&#x1F3B1;');
+	Smilies::add($b, ':crystal ball:', '&#x1F52E;');
+	Smilies::add($b, ':nazar amulet:', '&#x1F9FF;');
+	Smilies::add($b, ':video game:', '&#x1F3AE;');
+	Smilies::add($b, ':joystick:', '&#x1F579;');
+	Smilies::add($b, ':slot machine:', '&#x1F3B0;');
+	Smilies::add($b, ':game die:', '&#x1F3B2;');
+	Smilies::add($b, ':puzzle piece:', '&#x1F9E9;');
+	Smilies::add($b, ':teddy bear:', '&#x1F9F8;');
+	Smilies::add($b, ':spade suit:', '&#x2660;');
+	Smilies::add($b, ':heart suit:', '&#x2665;');
+	Smilies::add($b, ':diamond suit:', '&#x2666;');
+	Smilies::add($b, ':club suit:', '&#x2663;');
+	Smilies::add($b, ':chess pawn:', '&#x265F;');
+	Smilies::add($b, ':joker:', '&#x1F0CF;');
+	Smilies::add($b, ':mahjong red dragon:', '&#x1F004;');
+	Smilies::add($b, ':flower playing cards:', '&#x1F3B4;');
 
 // arts & crafts
-	Smilies::add($b, ':performing arts:', '&#x1F3AD');
-	Smilies::add($b, ':framed picture:', '&#x1F5BC');
-	Smilies::add($b, ':artist palette:', '&#x1F3A8');
-	Smilies::add($b, ':thread:', '&#x1F9F5');
-	Smilies::add($b, ':yarn:', '&#x1F9F6');
+	Smilies::add($b, ':performing arts:', '&#x1F3AD;');
+	Smilies::add($b, ':framed picture:', '&#x1F5BC;');
+	Smilies::add($b, ':artist palette:', '&#x1F3A8;');
+	Smilies::add($b, ':thread:', '&#x1F9F5;');
+	Smilies::add($b, ':yarn:', '&#x1F9F6;');
 
 // Objects
 // clothing
-	Smilies::add($b, ':glasses:', '&#x1F453');
-	Smilies::add($b, ':sunglasses:', '&#x1F576');
-	Smilies::add($b, ':goggles:', '&#x1F97D');
-	Smilies::add($b, ':lab coat:', '&#x1F97C');
-	Smilies::add($b, ':safety vest:', '&#x1F9BA');
-	Smilies::add($b, ':necktie:', '&#x1F454');
-	Smilies::add($b, ':t-shirt:', '&#x1F455');
-	Smilies::add($b, ':jeans:', '&#x1F456');
-	Smilies::add($b, ':scarf:', '&#x1F9E3');
-	Smilies::add($b, ':gloves:', '&#x1F9E4');
-	Smilies::add($b, ':coat:', '&#x1F9E5');
-	Smilies::add($b, ':socks:', '&#x1F9E6');
-	Smilies::add($b, ':dress:', '&#x1F457');
-	Smilies::add($b, ':kimono:', '&#x1F458');
-	Smilies::add($b, ':sari:', '&#x1F97B');
-	Smilies::add($b, ':one-piece swimsuit:', '&#x1FA71');
-	Smilies::add($b, ':briefs:', '&#x1FA72');
-	Smilies::add($b, ':shorts:', '&#x1FA73');
-	Smilies::add($b, ':bikini:', '&#x1F459');
-	Smilies::add($b, ':woman’s clothes:', '&#x1F45A');
-	Smilies::add($b, ':purse:', '&#x1F45B');
-	Smilies::add($b, ':handbag:', '&#x1F45C');
-	Smilies::add($b, ':clutch bag:', '&#x1F45D');
-	Smilies::add($b, ':shopping bags:', '&#x1F6CD');
-	Smilies::add($b, ':backpack:', '&#x1F392');
-	Smilies::add($b, ':man’s shoe:', '&#x1F45E');
-	Smilies::add($b, ':running shoe:', '&#x1F45F');
-	Smilies::add($b, ':hiking boot:', '&#x1F97E');
-	Smilies::add($b, ':flat shoe:', '&#x1F97F');
-	Smilies::add($b, ':high-heeled shoe:', '&#x1F460');
-	Smilies::add($b, ':woman’s sandal:', '&#x1F461');
-//	Smilies::add($b, ':ballet shoes:', '&#x1FA70');
-	Smilies::add($b, ':woman’s boot:', '&#x1F462');
-	Smilies::add($b, ':crown:', '&#x1F451');
-	Smilies::add($b, ':woman’s hat:', '&#x1F452');
-	Smilies::add($b, ':top hat:', '&#x1F3A9');
-	Smilies::add($b, ':graduation cap:', '&#x1F393');
-	Smilies::add($b, ':billed cap:', '&#x1F9E2');
-	Smilies::add($b, ':rescue worker’s helmet:', '&#x26D1');
-	Smilies::add($b, ':prayer beads:', '&#x1F4FF');
-	Smilies::add($b, ':lipstick:', '&#x1F484');
-	Smilies::add($b, ':ring:', '&#x1F48D');
-	Smilies::add($b, ':gem stone:', '&#x1F48E');
+	Smilies::add($b, ':glasses:', '&#x1F453;');
+	Smilies::add($b, ':sunglasses:', '&#x1F576;');
+	Smilies::add($b, ':goggles:', '&#x1F97D;');
+	Smilies::add($b, ':lab coat:', '&#x1F97C;');
+	Smilies::add($b, ':safety vest:', '&#x1F9BA;');
+	Smilies::add($b, ':necktie:', '&#x1F454;');
+	Smilies::add($b, ':t-shirt:', '&#x1F455;');
+	Smilies::add($b, ':jeans:', '&#x1F456;');
+	Smilies::add($b, ':scarf:', '&#x1F9E3;');
+	Smilies::add($b, ':gloves:', '&#x1F9E4;');
+	Smilies::add($b, ':coat:', '&#x1F9E5;');
+	Smilies::add($b, ':socks:', '&#x1F9E6;');
+	Smilies::add($b, ':dress:', '&#x1F457;');
+	Smilies::add($b, ':kimono:', '&#x1F458;');
+	Smilies::add($b, ':sari:', '&#x1F97B;');
+	Smilies::add($b, ':one-piece swimsuit:', '&#x1FA71;');
+	Smilies::add($b, ':briefs:', '&#x1FA72;');
+	Smilies::add($b, ':shorts:', '&#x1FA73;');
+	Smilies::add($b, ':bikini:', '&#x1F459;');
+	Smilies::add($b, ':woman’s clothes:', '&#x1F45A;');
+	Smilies::add($b, ':purse:', '&#x1F45B;');
+	Smilies::add($b, ':handbag:', '&#x1F45C;');
+	Smilies::add($b, ':clutch bag:', '&#x1F45D;');
+	Smilies::add($b, ':shopping bags:', '&#x1F6CD;');
+	Smilies::add($b, ':backpack:', '&#x1F392;');
+	Smilies::add($b, ':man’s shoe:', '&#x1F45E;');
+	Smilies::add($b, ':running shoe:', '&#x1F45F;');
+	Smilies::add($b, ':hiking boot:', '&#x1F97E;');
+	Smilies::add($b, ':flat shoe:', '&#x1F97F;');
+	Smilies::add($b, ':high-heeled shoe:', '&#x1F460;');
+	Smilies::add($b, ':woman’s sandal:', '&#x1F461;');
+//	Smilies::add($b, ':ballet shoes:', '&#x1FA70;');
+	Smilies::add($b, ':woman’s boot:', '&#x1F462;');
+	Smilies::add($b, ':crown:', '&#x1F451;');
+	Smilies::add($b, ':woman’s hat:', '&#x1F452;');
+	Smilies::add($b, ':top hat:', '&#x1F3A9;');
+	Smilies::add($b, ':graduation cap:', '&#x1F393;');
+	Smilies::add($b, ':billed cap:', '&#x1F9E2;');
+	Smilies::add($b, ':rescue worker’s helmet:', '&#x26D1;');
+	Smilies::add($b, ':prayer beads:', '&#x1F4FF;');
+	Smilies::add($b, ':lipstick:', '&#x1F484;');
+	Smilies::add($b, ':ring:', '&#x1F48D;');
+	Smilies::add($b, ':gem stone:', '&#x1F48E;');
 
 // sound
-	Smilies::add($b, ':muted speaker:', '&#x1F507');
-	Smilies::add($b, ':speaker low volume:', '&#x1F508');
-	Smilies::add($b, ':speaker medium volume:', '&#x1F509');
-	Smilies::add($b, ':speaker high volume:', '&#x1F50A');
-	Smilies::add($b, ':loudspeaker:', '&#x1F4E2');
-	Smilies::add($b, ':megaphone:', '&#x1F4E3');
-	Smilies::add($b, ':postal horn:', '&#x1F4EF');
-	Smilies::add($b, ':bell:', '&#x1F514');
-	Smilies::add($b, ':bell with slash:', '&#x1F515');
+	Smilies::add($b, ':muted speaker:', '&#x1F507;');
+	Smilies::add($b, ':speaker low volume:', '&#x1F508;');
+	Smilies::add($b, ':speaker medium volume:', '&#x1F509;');
+	Smilies::add($b, ':speaker high volume:', '&#x1F50A;');
+	Smilies::add($b, ':loudspeaker:', '&#x1F4E2;');
+	Smilies::add($b, ':megaphone:', '&#x1F4E3;');
+	Smilies::add($b, ':postal horn:', '&#x1F4EF;');
+	Smilies::add($b, ':bell:', '&#x1F514;');
+	Smilies::add($b, ':bell with slash:', '&#x1F515;');
 
 // musik
-	Smilies::add($b, ':musical score:', '&#x1F3BC');
-	Smilies::add($b, ':musical note:', '&#x1F3B5');
-	Smilies::add($b, ':musical notes:', '&#x1F3B6');
-	Smilies::add($b, ':studio microphone:', '&#x1F399');
-	Smilies::add($b, ':level slider:', '&#x1F39A');
-	Smilies::add($b, ':control knobs:', '&#x1F39B');
-	Smilies::add($b, ':microphone:', '&#x1F3A4');
-	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
+	Smilies::add($b, ':musical score:', '&#x1F3BC;');
+	Smilies::add($b, ':musical note:', '&#x1F3B5;');
+	Smilies::add($b, ':musical notes:', '&#x1F3B6;');
+	Smilies::add($b, ':studio microphone:', '&#x1F399;');
+	Smilies::add($b, ':level slider:', '&#x1F39A;');
+	Smilies::add($b, ':control knobs:', '&#x1F39B;');
+	Smilies::add($b, ':microphone:', '&#x1F3A4;');
+	Smilies::add($b, ':headphone:', '&#x1F3A7;');
+	Smilies::add($b, ':radio:', '&#x1F4FB;');
 
 // musical-instrument
-	Smilies::add($b, ':saxophone:', '&#x1F3B7');
-	Smilies::add($b, ':guitar:', '&#x1F3B8');
-	Smilies::add($b, ':musical keyboard:', '&#x1F3B9');
-	Smilies::add($b, ':trumpet:', '&#x1F3BA');
-	Smilies::add($b, ':violin:', '&#x1F3BB');
-//  Smilies::add($b, ':banjo:', '&#x1FA95');
-	Smilies::add($b, ':drum:', '&#x1F941');
+    Smilies::add($b, ':saxophone:', '&#x1F3B7;');
+    Smilies::add($b, ':guitar:', '&#x1F3B8;');
+    Smilies::add($b, ':musical keyboard:', '&#x1F3B9;');
+    Smilies::add($b, ':trumpet:', '&#x1F3BA;');
+    Smilies::add($b, ':violin:', '&#x1F3BB;');
+//  Smilies::add($b, ':banjo:', '&#x1FA95;');
+    Smilies::add($b, ':drum:', '&#x1F941;');
 
 // phone
-	Smilies::add($b, ':mobile phone:', '&#x1F4F1');
-	Smilies::add($b, ':mobile phone with arrow:', '&#x1F4F2');
-	Smilies::add($b, ':telephone:', '&#x260E');
-	Smilies::add($b, ':telephone receiver:', '&#x1F4DE');
-	Smilies::add($b, ':pager:', '&#x1F4DF');
-	Smilies::add($b, ':fax machine:', '&#x1F4E0');
+    Smilies::add($b, ':mobile phone:', '&#x1F4F1;');
+    Smilies::add($b, ':mobile phone with arrow:', '&#x1F4F2;');
+    Smilies::add($b, ':telephone:', '&#x260E;');
+    Smilies::add($b, ':telephone receiver:', '&#x1F4DE;');
+    Smilies::add($b, ':pager:', '&#x1F4DF;');
+    Smilies::add($b, ':fax machine:', '&#x1F4E0;');
 
 // computer
-	Smilies::add($b, ':battery:', '&#x1F50B');
-	Smilies::add($b, ':electric plug:', '&#x1F50C');
-	Smilies::add($b, ':laptop:', '&#x1F4BB');
-	Smilies::add($b, ':desktop computer:', '&#x1F5A5');
-	Smilies::add($b, ':printer:', '&#x1F5A8');
-	Smilies::add($b, ':keyboard:', '&#x2328');
-	Smilies::add($b, ':computer mouse:', '&#x1F5B1');
-	Smilies::add($b, ':trackball:', '&#x1F5B2');
-	Smilies::add($b, ':computer disk:', '&#x1F4BD');
-	Smilies::add($b, ':floppy disk:', '&#x1F4BE');
-	Smilies::add($b, ':optical disk:', '&#x1F4BF');
-	Smilies::add($b, ':dvd:', '&#x1F4C0');
-	Smilies::add($b, ':abacus:', '&#x1F9EE');
+    Smilies::add($b, ':battery:', '&#x1F50B;');
+    Smilies::add($b, ':electric plug:', '&#x1F50C;');
+    Smilies::add($b, ':laptop:', '&#x1F4BB;');
+    Smilies::add($b, ':desktop computer:', '&#x1F5A5;');
+    Smilies::add($b, ':printer:', '&#x1F5A8;');
+    Smilies::add($b, ':keyboard:', '&#x2328;');
+    Smilies::add($b, ':computer mouse:', '&#x1F5B1;');
+    Smilies::add($b, ':trackball:', '&#x1F5B2;');
+    Smilies::add($b, ':computer disk:', '&#x1F4BD;');
+    Smilies::add($b, ':floppy disk:', '&#x1F4BE;');
+    Smilies::add($b, ':optical disk:', '&#x1F4BF;');
+    Smilies::add($b, ':dvd:', '&#x1F4C0;');
+    Smilies::add($b, ':abacus:', '&#x1F9EE;');
 
 // light & video
-	Smilies::add($b, ':movie camera:', '&#x1F3A5');
-	Smilies::add($b, ':film frames:', '&#x1F39E');
-	Smilies::add($b, ':film projector:', '&#x1F4FD');
-	Smilies::add($b, ':clapper board:', '&#x1F3AC');
-	Smilies::add($b, ':television:', '&#x1F4FA');
-	Smilies::add($b, ':camera:', '&#x1F4F7');
-	Smilies::add($b, ':camera with flash:', '&#x1F4F8');
-	Smilies::add($b, ':video camera:', '&#x1F4F9');
-	Smilies::add($b, ':videocassette:', '&#x1F4FC');
-	Smilies::add($b, ':magnifying glass tilted left:', '&#x1F50D');
-	Smilies::add($b, ':magnifying glass tilted right:', '&#x1F50E');
-	Smilies::add($b, ':candle:', '&#x1F56F');
-	Smilies::add($b, ':light bulb:', '&#x1F4A1');
-	Smilies::add($b, ':flashlight:', '&#x1F526');
-	Smilies::add($b, ':red paper lantern:', '&#x1F3EE');
-//	Smilies::add($b, ':diya lamp:', '&#x1FA94');
+	Smilies::add($b, ':movie camera:', '&#x1F3A5;');
+	Smilies::add($b, ':film frames:', '&#x1F39E;');
+	Smilies::add($b, ':film projector:', '&#x1F4FD;');
+	Smilies::add($b, ':clapper board:', '&#x1F3AC;');
+	Smilies::add($b, ':television:', '&#x1F4FA;');
+	Smilies::add($b, ':camera:', '&#x1F4F7;');
+	Smilies::add($b, ':camera with flash:', '&#x1F4F8;');
+	Smilies::add($b, ':video camera:', '&#x1F4F9;');
+	Smilies::add($b, ':videocassette:', '&#x1F4FC;');
+	Smilies::add($b, ':magnifying glass tilted left:', '&#x1F50D;');
+	Smilies::add($b, ':magnifying glass tilted right:', '&#x1F50E;');
+	Smilies::add($b, ':candle:', '&#x1F56F;');
+	Smilies::add($b, ':light bulb:', '&#x1F4A1;');
+	Smilies::add($b, ':flashlight:', '&#x1F526;');
+	Smilies::add($b, ':red paper lantern:', '&#x1F3EE;');
+//  Smilies::add($b, ':diya lamp:', '&#x1FA94;');
 
 // book-paper
-	Smilies::add($b, ':notebook with decorative cover:', '&#x1F4D4');
-	Smilies::add($b, ':closed book:', '&#x1F4D5');
-	Smilies::add($b, ':open book:', '&#x1F4D6');
-	Smilies::add($b, ':green book:', '&#x1F4D7');
-	Smilies::add($b, ':blue book:', '&#x1F4D8');
-	Smilies::add($b, ':orange book:', '&#x1F4D9');
-	Smilies::add($b, ':books:', '&#x1F4DA');
-	Smilies::add($b, ':notebook:', '&#x1F4D3');
-	Smilies::add($b, ':ledger:', '&#x1F4D2');
-	Smilies::add($b, ':page with curl:', '&#x1F4C3');
-	Smilies::add($b, ':scroll:', '&#x1F4DC');
-	Smilies::add($b, ':page facing up:', '&#x1F4C4');
-	Smilies::add($b, ':newspaper:', '&#x1F4F0');
-	Smilies::add($b, ':rolled-up newspaper:', '&#x1F5DE');
-	Smilies::add($b, ':bookmark tabs:', '&#x1F4D1');
-	Smilies::add($b, ':bookmark:', '&#x1F516');
-	Smilies::add($b, ':label:', '&#x1F3F7');
+	Smilies::add($b, ':notebook with decorative cover:', '&#x1F4D4;');
+	Smilies::add($b, ':closed book:', '&#x1F4D5;');
+	Smilies::add($b, ':open book:', '&#x1F4D6;');
+	Smilies::add($b, ':green book:', '&#x1F4D7;');
+	Smilies::add($b, ':blue book:', '&#x1F4D8;');
+	Smilies::add($b, ':orange book:', '&#x1F4D9;');
+	Smilies::add($b, ':books:', '&#x1F4DA;');
+	Smilies::add($b, ':notebook:', '&#x1F4D3;');
+	Smilies::add($b, ':ledger:', '&#x1F4D2;');
+	Smilies::add($b, ':page with curl:', '&#x1F4C3;');
+	Smilies::add($b, ':scroll:', '&#x1F4DC;');
+	Smilies::add($b, ':page facing up:', '&#x1F4C4;');
+	Smilies::add($b, ':newspaper:', '&#x1F4F0;');
+	Smilies::add($b, ':rolled-up newspaper:', '&#x1F5DE;');
+	Smilies::add($b, ':bookmark tabs:', '&#x1F4D1;');
+	Smilies::add($b, ':bookmark:', '&#x1F516;');
+	Smilies::add($b, ':label:', '&#x1F3F7;');
 
 // money
-	Smilies::add($b, ':money bag:', '&#x1F4B0');
-	Smilies::add($b, ':yen banknote:', '&#x1F4B4');
-	Smilies::add($b, ':dollar banknote:', '&#x1F4B5');
-	Smilies::add($b, ':euro banknote:', '&#x1F4B6');
-	Smilies::add($b, ':pound banknote:', '&#x1F4B7');
-	Smilies::add($b, ':money with wings:', '&#x1F4B8');
-	Smilies::add($b, ':credit card:', '&#x1F4B3');
-	Smilies::add($b, ':receipt:', '&#x1F9FE');
-	Smilies::add($b, ':chart increasing with yen:', '&#x1F4B9');
+	Smilies::add($b, ':money bag:', '&#x1F4B0;');
+	Smilies::add($b, ':yen banknote:', '&#x1F4B4;');
+	Smilies::add($b, ':dollar banknote:', '&#x1F4B5;');
+	Smilies::add($b, ':euro banknote:', '&#x1F4B6;');
+	Smilies::add($b, ':pound banknote:', '&#x1F4B7;');
+	Smilies::add($b, ':money with wings:', '&#x1F4B8;');
+	Smilies::add($b, ':credit card:', '&#x1F4B3;');
+	Smilies::add($b, ':receipt:', '&#x1F9FE;');
+	Smilies::add($b, ':chart increasing with yen:', '&#x1F4B9;');
 
 // mail
-	Smilies::add($b, ':envelope:', '&#x2709');
-	Smilies::add($b, ':e-mail:', '&#x1F4E7');
-	Smilies::add($b, ':incoming envelope:', '&#x1F4E8');
-	Smilies::add($b, ':envelope with arrow:', '&#x1F4E9');
-	Smilies::add($b, ':outbox tray:', '&#x1F4E4');
-	Smilies::add($b, ':inbox tray:', '&#x1F4E5');
-	Smilies::add($b, ':package:', '&#x1F4E6');
-	Smilies::add($b, ':closed mailbox with raised flag:', '&#x1F4EB');
-	Smilies::add($b, ':closed mailbox with lowered flag:', '&#x1F4EA');
-	Smilies::add($b, ':open mailbox with raised flag:', '&#x1F4EC');
-	Smilies::add($b, ':open mailbox with lowered flag:', '&#x1F4ED');
-	Smilies::add($b, ':postbox:', '&#x1F4EE');
-	Smilies::add($b, ':ballot box with ballot:', '&#x1F5F3');
+	Smilies::add($b, ':envelope:', '&#x2709;');
+	Smilies::add($b, ':e-mail:', '&#x1F4E7;');
+	Smilies::add($b, ':incoming envelope:', '&#x1F4E8;');
+	Smilies::add($b, ':envelope with arrow:', '&#x1F4E9;');
+	Smilies::add($b, ':outbox tray:', '&#x1F4E4;');
+	Smilies::add($b, ':inbox tray:', '&#x1F4E5;');
+	Smilies::add($b, ':package:', '&#x1F4E6;');
+	Smilies::add($b, ':closed mailbox with raised flag:', '&#x1F4EB;');
+	Smilies::add($b, ':closed mailbox with lowered flag:', '&#x1F4EA;');
+	Smilies::add($b, ':open mailbox with raised flag:', '&#x1F4EC;');
+	Smilies::add($b, ':open mailbox with lowered flag:', '&#x1F4ED;');
+	Smilies::add($b, ':postbox:', '&#x1F4EE;');
+	Smilies::add($b, ':ballot box with ballot:', '&#x1F5F3;');
 
 // writing
-	Smilies::add($b, ':pencil:', '&#x270F');
-	Smilies::add($b, ':black nib:', '&#x2712');
-	Smilies::add($b, ':fountain pen:', '&#x1F58B');
-	Smilies::add($b, ':pen:', '&#x1F58A');
-	Smilies::add($b, ':paintbrush:', '&#x1F58C');
-	Smilies::add($b, ':crayon:', '&#x1F58D');
-	Smilies::add($b, ':memo:', '&#x1F4DD');
+	Smilies::add($b, ':pencil:', '&#x270F;');
+	Smilies::add($b, ':black nib:', '&#x2712;');
+	Smilies::add($b, ':fountain pen:', '&#x1F58B;');
+	Smilies::add($b, ':pen:', '&#x1F58A;');
+	Smilies::add($b, ':paintbrush:', '&#x1F58C;');
+	Smilies::add($b, ':crayon:', '&#x1F58D;');
+	Smilies::add($b, ':memo:', '&#x1F4DD;');
 
 // office
-	Smilies::add($b, ':briefcase:', '&#x1F4BC');
-	Smilies::add($b, ':file folder:', '&#x1F4C1');
-	Smilies::add($b, ':open file folder:', '&#x1F4C2');
-	Smilies::add($b, ':card index dividers:', '&#x1F5C2');
-	Smilies::add($b, ':calendar:', '&#x1F4C5');
-	Smilies::add($b, ':tear-off calendar:', '&#x1F4C6');
-	Smilies::add($b, ':spiral notepad:', '&#x1F5D2');
-	Smilies::add($b, ':spiral calendar:', '&#x1F5D3');
-	Smilies::add($b, ':card index:', '&#x1F4C7');
-	Smilies::add($b, ':chart increasing:', '&#x1F4C8');
-	Smilies::add($b, ':chart decreasing:', '&#x1F4C9');
-	Smilies::add($b, ':bar chart:', '&#x1F4CA');
-	Smilies::add($b, ':clipboard:', '&#x1F4CB');
-	Smilies::add($b, ':pushpin:', '&#x1F4CC');
-	Smilies::add($b, ':round pushpin:', '&#x1F4CD');
-	Smilies::add($b, ':paperclip:', '&#x1F4CE');
-	Smilies::add($b, ':linked paperclips:', '&#x1F587');
-	Smilies::add($b, ':straight ruler:', '&#x1F4CF');
-	Smilies::add($b, ':triangular ruler:', '&#x1F4D0');
-	Smilies::add($b, ':scissors:', '&#x2702');
-	Smilies::add($b, ':card file box:', '&#x1F5C3');
-	Smilies::add($b, ':file cabinet:', '&#x1F5C4');
-	Smilies::add($b, ':wastebasket:', '&#x1F5D1');
+	Smilies::add($b, ':briefcase:', '&#x1F4BC;');
+	Smilies::add($b, ':file folder:', '&#x1F4C1;');
+	Smilies::add($b, ':open file folder:', '&#x1F4C2;');
+	Smilies::add($b, ':card index dividers:', '&#x1F5C2;');
+	Smilies::add($b, ':calendar:', '&#x1F4C5;');
+	Smilies::add($b, ':tear-off calendar:', '&#x1F4C6;');
+	Smilies::add($b, ':spiral notepad:', '&#x1F5D2;');
+	Smilies::add($b, ':spiral calendar:', '&#x1F5D3;');
+	Smilies::add($b, ':card index:', '&#x1F4C7;');
+	Smilies::add($b, ':chart increasing:', '&#x1F4C8;');
+	Smilies::add($b, ':chart decreasing:', '&#x1F4C9;');
+	Smilies::add($b, ':bar chart:', '&#x1F4CA;');
+	Smilies::add($b, ':clipboard:', '&#x1F4CB;');
+	Smilies::add($b, ':pushpin:', '&#x1F4CC;');
+	Smilies::add($b, ':round pushpin:', '&#x1F4CD;');
+	Smilies::add($b, ':paperclip:', '&#x1F4CE;');
+	Smilies::add($b, ':linked paperclips:', '&#x1F587;');
+	Smilies::add($b, ':straight ruler:', '&#x1F4CF;');
+	Smilies::add($b, ':triangular ruler:', '&#x1F4D0;');
+	Smilies::add($b, ':scissors:', '&#x2702;');
+	Smilies::add($b, ':card file box:', '&#x1F5C3;');
+	Smilies::add($b, ':file cabinet:', '&#x1F5C4;');
+	Smilies::add($b, ':wastebasket:', '&#x1F5D1;');
 
 // lock
-	Smilies::add($b, ':locked:', '&#x1F512');
-	Smilies::add($b, ':unlocked:', '&#x1F513');
-	Smilies::add($b, ':locked with pen:', '&#x1F50F');
-	Smilies::add($b, ':locked with key:', '&#x1F510');
-	Smilies::add($b, ':key:', '&#x1F511');
-	Smilies::add($b, ':old key:', '&#x1F5DD');
+	Smilies::add($b, ':locked:', '&#x1F512;');
+	Smilies::add($b, ':unlocked:', '&#x1F513;');
+	Smilies::add($b, ':locked with pen:', '&#x1F50F;');
+	Smilies::add($b, ':locked with key:', '&#x1F510;');
+	Smilies::add($b, ':key:', '&#x1F511;');
+	Smilies::add($b, ':old key:', '&#x1F5DD;');
 
 // tool
-	Smilies::add($b, ':hammer:', '&#x1F528');
-//	Smilies::add($b, ':axe:', '&#x1FA93');
-	Smilies::add($b, ':pick:', '&#x26CF');
-	Smilies::add($b, ':hammer and pick:', '&#x2692');
-	Smilies::add($b, ':hammer and wrench:', '&#x1F6E0');
-	Smilies::add($b, ':dagger:', '&#x1F5E1');
+	Smilies::add($b, ':hammer:', '&#x1F528;');
+//	Smilies::add($b, ':axe:', '&#x1FA93;');
+	Smilies::add($b, ':pick:', '&#x26CF;');
+	Smilies::add($b, ':hammer and pick:', '&#x2692;');
+	Smilies::add($b, ':hammer and wrench:', '&#x1F6E0;');
+	Smilies::add($b, ':dagger:', '&#x1F5E1;');
 	Smilies::add($b, ':sabre:', '&#x1F5E1;');
-	Smilies::add($b, ':crossed swords:', '&#x2694');
-	Smilies::add($b, ':pistol:', '&#x1F52B');
-	Smilies::add($b, ':bow and arrow:', '&#x1F3F9');
-	Smilies::add($b, ':shield:', '&#x1F6E1');
-	Smilies::add($b, ':wrench:', '&#x1F527');
-	Smilies::add($b, ':nut and bolt:', '&#x1F529');
-	Smilies::add($b, ':gear:', '&#x2699');
-	Smilies::add($b, ':clamp:', '&#x1F5DC');
-	Smilies::add($b, ':balance scale:', '&#x2696');
-	Smilies::add($b, ':white cane:', '&#x1F9AF');
-	Smilies::add($b, ':link:', '&#x1F517');
-	Smilies::add($b, ':chains:', '&#x26D3');
-	Smilies::add($b, ':toolbox:', '&#x1F9F0');
-	Smilies::add($b, ':magnet:', '&#x1F9F2');
+	Smilies::add($b, ':crossed swords:', '&#x2694;');
+	Smilies::add($b, ':pistol:', '&#x1F52B;');
+	Smilies::add($b, ':bow and arrow:', '&#x1F3F9;');
+	Smilies::add($b, ':shield:', '&#x1F6E1;');
+	Smilies::add($b, ':wrench:', '&#x1F527;');
+	Smilies::add($b, ':nut and bolt:', '&#x1F529;');
+	Smilies::add($b, ':gear:', '&#x2699;');
+	Smilies::add($b, ':clamp:', '&#x1F5DC;');
+	Smilies::add($b, ':balance scale:', '&#x2696;');
+	Smilies::add($b, ':white cane:', '&#x1F9AF;');
+	Smilies::add($b, ':link:', '&#x1F517;');
+	Smilies::add($b, ':chains:', '&#x26D3;');
+	Smilies::add($b, ':toolbox:', '&#x1F9F0;');
+	Smilies::add($b, ':magnet:', '&#x1F9F2;');
 
 // science
-	Smilies::add($b, ':alembic:', '&#x2697');
-	Smilies::add($b, ':test tube:', '&#x1F9EA');
-	Smilies::add($b, ':petri dish:', '&#x1F9EB');
-	Smilies::add($b, ':dna:', '&#x1F9EC');
-	Smilies::add($b, ':microscope:', '&#x1F52C');
-	Smilies::add($b, ':telescope:', '&#x1F52D');
-	Smilies::add($b, ':satellite antenna:', '&#x1F4E1');
-	Smilies::add($b, ':asterism:', '&#8258');
-	Smilies::add($b, ':outlines white star:', '&#9885');
+	Smilies::add($b, ':alembic:', '&#x2697;');
+	Smilies::add($b, ':test tube:', '&#x1F9EA;');
+	Smilies::add($b, ':petri dish:', '&#x1F9EB;');
+	Smilies::add($b, ':dna:', '&#x1F9EC;');
+	Smilies::add($b, ':microscope:', '&#x1F52C;');
+	Smilies::add($b, ':telescope:', '&#x1F52D;');
+	Smilies::add($b, ':satellite antenna:', '&#x1F4E1;');
+	Smilies::add($b, ':asterism:', '&#x2042;');
+	Smilies::add($b, ':outlines white star:', '&#x9885;');
 
 // medical
-	Smilies::add($b, ':syringe:', '&#x1F489');
-	Smilies::add($b, ':drop of blood:', '&#x1FA78');
-	Smilies::add($b, ':pill:', '&#x1F48A');
-	Smilies::add($b, ':adhesive bandage:', '&#x1FA79');
-	Smilies::add($b, ':stethoscope:', '&#x1FA7A');
+	Smilies::add($b, ':syringe:', '&#x1F489;');
+	Smilies::add($b, ':drop of blood:', '&#x1FA78;');
+	Smilies::add($b, ':pill:', '&#x1F48A;');
+	Smilies::add($b, ':adhesive bandage:', '&#x1FA79;');
+	Smilies::add($b, ':stethoscope:', '&#x1FA7A;');
 
 // household
-	Smilies::add($b, ':door:', '&#x1F6AA');
-	Smilies::add($b, ':bed:', '&#x1F6CF');
-	Smilies::add($b, ':couch and lamp:', '&#x1F6CB');
-//	Smilies::add($b, ':chair:', '&#x1FA91');
-	Smilies::add($b, ':toilet:', '&#x1F6BD');
-	Smilies::add($b, ':shower:', '&#x1F6BF');
-	Smilies::add($b, ':bathtub:', '&#x1F6C1');
-	Smilies::add($b, ':razor:', '&#x1FA92');
-	Smilies::add($b, ':lotion bottle:', '&#x1F9F4');
-	Smilies::add($b, ':safety pin:', '&#x1F9F7');
-	Smilies::add($b, ':broom:', '&#x1F9F9');
-	Smilies::add($b, ':basket:', '&#x1F9FA');
-	Smilies::add($b, ':roll of paper:', '&#x1F9FB');
-	Smilies::add($b, ':soap:', '&#x1F9FC');
-	Smilies::add($b, ':sponge:', '&#x1F9FD');
-	Smilies::add($b, ':fire extinguisher:', '&#x1F9EF');
-	Smilies::add($b, ':shopping cart:', '&#x1F6D2');
+	Smilies::add($b, ':door:', '&#x1F6AA;');
+	Smilies::add($b, ':bed:', '&#x1F6CF;');
+	Smilies::add($b, ':couch and lamp:', '&#x1F6CB;');
+//	Smilies::add($b, ':chair:', '&#x1FA91;');
+	Smilies::add($b, ':toilet:', '&#x1F6BD;');
+	Smilies::add($b, ':shower:', '&#x1F6BF;');
+	Smilies::add($b, ':bathtub:', '&#x1F6C1;');
+	Smilies::add($b, ':razor:', '&#x1FA92;');
+	Smilies::add($b, ':lotion bottle:', '&#x1F9F4;');
+	Smilies::add($b, ':safety pin:', '&#x1F9F7;');
+	Smilies::add($b, ':broom:', '&#x1F9F9;');
+	Smilies::add($b, ':basket:', '&#x1F9FA;');
+	Smilies::add($b, ':roll of paper:', '&#x1F9FB;');
+	Smilies::add($b, ':soap:', '&#x1F9FC;');
+	Smilies::add($b, ':sponge:', '&#x1F9FD;');
+	Smilies::add($b, ':fire extinguisher:', '&#x1F9EF;');
+	Smilies::add($b, ':shopping cart:', '&#x1F6D2;');
 
 // other-object
-	Smilies::add($b, ':cigarette:', '&#x1F6AC');
-	Smilies::add($b, ':coffin:', '&#x26B0');
-	Smilies::add($b, ':funeral urn:', '&#x26B1');
-	Smilies::add($b, ':moai:', '&#x1F5FF');
+	Smilies::add($b, ':cigarette:', '&#x1F6AC;');
+	Smilies::add($b, ':coffin:', '&#x26B0;');
+	Smilies::add($b, ':funeral urn:', '&#x26B1;');
+	Smilies::add($b, ':moai:', '&#x1F5FF;');
 
 // Symbols
 // transport-sign
-	Smilies::add($b, ':atm sign:', '&#x1F3E7');
-	Smilies::add($b, ':litter in bin sign:', '&#x1F6AE');
-	Smilies::add($b, ':potable water:', '&#x1F6B0');
-	Smilies::add($b, ':wheelchair symbol:', '&#x267F');
-	Smilies::add($b, ':men’s room:', '&#x1F6B9');
-	Smilies::add($b, ':women’s room:', '&#x1F6BA');
-	Smilies::add($b, ':restroom:', '&#x1F6BB');
-	Smilies::add($b, ':baby symbol:', '&#x1F6BC');
-	Smilies::add($b, ':water closet:', '&#x1F6BE');
-	Smilies::add($b, ':passport control:', '&#x1F6C2');
-	Smilies::add($b, ':customs:', '&#x1F6C3');
-	Smilies::add($b, ':baggage claim:', '&#x1F6C4');
-	Smilies::add($b, ':left luggage:', '&#x1F6C5');
+	Smilies::add($b, ':atm sign:', '&#x1F3E7;');
+	Smilies::add($b, ':litter in bin sign:', '&#x1F6AE;');
+	Smilies::add($b, ':potable water:', '&#x1F6B0;');
+	Smilies::add($b, ':wheelchair symbol:', '&#x267F;');
+	Smilies::add($b, ':men’s room:', '&#x1F6B9;');
+	Smilies::add($b, ':women’s room:', '&#x1F6BA;');
+	Smilies::add($b, ':restroom:', '&#x1F6BB;');
+	Smilies::add($b, ':baby symbol:', '&#x1F6BC;');
+	Smilies::add($b, ':water closet:', '&#x1F6BE;');
+	Smilies::add($b, ':passport control:', '&#x1F6C2;');
+	Smilies::add($b, ':customs:', '&#x1F6C3;');
+	Smilies::add($b, ':baggage claim:', '&#x1F6C4;');
+	Smilies::add($b, ':left luggage:', '&#x1F6C5;');
 
 // warning
-	Smilies::add($b, ':warning:', '&#x26A0');
-	Smilies::add($b, ':children crossing:', '&#x1F6B8');
-	Smilies::add($b, ':no entry:', '&#x26D4');
-	Smilies::add($b, ':prohibited:', '&#x1F6AB');
-	Smilies::add($b, ':no bicycles:', '&#x1F6B3');
-	Smilies::add($b, ':no smoking:', '&#x1F6AD');
-	Smilies::add($b, ':no littering:', '&#x1F6AF');
-	Smilies::add($b, ':non-potable water:', '&#x1F6B1');
-	Smilies::add($b, ':no pedestrians:', '&#x1F6B7');
-	Smilies::add($b, ':no mobile phones:', '&#x1F4F5');
-	Smilies::add($b, ':no one under eighteen:', '&#x1F51E');
-	Smilies::add($b, ':radioactive:', '&#x2622');
-	Smilies::add($b, ':biohazard:', '&#x2623');
+	Smilies::add($b, ':warning:', '&#x26A0;');
+	Smilies::add($b, ':children crossing:', '&#x1F6B8;');
+	Smilies::add($b, ':no entry:', '&#x26D4;');
+	Smilies::add($b, ':prohibited:', '&#x1F6AB;');
+	Smilies::add($b, ':no bicycles:', '&#x1F6B3;');
+	Smilies::add($b, ':no smoking:', '&#x1F6AD;');
+	Smilies::add($b, ':no littering:', '&#x1F6AF;');
+	Smilies::add($b, ':non-potable water:', '&#x1F6B1;');
+	Smilies::add($b, ':no pedestrians:', '&#x1F6B7;');
+	Smilies::add($b, ':no mobile phones:', '&#x1F4F5;');
+	Smilies::add($b, ':no one under eighteen:', '&#x1F51E;');
+	Smilies::add($b, ':radioactive:', '&#x2622;');
+	Smilies::add($b, ':biohazard:', '&#x2623;');
 	Smilies::add($b, ':army:', '&#x1FA96;');
 
 // arrow
-	Smilies::add($b, ':up arrow:', '&#x2B06');
-	Smilies::add($b, ':up-right arrow:', '&#x2197');
-	Smilies::add($b, ':right arrow:', '&#x27A1');
-	Smilies::add($b, ':down-right arrow:', '&#x2198');
-	Smilies::add($b, ':down arrow:', '&#x2B07');
-	Smilies::add($b, ':down-left arrow:', '&#x2199');
-	Smilies::add($b, ':left arrow:', '&#x2B05');
-	Smilies::add($b, ':up-left arrow:', '&#x2196');
-	Smilies::add($b, ':up-down arrow:', '&#x2195');
-	Smilies::add($b, ':left-right arrow:', '&#x2194');
-	Smilies::add($b, ':right arrow curving left:', '&#x21A9');
-	Smilies::add($b, ':left arrow curving right:', '&#x21AA');
-	Smilies::add($b, ':right arrow curving up:', '&#x2934');
-	Smilies::add($b, ':right arrow curving down:', '&#x2935');
-	Smilies::add($b, ':clockwise vertical arrows:', '&#x1F503');
-	Smilies::add($b, ':counterclockwise arrows button:', '&#x1F504');
-	Smilies::add($b, ':BACK arrow:', '&#x1F519');
-	Smilies::add($b, ':END arrow:', '&#x1F51A');
-	Smilies::add($b, ':ON! arrow:', '&#x1F51B');
-	Smilies::add($b, ':SOON arrow:', '&#x1F51C');
-	Smilies::add($b, ':TOP arrow:', '&#x1F51D');
+	Smilies::add($b, ':up arrow:', '&#x2B06;');
+	Smilies::add($b, ':up-right arrow:', '&#x2197;');
+	Smilies::add($b, ':right arrow:', '&#x27A1;');
+	Smilies::add($b, ':down-right arrow:', '&#x2198;');
+	Smilies::add($b, ':down arrow:', '&#x2B07;');
+	Smilies::add($b, ':down-left arrow:', '&#x2199;');
+	Smilies::add($b, ':left arrow:', '&#x2B05;');
+	Smilies::add($b, ':up-left arrow:', '&#x2196;');
+	Smilies::add($b, ':up-down arrow:', '&#x2195;');
+	Smilies::add($b, ':left-right arrow:', '&#x2194;');
+	Smilies::add($b, ':right arrow curving left:', '&#x21A9;');
+	Smilies::add($b, ':left arrow curving right:', '&#x21AA;');
+	Smilies::add($b, ':right arrow curving up:', '&#x2934;');
+	Smilies::add($b, ':right arrow curving down:', '&#x2935;');
+	Smilies::add($b, ':clockwise vertical arrows:', '&#x1F503;');
+	Smilies::add($b, ':counterclockwise arrows button:', '&#x1F504;');
+	Smilies::add($b, ':BACK arrow:', '&#x1F519;');
+	Smilies::add($b, ':END arrow:', '&#x1F51A;');
+	Smilies::add($b, ':ON! arrow:', '&#x1F51B;');
+	Smilies::add($b, ':SOON arrow:', '&#x1F51C;');
+	Smilies::add($b, ':TOP arrow:', '&#x1F51D;');
 
 // religion
-	Smilies::add($b, ':place of worship:', '&#x1F6D0');
-	Smilies::add($b, ':atom symbol:', '&#x269B');
-	Smilies::add($b, ':om:', '&#x1F549');
-	Smilies::add($b, ':star of David:', '&#x2721');
-	Smilies::add($b, ':wheel of dharma:', '&#x2638');
-	Smilies::add($b, ':yin yang:', '&#x262F');
-	Smilies::add($b, ':latin cross:', '&#x271D');
-	Smilies::add($b, ':orthodox cross:', '&#x2626');
-	Smilies::add($b, ':star and crescent:', '&#x262A');
-	Smilies::add($b, ':peace symbol:', '&#x262E');
-	Smilies::add($b, ':menorah:', '&#x1F54E');
-	Smilies::add($b, ':dotted six-pointed star:', '&#x1F52F');
+	Smilies::add($b, ':place of worship:', '&#x1F6D0;');
+	Smilies::add($b, ':atom symbol:', '&#x269B;');
+	Smilies::add($b, ':om:', '&#x1F549;');
+	Smilies::add($b, ':star of David:', '&#x2721;');
+	Smilies::add($b, ':wheel of dharma:', '&#x2638;');
+	Smilies::add($b, ':yin yang:', '&#x262F;');
+	Smilies::add($b, ':latin cross:', '&#x271D;');
+	Smilies::add($b, ':orthodox cross:', '&#x2626;');
+	Smilies::add($b, ':star and crescent:', '&#x262A;');
+	Smilies::add($b, ':peace symbol:', '&#x262E;');
+	Smilies::add($b, ':menorah:', '&#x1F54E;');
+	Smilies::add($b, ':dotted six-pointed star:', '&#x1F52F;');
 
 // zodiac
-	Smilies::add($b, ':Aries:', '&#x2648');
-	Smilies::add($b, ':Taurus:', '&#x2649');
-	Smilies::add($b, ':Gemini:', '&#x264A');
-	Smilies::add($b, ':Cancer:', '&#x264B');
-	Smilies::add($b, ':Leo:', '&#x264C');
-	Smilies::add($b, ':Virgo:', '&#x264D');
-	Smilies::add($b, ':Libra:', '&#x264E');
-	Smilies::add($b, ':Scorpio:', '&#x264F');
-	Smilies::add($b, ':Sagittarius:', '&#x2650');
-	Smilies::add($b, ':Capricorn:', '&#x2651');
-	Smilies::add($b, ':Aquarius:', '&#x2652');
-	Smilies::add($b, ':Pisces:', '&#x2653');
-	Smilies::add($b, ':Ophiuchus:', '&#x26CE');
+	Smilies::add($b, ':Aries:', '&#x2648;');
+	Smilies::add($b, ':Taurus:', '&#x2649;');
+	Smilies::add($b, ':Gemini:', '&#x264A;');
+	Smilies::add($b, ':Cancer:', '&#x264B;');
+	Smilies::add($b, ':Leo:', '&#x264C;');
+	Smilies::add($b, ':Virgo:', '&#x264D;');
+	Smilies::add($b, ':Libra:', '&#x264E;');
+	Smilies::add($b, ':Scorpio:', '&#x264F;');
+	Smilies::add($b, ':Sagittarius:', '&#x2650;');
+	Smilies::add($b, ':Capricorn:', '&#x2651;');
+	Smilies::add($b, ':Aquarius:', '&#x2652;');
+	Smilies::add($b, ':Pisces:', '&#x2653;');
+	Smilies::add($b, ':Ophiuchus:', '&#x26CE;');
 
 // av-symbol
-	Smilies::add($b, ':shuffle tracks button:', '&#x1F500');
-	Smilies::add($b, ':repeat button:', '&#x1F501');
-	Smilies::add($b, ':repeat single button:', '&#x1F502');
-	Smilies::add($b, ':play button:', '&#x25B6');
-	Smilies::add($b, ':fast-forward button:', '&#x23E9');
-	Smilies::add($b, ':next track button:', '&#x23ED');
-	Smilies::add($b, ':play or pause button:', '&#x23EF');
-	Smilies::add($b, ':reverse button:', '&#x25C0');
-	Smilies::add($b, ':fast reverse button:', '&#x23EA');
-	Smilies::add($b, ':last track button:', '&#x23EE');
-	Smilies::add($b, ':upwards button:', '&#x1F53C');
-	Smilies::add($b, ':fast up button:', '&#x23EB');
-	Smilies::add($b, ':downwards button:', '&#x1F53D');
-	Smilies::add($b, ':fast down button:', '&#x23EC');
-	Smilies::add($b, ':pause button:', '&#x23F8');
-	Smilies::add($b, ':stop button:', '&#x23F9');
-	Smilies::add($b, ':record button:', '&#x23FA');
-	Smilies::add($b, ':eject button:', '&#x23CF');
-	Smilies::add($b, ':cinema:', '&#x1F3A6');
-	Smilies::add($b, ':dim button:', '&#x1F505');
-	Smilies::add($b, ':bright button:', '&#x1F506');
-	Smilies::add($b, ':antenna bars:', '&#x1F4F6');
-	Smilies::add($b, ':vibration mode:', '&#x1F4F3');
-	Smilies::add($b, ':mobile phone off:', '&#x1F4F4');
+	Smilies::add($b, ':shuffle tracks button:', '&#x1F500;');
+	Smilies::add($b, ':repeat button:', '&#x1F501;');
+	Smilies::add($b, ':repeat single button:', '&#x1F502;');
+	Smilies::add($b, ':play button:', '&#x25B6;');
+	Smilies::add($b, ':fast-forward button:', '&#x23E9;');
+	Smilies::add($b, ':next track button:', '&#x23ED;');
+	Smilies::add($b, ':play or pause button:', '&#x23EF;');
+	Smilies::add($b, ':reverse button:', '&#x25C0;');
+	Smilies::add($b, ':fast reverse button:', '&#x23EA;');
+	Smilies::add($b, ':last track button:', '&#x23EE;');
+	Smilies::add($b, ':upwards button:', '&#x1F53C;');
+	Smilies::add($b, ':fast up button:', '&#x23EB;');
+	Smilies::add($b, ':downwards button:', '&#x1F53D;');
+	Smilies::add($b, ':fast down button:', '&#x23EC;');
+	Smilies::add($b, ':pause button:', '&#x23F8;');
+	Smilies::add($b, ':stop button:', '&#x23F9;');
+	Smilies::add($b, ':record button:', '&#x23FA;');
+	Smilies::add($b, ':eject button:', '&#x23CF;');
+	Smilies::add($b, ':cinema:', '&#x1F3A6;');
+	Smilies::add($b, ':dim button:', '&#x1F505;');
+	Smilies::add($b, ':bright button:', '&#x1F506;');
+	Smilies::add($b, ':antenna bars:', '&#x1F4F6;');
+	Smilies::add($b, ':vibration mode:', '&#x1F4F3;');
+	Smilies::add($b, ':mobile phone off:', '&#x1F4F4;');
 
 // gender
-	Smilies::add($b, ':female sign:', '&#x2640');
-	Smilies::add($b, ':male sign:', '&#x2642');
+	Smilies::add($b, ':female sign:', '&#x2640;');
+	Smilies::add($b, ':male sign:', '&#x2642;');
 
 // math
-	Smilies::add($b, ':multiply:', '&#x2716');
-	Smilies::add($b, ':plus:', '&#x2795');
-	Smilies::add($b, ':minus:', '&#x2796');
-	Smilies::add($b, ':divide:', '&#x2797');
-	Smilies::add($b, ':infinity:', '&#x267E');
+	Smilies::add($b, ':multiply:', '&#x2716;');
+	Smilies::add($b, ':plus:', '&#x2795;');
+	Smilies::add($b, ':minus:', '&#x2796;');
+	Smilies::add($b, ':divide:', '&#x2797;');
+	Smilies::add($b, ':infinity:', '&#x267E;');
 	Smilies::add($b, ':kreisoperator:', '&#x2218;');
 	Smilies::add($b, ':leere menge:', '&#x2205;');
 	Smilies::add($b, ':rundung:', '&#x2248;');
@@ -1458,407 +1454,408 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':prozent:', '&#x0025;');
 
 // punctuation
-	Smilies::add($b, ':double exclamation mark:', '&#x203C');
-	Smilies::add($b, ':exclamation question mark:', '&#x2049');
-	Smilies::add($b, ':question mark:', '&#x2753');
-	Smilies::add($b, ':white question mark:', '&#x2754');
-	Smilies::add($b, ':white exclamation mark:', '&#x2755');
-	Smilies::add($b, ':exclamation mark:', '&#x2757');
-	Smilies::add($b, ':wavy dash:', '&#x3030');
+	Smilies::add($b, ':double exclamation mark:', '&#x203C;');
+	Smilies::add($b, ':exclamation question mark:', '&#x2049;');
+	Smilies::add($b, ':question mark:', '&#x2753;');
+	Smilies::add($b, ':white question mark:', '&#x2754;');
+	Smilies::add($b, ':white exclamation mark:', '&#x2755;');
+	Smilies::add($b, ':exclamation mark:', '&#x2757;');
+	Smilies::add($b, ':wavy dash:', '&#x3030;');
 
 // currency
-	Smilies::add($b, ':currency exchange:', '&#x1F4B1');
-	Smilies::add($b, ':heavy dollar sign:', '&#x1F4B2');
+	Smilies::add($b, ':currency exchange:', '&#x1F4B1;');
+	Smilies::add($b, ':heavy dollar sign:', '&#x1F4B2;');
 
 // other-symbol
-	Smilies::add($b, ':medical symbol:', '&#x2695');
-	Smilies::add($b, ':recycling symbol:', '&#x267B');
-	Smilies::add($b, ':fleur-de-lis:', '&#x269C');
-	Smilies::add($b, ':trident emblem:', '&#x1F531');
-	Smilies::add($b, ':name badge:', '&#x1F4DB');
-	Smilies::add($b, ':Japanese symbol for beginner:', '&#x1F530');
-	Smilies::add($b, ':hollow red circle:', '&#x2B55');
-	Smilies::add($b, ':check mark button:', '&#x2705');
-	Smilies::add($b, ':check box with check:', '&#x2611');
-	Smilies::add($b, ':check mark:', '&#x2714');
-	Smilies::add($b, ':cross mark:', '&#x274C');
-	Smilies::add($b, ':cross mark button:', '&#x274E');
-	Smilies::add($b, ':curly loop:', '&#x27B0');
-	Smilies::add($b, ':double curly loop:', '&#x27BF');
-	Smilies::add($b, ':part alternation mark:', '&#x303D');
-	Smilies::add($b, ':eight-spoked asterisk:', '&#x2733');
-	Smilies::add($b, ':eight-pointed star:', '&#x2734');
-	Smilies::add($b, ':sparkle:', '&#x2747');
-	Smilies::add($b, ':copyright:', '&#x00A9');
-	Smilies::add($b, ':registered:', '&#x00AE');
-	Smilies::add($b, ':trade mark:', '&#x2122');
+	Smilies::add($b, ':medical symbol:', '&#x2695;');
+	Smilies::add($b, ':recycling symbol:', '&#x267B;');
+	Smilies::add($b, ':fleur-de-lis:', '&#x269C;');
+	Smilies::add($b, ':trident emblem:', '&#x1F531;');
+	Smilies::add($b, ':name badge:', '&#x1F4DB;');
+	Smilies::add($b, ':Japanese symbol for beginner:', '&#x1F530;');
+	Smilies::add($b, ':hollow red circle:', '&#x2B55;');
+	Smilies::add($b, ':check mark button:', '&#x2705;');
+	Smilies::add($b, ':check box with check:', '&#x2611;');
+	Smilies::add($b, ':check mark:', '&#x2714;');
+	Smilies::add($b, ':cross mark:', '&#x274C;');
+	Smilies::add($b, ':cross mark button:', '&#x274E;');
+	Smilies::add($b, ':curly loop:', '&#x27B0;');
+	Smilies::add($b, ':double curly loop:', '&#x27BF;');
+	Smilies::add($b, ':part alternation mark:', '&#x303D;');
+	Smilies::add($b, ':eight-spoked asterisk:', '&#x2733;');
+	Smilies::add($b, ':eight-pointed star:', '&#x2734;');
+	Smilies::add($b, ':sparkle:', '&#x2747;');
+	Smilies::add($b, ':copyright:', '&#x00A9;');
+	Smilies::add($b, ':registered:', '&#x00AE;');
+	Smilies::add($b, ':trade mark:', '&#x2122;');
 
 // keycap
-	Smilies::add($b, ':keycap: #:', '&#x0023&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: *:', '&#x002A&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 0:', '&#x0030&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 1:', '&#x0031&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 2:', '&#x0032&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 3:', '&#x0033&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 4:', '&#x0034&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 5:', '&#x0035&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 6:', '&#x0036&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 7:', '&#x0037&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 8:', '&#x0038&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 9:', '&#x0039&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 10:', '&#x1F51F');
+	Smilies::add($b, ':keycap: #:', '&#x0023;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: *:', '&#x002A;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 0:', '&#x0030;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 1:', '&#x0031;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 2:', '&#x0032;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 3:', '&#x0033;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 4:', '&#x0034;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 5:', '&#x0035;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 6:', '&#x0036;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 7:', '&#x0037;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 8:', '&#x0038;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 9:', '&#x0039;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 10:', '&#x1F51F;');
 
 // alphanum
-	Smilies::add($b, ':input latin uppercase:', '&#x1F520');
-	Smilies::add($b, ':input latin lowercase:', '&#x1F521');
-	Smilies::add($b, ':input numbers:', '&#x1F522');
-	Smilies::add($b, ':input symbols:', '&#x1F523');
-	Smilies::add($b, ':input latin letters:', '&#x1F524');
-	Smilies::add($b, ':A button (blood type):', '&#x1F170');
-	Smilies::add($b, ':AB button (blood type):', '&#x1F18E');
-	Smilies::add($b, ':B button (blood type):', '&#x1F171');
-	Smilies::add($b, ':CL button:', '&#x1F191');
-	Smilies::add($b, ':COOL button:', '&#x1F192');
+	Smilies::add($b, ':input latin uppercase:', '&#x1F520;');
+	Smilies::add($b, ':input latin lowercase:', '&#x1F521;');
+	Smilies::add($b, ':input numbers:', '&#x1F522;');
+	Smilies::add($b, ':input symbols:', '&#x1F523;');
+	Smilies::add($b, ':input latin letters:', '&#x1F524;');
+	Smilies::add($b, ':A button (blood type):', '&#x1F170;');
+	Smilies::add($b, ':AB button (blood type):', '&#x1F18E;');
+	Smilies::add($b, ':B button (blood type):', '&#x1F171;');
+	Smilies::add($b, ':CL button:', '&#x1F191;');
+	Smilies::add($b, ':COOL button:', '&#x1F192;');
 	Smilies::add($b, ':cool:', '&#x1F192;');
-	Smilies::add($b, ':FREE button:', '&#x1F193');
-	Smilies::add($b, ':information:', '&#x2139');
-	Smilies::add($b, ':ID button:', '&#x1F194');
-	Smilies::add($b, ':circled M:', '&#x24C2');
-	Smilies::add($b, ':NEW button:', '&#x1F195');
-	Smilies::add($b, ':NG button:', '&#x1F196');
-	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
-	Smilies::add($b, ':OK button:', '&#x1F197');
-	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
-	Smilies::add($b, ':UP! button:', '&#x1F199');
-	Smilies::add($b, ':VS button:', '&#x1F19A');
-	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
-	Smilies::add($b, ':Japanese “service charge” button:', '&#x1F202');
-	Smilies::add($b, ':Japanese “monthly amount” button:', '&#x1F237');
-	Smilies::add($b, ':Japanese “not free of charge” button:', '&#x1F236');
-	Smilies::add($b, ':Japanese “reserved” button:', '&#x1F22F');
-	Smilies::add($b, ':Japanese “bargain” button:', '&#x1F250');
-	Smilies::add($b, ':Japanese “discount” button:', '&#x1F239');
-	Smilies::add($b, ':Japanese “free of charge” button:', '&#x1F21A');
-	Smilies::add($b, ':Japanese “prohibited” button:', '&#x1F232');
-	Smilies::add($b, ':Japanese “acceptable” button:', '&#x1F251');
-	Smilies::add($b, ':Japanese “application” button:', '&#x1F238');
-	Smilies::add($b, ':Japanese “passing grade” button:', '&#x1F234');
-	Smilies::add($b, ':Japanese “vacancy” button:', '&#x1F233');
-	Smilies::add($b, ':Japanese “congratulations” button:', '&#x3297');
-	Smilies::add($b, ':Japanese “secret” button:', '&#x3299');
-	Smilies::add($b, ':Japanese “open for business” button:', '&#x1F23A');
-	Smilies::add($b, ':Japanese “no vacancy” button:', '&#x1F235');
+	Smilies::add($b, ':FREE button:', '&#x1F193;');
+	Smilies::add($b, ':information:', '&#x2139;');
+	Smilies::add($b, ':ID button:', '&#x1F194;');
+	Smilies::add($b, ':circled M:', '&#x24C2;');
+	Smilies::add($b, ':NEW button:', '&#x1F195;');
+	Smilies::add($b, ':NG button:', '&#x1F196;');
+	Smilies::add($b, ':O button (blood type):', '&#x1F17E;');
+	Smilies::add($b, ':OK button:', '&#x1F197;');
+	Smilies::add($b, ':P button:', '&#x1F17F;');
+	Smilies::add($b, ':SOS button:', '&#x1F198;');
+	Smilies::add($b, ':UP! button:', '&#x1F199;');
+	Smilies::add($b, ':VS button:', '&#x1F19A;');
+	Smilies::add($b, ':Japanese “here” button:', '&#x1F201;');
+	Smilies::add($b, ':Japanese “service charge” button:', '&#x1F202;');
+	Smilies::add($b, ':Japanese “monthly amount” button:', '&#x1F237;');
+	Smilies::add($b, ':Japanese “not free of charge” button:', '&#x1F236;');
+	Smilies::add($b, ':Japanese “reserved” button:', '&#x1F22F;');
+	Smilies::add($b, ':Japanese “bargain” button:', '&#x1F250;');
+	Smilies::add($b, ':Japanese “discount” button:', '&#x1F239;');
+	Smilies::add($b, ':Japanese “free of charge” button:', '&#x1F21A;');
+	Smilies::add($b, ':Japanese “prohibited” button:', '&#x1F232;');
+	Smilies::add($b, ':Japanese “acceptable” button:', '&#x1F251;');
+	Smilies::add($b, ':Japanese “application” button:', '&#x1F238;');
+	Smilies::add($b, ':Japanese “passing grade” button:', '&#x1F234;');
+	Smilies::add($b, ':Japanese “vacancy” button:', '&#x1F233;');
+	Smilies::add($b, ':Japanese “congratulations” button:', '&#x3297;');
+	Smilies::add($b, ':Japanese “secret” button:', '&#x3299;');
+	Smilies::add($b, ':Japanese “open for business” button:', '&#x1F23A;');
+	Smilies::add($b, ':Japanese “no vacancy” button:', '&#x1F235;');
 
 // geometric
-	Smilies::add($b, ':red circle:', '&#x1F534');
-//	Smilies::add($b, ':orange circle:', '&#x1F7E0');
-//	Smilies::add($b, ':yellow circle:', '&#x1F7E1');
-//	Smilies::add($b, ':green circle:', '&#x1F7E2');
-	Smilies::add($b, ':blue circle:', '&#x1F535');
-//	Smilies::add($b, ':purple circle:', '&#x1F7E3');
-//	Smilies::add($b, ':brown circle:', '&#x1F7E4');
-	Smilies::add($b, ':black circle:', '&#x26AB');
-	Smilies::add($b, ':white circle:', '&#x26AA');
-//	Smilies::add($b, ':red square:', '&#x1F7E5');
-//	Smilies::add($b, ':orange square:', '&#x1F7E7');
-//	Smilies::add($b, ':yellow square:', '&#x1F7E8');
-//	Smilies::add($b, ':green square:', '&#x1F7E9');
-//	Smilies::add($b, ':blue square:', '&#x1F7E6');
-//	Smilies::add($b, ':purple square:', '&#x1F7EA');
-//	Smilies::add($b, ':brown square:', '&#x1F7EB');
-	Smilies::add($b, ':black large square:', '&#x2B1B');
-	Smilies::add($b, ':white large square:', '&#x2B1C');
-	Smilies::add($b, ':black medium square:', '&#x25FC');
-	Smilies::add($b, ':white medium square:', '&#x25FB');
-	Smilies::add($b, ':black medium-small square:', '&#x25FE');
-	Smilies::add($b, ':white medium-small square:', '&#x25FD');
-	Smilies::add($b, ':black small square:', '&#x25AA');
-	Smilies::add($b, ':white small square:', '&#x25AB');
-	Smilies::add($b, ':large orange diamond:', '&#x1F536');
-	Smilies::add($b, ':large blue diamond:', '&#x1F537');
-	Smilies::add($b, ':small orange diamond:', '&#x1F538');
-	Smilies::add($b, ':small blue diamond:', '&#x1F539');
-	Smilies::add($b, ':red triangle pointed up:', '&#x1F53A');
-	Smilies::add($b, ':red triangle pointed down:', '&#x1F53B');
-	Smilies::add($b, ':diamond with a dot:', '&#x1F4A0');
-	Smilies::add($b, ':radio button:', '&#x1F518');
-	Smilies::add($b, ':white square button:', '&#x1F533');
-	Smilies::add($b, ':black square button:', '&#x1F532');
+	Smilies::add($b, ':red circle:', '&#x1F534;');
+//	Smilies::add($b, ':orange circle:', '&#x1F7E0;');
+//	Smilies::add($b, ':yellow circle:', '&#x1F7E1;');
+//	Smilies::add($b, ':green circle:', '&#x1F7E2;');
+	Smilies::add($b, ':blue circle:', '&#x1F535;');
+//	Smilies::add($b, ':purple circle:', '&#x1F7E3;');
+//	Smilies::add($b, ':brown circle:', '&#x1F7E4;');
+	Smilies::add($b, ':black circle:', '&#x26AB;');
+	Smilies::add($b, ':white circle:', '&#x26AA;');
+//	Smilies::add($b, ':red square:', '&#x1F7E5;');
+//	Smilies::add($b, ':orange square:', '&#x1F7E7;');
+//	Smilies::add($b, ':yellow square:', '&#x1F7E8;');
+//	Smilies::add($b, ':green square:', '&#x1F7E9;');
+//	Smilies::add($b, ':blue square:', '&#x1F7E6;');
+//	Smilies::add($b, ':purple square:', '&#x1F7EA;');
+//	Smilies::add($b, ':brown square:', '&#x1F7EB;');
+	Smilies::add($b, ':black large square:', '&#x2B1B;');
+	Smilies::add($b, ':white large square:', '&#x2B1C;');
+	Smilies::add($b, ':black medium square:', '&#x25FC;');
+	Smilies::add($b, ':white medium square:', '&#x25FB;');
+	Smilies::add($b, ':black medium-small square:', '&#x25FE;');
+	Smilies::add($b, ':white medium-small square:', '&#x25FD;');
+	Smilies::add($b, ':black small square:', '&#x25AA;');
+	Smilies::add($b, ':white small square:', '&#x25AB;');
+	Smilies::add($b, ':large orange diamond:', '&#x1F536;');
+	Smilies::add($b, ':large blue diamond:', '&#x1F537;');
+	Smilies::add($b, ':small orange diamond:', '&#x1F538;');
+	Smilies::add($b, ':small blue diamond:', '&#x1F539;');
+	Smilies::add($b, ':red triangle pointed up:', '&#x1F53A;');
+	Smilies::add($b, ':red triangle pointed down:', '&#x1F53B;');
+	Smilies::add($b, ':diamond with a dot:', '&#x1F4A0;');
+	Smilies::add($b, ':radio button:', '&#x1F518;');
+	Smilies::add($b, ':white square button:', '&#x1F533;');
+	Smilies::add($b, ':black square button:', '&#x1F532;');
 
 // Flags
 // flag
-	Smilies::add($b, ':chequered flag:', '&#x1F3C1');
-	Smilies::add($b, ':triangular flag:', '&#x1F6A9');
-	Smilies::add($b, ':crossed flags:', '&#x1F38C');
-	Smilies::add($b, ':black flag:', '&#x1F3F4');
-	Smilies::add($b, ':white flag:', '&#x1F3F3');
-	Smilies::add($b, ':rainbow flag:', '&#x1F3F3&#xFE0F&#x200D&#x1F308');
-	Smilies::add($b, ':pirate flag:', '&#x1F3F4&#x200D&#x2620&#xFE0F');
+	Smilies::add($b, ':chequered flag:', '&#x1F3C1;');
+	Smilies::add($b, ':triangular flag:', '&#x1F6A9;');
+	Smilies::add($b, ':crossed flags:', '&#x1F38C;');
+	Smilies::add($b, ':black flag:', '&#x1F3F4;');
+	Smilies::add($b, ':white flag:', '&#x1F3F3;');
+	Smilies::add($b, ':rainbow flag:', '&#x1F3F3;&#xFE0F;&#x200D;&#x1F308;');
+	Smilies::add($b, ':pirate flag:', '&#x1F3F4;&#x200D;&#x2620;&#xFE0F;');
 
 // country-flag
-	Smilies::add($b, ':ascension island:', '&#x1F1E6&#x1F1E8');
-	Smilies::add($b, ':andorra:', '&#x1F1E6&#x1F1E9');
-	Smilies::add($b, ':united arab emirates:', '&#x1F1E6&#x1F1EA');
-	Smilies::add($b, ':afghanistan:', '&#x1F1E6&#x1F1EB');
-	Smilies::add($b, ':antigua & barbuda:', '&#x1F1E6&#x1F1EC');
-	Smilies::add($b, ':anguilla:', '&#x1F1E6&#x1F1EE');
-	Smilies::add($b, ':albania:', '&#x1F1E6&#x1F1F1');
-	Smilies::add($b, ':armenia:', '&#x1F1E6&#x1F1F2');
-	Smilies::add($b, ':angola:', '&#x1F1E6&#x1F1F4');
-	Smilies::add($b, ':antarctica:', '&#x1F1E6&#x1F1F6');
-	Smilies::add($b, ':argentina:', '&#x1F1E6&#x1F1F7');
-	Smilies::add($b, ':americansamoa:', '&#x1F1E6&#x1F1F8');
-	Smilies::add($b, ':austria:', '&#x1F1E6&#x1F1F9');
-	Smilies::add($b, ':australia:', '&#x1F1E6&#x1F1FA');
-	Smilies::add($b, ':aruba:', '&#x1F1E6&#x1F1FC');
-	Smilies::add($b, ':ålandislands:', '&#x1F1E6&#x1F1FD');
-	Smilies::add($b, ':azerbaijan:', '&#x1F1E6&#x1F1FF');
-	Smilies::add($b, ':bosnia&herzegovina:', '&#x1F1E7&#x1F1E6');
-	Smilies::add($b, ':barbados:', '&#x1F1E7&#x1F1E7');
-	Smilies::add($b, ':bangladesh:', '&#x1F1E7&#x1F1E9');
-	Smilies::add($b, ':belgium:', '&#x1F1E7&#x1F1EA');
-	Smilies::add($b, ':burkinafaso:', '&#x1F1E7&#x1F1EB');
-	Smilies::add($b, ':bulgaria:', '&#x1F1E7&#x1F1EC');
-	Smilies::add($b, ':bahrain:', '&#x1F1E7&#x1F1ED');
-	Smilies::add($b, ':burundi:', '&#x1F1E7&#x1F1EE');
-	Smilies::add($b, ':benin:', '&#x1F1E7&#x1F1EF');
-	Smilies::add($b, ':st.barthélemy:', '&#x1F1E7&#x1F1F1');
-	Smilies::add($b, ':bermuda:', '&#x1F1E7&#x1F1F2');
-	Smilies::add($b, ':brunei:', '&#x1F1E7&#x1F1F3');
-	Smilies::add($b, ':bolivia:', '&#x1F1E7&#x1F1F4');
-	Smilies::add($b, ':caribbeannetherlands:', '&#x1F1E7&#x1F1F6');
-	Smilies::add($b, ':brazil:', '&#x1F1E7&#x1F1F7');
-	Smilies::add($b, ':bahamas:', '&#x1F1E7&#x1F1F8');
-	Smilies::add($b, ':bhutan:', '&#x1F1E7&#x1F1F9');
-	Smilies::add($b, ':bouvetisland:', '&#x1F1E7&#x1F1FB');
-	Smilies::add($b, ':botswana:', '&#x1F1E7&#x1F1FC');
-	Smilies::add($b, ':belarus:', '&#x1F1E7&#x1F1FE');
-	Smilies::add($b, ':belize:', '&#x1F1E7&#x1F1FF');
-	Smilies::add($b, ':canada:', '&#x1F1E8&#x1F1E6');
-	Smilies::add($b, ':cocos(keeling)islands:', '&#x1F1E8&#x1F1E8');
-	Smilies::add($b, ':congo-kinshasa:', '&#x1F1E8&#x1F1E9');
-	Smilies::add($b, ':centralafricanrepublic:', '&#x1F1E8&#x1F1EB');
-	Smilies::add($b, ':congo-brazzaville:', '&#x1F1E8&#x1F1EC');
-	Smilies::add($b, ':switzerland:', '&#x1F1E8&#x1F1ED');
-	Smilies::add($b, ':côted’ivoire:', '&#x1F1E8&#x1F1EE');
-	Smilies::add($b, ':cookislands:', '&#x1F1E8&#x1F1F0');
-	Smilies::add($b, ':chile:', '&#x1F1E8&#x1F1F1');
-	Smilies::add($b, ':cameroon:', '&#x1F1E8&#x1F1F2');
-	Smilies::add($b, ':china:', '&#x1F1E8&#x1F1F3');
-	Smilies::add($b, ':colombia:', '&#x1F1E8&#x1F1F4');
-	Smilies::add($b, ':clippertonisland:', '&#x1F1E8&#x1F1F5');
-	Smilies::add($b, ':costarica:', '&#x1F1E8&#x1F1F7');
-	Smilies::add($b, ':cuba:', '&#x1F1E8&#x1F1FA');
-	Smilies::add($b, ':capeverde:', '&#x1F1E8&#x1F1FB');
-	Smilies::add($b, ':curaçao:', '&#x1F1E8&#x1F1FC');
-	Smilies::add($b, ':christmasisland:', '&#x1F1E8&#x1F1FD');
-	Smilies::add($b, ':cyprus:', '&#x1F1E8&#x1F1FE');
-	Smilies::add($b, ':czechia:', '&#x1F1E8&#x1F1FF');
-	Smilies::add($b, ':germany:', '&#x1F1E9&#x1F1EA');
-	Smilies::add($b, ':diegogarcia:', '&#x1F1E9&#x1F1EC');
-	Smilies::add($b, ':djibouti:', '&#x1F1E9&#x1F1EF');
-	Smilies::add($b, ':denmark:', '&#x1F1E9&#x1F1F0');
-	Smilies::add($b, ':dominica:', '&#x1F1E9&#x1F1F2');
-	Smilies::add($b, ':dominicanrepublic:', '&#x1F1E9&#x1F1F4');
-	Smilies::add($b, ':algeria:', '&#x1F1E9&#x1F1FF');
-	Smilies::add($b, ':ceuta&melilla:', '&#x1F1EA&#x1F1E6');
-	Smilies::add($b, ':ecuador:', '&#x1F1EA&#x1F1E8');
-	Smilies::add($b, ':estonia:', '&#x1F1EA&#x1F1EA');
-	Smilies::add($b, ':egypt:', '&#x1F1EA&#x1F1EC');
-	Smilies::add($b, ':westernsahara:', '&#x1F1EA&#x1F1ED');
-	Smilies::add($b, ':eritrea:', '&#x1F1EA&#x1F1F7');
-	Smilies::add($b, ':spain:', '&#x1F1EA&#x1F1F8');
-	Smilies::add($b, ':ethiopia:', '&#x1F1EA&#x1F1F9');
-	Smilies::add($b, ':europeanunion:', '&#x1F1EA&#x1F1FA');
-	Smilies::add($b, ':finland:', '&#x1F1EB&#x1F1EE');
-	Smilies::add($b, ':fiji:', '&#x1F1EB&#x1F1EF');
-	Smilies::add($b, ':falklandislands:', '&#x1F1EB&#x1F1F0');
-	Smilies::add($b, ':micronesia:', '&#x1F1EB&#x1F1F2');
-	Smilies::add($b, ':faroeislands:', '&#x1F1EB&#x1F1F4');
-	Smilies::add($b, ':france:', '&#x1F1EB&#x1F1F7');
-	Smilies::add($b, ':gabon:', '&#x1F1EC&#x1F1E6');
-	Smilies::add($b, ':unitedkingdom:', '&#x1F1EC&#x1F1E7');
-	Smilies::add($b, ':grenada:', '&#x1F1EC&#x1F1E9');
-	Smilies::add($b, ':georgia:', '&#x1F1EC&#x1F1EA');
-	Smilies::add($b, ':frenchguiana:', '&#x1F1EC&#x1F1EB');
-	Smilies::add($b, ':guernsey:', '&#x1F1EC&#x1F1EC');
-	Smilies::add($b, ':ghana:', '&#x1F1EC&#x1F1ED');
-	Smilies::add($b, ':gibraltar:', '&#x1F1EC&#x1F1EE');
-	Smilies::add($b, ':greenland:', '&#x1F1EC&#x1F1F1');
-	Smilies::add($b, ':gambia:', '&#x1F1EC&#x1F1F2');
-	Smilies::add($b, ':guinea:', '&#x1F1EC&#x1F1F3');
-	Smilies::add($b, ':guadeloupe:', '&#x1F1EC&#x1F1F5');
-	Smilies::add($b, ':equatorialguinea:', '&#x1F1EC&#x1F1F6');
-	Smilies::add($b, ':greece:', '&#x1F1EC&#x1F1F7');
-	Smilies::add($b, ':southgeorgia&southsandwichislands:', '&#x1F1EC&#x1F1F8');
-	Smilies::add($b, ':guatemala:', '&#x1F1EC&#x1F1F9');
-	Smilies::add($b, ':guam:', '&#x1F1EC&#x1F1FA');
-	Smilies::add($b, ':guinea-bissau:', '&#x1F1EC&#x1F1FC');
-	Smilies::add($b, ':guyana:', '&#x1F1EC&#x1F1FE');
-	Smilies::add($b, ':hongkongsarchina:', '&#x1F1ED&#x1F1F0');
-	Smilies::add($b, ':heard&mcdonaldislands:', '&#x1F1ED&#x1F1F2');
-	Smilies::add($b, ':honduras:', '&#x1F1ED&#x1F1F3');
-	Smilies::add($b, ':croatia:', '&#x1F1ED&#x1F1F7');
-	Smilies::add($b, ':haiti:', '&#x1F1ED&#x1F1F9');
-	Smilies::add($b, ':hungary:', '&#x1F1ED&#x1F1FA');
-	Smilies::add($b, ':canaryislands:', '&#x1F1EE&#x1F1E8');
-	Smilies::add($b, ':indonesia:', '&#x1F1EE&#x1F1E9');
-	Smilies::add($b, ':ireland:', '&#x1F1EE&#x1F1EA');
-	Smilies::add($b, ':israel:', '&#x1F1EE&#x1F1F1');
-	Smilies::add($b, ':isleofman:', '&#x1F1EE&#x1F1F2');
-	Smilies::add($b, ':india:', '&#x1F1EE&#x1F1F3');
-	Smilies::add($b, ':britishindianoceanterritory:', '&#x1F1EE&#x1F1F4');
-	Smilies::add($b, ':iraq:', '&#x1F1EE&#x1F1F6');
-	Smilies::add($b, ':iran:', '&#x1F1EE&#x1F1F7');
-	Smilies::add($b, ':iceland:', '&#x1F1EE&#x1F1F8');
-	Smilies::add($b, ':italy:', '&#x1F1EE&#x1F1F9');
-	Smilies::add($b, ':jersey:', '&#x1F1EF&#x1F1EA');
-	Smilies::add($b, ':jamaica:', '&#x1F1EF&#x1F1F2');
-	Smilies::add($b, ':jordan:', '&#x1F1EF&#x1F1F4');
-	Smilies::add($b, ':japan:', '&#x1F1EF&#x1F1F5');
-	Smilies::add($b, ':kenya:', '&#x1F1F0&#x1F1EA');
-	Smilies::add($b, ':kyrgyzstan:', '&#x1F1F0&#x1F1EC');
-	Smilies::add($b, ':cambodia:', '&#x1F1F0&#x1F1ED');
-	Smilies::add($b, ':kiribati:', '&#x1F1F0&#x1F1EE');
-	Smilies::add($b, ':comoros:', '&#x1F1F0&#x1F1F2');
-	Smilies::add($b, ':st.kitts&nevis:', '&#x1F1F0&#x1F1F3');
-	Smilies::add($b, ':northkorea:', '&#x1F1F0&#x1F1F5');
-	Smilies::add($b, ':southkorea:', '&#x1F1F0&#x1F1F7');
-	Smilies::add($b, ':kuwait:', '&#x1F1F0&#x1F1FC');
-	Smilies::add($b, ':caymanislands:', '&#x1F1F0&#x1F1FE');
-	Smilies::add($b, ':kazakhstan:', '&#x1F1F0&#x1F1FF');
-	Smilies::add($b, ':laos:', '&#x1F1F1&#x1F1E6');
-	Smilies::add($b, ':lebanon:', '&#x1F1F1&#x1F1E7');
-	Smilies::add($b, ':st.lucia:', '&#x1F1F1&#x1F1E8');
-	Smilies::add($b, ':liechtenstein:', '&#x1F1F1&#x1F1EE');
-	Smilies::add($b, ':srilanka:', '&#x1F1F1&#x1F1F0');
-	Smilies::add($b, ':liberia:', '&#x1F1F1&#x1F1F7');
-	Smilies::add($b, ':lesotho:', '&#x1F1F1&#x1F1F8');
-	Smilies::add($b, ':lithuania:', '&#x1F1F1&#x1F1F9');
-	Smilies::add($b, ':luxembourg:', '&#x1F1F1&#x1F1FA');
-	Smilies::add($b, ':latvia:', '&#x1F1F1&#x1F1FB');
-	Smilies::add($b, ':libya:', '&#x1F1F1&#x1F1FE');
-	Smilies::add($b, ':morocco:', '&#x1F1F2&#x1F1E6');
-	Smilies::add($b, ':monaco:', '&#x1F1F2&#x1F1E8');
-	Smilies::add($b, ':moldova:', '&#x1F1F2&#x1F1E9');
-	Smilies::add($b, ':montenegro:', '&#x1F1F2&#x1F1EA');
-	Smilies::add($b, ':st.martin:', '&#x1F1F2&#x1F1EB');
-	Smilies::add($b, ':madagascar:', '&#x1F1F2&#x1F1EC');
-	Smilies::add($b, ':marshallislands:', '&#x1F1F2&#x1F1ED');
-	Smilies::add($b, ':northmacedonia:', '&#x1F1F2&#x1F1F0');
-	Smilies::add($b, ':mali:', '&#x1F1F2&#x1F1F1');
-	Smilies::add($b, ':myanmar(burma):', '&#x1F1F2&#x1F1F2');
-	Smilies::add($b, ':mongolia:', '&#x1F1F2&#x1F1F3');
-	Smilies::add($b, ':macaosarchina:', '&#x1F1F2&#x1F1F4');
-	Smilies::add($b, ':northernmarianaislands:', '&#x1F1F2&#x1F1F5');
-	Smilies::add($b, ':martinique:', '&#x1F1F2&#x1F1F6');
-	Smilies::add($b, ':mauritania:', '&#x1F1F2&#x1F1F7');
-	Smilies::add($b, ':montserrat:', '&#x1F1F2&#x1F1F8');
-	Smilies::add($b, ':malta:', '&#x1F1F2&#x1F1F9');
-	Smilies::add($b, ':mauritius:', '&#x1F1F2&#x1F1FA');
-	Smilies::add($b, ':maldives:', '&#x1F1F2&#x1F1FB');
-	Smilies::add($b, ':malawi:', '&#x1F1F2&#x1F1FC');
-	Smilies::add($b, ':mexico:', '&#x1F1F2&#x1F1FD');
-	Smilies::add($b, ':malaysia:', '&#x1F1F2&#x1F1FE');
-	Smilies::add($b, ':mozambique:', '&#x1F1F2&#x1F1FF');
-	Smilies::add($b, ':namibia:', '&#x1F1F3&#x1F1E6');
-	Smilies::add($b, ':newcaledonia:', '&#x1F1F3&#x1F1E8');
-	Smilies::add($b, ':niger:', '&#x1F1F3&#x1F1EA');
-	Smilies::add($b, ':norfolkisland:', '&#x1F1F3&#x1F1EB');
-	Smilies::add($b, ':nigeria:', '&#x1F1F3&#x1F1EC');
-	Smilies::add($b, ':nicaragua:', '&#x1F1F3&#x1F1EE');
-	Smilies::add($b, ':netherlands:', '&#x1F1F3&#x1F1F1');
-	Smilies::add($b, ':norway:', '&#x1F1F3&#x1F1F4');
-	Smilies::add($b, ':nepal:', '&#x1F1F3&#x1F1F5');
-	Smilies::add($b, ':nauru:', '&#x1F1F3&#x1F1F7');
-	Smilies::add($b, ':niue:', '&#x1F1F3&#x1F1FA');
-	Smilies::add($b, ':newzealand:', '&#x1F1F3&#x1F1FF');
-	Smilies::add($b, ':oman:', '&#x1F1F4&#x1F1F2');
-	Smilies::add($b, ':panama:', '&#x1F1F5&#x1F1E6');
-	Smilies::add($b, ':peru:', '&#x1F1F5&#x1F1EA');
-	Smilies::add($b, ':frenchpolynesia:', '&#x1F1F5&#x1F1EB');
-	Smilies::add($b, ':papuanewguinea:', '&#x1F1F5&#x1F1EC');
-	Smilies::add($b, ':philippines:', '&#x1F1F5&#x1F1ED');
-	Smilies::add($b, ':pakistan:', '&#x1F1F5&#x1F1F0');
-	Smilies::add($b, ':poland:', '&#x1F1F5&#x1F1F1');
-	Smilies::add($b, ':st.pierre&miquelon:', '&#x1F1F5&#x1F1F2');
-	Smilies::add($b, ':pitcairnislands:', '&#x1F1F5&#x1F1F3');
-	Smilies::add($b, ':puertorico:', '&#x1F1F5&#x1F1F7');
-	Smilies::add($b, ':palestinianterritories:', '&#x1F1F5&#x1F1F8');
-	Smilies::add($b, ':portugal:', '&#x1F1F5&#x1F1F9');
-	Smilies::add($b, ':palau:', '&#x1F1F5&#x1F1FC');
-	Smilies::add($b, ':paraguay:', '&#x1F1F5&#x1F1FE');
-	Smilies::add($b, ':qatar:', '&#x1F1F6&#x1F1E6');
-	Smilies::add($b, ':réunion:', '&#x1F1F7&#x1F1EA');
-	Smilies::add($b, ':romania:', '&#x1F1F7&#x1F1F4');
-	Smilies::add($b, ':serbia:', '&#x1F1F7&#x1F1F8');
-	Smilies::add($b, ':russia:', '&#x1F1F7&#x1F1FA');
-	Smilies::add($b, ':rwanda:', '&#x1F1F7&#x1F1FC');
-	Smilies::add($b, ':saudiarabia:', '&#x1F1F8&#x1F1E6');
-	Smilies::add($b, ':solomonislands:', '&#x1F1F8&#x1F1E7');
-	Smilies::add($b, ':seychelles:', '&#x1F1F8&#x1F1E8');
-	Smilies::add($b, ':sudan:', '&#x1F1F8&#x1F1E9');
-	Smilies::add($b, ':sweden:', '&#x1F1F8&#x1F1EA');
-	Smilies::add($b, ':singapore:', '&#x1F1F8&#x1F1EC');
-	Smilies::add($b, ':st.helena:', '&#x1F1F8&#x1F1ED');
-	Smilies::add($b, ':slovenia:', '&#x1F1F8&#x1F1EE');
-	Smilies::add($b, ':svalbard&janmayen:', '&#x1F1F8&#x1F1EF');
-	Smilies::add($b, ':slovakia:', '&#x1F1F8&#x1F1F0');
-	Smilies::add($b, ':sierraleone:', '&#x1F1F8&#x1F1F1');
-	Smilies::add($b, ':sanmarino:', '&#x1F1F8&#x1F1F2');
-	Smilies::add($b, ':senegal:', '&#x1F1F8&#x1F1F3');
-	Smilies::add($b, ':somalia:', '&#x1F1F8&#x1F1F4');
-	Smilies::add($b, ':suriname:', '&#x1F1F8&#x1F1F7');
-	Smilies::add($b, ':southsudan:', '&#x1F1F8&#x1F1F8');
-	Smilies::add($b, ':sãotomé&príncipe:', '&#x1F1F8&#x1F1F9');
-	Smilies::add($b, ':elsalvador:', '&#x1F1F8&#x1F1FB');
-	Smilies::add($b, ':sintmaarten:', '&#x1F1F8&#x1F1FD');
-	Smilies::add($b, ':syria:', '&#x1F1F8&#x1F1FE');
-	Smilies::add($b, ':eswatini:', '&#x1F1F8&#x1F1FF');
-	Smilies::add($b, ':tristandacunha:', '&#x1F1F9&#x1F1E6');
-	Smilies::add($b, ':turks&caicosislands:', '&#x1F1F9&#x1F1E8');
-	Smilies::add($b, ':chad:', '&#x1F1F9&#x1F1E9');
-	Smilies::add($b, ':frenchsouthernterritories:', '&#x1F1F9&#x1F1EB');
-	Smilies::add($b, ':togo:', '&#x1F1F9&#x1F1EC');
-	Smilies::add($b, ':thailand:', '&#x1F1F9&#x1F1ED');
-	Smilies::add($b, ':tajikistan:', '&#x1F1F9&#x1F1EF');
-	Smilies::add($b, ':tokelau:', '&#x1F1F9&#x1F1F0');
-	Smilies::add($b, ':timor-leste:', '&#x1F1F9&#x1F1F1');
-	Smilies::add($b, ':turkmenistan:', '&#x1F1F9&#x1F1F2');
-	Smilies::add($b, ':tunisia:', '&#x1F1F9&#x1F1F3');
-	Smilies::add($b, ':tonga:', '&#x1F1F9&#x1F1F4');
-	Smilies::add($b, ':turkey:', '&#x1F1F9&#x1F1F7');
-	Smilies::add($b, ':trinidad&tobago:', '&#x1F1F9&#x1F1F9');
-	Smilies::add($b, ':tuvalu:', '&#x1F1F9&#x1F1FB');
-	Smilies::add($b, ':taiwan:', '&#x1F1F9&#x1F1FC');
-	Smilies::add($b, ':tanzania:', '&#x1F1F9&#x1F1FF');
-	Smilies::add($b, ':ukraine:', '&#x1F1FA&#x1F1E6');
-	Smilies::add($b, ':uganda:', '&#x1F1FA&#x1F1EC');
-	Smilies::add($b, ':u.s.outlyingislands:', '&#x1F1FA&#x1F1F2');
-	Smilies::add($b, ':unitednations:', '&#x1F1FA&#x1F1F3');
-	Smilies::add($b, ':unitedstates:', '&#x1F1FA&#x1F1F8');
-	Smilies::add($b, ':uruguay:', '&#x1F1FA&#x1F1FE');
-	Smilies::add($b, ':uzbekistan:', '&#x1F1FA&#x1F1FF');
-	Smilies::add($b, ':vaticancity:', '&#x1F1FB&#x1F1E6');
-	Smilies::add($b, ':st.vincent&grenadines:', '&#x1F1FB&#x1F1E8');
-	Smilies::add($b, ':venezuela:', '&#x1F1FB&#x1F1EA');
-	Smilies::add($b, ':britishvirginislands:', '&#x1F1FB&#x1F1EC');
-	Smilies::add($b, ':u.s.virginislands:', '&#x1F1FB&#x1F1EE');
-	Smilies::add($b, ':vietnam:', '&#x1F1FB&#x1F1F3');
-	Smilies::add($b, ':vanuatu:', '&#x1F1FB&#x1F1FA');
-	Smilies::add($b, ':wallis&futuna:', '&#x1F1FC&#x1F1EB');
-	Smilies::add($b, ':samoa:', '&#x1F1FC&#x1F1F8');
-	Smilies::add($b, ':kosovo:', '&#x1F1FD&#x1F1F0');
-	Smilies::add($b, ':yemen:', '&#x1F1FE&#x1F1EA');
-	Smilies::add($b, ':mayotte:', '&#x1F1FE&#x1F1F9');
-	Smilies::add($b, ':southafrica:', '&#x1F1FF&#x1F1E6');
-	Smilies::add($b, ':zambia:', '&#x1F1FF&#x1F1F2');
-	Smilies::add($b, ':zimbabwe:', '&#x1F1FF&#x1F1FC');
+	Smilies::add($b, ':ascension island:', '&#x1F1E6;&#x1F1E8;');
+	Smilies::add($b, ':andorra:', '&#x1F1E6;&#x1F1E9;');
+	Smilies::add($b, ':united arab emirates:', '&#x1F1E6;&#x1F1EA;');
+	Smilies::add($b, ':afghanistan:', '&#x1F1E6;&#x1F1EB;');
+	Smilies::add($b, ':antigua & barbuda:', '&#x1F1E6;&#x1F1EC;');
+	Smilies::add($b, ':anguilla:', '&#x1F1E6;&#x1F1EE;');
+	Smilies::add($b, ':albania:', '&#x1F1E6;&#x1F1F1;');
+	Smilies::add($b, ':armenia:', '&#x1F1E6;&#x1F1F2;');
+	Smilies::add($b, ':angola:', '&#x1F1E6;&#x1F1F4;');
+	Smilies::add($b, ':antarctica:', '&#x1F1E6;&#x1F1F6;');
+	Smilies::add($b, ':argentina:', '&#x1F1E6;&#x1F1F7;');
+	Smilies::add($b, ':americansamoa:', '&#x1F1E6;&#x1F1F8;');
+	Smilies::add($b, ':austria:', '&#x1F1E6;&#x1F1F9;');
+	Smilies::add($b, ':australia:', '&#x1F1E6;&#x1F1FA;');
+	Smilies::add($b, ':aruba:', '&#x1F1E6;&#x1F1FC;');
+	Smilies::add($b, ':ålandislands:', '&#x1F1E6;&#x1F1FD;');
+	Smilies::add($b, ':azerbaijan:', '&#x1F1E6;&#x1F1FF;');
+	Smilies::add($b, ':bosnia&herzegovina:', '&#x1F1E7;&#x1F1E6;');
+	Smilies::add($b, ':barbados:', '&#x1F1E7;&#x1F1E7;');
+	Smilies::add($b, ':bangladesh:', '&#x1F1E7;&#x1F1E9;');
+	Smilies::add($b, ':belgium:', '&#x1F1E7;&#x1F1EA;');
+	Smilies::add($b, ':burkinafaso:', '&#x1F1E7;&#x1F1EB;');
+	Smilies::add($b, ':bulgaria:', '&#x1F1E7;&#x1F1EC;');
+	Smilies::add($b, ':bahrain:', '&#x1F1E7;&#x1F1ED;');
+	Smilies::add($b, ':burundi:', '&#x1F1E7;&#x1F1EE;');
+	Smilies::add($b, ':benin:', '&#x1F1E7;&#x1F1EF;');
+	Smilies::add($b, ':st.barthélemy:', '&#x1F1E7;&#x1F1F1;');
+	Smilies::add($b, ':bermuda:', '&#x1F1E7;&#x1F1F2;');
+	Smilies::add($b, ':brunei:', '&#x1F1E7;&#x1F1F3;');
+	Smilies::add($b, ':bolivia:', '&#x1F1E7;&#x1F1F4;');
+	Smilies::add($b, ':caribbeannetherlands:', '&#x1F1E7;&#x1F1F6;');
+	Smilies::add($b, ':brazil:', '&#x1F1E7;&#x1F1F7;');
+	Smilies::add($b, ':bahamas:', '&#x1F1E7;&#x1F1F8;');
+	Smilies::add($b, ':bhutan:', '&#x1F1E7;&#x1F1F9;');
+	Smilies::add($b, ':bouvetisland:', '&#x1F1E7;&#x1F1FB;');
+	Smilies::add($b, ':botswana:', '&#x1F1E7;&#x1F1FC;');
+	Smilies::add($b, ':belarus:', '&#x1F1E7;&#x1F1FE;');
+	Smilies::add($b, ':belize:', '&#x1F1E7;&#x1F1FF;');
+	Smilies::add($b, ':canada:', '&#x1F1E8;&#x1F1E6;');
+	Smilies::add($b, ':cocos(keeling)islands:', '&#x1F1E8;&#x1F1E8;');
+	Smilies::add($b, ':congo-kinshasa:', '&#x1F1E8;&#x1F1E9;');
+	Smilies::add($b, ':centralafricanrepublic:', '&#x1F1E8;&#x1F1EB;');
+	Smilies::add($b, ':congo-brazzaville:', '&#x1F1E8;&#x1F1EC;');
+	Smilies::add($b, ':switzerland:', '&#x1F1E8;&#x1F1ED;');
+	Smilies::add($b, ':côted’ivoire:', '&#x1F1E8;&#x1F1EE;');
+	Smilies::add($b, ':cookislands:', '&#x1F1E8;&#x1F1F0;');
+	Smilies::add($b, ':chile:', '&#x1F1E8;&#x1F1F1;');
+	Smilies::add($b, ':cameroon:', '&#x1F1E8;&#x1F1F2;');
+	Smilies::add($b, ':china:', '&#x1F1E8;&#x1F1F3;');
+	Smilies::add($b, ':colombia:', '&#x1F1E8;&#x1F1F4;');
+	Smilies::add($b, ':clippertonisland:', '&#x1F1E8;&#x1F1F5;');
+	Smilies::add($b, ':costarica:', '&#x1F1E8;&#x1F1F7;');
+	Smilies::add($b, ':cuba:', '&#x1F1E8;&#x1F1FA;');
+	Smilies::add($b, ':capeverde:', '&#x1F1E8;&#x1F1FB;');
+	Smilies::add($b, ':curaçao:', '&#x1F1E8;&#x1F1FC;');
+	Smilies::add($b, ':christmasisland:', '&#x1F1E8;&#x1F1FD;');
+	Smilies::add($b, ':cyprus:', '&#x1F1E8;&#x1F1FE;');
+	Smilies::add($b, ':czechia:', '&#x1F1E8;&#x1F1FF;');
+	Smilies::add($b, ':germany:', '&#x1F1E9;&#x1F1EA;');
+	Smilies::add($b, ':diegogarcia:', '&#x1F1E9;&#x1F1EC;');
+	Smilies::add($b, ':djibouti:', '&#x1F1E9;&#x1F1EF;');
+	Smilies::add($b, ':denmark:', '&#x1F1E9;&#x1F1F0;');
+	Smilies::add($b, ':dominica:', '&#x1F1E9;&#x1F1F2;');
+	Smilies::add($b, ':dominicanrepublic:', '&#x1F1E9;&#x1F1F4;');
+	Smilies::add($b, ':algeria:', '&#x1F1E9;&#x1F1FF;');
+	Smilies::add($b, ':ceuta&melilla:', '&#x1F1EA;&#x1F1E6;');
+	Smilies::add($b, ':ecuador:', '&#x1F1EA;&#x1F1E8;');
+	Smilies::add($b, ':estonia:', '&#x1F1EA;&#x1F1EA;');
+	Smilies::add($b, ':egypt:', '&#x1F1EA;&#x1F1EC;');
+	Smilies::add($b, ':westernsahara:', '&#x1F1EA;&#x1F1ED;');
+	Smilies::add($b, ':eritrea:', '&#x1F1EA;&#x1F1F7;');
+	Smilies::add($b, ':spain:', '&#x1F1EA;&#x1F1F8;');
+	Smilies::add($b, ':ethiopia:', '&#x1F1EA;&#x1F1F9;');
+	Smilies::add($b, ':europeanunion:', '&#x1F1EA;&#x1F1FA;');
+	Smilies::add($b, ':finland:', '&#x1F1EB;&#x1F1EE;');
+	Smilies::add($b, ':fiji:', '&#x1F1EB;&#x1F1EF;');
+	Smilies::add($b, ':falklandislands:', '&#x1F1EB;&#x1F1F0;');
+	Smilies::add($b, ':micronesia:', '&#x1F1EB;&#x1F1F2;');
+	Smilies::add($b, ':faroeislands:', '&#x1F1EB;&#x1F1F4;');
+	Smilies::add($b, ':france:', '&#x1F1EB;&#x1F1F7;');
+	Smilies::add($b, ':gabon:', '&#x1F1EC;&#x1F1E6;');
+	Smilies::add($b, ':unitedkingdom:', '&#x1F1EC;&#x1F1E7;');
+	Smilies::add($b, ':grenada:', '&#x1F1EC;&#x1F1E9;');
+	Smilies::add($b, ':georgia:', '&#x1F1EC;&#x1F1EA;');
+	Smilies::add($b, ':frenchguiana:', '&#x1F1EC;&#x1F1EB;');
+	Smilies::add($b, ':guernsey:', '&#x1F1EC;&#x1F1EC;');
+	Smilies::add($b, ':ghana:', '&#x1F1EC;&#x1F1ED;');
+	Smilies::add($b, ':gibraltar:', '&#x1F1EC;&#x1F1EE;');
+	Smilies::add($b, ':greenland:', '&#x1F1EC;&#x1F1F1;');
+	Smilies::add($b, ':gambia:', '&#x1F1EC;&#x1F1F2;');
+	Smilies::add($b, ':guinea:', '&#x1F1EC;&#x1F1F3;');
+	Smilies::add($b, ':guadeloupe:', '&#x1F1EC;&#x1F1F5;');
+	Smilies::add($b, ':equatorialguinea:', '&#x1F1EC;&#x1F1F6;');
+	Smilies::add($b, ':greece:', '&#x1F1EC,;&#x1F1F7;');
+	Smilies::add($b, ':southgeorgia&southsandwichislands:', '&#x1F1EC;&#x1F1F8;');
+	Smilies::add($b, ':guatemala:', '&#x1F1EC;&#x1F1F9;');
+	Smilies::add($b, ':guam:', '&#x1F1EC;&#x1F1FA;');
+	Smilies::add($b, ':guinea-bissau:', '&#x1F1EC;&#x1F1FC;');
+	Smilies::add($b, ':guyana:', '&#x1F1EC&#x1F1FE;');
+	Smilies::add($b, ':hongkongsarchina:', '&#x1F1ED&#x1F1F0;');
+	Smilies::add($b, ':heard&mcdonaldislands:', '&#x1F1ED;&#x1F1F2;');
+	Smilies::add($b, ':honduras:', '&#x1F1ED;&#x1F1F3;');
+	Smilies::add($b, ':croatia:', '&#x1F1ED;&#x1F1F7;');
+	Smilies::add($b, ':haiti:', '&#x1F1ED;&#x1F1F9;');
+	Smilies::add($b, ':hungary:', '&#x1F1ED;&#x1F1FA;');
+	Smilies::add($b, ':canaryislands:', '&#x1F1EE;&#x1F1E8;');
+	Smilies::add($b, ':indonesia:', '&#x1F1EE;&#x1F1E9;');
+	Smilies::add($b, ':ireland:', '&#x1F1EE;&#x1F1EA;');
+	Smilies::add($b, ':israel:', '&#x1F1EE;&#x1F1F1;');
+	Smilies::add($b, ':isleofman:', '&#x1F1EE;&#x1F1F2;');
+	Smilies::add($b, ':india:', '&#x1F1EE;&#x1F1F3;');
+	Smilies::add($b, ':britishindianoceanterritory:', '&#x1F1EE;&#x1F1F4;');
+	Smilies::add($b, ':iraq:', '&#x1F1EE;&#x1F1F6;');
+	Smilies::add($b, ':iran:', '&#x1F1EE;&#x1F1F7;');
+	Smilies::add($b, ':iceland:', '&#x1F1EE;&#x1F1F8;');
+	Smilies::add($b, ':italy:', '&#x1F1EE;&#x1F1F9;');
+	Smilies::add($b, ':jersey:', '&#x1F1EF;&#x1F1EA;');
+	Smilies::add($b, ':jamaica:', '&#x1F1EF;&#x1F1F2;');
+	Smilies::add($b, ':jordan:', '&#x1F1EF;&#x1F1F4;');
+	Smilies::add($b, ':japan:', '&#x1F1EF;&#x1F1F5;');
+	Smilies::add($b, ':kenya:', '&#x1F1F0;&#x1F1EA;');
+	Smilies::add($b, ':kyrgyzstan:', '&#x1F1F0;&#x1F1EC;');
+	Smilies::add($b, ':cambodia:', '&#x1F1F0;&#x1F1ED;');
+	Smilies::add($b, ':kiribati:', '&#x1F1F0;&#x1F1EE;');
+	Smilies::add($b, ':comoros:', '&#x1F1F0;&#x1F1F2;');
+	Smilies::add($b, ':st.kitts&nevis:', '&#x1F1F0;&#x1F1F3;');
+	Smilies::add($b, ':northkorea:', '&#x1F1F0;&#x1F1F5;');
+	Smilies::add($b, ':southkorea:', '&#x1F1F0;&#x1F1F7;');
+	Smilies::add($b, ':kuwait:', '&#x1F1F0;&#x1F1FC;');
+	Smilies::add($b, ':caymanislands:', '&#x1F1F0;&#x1F1FE;');
+	Smilies::add($b, ':kazakhstan:', '&#x1F1F0;&#x1F1FF;');
+	Smilies::add($b, ':laos:', '&#x1F1F1;&#x1F1E6;');
+	Smilies::add($b, ':lebanon:', '&#x1F1F1;&#x1F1E7;');
+	Smilies::add($b, ':st.lucia:', '&#x1F1F1;&#x1F1E8;');
+	Smilies::add($b, ':liechtenstein:', '&#x1F1F1;&#x1F1EE;');
+	Smilies::add($b, ':srilanka:', '&#x1F1F1;&#x1F1F0;');
+	Smilies::add($b, ':liberia:', '&#x1F1F1;&#x1F1F7;');
+	Smilies::add($b, ':lesotho:', '&#x1F1F1;&#x1F1F8;');
+	Smilies::add($b, ':lithuania:', '&#x1F1F1;&#x1F1F9;');
+	Smilies::add($b, ':luxembourg:', '&#x1F1F1;&#x1F1FA;');
+	Smilies::add($b, ':latvia:', '&#x1F1F1;&#x1F1FB;');
+	Smilies::add($b, ':libya:', '&#x1F1F1;&#x1F1FE;');
+	Smilies::add($b, ':morocco:', '&#x1F1F2;&#x1F1E6;');
+	Smilies::add($b, ':monaco:', '&#x1F1F2;&#x1F1E8;');
+	Smilies::add($b, ':moldova:', '&#x1F1F2;&#x1F1E9;');
+	Smilies::add($b, ':montenegro:', '&#x1F1F2;&#x1F1EA;');
+	Smilies::add($b, ':st.martin:', '&#x1F1F2;&#x1F1EB;');
+	Smilies::add($b, ':madagascar:', '&#x1F1F2;&#x1F1EC;');
+	Smilies::add($b, ':marshallislands:', '&#x1F1F2;&#x1F1ED;');
+	Smilies::add($b, ':northmacedonia:', '&#x1F1F2;&#x1F1F0;');
+	Smilies::add($b, ':mali:', '&#x1F1F2;&#x1F1F1;');
+	Smilies::add($b, ':myanmar(burma):', '&#x1F1F2;&#x1F1F2;');
+	Smilies::add($b, ':mongolia:', '&#x1F1F2;&#x1F1F3;');
+	Smilies::add($b, ':macaosarchina:', '&#x1F1F2;&#x1F1F4;');
+	Smilies::add($b, ':northernmarianaislands:', '&#x1F1F2;&#x1F1F5;');
+	Smilies::add($b, ':martinique:', '&#x1F1F2;&#x1F1F6;');
+	Smilies::add($b, ':mauritania:', '&#x1F1F2;&#x1F1F7;');
+	Smilies::add($b, ':montserrat:', '&#x1F1F2;&#x1F1F8;');
+	Smilies::add($b, ':malta:', '&#x1F1F2;&#x1F1F9;');
+	Smilies::add($b, ':mauritius:', '&#x1F1F2;&#x1F1FA;');
+	Smilies::add($b, ':maldives:', '&#x1F1F2;&#x1F1FB;');
+	Smilies::add($b, ':malawi:', '&#x1F1F2;&#x1F1FC;');
+	Smilies::add($b, ':mexico:', '&#x1F1F2;&#x1F1FD;');
+	Smilies::add($b, ':malaysia:', '&#x1F1F2;&#x1F1FE;');
+	Smilies::add($b, ':mozambique:', '&#x1F1F2;&#x1F1FF;');
+	Smilies::add($b, ':namibia:', '&#x1F1F3;&#x1F1E6;');
+	Smilies::add($b, ':newcaledonia:', '&#x1F1F3;&#x1F1E8;');
+	Smilies::add($b, ':niger:', '&#x1F1F3;&#x1F1EA;');
+	Smilies::add($b, ':norfolkisland:', '&#x1F1F3;&#x1F1EB;');
+	Smilies::add($b, ':nigeria:', '&#x1F1F3;&#x1F1EC;');
+	Smilies::add($b, ':nicaragua:', '&#x1F1F3;&#x1F1EE;');
+	Smilies::add($b, ':netherlands:', '&#x1F1F3;&#x1F1F1;');
+	Smilies::add($b, ':norway:', '&#x1F1F3;&#x1F1F4;');
+	Smilies::add($b, ':nepal:', '&#x1F1F3;&#x1F1F5;');
+	Smilies::add($b, ':nauru:', '&#x1F1F3;&#x1F1F7;');
+	Smilies::add($b, ':niue:', '&#x1F1F3;&#x1F1FA;');
+	Smilies::add($b, ':newzealand:', '&#x1F1F3;&#x1F1FF;');
+	Smilies::add($b, ':oman:', '&#x1F1F4;&#x1F1F2;');
+	Smilies::add($b, ':panama:', '&#x1F1F5;&#x1F1E6;');
+	Smilies::add($b, ':peru:', '&#x1F1F5;&#x1F1EA;');
+	Smilies::add($b, ':frenchpolynesia:', '&#x1F1F5;&#x1F1EB;');
+	Smilies::add($b, ':papuanewguinea:', '&#x1F1F5;&#x1F1EC;');
+	Smilies::add($b, ':philippines:', '&#x1F1F5;&#x1F1ED;');
+	Smilies::add($b, ':pakistan:', '&#x1F1F5;&#x1F1F0;');
+	Smilies::add($b, ':poland:', '&#x1F1F5;&#x1F1F1;');
+	Smilies::add($b, ':st.pierre&miquelon:', '&#x1F1F5;&#x1F1F2;');
+	Smilies::add($b, ':pitcairnislands:', '&#x1F1F5;&#x1F1F3;');
+	Smilies::add($b, ':puertorico:', '&#x1F1F5;&#x1F1F7;');
+	Smilies::add($b, ':palestinianterritories:', '&#x1F1F5;&#x1F1F8;');
+	Smilies::add($b, ':portugal:', '&#x1F1F5;&#x1F1F9;');
+	Smilies::add($b, ':palau:', '&#x1F1F5;&#x1F1FC;');
+	Smilies::add($b, ':paraguay:', '&#x1F1F5;&#x1F1FE;');
+	Smilies::add($b, ':qatar:', '&#x1F1F6;&#x1F1E6;');
+	Smilies::add($b, ':réunion:', '&#x1F1F7;&#x1F1EA;');
+	Smilies::add($b, ':romania:', '&#x1F1F7;&#x1F1F4;');
+	Smilies::add($b, ':serbia:', '&#x1F1F7;&#x1F1F8;');
+	Smilies::add($b, ':russia:', '&#x1F1F7;&#x1F1FA;');
+	Smilies::add($b, ':rwanda:', '&#x1F1F7;&#x1F1FC;');
+	Smilies::add($b, ':saudiarabia:', '&#x1F1F8;&#x1F1E6;');
+	Smilies::add($b, ':solomonislands:', '&#x1F1F8;&#x1F1E7;');
+	Smilies::add($b, ':seychelles:', '&#x1F1F8;&#x1F1E8;');
+	Smilies::add($b, ':sudan:', '&#x1F1F8;&#x1F1E9;');
+	Smilies::add($b, ':sweden:', '&#x1F1F8;&#x1F1EA;');
+	Smilies::add($b, ':singapore:', '&#x1F1F8;&#x1F1EC;');
+	Smilies::add($b, ':st.helena:', '&#x1F1F8;&#x1F1ED;');
+	Smilies::add($b, ':slovenia:', '&#x1F1F8;&#x1F1EE;');
+	Smilies::add($b, ':svalbard&janmayen:', '&#x1F1F8;&#x1F1EF;');
+	Smilies::add($b, ':slovakia:', '&#x1F1F8;&#x1F1F0;');
+	Smilies::add($b, ':sierraleone:', '&#x1F1F8;&#x1F1F1;');
+	Smilies::add($b, ':sanmarino:', '&#x1F1F8;&#x1F1F2;');
+	Smilies::add($b, ':senegal:', '&#x1F1F8;&#x1F1F3;');
+	Smilies::add($b, ':somalia:', '&#x1F1F8;&#x1F1F4;');
+	Smilies::add($b, ':suriname:', '&#x1F1F8;&#x1F1F7;');
+	Smilies::add($b, ':southsudan:', '&#x1F1F8;&#x1F1F8;');
+	Smilies::add($b, ':sãotomé&príncipe:', '&#x1F1F8;&#x1F1F9;');
+	Smilies::add($b, ':elsalvador:', '&#x1F1F8;&#x1F1FB;');
+	Smilies::add($b, ':sintmaarten:', '&#x1F1F8;&#x1F1FD;');
+	Smilies::add($b, ':syria:', '&#x1F1F8;&#x1F1FE;');
+	Smilies::add($b, ':eswatini:', '&#x1F1F8;&#x1F1FF;');
+	Smilies::add($b, ':tristandacunha:', '&#x1F1F9;&#x1F1E6;');
+	Smilies::add($b, ':turks&caicosislands:', '&#x1F1F9;&#x1F1E8;');
+	Smilies::add($b, ':chad:', '&#x1F1F9;&#x1F1E9;');
+	Smilies::add($b, ':frenchsouthernterritories:', '&#x1F1F9;&#x1F1EB;');
+	Smilies::add($b, ':togo:', '&#x1F1F9;&#x1F1EC;');
+	Smilies::add($b, ':thailand:', '&#x1F1F9;&#x1F1ED;');
+	Smilies::add($b, ':tajikistan:', '&#x1F1F9;&#x1F1EF;');
+	Smilies::add($b, ':tokelau:', '&#x1F1F9;&#x1F1F0;');
+	Smilies::add($b, ':timor-leste:', '&#x1F1F9&#x1F1F1;');
+	Smilies::add($b, ':turkmenistan:', '&#x1F1F9&#x1F1F2;');
+	Smilies::add($b, ':tunisia:', '&#x1F1F9&#x1F1F3;');
+	Smilies::add($b, ':tonga:', '&#x1F1F9;&#x1F1F4;');
+	Smilies::add($b, ':turkey:', '&#x1F1F9;&#x1F1F7;');
+	Smilies::add($b, ':trinidad&tobago:', '&#x1F1F9;&#x1F1F9;');
+	Smilies::add($b, ':tuvalu:', '&#x1F1F9;&#x1F1FB;');
+	Smilies::add($b, ':taiwan:', '&#x1F1F9;&#x1F1FC;');
+	Smilies::add($b, ':tanzania:', '&#x1F1F9;&#x1F1FF;');
+	Smilies::add($b, ':ukraine:', '&#x1F1FA;&#x1F1E6;');
+	Smilies::add($b, ':uganda:', '&#x1F1FA;&#x1F1EC;');
+	Smilies::add($b, ':u.s.outlyingislands:', '&#x1F1FA;&#x1F1F2;');
+	Smilies::add($b, ':unitednations:', '&#x1F1FA;&#x1F1F3;');
+	Smilies::add($b, ':unitedstates:', '&#x1F1FA;&#x1F1F8;');
+	Smilies::add($b, ':uruguay:', '&#x1F1FA;&#x1F1FE;');
+	Smilies::add($b, ':uzbekistan:', '&#x1F1FA;&#x1F1FF;');
+	Smilies::add($b, ':vaticancity:', '&#x1F1FB;&#x1F1E6;');
+	Smilies::add($b, ':st.vincent&grenadines:', '&#x1F1FB;&#x1F1E8;');
+	Smilies::add($b, ':venezuela:', '&#x1F1FB;&#x1F1EA;');
+	Smilies::add($b, ':britishvirginislands:', '&#x1F1FB;&#x1F1EC;');
+	Smilies::add($b, ':u.s.virginislands:', '&#x1F1FB;&#x1F1EE;');
+	Smilies::add($b, ':vietnam:', '&#x1F1FB;&#x1F1F3;');
+	Smilies::add($b, ':vanuatu:', '&#x1F1FB;&#x1F1FA;');
+	Smilies::add($b, ':wallis&futuna:', '&#x1F1FC;&#x1F1EB;');
+	Smilies::add($b, ':samoa:', '&#x1F1FC;&#x1F1F8;');
+	Smilies::add($b, ':kosovo:', '&#x1F1FD;&#x1F1F0;');
+	Smilies::add($b, ':yemen:', '&#x1F1FE;&#x1F1EA;');
+	Smilies::add($b, ':mayotte:', '&#x1F1FE;&#x1F1F9;');
+	Smilies::add($b, ':southafrica:', '&#x1F1FF;&#x1F1E6;');
+	Smilies::add($b, ':zambia:', '&#x1F1FF;&#x1F1F2;');
+	Smilies::add($b, ':zimbabwe:', '&#x1F1FF;&#x1F1FC;');
 
 // subdivision-flag
- 	Smilies::add($b, ':england:', '&#x1F3F4&#xE0067&#xE0062&#xE0065&#xE006E&#xE0067&#xE007F');
-	Smilies::add($b, ':scotland:', '&#x1F3F4&#xE0067&#xE0062&#xE0073&#xE0074&#xE007F');
-	Smilies::add($b, ':wales:', '&#x1F3F4&#xE0067&#xE0062&#xE0077&#xE006C&#xE0073&#xE007F');
+	Smilies::add($b, ':england:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;');
+	Smilies::add($b, ':scotland:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0073;&#xE0074;&#xE007F;');
+	Smilies::add($b, ':wales:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0077;&#xE006C;&#xE0073;&#xE007F;');
 
 	}
+

From 0697f078f11af094ec8455d1ec9e59ec63cd66d0 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 22 Dec 2024 08:38:17 +0100
Subject: [PATCH 073/161] [CI] Fix codecov

---
 .woodpecker/.phpunit.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 887e897e..3f713d19 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -98,9 +98,9 @@ pipeline:
         - friendica/friendica-addons
     commands:
       - codecov -R '.' -Z -f 'clover.xml'
-    secrets:
-      - source: codecov-token
-        target: codecov_token
+    environment:
+      codecov_token:
+        from_secret: codecov-token
 
 services:
   mariadb:

From 5f50fd2498b58787f8671c3e6cff6658d9dd38dd Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 22 Dec 2024 08:54:51 +0100
Subject: [PATCH 074/161] Fix codecov token env

---
 .woodpecker/.phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 3f713d19..6acbf787 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -99,7 +99,7 @@ pipeline:
     commands:
       - codecov -R '.' -Z -f 'clover.xml'
     environment:
-      codecov_token:
+      CODECOV_TOKEN:
         from_secret: codecov-token
 
 services:

From 9e1f7dc468b3e615e2345b691b89ecfc80364f87 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 27 Dec 2024 10:26:20 +0000
Subject: [PATCH 075/161] Bluesky: Preparation to be able to fetch AT links

---
 bluesky/bluesky.php | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index d6b7624b..1355f000 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -97,27 +97,25 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	$token = DI::atProtocol()->getUserToken($hookData['uid']);
-	if (empty($token)) {
-		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;
+		}
+	
+		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'];
 	}
 
-	// @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);
-	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[2], 'result' => $uri]);
+	Logger::debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {

From 995e81e951a7525f4aa9bbceb661dd0fc8e548ae Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 1 Jan 2025 20:06:43 +0100
Subject: [PATCH 076/161] [CI] Fix releaser

---
 .woodpecker/.code_standards_check.yml  | 2 +-
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.messages.po_check.yml     | 2 +-
 .woodpecker/.phpunit.yml               | 2 +-
 .woodpecker/.releaser.yml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index fb5be33c..50872d4c 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 4d3bc5b7..6b41deae 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
index aa40ab4e..e0239dcd 100644
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 6acbf787..8b840f80 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -17,7 +17,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index f12697b9..2d880a6b 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:

From d034e311cbe5c45f808baf0c88efd88c484acd76 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 21:51:37 +0100
Subject: [PATCH 077/161] Ratioed: add help link

---
 ratioed/templates/ratioed.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 0d81b0d7..5d92bff2 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -2,7 +2,10 @@
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{constant('\Friendica\App::VERSION')}}" type="text/css" media="screen"/>
 
 <div id="admin-users" class="adminpage generic-page-wrapper">
-	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	<h1>
+		{{$title}} - {{$page}} ({{$count}})
+		<a href="{{$base_url}}/ratioed/help"><i style="float: right; font-size: 60%" class="fa fa-question-circle fa-fw" aria-hidden="true"></i></a>
+	</h1>
 	<p>
 		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
 	</p>

From 8e65141cb5e04be141ee0489d28aa8be62155553 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 21:57:18 +0100
Subject: [PATCH 078/161] Ratioed: bump version number

---
 ratioed/ratioed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 8ae0d48c..581ef89b 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -2,7 +2,7 @@
 /**
  * Name: Ratioed
  * Description: Additional moderation user table with statistics about user behaviour
- * Version: 0.1
+ * Version: 0.2
  * Author: Matthew Exon <http://mat.exon.name>
  */
 

From 2ef9cb8add8bc28a5d6dea9f40276abea2814d97 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:36:06 +0100
Subject: [PATCH 079/161] Ratioed: fill in zeroes for empty values

---
 ratioed/RatioedPanel.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index bd9b44dc..dac71752 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -175,8 +175,10 @@ class RatioedPanel extends Active
 						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
 					}
 					else {
+						$user['reactions'] = 0;
 						if ($user['comments'] == 0) {
-							$user['ratio'] = '0';
+							$user['comments'] = 0;
+							$user['ratio'] = 0;
 							$user['ratioed'] = false;
 						}
 						else {

From d495810b2daf9e278cf317df9a12702b136d131c Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:36:38 +0100
Subject: [PATCH 080/161] Ratioed: allow both sorting directions

---
 ratioed/RatioedPanel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index dac71752..08d94167 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -70,10 +70,10 @@ class RatioedPanel extends Active
 
 		$order		   = 'last-item';
 		$order_direction = '-';
-		if (!empty($request['o'])) {
-			$new_order = $request['o'];
-			if ($new_order[0] === '-') {
-				$order_direction = '-';
+		if (!empty($_REQUEST['o'])) {
+			$new_order = $_REQUEST['o'];
+			if ($new_order[0] === '+') {
+				$order_direction = '+';
 				$new_order	   = substr($new_order, 1);
 			}
 

From 81639ff61574c38769c3693bec6054b1b27bfefc Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:38:29 +0100
Subject: [PATCH 081/161] Ratioed: fix sorting by columns

---
 ratioed/templates/ratioed.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 5d92bff2..d634993e 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -22,9 +22,9 @@
 					</th>
 					<th></th>
 					{{foreach $th_users as $k=>$th}}
-						{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+						{{if $k < 2 || $order_users == $th.1 || ($k==4 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1])) }}
 						<th class="th-{{$k}}">
-							<a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
 								{{if $order_users == $th.1}}
 									{{if $order_direction_users == "+"}}
 									&#8595;
@@ -66,11 +66,7 @@
 					<td>{{$u.login_date}}</td>
 				{{/if}}
 
-				{{if $order_users == $th_users.4.1}}
-					<td>{{$u.lastitem_date}}</td>
-				{{/if}}
-
-				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+				{{if $order_users == $th_users.5.1}}
 					<td>
 						<i class="fa
 							{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
@@ -94,6 +90,10 @@
 					</td>
 				{{/if}}
 
+				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1]) }}
+					<td>{{$u.lastitem_date}}</td>
+				{{/if}}
+
 					<td class="text-right">
 						<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
 					</td>

From 46b38367209b8c5c6f084454d5a9ea9eb322a8d9 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:39:20 +0100
Subject: [PATCH 082/161] Ratioed: remove create user button

---
 ratioed/templates/ratioed.tpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index d634993e..c64cb1dc 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -6,9 +6,6 @@
 		{{$title}} - {{$page}} ({{$count}})
 		<a href="{{$base_url}}/ratioed/help"><i style="float: right; font-size: 60%" class="fa fa-question-circle fa-fw" aria-hidden="true"></i></a>
 	</h1>
-	<p>
-		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
-	</p>
 	<form action="{{$baseurl}}/{{$query_string}}" method="post">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 		<table id="users" class="table table-hover">

From b360b553eddf3a7ad01c06f7b050b1a69734cdc7 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 20:07:18 +0100
Subject: [PATCH 083/161] Ratioed: remove actions

---
 ratioed/RatioedPanel.php      | 30 ++++--------------------------
 ratioed/templates/ratioed.tpl | 26 ++------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 08d94167..19f6dd44 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -24,7 +24,6 @@ class RatioedPanel extends Active
 			return Renderer::replaceMacros($template, array('$config' => DI::baseUrl() . '/settings/addon'));
 		}
 
-		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
 		$user   = [];
 
@@ -32,31 +31,10 @@ class RatioedPanel extends Active
 			$user = User::getById($uid, ['username', 'blocked']);
 			if (!$user) {
 				$this->systemMessages->addNotice($this->t('User not found'));
-				$this->baseUrl->redirect('moderation/users');
+				$this->baseUrl->redirect('ratioed');
 			}
 		}
 
-		switch ($action) {
-			case 'delete':
-				if ($this->session->getLocalUserId() != $uid) {
-					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-					// delete user
-					User::remove($uid);
-
-					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
-				} else {
-					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
-				}
-
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-			case 'block':
-				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-				User::block($uid);
-				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-		}
 		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
 
 		$valid_orders = [
@@ -69,11 +47,11 @@ class RatioedPanel extends Active
 		];
 
 		$order		   = 'last-item';
-		$order_direction = '-';
+		$order_direction = '+';
 		if (!empty($_REQUEST['o'])) {
 			$new_order = $_REQUEST['o'];
-			if ($new_order[0] === '+') {
-				$order_direction = '+';
+			if ($new_order[0] === '-') {
+				$order_direction = '-';
 				$new_order	   = substr($new_order, 1);
 			}
 
diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index c64cb1dc..24ae20b8 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -11,12 +11,7 @@
 		<table id="users" class="table table-hover">
 			<thead>
 				<tr>
-					<th>
-						<div class="checkbox">
-							<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
-							<label for="admin-settings-users-select"></label>
-						</div>
-					</th>
+					<th></th>
 					<th></th>
 					{{foreach $th_users as $k=>$th}}
 						{{if $k < 2 || $order_users == $th.1 || ($k==4 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1])) }}
@@ -42,16 +37,7 @@
 			<tbody>
 			{{foreach $users as $u}}
 				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
-					<td>
-						{{if $u.is_deletable}}
-						<div class="checkbox">
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
-							<label for="id_user_{{$u.uid}}"></label>
-						</div>
-						{{else}}
-						&nbsp;
-						{{/if}}
-					</td>
+					<td></td>
 					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
 					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
 					<td>{{$u.email}}</td>
@@ -151,14 +137,6 @@
 			{{/foreach}}
 			</tbody>
 		</table>
-		<div class="panel-footer">
-			<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
-				<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
-			</button>
-			<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
-				<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
-			</button>
-		</div>
 		{{$pager nofilter}}
 	</form>
 </div>

From 3441c9bd0e7bcf713b5358a3d316c091af1c459a Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 00:23:51 +0100
Subject: [PATCH 084/161] Ratioed: add statistics about reply likes and reply
 guy score

---
 ratioed/RatioedPanel.php      | 137 ++++++++++++++++++++++++++++++++++
 ratioed/templates/help.tpl    |  57 +++++++++++++-
 ratioed/templates/ratioed.tpl |   2 +-
 3 files changed, 192 insertions(+), 4 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 19f6dd44..33a009cd 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -8,7 +8,9 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
+use Friendica\Model\Verb;
 use Friendica\Module\Moderation\Users\Active;
+use Friendica\Protocol\Activity;
 
 /**
  * This class implements the "Behaviour" panel in Moderation/Users
@@ -75,6 +77,11 @@ class RatioedPanel extends Active
 			$this->t('Comments last 24h'),
 			$this->t('Reactions last 24h'),
 			$this->t('Ratio last 24h'),
+			$this->t('Replies last month'),
+			$this->t('Reply likes'),
+			$this->t('Respondee likes'),
+			$this->t('OP likes'),
+			$this->t('Reply guy score'),
 		];
 		$field_names = [
 			'name',
@@ -87,6 +94,11 @@ class RatioedPanel extends Active
 			'comments',
 			'reactions',
 			'ratio',
+			'reply_count',
+			'reply_likes',
+			'reply_respondee_likes',
+			'reply_op_likes',
+			'reply_guy_score',
 		];
 		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
 
@@ -125,6 +137,129 @@ class RatioedPanel extends Active
 		]);
 	}
 
+	protected function getReplyGuyRow($contact_uid)
+	{
+		$like_vid = Verb::getID(Activity::LIKE);
+		$post_vid = Verb::getID(Activity::POST);
+
+		/*
+		 * This is a complicated query.
+		 *
+		 * The innermost select retrieves a chain of four posts: an
+		 * original post, a target comment (possibly deep down in the
+		 * thread), a reply from our user, and a like for that reply.
+		 * If there's no like, we still want to count the reply, so we
+		 * use an outer join.
+		 *
+		 * The second select adds "points" for different kinds of
+		 * likes.  The outermost select then counts up these points,
+		 * and the number of distinct replies.
+		 */
+		$reply_guy_result = DBA::p('
+SELECT
+  COUNT(distinct reply_id) AS replies_total,
+  SUM(like_point) AS like_total,
+  SUM(target_like_point) AS target_like_total,
+  SUM(original_like_point) AS original_like_total
+FROM (
+  SELECT
+    reply_id,
+    like_date,
+    like_date IS NOT NULL AS like_point,
+    like_author = target_author AS target_like_point,
+    like_author = original_author AS original_like_point
+  FROM (
+    SELECT
+      original_post.`uri-id` AS original_id,
+      original_post.`author-id` AS original_author,
+      original_post.created AS original_date,
+      target_post.`uri-id` AS target_id,
+      target_post.`author-id` AS target_author,
+      target_post.created AS target_date,
+      reply_post.`uri-id` AS reply_id,
+      reply_post.`author-id` AS reply_author,
+      reply_post.created AS reply_date,
+      like_post.`uri-id` AS like_id,
+      like_post.`author-id` AS like_author,
+      like_post.created AS like_date
+    FROM
+      post AS original_post
+    JOIN
+      post AS target_post
+    ON
+      original_post.`uri-id` = target_post.`parent-uri-id`
+    JOIN
+      post AS reply_post
+    ON
+      target_post.`uri-id` = reply_post.`thr-parent-id` AND
+      reply_post.`author-id` = ? AND
+      reply_post.`author-id` != target_post.`author-id` AND
+      reply_post.`author-id` != original_post.`author-id` AND
+      reply_post.`uri-id` != reply_post.`thr-parent-id` AND
+      reply_post.vid = ? AND
+      reply_post.created > CURDATE() - INTERVAL 1 MONTH
+    LEFT OUTER JOIN
+      post AS like_post
+    ON
+      reply_post.`uri-id` = like_post.`thr-parent-id` AND
+      like_post.vid = ? AND
+      like_post.`author-id` != reply_post.`author-id`
+  ) AS post_meta
+) AS reply_counts
+', $contact_uid, $post_vid, $like_vid);
+		return $reply_guy_result;
+	}
+
+	// https://stackoverflow.com/a/48283297/235936
+	protected function sigFig($value, $digits)
+	{
+		if ($value == 0) {
+			$decimalPlaces = $digits - 1;
+		} elseif ($value < 0) {
+			$decimalPlaces = $digits - floor(log10($value * -1)) - 1;
+		} else {
+			$decimalPlaces = $digits - floor(log10($value)) - 1;
+		}
+
+		$answer = ($decimalPlaces > 0) ?
+			number_format($value, $decimalPlaces) : round($value, $decimalPlaces);
+		return $answer;
+	}
+
+	protected function fillReplyGuyData(&$user) {
+		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
+		if (DBA::isResult($reply_guy_result)) {
+			$reply_guy_result_row = DBA::fetch($reply_guy_result);
+			$user['reply_count'] = $reply_guy_result_row['replies_total'] ?? 0;
+			$user['reply_likes'] = $reply_guy_result_row['like_total'] ?? 0;
+			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
+			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
+
+			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			if ($user['reply_count'] == 0) {
+				$user['reply_guy'] = false;
+				$user['reply_guy_score'] = 0;
+			}
+			elseif ($denominator == 0) {
+				$user['reply_guy'] = true;
+				$user['reply_guy_score'] = '∞';
+			}
+			else {
+				$reply_guy_score = $user['reply_count'] / $denominator;
+				$user['reply_guy'] = $reply_guy_score >= 1.0;
+				$user['reply_guy_score'] = $this->sigFig($reply_guy_score, 2);
+			}
+		}
+		else {
+			$user['reply_count'] = "error";
+			$user['reply_likes'] = "error";
+			$user['reply_respondee_likes'] = "error";
+			$user['reply_op_likes'] = "error";
+			$user['reply_guy'] = false;
+			$user['reply_guy_score'] = 0;
+		}
+	}
+
 	protected function setupUserCallback(): \Closure
 	{
 		Logger::debug("ratioed: setupUserCallback");
@@ -179,6 +314,8 @@ class RatioedPanel extends Active
 				$user['ratioed'] = false;
 			}
 
+			$this->fillReplyGuyData($user);
+
 			$user = $parentCallback($user);
 			Logger::debug("ratioed: setupUserCallback", [
 				'uid' => $user['uid'],
diff --git a/ratioed/templates/help.tpl b/ratioed/templates/help.tpl
index fee47e34..db6480cf 100644
--- a/ratioed/templates/help.tpl
+++ b/ratioed/templates/help.tpl
@@ -2,7 +2,7 @@
   <div class="panel-body">
     <h2>Ratioed Plugin Help</h2>
     <p>
-      This plugin provides administrators with additional statistics about
+      This plugin provides moderators with additional statistics about
       the behaviour of users.  These may be useful as early warning signs
       that warrant more carefully watching the behaviour of a user.  They
       are <em>not</em> suitable as a trigger for instantly blocking,
@@ -28,7 +28,7 @@
     <p>
       This plugin allows viewing of an actual ratio, calculated over the
       last 24 hours.  This is a useful timeframe for sudden dogpiling
-      events that administrators might not otherwise notice.  The plugin
+      events that moderators might not otherwise notice.  The plugin
       also calculates other statistics.
     </p>
     <h3>Explanation of Statistics</h3>
@@ -68,10 +68,61 @@
       24h".  It is intended to approximate the traditional ratio as
       understood on Twitter.
     </p>
+    <h4>Replies last month</h4>
+    <p>
+      This is the number of times the user posted a reply to someone any time in the last month.
+    </p>
+    <h4>Reply likes</h4>
+    <p>
+      This is the number of likes received by the user on their
+      replies to other people's posts in the last month.  Replies that
+      receive likes can be assumed to be more of a valuable
+      contribution than replies that do not.
+    </p>
+    <h4>Respondee likes</h4>
+    <p>
+      The number of times in the last month the user replied to
+      someone else's comment and that person then liked the reply.
+      Likes to replies are not necessarily a positive thing, but if
+      the person you're replying to approves the reply, that's a very
+      good sign.  Of course it's also common in a debate for neither
+      side to like the other side's comments, but the debate still can
+      be valuable.
+    </p>
+    <h4>OP likes</h4>
+    <p>
+      The number of times in the last month the user replied on a
+      thread and the original poster that started the thread liked the
+      reply.  While there is no formal concept of "ownership" of a
+      thread, conventionally the original poster is assumed to have
+      started the thread for a reason, and making replies that do not
+      fulfil that purpose are bad etiquette.  Getting approval from
+      the original poster therefore is a good sign that the user is
+      posting replies that are wanted.
+    </p>
+    <h4>Reply guy score</h4>
+    <p>
+      A <a href="https://en.wikipedia.org/wiki/Reply_guy">"reply
+      guy"</a> is a common Internet phenomenon of people (disproportionately male)
+      posting unwanted comments on other (disproportionately female)
+      people's threads, derailing the
+      conversation.  This score loosely approximates this phenomenon,
+      as the ratio betwen the number of replies and the sum of likes,
+      respondee likes, and OP likes.  This formula gives extra weight
+      to particularly relevant likes: a reply to a top-level post that
+      is liked by the original poster scores the maximum of 3
+      "points".  A score above 1.0 might indicate cause for concern
+      for moderators.
+    </p>
+    <p>
+      Since this is indicative of long-term behaviour, the score is
+      calculated over a month instead of 24 hours.
+    </p>
+    </p>
     <h3>Performance</h3>
     <p>
       The statistics are computed from scratch each time the page loads.
-      It's possible that this might put a heavy load on the database. and
+      It's possible that this might put a heavy load on the database, and
       the page may take a long time to load.
     </p>
     <h3>Extending</h3>
diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 24ae20b8..6ee6b1d0 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -36,7 +36,7 @@
 			</thead>
 			<tbody>
 			{{foreach $users as $u}}
-				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
+				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed || $u.reply_guy}}blocked{{/if}}">
 					<td></td>
 					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
 					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>

From 8ba4cd5f6140a1ad64ad5404e603ed76b8d535f3 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:42:03 +0100
Subject: [PATCH 085/161] Ratioed: bump version number

---
 ratioed/ratioed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 581ef89b..443fdaa9 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -2,7 +2,7 @@
 /**
  * Name: Ratioed
  * Description: Additional moderation user table with statistics about user behaviour
- * Version: 0.2
+ * Version: 0.3
  * Author: Matthew Exon <http://mat.exon.name>
  */
 

From 807598dbd03b9dca3c3ac7d890fe0cb2f8a1bb9f Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 15 Jan 2025 19:32:55 +0100
Subject: [PATCH 086/161] Ratioed: wrap long lines

---
 ratioed/templates/help.tpl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ratioed/templates/help.tpl b/ratioed/templates/help.tpl
index db6480cf..0d012ca7 100644
--- a/ratioed/templates/help.tpl
+++ b/ratioed/templates/help.tpl
@@ -70,7 +70,9 @@
     </p>
     <h4>Replies last month</h4>
     <p>
-      This is the number of times the user posted a reply to someone any time in the last month.
+      This is the number of times the user posted a reply to someone
+      else, on a thread the user did not start, any time in the last
+      month.
     </p>
     <h4>Reply likes</h4>
     <p>
@@ -86,8 +88,8 @@
       Likes to replies are not necessarily a positive thing, but if
       the person you're replying to approves the reply, that's a very
       good sign.  Of course it's also common in a debate for neither
-      side to like the other side's comments, but the debate still can
-      be valuable.
+      side to like the other side's comments without that indicating
+      an unhealthy interaction, so interpret this statistic cautiously.
     </p>
     <h4>OP likes</h4>
     <p>
@@ -103,10 +105,10 @@
     <h4>Reply guy score</h4>
     <p>
       A <a href="https://en.wikipedia.org/wiki/Reply_guy">"reply
-      guy"</a> is a common Internet phenomenon of people (disproportionately male)
-      posting unwanted comments on other (disproportionately female)
-      people's threads, derailing the
-      conversation.  This score loosely approximates this phenomenon,
+      guy"</a> is a common Internet phenomenon of people
+      (disproportionately male) posting unwanted comments on other
+      (disproportionately female) people's threads, derailing the
+      conversation.  This score loosely quantifies this phenomenon,
       as the ratio betwen the number of replies and the sum of likes,
       respondee likes, and OP likes.  This formula gives extra weight
       to particularly relevant likes: a reply to a top-level post that

From ee8c852d38cd74ca770a8d2445c4975607260bfc Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 15 Jan 2025 19:33:11 +0100
Subject: [PATCH 087/161] Ratioed: remove action buttons

---
 ratioed/templates/ratioed.tpl | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 6ee6b1d0..2413ed9d 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -121,18 +121,7 @@
 					{{/foreach}}
 
 					</td>
-					<td class="text-right">
-				{{if $u.is_deletable}}
-						<a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
-							<i class="fa fa-ban" aria-hidden="true"></i>
-						</a>
-						<a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
-							<i class="fa fa-trash" aria-hidden="true"></i>
-						</a>
-				{{else}}
-						&nbsp;
-				{{/if}}
-					</td>
+					<td class="text-right"></td>
 				</tr>
 			{{/foreach}}
 			</tbody>

From cb70a4eaffa1e603c5a910211118deab02e519e8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 18 Jan 2025 15:25:50 +0000
Subject: [PATCH 088/161] Fix codestyle

---
 ratioed/RatioedPanel.php | 111 ++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 59 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 33a009cd..d0fac8ad 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -163,47 +163,47 @@ SELECT
   SUM(original_like_point) AS original_like_total
 FROM (
   SELECT
-    reply_id,
-    like_date,
-    like_date IS NOT NULL AS like_point,
-    like_author = target_author AS target_like_point,
-    like_author = original_author AS original_like_point
+	reply_id,
+	like_date,
+	like_date IS NOT NULL AS like_point,
+	like_author = target_author AS target_like_point,
+	like_author = original_author AS original_like_point
   FROM (
-    SELECT
-      original_post.`uri-id` AS original_id,
-      original_post.`author-id` AS original_author,
-      original_post.created AS original_date,
-      target_post.`uri-id` AS target_id,
-      target_post.`author-id` AS target_author,
-      target_post.created AS target_date,
-      reply_post.`uri-id` AS reply_id,
-      reply_post.`author-id` AS reply_author,
-      reply_post.created AS reply_date,
-      like_post.`uri-id` AS like_id,
-      like_post.`author-id` AS like_author,
-      like_post.created AS like_date
-    FROM
-      post AS original_post
-    JOIN
-      post AS target_post
-    ON
-      original_post.`uri-id` = target_post.`parent-uri-id`
-    JOIN
-      post AS reply_post
-    ON
-      target_post.`uri-id` = reply_post.`thr-parent-id` AND
-      reply_post.`author-id` = ? AND
-      reply_post.`author-id` != target_post.`author-id` AND
-      reply_post.`author-id` != original_post.`author-id` AND
-      reply_post.`uri-id` != reply_post.`thr-parent-id` AND
-      reply_post.vid = ? AND
-      reply_post.created > CURDATE() - INTERVAL 1 MONTH
-    LEFT OUTER JOIN
-      post AS like_post
-    ON
-      reply_post.`uri-id` = like_post.`thr-parent-id` AND
-      like_post.vid = ? AND
-      like_post.`author-id` != reply_post.`author-id`
+	SELECT
+	  original_post.`uri-id` AS original_id,
+	  original_post.`author-id` AS original_author,
+	  original_post.created AS original_date,
+	  target_post.`uri-id` AS target_id,
+	  target_post.`author-id` AS target_author,
+	  target_post.created AS target_date,
+	  reply_post.`uri-id` AS reply_id,
+	  reply_post.`author-id` AS reply_author,
+	  reply_post.created AS reply_date,
+	  like_post.`uri-id` AS like_id,
+	  like_post.`author-id` AS like_author,
+	  like_post.created AS like_date
+	FROM
+	  post AS original_post
+	JOIN
+	  post AS target_post
+	ON
+	  original_post.`uri-id` = target_post.`parent-uri-id`
+	JOIN
+	  post AS reply_post
+	ON
+	  target_post.`uri-id` = reply_post.`thr-parent-id` AND
+	  reply_post.`author-id` = ? AND
+	  reply_post.`author-id` != target_post.`author-id` AND
+	  reply_post.`author-id` != original_post.`author-id` AND
+	  reply_post.`uri-id` != reply_post.`thr-parent-id` AND
+	  reply_post.vid = ? AND
+	  reply_post.created > CURDATE() - INTERVAL 1 MONTH
+	LEFT OUTER JOIN
+	  post AS like_post
+	ON
+	  reply_post.`uri-id` = like_post.`thr-parent-id` AND
+	  like_post.vid = ? AND
+	  like_post.`author-id` != reply_post.`author-id`
   ) AS post_meta
 ) AS reply_counts
 ', $contact_uid, $post_vid, $like_vid);
@@ -226,7 +226,8 @@ FROM (
 		return $answer;
 	}
 
-	protected function fillReplyGuyData(&$user) {
+	protected function fillReplyGuyData(&$user)
+	{
 		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
 		if (DBA::isResult($reply_guy_result)) {
 			$reply_guy_result_row = DBA::fetch($reply_guy_result);
@@ -235,22 +236,19 @@ FROM (
 			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
 			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			$denominator = (int)($user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes']);
 			if ($user['reply_count'] == 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;
-			}
-			elseif ($denominator == 0) {
+			} elseif ($denominator == 0) {
 				$user['reply_guy'] = true;
 				$user['reply_guy_score'] = '∞';
-			}
-			else {
+			} else {
 				$reply_guy_score = $user['reply_count'] / $denominator;
 				$user['reply_guy'] = $reply_guy_score >= 1.0;
 				$user['reply_guy_score'] = $this->sigFig($reply_guy_score, 2);
 			}
-		}
-		else {
+		} else {
 			$user['reply_count'] = "error";
 			$user['reply_likes'] = "error";
 			$user['reply_respondee_likes'] = "error";
@@ -272,9 +270,8 @@ FROM (
 			if (DBA::isResult($self_contact_result)) {
 				$self_contact_result_row = DBA::fetch($self_contact_result);
 				$user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
-			}
-			else {
-				$user['user_contact_uid'] = NULL;
+			} else {
+				$user['user_contact_uid'] = null;
 			}
 
 			if ($user['user_contact_uid']) {
@@ -286,28 +283,24 @@ FROM (
 					if ($user['reactions'] > 0) {
 						$user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
 						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
-					}
-					else {
+					} else {
 						$user['reactions'] = 0;
 						if ($user['comments'] == 0) {
 							$user['comments'] = 0;
 							$user['ratio'] = 0;
 							$user['ratioed'] = false;
-						}
-						else {
+						} else {
 							$user['ratio'] = '∞';
 							$user['ratioed'] = false;
 						}
 					}
-				}
-				else {
+				} else {
 					$user['comments'] = 'error';
 					$user['reactions'] = 'error';
 					$user['ratio'] = 'error';
 					$user['ratioed'] = false;
 				}
-			}
-			else {
+			} else {
 				$user['comments'] = 'error';
 				$user['reactions'] = 'error';
 				$user['ratio'] = 'error';

From 0d0aae36cd1a5a646ddbad15e1a4f548d6f14073 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 22 Jan 2025 08:30:30 +0100
Subject: [PATCH 089/161] Clean up phpstan warning

---
 ratioed/RatioedPanel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index d0fac8ad..b611b256 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -236,7 +236,7 @@ FROM (
 			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
 			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = (int)($user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes']);
+			$denominator = intval($user['reply_likes']) + intval($user['reply_respondee_likes']) + intval($user['reply_op_likes']);
 			if ($user['reply_count'] == 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;

From 2741227bfa8bb174d29a69399403f72b94e00ba2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 08:42:18 +0000
Subject: [PATCH 090/161] Add phpstan in woodpacker

---
 .woodpecker/.code_standards_check.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index 50872d4c..60a1bd2a 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -56,6 +56,10 @@ 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:

From 7a7940a8eddcd39279afc953ea136ff78f854f8a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 08:46:57 +0000
Subject: [PATCH 091/161] Fix PHPStan errors

---
 ratioed/RatioedPanel.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index b611b256..91665640 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -231,13 +231,13 @@ FROM (
 		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
 		if (DBA::isResult($reply_guy_result)) {
 			$reply_guy_result_row = DBA::fetch($reply_guy_result);
-			$user['reply_count'] = $reply_guy_result_row['replies_total'] ?? 0;
-			$user['reply_likes'] = $reply_guy_result_row['like_total'] ?? 0;
-			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
-			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
+			$user['reply_count'] = (int) $reply_guy_result_row['replies_total'] ?? 0;
+			$user['reply_likes'] = (int) $reply_guy_result_row['like_total'] ?? 0;
+			$user['reply_respondee_likes'] = (int) $reply_guy_result_row['target_like_total'] ?? 0;
+			$user['reply_op_likes'] = (int) $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = intval($user['reply_likes']) + intval($user['reply_respondee_likes']) + intval($user['reply_op_likes']);
-			if ($user['reply_count'] == 0) {
+			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			if ($user['reply_count'] === 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;
 			} elseif ($denominator == 0) {

From 2b5764c132bb02390d8a417bc80e0fb28f83df07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Wed, 15 Jan 2025 10:42:08 +0100
Subject: [PATCH 092/161] rework saml addon

fix #1587
remove css-side hiding of elements, which was broken.
remove them or make them readonly via javascript
---
 saml/saml.css | 1 -
 saml/saml.php | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 saml/saml.css

diff --git a/saml/saml.css b/saml/saml.css
deleted file mode 100644
index 087633cd..00000000
--- a/saml/saml.css
+++ /dev/null
@@ -1 +0,0 @@
-#settings-form > div:first-of-type, #settings-form > h2:first-of-type, #wrapper_mpassword, #wrapper_email { display: none !important; }
diff --git a/saml/saml.php b/saml/saml.php
index 9f065355..f3dd1774 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -75,11 +75,6 @@ function saml_install()
 	Hook::register('footer', __FILE__, 'saml_footer');
 }
 
-function saml_head(string &$body)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/saml.css');
-}
-
 function saml_footer(string &$body)
 {
 	$fragment = addslashes(BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('saml', 'settings_statement')));
@@ -87,6 +82,10 @@ function saml_footer(string &$body)
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
+document.getElementById('id_email').setAttribute('readonly', 'readonly');
+document.getElementById('password-settings').remove();
+document.getElementById('password-settings-collapse').remove();
+document.getElementById('id_mpassword_wrapper').remove();
 </script>
 EOL;
 }

From 792f50f835ebb9181f7d627282e582a153373a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Thu, 16 Jan 2025 18:53:05 +0100
Subject: [PATCH 093/161] fix view in vier and frio

---
 saml/saml.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index f3dd1774..7fdafc1e 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -83,9 +83,22 @@ function saml_footer(string &$body)
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
 document.getElementById('id_email').setAttribute('readonly', 'readonly');
-document.getElementById('password-settings').remove();
-document.getElementById('password-settings-collapse').remove();
-document.getElementById('id_mpassword_wrapper').remove();
+if ( document.getElementById('password-settings') != null ) {
+	document.getElementById('password-settings').remove();
+}
+if ( document.getElementById('password-settings-collapse') != null ) {
+	document.getElementById('password-settings-collapse').remove();
+}
+if ( document.getElementById('id_mpassword_wrapper') != null ) {
+	document.getElementById('id_mpassword_wrapper').remove();
+}
+if ( document.getElementById('wrapper_mpassword') != null ) {
+	document.getElementById('wrapper_mpassword').remove();
+}
+if ( document.getElementById('wrapper_password') != null ) {
+	document.getElementById('wrapper_password').parentNode.parentNode.children[0].remove();
+	document.getElementById('wrapper_password').parentNode.remove();
+}
 </script>
 EOL;
 }

From c50636727361a153b5ed5f445ab6afed9497e663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Fri, 17 Jan 2025 03:04:31 +0100
Subject: [PATCH 094/161] replace password-handling with hint

also add hint to email-field
---
 saml/saml.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index 7fdafc1e..81a6bfcc 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -78,26 +78,32 @@ function saml_install()
 function saml_footer(string &$body)
 {
 	$fragment = addslashes(BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('saml', 'settings_statement')));
+	$samlhint = DI::l10n()->t('managed via SAML authentication');
 	$body .= <<<EOL
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
 document.getElementById('id_email').setAttribute('readonly', 'readonly');
-if ( document.getElementById('password-settings') != null ) {
-	document.getElementById('password-settings').remove();
-}
+var saml_hint = document.createElement("span");
+var saml_hint_text = document.createTextNode('$samlhint');
+saml_hint.appendChild(saml_hint_text);
+document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+// Frio theme
 if ( document.getElementById('password-settings-collapse') != null ) {
-	document.getElementById('password-settings-collapse').remove();
+	document.getElementById('password-settings-collapse').replaceChildren(saml_hint.cloneNode(true));
 }
 if ( document.getElementById('id_mpassword_wrapper') != null ) {
+	document.getElementById('id_mpassword_wrapper').parentNode.appendChild(saml_hint.cloneNode(true));
 	document.getElementById('id_mpassword_wrapper').remove();
+	document.getElementById('id_email').nextElementSibling.classList.add('help-block');
 }
+// Vier theme
 if ( document.getElementById('wrapper_mpassword') != null ) {
 	document.getElementById('wrapper_mpassword').remove();
+	document.getElementById('id_email').nextElementSibling.classList.add('field_help');
 }
 if ( document.getElementById('wrapper_password') != null ) {
-	document.getElementById('wrapper_password').parentNode.parentNode.children[0].remove();
-	document.getElementById('wrapper_password').parentNode.remove();
+	document.getElementById('wrapper_password').parentNode.replaceChildren(saml_hint.cloneNode(true));
 }
 </script>
 EOL;

From 0b4aaac9fd16bc26511f226ed470fb4e18395e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Fri, 17 Jan 2025 03:24:17 +0100
Subject: [PATCH 095/161] translation for saml-hint

---
 saml/lang/C/messages.po | 82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/saml/lang/C/messages.po b/saml/lang/C/messages.po
index 05579568..b4a4c8ce 100644
--- a/saml/lang/C/messages.po
+++ b/saml/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
+"POT-Creation-Date: 2025-01-17 03:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: saml.php:231
+#: saml.php:81
+msgid "managed via SAML authentication"
+msgstr ""
+
+#: saml.php:246
 msgid "Settings statement"
 msgstr ""
 
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr ""
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/"
-"user)."
-msgstr ""
-
-#: saml.php:242
-msgid "Client ID"
-msgstr ""
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr ""
-
 #: saml.php:247
-msgid "IdP SSO URL"
-msgstr ""
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
+msgid "A statement on the settings page explaining where the user should go to change their e-mail and password. BBCode allowed."
 msgstr ""
 
 #: saml.php:252
-msgid "IdP SLO request URL"
+msgid "IdP ID"
 msgstr ""
 
 #: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
+msgid "Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user)."
 msgstr ""
 
 #: saml.php:257
-msgid "IdP SLO response URL"
+msgid "Client ID"
 msgstr ""
 
 #: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
+msgid "Identifier assigned to client by the identity provider (IdP)."
 msgstr ""
 
 #: saml.php:262
-msgid "SP private key"
+msgid "IdP SSO URL"
 msgstr ""
 
 #: saml.php:263
-msgid "The private key the addon should use to authenticate."
+msgid "The URL for your identity provider's SSO endpoint."
 msgstr ""
 
 #: saml.php:267
-msgid "SP certificate"
+msgid "IdP SLO request URL"
 msgstr ""
 
 #: saml.php:268
-msgid "The certficate for the addon's private key."
+msgid "The URL for your identity provider's SLO request endpoint."
 msgstr ""
 
 #: saml.php:272
-msgid "IdP certificate"
+msgid "IdP SLO response URL"
 msgstr ""
 
 #: saml.php:273
+msgid "The URL for your identity provider's SLO response endpoint."
+msgstr ""
+
+#: saml.php:277
+msgid "SP private key"
+msgstr ""
+
+#: saml.php:278
+msgid "The private key the addon should use to authenticate."
+msgstr ""
+
+#: saml.php:282
+msgid "SP certificate"
+msgstr ""
+
+#: saml.php:283
+msgid "The certficate for the addon's private key."
+msgstr ""
+
+#: saml.php:287
+msgid "IdP certificate"
+msgstr ""
+
+#: saml.php:288
 msgid "The x509 certficate for your identity provider."
 msgstr ""
 
-#: saml.php:276
+#: saml.php:291
 msgid "Save Settings"
 msgstr ""

From 4310c1355d42e7d0c9f071866c06624afd324f3a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 10:53:01 +0000
Subject: [PATCH 096/161] Replace call for Logger with DI::logger()

---
 advancedcontentfilter/advancedcontentfilter.php | 3 +--
 birdavatar/birdavatar.php                       | 3 +--
 blackout/blackout.php                           | 3 +--
 catavatar/catavatar.php                         | 3 +--
 fromapp/fromapp.php                             | 3 +--
 geonames/geonames.php                           | 3 +--
 gnot/gnot.php                                   | 3 +--
 googlemaps/googlemaps.php                       | 3 +--
 gravatar/gravatar.php                           | 3 +--
 impressum/impressum.php                         | 3 +--
 keycloakpassword/keycloakpassword.php           | 3 +--
 krynn/krynn.php                                 | 3 +--
 leistungsschutzrecht/leistungsschutzrecht.php   | 3 +--
 libravatar/libravatar.php                       | 3 +--
 newmemberwidget/newmemberwidget.php             | 3 +--
 numfriends/numfriends.php                       | 3 +--
 opmlexport/opmlexport.php                       | 3 +--
 piwik/piwik.php                                 | 3 +--
 pumpio/pumpio_sync.php                          | 4 ++--
 securemail/securemail.php                       | 3 +--
 20 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index c03034cd..aeeff77c 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -36,7 +36,6 @@
 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;
@@ -62,7 +61,7 @@ function advancedcontentfilter_install()
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	Logger::notice('installed advancedcontentfilter');
+	DI::logger()->notice('installed advancedcontentfilter');
 }
 
 /*
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 9a9dce0a..cd49b183 100644
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function birdavatar_install()
 	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-	Logger::info('registered birdavatar');
+	DI::logger()->info('registered birdavatar');
 }
 
 /**
diff --git a/blackout/blackout.php b/blackout/blackout.php
index a3f806ff..ac1ee3e6 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -45,7 +45,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -77,7 +76,7 @@ function blackout_redirect ($b)
 	}
 
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		Logger::notice('redirecting user to blackout page');
+		DI::logger()->notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2bdf0cca..7b5f05c0 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function catavatar_install()
 	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-	Logger::notice('registered catavatar');
+	DI::logger()->notice('registered catavatar');
 }
 
 /**
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 8bd27606..bb8a4fe6 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -17,7 +16,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');
-	Logger::notice("installed fromapp");
+	DI::logger()->notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)
diff --git a/geonames/geonames.php b/geonames/geonames.php
index d14b1e8f..4c5e54d8 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	Logger::notice('geonames invoked');
+	 DI::logger()->notice('geonames invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
 		return;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 5d0919cb..3801a210 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -20,7 +19,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');
 
-	Logger::notice("installed gnot");
+	DI::logger()->notice("installed gnot");
 }
 
 /**
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index b83a9cf9..a0bba8ad 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -8,13 +8,12 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 
 function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	Logger::notice('installed googlemaps');
+	DI::logger()->notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 6007c433..7fe0d955 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	Logger::notice("registered gravatar in avatar_lookup hook");
+	DI::logger()->notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)
diff --git a/impressum/impressum.php b/impressum/impressum.php
index f61d7182..0ad34e40 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -9,7 +9,6 @@
 
 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;
@@ -20,7 +19,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');
-	Logger::notice("installed impressum Addon");
+	DI::logger()->notice("installed impressum Addon");
 }
 
 /**
diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index e9809f86..11034ffe 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -37,7 +36,7 @@ function keycloakpassword_request($client_id, $secret, $url, $params = [])
 	$res = curl_exec($ch);
 
 	if (curl_errno($ch)) {
-		Logger::error(curl_error($ch));
+		DI::logger()->error(curl_error($ch));
 	}
 	curl_close($ch);
 
diff --git a/krynn/krynn.php b/krynn/krynn.php
index fa9db133..b57d827e 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -11,7 +11,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -31,7 +30,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');
 
-	Logger::notice("installed krynn");
+	DI::logger()->notice("installed krynn");
 }
 
 function krynn_post_hook(&$item)
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index ec8091ac..891cb6ca 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 function leistungsschutzrecht_install()
@@ -168,7 +167,7 @@ function leistungsschutzrecht_cron($b)
 	if ($last) {
 		$next = $last + 86400;
 		if ($next > time()) {
-			Logger::notice('poll intervall not reached');
+			DI::logger()->notice('poll intervall not reached');
 			return;
 		}
 	}
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 4cd72c83..6cb35331 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,7 +8,6 @@
 
 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;
@@ -20,7 +19,7 @@ function libravatar_install()
 {
 	Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	Logger::notice("registered libravatar in avatar_lookup hook");
+	DI::logger()->notice("registered libravatar in avatar_lookup hook");
 }
 
 function libravatar_load_config(ConfigFileManager $loader)
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index d3b68807..ba7dfb39 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -16,7 +15,7 @@ use Friendica\Model\User;
 function newmemberwidget_install()
 {
 	Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-	Logger::notice('newmemberwidget installed');
+	DI::logger()->notice('newmemberwidget installed');
 }
 
 function newmemberwidget_network_mod_init ($b)
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 66c9b74a..5652c8f0 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -16,7 +15,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');
 
-	Logger::notice("installed numfriends");
+	DI::logger()->notice("installed numfriends");
 }
 
 /**
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index 3df71275..be1d335c 100644
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -9,7 +9,6 @@
 
 use Friendica\DI;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
@@ -18,7 +17,7 @@ function opmlexport_install()
 {
 	Hook::register('addon_settings',        __FILE__, 'opmlexport_addon_settings');
 	Hook::register('addon_settings_post',   __FILE__, 'opmlexport_addon_settings_post');
-	Logger::notice('installed opmlexport Addon');
+	DI::logger()->notice('installed opmlexport Addon');
 }
 
 
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fc459a87..b7e9e71c 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,7 +36,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function piwik_install() {
 	Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
 	Hook::register('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-	Logger::notice("installed piwik addon");
+	DI::logger()->notice("installed piwik addon");
 }
 
 function piwik_load_config(ConfigFileManager $loader)
diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index beaf6e81..09548c6d 100644
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,5 +1,5 @@
 <?php
-use Friendica\Core\Logger;
+
 use Friendica\DI;
 
 function pumpio_sync_run(array $argv, int $argc) {
@@ -8,7 +8,7 @@ function pumpio_sync_run(array $argv, int $argc) {
 	if (function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if (intval($load[0]) > DI::config()->get('system', 'maxloadavg', 50)) {
-			Logger::notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+			DI::logger()->notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
 			return;
 		}
 	}
diff --git a/securemail/securemail.php b/securemail/securemail.php
index b56c0cbc..7b412395 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
@@ -22,7 +21,7 @@ function securemail_install()
 
 	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
 
-	Logger::notice('installed securemail');
+	DI::logger()->notice('installed securemail');
 }
 
 /**

From 41f280f0c71f214e7d2c803363e83c4d5ca7dac6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:34:33 +0000
Subject: [PATCH 097/161] Replace call for Logger with DI::logger() in blockbot
 addon

---
 blockbot/blockbot.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 022f188d..163d0cbc 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -11,7 +11,6 @@
 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;
@@ -70,7 +69,7 @@ function blockbot_init_1()
 	}
 
 	if (empty($parts)) {
-		Logger::debug('Known frontend found - accept', $logdata);
+		DI::logger()->debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -80,66 +79,66 @@ function blockbot_init_1()
 	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
 	if (blockbot_is_crawler($parts)) {
-		Logger::debug('Crawler found - reject', $logdata);
+		DI::logger()->debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		Logger::debug('Search bot found - reject', $logdata);
+		DI::logger()->debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
+		DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
 		if (!DI::config()->get('blockbot', 'security_checker')) {
-			Logger::debug('Security checker found - reject', $logdata);
+			DI::logger()->debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('Security checker found - accept', $logdata);
+		DI::logger()->debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		Logger::debug('Social media service found - accept', $logdata);
+		DI::logger()->debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		Logger::debug('Fediverse client found - accept', $logdata);
+		DI::logger()->debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		Logger::debug('Feed reader found - accept', $logdata);
+		DI::logger()->debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		Logger::debug('Fediverse tool found - accept', $logdata);
+		DI::logger()->debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		Logger::debug('Service agent found - accept', $logdata);
+		DI::logger()->debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		Logger::debug('Monitoring service found - accept', $logdata);
+		DI::logger()->debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		Logger::debug('Validation service found - accept', $logdata);
+		DI::logger()->debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		Logger::debug('Uncategorized helpful service found - accept', $logdata);
+		DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
@@ -147,10 +146,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')) {
-			Logger::debug('HTTP Library found - reject', $logdata);
+			DI::logger()->debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('HTTP Library found - accept', $logdata);
+		DI::logger()->debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -161,12 +160,12 @@ function blockbot_init_1()
 
 	if (!$isCrawler) {
 		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
-		Logger::debug('Non-bot user agent detected', $logdata);
+		DI::logger()->debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	Logger::notice('Possible bot found - reject', $logdata);
+	DI::logger()->notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -217,7 +216,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'])) {
-		Logger::debug('Login attempt detected - reject', $logdata);
+		DI::logger()->debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -443,7 +442,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

From d78ea50516c67f871ddb49ca18328379a95b4d57 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:36:23 +0000
Subject: [PATCH 098/161] Replace call for Logger with DI::logger() in bluesky
 addon

---
 bluesky/bluesky.php               | 95 +++++++++++++++----------------
 bluesky/bluesky_feed.php          |  6 +-
 bluesky/bluesky_notifications.php |  6 +-
 bluesky/bluesky_timeline.php      |  6 +-
 4 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5bf07afb..7f6bb9e7 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -30,7 +30,6 @@ 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;
@@ -106,16 +105,16 @@ function bluesky_item_by_link(array &$hookData)
 		if (empty($did)) {
 			return;
 		}
-	
-		Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-	
+
+		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'];
 	}
 
 	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	Logger::debug('Got post', ['uri' => $uri]);
+	DI::logger()->debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -138,7 +137,7 @@ function bluesky_follow(array &$hook_data)
 		return;
 	}
 
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
+	DI::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;
@@ -159,7 +158,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;
-		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -213,7 +212,7 @@ function bluesky_block(array &$hook_data)
 		if ($ucid) {
 			Contact::remove($ucid);
 		}
-		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -421,11 +420,11 @@ function bluesky_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('poll interval not reached');
+			DI::logger()->notice('poll interval not reached');
 			return;
 		}
 	}
-	Logger::notice('cron_start');
+	DI::logger()->notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -437,19 +436,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']))) {
-			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			DI::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])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				DI::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
-		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		DI::atProtocol()->getUserToken($pconfig['uid']);
 
 		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -463,32 +462,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')) {
-			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+			DI::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);
 			}
 		}
-		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
-	Logger::notice('Polling done for all users');
+	DI::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())) {
-		Logger::notice('Start contact cleanup');
+		DI::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());
-		Logger::notice('Contact cleanup done');
+		DI::logger()->notice('Contact cleanup done');
 	}
 
-	Logger::notice('cron_end');
+	DI::logger()->notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -508,7 +507,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])) {
-			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
+			DI::logger()->notice('No bluesky parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -555,12 +554,12 @@ function bluesky_send(array &$b)
 	}
 
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+		DI::logger()->debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
 			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
-				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
+				DI::logger()->debug('Not a bluesky post', ['uri' => $b['uri']]);
 				return;
 			}
 			bluesky_delete_post($b['uri'], $b['uid']);
@@ -571,12 +570,12 @@ function bluesky_send(array &$b)
 		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
-			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+			DI::logger()->debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+			DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
 			bluesky_create_post($b, $root, $parent);
 			return;
 		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -635,10 +634,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	if (empty($activity->uri)) {
 		return;
 	}
-	Logger::debug('Activity done', ['return' => $activity]);
+	DI::logger()->debug('Activity done', ['return' => $activity]);
 	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+	DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
@@ -722,14 +721,14 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 			return;
 		}
-		Logger::debug('Posting done', ['return' => $parent]);
+		DI::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']]);
-			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+			DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
 }
@@ -899,20 +898,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$new_size   = strlen($content);
 
 	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-		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]);
+		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]);
 		$content = Photo::getImageForPhoto($photo);
 	} else {
-		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]);
+		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]);
 	}
 
 	$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)) {
-		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]);
+		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]);
 		return null;
 	}
 
 	Item::incrementOutbound(Protocol::BLUESKY);
-	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]);
+	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]);
 	return $data->blob;
 }
 
@@ -920,11 +919,11 @@ function bluesky_delete_post(string $uri, int $uid)
 {
 	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
-		Logger::debug('No uri delected', ['uri' => $uri]);
+		DI::logger()->debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
 	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-	Logger::debug('Deleted', ['parts' => $parts]);
+	DI::logger()->debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
@@ -1026,10 +1025,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])) {
-			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+			DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
 		}
-		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+		DI::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);
@@ -1039,9 +1038,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);
-					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
@@ -1053,37 +1052,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);
-					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::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);
-				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+				DI::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);
-				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::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);
-				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::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);
-				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
-				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+				DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
 				break;
 		}
 	}
@@ -1114,16 +1113,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)) {
-			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+			DI::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);
-			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
 		} else {
-			Logger::notice('Post not found', ['entry' => $entry]);
+			DI::logger()->notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
diff --git a/bluesky/bluesky_feed.php b/bluesky/bluesky_feed.php
index a20ef1b9..e4aa3fdc 100644
--- a/bluesky/bluesky_feed.php
+++ b/bluesky/bluesky_feed.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
 		return;
 	}
 
-	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
 	bluesky_fetch_feed($argv[1], $argv[2]);
-	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }
diff --git a/bluesky/bluesky_notifications.php b/bluesky/bluesky_notifications.php
index 1fbc8f67..e1bf2047 100644
--- a/bluesky/bluesky_notifications.php
+++ b/bluesky/bluesky_notifications.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
 	bluesky_fetch_notifications($argv[1]);
-	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
 }
diff --git a/bluesky/bluesky_timeline.php b/bluesky/bluesky_timeline.php
index fda846ba..37b22d99 100644
--- a/bluesky/bluesky_timeline.php
+++ b/bluesky/bluesky_timeline.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
 	bluesky_fetch_timeline($argv[1]);
-	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
 }

From 77ebaca28102deb1c8ae398aeb18903c5188d0a6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:37:28 +0000
Subject: [PATCH 099/161] Replace call for Logger with DI::logger() in ratioed
 addon

---
 ratioed/RatioedPanel.php | 5 ++---
 ratioed/ratioed.php      | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 91665640..4cf5d7ff 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -3,7 +3,6 @@
 namespace Friendica\Addon\ratioed;
 
 use Friendica\Content\Pager;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -260,7 +259,7 @@ FROM (
 
 	protected function setupUserCallback(): \Closure
 	{
-		Logger::debug("ratioed: setupUserCallback");
+		DI::logger()->debug("ratioed: setupUserCallback");
 		$parentCallback = parent::setupUserCallback();
 		return function ($user) use ($parentCallback) {
 			$blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
@@ -310,7 +309,7 @@ FROM (
 			$this->fillReplyGuyData($user);
 
 			$user = $parentCallback($user);
-			Logger::debug("ratioed: setupUserCallback", [
+			DI::logger()->debug("ratioed: setupUserCallback", [
 				'uid' => $user['uid'],
 				'blocked_by' => $user['blocked_by'],
 				'comments' => $user['comments'],
diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 443fdaa9..5cc6d539 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\ratioed\RatioedPanel;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 /**
@@ -18,7 +17,7 @@ function ratioed_install()
 {
 	Hook::register('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
 
-	Logger::info("ratioed: installed");
+	DI::logger()->info("ratioed: installed");
 }
 
 /**
@@ -34,7 +33,7 @@ function ratioed_module() {}
  * @param array $arr Parameters, including "tabs" which is the list to modify, and "selectedTab", which is the currently selected tab ID
  */
 function ratioed_users_tabs(array &$arr) {
-	Logger::debug("ratioed: users tabs");
+	DI::logger()->debug("ratioed: users tabs");
 
 	array_push($arr['tabs'], [
 		'label'	 => DI::l10n()->t('Behaviour'),
@@ -50,7 +49,7 @@ function ratioed_users_tabs(array &$arr) {
  * @brief Displays the ratioed tab in the moderation panel
  */
 function ratioed_content() {
-	Logger::debug("ratioed: content");
+	DI::logger()->debug("ratioed: content");
 
 	$ratioed = DI::getDice()->create(RatioedPanel::class, [$_SERVER]);
 	$httpException = DI::getDice()->create(Friendica\Module\Special\HTTPException::class);

From 1d1a00df275d19e81fdf44580d126c2affc89f74 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:37:58 +0000
Subject: [PATCH 100/161] Replace call for Logger with DI::logger() in cld
 addon

---
 cld/cld.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

From 4881e6004a9bc883714fe31eff59484a41ad8e2e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:38:27 +0000
Subject: [PATCH 101/161] Replace call for Logger with DI::logger() in diaspora
 addon

---
 diaspora/diaspora.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index d6c98e34..3c4b4c0e 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -11,7 +11,6 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 
 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;
@@ -186,7 +185,7 @@ function diaspora_send(array &$b)
 {
 	$hostname = DI::baseUrl()->getHost();
 
-	Logger::notice('diaspora_send: invoked');
+	DI::logger()->notice('diaspora_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -210,14 +209,14 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	Logger::info('diaspora_send: prepare posting');
+	DI::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) {
-		Logger::info('diaspora_send: all values seem to be okay');
+		DI::logger()->info('diaspora_send: all values seem to be okay');
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -248,20 +247,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			Logger::info('diaspora_send: prepare');
+			DI::logger()->info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			Logger::info('diaspora_send: try to log in ' . $handle);
+			DI::logger()->info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			Logger::info('diaspora_send: try to send ' . $body);
+			DI::logger()->info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			Logger::notice('diaspora_send: success');
+			DI::logger()->notice('diaspora_send: success');
 		} catch (Exception $e) {
-			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			DI::logger()->notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			Logger::info('diaspora_send: requeueing ' . $b['uid']);
+			DI::logger()->info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}

From b38c2d18be2d0174e7e5866cdbbae8cfa75b5b88 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:38:48 +0000
Subject: [PATCH 102/161] Replace call for Logger with DI::logger() in
 discourse addon

---
 discourse/discourse.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/discourse/discourse.php b/discourse/discourse.php
index e97a4fd8..b8d0d996 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -10,7 +10,6 @@
 
 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;
@@ -79,13 +78,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])) {
-		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
+		DI::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)) {
-		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
+		DI::logger()->info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
 		return;
 	}
 
@@ -95,16 +94,16 @@ function discourse_email_getmessage(&$message)
 	}
 
 	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		Logger::info('This is no Discourse post');
+		DI::logger()->info('This is no Discourse post');
 		return;
 	}
 
 	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
+		DI::logger()->info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
 		return;
 	}
 
-	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
+	DI::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);
@@ -121,7 +120,7 @@ function discourse_fetch_post($host, $topic, $pid)
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
 	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
-		Logger::info('No success', ['url' => $url]);
+		DI::logger()->info('No success', ['url' => $url]);
 		return false;
 	}
 
@@ -133,11 +132,11 @@ function discourse_fetch_post($host, $topic, $pid)
 			/// @todo Possibly fetch missing posts here
 			continue;
 		}
-		Logger::info('Got post data from topic', $post);
+		DI::logger()->info('Got post data from topic', $post);
 		return $post;
 	}
 
-	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
+	DI::logger()->info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
 	return false;
 }
 
@@ -169,7 +168,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 
 	$message = discourse_process_post($message, $data, $hostaddr);
 
-	Logger::info('Got API data', $message);
+	DI::logger()->info('Got API data', $message);
 	return true;
 }
 
@@ -202,7 +201,7 @@ function discourse_get_user($post, $hostaddr)
 	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
-	Logger::info('Contact', $contact);
+	DI::logger()->info('Contact', $contact);
 	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
@@ -268,11 +267,11 @@ function discourse_get_html($message)
 	$div = $doc2->importNode($result->item(0), true);
 	$doc2->appendChild($div);
 	$message['html'] = $doc2->saveHTML();
-	Logger::info('Found html body', ['html' => $message['html']]);
+	DI::logger()->info('Found html body', ['html' => $message['html']]);
 
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
-		Logger::info('Found profile', $profile);
+		DI::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'];
@@ -288,21 +287,21 @@ function discourse_get_text($message)
 	$text = str_replace("\r", '', $text);
 	$pos = strpos($text, "\n---\n");
 	if ($pos == 0) {
-		Logger::info('No separator found', ['text' => $text]);
+		DI::logger()->info('No separator found', ['text' => $text]);
 		return $message;
 	}
 
 	$message['text'] = trim(substr($text, 0, $pos));
 
-	Logger::info('Found text body', ['text' => $message['text']]);
+	DI::logger()->info('Found text body', ['text' => $message['text']]);
 
 	$message['text'] = Markdown::toBBCode($message['text']);
 
 	$text = substr($text, $pos);
-	Logger::info('Found footer', ['text' => $text]);
+	DI::logger()->info('Found footer', ['text' => $text]);
 	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
 		$message['item']['plink'] = $link[1];
-		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
+		DI::logger()->info('Found plink', ['plink' => $message['item']['plink']]);
 	}
 	return $message;
 }

From 1db552ead93ef398b6f3fb689c95d763c4d93a72 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:39:11 +0000
Subject: [PATCH 103/161] Replace call for Logger with DI::logger() in dwpost
 addon

---
 dwpost/dwpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 7ce30086..7bad85dc 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -185,12 +184,12 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('dwpost: data: ' . $xml);
+		DI::logger()->debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
 			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
+		DI::logger()->info('posted to dreamwidth: ' . ($x) ? $x : '');
 	}
 }

From e7755584cbbd3850389495420613ebfe2b59ddb1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:40:12 +0000
Subject: [PATCH 104/161] Replace call for Logger with DI::logger() in
 geocoordinates addon

---
 geocoordinates/geocoordinates.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index eb56f093..5af1defc 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -51,25 +50,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) {
-		Logger::info('API could not be queried');
+		DI::logger()->info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != '200') {
-		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+		DI::logger()->info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		Logger::info('No results found for coordinates ' . $item['coord']);
+		DI::logger()->info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
 	$item['location'] = $data->results[0]->formatted;
 
-	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	DI::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']);

From 15a951235f1f2d2039315851eb0a38831b77c05a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:40:32 +0000
Subject: [PATCH 105/161] Replace call for Logger with DI::logger() in ifttt
 addon

---
 ifttt/ifttt.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 51fa8db8..cb23032b 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -8,7 +8,6 @@
  */
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -86,16 +85,16 @@ function ifttt_post()
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		Logger::info('User ' . $nickname . ' not found.');
+		DI::logger()->info('User ' . $nickname . ' not found.');
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	DI::logger()->info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
 
 	if (!isset($_REQUEST['key'])) {
-		Logger::notice('No key found.');
+		DI::logger()->notice('No key found.');
 		return;
 	}
 
@@ -103,7 +102,7 @@ function ifttt_post()
 
 	// Check the key
 	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		Logger::info('Invalid key for user ' . $uid);
+		DI::logger()->info('Invalid key for user ' . $uid);
 		return;
 	}
 
@@ -114,7 +113,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		Logger::info('Unknown item type ' . $item['type']);
+		DI::logger()->info('Unknown item type ' . $item['type']);
 		return;
 	}
 

From 50023180895a4c1e70163762bd90d56d38d823ba Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:41:02 +0000
Subject: [PATCH 106/161] Replace call for Logger with DI::logger() in ijpost
 addon

---
 ijpost/ijpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 37c3cd45..9fe502af 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -178,11 +177,11 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('ijpost: data: ' . $xml);
+		DI::logger()->debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
 			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
-		Logger::info('posted to insanejournal: ' . $x ? $x : '');
+		DI::logger()->info('posted to insanejournal: ' . $x ? $x : '');
 	}
 }

From 5d51c5b56ecbbc220332fd5b2bea6bb34c436e5f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:42:25 +0000
Subject: [PATCH 107/161] Replace call for Logger with DI::logger() in
 js_upload addon

---
 js_upload/js_upload.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index f1d85aa3..c0a2467d 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Images;
@@ -68,7 +67,7 @@ function js_upload_post_init(array &$b)
 	$js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if (isset($result['error'])) {
-		Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
+		DI::logger()->info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
 		echo json_encode($result);
 		exit();
 	}
@@ -91,7 +90,7 @@ function js_upload_post_end(int &$b)
 {
 	global $js_upload_jsonresponse;
 
-	Logger::notice('upload_post_end');
+	DI::logger()->notice('upload_post_end');
 	if (!empty($js_upload_jsonresponse)) {
 		echo $js_upload_jsonresponse;
 		exit();
@@ -187,6 +186,10 @@ class js_upload_qqFileUploader
 {
 	private $allowedExtensions;
 	private $sizeLimit;
+
+	/**
+	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm
+	 */
 	private $file;
 
 	function __construct(array $allowedExtensions = [], $sizeLimit)
@@ -234,7 +237,7 @@ class js_upload_qqFileUploader
 		$filename = $pathinfo['filename'];
 
 		if (!isset($pathinfo['extension'])) {
-			Logger::warning('extension isn\'t set.', ['filename' => $filename]);
+			DI::logger()->warning('extension isn\'t set.', ['filename' => $filename]);
 		}
 		$ext = $pathinfo['extension'] ?? '';
 

From a488f2513159b44765400fa03f3351f5885e851f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:44:48 +0000
Subject: [PATCH 108/161] Replace call for Logger with DI::logger() in ldapauth
 addon

---
 ldapauth/ldapauth.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index f834b4d5..b80c5226 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -30,7 +30,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -69,54 +68,54 @@ function ldapauth_authenticate($username, $password)
 	$ldap_autocreateaccount_nameattribute  = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
 	if (!extension_loaded('ldap') || !strlen($ldap_server)) {
-		Logger::error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
+		DI::logger()->error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
 		return false;
 	}
 
 	if (!strlen($password)) {
-		Logger::error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
+		DI::logger()->error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
 		return false;
 	}
 
 	$connect = @ldap_connect($ldap_server);
 	if ($connect === false) {
-		Logger::warning('Could not connect to LDAP server', ['server' => $ldap_server]);
+		DI::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) {
-		Logger::warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::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) {
-		Logger::notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::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) {
-		Logger::notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		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)]);
 		return false;
 	}
 
 	$dn = @ldap_get_dn($connect, $id);
 	if (!@ldap_bind($connect, $dn, $password)) {
-		Logger::notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::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) {
-			Logger::notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			DI::logger()->notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} elseif ($errno === 16) {
-			Logger::notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			DI::logger()->notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} else {
-			Logger::notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
+			DI::logger()->notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
 		}
 
 		@ldap_close($connect);
@@ -140,7 +139,7 @@ function ldapauth_authenticate($username, $password)
 		$authentication = User::getAuthenticationInfo($username);
 		return User::getById($authentication['uid']);
 	} catch (Exception $e) {
-		Logger::notice('LDAP authentication error: ' . $e->getMessage());
+		DI::logger()->notice('LDAP authentication error: ' . $e->getMessage());
 		return false;
 	}
 }
@@ -148,7 +147,7 @@ function ldapauth_authenticate($username, $password)
 function ldap_createaccount($username, $password, $email, $name)
 {
 	if (!strlen($email) || !strlen($name)) {
-		Logger::notice('Could not create local user from LDAP data, no email or nickname provided');
+		DI::logger()->notice('Could not create local user from LDAP data, no email or nickname provided');
 		return false;
 	}
 
@@ -160,10 +159,10 @@ function ldap_createaccount($username, $password, $email, $name)
 			'password' => $password,
 			'verified' => 1
 		]);
-		Logger::info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
+		DI::logger()->info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
 		return $user;
 	} catch (Exception $ex) {
-		Logger::error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
+		DI::logger()->error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
 	}
 
 	return false;

From f08750199df1a0b7833e2eaba774f41c88cfe049 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:45:25 +0000
Subject: [PATCH 109/161] Replace call for Logger with DI::logger() in
 libertree addon

---
 libertree/libertree.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libertree/libertree.php b/libertree/libertree.php
index c138e597..1489a029 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -130,7 +129,7 @@ function libertree_post_local(array &$b)
 
 function libertree_send(array &$b)
 {
-	Logger::notice('libertree_send: invoked');
+	DI::logger()->notice('libertree_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -196,6 +195,6 @@ function libertree_send(array &$b)
 		];
 
 		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
-		Logger::notice('libertree: ' . $result);
+		DI::logger()->notice('libertree: ' . $result);
 	}
 }

From 9ed02034f1755ae5832b96d34800a7758ad37bf5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:04 +0000
Subject: [PATCH 110/161] Replace call for Logger with DI::logger() in ljpost
 addon

---
 ljpost/ljpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index b416c605..fd7d1bd8 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -200,7 +199,7 @@ function ljpost_send(array &$b)
 </methodCall>
 EOT;
 
-		Logger::debug('ljpost: data: ' . $xml);
+		DI::logger()->debug('ljpost: data: ' . $xml);
 
 		$x = '';
 
@@ -208,6 +207,6 @@ EOT;
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . $x);
+		DI::logger()->info('posted to livejournal: ' . $x);
 	}
 }

From 9a91bae363392fd1df0849afb4a21e24de994579 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:30 +0000
Subject: [PATCH 111/161] Replace call for Logger with DI::logger() in
 mailstream addon

---
 mailstream/mailstream.php | 45 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 9910a63d..5228b168 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -8,7 +8,6 @@
 
 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;
@@ -32,7 +31,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');
 
-	Logger::info("installed mailstream");
+	DI::logger()->info("installed mailstream");
 }
 
 /**
@@ -86,7 +85,7 @@ function mailstream_generate_id(string $uri): string
 	$host = DI::baseUrl()->getHost();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	Logger::debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
+	DI::logger()->debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
 	return $message_id;
 }
 
@@ -95,20 +94,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)) {
-		Logger::error('could not find item');
+		DI::logger()->error('could not find item');
 		return;
 	}
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-		Logger::error('could not find user', ['uid' => $item['uid']]);
+		DI::logger()->error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
 	if (!mailstream_send($data['message_id'], $item, $user)) {
-		Logger::debug('send failed, will retry', $data);
+		DI::logger()->debug('send failed, will retry', $data);
 		if (!Worker::defer()) {
-			Logger::error('failed and could not defer', $data);
+			DI::logger()->error('failed and could not defer', $data);
 		}
 	}
 }
@@ -124,32 +123,32 @@ function mailstream_send_hook(array $data)
 function mailstream_post_hook(array &$item)
 {
 	if ($item['uid'] === 0) {
-		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
+		DI::logger()->debug('mailstream: root user, skipping item ' . $item['id']);
 		return;
 	}
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+		DI::logger()->debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
 	if (!$item['contact-id']) {
-		Logger::debug('no contact-id', ['item' => $item['id']]);
+		DI::logger()->debug('no contact-id', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['uri']) {
-		Logger::debug('no uri', ['item' => $item['id']]);
+		DI::logger()->debug('no uri', ['item' => $item['id']]);
 		return;
 	}
 	if ($item['verb'] == Activity::ANNOUNCE) {
-		Logger::debug('ignoring announce', ['item' => $item['id']]);
+		DI::logger()->debug('ignoring announce', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
-			Logger::debug('ignoring like', ['item' => $item['id']]);
+			DI::logger()->debug('ignoring like', ['item' => $item['id']]);
 			return;
 		}
 		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('ignoring dislike', ['item' => $item['id']]);
+			DI::logger()->debug('ignoring dislike', ['item' => $item['id']]);
 			return;
 		}
 	}
@@ -200,7 +199,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 		try {
 			$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 			if (!$curlResult->isSuccess()) {
-				Logger::debug('mailstream: fetch image url failed', [
+				DI::logger()->debug('mailstream: fetch image url failed', [
 					'url' => $url,
 					'item_id' => $item['id'],
 					'return_code' => $curlResult->getReturnCode()
@@ -208,7 +207,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 				continue;
 			}
 		} catch (InvalidArgumentException $e) {
-			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			DI::logger()->error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;
 		}
 		$attachments[$url] = [
@@ -309,7 +308,7 @@ function mailstream_subject(array $item): string
 	}
 	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
 	if (!DBA::isResult($contact)) {
-		Logger::error('no contact', [
+		DI::logger()->error('no contact', [
 			'item' => $item['id'],
 			'plink' => $item['plink'],
 			'contact id' => $item['contact-id'],
@@ -351,16 +350,16 @@ function mailstream_subject(array $item): string
 function mailstream_send(string $message_id, array $item, array $user): bool
 {
 	if (!is_array($item)) {
-		Logger::error('item is empty', ['message_id' => $message_id]);
+		DI::logger()->error('item is empty', ['message_id' => $message_id]);
 		return false;
 	}
 
 	if (!$item['visible']) {
-		Logger::debug('item not yet visible', ['item uri' => $item['uri']]);
+		DI::logger()->debug('item not yet visible', ['item uri' => $item['uri']]);
 		return false;
 	}
 	if (!$message_id) {
-		Logger::error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
+		DI::logger()->error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
 		return true;
 	}
 
@@ -418,15 +417,15 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		Logger::debug('sent message', [
+		DI::logger()->debug('sent message', [
 			'message ID' => $mail->MessageID,
 			'subject' => $mail->Subject,
 			'address' => $address
 		]);
 	} catch (phpmailerException $e) {
-		Logger::debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
+		DI::logger()->debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
 	} catch (Exception $e) {
-		Logger::debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
+		DI::logger()->debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
 	}
 
 	return true;

From 9ceff8f5929d7899b91cc8b1acc26e47cd3dfce7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:58 +0000
Subject: [PATCH 112/161] Replace call for Logger with DI::logger() in
 nominatim addon

---
 nominatim/nominatim.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
index a3d14af5..3a567b7b 100644
--- a/nominatim/nominatim.php
+++ b/nominatim/nominatim.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -45,19 +44,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)) {
-		Logger::info('API could not be queried');
+		DI::logger()->info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s, true);
 	if (empty($data['display_name'])) {
-		Logger::info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
+		DI::logger()->info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
 		return;
 	}
 
 	$item['location'] = $data['display_name'];
 
-	Logger::info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
+	DI::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']);

From 757d72c360396a06a58f91c4c9d14f7726a9f644 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:47:24 +0000
Subject: [PATCH 113/161] Replace call for Logger with DI::logger() in
 openstreetmap addon

---
 openstreetmap/openstreetmap.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index fc5ebbbe..bf0f54b6 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -11,7 +11,6 @@
 
 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;
@@ -31,7 +30,7 @@ function openstreetmap_install()
 	Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	Logger::notice("installed openstreetmap");
+	DI::logger()->notice("installed openstreetmap");
 }
 
 function openstreetmap_load_config(ConfigFileManager $loader)
@@ -154,8 +153,8 @@ function openstreetmap_generate_map(array &$b)
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	Logger::debug('lat: ' . $lat);
-	Logger::debug('lon: ' . $lon);
+	DI::logger()->debug('lat: ' . $lat);
+	DI::logger()->debug('lon: ' . $lon);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -173,7 +172,7 @@ function openstreetmap_generate_map(array &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	Logger::debug('generate_map: ' . $b['html']);
+	DI::logger()->debug('generate_map: ' . $b['html']);
 }
 
 function openstreetmap_addon_admin(string &$o)

From 469d3e6d61c8c20089be5da8ce7187db6507f77b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:47:40 +0000
Subject: [PATCH 114/161] Replace call for Logger with DI::logger() in planets
 addon

---
 planets/planets.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/planets/planets.php b/planets/planets.php
index d96e33a6..8849010a 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -28,7 +27,7 @@ function planets_install()
 	Hook::register('addon_settings', 'addon/planets/planets.php', 'planets_settings');
 	Hook::register('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
 
-	Logger::notice("installed planets");
+	DI::logger()->notice("installed planets");
 }
 
 /**
@@ -39,7 +38,7 @@ function planets_install()
  */
 function planets_post_hook(&$item)
 {
-	Logger::notice('planets invoked');
+	DI::logger()->notice('planets invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {
 		/* non-zero if this is a logged in user of this system */

From 119ba0a78e1d578d802bf87b1d39e6da35a02da6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:48:21 +0000
Subject: [PATCH 115/161] Replace call for Logger with DI::logger() in pnut
 addon

---
 pnut/pnut.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pnut/pnut.php b/pnut/pnut.php
index f298997b..5460b991 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -14,7 +14,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -76,7 +75,7 @@ function pnut_connect()
 
 	try {
 		$token = $nut->getAccessToken($callback_url);
-		Logger::debug('Got Token', [$token]);
+		DI::logger()->debug('Got Token', [$token]);
 		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
 	} catch (phpnutException $e) {
@@ -266,8 +265,8 @@ function pnut_post_hook(array &$b)
 		return;
 	}
 
-	Logger::notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
-	Logger::debug('PNUT array', $b);
+	DI::logger()->notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
+	DI::logger()->debug('PNUT array', $b);
 
 	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
 	$nut = new phpnut\phpnut($token);
@@ -276,7 +275,7 @@ function pnut_post_hook(array &$b)
 	$text = $msgarr['text'];
 	$raw = [];
 
-	Logger::debug('PNUT msgarr', $msgarr);
+	DI::logger()->debug('PNUT msgarr', $msgarr);
 
 	if (count($msgarr['parts']) > 1) {
 		$tstamp = time();
@@ -292,23 +291,23 @@ function pnut_post_hook(array &$b)
 	if ($msgarr['type'] == 'photo') {
 		$fileraw = ['type' => 'dev.mcmillian.friendica.image', 'kind' => 'image', 'is_public' => true];
 		foreach ($msgarr['images'] as $image) {
-			Logger::debug('PNUT image', $image);
+			DI::logger()->debug('PNUT image', $image);
 
 			if (!empty($image['id'])) {
 				$photo = Photo::selectFirst([], ['id' => $image['id']]);
-				Logger::debug('PNUT selectFirst');
+				DI::logger()->debug('PNUT selectFirst');
 			} else {
 				$photo = Photo::createPhotoForExternalResource($image['url']);
-				Logger::debug('PNUT createPhotoForExternalResource');
+				DI::logger()->debug('PNUT createPhotoForExternalResource');
 			}
 			$picturedata = Photo::getImageForPhoto($photo);
 
-			Logger::debug('PNUT photo', $photo);
+			DI::logger()->debug('PNUT photo', $photo);
 			$picurefile = tempnam(System::getTempPath(), 'pnut');
 			file_put_contents($picurefile, $picturedata);
-			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
+			DI::logger()->debug('PNUT got file?', ['filename' => $picurefile]);
 			$imagefile = $nut->createFile($picurefile, $fileraw);
-			Logger::debug('PNUT file', ['pnutimagefile' => $imagefile]);
+			DI::logger()->debug('PNUT file', ['pnutimagefile' => $imagefile]);
 			unlink($picurefile);
 
 			$raw['io.pnut.core.oembed'][] = ['+io.pnut.core.file' => ['file_id' => $imagefile['id'], 'file_token' => $imagefile['file_token'], 'format' => 'oembed']];
@@ -318,5 +317,5 @@ function pnut_post_hook(array &$b)
 	$raw['io.pnut.core.crosspost'][] = ['canonical_url' => $b['plink']];
 	$nut->createPost($text, ['raw' => $raw]);
 
-	Logger::debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
+	DI::logger()->debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
 }

From e32ba1ce7b0a1baad29d47df9dcb6328834fbd94 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:54:34 +0000
Subject: [PATCH 116/161] Replace call for Logger with DI::logger() in
 public_server addon

---
 public_server/public_server.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public_server/public_server.php b/public_server/public_server.php
index eb7af1e7..9cd0f667 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,7 +8,6 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -47,7 +46,7 @@ function public_server_register_account($b)
 
 function public_server_cron($b)
 {
-	Logger::notice("public_server: cron start");
+	DI::logger()->notice("public_server: cron start");
 
 	$users = DBA::selectToArray('user', [], ["`account_expires_on` > ? AND `account_expires_on` < ?
 		AND `expire_notification_sent` <= ?", DBA::NULL_DATETIME, DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
@@ -96,7 +95,7 @@ function public_server_cron($b)
 		}
 	}
 
-	Logger::notice("public_server: cron end");
+	DI::logger()->notice("public_server: cron end");
 }
 
 function public_server_enotify(array &$b)

From d50650b8cfe7284ee17b482f261e0a8778ad3758 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:55:13 +0000
Subject: [PATCH 117/161] Replace call for Logger with DI::logger() in pumpio
 addon

---
 pumpio/pumpio.php | 73 +++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index ffe5f187..c3445b48 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -10,7 +10,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -107,7 +106,7 @@ function pumpio_registerclient($host)
 	$params['logo_url'] = DI::baseUrl() . '/images/friendica-256.png';
 	$params['redirect_uris'] = DI::baseUrl() . '/pumpio/connect';
 
-	Logger::info('pumpio_registerclient: ' . $url . ' parameters', $params);
+	DI::logger()->info('pumpio_registerclient: ' . $url . ' parameters', $params);
 
 	// @TODO Rewrite this to our own HTTP client
 	$ch = curl_init($url);
@@ -122,10 +121,10 @@ function pumpio_registerclient($host)
 
 	if ($curl_info['http_code'] == '200') {
 		$values = json_decode($s);
-		Logger::info('pumpio_registerclient: success ', (array)$values);
+		DI::logger()->info('pumpio_registerclient: success ', (array)$values);
 		return $values;
 	}
-	Logger::info('pumpio_registerclient: failed: ', $curl_info);
+	DI::logger()->info('pumpio_registerclient: failed: ', $curl_info);
 	return false;
 
 }
@@ -138,7 +137,7 @@ function pumpio_connect()
 	$hostname        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'host');
 
 	if ((($consumer_key == '') || ($consumer_secret == '')) && ($hostname != '')) {
-		Logger::notice('pumpio_connect: register client');
+		DI::logger()->notice('pumpio_connect: register client');
 		$clientdata = pumpio_registerclient($hostname);
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key', $clientdata->client_id);
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
@@ -146,11 +145,11 @@ function pumpio_connect()
 		$consumer_key    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key');
 		$consumer_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret');
 
-		Logger::info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret);
+		DI::logger()->info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret);
 	}
 
 	if (($consumer_key == '') || ($consumer_secret == '')) {
-		Logger::notice('pumpio_connect: '.sprintf('Unable to register the client at the pump.io server "%s".', $hostname));
+		DI::logger()->notice('pumpio_connect: '.sprintf('Unable to register the client at the pump.io server "%s".', $hostname));
 
 		return DI::l10n()->t("Unable to register the client at the pump.io server '%s'.", $hostname);
 	}
@@ -179,7 +178,7 @@ function pumpio_connect()
 	if (($success = $client->Initialize())) {
 		if (($success = $client->Process())) {
 			if (strlen($client->access_token)) {
-				Logger::info('pumpio_connect: otoken: ' . $client->access_token . ', osecrect: ' . $client->access_token_secret);
+				DI::logger()->info('pumpio_connect: otoken: ' . $client->access_token . ', osecrect: ' . $client->access_token_secret);
 				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token', $client->access_token);
 				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token_secret', $client->access_token_secret);
 			}
@@ -191,11 +190,11 @@ function pumpio_connect()
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_connect: authenticated');
+		DI::logger()->notice('pumpio_connect: authenticated');
 		$o = DI::l10n()->t('You are now authenticated to pumpio.');
 		$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t('return to the connector page') . '</a>';
 	} else {
-		Logger::notice('pumpio_connect: could not connect');
+		DI::logger()->notice('pumpio_connect: could not connect');
 		$o = 'Could not connect to pumpio. Refresh the page or try again later.';
 	}
 
@@ -345,7 +344,7 @@ function pumpio_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
 		// Don't fork if it isn't a reply to a pump.io post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
-			Logger::notice('No pump.io parent found for item ' . $post['id']);
+			DI::logger()->notice('No pump.io parent found for item ' . $post['id']);
 			$b['execute'] = false;
 			return;
 		}
@@ -389,7 +388,7 @@ function pumpio_send(array &$b)
 		return;
 	}
 
-	Logger::debug('pumpio_send: parameter ', $b);
+	DI::logger()->debug('pumpio_send: parameter ', $b);
 
 	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
@@ -399,7 +398,7 @@ function pumpio_send(array &$b)
 		$orig_post = Post::selectFirst([], $condition);
 
 		if (!DBA::isResult($orig_post)) {
-			Logger::notice('pumpio_send: no pumpio post ' . $b['parent']);
+			DI::logger()->notice('pumpio_send: no pumpio post ' . $b['parent']);
 			return;
 		} else {
 			$iscomment = true;
@@ -409,7 +408,7 @@ function pumpio_send(array &$b)
 
 		$receiver = pumpio_getreceiver($b);
 
-		Logger::notice('pumpio_send: receiver ', $receiver);
+		DI::logger()->notice('pumpio_send: receiver ', $receiver);
 
 		if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio')) {
 			return;
@@ -543,13 +542,13 @@ function pumpio_send(array &$b)
 			}
 
 			$post_id = $user->object->id;
-			Logger::notice('pumpio_send ' . $username . ': success ' . $post_id);
+			DI::logger()->notice('pumpio_send ' . $username . ': success ' . $post_id);
 			if ($post_id && $iscomment) {
-				Logger::notice('pumpio_send ' . $username . ': Update extid ' . $post_id . ' for post id ' . $b['id']);
+				DI::logger()->notice('pumpio_send ' . $username . ': Update extid ' . $post_id . ' for post id ' . $b['id']);
 				Item::update(['extid' => $post_id], ['id' => $b['id']]);
 			}
 		} else {
-			Logger::notice('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
+			DI::logger()->notice('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
 			Worker::defer();
 		}
 	}
@@ -619,9 +618,9 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_action '.$username.' '.$action.': success '.$uri);
+		DI::logger()->notice('pumpio_action '.$username.' '.$action.': success '.$uri);
 	} else {
-		Logger::notice('pumpio_action '.$username.' '.$action.': general error: '.$uri);
+		DI::logger()->notice('pumpio_action '.$username.' '.$action.': general error: '.$uri);
 		Worker::defer();
 	}
 }
@@ -639,15 +638,15 @@ function pumpio_sync()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('pumpio: poll intervall not reached');
+			DI::logger()->notice('pumpio: poll intervall not reached');
 			return;
 		}
 	}
-	Logger::notice('pumpio: cron_start');
+	DI::logger()->notice('pumpio: cron_start');
 
 	$pconfigs = DBA::selectToArray('pconfig', ['uid'], ['cat' => 'pumpio', 'k' => 'mirror', 'v' => '1']);
 	foreach ($pconfigs as $rr) {
-		Logger::notice('pumpio: mirroring user '.$rr['uid']);
+		DI::logger()->notice('pumpio: mirroring user '.$rr['uid']);
 		pumpio_fetchtimeline($rr['uid']);
 	}
 
@@ -662,12 +661,12 @@ function pumpio_sync()
 	foreach ($pconfigs as $rr) {
 		if ($abandon_days != 0) {
 			if (DBA::exists('user', ["uid = ? AND `login_date` >= ?", $rr['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+				DI::logger()->notice('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
 				continue;
 			}
 		}
 
-		Logger::notice('pumpio: importing timeline from user '.$rr['uid']);
+		DI::logger()->notice('pumpio: importing timeline from user '.$rr['uid']);
 		pumpio_fetchinbox($rr['uid']);
 
 		// check for new contacts once a day
@@ -684,7 +683,7 @@ function pumpio_sync()
 		}
 	}
 
-	Logger::notice('pumpio: cron_end');
+	DI::logger()->notice('pumpio: cron_end');
 
 	DI::keyValue()->set('pumpio_last_poll', time());
 }
@@ -729,7 +728,7 @@ function pumpio_fetchtimeline(int $uid)
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major';
 
-	Logger::notice('pumpio: fetching for user ' . $uid . ' ' . $url . ' C:' . $client->client_id . ' CS:' . $client->client_secret . ' T:' . $client->access_token . ' TS:' . $client->access_token_secret);
+	DI::logger()->notice('pumpio: fetching for user ' . $uid . ' ' . $url . ' C:' . $client->client_id . ' CS:' . $client->client_secret . ' T:' . $client->access_token . ' TS:' . $client->access_token_secret);
 
 	$useraddr = $username.'@'.$hostname;
 
@@ -741,7 +740,7 @@ function pumpio_fetchtimeline(int $uid)
 	}
 
 	if (!$success) {
-		Logger::notice('pumpio: error fetching posts for user ' . $uid . ' ' . $useraddr . ' ', $user);
+		DI::logger()->notice('pumpio: error fetching posts for user ' . $uid . ' ' . $useraddr . ' ', $user);
 		return;
 	}
 
@@ -801,11 +800,11 @@ function pumpio_fetchtimeline(int $uid)
 					}
 				}
 
-				Logger::notice('pumpio: posting for user ' . $uid);
+				DI::logger()->notice('pumpio: posting for user ' . $uid);
 
 				Item::insert($postarray, true);
 
-				Logger::notice('pumpio: posting done - user ' . $uid);
+				DI::logger()->notice('pumpio: posting done - user ' . $uid);
 			}
 		}
 	}
@@ -846,16 +845,16 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
 
 	if (DBA::isResult($contact)) {
-		Logger::notice('pumpio_dounlike: unliked existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dounlike: unliked existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 	} else {
-		Logger::notice('pumpio_dounlike: not found. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' Url ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dounlike: not found. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' Url ' . $orig_post['uri']);
 	}
 }
 
 function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcompletion = true)
 {
 	if (empty($post->object->id)) {
-		Logger::info('Got empty like: '.print_r($post, true));
+		DI::logger()->info('Got empty like: '.print_r($post, true));
 		return;
 	}
 
@@ -900,7 +899,7 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 	];
 
 	if (Post::exists($condition)) {
-		Logger::notice('pumpio_dolike: found existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dolike: found existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 		return;
 	}
 
@@ -934,7 +933,7 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 
 	$ret = Item::insert($likedata);
 
-	Logger::notice('pumpio_dolike: ' . $ret . ' User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+	DI::logger()->notice('pumpio_dolike: ' . $ret . ' User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 }
 
 function pumpio_get_contact($uid, $contact, $no_insert = false)
@@ -1405,7 +1404,7 @@ function pumpio_fetchallcomments($uid, $id)
 	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
 	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
 
-	Logger::notice('pumpio_fetchallcomments: completing comment for user ' . $uid . ' post id ' . $id);
+	DI::logger()->notice('pumpio_fetchallcomments: completing comment for user ' . $uid . ' post id ' . $id);
 
 	$own_id = 'https://' . $hostname . '/' . $username;
 
@@ -1430,7 +1429,7 @@ function pumpio_fetchallcomments($uid, $id)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
+	DI::logger()->notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
 	$item = new \stdClass();
 
@@ -1495,7 +1494,7 @@ function pumpio_fetchallcomments($uid, $id)
 
 		$post->object = $item;
 
-		Logger::notice('pumpio_fetchallcomments: posting comment ' . $post->object->id . ' ', json_decode(json_encode($post), true));
+		DI::logger()->notice('pumpio_fetchallcomments: posting comment ' . $post->object->id . ' ', json_decode(json_encode($post), true));
 		pumpio_dopost($client, $uid, $self, $post, $own_id, false);
 	}
 }

From 32a3160445d6a148b81daadd169705ddfe5558af Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:09 +0000
Subject: [PATCH 118/161] Replace call for Logger with DI::logger() in
 randplace addon

---
 randplace/randplace.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/randplace/randplace.php b/randplace/randplace.php
index 5cb07597..89a75f98 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -40,7 +39,7 @@ function randplace_install()
 	Hook::register('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
 	Hook::register('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
-	Logger::notice("installed randplace");
+	DI::logger()->notice("installed randplace");
 }
 
 function randplace_uninstall()
@@ -50,7 +49,7 @@ function randplace_uninstall()
 	 *
 	 * Except hooks, they are all unregistered automatically and don't need to be unregistered manually.
 	 */
-	Logger::notice("removed randplace");
+	DI::logger()->notice("removed randplace");
 }
 
 function randplace_post_hook(&$item)
@@ -61,7 +60,7 @@ function randplace_post_hook(&$item)
 	 *      - A status post by a profile owner
 	 *      - The profile owner must have allowed our addon
 	 */
-	Logger::notice('randplace invoked');
+	DI::logger()->notice('randplace invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {
 		/* non-zero if this is a logged in user of this system */

From ac6c1d7a49a386555c054faa6d13bb108856ebd0 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:29 +0000
Subject: [PATCH 119/161] Replace call for Logger with DI::logger() in saml
 addon

---
 saml/saml.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index 81a6bfcc..c8824b46 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -63,7 +62,7 @@ function saml_metadata()
 			);
 		}
 	} catch (Exception $e) {
-		Logger::error($e->getMessage());
+		DI::logger()->error($e->getMessage());
 	}
 }
 
@@ -125,7 +124,7 @@ function saml_is_configured()
 function saml_sso_initiate(string &$body)
 {
 	if (!saml_is_configured()) {
-		Logger::warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
+		DI::logger()->warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
 		return;
 	}
 
@@ -154,7 +153,7 @@ function saml_sso_reply()
 
 	if (!empty($errors)) {
 		echo 'Errors encountered.';
-		Logger::error(implode(', ', $errors));
+		DI::logger()->error(implode(', ', $errors));
 		exit();
 	}
 
@@ -190,7 +189,7 @@ function saml_sso_reply()
 function saml_slo_initiate()
 {
 	if (!saml_is_configured()) {
-		Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
+		DI::logger()->warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
 		return;
 	}
 
@@ -221,7 +220,7 @@ function saml_slo_reply()
 	if (empty($errors)) {
 		$auth->redirectTo(DI::baseUrl());
 	} else {
-		Logger::error(implode(', ', $errors));
+		DI::logger()->error(implode(', ', $errors));
 	}
 }
 
@@ -314,7 +313,7 @@ function saml_addon_admin_post()
 function saml_create_user($username, $email, $name)
 {
 	if (!strlen($email) || !strlen($name)) {
-		Logger::error('Could not create user: no email or username given.');
+		DI::logger()->error('Could not create user: no email or username given.');
 		return false;
 	}
 
@@ -336,7 +335,7 @@ function saml_create_user($username, $email, $name)
 
 		return $user;
 	} catch (Exception $e) {
-		Logger::error(
+		DI::logger()->error(
 			'Exception while creating user',
 			[
 				'username'  => $username,

From bfdccb451ce391361de025d01565b4a52af99d6c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:45 +0000
Subject: [PATCH 120/161] Replace call for Logger with DI::logger() in
 statusnet addon

---
 statusnet/statusnet.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index bd115115..8663aaea 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -40,7 +40,6 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 use CodebirdSN\CodebirdSN;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -58,7 +57,7 @@ function statusnet_install()
 	Hook::register('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
 	Hook::register('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	Hook::register('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
-	Logger::notice('installed GNU Social');
+	DI::logger()->notice('installed GNU Social');
 }
 
 function statusnet_jot_nets(array &$jotnets_fields)
@@ -355,7 +354,7 @@ function statusnet_post_hook(array &$b)
 		return;
 	}
 
-	Logger::notice('GNU Socialpost invoked');
+	DI::logger()->notice('GNU Socialpost invoked');
 
 	DI::pConfig()->load($b['uid'], 'statusnet');
 
@@ -407,7 +406,7 @@ function statusnet_post_hook(array &$b)
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			Logger::info('statusnet_post send, result: ' . print_r($result, true) .
+			DI::logger()->info('statusnet_post send, result: ' . print_r($result, true) .
 				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
 
 			if (!empty($result->source)) {
@@ -415,9 +414,9 @@ function statusnet_post_hook(array &$b)
 			}
 
 			if (!empty($result->error)) {
-				Logger::notice('Send to GNU Social failed: "' . $result->error . '"');
+				DI::logger()->notice('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				Logger::notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']);
+				DI::logger()->notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']);
 				Item::update(['extid' => $hostname . '::' . $result->id, 'body' => $result->text], ['id' => $b['id']]);
 			}
 		}

From 763c5026f237a569f9f6cc9b4b65311556ca0087 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:57:12 +0000
Subject: [PATCH 121/161] Replace call for Logger with DI::logger() in tumblr
 addon

---
 tumblr/tumblr.php | 99 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 12f13aa8..819c0ca5 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -14,7 +14,6 @@ use Friendica\Content\Text\NPF;
 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\System;
@@ -60,7 +59,7 @@ function tumblr_install()
 	Hook::register('check_item_notification', __FILE__, 'tumblr_check_item_notification');
 	Hook::register('probe_detect',            __FILE__, 'tumblr_probe_detect');
 	Hook::register('item_by_link',            __FILE__, 'tumblr_item_by_link');
-	Logger::info('installed tumblr');
+	DI::logger()->info('installed tumblr');
 }
 
 function tumblr_load_config(ConfigFileManager $loader)
@@ -121,16 +120,16 @@ function tumblr_item_by_link(array &$hookData)
 		return;
 	}
 
-	Logger::debug('Found tumblr post', ['url' => $hookData['uri'], 'blog' => $matches[1], 'id' => $matches[2]]);
+	DI::logger()->debug('Found tumblr post', ['url' => $hookData['uri'], 'blog' => $matches[1], 'id' => $matches[2]]);
 
 	$parameters = ['id' => $matches[2], 'reblog_info' => false, 'notes_info' => false, 'npf' => false];
 	$result = tumblr_get($hookData['uid'], 'blog/' . $matches[1] . '/posts', $parameters);
 	if ($result->meta->status > 399) {
-		Logger::notice('Error fetching status', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'blog' => $matches[1], 'id' => $matches[2]]);
+		DI::logger()->notice('Error fetching status', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'blog' => $matches[1], 'id' => $matches[2]]);
 		return [];
 	}
 
-	Logger::debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
+	DI::logger()->debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
 	if (!empty($result->response->posts)) {
 		$hookData['item_id'] = tumblr_process_post($result->response->posts[0], $hookData['uid'], Item::PR_FETCHED);
 		Item::incrementInbound(Protocol::TUMBLR);
@@ -159,20 +158,20 @@ function tumblr_follow(array &$hook_data)
 		return;
 	}
 
-	Logger::debug('Check if contact is Tumblr', ['url' => $hook_data['url']]);
+	DI::logger()->debug('Check if contact is Tumblr', ['url' => $hook_data['url']]);
 
 	$fields = tumblr_get_contact_by_url($hook_data['url'], $uid);
 	if (empty($fields)) {
-		Logger::debug('Contact is not a Tumblr contact', ['url' => $hook_data['url']]);
+		DI::logger()->debug('Contact is not a Tumblr contact', ['url' => $hook_data['url']]);
 		return;
 	}
 
 	$result = tumblr_post($uid, 'user/follow', ['url' => $fields['url']]);
 	if ($result->meta->status <= 399) {
 		$hook_data['contact'] = $fields;
-		Logger::debug('Successfully start following', ['url' => $fields['url']]);
+		DI::logger()->debug('Successfully start following', ['url' => $fields['url']]);
 	} else {
-		Logger::notice('Following failed', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'url' => $fields['url']]);
+		DI::logger()->notice('Following failed', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'url' => $fields['url']]);
 	}
 }
 
@@ -415,11 +414,11 @@ function tumblr_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('poll interval not reached');
+			DI::logger()->notice('poll interval not reached');
 			return;
 		}
 	}
-	Logger::notice('cron_start');
+	DI::logger()->notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -432,30 +431,30 @@ function tumblr_cron()
 	foreach ($pconfigs as $pconfig) {
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
-		Logger::notice('importing timeline - start', ['user' => $pconfig['uid']]);
+		DI::logger()->notice('importing timeline - start', ['user' => $pconfig['uid']]);
 		tumblr_fetch_dashboard($pconfig['uid'], $last);
 		tumblr_fetch_tags($pconfig['uid'], $last);
-		Logger::notice('importing timeline - done', ['user' => $pconfig['uid']]);
+		DI::logger()->notice('importing timeline - done', ['user' => $pconfig['uid']]);
 	}
 
 	$last_clean = DI::keyValue()->get('tumblr_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
+		DI::logger()->notice('Start contact cleanup');
 		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::TUMBLR, 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('tumblr_last_clean', time());
-		Logger::notice('Contact cleanup done');
+		DI::logger()->notice('Contact cleanup done');
 	}
 
-	Logger::notice('cron_end');
+	DI::logger()->notice('cron_end');
 
 	DI::keyValue()->set('tumblr_last_poll', time());
 }
@@ -478,7 +477,7 @@ function tumblr_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
 		// Don't post if it isn't a reply to a tumblr post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
-			Logger::notice('No tumblr parent found', ['item' => $post['id']]);
+			DI::logger()->notice('No tumblr parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -525,20 +524,20 @@ function tumblr_send(array &$b)
 	}
 
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+		DI::logger()->debug('Got comment', ['item' => $b]);
 
 		$parent = tumblr_get_post_from_uri($b['thr-parent']);
 		if (empty($parent)) {
-			Logger::notice('No tumblr post', ['thr-parent' => $b['thr-parent']]);
+			DI::logger()->notice('No tumblr post', ['thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
-		Logger::debug('Parent found', ['parent' => $parent]);
+		DI::logger()->debug('Parent found', ['parent' => $parent]);
 
 		$page = tumblr_get_page($b['uid']);
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::notice('Commenting is not supported (yet)');
+			DI::logger()->notice('Commenting is not supported (yet)');
 		} else {
 			if (($b['verb'] == Activity::LIKE) && !$b['deleted']) {
 				$params = ['id' => $parent['id'], 'reblog_key' => $parent['reblog_key']];
@@ -562,12 +561,12 @@ function tumblr_send(array &$b)
 			}
 
 			if ($result->meta->status < 400) {
-				Logger::info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
+				DI::logger()->info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
 				if (!$b['deleted'] && !empty($result->response->id_string)) {
 					Item::update(['extid' => 'tumblr::' . $result->response->id_string], ['guid' => $b['guid']]);
 				}
 			} else {
-				Logger::notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+				DI::logger()->notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 			}
 		}
 		return;
@@ -665,9 +664,9 @@ function tumblr_send_legacy(array $b)
 	$result = tumblr_post($b['uid'], 'blog/' . $page . '/post', $params);
 
 	if ($result->meta->status < 400) {
-		Logger::info('Success (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
+		DI::logger()->info('Success (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
 	} else {
-		Logger::notice('Error posting blog (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+		DI::logger()->notice('Error posting blog (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 	}
 }
 
@@ -676,7 +675,7 @@ function tumblr_send_npf(array $post): bool
 	$page = tumblr_get_page($post['uid']);
 
 	if (empty($page)) {
-		Logger::notice('Missing page, post will not be send to Tumblr.', ['uid' => $post['uid'], 'page' => $page, 'id' => $post['id']]);
+		DI::logger()->notice('Missing page, post will not be send to Tumblr.', ['uid' => $post['uid'], 'page' => $page, 'id' => $post['id']]);
 		// "true" is returned, since the legacy function will fail as well.
 		return true;
 	}
@@ -707,10 +706,10 @@ function tumblr_send_npf(array $post): bool
 	$result = tumblr_post($post['uid'], 'blog/' . $page . '/posts', $params);
 
 	if ($result->meta->status < 400) {
-		Logger::info('Success (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
+		DI::logger()->info('Success (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
 		return true;
 	} else {
-		Logger::notice('Error posting blog (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+		DI::logger()->notice('Error posting blog (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 		return false;
 	}
 }
@@ -747,10 +746,10 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 		foreach (array_reverse($data->response) as $post) {
 			$id = tumblr_process_post($post, $uid, Item::PR_TAG, $last_poll);
 			if (!empty($id)) {
-				Logger::debug('Tag post imported', ['tag' => $tag, 'id' => $id]);
+				DI::logger()->debug('Tag post imported', ['tag' => $tag, 'id' => $id]);
 				$post = Post::selectFirst(['uri-id'], ['id' => $id]);
 				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $tag);
-				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
+				DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
 				Item::incrementInbound(Protocol::TUMBLR);
 			}
 		}
@@ -775,7 +774,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 
 	$dashboard = tumblr_get($uid, 'user/dashboard', $parameters);
 	if ($dashboard->meta->status > 399) {
-		Logger::notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
+		DI::logger()->notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
 		return [];
 	}
 
@@ -788,7 +787,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 			$last = $post->id;
 		}
 
-		Logger::debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
+		DI::logger()->debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
 
 		tumblr_process_post($post, $uid, Item::PR_NONE, $last_poll);
 		Item::incrementInbound(Protocol::TUMBLR);
@@ -1063,7 +1062,7 @@ function tumblr_get_type_replacement(array $data, string $plink): string
 			}
 
 		default:
-			Logger::notice('Unknown type', ['type' => $data['type'], 'data' => $data, 'plink' => $plink]);
+			DI::logger()->notice('Unknown type', ['type' => $data['type'], 'data' => $data, 'plink' => $plink]);
 			$body = '';
 	}
 
@@ -1118,9 +1117,9 @@ function tumblr_get_contact(stdClass $blog, int $uid): array
 			$cid = $contact['id'];
 			Contact::update($fields, ['id' => $cid], true);
 		}
-		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
+		DI::logger()->debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
 	} else {
-		Logger::debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
+		DI::logger()->debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
 	}
 
 	if (!empty($avatar)) {
@@ -1156,13 +1155,13 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 	];
 
 	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
+		DI::logger()->debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 		return $fields;
 	}
 
 	$info = tumblr_get($uid, 'blog/' . $blog->uuid . '/info');
 	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
+		DI::logger()->notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
 		return $fields;
 	}
 	Item::incrementInbound(Protocol::TUMBLR);
@@ -1184,7 +1183,7 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 
 	$fields['header'] = $info->response->blog->theme->header_image_focused;
 
-	Logger::debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
+	DI::logger()->debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 	return $fields;
 }
 
@@ -1226,7 +1225,7 @@ function tumblr_get_blogs(int $uid): array
 {
 	$userinfo = tumblr_get($uid, 'user/info');
 	if ($userinfo->meta->status > 399) {
-		Logger::notice('Error fetching blogs', ['meta' => $userinfo->meta, 'response' => $userinfo->response, 'errors' => $userinfo->errors]);
+		DI::logger()->notice('Error fetching blogs', ['meta' => $userinfo->meta, 'response' => $userinfo->response, 'errors' => $userinfo->errors]);
 		return [];
 	}
 
@@ -1282,15 +1281,15 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
 		return null;
 	}
 
-	Logger::debug('Update Tumblr blog data', ['url' => $url, 'blog' => $blog, 'uid' => $uid]);
+	DI::logger()->debug('Update Tumblr blog data', ['url' => $url, 'blog' => $blog, 'uid' => $uid]);
 
 	$info = tumblr_get($uid, 'blog/' . $blog . '/info');
 	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
+		DI::logger()->notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
 		return null;
 	}
 
-	Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
+	DI::logger()->debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
 	Item::incrementInbound(Protocol::TUMBLR);
 
 	$baseurl = 'https://tumblr.com';
@@ -1419,7 +1418,7 @@ function tumblr_get_token(int $uid, string $code = ''): string
 	$refresh_token = DI::pConfig()->get($uid, 'tumblr', 'refresh_token');
 
 	if (empty($code) && !empty($access_token) && ($expires_at > (time()))) {
-		Logger::debug('Got token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Got token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 		return $access_token;
 	}
 
@@ -1431,11 +1430,11 @@ function tumblr_get_token(int $uid, string $code = ''): string
 	if (empty($refresh_token) && empty($code)) {
 		$result = tumblr_exchange_token($uid);
 		if (empty($result->refresh_token)) {
-			Logger::info('Invalid result while exchanging token', ['uid' => $uid]);
+			DI::logger()->info('Invalid result while exchanging token', ['uid' => $uid]);
 			return '';
 		}
 		$expires_at = time() + $result->expires_in;
-		Logger::debug('Updated token from OAuth1 to OAuth2', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Updated token from OAuth1 to OAuth2', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 	} else {
 		if (!empty($code)) {
 			$parameters['code']       = $code;
@@ -1447,18 +1446,18 @@ function tumblr_get_token(int $uid, string $code = ''): string
 
 		$curlResult = DI::httpClient()->post('https://api.tumblr.com/v2/oauth2/token', $parameters);
 		if (!$curlResult->isSuccess()) {
-			Logger::info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
+			DI::logger()->info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
 			return '';
 		}
 
 		$result = json_decode($curlResult->getBodyString());
 		if (empty($result)) {
-			Logger::info('Invalid result when updating token', ['uid' => $uid]);
+			DI::logger()->info('Invalid result when updating token', ['uid' => $uid]);
 			return '';
 		}
 
 		$expires_at = time() + $result->expires_in;
-		Logger::debug('Renewed token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Renewed token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 	}
 
 	DI::pConfig()->set($uid, 'tumblr', 'access_token', $result->access_token);
@@ -1502,7 +1501,7 @@ function tumblr_exchange_token(int $uid): stdClass
 		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
 		return json_decode($response->getBody()->getContents());
 	} catch (RequestException $exception) {
-		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+		DI::logger()->notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 		return new stdClass;
 	}
 }

From a7b26f64538159e72799fae87679d1d10e0b1bb3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:57:34 +0000
Subject: [PATCH 122/161] Replace call for Logger with DI::logger() in
 tesseract addon

---
 tesseract/tesseract.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index 4c630dbb..ea048032 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\System;
 use thiagoalessio\TesseractOCR\TesseractOCR;
 
@@ -17,7 +16,7 @@ function tesseract_install()
 {
 	Hook::register('ocr-detection', __FILE__, 'tesseract_ocr_detection');
 
-	Logger::notice('installed tesseract');
+	DI::logger()->notice('installed tesseract');
 }
 
 function tesseract_ocr_detection(&$media)
@@ -33,6 +32,6 @@ function tesseract_ocr_detection(&$media)
 		$ocr->imageData($media['img_str'], strlen($media['img_str']));
 		$media['description'] = $ocr->run();
 	} catch (\Throwable $th) {
-		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
+		DI::logger()->info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
 	}
 }

From e4d14cab62755aa91d986584b4898d75054b3471 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:58:10 +0000
Subject: [PATCH 123/161] Replace call for Logger with DI::logger() in twitter
 addon

---
 tesseract/tesseract.php |  1 +
 twitter/twitter.php     | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index ea048032..a07c690c 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -8,6 +8,7 @@
 
 use Friendica\Core\Hook;
 use Friendica\Core\System;
+use Friendica\DI;
 use thiagoalessio\TesseractOCR\TesseractOCR;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
diff --git a/twitter/twitter.php b/twitter/twitter.php
index ea4ae356..a9654405 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -38,7 +38,6 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\DI;
@@ -217,7 +216,7 @@ function twitter_post_hook(array &$b)
 
 	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
-	Logger::notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
+	DI::logger()->notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
 
 	DI::pConfig()->load($b['uid'], 'twitter');
 
@@ -227,17 +226,17 @@ function twitter_post_hook(array &$b)
 	$access_secret = DI::pConfig()->get($b['uid'], 'twitter', 'access_secret');
 
 	if (empty($api_key) || empty($api_secret) || empty($access_token) || empty($access_secret)) {
-		Logger::info('Missing keys, secrets or tokens.');
+		DI::logger()->info('Missing keys, secrets or tokens.');
 		return;
 	}
 
 	$msgarr = Plaintext::getPost($b, 280, true, BBCode::TWITTER);
-	Logger::debug('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
+	DI::logger()->debug('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
 
 	$media_ids = [];
 
 	if (!empty($msgarr['images']) || !empty($msgarr['remote_images'])) {
-		Logger::info('Got images', ['id' => $b['id'], 'images' => $msgarr['images'] ?? []]);
+		DI::logger()->info('Got images', ['id' => $b['id'], 'images' => $msgarr['images'] ?? []]);
 
 		$retrial = Worker::getRetrial();
 		if ($retrial > 4) {
@@ -250,7 +249,7 @@ function twitter_post_hook(array &$b)
 			try {
 				$media_ids[] = twitter_upload_image($b['uid'], $image, $retrial);
 			} catch (RequestException $exception) {
-				Logger::warning('Error while uploading image', ['image' => $image, 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+				DI::logger()->warning('Error while uploading image', ['image' => $image, 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 				Worker::defer();
 				return;
 			}
@@ -259,13 +258,13 @@ function twitter_post_hook(array &$b)
 
 	$in_reply_to_tweet_id = 0;
 
-	Logger::debug('Post message', ['id' => $b['id'], 'parts' => count($msgarr['parts'])]);
+	DI::logger()->debug('Post message', ['id' => $b['id'], 'parts' => count($msgarr['parts'])]);
 	foreach ($msgarr['parts'] as $key => $part) {
 		try {
 			$id = twitter_post_status($b['uid'], $part, $media_ids, $in_reply_to_tweet_id);
-			Logger::info('twitter_post send', ['part' => $key, 'id' => $b['id'], 'result' => $id]);
+			DI::logger()->info('twitter_post send', ['part' => $key, 'id' => $b['id'], 'result' => $id]);
 		} catch (RequestException $exception) {
-			Logger::warning('Error while posting message', ['part' => $key, 'id' => $b['id'], 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+			DI::logger()->warning('Error while posting message', ['part' => $key, 'id' => $b['id'], 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 			$status = [
 				'code'    => $exception->getCode(),
 				'reason'  => $exception->getResponse()->getReasonPhrase(),
@@ -319,9 +318,9 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 	$picturedata = $picture->asString();
 	$new_size    = strlen($picturedata);
 
-	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, 'image' => $image]);
+	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, 'image' => $image]);
 	$media = twitter_post($uid, 'https://upload.twitter.com/1.1/media/upload.json', 'form_params', ['media' => base64_encode($picturedata)]);
-	Logger::info('Uploading done', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
+	DI::logger()->info('Uploading done', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
 
 	if (isset($media->media_id_string)) {
 		$media_id = $media->media_id_string;
@@ -334,10 +333,10 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 				]
 			];
 			$ret = twitter_post($uid, 'https://upload.twitter.com/1.1/media/metadata/create.json', 'json', $data);
-			Logger::info('Metadata create', ['uid' => $uid, 'data' => $data, 'return' => $ret]);
+			DI::logger()->info('Metadata create', ['uid' => $uid, 'data' => $data, 'return' => $ret]);
 		}
 	} else {
-		Logger::error('Failed upload', ['uid' => $uid, 'size' => strlen($picturedata), 'image' => $image['url'], 'return' => $media]);
+		DI::logger()->error('Failed upload', ['uid' => $uid, 'size' => strlen($picturedata), 'image' => $image['url'], 'return' => $media]);
 		throw new Exception('Failed upload of ' . $image['url']);
 	}
 
@@ -373,7 +372,7 @@ function twitter_post(int $uid, string $url, string $type, array $data): stdClas
 	DI::pConfig()->set($uid, 'twitter', 'last_status', $status);
 
 	$content = json_decode($body) ?? new stdClass;
-	Logger::debug('Success', ['content' => $content]);
+	DI::logger()->debug('Success', ['content' => $content]);
 	return $content;
 }
 
@@ -402,7 +401,7 @@ function twitter_test_connection(int $uid)
 			'content' => $response->getBody()->getContents()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test successful', ['uid' => $uid]);
+		DI::logger()->info('Test successful', ['uid' => $uid]);
 	} catch (RequestException $exception) {
 		$status = [
 			'code'    => $exception->getCode(),
@@ -410,6 +409,6 @@ function twitter_test_connection(int $uid)
 			'content' => $exception->getMessage()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test failed', ['uid' => $uid]);
+		DI::logger()->info('Test failed', ['uid' => $uid]);
 	}
 }

From dd775645d48b0309e08f604500e2baf85171800f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:58:32 +0000
Subject: [PATCH 124/161] Replace call for Logger with DI::logger() in wppost
 addon

---
 wppost/wppost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index f2ee5d21..de216806 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -9,7 +9,6 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -257,13 +256,13 @@ function wppost_send(array &$b)
 
 EOT;
 
-		Logger::debug('wppost: data: ' . $xml);
+		DI::logger()->debug('wppost: data: ' . $xml);
 
 		$x = '';
 
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . $x);
+		DI::logger()->info('posted to wordpress: ' . $x);
 	}
 }

From 4c8c262b07f61d08a6f9a67c325a54dcb95b4c75 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 12:10:58 +0000
Subject: [PATCH 125/161] fix in googlemaps addon

---
 googlemaps/googlemaps.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index a0bba8ad..94a3a96b 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function googlemaps_install()
 {

From cbfcfb33494d1662de1a5f5689caa23d723d6bca Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 25 Jan 2025 02:44:54 +0000
Subject: [PATCH 126/161] Issue 14692: Avoid loop situation

---
 blockbot/blockbot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 163d0cbc..71e35c93 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -208,7 +208,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 		blockbot_save('activitypub-inbox-agents', $agent);
 	}
 
-	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER, false))) {
 		blockbot_save('activitypub-signature-agents', $agent);
 	}
 }

From 8384b74696b54c126a2b2c835a010403b6413b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Thu, 23 Jan 2025 16:32:22 +0100
Subject: [PATCH 127/161] add condition for selected theme

---
 saml/saml.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index c8824b46..83e4d3fd 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -82,11 +82,13 @@ function saml_footer(string &$body)
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
-document.getElementById('id_email').setAttribute('readonly', 'readonly');
 var saml_hint = document.createElement("span");
 var saml_hint_text = document.createTextNode('$samlhint');
 saml_hint.appendChild(saml_hint_text);
-document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+if ( document.getElementById('id_email') != null ) {
+	document.getElementById('id_email').setAttribute('readonly', 'readonly');
+	document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+}
 // Frio theme
 if ( document.getElementById('password-settings-collapse') != null ) {
 	document.getElementById('password-settings-collapse').replaceChildren(saml_hint.cloneNode(true));

From 16127854dd7f9018162c333bdcc6556a2c1ee3d4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 28 Jan 2025 20:27:52 +0000
Subject: [PATCH 128/161] Accessibility: Use different id values for options

---
 invidious/invidious.php | 8 ++++----
 markdown/markdown.php   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index 033ecce5..5fa2eca9 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -54,8 +54,8 @@ function invidious_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/invidious/');
 	$html = Renderer::replaceMacros($t, [
-		'$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>')],
+		'$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>')],
 	]);
 
 	$data = [
@@ -71,9 +71,9 @@ function invidious_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['enabled']);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['invidious-enabled']);
 
-	$server = trim($_POST['server'], " \n\r\t\v\x00/");
+	$server = trim($_POST['invidious-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 {
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 0822ac83..1ef6cd9a 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -26,7 +26,7 @@ function markdown_addon_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
 	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
+		'$enabled' => ['markdown-enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
 	]);
 
 	$data = [
@@ -42,7 +42,7 @@ function markdown_addon_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['enabled']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['markdown-enabled']));
 }
 
 function markdown_post_local_start(&$request) {

From e6d92cc94a56660207e08095865195da97d403a5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:11:14 +0000
Subject: [PATCH 129/161] Rewrite Monolog factory to implement LoggerFactory

---
 .../{Monolog.php => MonologFactory.php}       | 41 ++++++++++++++-----
 monolog/static/dependencies.config.php        |  7 +---
 monolog/static/strategies.config.php          | 26 ------------
 3 files changed, 33 insertions(+), 41 deletions(-)
 rename monolog/src/Factory/{Monolog.php => MonologFactory.php} (51%)
 delete mode 100644 monolog/static/strategies.config.php

diff --git a/monolog/src/Factory/Monolog.php b/monolog/src/Factory/MonologFactory.php
similarity index 51%
rename from monolog/src/Factory/Monolog.php
rename to monolog/src/Factory/MonologFactory.php
index c5c69824..ede4d5b2 100644
--- a/monolog/src/Factory/Monolog.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -4,7 +4,8 @@ namespace Friendica\Addon\monolog\src\Factory;
 
 use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Factory\AbstractLoggerTypeFactory;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
+use Friendica\Core\Logger\Factory\LoggerFactory;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
@@ -16,32 +17,52 @@ use Psr\Log\LogLevel;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-class Monolog extends AbstractLoggerTypeFactory
+final class MonologFactory implements LoggerFactory
 {
-	public function create(IManageConfigValues $config, string $loglevel = null): LoggerInterface
+	private IHaveCallIntrospections $introspection;
+
+	private IManageConfigValues $config;
+
+	/**
+	 * @param string $channel The channel for the logger
+	 */
+	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
 	{
 		$loggerTimeZone = new \DateTimeZone('UTC');
 
-		$logger = new Logger($this->channel);
+		$logger = new Logger($logChannel);
 		$logger->setTimezone($loggerTimeZone);
 		$logger->pushProcessor(new PsrLogMessageProcessor());
 		$logger->pushProcessor(new ProcessIdProcessor());
 		$logger->pushProcessor(new UidProcessor());
 		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
 
-		$logfile = $config->get('system', 'logfile');
+		$logfile = $this->config->get('system', 'logfile');
 
 		// just add a stream in case it's either writable or not file
 		if (is_writable($logfile)) {
-			$loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel'));
-			$loglevel = Logger::toMonologLevel($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);
diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
index e3066594..75ea8df7 100644
--- a/monolog/static/dependencies.config.php
+++ b/monolog/static/dependencies.config.php
@@ -20,10 +20,7 @@
  */
 
 return [
-	\Monolog\Logger::class => [
-		'instanceOf' => \Friendica\Addon\monolog\src\Factory\Monolog::class,
-		'call' => [
-			['create', [], \Dice\Dice::CHAIN_CALL],
-		],
+	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
+		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
 	],
 ];
diff --git a/monolog/static/strategies.config.php b/monolog/static/strategies.config.php
deleted file mode 100644
index 87153839..00000000
--- a/monolog/static/strategies.config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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'],
-	],
-];

From 0bafcc78f827b4bc1f064a0cc73a3c87700ced63 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:06 +0000
Subject: [PATCH 130/161] Add READMD.md for monolog addon

---
 monolog/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 monolog/README.md

diff --git a/monolog/README.md b/monolog/README.md
new file mode 100644
index 00000000..e5a139e9
--- /dev/null
+++ b/monolog/README.md
@@ -0,0 +1,14 @@
+# 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.
+
+Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+
+```
+// in config/local.config.php
+// ...
+    'system' => [
+        'logger_config' => 'monolog',
+    ]
+// ...
+```

From f7ec934893bda2ac130dd5e6867ed564a074a943 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:22 +0000
Subject: [PATCH 131/161] bump version to 1.1

---
 monolog/monolog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monolog/monolog.php b/monolog/monolog.php
index b13efff9..f194aac4 100644
--- a/monolog/monolog.php
+++ b/monolog/monolog.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Name: Monolog
- * 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
+ * Description: A Logging framework with lots of additions, customized for Friendica.
+ * Version: 1.1
  * Author: Philipp Holzer
  */

From c4f8c65817c478e0e682a8a74573deb634642c8b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:32:24 +0000
Subject: [PATCH 132/161] Remove wrong phpdoc

---
 monolog/src/Factory/MonologFactory.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/monolog/src/Factory/MonologFactory.php b/monolog/src/Factory/MonologFactory.php
index ede4d5b2..e0c11e13 100644
--- a/monolog/src/Factory/MonologFactory.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -23,9 +23,6 @@ final class MonologFactory implements LoggerFactory
 
 	private IManageConfigValues $config;
 
-	/**
-	 * @param string $channel The channel for the logger
-	 */
 	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
 	{
 		$this->introspection = $introspection;

From ed75360eb4f573c961dc1e1eca58bed7b2ba37e1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 09:27:22 +0000
Subject: [PATCH 133/161] Setting the logger_config config is no longer needed

---
 monolog/README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index e5a139e9..74ade29d 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -3,12 +3,3 @@
 A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
 
 Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
-
-```
-// in config/local.config.php
-// ...
-    'system' => [
-        'logger_config' => 'monolog',
-    ]
-// ...
-```

From 5701853d295f08c93cdc5f2b0e807bab85d4cddd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 11:35:10 +0000
Subject: [PATCH 134/161] Remove config docs, format syntax

---
 monolog/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index 74ade29d..efb7959a 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -1,5 +1,4 @@
 # 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.
-
-Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)).
+There are just Friendica additions inside the src directory.

From 373c30b5d0fc84dd1cb238bcf9dc2cd381d2c5d6 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 6 Feb 2025 20:50:40 -0500
Subject: [PATCH 135/161] [tumblr] Ward against unexpected response format in
 tumblr_fetch_tags()

- Adress https://github.com/friendica/friendica/issues/14646#issuecomment-2628090487
---
 tumblr/tumblr.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 819c0ca5..f2e2d78d 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -743,6 +743,12 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 
 	foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
 		$data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
+
+		if (!is_array($data->response)) {
+			DI::logger()->warning('Unexpected Tumblr response format', ['uid' => $uid, 'url' => 'tagged', 'parameters' => ['tag' => $tag], 'data' => $data]);
+			continue;
+		}
+
 		foreach (array_reverse($data->response) as $post) {
 			$id = tumblr_process_post($post, $uid, Item::PR_TAG, $last_poll);
 			if (!empty($id)) {

From 07008af9c15bbe2ed431f97e9429b03642ec8820 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Feb 2025 06:12:49 +0000
Subject: [PATCH 136/161] Bluesky: Avoid duplicated reshares

---
 bluesky/bluesky.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 7f6bb9e7..ba80660c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1005,6 +1005,10 @@ 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'];

From 859d92ab02ce74718b10853f84522d84f85b35b6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Feb 2025 05:48:09 +0000
Subject: [PATCH 137/161] Improve accessibility with showmore and rendertime

---
 rendertime/rendertime.php    | 2 +-
 showmore_dyn/showmore_dyn.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 1cce5b1b..4523d911 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -59,7 +59,7 @@ function rendertime_page_end(string &$o)
 
 	if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
-		$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+		$o = $o . '<div class="renderinfo" aria-hidden="true">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
 				round($profiler->get('database') - $profiler->get('database_write'), 3),
 				round($profiler->get('database_write'), 3),
 				round($profiler->get('network'), 2),
diff --git a/showmore_dyn/showmore_dyn.js b/showmore_dyn/showmore_dyn.js
index 74803d2d..fd07a82f 100644
--- a/showmore_dyn/showmore_dyn.js
+++ b/showmore_dyn/showmore_dyn.js
@@ -59,7 +59,7 @@ function addHeightToggleHandler($item) {
 	$item.data("item-id", itemId);
 	var toggleId = "wall-item-body-toggle-" + itemId;
 
-	$item.append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><button type="button" class="wall-item-body-toggle-text">' + showmore_dyn_showmore_linktext + '</button></div>');
+	$item.append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><button type="button" class="wall-item-body-toggle-text" aria-hidden="true">' + showmore_dyn_showmore_linktext + '</button></div>');
 	$item.addClass("limitable limit-height");
 
 	var $toggle = $("#" + toggleId);

From ec718ea29412b3482ec4543152b021b75e0f36f4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 20 Feb 2025 23:03:27 -0500
Subject: [PATCH 138/161] [tumblr] Skip empty tags when saving user-defined
 tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Skip empty tags when fetching them
↪ Empty tags were triggering a Tumblr API error
- Address https://github.com/friendica/friendica/issues/14646#issuecomment-2628090487
- Using log output from https://github.com/friendica/friendica/issues/14646#issuecomment-2665000962
---
 tumblr/tumblr.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index f2e2d78d..4415e2de 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -391,12 +391,17 @@ function tumblr_settings_post(array &$b)
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'import',          intval($_POST['tumblr_import']));
 
 		$max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS;
-		$tags     = [];
-		foreach (explode(',', $_POST['tags']) as $tag) {
-			if (count($tags) < $max_tags) {
-				$tags[] = trim($tag, ' #');
-			}
-		}
+
+		$tags = array_slice(
+			array_filter(
+				array_map(
+					function($tag) { return trim($tag, ' #');},
+					explode(',', $_POST['tags']) ?: []
+				)
+			),
+			0,
+			$max_tags,
+		);
 
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'tags', $tags);
 	}
@@ -742,6 +747,11 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 	}
 
 	foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
+		// Tumblr will return an error for queries on empty tag
+		if (!$tag) {
+			continue;
+		}
+
 		$data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
 
 		if (!is_array($data->response)) {

From d488c1907a8047d9eeaa802a24f5573feba76991 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 25 Feb 2025 15:24:00 +0000
Subject: [PATCH 139/161] Fix PHPStan error in webdav_storage addon

---
 webdav_storage/src/WebDavConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
index 2236e97a..320b06a2 100644
--- a/webdav_storage/src/WebDavConfig.php
+++ b/webdav_storage/src/WebDavConfig.php
@@ -52,7 +52,7 @@ class WebDavConfig implements ICanConfigureStorage
 		$this->config = $config;
 		$this->client = $client;
 
-		$this->authOptions = null;
+		$this->authOptions = [];
 
 		if (!empty($this->config->get('webdav', 'username'))) {
 			$this->authOptions = [

From cfe27582eeba1442f8414a4edc731b53057bc092 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 08:47:06 +0000
Subject: [PATCH 140/161] Fix PHPStan error in tumblr addon

---
 tumblr/tumblr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 4415e2de..9e691bf2 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -791,7 +791,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 	$dashboard = tumblr_get($uid, 'user/dashboard', $parameters);
 	if ($dashboard->meta->status > 399) {
 		DI::logger()->notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
-		return [];
+		return;
 	}
 
 	if (empty($dashboard->response->posts)) {

From 512ad63dbff6a9c4c85ff414e0768eda09b71b52 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 14:35:00 +0000
Subject: [PATCH 141/161] Fix PHPStan errors in statusnet addon

---
 statusnet/library/codebirdsn.php     |  2 +-
 statusnet/library/statusnetoauth.php | 16 ++++++-------
 statusnet/library/twitteroauth.php   | 36 ++++++++++++++--------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 9807d97f..bffca163 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -976,7 +976,7 @@ class CodebirdSN
      * @param string $method The method that has been called
      * @param string $reply  The actual reply, JSON-encoded or URL-encoded
      *
-     * @return array|object The parsed reply
+     * @return string|array|object The parsed reply
      */
     protected function _parseApiReply($method, $reply)
     {
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index c32b2b4f..da21be58 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -12,7 +12,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
  */
 class StatusNetOAuth extends TwitterOAuth
 {
-	function get_maxlength()
+	public function get_maxlength()
 	{
 		$config = $this->get($this->host . 'statusnet/config.json');
 		if (empty($config)) {
@@ -21,27 +21,27 @@ class StatusNetOAuth extends TwitterOAuth
 		return $config->site->textlimit;
 	}
 
-	function accessTokenURL()
+	public function accessTokenURL()
 	{
 		return $this->host . 'oauth/access_token';
 	}
 
-	function authenticateURL()
+	public function authenticateURL()
 	{
 		return $this->host . 'oauth/authenticate';
 	}
 
-	function authorizeURL()
+	public function authorizeURL()
 	{
 		return $this->host . 'oauth/authorize';
 	}
 
-	function requestTokenURL()
+	public function requestTokenURL()
 	{
 		return $this->host . 'oauth/request_token';
 	}
 
-	function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
+	public function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
 	{
 		parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
 		$this->host = $apipath;
@@ -52,9 +52,9 @@ class StatusNetOAuth extends TwitterOAuth
 	 *
 	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
 	 *
-	 * @return array|object API results
+	 * @return array|object|mixed API results
 	 */
-	function http($url, $method, $postfields = NULL)
+	public function http($url, $method, $postfields = NULL)
 	{
 		$this->http_info = [];
 		$ci = curl_init();
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index bf413d23..bab66195 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -45,11 +45,11 @@ class TwitterOAuth
 	public $http_header;
 	/**
 	 * Contains the last HTTP request info
-	 * @var string
+	 * @var array
 	 */
 	public $http_info;
 
-	/** @var OAuthToken */
+	/** @var OAuthToken|null */
 	private $token;
 	/** @var OAuthConsumer */
 	private $consumer;
@@ -59,27 +59,27 @@ class TwitterOAuth
 	/**
 	 * Set API URLS
 	 */
-	function accessTokenURL()
+	public function accessTokenURL()
 	{
 		return 'https://api.twitter.com/oauth/access_token';
 	}
 
-	function authenticateURL()
+	public function authenticateURL()
 	{
 		return 'https://twitter.com/oauth/authenticate';
 	}
 
-	function authorizeURL()
+	public function authorizeURL()
 	{
 		return 'https://twitter.com/oauth/authorize';
 	}
 
-	function requestTokenURL()
+	public function requestTokenURL()
 	{
 		return 'https://api.twitter.com/oauth/request_token';
 	}
 
-	function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
+	public function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
 	{
 		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
 		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
@@ -96,7 +96,7 @@ class TwitterOAuth
 	 * @param callable $oauth_callback
 	 * @return array
 	 */
-	function getRequestToken($oauth_callback = null)
+	public function getRequestToken($oauth_callback = null)
 	{
 		$parameters = [];
 		if (!empty($oauth_callback)) {
@@ -114,7 +114,7 @@ class TwitterOAuth
 	 *
 	 * @return string
 	 */
-	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
+	public function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
 	{
 		if (is_array($token)) {
 			$token = $token['oauth_token'];
@@ -137,7 +137,7 @@ class TwitterOAuth
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham")
 	 */
-	function getAccessToken($oauth_verifier = FALSE)
+	public function getAccessToken($oauth_verifier = FALSE)
 	{
 		$parameters = [];
 		if (!empty($oauth_verifier)) {
@@ -162,7 +162,7 @@ class TwitterOAuth
 	 *                "screen_name" => "abraham",
 	 *                "x_auth_expires" => "0")
 	 */
-	function getXAuthToken($username, $password)
+	public function getXAuthToken($username, $password)
 	{
 		$parameters = [];
 		$parameters['x_auth_username'] = $username;
@@ -182,7 +182,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function get($url, $parameters = [])
+	public function get($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'GET', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -199,7 +199,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function post($url, $parameters = [])
+	public function post($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'POST', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -216,7 +216,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function delete($url, $parameters = [])
+	public function delete($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -234,7 +234,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function oAuthRequest($url, $method, $parameters)
+	public function oAuthRequest($url, $method, $parameters)
 	{
 		if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
 			$url = "{$this->host}{$url}.{$this->format}";
@@ -258,9 +258,9 @@ class TwitterOAuth
 	 * @param string $url
 	 * @param string $method
 	 * @param mixed  $postfields
-	 * @return string API results
+	 * @return string|bool|mixed API results
 	 */
-	function http($url, $method, $postfields = null)
+	public function http($url, $method, $postfields = null)
 	{
 		$this->http_info = [];
 		$ci = curl_init();
@@ -305,7 +305,7 @@ class TwitterOAuth
 	 * @param string $header
 	 * @return int
 	 */
-	function getHeader($ch, $header)
+	public function getHeader($ch, $header)
 	{
 		$i = strpos($header, ':');
 		if (!empty($i)) {

From bbce8c345f6e25f979f81b4939f0a647ce3245fb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 15:12:25 +0000
Subject: [PATCH 142/161] Fix PHPStan errors in phpnut addon

---
 pnut/lib/phpnut.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index ff765243..716945ed 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1025,7 +1025,7 @@ class phpnut
      * see: https://docs.pnut.io/resources/posts/search
      * @param string $query The search query. Supports
      * normal search terms. Searches post text.
-     * @return array An array of associative arrays, each representing one post.
+     * @return string|array|false An array of associative arrays, each representing one post.
      * or false on error
      */
     public function searchPosts(array $params=[], string $query='', string $order='default')
@@ -1769,7 +1769,7 @@ class phpnut
      * see: https://docs.pnut.io/resources/messages/search
      * @param string $query The search query. Supports
      * normal search terms. Searches common channel raw.
-     * @return array An array of associative arrays, each representing one channel.
+     * @return string|array|false An array of associative arrays, each representing one channel.
      * or false on error
      */
     public function searchMessages(array $params=[], string $query='', string $order='default')

From 21a7529a0ef570c68bb15d97adcbc82ba57d0b7b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 15:21:19 +0000
Subject: [PATCH 143/161] fix PHPStan error in phpmailer addon

---
 phpmailer/phpmailer.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index f4bb7753..10287a04 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -28,10 +28,14 @@ function phpmailer_load_config(ConfigFileManager $loader)
 }
 
 /**
- * @param IEmail $email
+ * @param null|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 {

From dda6710b1064559621ac3f4f720fe8b7ef6533f9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 09:36:34 +0000
Subject: [PATCH 144/161] Fix error in notifyall addon

---
 notifyall/notifyall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index d37bac56..387fa1ab 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -50,7 +50,7 @@ function notifyall_post()
 
 	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition), $condition);
 
-	if (! $recipients) {
+	if (! $recipients || !is_iterable($recipients)) {
 		DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));
 		return;
 	}

From 417a3a81989fb07ea89209e4a7c4caf47afcd192 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 09:49:18 +0000
Subject: [PATCH 145/161] Fix error in membersince addon

---
 membersince/membersince.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/membersince/membersince.php b/membersince/membersince.php
index 448b8cf2..df6388c6 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -17,7 +17,11 @@ function membersince_install()
 	Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_display(array &$b)
+/**
+ * @param array|string|null $b
+ * @return void
+ */
+function membersince_display(&$b)
 {
 	$uid = DI::userSession()->getLocalUserId();
 
@@ -59,7 +63,7 @@ function membersince_display(array &$b)
 		$div->appendChild($entry);
 		$elm->parentNode->insertBefore($div, $elm->nextSibling);
 
-		$b = $doc->saveHTML();
+		$b = (string) $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);

From c56ec7c7c4c2545fcb463719d92630ea653bde61 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 10:29:47 +0000
Subject: [PATCH 146/161] Fix error in mailstream addon

---
 mailstream/mailstream.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 5228b168..98654831 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -179,7 +179,7 @@ function mailstream_post_hook(array &$item)
 function mailstream_do_images(array &$item, array &$attachments)
 {
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
-		return;
+		return $attachments;
 	}
 
 	$attachments = [];

From 2667b4d78ede7dbcc4068acc43ad80209fbb2440 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:38:18 +0000
Subject: [PATCH 147/161] Fix error in libravatar addon

---
 libravatar/Services/Libravatar.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index e51ef070..a5bd0793 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -361,19 +361,19 @@ class Services_Libravatar
     protected function domainGet($identifier)
     {
         if ($identifier === null) {
-            return null;
+            return '';
         }
 
         // What are we, email or openid? Split ourself up and get the
         // important bit out.
         if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
             $email = explode('@', $identifier);
-            return $email[1];
+            return (string) $email[1];
         }
 
         //OpenID
         $url    = parse_url($identifier);
-        $domain = $url['host'];
+        $domain = (string) $url['host'];
         if (isset($url['port']) && $url['scheme'] === 'http'
             && $url['port'] != 80
             || isset($url['port']) && $url['scheme'] === 'https'

From ad316852376f82c6d5998b4f6dc8edbd86495e2a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:51:53 +0000
Subject: [PATCH 148/161] Fix error in js_upload addon

---
 js_upload/js_upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index c0a2467d..4bf91de1 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -188,7 +188,7 @@ class js_upload_qqFileUploader
 	private $sizeLimit;
 
 	/**
-	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm
+	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm|false
 	 */
 	private $file;
 

From cdeaa433a133d88569987a9e0c7cd57863198bcd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:55:34 +0000
Subject: [PATCH 149/161] Fix error in diaspora addon

---
 diaspora/Diaspora_Connection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index d8390d70..05c21eb0 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -33,7 +33,6 @@ class Diaspora_Connection {
 		}
 
 		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
-		return $this;
 	}
 
 	public function __destruct() {

From dd58b000d9728dc16976011c8bd8a044449a573e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:57:28 +0000
Subject: [PATCH 150/161] Fix error in bluesky addon

---
 bluesky/bluesky.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ba80660c..500f1846 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -961,13 +961,13 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	if (!empty($existing_uri)) {
 		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
 		if (($post->replyCount <= $comments) || !$complete) {
-			return DI::atpProcessor()->fetchUriId($existing_uri, $uid);
+			return (int) DI::atpProcessor()->fetchUriId($existing_uri, $uid);
 		}
 	}
 
 	if ($complete) {
 		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true, $protocol);
-		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
+		$uri_id = (int) DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
 		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);
 	}

From db875bc755449ec71571a35cb62942b282cae0b9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 07:49:20 +0000
Subject: [PATCH 151/161] Remove type casting to int

---
 bluesky/bluesky.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 500f1846..ba80660c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -961,13 +961,13 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	if (!empty($existing_uri)) {
 		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
 		if (($post->replyCount <= $comments) || !$complete) {
-			return (int) DI::atpProcessor()->fetchUriId($existing_uri, $uid);
+			return DI::atpProcessor()->fetchUriId($existing_uri, $uid);
 		}
 	}
 
 	if ($complete) {
 		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true, $protocol);
-		$uri_id = (int) DI::atpProcessor()->fetchUriId($uri, $uid);
+		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
 		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);
 	}

From 38a8e9a16950584b14c0c5b4e1945c31cbd2e0df Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 08:15:02 +0000
Subject: [PATCH 152/161] remove obvious type cast

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index a5bd0793..8b3dd493 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -368,12 +368,12 @@ class Services_Libravatar
         // important bit out.
         if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
             $email = explode('@', $identifier);
-            return (string) $email[1];
+            return $email[1];
         }
 
         //OpenID
         $url    = parse_url($identifier);
-        $domain = (string) $url['host'];
+        $domain = $url['host'];
         if (isset($url['port']) && $url['scheme'] === 'http'
             && $url['port'] != 80
             || isset($url['port']) && $url['scheme'] === 'https'

From 06b4f164f5bb26162fa948797b4cc79e09e27fe1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 08:21:08 +0000
Subject: [PATCH 153/161] cast db stmt object to array

---
 notifyall/notifyall.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 387fa1ab..f814c4f5 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -50,14 +50,14 @@ function notifyall_post()
 
 	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition), $condition);
 
-	if (! $recipients || !is_iterable($recipients)) {
+	if (! $recipients) {
 		DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));
 		return;
 	}
 
 	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
 
-	foreach ($recipients as $recipient) {
+	foreach (DBA::toArray($recipients) as $recipient) {
 		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
 	}
 

From 97a3b5815ba0da99469dd77f36021cea73b61a00 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 14 Mar 2025 23:53:09 +0100
Subject: [PATCH 154/161] [CI] Bump PHP versions in woodpecker

---
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.phpunit.yml               | 8 +++++---
 .woodpecker/.releaser.yml              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 6b41deae..d6d8a22a 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -48,7 +48,7 @@ steps:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 8b840f80..b0745ad0 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -5,11 +5,13 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.27
+      PHP_VERSION: 8.1.31
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
+      PHP_VERSION: 8.2.28
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.3
+      PHP_VERSION: 8.3.17
+    - PHP_MAJOR_VERSION: 8.4
+      PHP_VERSION: 8.4.5
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 2d880a6b..7407f2bc 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -45,7 +45,7 @@ steps:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

From 48ff761bdb142bce070594c635f91fc47796374a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 28 Apr 2025 13:01:41 +0000
Subject: [PATCH 155/161] Replace Addon class with AddonHelper

---
 libravatar/libravatar.php | 5 +++--
 pumpio/pumpio.php         | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 6cb35331..6f47bf51 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -71,7 +70,9 @@ function libravatar_addon_admin(string &$o)
 		'pagan' => DI::l10n()->t('retro adventure game character'),
 	];
 
-	if (Addon::isEnabled('gravatar')) {
+	$addonHelper = DI::addonHelper();
+
+	if ($addonHelper->isAddonEnabled('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>';
 	}
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index c3445b48..2d6937e8 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -627,7 +626,9 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 
 function pumpio_sync()
 {
-	if (!Addon::isEnabled('pumpio')) {
+	$addonHelper = DI::addonHelper();
+
+	if (!$addonHelper->isAddonEnabled('pumpio')) {
 		return;
 	}
 

From cd4f102d02695dbe6be885a301e1d3b1852f0523 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 17 Apr 2025 21:29:42 +0000
Subject: [PATCH 156/161] Bluesky: Support for mentions

---
 bluesky/bluesky.php | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ba80660c..ce6ddaf2 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -672,6 +672,8 @@ 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'];
 
@@ -733,14 +735,41 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 	}
 }
 
-function bluesky_get_urls(string $body): array
+function bluesky_set_mentions(string $body): string
 {
-	// Remove all hashtag and mention links
+	// 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
+{
 	$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) {
@@ -825,6 +854,9 @@ 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;
 		}

From 2289fdc97ec74ffba2027c6f619065f86100190b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Apr 2025 06:12:02 +0000
Subject: [PATCH 157/161] Issue 14667: Pinned Bluesky feeds are fetched again

---
 bluesky/bluesky.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ce6ddaf2..aef7156c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1174,8 +1174,14 @@ function bluesky_get_feeds(int $uid): array
 		return [];
 	}
 	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
-			return $preference->pinned ?? [];
+		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;
 		}
 	}
 	return [];

From 8a8639b07e0f93b9c5cd8d068bb70009cb0f7af7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 5 Jun 2025 07:56:53 +0000
Subject: [PATCH 158/161] reset Dice calls for LoggerFactory

---
 monolog/static/dependencies.config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
index 75ea8df7..f992d69c 100644
--- a/monolog/static/dependencies.config.php
+++ b/monolog/static/dependencies.config.php
@@ -22,5 +22,6 @@
 return [
 	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
 		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
+		'call' => null,
 	],
 ];

From 9387db358c0edb750ba8cecd1f4624033cc6403d Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 10 Jul 2025 06:30:21 +0200
Subject: [PATCH 159/161] update PHPMailer

---
 phpmailer/composer.lock                       |  20 +-
 phpmailer/vendor/autoload.php                 |  18 +
 phpmailer/vendor/composer/ClassLoader.php     | 202 ++++++++--
 .../vendor/composer/InstalledVersions.php     | 359 ++++++++++++++++++
 .../vendor/composer/autoload_classmap.php     |   3 +-
 .../vendor/composer/autoload_namespaces.php   |   2 +-
 phpmailer/vendor/composer/autoload_psr4.php   |   2 +-
 phpmailer/vendor/composer/autoload_real.php   |  27 +-
 phpmailer/vendor/composer/autoload_static.php |   1 +
 phpmailer/vendor/composer/installed.json      | 169 +++++----
 phpmailer/vendor/composer/installed.php       |  32 ++
 phpmailer/vendor/composer/platform_check.php  |  26 ++
 .../vendor/phpmailer/phpmailer/.editorconfig  |  15 -
 .../vendor/phpmailer/phpmailer/README.md      |  27 +-
 .../vendor/phpmailer/phpmailer/SECURITY.md    |   4 +-
 .../vendor/phpmailer/phpmailer/SMTPUTF8.md    |  48 +++
 phpmailer/vendor/phpmailer/phpmailer/VERSION  |   2 +-
 .../vendor/phpmailer/phpmailer/composer.json  |   3 +-
 .../phpmailer/phpmailer/get_oauth_token.php   |   6 +-
 .../phpmailer/language/phpmailer.lang-es.php  |  15 +-
 .../phpmailer/language/phpmailer.lang-fr.php  |   3 +-
 .../phpmailer/language/phpmailer.lang-ja.php  |  14 +-
 .../phpmailer/language/phpmailer.lang-ku.php  |  27 ++
 .../phpmailer/language/phpmailer.lang-pt.php  |  41 +-
 .../phpmailer/language/phpmailer.lang-ru.php  |  22 +-
 .../phpmailer/language/phpmailer.lang-tr.php  |   9 +-
 .../phpmailer/language/phpmailer.lang-ur.php  |  30 ++
 .../phpmailer/src/DSNConfigurator.php         |   2 +-
 .../phpmailer/phpmailer/src/Exception.php     |   2 +-
 .../vendor/phpmailer/phpmailer/src/OAuth.php  |   4 +-
 .../phpmailer/src/OAuthTokenProvider.php      |   2 +-
 .../phpmailer/phpmailer/src/PHPMailer.php     | 206 +++++++---
 .../vendor/phpmailer/phpmailer/src/POP3.php   |   8 +-
 .../vendor/phpmailer/phpmailer/src/SMTP.php   |  96 +++--
 34 files changed, 1151 insertions(+), 296 deletions(-)
 create mode 100644 phpmailer/vendor/composer/InstalledVersions.php
 create mode 100644 phpmailer/vendor/composer/installed.php
 create mode 100644 phpmailer/vendor/composer/platform_check.php
 delete mode 100644 phpmailer/vendor/phpmailer/phpmailer/.editorconfig
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php

diff --git a/phpmailer/composer.lock b/phpmailer/composer.lock
index b2144482..7cd1afd5 100644
--- a/phpmailer/composer.lock
+++ b/phpmailer/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.9.1",
+            "version": "v6.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
+                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
                 "shasum": ""
             },
             "require": {
@@ -75,24 +75,28 @@
                 }
             ],
             "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": "2023-11-25T22:23:28+00:00"
+            "time": "2025-04-24T15:19:31+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": "1.1.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
diff --git a/phpmailer/vendor/autoload.php b/phpmailer/vendor/autoload.php
index 60925835..1d45b283 100644
--- a/phpmailer/vendor/autoload.php
+++ b/phpmailer/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // 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();
diff --git a/phpmailer/vendor/composer/ClassLoader.php b/phpmailer/vendor/composer/ClassLoader.php
index 03b9bb9c..7824d8f7 100644
--- a/phpmailer/vendor/composer/ClassLoader.php
+++ b/phpmailer/vendor/composer/ClassLoader.php
@@ -37,26 +37,81 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://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)) {
@@ -66,28 +121,42 @@ 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 $classMap Class to filename map
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,22 +171,25 @@ 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 array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @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
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -126,19 +198,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -147,25 +219,28 @@ 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 array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @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
      *
      * @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(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -175,18 +250,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] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -195,8 +270,10 @@ 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 array|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +288,12 @@ 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 array|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +313,8 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +337,8 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +359,8 @@ 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)
     {
@@ -296,33 +381,55 @@ 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 bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +474,21 @@ 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
@@ -432,14 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @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);
+    }
 }
diff --git a/phpmailer/vendor/composer/InstalledVersions.php b/phpmailer/vendor/composer/InstalledVersions.php
new file mode 100644
index 00000000..51e734a7
--- /dev/null
+++ b/phpmailer/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?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;
+    }
+}
diff --git a/phpmailer/vendor/composer/autoload_classmap.php b/phpmailer/vendor/composer/autoload_classmap.php
index 31c59aff..c20440c1 100644
--- a/phpmailer/vendor/composer/autoload_classmap.php
+++ b/phpmailer/vendor/composer/autoload_classmap.php
@@ -2,10 +2,11 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $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',
diff --git a/phpmailer/vendor/composer/autoload_namespaces.php b/phpmailer/vendor/composer/autoload_namespaces.php
index b7fc0125..15a2ff3a 100644
--- a/phpmailer/vendor/composer/autoload_namespaces.php
+++ b/phpmailer/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/phpmailer/vendor/composer/autoload_psr4.php b/phpmailer/vendor/composer/autoload_psr4.php
index 0706da6f..28567a00 100644
--- a/phpmailer/vendor/composer/autoload_psr4.php
+++ b/phpmailer/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/phpmailer/vendor/composer/autoload_real.php b/phpmailer/vendor/composer/autoload_real.php
index e7e97ae8..65adf3da 100644
--- a/phpmailer/vendor/composer/autoload_real.php
+++ b/phpmailer/vendor/composer/autoload_real.php
@@ -22,31 +22,14 @@ 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();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'));
 
-        $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);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
 
         $loader->register(true);
 
diff --git a/phpmailer/vendor/composer/autoload_static.php b/phpmailer/vendor/composer/autoload_static.php
index d07c239a..8fc70b40 100644
--- a/phpmailer/vendor/composer/autoload_static.php
+++ b/phpmailer/vendor/composer/autoload_static.php
@@ -21,6 +21,7 @@ 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',
diff --git a/phpmailer/vendor/composer/installed.json b/phpmailer/vendor/composer/installed.json
index 99511ee9..142a295b 100644
--- a/phpmailer/vendor/composer/installed.json
+++ b/phpmailer/vendor/composer/installed.json
@@ -1,81 +1,90 @@
-[
-    {
-        "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"
+{
+        "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"
+                }
         ],
-        "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"
-            }
-        ]
-    }
-]
+        "dev": true,
+        "dev-package-names": []
+}
diff --git a/phpmailer/vendor/composer/installed.php b/phpmailer/vendor/composer/installed.php
new file mode 100644
index 00000000..554d2c40
--- /dev/null
+++ b/phpmailer/vendor/composer/installed.php
@@ -0,0 +1,32 @@
+<?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,
+        ),
+    ),
+);
diff --git a/phpmailer/vendor/composer/platform_check.php b/phpmailer/vendor/composer/platform_check.php
new file mode 100644
index 00000000..f79e574b
--- /dev/null
+++ b/phpmailer/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70000)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.0.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig b/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
deleted file mode 100644
index a7c44ddb..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = space
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2
diff --git a/phpmailer/vendor/phpmailer/phpmailer/README.md b/phpmailer/vendor/phpmailer/phpmailer/README.md
index e3e4ecff..862a4e1a 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/README.md
+++ b/phpmailer/vendor/phpmailer/phpmailer/README.md
@@ -20,34 +20,35 @@
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Add attachments, including inline
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
-- SMTP authentication with LOGIN, PLAIN, CRAM-MD5, and XOAUTH2 mechanisms over SMTPS and SMTP+STARTTLS transports
+- Full UTF-8 support when using servers that support `SMTPUTF8`.
+- Support for iCal events in multiparts and attachments
+- SMTP authentication with `LOGIN`, `PLAIN`, `CRAM-MD5`, and `XOAUTH2` mechanisms over SMTPS and SMTP+STARTTLS transports
 - Validates email addresses automatically
 - Protects against header injection attacks
 - Error messages in over 50 languages!
 - DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later, including PHP 8.2
+- Compatible with PHP 5.5 and later, including PHP 8.4
 - Namespaced to prevent name clashes
 - Much more!
 
 ## Why you might need it
-Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
+Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as authentication, HTML messages, and attachments.
 
 Formatting email correctly is surprisingly difficult. There are myriad overlapping (and conflicting) standards, requiring tight adherence to horribly complicated formatting and encoding rules – the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong, if not unsafe!
 
 The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP client allows email sending on all platforms without needing a local mail server. Be aware though, that the `mail()` function should be avoided when possible; it's both faster and [safer](https://exploitbox.io/paper/Pwning-PHP-Mail-Function-For-Fun-And-RCE.html) to use SMTP to localhost.
 
 *Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
-you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
-, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
+you should look at before rolling your own. Try [Symfony Mailer](https://symfony.com/doc/current/mailer.html), [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
 
 ## License
-This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
+This software is distributed under the [LGPL 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
 
 ## Installation & loading
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.9.1"
+"phpmailer/phpmailer": "^6.10.0"
 ```
 
 or run
@@ -74,7 +75,7 @@ require 'path/to/PHPMailer/src/PHPMailer.php';
 require 'path/to/PHPMailer/src/SMTP.php';
 ```
 
-If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
+If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for it. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
 
 ## Legacy versions
 PHPMailer 5.2 (which is compatible with PHP 5.0 — 7.0) is no longer supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
@@ -95,7 +96,7 @@ use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 
-//Load Composer's autoloader
+//Load Composer's autoloader (created by composer, not included with PHPMailer)
 require 'vendor/autoload.php';
 
 //Create an instance; passing `true` enables exceptions
@@ -144,7 +145,7 @@ If you are re-using the instance (e.g. when sending to a mailing list), you may
 That's it. You should now be ready to use PHPMailer!
 
 ## Localization
-PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](https://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 ```php
 //To load the French version
@@ -162,9 +163,9 @@ To reduce PHPMailer's deployed code footprint, examples are not included if you
 
 Complete generated API documentation is [available online](https://phpmailer.github.io/PHPMailer/).
 
-You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
+You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](https://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailer/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
 
-If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
+If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](https://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
 
 ## Tests
 [PHPMailer tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/) use PHPUnit 9, with [a polyfill](https://github.com/Yoast/PHPUnit-Polyfills) to let 9-style tests run on older PHPUnit and PHP versions.
@@ -213,7 +214,7 @@ use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-php
 See [changelog](changelog.md).
 
 ## History
-- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
+- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](https://sourceforge.net/projects/phpmailer/).
 - [Marcus Bointon](https://github.com/Synchro) (`coolbru` on SF) and Andy Prevost (`codeworxtech`) took over the project in 2004.
 - Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
 - Marcus created [his fork on GitHub](https://github.com/Synchro/PHPMailer) in 2008.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md b/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
index 035a87f7..4f34026d 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
+++ b/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
@@ -13,13 +13,13 @@ PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs
 
 PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr.
 
-PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it is not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
 
 PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
 
 PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
 
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
 
 PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
 
diff --git a/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md b/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
new file mode 100644
index 00000000..ca284ee2
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
@@ -0,0 +1,48 @@
+# A short history of UTF-8 in email
+
+## Background
+
+For most of its existence, SMTP has been a 7-bit channel, only supporting US-ASCII characters. This has been a problem for many languages, especially those that use non-Latin scripts, and has led to the development of various workarounds.
+
+The first major improvement, introduced in 1994 in [RFC 1652](https://www.rfc-editor.org/rfc/rfc1652) and extended in 2011 in [RFC 6152](https://www.rfc-editor.org/rfc/rfc6152), was the addition of the `8BITMIME` SMTP extension, which allowed raw 8-bit data to be included in message bodies sent over SMTP.
+This allowed the message *contents* to contain 8-bit data, including things like UTF-8 text, even though the SMTP protocol itself was still firmly 7-bit. This worked by having the server switch to 8-bit after the headers, and then back to 7-bit after the completion of a `DATA` command.
+
+From 1996, messages could support [RFC 2047 encoding](https://www.rfc-editor.org/rfc/rfc2047), which permitted inserting characters from any character set into header *values* (but not names), but only by encoding them in somewhat unreadable ways to allow them to survive passage through a 7-bit channel. An example with a subject of "Schrödinger's cat" would be:
+
+```
+Subject: =?utf-8?Q=Schr=C3=B6dinger=92s_Cat?=
+```
+
+Here the accented `ö` is encoded as `=C3=B6`, which is the UTF-8 encoding of the 2-byte character, and the whole thing is wrapped in `=?utf-8?Q?` to indicate that it uses the UTF-8 charset and `quoted-printable` encoding. This is a bit of a hack, and not very human-friendly, but it works.
+
+Similarly, 8-bit message bodies could be encoded using the same `quoted-printable` and `base64` content transfer encoding (CTE) schemes, which preserved the 8-bit content while encoding it in a format that could survive transmission through a 7-bit channel.
+
+Domain names were originally also stuck in a 7-bit world, actually even more constrained to only a subset of the US-ASCII character set. But of course, many people want to have domains in their own language/script. Internationalized domain name (IDN) permitted this, using yet another complex encoding scheme called punycode, defined for domain names in 2003 in [RFC 3492](https://www.rfc-editor.org/rfc/rfc3492). This finally allowed the domain part (after the `@`) of email addresses to contain UTF-8, though it was actually an illusion preserved by email client applications. For example, an address of
+`user@café.example.com` translates to
+`user@xn--caf-dma.example.com` in punycode, rendering it mostly unreadable, but 7-bit friendly, and remaining compatible with email clients that don't know about IDN.
+
+The one remaining part of email that could not handle UTF-8 is the local part of email addresses (the part before the `@`).
+
+I've only mentioned UTF-8 here, but most of these approaches also allowed other character sets that were popular, such as [the ISO-8859 family](https://en.wikipedia.org/wiki/ISO/IEC_8859). However, UTF-8 solves so many problems that these other character sets are gradually falling out of favour, as UTF-8 can support all languages.
+
+This patchwork of overlapping approaches has served us well, but we have to admit that it's a mess.
+
+## SMTPUTF8
+
+`SMTPUTF8` is another SMTP extension, defined in [RFC 6531](https://www.rfc-editor.org/rfc/rfc6531) in 2012. This essentially solves the whole problem, allowing the entire SMTP conversation — commands, headers, and message bodies — to be sent in raw, unencoded UTF-8.
+
+But there's a problem with this approach: adoption. If you send a UTF-8 message to a recipient whose mail server doesn't support this format, the sender has to somehow downgrade the message to make it survive a transition to 7-bit. This is a hard problem to solve, especially since there is no way to make a 7-bit system support UTF-8 in the local parts of addresses. This downgrade problem is what held up the adoption of `SMTPUTF8` in PHPMailer for many years, but in that time the *de facto* approach has become to simply fail in that situation, and tell the recipient it's time they upgraded their mail server 😅.
+
+The vast majority of large email providers (gmail, Yahoo, Microsoft, etc), mail servers (postfix, exim, IIS, etc), and mail clients (Apple Mail, Outlook, Thunderbird, etc) now all support SMTPUTF8, so the need for backward compatibility is no longer what it was.
+
+## SMTPUTF8 in PHPMailer
+
+Several other PHP email libraries have implemented a halfway solution to `SMTPUTF8`, adding only the ability to support UTF-8 in email addresses, not elsewhere in the protocol. I wanted PHPMailer to do it "the right way", and this has taken much longer. PHPMailer now supports UTF-8 everywhere, and does not need to use transfer or header encodings for UTF-8 text when connecting to an `SMTPUTF8`-capable mail server.
+
+This support is handled automatically: if you add an email address that requires UTF-8, PHPMailer will use UTF-8 for everything. If not, it will fall back to 7-bit and encode the message as necessary.
+
+The one place you will need to be careful is in the selection of the address validator. By default, PHPMailer uses PHP's built-in `filter_var` validator, which does not allow UTF-8 email addresses. When PHPMailer spots that you have submitted a UTF-8 address, but have not altered the default validator, it will automatically switch to using a UTF-8-compatible validator. As soon as you do this, any SMTP connection you make will *require* that the server you connect to supports `SMTPUTF8`. You can select this validator explicitly by setting `PHPMailer::$validator = 'eai'` (an acronym for Email Address Internationalization).
+
+### Postfix gotcha
+
+Postfix has supported `SMTPUTF8` for a long time, but it has a peculiarity that it does not always advertise that it does so. However, rather surprisingly, if you use UTF-8 in the conversation, it will work anyway.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/VERSION b/phpmailer/vendor/phpmailer/phpmailer/VERSION
index dc3829f5..cf79bf90 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/VERSION
+++ b/phpmailer/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.9.1
+6.10.0
diff --git a/phpmailer/vendor/phpmailer/phpmailer/composer.json b/phpmailer/vendor/phpmailer/phpmailer/composer.json
index fa170a0b..7b008b7c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/composer.json
+++ b/phpmailer/vendor/phpmailer/phpmailer/composer.json
@@ -28,7 +28,8 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "lock": false
     },
     "require": {
         "php": ">=5.5.0",
diff --git a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
index cda0445c..0e54a00b 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -12,7 +12,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -36,7 +36,7 @@ namespace PHPMailer\PHPMailer;
  * Aliases for League Provider Classes
  * Make sure you have added these to your composer.json and run `composer install`
  * Plenty to choose from here:
- * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
+ * @see https://oauth2-client.thephpleague.com/providers/thirdparty/
  */
 //@see https://github.com/thephpleague/oauth2-google
 use League\OAuth2\Client\Provider\Google;
@@ -178,5 +178,5 @@ if (!isset($_GET['code'])) {
     );
     //Use this to interact with an API on the users behalf
     //Use this to get a new access token if the old one expires
-    echo 'Refresh Token: ', $token->getRefreshToken();
+    echo 'Refresh Token: ', htmlspecialchars($token->getRefreshToken());
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
index 69920418..4e74bfb7 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -5,27 +5,32 @@
  * @package PHPMailer
  * @author Matt Sturdy <matt.sturdy@gmail.com>
  * @author Crystopher Glodzienski Cardoso <crystopher.glodzienski@gmail.com>
+ * @author Daniel Cruz <danicruz0415@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
+$PHPMAILER_LANG['buggy_php']            = 'Tu versión de PHP está afectada por un bug que puede resultar en mensajes corruptos. Para arreglarlo, cambia a enviar usando SMTP, deshabilita la opción mail.add_x_header en tu php.ini, cambia a MacOS o Linux, o actualiza tu PHP a la versión 7.0.17+ o 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Error SMTP: Imposible conectar al servidor SMTP.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Datos no aceptados.';
 $PHPMAILER_LANG['empty_message']        = 'El cuerpo del mensaje está vacío.';
 $PHPMAILER_LANG['encoding']             = 'Codificación desconocida: ';
 $PHPMAILER_LANG['execute']              = 'Imposible ejecutar: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
 $PHPMAILER_LANG['file_access']          = 'Imposible acceder al archivo: ';
 $PHPMAILER_LANG['file_open']            = 'Error de Archivo: Imposible abrir el archivo: ';
 $PHPMAILER_LANG['from_failed']          = 'La(s) siguiente(s) direcciones de remitente fallaron: ';
 $PHPMAILER_LANG['instantiate']          = 'Imposible crear una instancia de la función Mail.';
 $PHPMAILER_LANG['invalid_address']      = 'Imposible enviar: dirección de email inválido: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Hostentry inválido: ';
+$PHPMAILER_LANG['invalid_host']         = 'Host inválido: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
 $PHPMAILER_LANG['provide_address']      = 'Debe proporcionar al menos una dirección de email de destino.';
 $PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Los siguientes destinos fallaron: ';
 $PHPMAILER_LANG['signing']              = 'Error al firmar: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
-$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
 $PHPMAILER_LANG['smtp_code']            = 'Código del servidor SMTP: ';
 $PHPMAILER_LANG['smtp_code_ex']         = 'Información adicional del servidor SMTP: ';
-$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalle: ';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
index 0d367fcf..a6d582d8 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -6,7 +6,6 @@
  * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
  * for example before a colon or exclamation mark.
  * There is one of these characters between these quotes: " "
- * @see http://unicode.org/udhr/n/notes_fra.html
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
@@ -31,7 +30,7 @@ $PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires s
 $PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
 $PHPMAILER_LANG['smtp_code']            = 'Code SMTP : ';
 $PHPMAILER_LANG['smtp_code_ex']         = 'Informations supplémentaires SMTP : ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échouée.';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échoué.';
 $PHPMAILER_LANG['smtp_detail']          = 'Détails : ';
 $PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
 $PHPMAILER_LANG['variable_set']         = 'Impossible d’initialiser ou de réinitialiser une variable : ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
index c76f5264..d01869ce 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
@@ -3,27 +3,35 @@
 /**
  * Japanese PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
- * @author Mitsuhiro Yoshida <http://mitstek.com/>
+ * @author Mitsuhiro Yoshida <https://mitstek.com>
  * @author Yoshi Sakai <http://bluemooninc.jp/>
  * @author Arisophy <https://github.com/arisophy/>
+ * @author ARAKI Musashi <https://github.com/arakim/>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['buggy_php']            = 'ご利用のバージョンのPHPには不具合があり、メッセージが破損するおそれがあります。問題の解決は以下のいずれかを行ってください。SMTPでの送信に切り替える。php.iniのmail.add_x_headerをoffにする。MacOSまたはLinuxに切り替える。PHPバージョン7.0.17以降または7.1.3以降にアップグレードする。';
 $PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
 $PHPMAILER_LANG['empty_message']        = 'メール本文が空です。';
 $PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
 $PHPMAILER_LANG['execute']              = '実行できませんでした: ';
+$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
 $PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
 $PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
 $PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
 $PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
 $PHPMAILER_LANG['invalid_address']      = '不正なメールアドレス: ';
-$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['invalid_header']       = '不正なヘッダー名またはその内容';
+$PHPMAILER_LANG['invalid_hostentry']    = '不正なホストエントリー: ';
+$PHPMAILER_LANG['invalid_host']         = '不正なホスト: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
 $PHPMAILER_LANG['signing']              = '署名エラー: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTPコード: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'SMTP追加情報: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP接続に失敗しました。';
+$PHPMAILER_LANG['smtp_detail']          = '詳細: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTPサーバーエラー: ';
 $PHPMAILER_LANG['variable_set']         = '変数が存在しません: ';
-$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
new file mode 100644
index 00000000..cf3bda69
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Kurdish (Sorani) PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Halo Salman <halo@home4t.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'هەڵەی SMTP : نەتوانرا کۆدەکە پشتڕاست بکرێتەوە ';
+$PHPMAILER_LANG['connect_host']         = 'هەڵەی SMTP: نەتوانرا پەیوەندی بە سێرڤەرەوە بکات SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'هەڵەی SMTP: ئەو زانیاریانە قبوڵ نەکرا.';
+$PHPMAILER_LANG['empty_message']        = 'پەیامەکە بەتاڵە';
+$PHPMAILER_LANG['encoding']             = 'کۆدکردنی نەزانراو : ';
+$PHPMAILER_LANG['execute']              = 'ناتوانرێت جێبەجێ بکرێت: ';
+$PHPMAILER_LANG['file_access']          = 'ناتوانرێت دەستت بگات بە فایلەکە: ';
+$PHPMAILER_LANG['file_open']            = 'هەڵەی پەڕگە(فایل): ناتوانرێت بکرێتەوە: ';
+$PHPMAILER_LANG['from_failed']          = 'هەڵە لە ئاستی ناونیشانی نێرەر: ';
+$PHPMAILER_LANG['instantiate']          = 'ناتوانرێت خزمەتگوزاری پۆستە پێشکەش بکرێت.';
+$PHPMAILER_LANG['invalid_address']      = 'نەتوانرا بنێردرێت ، چونکە ناونیشانی ئیمەیڵەکە نادروستە: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' مەیلەر پشتگیری ناکات';
+$PHPMAILER_LANG['provide_address']      = 'دەبێت ناونیشانی ئیمەیڵی لانیکەم یەک وەرگر دابین بکرێت.';
+$PHPMAILER_LANG['recipients_failed']    = ' هەڵەی SMTP: ئەم هەڵانەی خوارەوەشکستی هێنا لە ناردن بۆ هەردووکیان: ';
+$PHPMAILER_LANG['signing']              = 'هەڵەی واژۆ: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect()پەیوەندی شکستی هێنا .';
+$PHPMAILER_LANG['smtp_error']           = 'هەڵەی ئاستی سێرڤەری SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'ناتوانرێت بیگۆڕیت یان دوبارە بینێریتەوە: ';
+$PHPMAILER_LANG['extension_missing']    = 'درێژکراوە نەماوە: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
index f1ce946e..79a68026 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
@@ -3,25 +3,32 @@
 /**
  * Portuguese (European) PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
- * @author Jonadabe <jonadabe@hotmail.com>
+ * @author João Vieira <mail@joaovieira.eu>
  */
 
-$PHPMAILER_LANG['authenticate']         = 'Erro do SMTP: Não foi possível realizar a autenticação.';
-$PHPMAILER_LANG['connect_host']         = 'Erro do SMTP: Não foi possível realizar ligação com o servidor SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Erro do SMTP: Os dados foram rejeitados.';
-$PHPMAILER_LANG['empty_message']        = 'A mensagem no e-mail está vazia.';
+$PHPMAILER_LANG['authenticate']         = 'Erro SMTP: Falha na autenticação.';
+$PHPMAILER_LANG['buggy_php']            = 'A sua versão do PHP tem um bug que pode causar mensagens corrompidas. Para resolver, utilize o envio por SMTP, desative a opção mail.add_x_header no ficheiro php.ini, mude para MacOS ou Linux, ou atualize o PHP para a versão 7.0.17+ ou 7.1.3+.';
+$PHPMAILER_LANG['connect_host']         = 'Erro SMTP: Não foi possível ligar ao servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro SMTP: Dados não aceites.';
+$PHPMAILER_LANG['empty_message']        = 'A mensagem de e-mail está vazia.';
 $PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
 $PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
-$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder o ficheiro: ';
-$PHPMAILER_LANG['file_open']            = 'Abertura do ficheiro: Não foi possível abrir o ficheiro: ';
-$PHPMAILER_LANG['from_failed']          = 'Ocorreram falhas nos endereços dos seguintes remententes: ';
-$PHPMAILER_LANG['instantiate']          = 'Não foi possível iniciar uma instância da função mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Não foi enviado nenhum e-mail para o endereço de e-mail inválido: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
-$PHPMAILER_LANG['provide_address']      = 'Tem de fornecer pelo menos um endereço como destinatário do e-mail.';
-$PHPMAILER_LANG['recipients_failed']    = 'Erro do SMTP: O endereço do seguinte destinatário falhou: ';
-$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
-$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
 $PHPMAILER_LANG['extension_missing']    = 'Extensão em falta: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder ao ficheiro: ';
+$PHPMAILER_LANG['file_open']            = 'Erro ao abrir o ficheiro: ';
+$PHPMAILER_LANG['from_failed']          = 'O envio falhou para o seguinte endereço do remetente: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nome ou valor do cabeçalho inválido.';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Entrada de host inválida: ';
+$PHPMAILER_LANG['invalid_host']         = 'Host inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'O cliente de e-mail não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Deve fornecer pelo menos um endereço de destinatário.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro SMTP: Falha no envio para os seguintes destinatários: ';
+$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
+$PHPMAILER_LANG['smtp_code']            = 'Código SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informações adicionais SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Falha na função SMTP connect().';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalhes: ';
+$PHPMAILER_LANG['smtp_error']           = 'Erro do servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
index 8c8c5e81..8013f37c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
@@ -5,24 +5,32 @@
  * @package PHPMailer
  * @author Alexey Chumakov <alex@chumakov.ru>
  * @author Foster Snowhill <i18n@forstwoof.ru>
+ * @author ProjectSoft <projectsoft2009@yandex.ru>
  */
 
-$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: не удалось пройти аутентификацию.';
+$PHPMAILER_LANG['buggy_php']            = 'В вашей версии PHP есть ошибка, которая может привести к повреждению сообщений. Чтобы исправить, переключитесь на отправку по SMTP, отключите опцию mail.add_x_header в ваш php.ini, переключитесь на MacOS или Linux или обновите PHP до версии 7.0.17+ или 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к SMTP-серверу.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
 $PHPMAILER_LANG['encoding']             = 'Неизвестная кодировка: ';
 $PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
 $PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
 $PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удаётся открыть файл: ';
 $PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
 $PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail().';
-$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один email-адрес получателя.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
-$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: не удалась отправка таким адресатам: ';
-$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
 $PHPMAILER_LANG['invalid_address']      = 'Не отправлено из-за неправильного формата email-адреса: ';
+$PHPMAILER_LANG['invalid_header']       = 'Неверное имя или значение заголовка';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Неверная запись хоста: ';
+$PHPMAILER_LANG['invalid_host']         = 'Неверный хост: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['provide_address']      = 'Вы должны указать хотя бы один адрес электронной почты получателя.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: Ошибка следующих получателей: ';
 $PHPMAILER_LANG['signing']              = 'Ошибка подписи: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
+$PHPMAILER_LANG['smtp_code']            = 'Код SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Дополнительная информация SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером.';
+$PHPMAILER_LANG['smtp_detail']          = 'Детали: ';
 $PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
 $PHPMAILER_LANG['variable_set']         = 'Невозможно установить или сбросить переменную: ';
-$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
index f938f802..3c45bc1c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
@@ -11,21 +11,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.';
+$PHPMAILER_LANG['buggy_php']            = 'PHP sürümünüz iletilerin bozulmasına neden olabilecek bir hatadan etkileniyor. Bunu düzeltmek için, SMTP kullanarak göndermeye geçin, mail.add_x_header seçeneğini devre dışı bırakın php.ini dosyanızdaki mail.add_x_header seçeneğini devre dışı bırakın, MacOS veya Linux geçin veya PHP sürümünü 7.0.17+ veya 7.1.3+ sürümüne yükseltin,';
 $PHPMAILER_LANG['connect_host']         = 'SMTP Hatası: SMTP sunucusuna bağlanılamadı.';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hatası: Veri kabul edilmedi.';
 $PHPMAILER_LANG['empty_message']        = 'Mesajın içeriği boş';
 $PHPMAILER_LANG['encoding']             = 'Bilinmeyen karakter kodlama: ';
 $PHPMAILER_LANG['execute']              = 'Çalıştırılamadı: ';
+$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
 $PHPMAILER_LANG['file_access']          = 'Dosyaya erişilemedi: ';
 $PHPMAILER_LANG['file_open']            = 'Dosya Hatası: Dosya açılamadı: ';
 $PHPMAILER_LANG['from_failed']          = 'Belirtilen adreslere gönderme başarısız: ';
 $PHPMAILER_LANG['instantiate']          = 'Örnek e-posta fonksiyonu oluşturulamadı.';
 $PHPMAILER_LANG['invalid_address']      = 'Geçersiz e-posta adresi: ';
+$PHPMAILER_LANG['invalid_header']       = 'Geçersiz başlık adı veya değeri: ';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Geçersiz ana bilgisayar girişi: ';
+$PHPMAILER_LANG['invalid_host']         = 'Geçersiz ana bilgisayar: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' e-posta kütüphanesi desteklenmiyor.';
 $PHPMAILER_LANG['provide_address']      = 'En az bir alıcı e-posta adresi belirtmelisiniz.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Hatası: Belirtilen alıcılara ulaşılamadı: ';
 $PHPMAILER_LANG['signing']              = 'İmzalama hatası: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kodu: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'ek SMTP bilgileri: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
+$PHPMAILER_LANG['smtp_detail']          = 'SMTP SMTP Detayı: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
 $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
-$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
new file mode 100644
index 00000000..0b9de0f1
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Urdu PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Saqib Ali Siddiqui <saqibsra@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP خرابی: تصدیق کرنے سے قاصر۔';
+$PHPMAILER_LANG['connect_host']         = 'SMTP خرابی: سرور سے منسلک ہونے سے قاصر۔';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP خرابی: ڈیٹا قبول نہیں کیا گیا۔';
+$PHPMAILER_LANG['empty_message']        = 'پیغام کی باڈی خالی ہے۔';
+$PHPMAILER_LANG['encoding']             = 'نامعلوم انکوڈنگ: ';
+$PHPMAILER_LANG['execute']              = 'عمل کرنے کے قابل نہیں ';
+$PHPMAILER_LANG['file_access']          = 'فائل تک رسائی سے قاصر:';
+$PHPMAILER_LANG['file_open']            = 'فائل کی خرابی: فائل کو کھولنے سے قاصر:';
+$PHPMAILER_LANG['from_failed']          = 'درج ذیل بھیجنے والے کا پتہ ناکام ہو گیا:';
+$PHPMAILER_LANG['instantiate']          = 'میل فنکشن کی مثال بنانے سے قاصر۔';
+$PHPMAILER_LANG['invalid_address']      = 'بھیجنے سے قاصر: غلط ای میل پتہ:';
+$PHPMAILER_LANG['mailer_not_supported'] = ' میلر تعاون یافتہ نہیں ہے۔';
+$PHPMAILER_LANG['provide_address']      = 'آپ کو کم از کم ایک منزل کا ای میل پتہ فراہم کرنا چاہیے۔';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP خرابی: درج ذیل پتہ پر نہیں بھیجا جاسکا: ';
+$PHPMAILER_LANG['signing']              = 'دستخط کی خرابی: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP ملنا ناکام ہوا';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP سرور کی خرابی: ';
+$PHPMAILER_LANG['variable_set']         = 'متغیر سیٹ نہیں کیا جا سکا: ';
+$PHPMAILER_LANG['extension_missing']    = 'ایکٹینشن موجود نہیں ہے۔ ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP سرور کوڈ: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'اضافی SMTP سرور کی معلومات:';
+$PHPMAILER_LANG['invalid_header']       = 'غلط ہیڈر کا نام یا قدر';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
index 566c9618..7058c1f0 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2023 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
index 52eaf951..09c1a2cf 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
index c1d5b776..a7e95886 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -29,7 +29,7 @@ use League\OAuth2\Client\Token\AccessToken;
  * OAuth - OAuth2 authentication wrapper class.
  * Uses the oauth2-client package from the League of Extraordinary Packages.
  *
- * @see     http://oauth2-client.thephpleague.com
+ * @see     https://oauth2-client.thephpleague.com
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
index 11555074..cbda1a12 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
index ba4bcd47..2444bcf3 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -152,8 +152,7 @@ class PHPMailer
      * Only supported in simple alt or alt_inline message types
      * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
      *
-     * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @see http://kigkonsult.se/iCalcreator/
+     * @see https://kigkonsult.se/iCalcreator/
      *
      * @var string
      */
@@ -254,7 +253,7 @@ class PHPMailer
      * You can set your own, but it must be in the format "<id@domain>",
      * as defined in RFC5322 section 3.6.4 or it will be ignored.
      *
-     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     * @see https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
      *
      * @var string
      */
@@ -358,7 +357,7 @@ class PHPMailer
     public $AuthType = '';
 
     /**
-     * SMTP SMTPXClient command attibutes
+     * SMTP SMTPXClient command attributes
      *
      * @var array
      */
@@ -388,7 +387,7 @@ class PHPMailer
      * 'DELAY'   will notify you if there is an unusual delay in delivery, but the actual
      *           delivery's outcome (success or failure) is not yet decided.
      *
-     * @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
+     * @see https://www.rfc-editor.org/rfc/rfc3461.html#section-4.1 for more information about NOTIFY
      */
     public $dsn = '';
 
@@ -468,7 +467,7 @@ class PHPMailer
      * Only applicable when sending via SMTP.
      *
      * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @see http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @see https://www.postfix.org/VERP_README.html Postfix VERP info
      *
      * @var bool
      */
@@ -551,10 +550,10 @@ class PHPMailer
      * The function that handles the result of the send email action.
      * It is called out by send() for each email sent.
      *
-     * Value can be any php callable: http://www.php.net/is_callable
+     * Value can be any php callable: https://www.php.net/is_callable
      *
      * Parameters:
-     *   bool $result        result of the send action
+     *   bool $result           result of the send action
      *   array   $to            email addresses of the recipients
      *   array   $cc            cc email addresses
      *   array   $bcc           bcc email addresses
@@ -581,6 +580,10 @@ class PHPMailer
      * May be a callable to inject your own validator, but there are several built-in validators.
      * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
      *
+     * If CharSet is UTF8, the validator is left at the default value,
+     * and you send to addresses that use non-ASCII local parts, then
+     * PHPMailer automatically changes to the 'eai' validator.
+     *
      * @see PHPMailer::validateAddress()
      *
      * @var string|callable
@@ -660,6 +663,14 @@ class PHPMailer
      */
     protected $ReplyToQueue = [];
 
+    /**
+     * Whether the need for SMTPUTF8 has been detected. Set by
+     * preSend() if necessary.
+     *
+     * @var bool
+     */
+    public $UseSMTPUTF8 = false;
+
     /**
      * The array of attachments.
      *
@@ -757,7 +768,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * Error severity: message only, continue processing.
@@ -903,7 +914,7 @@ class PHPMailer
         }
         //Is this a PSR-3 logger?
         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-            $this->Debugoutput->debug($str);
+            $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
             return;
         }
@@ -1072,7 +1083,7 @@ class PHPMailer
      * be modified after calling this function), addition of such addresses is delayed until send().
      * Addresses that have been added already return false, but do not throw exceptions.
      *
-     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'Reply-To'
      * @param string $address The email address
      * @param string $name    An optional username associated with the address
      *
@@ -1111,19 +1122,22 @@ class PHPMailer
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
         //Domain is assumed to be whatever is after the last @ symbol in the address
-        if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
-            if ('Reply-To' !== $kind) {
-                if (!array_key_exists($address, $this->RecipientsQueue)) {
-                    $this->RecipientsQueue[$address] = $params;
+        if ($this->has8bitChars(substr($address, ++$pos))) {
+            if (static::idnSupported()) {
+                if ('Reply-To' !== $kind) {
+                    if (!array_key_exists($address, $this->RecipientsQueue)) {
+                        $this->RecipientsQueue[$address] = $params;
+
+                        return true;
+                    }
+                } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
 
                     return true;
                 }
-            } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
-                $this->ReplyToQueue[$address] = $params;
-
-                return true;
             }
-
+            //We have an 8-bit domain, but we are missing the necessary extensions to support it
+            //Or we are already sending to this address
             return false;
         }
 
@@ -1161,6 +1175,15 @@ class PHPMailer
      */
     protected function addAnAddress($kind, $address, $name = '')
     {
+        if (
+            self::$validator === 'php' &&
+            ((bool) preg_match('/[\x80-\xFF]/', $address))
+        ) {
+            //The caller has not altered the validator and is sending to an address
+            //with UTF-8, so assume that they want UTF-8 support instead of failing
+            $this->CharSet = self::CHARSET_UTF8;
+            self::$validator = 'eai';
+        }
         if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
             $error_message = sprintf(
                 '%s: %s',
@@ -1212,7 +1235,7 @@ class PHPMailer
      * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
      * Note that quotes in the name part are removed.
      *
-     * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     * @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
      *
      * @param string $addrstr The address list string
      * @param bool   $useimap Whether to use the IMAP extension to parse the list
@@ -1363,6 +1386,7 @@ class PHPMailer
      * * `pcre` Use old PCRE implementation;
      * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
      * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `eai` Use a pattern similar to the HTML5 spec for 'email' and to firefox, extended to support EAI (RFC6530).
      * * `noregex` Don't use a regex: super fast, really dumb.
      * Alternatively you may pass in a callable to inject your own validator, for example:
      *
@@ -1407,7 +1431,6 @@ class PHPMailer
                  *  * IPv6 literals: 'first.last@[IPv6:a1::]'
                  * Not all of these will necessarily work for sending!
                  *
-                 * @see       http://squiloople.com/2009/12/20/email-address-validation/
                  * @copyright 2009-2010 Michael Rushton
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
@@ -1434,6 +1457,24 @@ class PHPMailer
                     '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
                     $address
                 );
+            case 'eai':
+                /*
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type
+                 * form input elements (as above), modified to accept Unicode email addresses.
+                 * This is also more lenient than Firefox' html5 spec, in order to make the regex faster.
+                 * 'eai' is an acronym for Email Address Internationalization.
+                 * This validator is selected automatically if you attempt to use recipient addresses
+                 * that contain Unicode characters in the local part.
+                 *
+                 * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
+                 * @see https://en.wikipedia.org/wiki/International_email
+                 */
+                return (bool) preg_match(
+                    '/^[-\p{L}\p{N}\p{M}.!#$%&\'*+\/=?^_`{|}~]+@[\p{L}\p{N}\p{M}](?:[\p{L}\p{N}\p{M}-]{0,61}' .
+                    '[\p{L}\p{N}\p{M}])?(?:\.[\p{L}\p{N}\p{M}]' .
+                    '(?:[-\p{L}\p{N}\p{M}]{0,61}[\p{L}\p{N}\p{M}])?)*$/usD',
+                    $address
+                );
             case 'php':
             default:
                 return filter_var($address, FILTER_VALIDATE_EMAIL) !== false;
@@ -1567,9 +1608,26 @@ class PHPMailer
             $this->error_count = 0; //Reset errors
             $this->mailHeader = '';
 
+            //The code below tries to support full use of Unicode,
+            //while remaining compatible with legacy SMTP servers to
+            //the greatest degree possible: If the message uses
+            //Unicode in the local parts of any addresses, it is sent
+            //using SMTPUTF8. If not, it it sent using
+            //punycode-encoded domains and plain SMTP.
+            if (
+                static::CHARSET_UTF8 === strtolower($this->CharSet) &&
+                ($this->anyAddressHasUnicodeLocalPart($this->RecipientsQueue) ||
+                 $this->anyAddressHasUnicodeLocalPart(array_keys($this->all_recipients)) ||
+                 $this->anyAddressHasUnicodeLocalPart($this->ReplyToQueue) ||
+                 $this->addressHasUnicodeLocalPart($this->From))
+            ) {
+                $this->UseSMTPUTF8 = true;
+            }
             //Dequeue recipient and Reply-To addresses with IDN
             foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
-                $params[1] = $this->punyencodeAddress($params[1]);
+                if (!$this->UseSMTPUTF8) {
+                    $params[1] = $this->punyencodeAddress($params[1]);
+                }
                 call_user_func_array([$this, 'addAnAddress'], $params);
             }
             if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
@@ -1734,9 +1792,8 @@ class PHPMailer
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
         //A space after `-f` is optional, but there is a long history of its presence
         //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+        //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+        //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
         //Example problem: https://www.drupal.org/node/1057954
 
         //PHP 5.6 workaround
@@ -1874,7 +1931,7 @@ class PHPMailer
      */
     protected static function isPermittedPath($path)
     {
-        //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
+        //Matches scheme definition from https://www.rfc-editor.org/rfc/rfc3986#section-3.1
         return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
     }
 
@@ -1901,7 +1958,7 @@ class PHPMailer
     /**
      * Send mail using the PHP mail() function.
      *
-     * @see http://www.php.net/manual/en/book.mail.php
+     * @see https://www.php.net/manual/en/book.mail.php
      *
      * @param string $header The message headers
      * @param string $body   The message body
@@ -1931,9 +1988,8 @@ class PHPMailer
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
         //A space after `-f` is optional, but there is a long history of its presence
         //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+        //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+        //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
         //Example problem: https://www.drupal.org/node/1057954
         //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
 
@@ -2062,6 +2118,11 @@ class PHPMailer
         if (!$this->smtpConnect($this->SMTPOptions)) {
             throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
         }
+        //If we have recipient addresses that need Unicode support,
+        //but the server doesn't support it, stop here
+        if ($this->UseSMTPUTF8 && !$this->smtp->getServerExt('SMTPUTF8')) {
+            throw new Exception($this->lang('no_smtputf8'), self::STOP_CRITICAL);
+        }
         //Sender already validated in preSend()
         if ('' === $this->Sender) {
             $smtp_from = $this->From;
@@ -2163,6 +2224,7 @@ class PHPMailer
         $this->smtp->setDebugLevel($this->SMTPDebug);
         $this->smtp->setDebugOutput($this->Debugoutput);
         $this->smtp->setVerp($this->do_verp);
+        $this->smtp->setSMTPUTF8($this->UseSMTPUTF8);
         if ($this->Host === null) {
             $this->Host = 'localhost';
         }
@@ -2360,6 +2422,7 @@ class PHPMailer
             'smtp_detail' => 'Detail: ',
             'smtp_error' => 'SMTP server error: ',
             'variable_set' => 'Cannot set or reset variable: ',
+            'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses',
         ];
         if (empty($lang_path)) {
             //Calculate an absolute path so it can work if CWD is not here
@@ -2709,7 +2772,7 @@ class PHPMailer
         }
 
         //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
-        //https://tools.ietf.org/html/rfc5322#section-3.6.4
+        //https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
         if (
             '' !== $this->MessageID &&
             preg_match(
@@ -2874,7 +2937,9 @@ class PHPMailer
         $bodyEncoding = $this->Encoding;
         $bodyCharSet = $this->CharSet;
         //Can we do a 7-bit downgrade?
-        if (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
+        if ($this->UseSMTPUTF8) {
+            $bodyEncoding = static::ENCODING_8BIT;
+        } elseif (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
             $bodyEncoding = static::ENCODING_7BIT;
             //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
             $bodyCharSet = static::CHARSET_ASCII;
@@ -3511,7 +3576,8 @@ class PHPMailer
     /**
      * Encode a header value (not including its label) optimally.
      * Picks shortest of Q, B, or none. Result includes folding if needed.
-     * See RFC822 definitions for phrase, comment and text positions.
+     * See RFC822 definitions for phrase, comment and text positions,
+     * and RFC2047 for inline encodings.
      *
      * @param string $str      The header value to encode
      * @param string $position What context the string will be used in
@@ -3520,6 +3586,11 @@ class PHPMailer
      */
     public function encodeHeader($str, $position = 'text')
     {
+        $position = strtolower($position);
+        if ($this->UseSMTPUTF8 && !("comment" === $position)) {
+            return trim(static::normalizeBreaks($str));
+        }
+
         $matchcount = 0;
         switch (strtolower($position)) {
             case 'phrase':
@@ -3634,7 +3705,7 @@ class PHPMailer
      * without breaking lines within a character.
      * Adapted from a function by paravoid.
      *
-     * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @see https://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
      *
      * @param string $str       multi-byte text to wrap encode
      * @param string $linebreak string to use as linefeed/end-of-line
@@ -3690,7 +3761,7 @@ class PHPMailer
     /**
      * Encode a string using Q encoding.
      *
-     * @see http://tools.ietf.org/html/rfc2047#section-4.2
+     * @see https://www.rfc-editor.org/rfc/rfc2047#section-4.2
      *
      * @param string $str      the text to encode
      * @param string $position Where the text is going to be used, see the RFC for what that means
@@ -4184,7 +4255,7 @@ class PHPMailer
         if ('smtp' === $this->Mailer && null !== $this->smtp) {
             $lasterror = $this->smtp->getError();
             if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                $msg .= ' ' . $this->lang('smtp_error') . $lasterror['error'];
                 if (!empty($lasterror['detail'])) {
                     $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
                 }
@@ -4228,7 +4299,7 @@ class PHPMailer
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();
-        } elseif (php_uname('n') !== false) {
+        } elseif (php_uname('n') !== '') {
             $result = php_uname('n');
         }
         if (!static::isValidHost($result)) {
@@ -4253,7 +4324,7 @@ class PHPMailer
             empty($host)
             || !is_string($host)
             || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
+            || !preg_match('/^([a-z\d.-]*|\[[a-f\d:]+\])$/i', $host)
         ) {
             return false;
         }
@@ -4267,10 +4338,49 @@ class PHPMailer
             //Is it a valid IPv4 address?
             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
         }
-        //Is it a syntactically valid hostname (when embeded in a URL)?
-        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
+        //Is it a syntactically valid hostname (when embedded in a URL)?
+        return filter_var('https://' . $host, FILTER_VALIDATE_URL) !== false;
     }
 
+    /**
+     * Check whether the supplied address uses Unicode in the local part.
+     *
+     * @return bool
+     */
+    protected function addressHasUnicodeLocalPart($address)
+    {
+        return (bool) preg_match('/[\x80-\xFF].*@/', $address);
+    }
+
+    /**
+     * Check whether any of the supplied addresses use Unicode in the local part.
+     *
+     * @return bool
+     */
+    protected function anyAddressHasUnicodeLocalPart($addresses)
+    {
+        foreach ($addresses as $address) {
+            if (is_array($address)) {
+                $address = $address[0];
+            }
+            if ($this->addressHasUnicodeLocalPart($address)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check whether the message requires SMTPUTF8 based on what's known so far.
+     *
+     * @return bool
+     */
+    public function needsSMTPUTF8()
+    {
+        return $this->UseSMTPUTF8;
+    }
+
+
     /**
      * Get an error message in the current language.
      *
@@ -4679,7 +4789,7 @@ class PHPMailer
      * Multi-byte-safe pathinfo replacement.
      * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
      *
-     * @see http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @see https://www.php.net/manual/en/function.pathinfo.php#107461
      *
      * @param string     $path    A filename or path, does not need to exist as a file
      * @param int|string $options Either a PATHINFO_* constant,
@@ -4914,7 +5024,7 @@ class PHPMailer
      * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
      * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
      *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
+     * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.2
      *
      * @param string $signHeader Header
      *
@@ -4926,7 +5036,7 @@ class PHPMailer
         $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
         //Unfold header lines
         //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
-        //@see https://tools.ietf.org/html/rfc5322#section-2.2
+        //@see https://www.rfc-editor.org/rfc/rfc5322#section-2.2
         //That means this may break if you do something daft like put vertical tabs in your headers.
         $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
         //Break headers out into an array
@@ -4958,7 +5068,7 @@ class PHPMailer
      * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
      * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
      *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
+     * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.3
      *
      * @param string $body Message Body
      *
@@ -4994,7 +5104,7 @@ class PHPMailer
         $DKIMquery = 'dns/txt'; //Query method
         $DKIMtime = time();
         //Always sign these headers without being asked
-        //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
+        //Recommended list from https://www.rfc-editor.org/rfc/rfc6376#section-5.4.1
         $autoSignHeaders = [
             'from',
             'to',
@@ -5100,7 +5210,7 @@ class PHPMailer
         }
         //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
         //which is appended after calculating the signature
-        //https://tools.ietf.org/html/rfc6376#section-3.5
+        //https://www.rfc-editor.org/rfc/rfc6376#section-3.5
         $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
             ' d=' . $this->DKIM_domain . ';' .
             ' s=' . $this->DKIM_selector . ';' . static::$LE .
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
index 7b25fdd7..1190a1e2 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * Default POP3 port number.
@@ -250,7 +250,9 @@ class POP3
 
         //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
         //Rather than suppress it with @fsockopen, capture it cleanly instead
-        set_error_handler([$this, 'catchWarning']);
+        set_error_handler(function () {
+            call_user_func_array([$this, 'catchWarning'], func_get_args());
+        });
 
         if (false === $port) {
             $port = static::DEFAULT_PORT;
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
index 1b5b0077..7226ee93 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * SMTP line break constant.
@@ -62,7 +62,7 @@ class SMTP
      * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
      * *excluding* a trailing CRLF break.
      *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
+     * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
      *
      * @var int
      */
@@ -72,7 +72,7 @@ class SMTP
      * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
      * *including* a trailing CRLF line break.
      *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
+     * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
      *
      * @var int
      */
@@ -152,19 +152,28 @@ class SMTP
     /**
      * Whether to use VERP.
      *
-     * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @see http://www.postfix.org/VERP_README.html Info on VERP
+     * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @see https://www.postfix.org/VERP_README.html Info on VERP
      *
      * @var bool
      */
     public $do_verp = false;
 
+    /**
+     * Whether to use SMTPUTF8.
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc6531
+     *
+     * @var bool
+     */
+    public $do_smtputf8 = false;
+
     /**
      * The timeout value for connection, in seconds.
      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
      * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
      *
-     * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @see https://www.rfc-editor.org/rfc/rfc2821#section-4.5.3.2
      *
      * @var int
      */
@@ -187,12 +196,12 @@ class SMTP
      */
     protected $smtp_transaction_id_patterns = [
         'exim' => '/[\d]{3} OK id=(.*)/',
-        'sendmail' => '/[\d]{3} 2.0.0 (.*) Message/',
-        'postfix' => '/[\d]{3} 2.0.0 Ok: queued as (.*)/',
-        'Microsoft_ESMTP' => '/[0-9]{3} 2.[\d].0 (.*)@(?:.*) Queued mail for delivery/',
+        'sendmail' => '/[\d]{3} 2\.0\.0 (.*) Message/',
+        'postfix' => '/[\d]{3} 2\.0\.0 Ok: queued as (.*)/',
+        'Microsoft_ESMTP' => '/[0-9]{3} 2\.[\d]\.0 (.*)@(?:.*) Queued mail for delivery/',
         'Amazon_SES' => '/[\d]{3} Ok (.*)/',
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
-        'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
+        'CampaignMonitor' => '/[\d]{3} 2\.0\.0 OK:([a-zA-Z\d]{48})/',
         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
         'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
         'Mailjet' => '/[\d]{3} OK queued as (.*)/',
@@ -280,7 +289,8 @@ class SMTP
         }
         //Is this a PSR-3 logger?
         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-            $this->Debugoutput->debug($str);
+            //Remove trailing line breaks potentially added by calls to SMTP::client_send()
+            $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
             return;
         }
@@ -293,6 +303,7 @@ class SMTP
         switch ($this->Debugoutput) {
             case 'error_log':
                 //Don't output, just log
+                /** @noinspection ForgottenDebugOutputInspection */
                 error_log($str);
                 break;
             case 'html':
@@ -371,7 +382,7 @@ class SMTP
         }
         //Anything other than a 220 response means something went wrong
         //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
-        //https://tools.ietf.org/html/rfc5321#section-3.1
+        //https://www.rfc-editor.org/rfc/rfc5321#section-3.1
         if ($responseCode === 554) {
             $this->quit();
         }
@@ -404,7 +415,9 @@ class SMTP
         $errstr = '';
         if ($streamok) {
             $socket_context = stream_context_create($options);
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $connection = stream_socket_client(
                 $host . ':' . $port,
                 $errno,
@@ -419,7 +432,9 @@ class SMTP
                 'Connection: stream_socket_client not available, falling back to fsockopen',
                 self::DEBUG_CONNECTION
             );
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $connection = fsockopen(
                 $host,
                 $port,
@@ -483,7 +498,9 @@ class SMTP
         }
 
         //Begin encrypted connection
-        set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
         $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
             true,
@@ -574,7 +591,7 @@ class SMTP
                 }
                 //Send encoded username and password
                 if (
-                    //Format from https://tools.ietf.org/html/rfc4616#section-2
+                    //Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
                     //We skip the first field (it's forgery), so the string starts with a null byte
                     !$this->sendCommand(
                         'User & Password',
@@ -648,7 +665,7 @@ class SMTP
         }
 
         //The following borrowed from
-        //http://php.net/manual/en/function.mhash.php#27225
+        //https://www.php.net/manual/en/function.mhash.php#27225
 
         //RFC 2104 HMAC implementation for php.
         //Creates an md5 HMAC.
@@ -787,7 +804,7 @@ class SMTP
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
                 //Dot-stuffing as per RFC5321 section 4.5.2
-                //https://tools.ietf.org/html/rfc5321#section-4.5.2
+                //https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
                 if (!empty($line_out) && $line_out[0] === '.') {
                     $line_out = '.' . $line_out;
                 }
@@ -905,7 +922,15 @@ class SMTP
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more recipient
      * commands may be called followed by a data command.
-     * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF>.
+     * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF> and
+     * two extensions, namely XVERP and SMTPUTF8.
+     *
+     * The server's EHLO response is not checked. If use of either
+     * extensions is enabled even though the server does not support
+     * that, mail submission will fail.
+     *
+     * XVERP is documented at https://www.postfix.org/VERP_README.html
+     * and SMTPUTF8 is specified in RFC 6531.
      *
      * @param string $from Source address of this message
      *
@@ -914,10 +939,11 @@ class SMTP
     public function mail($from)
     {
         $useVerp = ($this->do_verp ? ' XVERP' : '');
+        $useSmtputf8 = ($this->do_smtputf8 ? ' SMTPUTF8' : '');
 
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<' . $from . '>' . $useSmtputf8 . $useVerp,
             250
         );
     }
@@ -1162,7 +1188,9 @@ class SMTP
         } else {
             $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
         }
-        set_error_handler([$this, 'errorHandler']);
+        set_error_handler(function () {
+            call_user_func_array([$this, 'errorHandler'], func_get_args());
+        });
         $result = fwrite($this->smtp_conn, $data);
         restore_error_handler();
 
@@ -1265,7 +1293,9 @@ class SMTP
         while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
             //Must pass vars in here as params are by reference
             //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $n = stream_select($selR, $selW, $selW, $this->Timelimit);
             restore_error_handler();
 
@@ -1352,6 +1382,26 @@ class SMTP
         return $this->do_verp;
     }
 
+    /**
+     * Enable or disable use of SMTPUTF8.
+     *
+     * @param bool $enabled
+     */
+    public function setSMTPUTF8($enabled = false)
+    {
+        $this->do_smtputf8 = $enabled;
+    }
+
+    /**
+     * Get SMTPUTF8 use.
+     *
+     * @return bool
+     */
+    public function getSMTPUTF8()
+    {
+        return $this->do_smtputf8;
+    }
+
     /**
      * Set error messages and codes.
      *

From b39ab36cee46dfd59f41e9fda3d4c152ff156540 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 29 Jul 2025 21:23:57 +0000
Subject: [PATCH 160/161] Issue 15048: Support addon filters via API

---
 advancedcontentfilter/advancedcontentfilter.php |  9 +++++----
 langfilter/langfilter.php                       | 14 +++++++-------
 nsfw/nsfw.php                                   |  7 ++++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index aeeff77c..d19cd9df 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -120,21 +120,22 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	if (!DI::userSession()->getLocalUserId()) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (!$uid) {
 		return;
 	}
 
 	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
+	$rules = DI::cache()->get('rules_' . $uid);
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
+			['uid' => $uid, 'active' => true]
 		));
 
-		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
+		DI::cache()->set('rules_' . $uid, $rules);
 	}
 
 	if ($rules) {
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 2bf986f0..82ec244b 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -99,8 +99,8 @@ function langfilter_addon_settings_post(array &$b)
 
 function langfilter_prepare_body_content_filter(&$hook_data)
 {
-	$logged_user = DI::userSession()->getLocalUserId();
-	if (!$logged_user) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (!$uid) {
 		return;
 	}
 
@@ -112,8 +112,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	}
 
 	// Don't filter if language filter is disabled
-	if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable',
-		!DI::pConfig()->get($logged_user, 'langfilter', 'disable'))
+	if (!DI::pConfig()->get($uid, 'langfilter', 'enable',
+		!DI::pConfig()->get($uid, 'langfilter', 'disable'))
 	) {
 		return;
 	}
@@ -127,7 +127,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(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
+	$minlen = DI::pConfig()->get($uid, 'langfilter', 'minlength', 32);
 	if (!$minlen) {
 		$minlen = 32;
 	}
@@ -136,8 +136,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 		return;
 	}
 
-	$read_languages_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
-	$minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence');
+	$read_languages_string = DI::pConfig()->get($uid, 'langfilter', 'languages');
+	$minconfidence = DI::pConfig()->get($uid, 'langfilter', 'minconfidence');
 
 	// Don't filter if no spoken languages are configured
 	if (!$read_languages_string) {
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 674fc201..1479b477 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -104,12 +104,13 @@ function nsfw_addon_settings_post(array &$b)
 function nsfw_prepare_body_content_filter(&$hook_data)
 {
 	$words = null;
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable')) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
 		return;
 	}
 
-	if (DI::userSession()->getLocalUserId()) {
-		$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words');
+	if ($uid) {
+		$words = DI::pConfig()->get($uid, 'nsfw', 'words');
 	}
 
 	if ($words) {

From 1cc54a83a9192db34466771984d80945234cd837 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 4 Aug 2025 20:48:06 +0000
Subject: [PATCH 161/161] Fix several warnings

---
 advancedcontentfilter/advancedcontentfilter.php | 2 +-
 langfilter/langfilter.php                       | 2 +-
 nsfw/nsfw.php                                   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index d19cd9df..53cb9ebe 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -120,7 +120,7 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (!$uid) {
 		return;
 	}
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 82ec244b..3a202fcd 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -99,7 +99,7 @@ function langfilter_addon_settings_post(array &$b)
 
 function langfilter_prepare_body_content_filter(&$hook_data)
 {
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (!$uid) {
 		return;
 	}
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 1479b477..37d34d7d 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -104,7 +104,7 @@ function nsfw_addon_settings_post(array &$b)
 function nsfw_prepare_body_content_filter(&$hook_data)
 {
 	$words = null;
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
 		return;
 	}
@@ -137,10 +137,10 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 					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;
 			}