", $text);
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 0c73df9091..b86b3e9b1c 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -7,7 +7,6 @@
namespace Friendica\Content;
-use Friendica\Core\Addon;
use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
@@ -33,13 +32,13 @@ class Widget
*/
public static function follow(string $value = ''): string
{
- return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/follow.tpl'), array(
+ return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/follow.tpl'), [
'$connect' => DI::l10n()->t('Add New Contact'),
- '$desc' => DI::l10n()->t('Enter address or web location'),
- '$hint' => DI::l10n()->t('Example: bob@example.com, http://example.com/barbara'),
- '$value' => $value,
- '$follow' => DI::l10n()->t('Connect')
- ));
+ '$desc' => DI::l10n()->t('Enter address or web location'),
+ '$hint' => DI::l10n()->t('Example: bob@example.com, http://example.com/barbara'),
+ '$value' => $value,
+ '$follow' => DI::l10n()->t('Connect')
+ ]);
}
/**
@@ -60,21 +59,21 @@ class Widget
}
}
- $nv = [];
- $nv['findpeople'] = DI::l10n()->t('Find People');
- $nv['desc'] = DI::l10n()->t('Enter name or interest');
- $nv['label'] = DI::l10n()->t('Connect/Follow');
- $nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
- $nv['findthem'] = DI::l10n()->t('Find');
- $nv['suggest'] = DI::l10n()->t('Friend Suggestions');
- $nv['similar'] = DI::l10n()->t('Similar Interests');
- $nv['random'] = DI::l10n()->t('Random Profile');
- $nv['inv'] = DI::l10n()->t('Invite Friends');
- $nv['directory'] = DI::l10n()->t('Global Directory');
- $nv['global_dir'] = OpenWebAuth::getZrlUrl($global_dir, true);
+ $nv = [];
+ $nv['findpeople'] = DI::l10n()->t('Find People');
+ $nv['desc'] = DI::l10n()->t('Enter name or interest');
+ $nv['label'] = DI::l10n()->t('Connect/Follow');
+ $nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
+ $nv['findthem'] = DI::l10n()->t('Find');
+ $nv['suggest'] = DI::l10n()->t('Friend Suggestions');
+ $nv['similar'] = DI::l10n()->t('Similar Interests');
+ $nv['random'] = DI::l10n()->t('Random Profile');
+ $nv['inv'] = DI::l10n()->t('Invite Friends');
+ $nv['directory'] = DI::l10n()->t('Global Directory');
+ $nv['global_dir'] = OpenWebAuth::getZrlUrl($global_dir, true);
$nv['local_directory'] = DI::l10n()->t('Local Directory');
- $aside = [];
+ $aside = [];
$aside['$nv'] = $nv;
return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/peoplefind.tpl'), $aside);
@@ -87,19 +86,21 @@ class Widget
*/
public static function unavailableNetworks(): array
{
+ $addonHelper = DI::addonHelper();
+
// Always hide content from these networks
$networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::TWITTER, Protocol::ZOT, Protocol::OSTATUS, Protocol::STATUSNET];
- Addon::loadAddons();
+ $addonHelper->loadAddons();
- if (!Addon::isEnabled('discourse')) {
+ if (!$addonHelper->isAddonEnabled('discourse')) {
$networks[] = Protocol::DISCOURSE;
}
- if (!Addon::isEnabled('pumpio')) {
+ if (!$addonHelper->isAddonEnabled('pumpio')) {
$networks[] = Protocol::PUMPIO;
}
- if (!Addon::isEnabled('tumblr')) {
+ if (!$addonHelper->isAddonEnabled('tumblr')) {
$networks[] = Protocol::TUMBLR;
}
@@ -107,7 +108,7 @@ class Widget
$networks[] = Protocol::DIASPORA;
}
- if (!Addon::isEnabled('pnut')) {
+ if (!$addonHelper->isAddonEnabled('pnut')) {
$networks[] = Protocol::PNUT;
}
return $networks;
@@ -120,18 +121,20 @@ class Widget
*/
public static function availableNetworks(): array
{
- $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::FEED];
- Addon::loadAddons();
+ $addonHelper = DI::addonHelper();
- if (Addon::isEnabled('discourse')) {
+ $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::FEED];
+ $addonHelper->loadAddons();
+
+ if ($addonHelper->isAddonEnabled('discourse')) {
$networks[] = Protocol::DISCOURSE;
}
- if (Addon::isEnabled('pumpio')) {
+ if ($addonHelper->isAddonEnabled('pumpio')) {
$networks[] = Protocol::PUMPIO;
}
- if (Addon::isEnabled('tumblr')) {
+ if ($addonHelper->isAddonEnabled('tumblr')) {
$networks[] = Protocol::TUMBLR;
}
@@ -143,7 +146,7 @@ class Widget
$networks[] = Protocol::MAIL;
}
- if (Addon::isEnabled('pnut')) {
+ if ($addonHelper->isAddonEnabled('pnut')) {
$networks[] = Protocol::PNUT;
}
return $networks;
@@ -174,7 +177,7 @@ class Widget
private static function filter(string $type, string $title, string $desc, string $all, string $baseUrl, array $options, string $selected = null): string
{
$queryString = parse_url($baseUrl, PHP_URL_QUERY);
- $queryArray = [];
+ $queryArray = [];
if ($queryString) {
parse_str($queryString, $queryArray);
@@ -282,8 +285,8 @@ class Widget
return '';
}
- $networks = self::unavailableNetworks();
- $query = "`uid` = ? AND NOT `deleted` AND `network` != '' AND NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")";
+ $networks = self::unavailableNetworks();
+ $query = "`uid` = ? AND NOT `deleted` AND `network` != '' AND NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")";
$condition = array_merge([$query], array_merge([DI::userSession()->getLocalUserId()], $networks));
$r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]);
@@ -473,7 +476,7 @@ class Widget
$ret = [];
$cachekey = 'Widget::postedByYear' . $uid . '-' . (int)$wall;
- $dthen = DI::cache()->get($cachekey);
+ $dthen = DI::cache()->get($cachekey);
if (empty($dthen)) {
$dthen = Item::firstPostDate($uid, $wall);
DI::cache()->set($cachekey, $dthen, Duration::HOUR);
@@ -486,30 +489,30 @@ class Widget
if ($dthen) {
// Set the start and end date to the beginning of the month
$cutoffday = $dthen;
- $thisday = substr($dnow, 4);
- $nextday = date('Y-m-d', strtotime($dnow . ' + 1 day'));
- $nextday = substr($nextday, 4);
- $dnow = substr($dnow, 0, 8) . '01';
- $dthen = substr($dthen, 0, 8) . '01';
+ $thisday = substr($dnow, 4);
+ $nextday = date('Y-m-d', strtotime($dnow . ' + 1 day'));
+ $nextday = substr($nextday, 4);
+ $dnow = substr($dnow, 0, 8) . '01';
+ $dthen = substr($dthen, 0, 8) . '01';
/*
* Starting with the current month, get the first and last days of every
* month down to and including the month of the first post
*/
while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
- $dyear = intval(substr($dnow, 0, 4));
- $dstart = substr($dnow, 0, 8) . '01';
- $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
+ $dyear = intval(substr($dnow, 0, 4));
+ $dstart = substr($dnow, 0, 8) . '01';
+ $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
- $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
- $str = DI::l10n()->getDay(DateTimeFormat::utc($dnow, 'F'));
+ $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
+ $str = DI::l10n()->getDay(DateTimeFormat::utc($dnow, 'F'));
if (empty($ret[$dyear])) {
$ret[$dyear] = [];
}
$ret[$dyear][] = [$str, $end_month, $start_month];
- $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
+ $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
}
}
@@ -518,21 +521,21 @@ class Widget
}
$cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
- $cutoff = array_key_exists($cutoff_year, $ret);
+ $cutoff = array_key_exists($cutoff_year, $ret);
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'), [
- '$title' => DI::l10n()->t('Archives'),
- '$size' => $visible_years,
+ '$title' => DI::l10n()->t('Archives'),
+ '$size' => $visible_years,
'$cutoff_year' => $cutoff_year,
- '$cutoff' => $cutoff,
- '$url' => $url,
- '$dates' => $ret,
- '$showless' => DI::l10n()->t('show less'),
- '$showmore' => DI::l10n()->t('show more'),
- '$onthisdate' => DI::l10n()->t('On this date'),
- '$thisday' => $thisday,
- '$nextday' => $nextday,
- '$cutoffday' => $cutoffday
+ '$cutoff' => $cutoff,
+ '$url' => $url,
+ '$dates' => $ret,
+ '$showless' => DI::l10n()->t('show less'),
+ '$showmore' => DI::l10n()->t('show more'),
+ '$onthisdate' => DI::l10n()->t('On this date'),
+ '$thisday' => $thisday,
+ '$nextday' => $nextday,
+ '$cutoffday' => $cutoffday
]);
return $o;
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 5b162fd986..39a1737946 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -18,6 +18,9 @@ class Addon
{
/**
* The addon sub-directory
+ *
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getAddonPath()` instead
+ *
* @var string
*/
const DIRECTORY = 'addon';
@@ -34,6 +37,8 @@ class Addon
* This list is made from scanning the addon/ folder.
* Unsupported addons are excluded unless they already are enabled or system.show_unsupported_addon is set.
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getAvailableAddons()` instead
+ *
* @return array
* @throws \Exception
*/
@@ -64,6 +69,8 @@ class Addon
* Returns a list of addons that can be configured at the node level.
* The list is formatted for display in the admin panel aside.
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getEnabledAddonsWithAdminSettings()` instead
+ *
* @return array
* @throws \Exception
*/
@@ -88,7 +95,6 @@ class Addon
return $addons_admin;
}
-
/**
* Synchronize addons:
*
@@ -100,6 +106,7 @@ class Addon
* Then go through the config list and if we have a addon that isn't installed,
* call the install procedure and add it to the database.
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::loadAddons()` instead
*/
public static function loadAddons()
{
@@ -109,6 +116,8 @@ class Addon
/**
* uninstalls an addon.
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::uninstallAddon()` instead
+ *
* @param string $addon name of the addon
* @return void
* @throws \Exception
@@ -135,6 +144,8 @@ class Addon
/**
* installs an addon.
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::installAddon()` instead
+ *
* @param string $addon name of the addon
* @return bool
* @throws \Exception
@@ -173,6 +184,8 @@ class Addon
/**
* reload all updated addons
*
+ * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::reloadAddons()` instead
+ *
* @return void
* @throws \Exception
*
@@ -209,6 +222,9 @@ class Addon
* * Maintainer: Jess ' . file_get_contents("addon/$addon/README") . '';
}
+ $addons_admin = $addonHelper->getEnabledAddonsWithAdminSettings();
+
$admin_form = '';
- if (array_key_exists($addon, $addons_admin)) {
+ if (in_array($addon, $addons_admin)) {
require_once "addon/$addon/$addon.php";
$func = $addon . '_addon_admin';
$func($admin_form);
}
+ $addonInfo = $addonHelper->getAddonInfo($addon);
+
$t = Renderer::getMarkupTemplate('admin/addons/details.tpl');
return Renderer::replaceMacros($t, [
- '$title' => DI::l10n()->t('Administration'),
- '$page' => DI::l10n()->t('Addons'),
- '$toggle' => DI::l10n()->t('Toggle'),
+ '$title' => DI::l10n()->t('Administration'),
+ '$page' => DI::l10n()->t('Addons'),
+ '$toggle' => DI::l10n()->t('Toggle'),
'$settings' => DI::l10n()->t('Settings'),
- '$addon' => $addon,
+ '$addon' => $addon,
'$status' => $status,
'$action' => $action,
- '$info' => Addon::getInfo($addon),
- '$str_author' => DI::l10n()->t('Author: '),
+ '$info' => [
+ 'name' => $addonInfo->getName(),
+ 'version' => $addonInfo->getVersion(),
+ 'description' => $addonInfo->getDescription(),
+ 'author' => $addonInfo->getAuthors(),
+ 'maintainer' => $addonInfo->getMaintainers(),
+ ],
+ '$str_author' => DI::l10n()->t('Author: '),
'$str_maintainer' => DI::l10n()->t('Maintainer: '),
'$admin_form' => $admin_form,
- '$function' => 'addons',
+ '$function' => 'addons',
'$screenshot' => '',
- '$readme' => $readme,
+ '$readme' => $readme,
'$form_security_token' => self::getFormSecurityToken('admin_addons_details'),
]);
diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 8ebf1f918d..6038373018 100644
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -7,7 +7,6 @@
namespace Friendica\Module\Admin\Addons;
-use Friendica\Core\Addon;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdmin;
@@ -24,22 +23,25 @@ class Index extends BaseAdmin
{
parent::content();
+ $addonHelper = DI::addonHelper();
+
// reload active themes
if (!empty($_GET['action'])) {
self::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_addons', 't');
switch ($_GET['action']) {
case 'reload':
- Addon::reload();
+ $addonHelper->reloadAddons();
DI::sysmsg()->addInfo(DI::l10n()->t('Addons reloaded'));
break;
- case 'toggle' :
+ case 'toggle':
$addon = $_GET['addon'] ?? '';
- if (Addon::isEnabled($addon)) {
- Addon::uninstall($addon);
+
+ if ($addonHelper->isAddonEnabled($addon)) {
+ $addonHelper->uninstallAddon($addon);
DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s disabled.', $addon));
- } elseif (Addon::install($addon)) {
+ } elseif ($addonHelper->installAddon($addon)) {
DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s enabled.', $addon));
} else {
DI::sysmsg()->addNotice(DI::l10n()->t('Addon %s failed to install.', $addon));
@@ -52,18 +54,34 @@ class Index extends BaseAdmin
DI::baseUrl()->redirect('admin/addons');
}
- $addons = Addon::getAvailableList();
+ $addons = [];
+
+ foreach ($addonHelper->getAvailableAddons() as $addonId) {
+ $addonInfo = $addonHelper->getAddonInfo($addonId);
+
+ $info = [
+ 'name' => $addonInfo->getName(),
+ 'description' => $addonInfo->getDescription(),
+ 'version' => $addonInfo->getVersion(),
+ ];
+
+ $addons[] = [
+ $addonId,
+ ($addonHelper->isAddonEnabled($addonId) ? 'on' : 'off'),
+ $info,
+ ];
+ }
$t = Renderer::getMarkupTemplate('admin/addons/index.tpl');
return Renderer::replaceMacros($t, [
- '$title' => DI::l10n()->t('Administration'),
- '$page' => DI::l10n()->t('Addons'),
- '$submit' => DI::l10n()->t('Save Settings'),
- '$reload' => DI::l10n()->t('Reload active addons'),
- '$function' => 'addons',
- '$addons' => $addons,
- '$pcount' => count($addons),
- '$noplugshint' => DI::l10n()->t('There are currently no addons available on your node. You can find the official addon repository at %1$s.', 'https://git.friendi.ca/friendica/friendica-addons'),
+ '$title' => DI::l10n()->t('Administration'),
+ '$page' => DI::l10n()->t('Addons'),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$reload' => DI::l10n()->t('Reload active addons'),
+ '$function' => 'addons',
+ '$addons' => $addons,
+ '$pcount' => count($addons),
+ '$noplugshint' => DI::l10n()->t('There are currently no addons available on your node. You can find the official addon repository at %1$s.', 'https://git.friendi.ca/friendica/friendica-addons'),
'$form_security_token' => self::getFormSecurityToken('admin_addons'),
]);
}
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index f07e9720cb..282c15e4bc 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -8,7 +8,6 @@
namespace Friendica\Module\Admin;
use Friendica\App;
-use Friendica\Core\Addon;
use Friendica\Core\Config\ValueObject\Cache;
use Friendica\Core\Renderer;
use Friendica\Core\Update;
@@ -27,13 +26,14 @@ class Summary extends BaseAdmin
{
parent::content();
- $basePath = DI::appHelper()->getBasePath();
+ $basePath = DI::appHelper()->getBasePath();
+ $addonPath = DI::addonHelper()->getAddonPath();
// are there MyISAM tables in the DB? If so, trigger a warning message
$warningtext = [];
$templateEngine = Renderer::getTemplateEngine();
- $errors = [];
+ $errors = [];
$templateEngine->testInstall($errors);
foreach ($errors as $error) {
$warningtext[] = DI::l10n()->t('Template engine (%s) error: %s', $templateEngine::$name, $error);
@@ -51,7 +51,7 @@ class Summary extends BaseAdmin
// Avoid the database error 1615 "Prepared statement needs to be re-prepared", see https://github.com/friendica/friendica/issues/8550
if (!DI::config()->get('database', 'pdo_emulate_prepares')) {
$table_definition_cache = DBA::getVariable('table_definition_cache');
- $table_open_cache = DBA::getVariable('table_open_cache');
+ $table_open_cache = DBA::getVariable('table_open_cache');
if (!empty($table_definition_cache) && !empty($table_open_cache)) {
$suggested_definition_cache = min(400 + round((int) $table_open_cache / 2, 1), 2000);
if ($suggested_definition_cache > $table_definition_cache) {
@@ -100,9 +100,13 @@ class Summary extends BaseAdmin
// Check server vitality
if (!self::checkSelfHostMeta()) {
- $well_known = DI::baseUrl() . Probe::HOST_META;
- $warningtext[] = DI::l10n()->t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.',
- $well_known, $well_known, DI::baseUrl() . '/help/Install');
+ $well_known = DI::baseUrl() . Probe::HOST_META;
+ $warningtext[] = DI::l10n()->t(
+ '%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.',
+ $well_known,
+ $well_known,
+ DI::baseUrl() . '/help/Install'
+ );
}
// Check logfile permission
@@ -114,8 +118,8 @@ class Summary extends BaseAdmin
}
// check legacy basepath settings
- $configLoader = (new Config())->createConfigFileManager($basePath, $_SERVER);
- $configCache = new Cache();
+ $configLoader = (new Config())->createConfigFileManager($basePath, $addonPath, $_SERVER);
+ $configCache = new Cache();
$configLoader->setupCache($configCache);
$confBasepath = $configCache->get('system', 'basepath');
$currBasepath = DI::config()->get('system', 'basepath');
@@ -125,25 +129,31 @@ class Summary extends BaseAdmin
'from' => $currBasepath,
'to' => $confBasepath,
]);
- $warningtext[] = DI::l10n()->t('Friendica\'s system.basepath was updated from \'%s\' to \'%s\'. Please remove the system.basepath from your db to avoid differences.',
+ $warningtext[] = DI::l10n()->t(
+ 'Friendica\'s system.basepath was updated from \'%s\' to \'%s\'. Please remove the system.basepath from your db to avoid differences.',
$currBasepath,
- $confBasepath);
+ $confBasepath
+ );
} elseif (!is_dir($currBasepath)) {
DI::logger()->alert('Friendica\'s system.basepath is wrong.', [
'from' => $currBasepath,
'to' => $confBasepath,
]);
- $warningtext[] = DI::l10n()->t('Friendica\'s current system.basepath \'%s\' is wrong and the config file \'%s\' isn\'t used.',
+ $warningtext[] = DI::l10n()->t(
+ 'Friendica\'s current system.basepath \'%s\' is wrong and the config file \'%s\' isn\'t used.',
$currBasepath,
- $confBasepath);
+ $confBasepath
+ );
} else {
DI::logger()->alert('Friendica\'s system.basepath is wrong.', [
'from' => $currBasepath,
'to' => $confBasepath,
]);
- $warningtext[] = DI::l10n()->t('Friendica\'s current system.basepath \'%s\' is not equal to the config file \'%s\'. Please fix your configuration.',
+ $warningtext[] = DI::l10n()->t(
+ 'Friendica\'s current system.basepath \'%s\' is not equal to the config file \'%s\'. Please fix your configuration.',
$currBasepath,
- $confBasepath);
+ $confBasepath
+ );
}
}
@@ -177,7 +187,7 @@ class Summary extends BaseAdmin
'$platform' => App::PLATFORM,
'$codename' => App::CODENAME,
'$build' => DI::config()->get('system', 'build'),
- '$addons' => [DI::l10n()->t('Active addons'), Addon::getEnabledList()],
+ '$addons' => [DI::l10n()->t('Active addons'), DI::addonHelper()->getEnabledAddons()],
'$serversettings' => $server_settings,
'$warningtext' => $warningtext,
]);
diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php
index 3d1188395f..ea03efd2a9 100644
--- a/src/Module/BaseAdmin.php
+++ b/src/Module/BaseAdmin.php
@@ -8,7 +8,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\Addon;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Network\HTTPException;
@@ -69,43 +68,53 @@ abstract class BaseAdmin extends BaseModule
// not part of $aside to make the template more adjustable
$aside_sub = [
'information' => [DI::l10n()->t('Information'), [
- 'overview' => ['admin' , DI::l10n()->t('Overview') , 'overview'],
- 'federation' => ['admin/federation' , DI::l10n()->t('Federation Statistics') , 'federation']
+ 'overview' => ['admin' , DI::l10n()->t('Overview') , 'overview'],
+ 'federation' => ['admin/federation' , DI::l10n()->t('Federation Statistics') , 'federation']
]],
'configuration' => [DI::l10n()->t('Configuration'), [
- 'site' => ['admin/site' , DI::l10n()->t('Site') , 'site'],
- 'storage' => ['admin/storage' , DI::l10n()->t('Storage') , 'storage'],
- 'addons' => ['admin/addons' , DI::l10n()->t('Addons') , 'addons'],
- 'themes' => ['admin/themes' , DI::l10n()->t('Themes') , 'themes'],
- 'features' => ['admin/features' , DI::l10n()->t('Additional features') , 'features'],
- 'tos' => ['admin/tos' , DI::l10n()->t('Terms of Service') , 'tos'],
+ 'site' => ['admin/site' , DI::l10n()->t('Site') , 'site'],
+ 'storage' => ['admin/storage' , DI::l10n()->t('Storage') , 'storage'],
+ 'addons' => ['admin/addons' , DI::l10n()->t('Addons') , 'addons'],
+ 'themes' => ['admin/themes' , DI::l10n()->t('Themes') , 'themes'],
+ 'features' => ['admin/features' , DI::l10n()->t('Additional features') , 'features'],
+ 'tos' => ['admin/tos' , DI::l10n()->t('Terms of Service') , 'tos'],
]],
'database' => [DI::l10n()->t('Database'), [
- 'dbsync' => ['admin/dbsync' , DI::l10n()->t('DB updates') , 'dbsync'],
- 'deferred' => ['admin/queue/deferred', DI::l10n()->t('Inspect Deferred Workers'), 'deferred'],
- 'workerqueue' => ['admin/queue' , DI::l10n()->t('Inspect worker Queue') , 'workerqueue'],
+ 'dbsync' => ['admin/dbsync' , DI::l10n()->t('DB updates') , 'dbsync'],
+ 'deferred' => ['admin/queue/deferred', DI::l10n()->t('Inspect Deferred Workers'), 'deferred'],
+ 'workerqueue' => ['admin/queue' , DI::l10n()->t('Inspect worker Queue') , 'workerqueue'],
]],
'logs' => [DI::l10n()->t('Logs'), [
- 'logsconfig' => ['admin/logs/', DI::l10n()->t('Logs') , 'logs'],
- 'logsview' => ['admin/logs/view' , DI::l10n()->t('View Logs') , 'viewlogs'],
+ 'logsconfig' => ['admin/logs/', DI::l10n()->t('Logs') , 'logs'],
+ 'logsview' => ['admin/logs/view' , DI::l10n()->t('View Logs') , 'viewlogs'],
]],
'diagnostics' => [DI::l10n()->t('Diagnostics'), [
- 'phpinfo' => ['admin/phpinfo?t=' . self::getFormSecurityToken('phpinfo'), DI::l10n()->t('PHP Info') , 'phpinfo'],
- 'probe' => ['probe' , DI::l10n()->t('probe address') , 'probe'],
- 'webfinger' => ['webfinger' , DI::l10n()->t('check webfinger') , 'webfinger'],
- 'babel' => ['babel' , DI::l10n()->t('Babel') , 'babel'],
- 'debug/ap' => ['debug/ap' , DI::l10n()->t('ActivityPub Conversion') , 'debug/ap'],
+ 'phpinfo' => ['admin/phpinfo?t=' . self::getFormSecurityToken('phpinfo'), DI::l10n()->t('PHP Info') , 'phpinfo'],
+ 'probe' => ['probe' , DI::l10n()->t('probe address') , 'probe'],
+ 'webfinger' => ['webfinger' , DI::l10n()->t('check webfinger') , 'webfinger'],
+ 'babel' => ['babel' , DI::l10n()->t('Babel') , 'babel'],
+ 'debug/ap' => ['debug/ap' , DI::l10n()->t('ActivityPub Conversion') , 'debug/ap'],
]],
];
+ $addons_admin = [];
+
+ foreach (DI::addonHelper()->getEnabledAddonsWithAdminSettings() as $addonId) {
+ $addons_admin[$addonId] = [
+ 'url' => 'admin/addons/' . $addonId,
+ 'name' => $addonId,
+ 'class' => 'addon',
+ ];
+ }
+
$t = Renderer::getMarkupTemplate('admin/aside.tpl');
DI::page()['aside'] .= Renderer::replaceMacros($t, [
- '$admin' => ['addons_admin' => Addon::getAdminList()],
- '$subpages' => $aside_sub,
- '$admtxt' => DI::l10n()->t('Admin'),
+ '$admin' => ['addons_admin' => $addons_admin],
+ '$subpages' => $aside_sub,
+ '$admtxt' => DI::l10n()->t('Admin'),
'$plugadmtxt' => DI::l10n()->t('Addon Features'),
- '$h_pending' => DI::l10n()->t('User registrations waiting for confirmation'),
- '$admurl' => 'admin/'
+ '$h_pending' => DI::l10n()->t('User registrations waiting for confirmation'),
+ '$admurl' => 'admin/'
]);
return '';
diff --git a/src/Module/BaseProfile.php b/src/Module/BaseProfile.php
index 2fab793152..4a73408bc9 100644
--- a/src/Module/BaseProfile.php
+++ b/src/Module/BaseProfile.php
@@ -31,35 +31,35 @@ class BaseProfile extends BaseModule
$tabs = [
[
- 'label' => DI::l10n()->t('Profile'),
- 'url' => $baseProfileUrl . '/profile',
- 'sel' => $current == 'profile' ? 'active' : '',
- 'title' => DI::l10n()->t('Profile Details'),
- 'id' => 'profile-tab',
+ 'label' => DI::l10n()->t('Profile'),
+ 'url' => $baseProfileUrl . '/profile',
+ 'sel' => $current == 'profile' ? 'active' : '',
+ 'title' => DI::l10n()->t('Profile Details'),
+ 'id' => 'profile-tab',
'accesskey' => 'r',
],
[
- 'label' => DI::l10n()->t('Conversations'),
- 'url' => $baseProfileUrl . '/conversations',
- 'sel' => $current == 'status' ? 'active' : '',
- 'title' => DI::l10n()->t('Conversations started'),
- 'id' => 'status-tab',
+ 'label' => DI::l10n()->t('Conversations'),
+ 'url' => $baseProfileUrl . '/conversations',
+ 'sel' => $current == 'status' ? 'active' : '',
+ 'title' => DI::l10n()->t('Conversations started'),
+ 'id' => 'status-tab',
'accesskey' => 'm',
],
[
- 'label' => DI::l10n()->t('Photos'),
- 'url' => $baseProfileUrl . '/photos',
- 'sel' => $current == 'photos' ? 'active' : '',
- 'title' => DI::l10n()->t('Photo Albums'),
- 'id' => 'photo-tab',
+ 'label' => DI::l10n()->t('Photos'),
+ 'url' => $baseProfileUrl . '/photos',
+ 'sel' => $current == 'photos' ? 'active' : '',
+ 'title' => DI::l10n()->t('Photo Albums'),
+ 'id' => 'photo-tab',
'accesskey' => 'h',
],
[
- 'label' => DI::l10n()->t('Media'),
- 'url' => $baseProfileUrl . '/media',
- 'sel' => $current == 'media' ? 'active' : '',
- 'title' => DI::l10n()->t('Media'),
- 'id' => 'media-tab',
+ 'label' => DI::l10n()->t('Media'),
+ 'url' => $baseProfileUrl . '/media',
+ 'sel' => $current == 'media' ? 'active' : '',
+ 'title' => DI::l10n()->t('Media'),
+ 'id' => 'media-tab',
'accesskey' => 'd',
],
];
@@ -67,22 +67,22 @@ class BaseProfile extends BaseModule
// the calendar link for the full-featured events calendar
if ($is_owner) {
$tabs[] = [
- 'label' => DI::l10n()->t('Calendar'),
- 'url' => DI::baseUrl() . '/calendar',
- 'sel' => $current == 'calendar' ? 'active' : '',
- 'title' => DI::l10n()->t('Calendar'),
- 'id' => 'calendar-tab',
+ 'label' => DI::l10n()->t('Calendar'),
+ 'url' => DI::baseUrl() . '/calendar',
+ 'sel' => $current == 'calendar' ? 'active' : '',
+ 'title' => DI::l10n()->t('Calendar'),
+ 'id' => 'calendar-tab',
'accesskey' => 'c',
];
} else {
$owner = User::getByNickname($nickname, ['uid']);
if(DI::userSession()->isAuthenticated() || $owner && Feature::isEnabled($owner['uid'], Feature::PUBLIC_CALENDAR)) {
$tabs[] = [
- 'label' => DI::l10n()->t('Calendar'),
- 'url' => DI::baseUrl() . '/calendar/show/' . $nickname,
- 'sel' => $current == 'calendar' ? 'active' : '',
- 'title' => DI::l10n()->t('Calendar'),
- 'id' => 'calendar-tab',
+ 'label' => DI::l10n()->t('Calendar'),
+ 'url' => DI::baseUrl() . '/calendar/show/' . $nickname,
+ 'sel' => $current == 'calendar' ? 'active' : '',
+ 'title' => DI::l10n()->t('Calendar'),
+ 'id' => 'calendar-tab',
'accesskey' => 'c',
];
}
@@ -90,30 +90,30 @@ class BaseProfile extends BaseModule
if ($is_owner) {
$tabs[] = [
- 'label' => DI::l10n()->t('Personal Notes'),
- 'url' => DI::baseUrl() . '/notes',
- 'sel' => $current == 'notes' ? 'active' : '',
- 'title' => DI::l10n()->t('Only You Can See This'),
- 'id' => 'notes-tab',
+ 'label' => DI::l10n()->t('Personal Notes'),
+ 'url' => DI::baseUrl() . '/notes',
+ 'sel' => $current == 'notes' ? 'active' : '',
+ 'title' => DI::l10n()->t('Only You Can See This'),
+ 'id' => 'notes-tab',
'accesskey' => 't',
];
$tabs[] = [
- 'label' => DI::l10n()->t('Scheduled Posts'),
- 'url' => $baseProfileUrl . '/schedule',
- 'sel' => $current == 'schedule' ? 'active' : '',
- 'title' => DI::l10n()->t('Posts that are scheduled for publishing'),
- 'id' => 'schedule-tab',
+ 'label' => DI::l10n()->t('Scheduled Posts'),
+ 'url' => $baseProfileUrl . '/schedule',
+ 'sel' => $current == 'schedule' ? 'active' : '',
+ 'title' => DI::l10n()->t('Posts that are scheduled for publishing'),
+ 'id' => 'schedule-tab',
'accesskey' => 'o',
];
}
if (!$hide_friends) {
$tabs[] = [
- 'label' => DI::l10n()->t('Contacts'),
- 'url' => $baseProfileUrl . '/contacts',
- 'sel' => $current == 'contacts' ? 'active' : '',
- 'title' => DI::l10n()->t('Contacts'),
- 'id' => 'viewcontacts-tab',
+ 'label' => DI::l10n()->t('Contacts'),
+ 'url' => $baseProfileUrl . '/contacts',
+ 'sel' => $current == 'contacts' ? 'active' : '',
+ 'title' => DI::l10n()->t('Contacts'),
+ 'id' => 'viewcontacts-tab',
'accesskey' => 'k',
];
}
@@ -134,6 +134,6 @@ class BaseProfile extends BaseModule
$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
+ return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs'], '$more' => DI::l10n()->t('More')]);
}
}
diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index ca5820fb83..be7a31e341 100644
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -154,7 +154,7 @@ class BaseSettings extends BaseModule
$tabs[] = [
'label' => $this->t('Import Contacts'),
'url' => 'settings/importcontacts',
- 'selected' => static::class == Settings\UserExport::class ? 'active' : '',
+ 'selected' => static::class == Settings\ContactImport::class ? 'active' : '',
'accesskey' => '',
];
diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php
index 0a55f7ada7..9e9376d8bf 100644
--- a/src/Module/Calendar/Show.php
+++ b/src/Module/Calendar/Show.php
@@ -21,7 +21,6 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\Theme;
use Friendica\Model\Event;
use Friendica\Model\Profile;
-use Friendica\Model\User;
use Friendica\Module\BaseProfile;
use Friendica\Module\Response;
use Friendica\Module\Security\Login;
@@ -119,6 +118,8 @@ class Show extends BaseModule
'$week' => $this->t('week'),
'$day' => $this->t('day'),
'$list' => $this->t('list'),
+ '$prev' => $this->t('prev'),
+ '$next' => $this->t('next'),
]);
return $o;
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index b352648df7..e998160845 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -387,7 +387,7 @@ class Contact extends BaseModule
];
$tabs_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- $tabs_html = Renderer::replaceMacros($tabs_tpl, ['$tabs' => $tabs]);
+ $tabs_html = Renderer::replaceMacros($tabs_tpl, ['$tabs' => $tabs, '$more' => DI::l10n()->t('More')]);
switch ($rel) {
case 'followers':
@@ -534,7 +534,7 @@ class Contact extends BaseModule
}
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
+ $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs, '$more' => DI::l10n()->t('More')]);
return $tab_str;
}
diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php
index b711a58f4e..37d9b18985 100644
--- a/src/Module/Conversation/Channel.php
+++ b/src/Module/Conversation/Channel.php
@@ -95,7 +95,7 @@ class Channel extends Timeline
$tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel'));
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
+ $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs, '$more' => $this->l10n->t('More')]);
Nav::setSelected('channel');
@@ -163,7 +163,7 @@ class Channel extends Timeline
throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.'));
}
- $this->maxId = $request['last_created'] ?? $this->maxId;
+ $this->maxId = $request['last_created'] ?? $this->maxId;
$this->minId = $request['first_created'] ?? $this->minId;
}
}
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 375c86ee61..84e2179fe3 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -74,10 +74,10 @@ class Community extends Timeline
$t = Renderer::getMarkupTemplate("community.tpl");
$o = Renderer::replaceMacros($t, [
- '$content' => '',
- '$header' => '',
+ '$content' => '',
+ '$header' => '',
'$show_global_community_hint' => ($this->selectedTab == CommunityEntity::GLOBAL) && $this->config->get('system', 'show_global_community_hint'),
- '$global_community_hint' => $this->l10n->t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
+ '$global_community_hint' => $this->l10n->t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
]);
if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll')) {
@@ -88,7 +88,7 @@ class Community extends Timeline
if (!$this->raw) {
$tabs = $this->getTabArray($this->community->getTimelines($this->session->isAuthenticated()), 'community');
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
+ $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs, '$more' => $this->l10n->t('More')]);
Nav::setSelected('community');
@@ -185,7 +185,7 @@ class Community extends Timeline
}
}
- $this->maxId = $request['last_received'] ?? $this->maxId;
+ $this->maxId = $request['last_received'] ?? $this->maxId;
$this->minId = $request['first_received'] ?? $this->minId;
}
}
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index bf8b0614a9..86c2fcf736 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -192,9 +192,9 @@ class Network extends Timeline
$x = [
'lockstate' => $this->circleId || $this->network || ACL::getLockstateForUserId($this->session->getLocalUserId()) ? 'lock' : 'unlock',
- 'acl' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), true, $default_permissions),
- 'bang' => (($this->circleId || $this->network) ? '!' : ''),
- 'content' => '',
+ 'acl' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), true, $default_permissions),
+ 'bang' => (($this->circleId || $this->network) ? '!' : ''),
+ 'content' => '',
];
$o .= $this->conversation->statusEditor($x);
@@ -236,7 +236,7 @@ class Network extends Timeline
$pager = new BoundariesPager(
$this->l10n,
$this->args->getQueryString(),
- $items[0][$this->order] ?? null,
+ $items[0][$this->order] ?? null,
$items[count($items) - 1][$this->order] ?? null,
$this->itemsPerPage
);
@@ -292,7 +292,7 @@ class Network extends Timeline
$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- return Renderer::replaceMacros($tpl, ['$tabs' => $tabs]);
+ return Renderer::replaceMacros($tpl, ['$tabs' => $tabs, '$more' => $this->l10n->t('More')]);
}
protected function parseRequest(array $request)
@@ -313,23 +313,23 @@ class Network extends Timeline
if (!empty($request['star'])) {
$this->selectedTab = NetworkEntity::STAR;
- $this->star = true;
+ $this->star = true;
} else {
$this->star = $this->selectedTab == NetworkEntity::STAR;
}
if (!empty($request['mention'])) {
$this->selectedTab = NetworkEntity::MENTION;
- $this->mention = true;
+ $this->mention = true;
} else {
$this->mention = $this->selectedTab == NetworkEntity::MENTION;
}
if (!empty($request['order'])) {
$this->selectedTab = $request['order'];
- $this->order = $request['order'];
- $this->star = false;
- $this->mention = false;
+ $this->order = $request['order'];
+ $this->star = false;
+ $this->mention = false;
} elseif (in_array($this->selectedTab, [NetworkEntity::RECEIVED, NetworkEntity::STAR]) || $this->community->isTimeline($this->selectedTab)) {
$this->order = 'received';
} elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
@@ -344,7 +344,8 @@ class Network extends Timeline
// since otherwise the feed will optically jump, when some already visible thread has been updated.
if ($this->update && ($this->selectedTab == NetworkEntity::COMMENTED)) {
$this->order = 'received';
- $request['last_received'] = $request['last_commented'] ?? null;
+
+ $request['last_received'] = $request['last_commented'] ?? null;
$request['first_received'] = $request['first_commented'] ?? null;
}
@@ -361,7 +362,7 @@ class Network extends Timeline
$this->network = $request['nets'] ?? '';
$this->dateFrom = $this->parameters['from'] ?? '';
- $this->dateTo = $this->parameters['to'] ?? '';
+ $this->dateTo = $this->parameters['to'] ?? '';
$this->setMaxMinByOrder($request);
diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php
index 3e07820bec..95ad1946ad 100644
--- a/src/Module/Conversation/Timeline.php
+++ b/src/Module/Conversation/Timeline.php
@@ -150,20 +150,20 @@ class Timeline extends BaseModule
{
switch ($this->order) {
case 'received':
- $this->maxId = $request['last_received'] ?? $this->maxId;
+ $this->maxId = $request['last_received'] ?? $this->maxId;
$this->minId = $request['first_received'] ?? $this->minId;
break;
case 'created':
- $this->maxId = $request['last_created'] ?? $this->maxId;
+ $this->maxId = $request['last_created'] ?? $this->maxId;
$this->minId = $request['first_created'] ?? $this->minId;
break;
case 'uri-id':
- $this->maxId = $request['last_uriid'] ?? $this->maxId;
+ $this->maxId = $request['last_uriid'] ?? $this->maxId;
$this->minId = $request['first_uriid'] ?? $this->minId;
break;
default:
$this->order = 'commented';
- $this->maxId = $request['last_commented'] ?? $this->maxId;
+ $this->maxId = $request['last_commented'] ?? $this->maxId;
$this->minId = $request['first_commented'] ?? $this->minId;
}
}
@@ -256,8 +256,8 @@ class Timeline extends BaseModule
while (count($selected_items) < $total && ++$count < 50 && count($items) > 0) {
$maxposts = round((count($items) / $total) * $maxpostperauthor);
- $minId = $items[array_key_first($items)][$this->order];
- $maxId = $items[array_key_last($items)][$this->order];
+ $minId = $items[array_key_first($items)][$this->order];
+ $maxId = $items[array_key_last($items)][$this->order];
foreach ($items as $item) {
if (!in_array($item['owner-id'], $reduced)) {
@@ -373,9 +373,9 @@ class Timeline extends BaseModule
} elseif (is_numeric($this->selectedTab) && !empty($channel = $this->channelRepository->selectById($this->selectedTab, $uid))) {
$condition = $this->getUserChannelConditions($channel, $uid);
if (in_array($channel->circle, [-3, -4, -5])) {
- $table = SearchIndex::getSearchView();
- $condition = DBA::mergeConditions($condition, ['uid' => $uid]);
- $orders = ['-3' => 'created', '-4' => 'received', '-5' => 'commented'];
+ $table = SearchIndex::getSearchView();
+ $condition = DBA::mergeConditions($condition, ['uid' => $uid]);
+ $orders = ['-3' => 'created', '-4' => 'received', '-5' => 'commented'];
$this->order = $orders[$channel->circle];
}
}
@@ -421,10 +421,10 @@ class Timeline extends BaseModule
}
}
- $items = [];
- $fields = ['uri-id', 'owner-id', 'comments', 'activities'];
+ $items = [];
+ $fields = ['uri-id', 'owner-id', 'comments', 'activities'];
$fields[] = $this->order;
- $result = $this->database->select($table, $fields, $condition, $params);
+ $result = $this->database->select($table, $fields, $condition, $params);
if ($this->database->errorNo()) {
throw new \Exception($this->database->errorMessage(), $this->database->errorNo());
}
@@ -691,16 +691,19 @@ class Timeline extends BaseModule
$items = $this->selectItems();
$key = '';
+ $maxpostperauthor = 0;
if ($this->selectedTab == Community::LOCAL) {
$maxpostperauthor = (int)$this->config->get('system', 'max_author_posts_community_page');
- $key = 'author-id';
+ $key = 'author-id';
} elseif ($this->selectedTab == Community::GLOBAL) {
$maxpostperauthor = (int)$this->config->get('system', 'max_server_posts_community_page');
- $key = 'author-gsid';
- } else {
+ $key = 'author-gsid';
+ }
+
+ if ($maxpostperauthor === 0) {
$this->setItemsSeenByCondition([
- 'unseen' => true,
- 'uid' => $this->session->getLocalUserId(),
+ 'unseen' => true,
+ 'uid' => $this->session->getLocalUserId(),
'parent-uri-id' => array_column($items, 'uri-id')
]);
@@ -713,8 +716,8 @@ class Timeline extends BaseModule
while (count($selected_items) < $this->itemsPerPage && ++$count < 50 && count($items) > 0) {
$maxposts = round((count($items) / $this->itemsPerPage) * $maxpostperauthor);
- $minId = $items[array_key_first($items)]['received'];
- $maxId = $items[array_key_last($items)]['received'];
+ $minId = $items[array_key_first($items)]['received'];
+ $maxId = $items[array_key_last($items)]['received'];
foreach ($items as $item) {
$author_posts[$item[$key]][$item['uri-id']] = $item['received'];
@@ -799,7 +802,7 @@ class Timeline extends BaseModule
}
$items = [];
- if ($this->selectedTab == Community::LOCAL) {
+ if ($this->selectedTab == Community::LOCAL) {
$result = Post::selectOriginThread(['uri-id', 'received', 'author-id', 'author-gsid'], $condition, $params);
} else {
$result = Post::selectThreadForUser($this->session->getLocalUserId() ?: 0, ['uri-id', 'received', 'author-id', 'author-gsid'], $condition, $params);
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 20b68d4c51..63107c417a 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -56,7 +56,7 @@ class SaveTag extends BaseModule
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
echo Renderer::replaceMacros($tpl, [
- '$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
+ '$field' => ['term', $this->t("Folder:"), '', '', $filetags, $this->t('- select -')],
'$submit' => $this->t('Save'),
]);
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index cd1362b3af..1a741b890c 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -11,7 +11,7 @@ use Friendica\App;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
use Friendica\BaseModule;
-use Friendica\Core\Addon;
+use Friendica\Core\Addon\AddonHelper;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Hook;
use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
@@ -31,6 +31,7 @@ use Psr\Log\LoggerInterface;
*/
class Friendica extends BaseModule
{
+ private AddonHelper $addonHelper;
/** @var IManageConfigValues */
private $config;
/** @var IManageKeyValuePairs */
@@ -38,18 +39,19 @@ class Friendica extends BaseModule
/** @var IHandleUserSessions */
private $session;
- public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+ public function __construct(AddonHelper $addonHelper, IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
- $this->config = $config;
- $this->keyValue = $keyValue;
- $this->session = $session;
+ $this->config = $config;
+ $this->keyValue = $keyValue;
+ $this->session = $session;
+ $this->addonHelper = $addonHelper;
}
protected function content(array $request = []): string
{
- $visibleAddonList = Addon::getVisibleList();
+ $visibleAddonList = $this->addonHelper->getVisibleEnabledAddons();
if (!empty($visibleAddonList)) {
$sorted = $visibleAddonList;
@@ -83,8 +85,8 @@ class Friendica extends BaseModule
if (!empty($blockList) && ($this->config->get('blocklist', 'public') || $this->session->isAuthenticated())) {
$blocked = [
- 'title' => $this->t('On this server the following remote servers are blocked.'),
- 'header' => [
+ 'title' => $this->t('On this server the following remote servers are blocked.'),
+ 'header' => [
$this->t('Blocked domain'),
$this->t('Reason for the block'),
],
@@ -102,11 +104,13 @@ class Friendica extends BaseModule
$tpl = Renderer::getMarkupTemplate('friendica.tpl');
return Renderer::replaceMacros($tpl, [
- 'about' => $this->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+ 'about' => $this->t(
+ 'This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
'' . App::VERSION . '',
$this->baseUrl,
'' . $this->config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '',
- '' . $this->keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . ''),
+ '' . $this->keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . ''
+ ),
'friendica' => $this->t('Please visit Friendi.ca to learn more about the Friendica project.'),
'bugs' => $this->t('Bug reports and issues: please visit') . ' ' . '' . $this->t('the bugtracker at github') . '',
'info' => $this->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -148,7 +152,7 @@ class Friendica extends BaseModule
$register_policy = $register_policies[$register_policy_int];
}
- $admin = [];
+ $admin = [];
$administrator = User::getFirstAdmin(['username', 'nickname']);
if (!empty($administrator)) {
$admin = [
@@ -157,11 +161,11 @@ class Friendica extends BaseModule
];
}
- $visible_addons = Addon::getVisibleList();
+ $visible_addons = $this->addonHelper->getVisibleEnabledAddons();
$this->config->reload();
$locked_features = [];
- $featureLocks = $this->config->get('config', 'feature_lock');
+ $featureLocks = $this->config->get('config', 'feature_lock');
if (isset($featureLocks)) {
foreach ($featureLocks as $feature => $lock) {
if ($feature === 'config_loaded') {
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 80c3ff5add..966cbf47c3 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -235,22 +235,22 @@ class Install extends BaseModule
'$system_url' => $this->configCache->get('system', 'url'),
'$dbhost' => ['database-hostname',
$this->t('Database Server Name'),
- $this->configCache->get('database', 'hostname'),
+ $this->configCache->get('database', 'hostname') ? : getenv('MYSQL_HOST') ? : 'localhost',
'',
$this->t('Required')],
'$dbuser' => ['database-username',
$this->t('Database Login Name'),
- $this->configCache->get('database', 'username'),
+ $this->configCache->get('database', 'username') ? : getenv('MYSQL_USER') ? : '',
'',
$this->t('Required'),
'autofocus'],
'$dbpass' => ['database-password',
$this->t('Database Login Password'),
- $this->configCache->get('database', 'password'),
+ $this->configCache->get('database', 'password') ? : getenv('MYSQL_PASSWORD') ? : '',
$this->t("For security reasons the password must not be empty"),
$this->t('Required')],
'$dbdata' => ['database-database',
- $this->t('Database Name'),
+ $this->t('Database Name') ? : getenv('MYSQL_DATABASE') ? : '',
$this->configCache->get('database', 'database'),
'',
$this->t('Required')],
diff --git a/src/Module/Moderation/BaseUsers.php b/src/Module/Moderation/BaseUsers.php
index 0123ce5bc8..fcf4b4aa16 100644
--- a/src/Module/Moderation/BaseUsers.php
+++ b/src/Module/Moderation/BaseUsers.php
@@ -99,7 +99,7 @@ abstract class BaseUsers extends BaseModeration
Hook::callAll('moderation_users_tabs', $tabs_arr);
$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- return Renderer::replaceMacros($tpl, ['$tabs' => $tabs_arr['tabs']]);
+ return Renderer::replaceMacros($tpl, ['$tabs' => $tabs_arr['tabs'], '$more' => $this->t('More')]);
}
protected function setupUserCallback(): \Closure
diff --git a/src/Module/Moderation/Users/Active.php b/src/Module/Moderation/Users/Active.php
index 1b11685f64..7d1f61c7a7 100644
--- a/src/Module/Moderation/Users/Active.php
+++ b/src/Module/Moderation/Users/Active.php
@@ -124,8 +124,8 @@ class Active extends BaseUsers
*/
private function processGetActions(): void
{
- $action = (string)$this->parameters['action'] ?? '';
- $uid = (int)$this->parameters['uid'] ?? 0;
+ $action = (string) ($this->parameters['action'] ?? '');
+ $uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@@ -150,6 +150,7 @@ class Active extends BaseUsers
}
$this->baseUrl->redirect('moderation/users/active');
+ // no break
case 'block':
self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
User::block($uid);
diff --git a/src/Module/Moderation/Users/Blocked.php b/src/Module/Moderation/Users/Blocked.php
index fbdbc8d8c7..04230dbd8a 100644
--- a/src/Module/Moderation/Users/Blocked.php
+++ b/src/Module/Moderation/Users/Blocked.php
@@ -123,8 +123,8 @@ class Blocked extends BaseUsers
*/
private function processGetActions(): void
{
- $action = (string)$this->parameters['action'] ?? '';
- $uid = (int)$this->parameters['uid'] ?? 0;
+ $action = (string) ($this->parameters['action'] ?? '');
+ $uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@@ -148,6 +148,7 @@ class Blocked extends BaseUsers
$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
}
$this->baseUrl->redirect('moderation/users/blocked');
+ // no break
case 'unblock':
self::checkFormSecurityTokenRedirectOnError('/moderation/users/blocked', 'moderation_users_blocked', 't');
User::block($uid, false);
diff --git a/src/Module/Moderation/Users/Index.php b/src/Module/Moderation/Users/Index.php
index 7d195c1096..6162e7b58f 100644
--- a/src/Module/Moderation/Users/Index.php
+++ b/src/Module/Moderation/Users/Index.php
@@ -135,8 +135,8 @@ class Index extends BaseUsers
*/
private function processGetActions(): void
{
- $action = (string) $this->parameters['action'] ?? '';
- $uid = (int) $this->parameters['uid'] ?? 0;
+ $action = (string) ($this->parameters['action'] ?? '');
+ $uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@@ -161,11 +161,13 @@ class Index extends BaseUsers
}
$this->baseUrl->redirect('moderation/users');
+ // no break
case 'block':
self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
User::block($uid);
$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
$this->baseUrl->redirect('moderation/users');
+ // no break
case 'unblock':
self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
User::block($uid, false);
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 683d4e0ea6..1cea2ba9a4 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -148,8 +148,8 @@ class Register extends BaseModule
'$fillext' => $fillext,
'$oidlabel' => $oidlabel,
'$openid' => $openid_url,
- '$namelabel' => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system'),
- '$addrlabel' => DI::l10n()->t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
+ '$namelabel' => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system):'),
+ '$addrlabel' => DI::l10n()->t('Your Email Address (initial information will be sent there, so this must be a valid address):'),
'$addrlabel2' => DI::l10n()->t('Please repeat your e-mail address:'),
'$ask_password' => $ask_password,
'$password1' => ['password1', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Leave empty for an auto generated password.')],
diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php
index 6aee2f99d7..85ee2ccefa 100644
--- a/src/Module/Settings/Channels.php
+++ b/src/Module/Settings/Channels.php
@@ -127,7 +127,7 @@ class Channels extends BaseSettings
throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
}
- $user = User::getById($uid, ['account-type']);
+ $user = User::getById($uid, ['account-type']);
$account_type = $user['account-type'];
if (in_array($account_type, [User::ACCOUNT_TYPE_COMMUNITY, User::ACCOUNT_TYPE_RELAY])) {
@@ -151,7 +151,7 @@ class Channels extends BaseSettings
$circles[$circle['id']] = $circle['name'];
}
- $languages = $this->l10n->getLanguageCodes(true);
+ $languages = $this->l10n->getLanguageCodes(true);
$channel_languages = User::getWantedLanguages($uid);
$channels = [];
@@ -185,7 +185,7 @@ class Channels extends BaseSettings
'image' => ["image[$channel->code]", $this->t("Images"), $channel->mediaType & 1],
'video' => ["video[$channel->code]", $this->t("Videos"), $channel->mediaType & 2],
'audio' => ["audio[$channel->code]", $this->t("Audio"), $channel->mediaType & 4],
- 'languages' => ["languages[$channel->code][]", $this->t('Languages'), $channel->languages ?? $channel_languages, $this->t('Select all languages that you want to see in this channel.'), $languages, 'multiple'],
+ 'languages' => ["languages[$channel->code][]", $this->t('Languages'), $channel->languages ?? $channel_languages, $this->t('Select all languages that you want to see in this channel. "Unspecified" describes all posts for which no language information was detected (e.g. posts with just an image or too little text to be sure of the language). If you want to see all languages, you will need to select all items in the list.'), $languages, 'multiple'],
'publish' => $publish,
'delete' => ["delete[$channel->code]", $this->t("Delete channel") . ' (' . $channel->label . ')', false, $this->t("Check to delete this entry from the channel list")]
];
diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index b918dfa9db..97c163cea6 100644
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -103,13 +103,7 @@ class Display extends BaseSettings
$show_page_drop = (bool)$request['show_page_drop'];
$display_eventlist = (bool)$request['display_eventlist'];
$preview_mode = (int)$request['preview_mode'];
- $browser_update = (int)$request['browser_update'];
- if ($browser_update != -1) {
- $browser_update = $browser_update * 1000;
- if ($browser_update < 10000) {
- $browser_update = 10000;
- }
- }
+ $update_content = (int)$request['update_content'];
$enabled_timelines = [];
foreach ($enable as $code => $enabled) {
@@ -144,7 +138,7 @@ class Display extends BaseSettings
$this->pConfig->set($uid, 'system', 'itemspage_network', $itemspage_network);
$this->pConfig->set($uid, 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
- $this->pConfig->set($uid, 'system', 'update_interval', $browser_update);
+ $this->pConfig->set($uid, 'system', 'update_content', $update_content);
$this->pConfig->set($uid, 'system', 'no_smilies', !$enable_smile);
$this->pConfig->set($uid, 'system', 'infinite_scroll', $infinite_scroll);
$this->pConfig->set($uid, 'system', 'no_smart_threading', !$enable_smart_threading);
@@ -208,7 +202,7 @@ class Display extends BaseSettings
$allowed_themes = Theme::getAllowedList();
- $themes = [];
+ $themes = [];
$mobile_themes = ['---' => $this->t('No special theme for mobile devices')];
foreach ($allowed_themes as $theme) {
$is_experimental = file_exists('view/theme/' . $theme . '/experimental');
@@ -233,29 +227,25 @@ class Display extends BaseSettings
$theme_selected = $user['theme'] ?: $default_theme;
$mobile_theme_selected = $this->session->get('mobile-theme', $default_mobile_theme);
- $itemspage_network = intval($this->pConfig->get($uid, 'system', 'itemspage_network'));
- $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : $this->config->get('system', 'itemspage_network'));
+ $itemspage_network = intval($this->pConfig->get($uid, 'system', 'itemspage_network'));
+ $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : $this->config->get('system', 'itemspage_network'));
$itemspage_mobile_network = intval($this->pConfig->get($uid, 'system', 'itemspage_mobile_network'));
$itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : $this->config->get('system', 'itemspage_network_mobile'));
- $browser_update = intval($this->pConfig->get($uid, 'system', 'update_interval'));
- if ($browser_update != -1) {
- $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
- }
-
+ $update_content = $this->pConfig->get($uid, 'system', 'update_content') ?? false;
$enable_smile = !$this->pConfig->get($uid, 'system', 'no_smilies', false);
- $infinite_scroll = $this->pConfig->get($uid, 'system', 'infinite_scroll', false);
+ $infinite_scroll = $this->pConfig->get($uid, 'system', 'infinite_scroll', false);
$enable_smart_threading = !$this->pConfig->get($uid, 'system', 'no_smart_threading', false);
$enable_dislike = !$this->pConfig->get($uid, 'system', 'hide_dislike', false);
- $display_resharer = $this->pConfig->get($uid, 'system', 'display_resharer', false);
- $stay_local = $this->pConfig->get($uid, 'system', 'stay_local', false);
- $show_page_drop = $this->pConfig->get($uid, 'system', 'show_page_drop', true);
- $display_eventlist = $this->pConfig->get($uid, 'system', 'display_eventlist', true);
+ $display_resharer = $this->pConfig->get($uid, 'system', 'display_resharer', false);
+ $stay_local = $this->pConfig->get($uid, 'system', 'stay_local', false);
+ $show_page_drop = $this->pConfig->get($uid, 'system', 'show_page_drop', true);
+ $display_eventlist = $this->pConfig->get($uid, 'system', 'display_eventlist', true);
- $hide_empty_descriptions = $this->pConfig->get($uid, 'accessibility', 'hide_empty_descriptions', false);
- $hide_custom_emojis = $this->pConfig->get($uid, 'accessibility', 'hide_custom_emojis', false);
- $platform_icon_style = $this->pConfig->get($uid, 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_BLACK);
- $platform_icon_styles = [
+ $hide_empty_descriptions = $this->pConfig->get($uid, 'accessibility', 'hide_empty_descriptions', false);
+ $hide_custom_emojis = $this->pConfig->get($uid, 'accessibility', 'hide_custom_emojis', false);
+ $platform_icon_style = $this->pConfig->get($uid, 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_BLACK);
+ $platform_icon_styles = [
ContactSelector::SVG_DISABLED => $this->t('Disabled'),
ContactSelector::SVG_COLOR_BLACK => $this->t('Color/Black'),
ContactSelector::SVG_BLACK => $this->t('Black'),
@@ -263,7 +253,7 @@ class Display extends BaseSettings
ContactSelector::SVG_WHITE => $this->t('White'),
];
- $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
+ $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
$preview_modes = [
BBCode::PREVIEW_NONE => $this->t('No preview'),
BBCode::PREVIEW_NO_IMAGE => $this->t('No image'),
@@ -273,16 +263,16 @@ class Display extends BaseSettings
$bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', $this->getAvailableTimelines($uid, true)->column('code'));
$enabled_timelines = $this->pConfig->get($uid, 'system', 'enabled_timelines', $this->getAvailableTimelines($uid, false)->column('code'));
- $channel_languages = User::getWantedLanguages($uid);
- $languages = $this->l10n->getLanguageCodes(true);
+ $channel_languages = User::getWantedLanguages($uid);
+ $languages = $this->l10n->getLanguageCodes(true);
$timelines = [];
foreach ($this->getAvailableTimelines($uid) as $timeline) {
$timelines[] = [
- 'label' => $timeline->label,
- 'description' => $timeline->description,
- 'enable' => ["enable[{$timeline->code}]", '', in_array($timeline->code, $enabled_timelines)],
- 'bookmark' => ["bookmark[{$timeline->code}]", '', in_array($timeline->code, $bookmarked_timelines)],
+ 'label' => $timeline->label,
+ 'description' => $timeline->description,
+ 'enable' => ["enable[{$timeline->code}]", '', in_array($timeline->code, $enabled_timelines)],
+ 'bookmark' => ["bookmark[{$timeline->code}]", '', in_array($timeline->code, $bookmarked_timelines)],
];
}
@@ -326,14 +316,14 @@ class Display extends BaseSettings
'$form_security_token' => self::getFormSecurityToken('settings_display'),
'$uid' => $uid,
- '$theme' => ['theme', $this->t('Display Theme:'), $theme_selected, '', $themes, true],
- '$mobile_theme' => ['mobile_theme', $this->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
+ '$theme' => ['theme', $this->t('Display Theme:'), $theme_selected, '', $themes, true],
+ '$mobile_theme' => ['mobile_theme', $this->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
'$theme_config' => $theme_config,
'$itemspage_network' => ['itemspage_network', $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')],
'$itemspage_mobile_network' => ['itemspage_mobile_network', $this->t('Number of items to display per page when viewed from mobile device:'), $itemspage_mobile_network, $this->t('Maximum of 100 items')],
- '$ajaxint' => ['browser_update', $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')],
- '$enable_smile' => ['enable_smile', $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')],
+ '$update_content' => ['update_content', $this->t('Regularly update the page content'), $update_content, $this->t('When enabled, new content on network, community and channels are added on top.')],
+ '$enable_smile' => ['enable_smile', $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')],
'$infinite_scroll' => ['infinite_scroll', $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')],
'$enable_smart_threading' => ['enable_smart_threading', $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')],
'$enable_dislike' => ['enable_dislike', $this->t('Display the Dislike feature'), $enable_dislike, $this->t('Display the Dislike button and dislike reactions on posts and comments.')],
@@ -353,7 +343,7 @@ class Display extends BaseSettings
'$timelines' => $timelines,
'$timeline_explanation' => $this->t('Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu.'),
- '$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all languages that you want to see in your channels.'), $languages, 'multiple'],
+ '$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all the languages you want to see in your channels. "Unspecified" describes all posts for which no language information was detected (e.g. posts with just an image or too little text to be sure of the language). If you want to see all languages, you will need to select all items in the list.'), $languages, 'multiple'],
'$first_day_of_week' => ['first_day_of_week', $this->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
'$calendar_default_view' => ['calendar_default_view', $this->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false],
diff --git a/src/Module/Update/Display.php b/src/Module/Update/Display.php
index 657a70ac13..1ac1770331 100644
--- a/src/Module/Update/Display.php
+++ b/src/Module/Update/Display.php
@@ -45,19 +45,16 @@ class Display extends DisplayModule
$parentUriId = $item['parent-uri-id'];
if (empty($force)) {
- $browserUpdate = intval($this->pConfig->get($profileUid, 'system', 'update_interval') ?? 40000);
- if ($browserUpdate >= 1000) {
- $updateDate = date(DateTimeFormat::MYSQL, time() - ($browserUpdate * 2 / 1000));
+ if ($this->pConfig->get($profileUid, 'system', 'update_content')) {
+ $updateDate = date(DateTimeFormat::MYSQL, time() - 120);
if (!Post::exists([
"`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?",
$parentUriId, 0,
$profileUid, $updateDate])) {
- $this->logger->debug('No updated content. Ending process',
- ['uri-id' => $uriId, 'uid' => $profileUid, 'updated' => $updateDate]);
+ $this->logger->debug('No updated content. Ending process', ['uri-id' => $uriId, 'uid' => $profileUid, 'updated' => $updateDate]);
return '';
} else {
- $this->logger->debug('Updated content found.',
- ['uri-id' => $uriId, 'uid' => $profileUid, 'updated' => $updateDate]);
+ $this->logger->debug('Updated content found.', ['uri-id' => $uriId, 'uid' => $profileUid, 'updated' => $updateDate]);
}
}
} else {
diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index e43c759901..1c793faaee 100644
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -15,7 +15,6 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
-use Friendica\Core\System;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\Factory\Api\Mastodon\Notification as NotificationFactory;
@@ -205,7 +204,7 @@ class Notify extends BaseRepository
* @return bool
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- function createFromArray($params)
+ public function createFromArray($params)
{
/** @var string the common prefix of a notification subject */
$subjectPrefix = $this->l10n->t('[Friendica:Notify]');
@@ -217,10 +216,10 @@ class Notify extends BaseRepository
// Ensure that the important fields are set at any time
$fields = ['nickname', 'account-type', 'notify-flags', 'language', 'username', 'email', 'account_removed', 'account_expired'];
- $user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
+ $user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
if (!DBA::isResult($user)) {
- $this->logger->error('Unknown user', ['uid' => $params['uid']]);
+ $this->logger->error('Unknown user', ['uid' => $params['uid']]);
return false;
}
@@ -244,13 +243,13 @@ class Notify extends BaseRepository
if (!empty($params['cid'])) {
$contact = Model\Contact::getById($params['cid'], ['url', 'name', 'photo']);
if (DBA::isResult($contact)) {
- $params['source_link'] = $contact['url'];
- $params['source_name'] = $contact['name'];
+ $params['source_link'] = $contact['url'];
+ $params['source_name'] = $contact['name'];
$params['source_photo'] = $contact['photo'];
}
}
- $siteurl = (string)$this->baseUrl;
+ $siteurl = (string)$this->baseUrl;
$sitename = $this->config->get('config', 'sitename');
// with $params['show_in_notification_page'] == false, the notification isn't inserted into
@@ -259,9 +258,9 @@ class Notify extends BaseRepository
$show_in_notification_page = isset($params['show_in_notification_page']) ? $params['show_in_notification_page'] : true;
$title = $params['item']['title'] ?? '';
- $body = $params['item']['body'] ?? '';
+ $body = $params['item']['body'] ?? '';
- $parent_id = $params['item']['parent'] ?? 0;
+ $parent_id = $params['item']['parent'] ?? 0;
$parent_uri_id = $params['item']['parent-uri-id'] ?? 0;
$epreamble = '';
@@ -278,10 +277,10 @@ class Notify extends BaseRepository
$subject = $l10n->t('%s New mail received at %s', $subjectPrefix, $sitename);
- $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
+ $preamble = $l10n->t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
$epreamble = $l10n->t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=' . $itemlink . ']' . $l10n->t('a private message').'[/url]');
- $sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to your private messages.');
$tsitelink = sprintf($sitelink, $itemlink);
$hsitelink = sprintf($sitelink, '' . $sitename . '');
@@ -302,7 +301,7 @@ class Notify extends BaseRepository
$item_post_type = Model\Item::postType($item, $l10n);
- $body = BBCode::toPlaintext($item['body'], false);
+ $body = BBCode::toPlaintext($item['body'], false);
$title = Plaintext::shorten($body, 70);
if (!empty($title)) {
$title = '"' . trim(str_replace("\n", " ", $title)) . '"';
@@ -311,16 +310,16 @@ class Notify extends BaseRepository
// First go for the general message
// "George Bull's post"
- $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
+ $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
$dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
// "your post"
if ($item['wall']) {
- $message = $l10n->t('%1$s commented on your %2$s %3$s');
+ $message = $l10n->t('%1$s commented on your %2$s %3$s');
$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
- // "their post"
+ // "their post"
} elseif ($item['author-link'] == $params['source_link']) {
- $message = $l10n->t('%1$s commented on their %2$s %3$s');
+ $message = $l10n->t('%1$s commented on their %2$s %3$s');
$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
}
@@ -330,40 +329,42 @@ class Notify extends BaseRepository
$epreamble = $dest_str;
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '' . $sitename . '');
- $itemlink = $params['link'];
+ $itemlink = $params['link'];
break;
case Model\Notification\Type::WALL:
$subject = $l10n->t('%s %s posted to your profile wall', $subjectPrefix, $params['source_name']);
- $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s posted to [url=%2$s]your wall[/url]',
+ $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ '%1$s posted to [url=%2$s]your wall[/url]',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
$params['link']
);
- $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
+ $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
- $itemlink = $params['link'];
+ $itemlink = $params['link'];
break;
case Model\Notification\Type::INTRO:
$itemlink = $params['link'];
- $subject = $l10n->t('%s Introduction received', $subjectPrefix);
+ $subject = $l10n->t('%s Introduction received', $subjectPrefix);
- $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
+ $preamble = $l10n->t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ 'You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
$body = $l10n->t('You may visit their profile at %s', $params['source_link']);
- $sitelink = $l10n->t('Please visit %s to approve or reject the introduction.');
+ $sitelink = $l10n->t('Please visit %s to approve or reject the introduction.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
@@ -372,8 +373,9 @@ class Notify extends BaseRepository
// someone started to share with user (mostly OStatus)
$subject = $l10n->t('%s A new person is sharing with you', $subjectPrefix);
- $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%1$s is sharing with you at %2$s',
+ $preamble = $l10n->t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ '%1$s is sharing with you at %2$s',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
$sitename
);
@@ -382,8 +384,9 @@ class Notify extends BaseRepository
// someone started to follow the user (mostly OStatus)
$subject = $l10n->t('%s You have a new follower', $subjectPrefix);
- $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You have a new follower at %2$s : %1$s',
+ $preamble = $l10n->t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ 'You have a new follower at %2$s : %1$s',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
$sitename
);
@@ -395,11 +398,12 @@ class Notify extends BaseRepository
break;
case Model\Notification\Type::SUGGEST:
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Friend suggestion received', $subjectPrefix);
- $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
+ $preamble = $l10n->t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ 'You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
$itemlink,
'[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
@@ -409,42 +413,44 @@ class Notify extends BaseRepository
$body .= $l10n->t('Photo:').' '.$params['item']['photo']."\n";
$body .= $l10n->t('You may visit their profile at %s', $params['item']['url']);
- $sitelink = $l10n->t('Please visit %s to approve or reject the suggestion.');
+ $sitelink = $l10n->t('Please visit %s to approve or reject the suggestion.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
break;
case Model\Notification\Type::CONFIRM:
if ($params['verb'] == Activity::FRIEND) { // mutual connection
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
- $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
+ $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ '%2$s has accepted your [url=%1$s]connection request[/url].',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
+ $body = $l10n->t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
- $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
} else { // ACTIVITY_FOLLOW
- $itemlink = $params['link'];
- $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
+ $itemlink = $params['link'];
+ $subject = $l10n->t('%s Connection accepted', $subjectPrefix);
- $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('%2$s has accepted your [url=%1$s]connection request[/url].',
+ $preamble = $l10n->t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ '%2$s has accepted your [url=%1$s]connection request[/url].',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
+ $body = $l10n->t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
$body .= "\n\n";
$body .= $l10n->t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
- $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
+ $sitelink = $l10n->t('Please visit %s if you wish to make any changes to this relationship.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, ''.$sitename.'');
}
@@ -453,43 +459,49 @@ class Notify extends BaseRepository
case Model\Notification\Type::SYSTEM:
switch($params['event']) {
case 'SYSTEM_REGISTER_REQUEST':
- $itemlink = $params['link'];
- $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('registration request');
+ $itemlink = $params['link'];
+ $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('registration request');
- $preamble = $l10n->t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
+ $preamble = $l10n->t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ 'You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t("Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
+ $body = $l10n->t(
+ "Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
$params['source_name'],
- $siteurl, $params['source_mail'],
+ $siteurl,
+ $params['source_mail'],
$params['source_nick']
);
- $sitelink = $l10n->t('Please visit %s to approve or reject the request.');
+ $sitelink = $l10n->t('Please visit %s to approve or reject the request.');
$tsitelink = sprintf($sitelink, $params['link']);
$hsitelink = sprintf($sitelink, '' . $sitename . '
');
break;
case 'SYSTEM_REGISTER_NEW':
- $itemlink = $params['link'];
- $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('new registration');
+ $itemlink = $params['link'];
+ $subject = $l10n->t('[Friendica System Notify]') . ' ' . $l10n->t('new registration');
- $preamble = $l10n->t('You\'ve received a new registration from \'%1$s\' at %2$s', $params['source_name'], $sitename);
- $epreamble = $l10n->t('You\'ve received a [url=%1$s]new registration[/url] from %2$s.',
+ $preamble = $l10n->t('You\'ve received a new registration from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+ $epreamble = $l10n->t(
+ 'You\'ve received a [url=%1$s]new registration[/url] from %2$s.',
$itemlink,
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
);
- $body = $l10n->t("Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
+ $body = $l10n->t(
+ "Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
$params['source_name'],
- $siteurl, $params['source_mail'],
+ $siteurl,
+ $params['source_mail'],
$params['source_nick']
);
- $sitelink = $l10n->t('Please visit %s to have a look at the new registration.');
+ $sitelink = $l10n->t('Please visit %s to have a look at the new registration.');
$tsitelink = sprintf($sitelink, $params['link']);
$hsitelink = sprintf($sitelink, '' . $sitename . '
');
break;
@@ -509,14 +521,14 @@ class Notify extends BaseRepository
private function storeAndSend(array $params, string $sitelink, string $tsitelink, string $hsitelink, string $title, string $subject, string $preamble, string $epreamble, string $body, string $itemlink, bool $show_in_notification_page): bool
{
- $item_id = $params['item']['id'] ?? 0;
- $uri_id = $params['item']['uri-id'] ?? null;
- $parent_id = $params['item']['parent'] ?? 0;
+ $item_id = $params['item']['id'] ?? 0;
+ $uri_id = $params['item']['uri-id'] ?? null;
+ $parent_id = $params['item']['parent'] ?? 0;
$parent_uri_id = $params['item']['parent-uri-id'] ?? null;
// Ensure that the important fields are set at any time
$fields = ['nickname', 'account_removed', 'account_expired'];
- $user = Model\User::getById($params['uid'], $fields);
+ $user = Model\User::getById($params['uid'], $fields);
if ($user['account_removed'] || $user['account_expired']) {
return false;
}
@@ -551,12 +563,12 @@ class Notify extends BaseRepository
Hook::callAll('enotify', $h);
- $subject = $h['subject'];
+ $subject = $h['subject'];
$preamble = $h['preamble'];
$epreamble = $h['epreamble'];
- $body = $h['body'];
+ $body = $h['body'];
$tsitelink = $h['tsitelink'];
$hsitelink = $h['hsitelink'];
@@ -587,7 +599,7 @@ class Notify extends BaseRepository
$this->logger->notice('sending notification email');
if (isset($params['parent']) && (intval($params['parent']) != 0)) {
- $parent = Model\Post::selectFirst(['guid'], ['id' => $params['parent']]);
+ $parent = Model\Post::selectFirst(['guid'], ['id' => $params['parent']]);
$message_id = "<" . $parent['guid'] . "@" . gethostname() . ">";
// Is this the first email notification for this parent item and user?
@@ -595,13 +607,11 @@ class Notify extends BaseRepository
$this->logger->info("notify_id:" . intval($notify_id) . ", parent: " . intval($params['parent']) . "uid: " . intval($params['uid']));
$fields = ['notify-id' => $notify_id, 'master-parent-uri-id' => $parent_uri_id,
- 'receiver-uid' => $params['uid'], 'parent-item' => 0];
+ 'receiver-uid' => $params['uid'], 'parent-item' => 0];
DBA::insert('notify-threads', $fields);
$emailBuilder->setHeader('Message-ID', $message_id);
- $log_msg = "No previous notification found for this parent:\n" .
- " parent: {$params['parent']}\n" . " uid : {$params['uid']}\n";
- $this->logger->info($log_msg);
+ $this->logger->info('No previous notification found for this parent', ['parent' => $params['parent'], 'uid' => $params['uid']]);
} else {
// If not, just "follow" the thread.
$emailBuilder->setHeader('References', $message_id);
@@ -614,8 +624,8 @@ class Notify extends BaseRepository
'preamble' => $preamble,
'type' => $params['type'],
'parent' => $parent_id,
- 'source_name' => $params['source_name'] ?? null,
- 'source_link' => $params['source_link'] ?? null,
+ 'source_name' => $params['source_name'] ?? null,
+ 'source_link' => $params['source_link'] ?? null,
'source_photo' => $params['source_photo'] ?? null,
'uid' => $params['uid'],
'hsitelink' => $hsitelink,
@@ -633,7 +643,7 @@ class Notify extends BaseRepository
->withHeaders($datarray['headers'])
->withRecipient($params['to_email'])
->forUser([
- 'uid' => $datarray['uid'],
+ 'uid' => $datarray['uid'],
'language' => $params['language'],
])
->withNotification($datarray['subject'], $datarray['preamble'], $datarray['title'], $datarray['body'])
@@ -645,7 +655,8 @@ class Notify extends BaseRepository
$emailBuilder->withPhoto(
$datarray['source_photo'],
$datarray['source_link'] ?? $sitelink,
- $datarray['source_name'] ?? $sitename);
+ $datarray['source_name'] ?? $sitename
+ );
}
$email = $emailBuilder->build();
@@ -681,7 +692,7 @@ class Notify extends BaseRepository
// Fallback for the case when the notify type isn't set at all
if (is_null($notify_type) && !in_array($type, [Notification::TYPE_RESHARE, Notification::TYPE_LIKE])) {
- return true;
+ return true;
}
if (!is_null($notify_type) && ($notify_type & $Notification->type)) {
@@ -700,7 +711,7 @@ class Notify extends BaseRepository
return false;
}
- $params = [];
+ $params = [];
$params['verb'] = $Notification->verb;
$params['uid'] = $Notification->uid;
$params['otype'] = Model\Notification\ObjectType::ITEM;
@@ -725,9 +736,12 @@ class Notify extends BaseRepository
$params['source_photo'] = $contact['photo'];
}
- $item = Model\Post::selectFirstForUser($Notification->uid, Model\Item::ITEM_FIELDLIST,
- ['uid' => [0, $Notification->uid], 'uri-id' => $Notification->targetUriId, 'deleted' => false],
- ['order' => ['uid' => true]]);
+ $item = Model\Post::selectFirstForUser(
+ $Notification->uid,
+ Model\Item::ITEM_FIELDLIST,
+ ['uid' => [0, $Notification->uid], 'uri-id' => $Notification->targetUriId, 'deleted' => false],
+ ['order' => ['uid' => true]]
+ );
if (empty($item)) {
$this->logger->info('Item not found', ['uri-id' => $Notification->targetUriId, 'type' => $Notification->type]);
return false;
@@ -747,13 +761,13 @@ class Notify extends BaseRepository
// Check to see if there was already a tag notify or comment notify for this post.
// If so don't create a second notification
$condition = ['type' => [Model\Notification\Type::TAG_SELF, Model\Notification\Type::COMMENT, Model\Notification\Type::SHARE],
- 'link' => $params['link'], 'verb' => Activity::POST];
+ 'link' => $params['link'], 'verb' => Activity::POST];
if ($this->existsForUser($Notification->uid, $condition)) {
$this->logger->info('Duplicate found, quitting', $condition + ['uid' => $Notification->uid]);
return false;
}
- $body = BBCode::toPlaintext($item['body'], false);
+ $body = BBCode::toPlaintext($item['body'], false);
$title = Plaintext::shorten($body, 70);
if (!empty($title)) {
$title = '"' . trim(str_replace("\n", " ", $title)) . '"';
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index a573790f49..a7e7b8275c 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -147,7 +147,7 @@ class Probe
$newdata['baseurl'] = $data['networks'][$network]['baseurl'];
}
if (!empty($newdata['baseurl'])) {
- $newdata['gsid'] = $data['networks'][$network]['gsid'] = GServer::getID($newdata['baseurl']);
+ $newdata['gsid'] = $data['networks'][$network]['gsid'] = GServer::getRealID($newdata['baseurl']);
} else {
$newdata['gsid'] = $data['networks'][$network]['gsid'] = null;
}
@@ -436,7 +436,7 @@ class Probe
}
if (!empty($data['baseurl']) && empty($data['gsid'])) {
- $data['gsid'] = GServer::getID($data['baseurl']);
+ $data['gsid'] = GServer::getRealID($data['baseurl']);
}
// Ensure that local connections always are DFRN
@@ -2164,7 +2164,7 @@ class Probe
$split_name = Diaspora::splitName($owner['name']);
if (empty($owner['gsid'])) {
- $owner['gsid'] = GServer::getID($approfile['generator']['url']);
+ $owner['gsid'] = GServer::getRealID($approfile['generator']['url']);
}
$data = [
diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php
index 161494ae2d..baa06c8921 100644
--- a/src/Object/Api/Mastodon/Instance.php
+++ b/src/Object/Api/Mastodon/Instance.php
@@ -24,40 +24,24 @@ use Friendica\Object\Api\Mastodon\InstanceV2\Configuration;
*/
class Instance extends BaseDataTransferObject
{
- /** @var string (URL) */
- protected $uri;
- /** @var string */
- protected $title;
- /** @var string */
- protected $short_description;
- /** @var string */
- protected $description;
- /** @var string */
- protected $email;
- /** @var string */
- protected $version;
- /** @var array */
- protected $urls;
- /** @var Stats */
- protected $stats;
- /** @var string|null This is meant as a server banner, default Mastodon "thumbnail" is 1600×620px */
- protected $thumbnail = null;
- /** @var array */
- protected $languages;
- /** @var int */
- protected $max_toot_chars;
- /** @var bool */
- protected $registrations;
- /** @var bool */
- protected $approval_required;
- /** @var bool */
- protected $invites_enabled;
- /** @var Configuration */
- protected $configuration;
- /** @var Account|null */
- protected $contact_account = null;
- /** @var array */
- protected $rules = [];
+ protected string $uri;
+ protected string $title;
+ protected string $short_description;
+ protected string $description;
+ protected string $email;
+ protected string $version;
+ protected array $urls;
+ protected Stats $stats;
+ /** This is meant as a server banner, default Mastodon "thumbnail" is 1600×620px */
+ protected ?string $thumbnail = null;
+ protected array $languages;
+ protected int $max_toot_chars;
+ protected bool $registrations;
+ protected bool $approval_required;
+ protected bool $invites_enabled;
+ protected Configuration $configuration;
+ protected ?Account $contact_account = null;
+ protected array $rules = [];
public function __construct(IManageConfigValues $config, BaseURL $baseUrl, Database $database, Configuration $configuration, ?Account $contact_account, array $rules)
{
@@ -77,7 +61,7 @@ class Instance extends BaseDataTransferObject
$this->approval_required = ($register_policy === Register::APPROVE);
$this->invites_enabled = false;
$this->configuration = $configuration;
- $this->contact_account = $contact_account ?? [];
+ $this->contact_account = $contact_account;
$this->rules = $rules;
}
}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index aafe1b305b..b5ad33f56e 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -498,8 +498,10 @@ class Post
}
$languages = [];
+ $language = '';
if (!empty($item['language'])) {
$languages = DI::l10n()->t('Languages');
+ $language = array_key_first(json_decode($item['language'], true));
}
if (in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]) && in_array($item['network'], Protocol::FEDERATED)) {
@@ -553,6 +555,7 @@ class Post
'title' => $item['title'],
'summary' => $item['content-warning'],
'localtime' => DateTimeFormat::local($item['created'], 'r'),
+ 'utc' => DateTimeFormat::utc($item['created']),
'ago' => $item['app'] ? DI::l10n()->t('%s from %s', $ago, $item['app']) : $ago,
'app' => $item['app'],
'created' => $ago,
@@ -579,6 +582,7 @@ class Post
'tagger' => $tagger,
'filer' => $filer,
'language' => $languages,
+ 'lang' => $language,
'searchtext' => DI::l10n()->t('Search Text'),
'drop' => $drop,
'block' => $block,
diff --git a/src/Protocol/ATProtocol/Actor.php b/src/Protocol/ATProtocol/Actor.php
index 65d1b04a21..862d10eeea 100755
--- a/src/Protocol/ATProtocol/Actor.php
+++ b/src/Protocol/ATProtocol/Actor.php
@@ -142,7 +142,7 @@ class Actor
if (!empty($fields['baseurl'])) {
GServer::check($fields['baseurl'], Protocol::BLUESKY);
- $fields['gsid'] = GServer::getID($fields['baseurl'], true);
+ $fields['gsid'] = GServer::getRealID($fields['baseurl'], true);
}
foreach ($directory->verificationMethod as $method) {
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f09b5a2e07..b96486ef3a 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -906,15 +906,15 @@ class Processor
if ($id) {
$shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
$item['quote-uri-id'] = $shared_item['uri-id'];
- DI::logger()->debug('Quote is found', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]);
+ DI::logger()->debug('Quote is found', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]);
} elseif ($uri_id = ItemURI::getIdByURI($activity['quote-url'], false)) {
- DI::logger()->info('Quote was not fetched but the uri-id existed', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $uri_id]);
+ DI::logger()->info('Quote was not fetched but the uri-id existed', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $uri_id]);
$item['quote-uri-id'] = $uri_id;
} elseif (Queue::exists($activity['quote-url'], 'as:Create')) {
$item['quote-uri-id'] = ItemURI::getIdByURI($activity['quote-url']);
- DI::logger()->info('Quote is queued but not processed yet', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]);
+ DI::logger()->info('Quote is queued but not processed yet', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]);
} else {
- DI::logger()->notice('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
+ DI::logger()->notice('Quote was not fetched', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
}
}
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index a4446e5978..712b8954d4 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -798,32 +798,54 @@ class Transmitter
}
if (!empty($item['quote-uri-id']) && in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) {
- $quoted = Post::selectFirst(['author-link'], ['uri-id' => $item['quote-uri-id']]);
- $profile = APContact::getByURL($quoted['author-link'], false);
- if (!empty($profile)) {
- $data['cc'][] = $profile['url'];
+ $quoted = Post::selectFirst(['author-link'], ['uri-id' => $item['quote-uri-id']]);
+ if (!empty($quoted['author-link'])) {
+ $profile = APContact::getByURL($quoted['author-link'], false);
+ if (!empty($profile)) {
+ $data['cc'][] = $profile['url'];
+ }
}
}
+ $data = self::filterReceiverData($data, $item['author-link']);
+
+ $receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bto' => array_values($data['bto']), 'bcc' => array_values($data['bcc']), 'audience' => array_values($data['audience'])];
+
+ if (!$blindcopy) {
+ unset($receivers['bto']);
+ unset($receivers['bcc']);
+ }
+
+ if (!$blindcopy && count($receivers['audience']) == 1) {
+ $receivers['audience'] = $receivers['audience'][0];
+ } elseif (!$receivers['audience']) {
+ unset($receivers['audience']);
+ }
+
+ return $receivers;
+ }
+
+ private static function filterReceiverData(array $data, string $author_link): array
+ {
$data['to'] = array_unique($data['to']);
$data['cc'] = array_unique($data['cc']);
$data['bto'] = array_unique($data['bto']);
$data['bcc'] = array_unique($data['bcc']);
$data['audience'] = array_unique($data['audience']);
- if (($key = array_search($item['author-link'], $data['to'])) !== false) {
+ if (($key = array_search($author_link, $data['to'])) !== false) {
unset($data['to'][$key]);
}
- if (($key = array_search($item['author-link'], $data['cc'])) !== false) {
+ if (($key = array_search($author_link, $data['cc'])) !== false) {
unset($data['cc'][$key]);
}
- if (($key = array_search($item['author-link'], $data['bto'])) !== false) {
+ if (($key = array_search($author_link, $data['bto'])) !== false) {
unset($data['bto'][$key]);
}
- if (($key = array_search($item['author-link'], $data['bcc'])) !== false) {
+ if (($key = array_search($author_link, $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
@@ -857,20 +879,7 @@ class Transmitter
}
}
- $receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bto' => array_values($data['bto']), 'bcc' => array_values($data['bcc']), 'audience' => array_values($data['audience'])];
-
- if (!$blindcopy) {
- unset($receivers['bto']);
- unset($receivers['bcc']);
- }
-
- if (!$blindcopy && count($receivers['audience']) == 1) {
- $receivers['audience'] = $receivers['audience'][0];
- } elseif (!$receivers['audience']) {
- unset($receivers['audience']);
- }
-
- return $receivers;
+ return $data;
}
/**
diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php
index 6755f645d6..d99b67c9a8 100644
--- a/src/Protocol/Delivery.php
+++ b/src/Protocol/Delivery.php
@@ -310,7 +310,7 @@ class Delivery
$atom = DFRN::entries($msgitems, $owner);
}
- DI::logger()->debug('Notifier entry: ' . $contact['url'] . ' ' . ($target_item_id ?? 'relocation') . ' entry: ' . $atom);
+ DI::logger()->debug('Notifier entry', ['url' => $contact['url'], 'target_item_id' => ($target_item_id ?? 'relocation'), 'entry' => $atom]);
$protocol = Post\DeliveryData::DFRN;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 0235cb2f3f..a8db02f045 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2790,7 +2790,7 @@ class Diaspora
*/
public static function encodePrivateData(string $msg, array $user, array $contact, string $prvkey, string $pubkey): string
{
- DI::logger()->debug('Message: ' . $msg);
+ DI::logger()->debug('Diaspora message', ['msg' => $msg]);
// without a public key nothing will work
if (!$pubkey) {
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index fa1ea3b302..2f9be305f1 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -9,6 +9,8 @@ namespace Friendica\Protocol;
use DOMDocument;
use DOMElement;
+use DOMNode;
+use DOMNodeList;
use DOMXPath;
use Friendica\App;
use Friendica\Contact\LocalRelationship\Entity\LocalRelationship;
@@ -67,12 +69,12 @@ class Feed
return [];
}
+ $basepath = '';
+
if (!empty($contact['poll'])) {
- $basepath = $contact['poll'];
+ $basepath = (string) $contact['poll'];
} elseif (!empty($contact['url'])) {
- $basepath = $contact['url'];
- } else {
- $basepath = '';
+ $basepath = (string) $contact['url'];
}
$doc = new DOMDocument();
@@ -287,6 +289,77 @@ class Feed
$total_items = $max_items;
}
+ $postings = self::importOlderEntries($entries, $total_items, $header, $author, $contact, $importer, $xpath, $atomns, $basepath, $dryRun);
+
+ if (!empty($postings)) {
+ $min_posting = DI::config()->get('system', 'minimum_posting_interval', 0);
+ $total = count($postings);
+ if ($total > 1) {
+ // Posts shouldn't be delayed more than a day
+ $interval = min(1440, self::getPollInterval($contact));
+ $delay = max(round(($interval * 60) / $total), 60 * $min_posting);
+ DI::logger()->info('Got posting delay', ['delay' => $delay, 'interval' => $interval, 'items' => $total, 'cid' => $contact['id'], 'url' => $contact['url']]);
+ } else {
+ $delay = 0;
+ }
+
+ $post_delay = 0;
+
+ foreach ($postings as $posting) {
+ if ($delay > 0) {
+ $publish_time = time() + $post_delay;
+ $post_delay += $delay;
+ } else {
+ $publish_time = time();
+ }
+
+ $last_publish = DI::pConfig()->get($posting['item']['uid'], 'system', 'last_publish', 0, true);
+ $next_publish = max($last_publish + (60 * $min_posting), time());
+ if ($publish_time < $next_publish) {
+ $publish_time = $next_publish;
+ }
+ $publish_at = date(DateTimeFormat::MYSQL, $publish_time);
+
+ if (Post\Delayed::add($posting['item']['uri'], $posting['item'], $posting['notify'], Post\Delayed::PREPARED, $publish_at, $posting['taglist'], $posting['attachments'])) {
+ DI::pConfig()->set($posting['item']['uid'], 'system', 'last_publish', $publish_time);
+ }
+ }
+ }
+
+ if (!$dryRun && DI::config()->get('system', 'adjust_poll_frequency')) {
+ self::adjustPollFrequency($contact, $creation_dates);
+ }
+
+ return ['header' => $author, 'items' => $items];
+ }
+
+ private static function getTitleFromItemOrEntry(array $item, DOMXPath $xpath, string $atomns, ?DOMNode $entry): string
+ {
+ $title = (string) $item['title'];
+
+ if (empty($title)) {
+ $title = XML::getFirstNodeValue($xpath, $atomns . ':title/text()', $entry);
+ }
+
+ if (empty($title)) {
+ $title = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
+ }
+
+ if (empty($title)) {
+ $title = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
+ }
+
+ if (empty($title)) {
+ $title = XML::getFirstNodeValue($xpath, 'itunes:title/text()', $entry);
+ }
+
+ $title = trim(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+
+ return $title;
+ }
+
+ private static function importOlderEntries(DOMNodeList $entries, int $total_items, array $header, array $author, array $contact, array $importer, DOMXPath $xpath, string $atomns, string $basepath, bool $dryRun): array
+ {
$postings = [];
// Importing older entries first
@@ -386,23 +459,7 @@ class Feed
}
}
- if (empty($item['title'])) {
- $item['title'] = XML::getFirstNodeValue($xpath, $atomns . ':title/text()', $entry);
- }
-
- if (empty($item['title'])) {
- $item['title'] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
- }
-
- if (empty($item['title'])) {
- $item['title'] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
- }
-
- if (empty($item['title'])) {
- $item['title'] = XML::getFirstNodeValue($xpath, 'itunes:title/text()', $entry);
- }
-
- $item['title'] = trim(html_entity_decode($item['title'], ENT_QUOTES, 'UTF-8'));
+ $item['title'] = self::getTitleFromItemOrEntry($item, $xpath, $atomns, $entry);
$published = XML::getFirstNodeValue($xpath, $atomns . ':published/text()', $entry);
@@ -705,46 +762,7 @@ class Feed
}
}
- if (!empty($postings)) {
- $min_posting = DI::config()->get('system', 'minimum_posting_interval', 0);
- $total = count($postings);
- if ($total > 1) {
- // Posts shouldn't be delayed more than a day
- $interval = min(1440, self::getPollInterval($contact));
- $delay = max(round(($interval * 60) / $total), 60 * $min_posting);
- DI::logger()->info('Got posting delay', ['delay' => $delay, 'interval' => $interval, 'items' => $total, 'cid' => $contact['id'], 'url' => $contact['url']]);
- } else {
- $delay = 0;
- }
-
- $post_delay = 0;
-
- foreach ($postings as $posting) {
- if ($delay > 0) {
- $publish_time = time() + $post_delay;
- $post_delay += $delay;
- } else {
- $publish_time = time();
- }
-
- $last_publish = DI::pConfig()->get($posting['item']['uid'], 'system', 'last_publish', 0, true);
- $next_publish = max($last_publish + (60 * $min_posting), time());
- if ($publish_time < $next_publish) {
- $publish_time = $next_publish;
- }
- $publish_at = date(DateTimeFormat::MYSQL, $publish_time);
-
- if (Post\Delayed::add($posting['item']['uri'], $posting['item'], $posting['notify'], Post\Delayed::PREPARED, $publish_at, $posting['taglist'], $posting['attachments'])) {
- DI::pConfig()->set($posting['item']['uid'], 'system', 'last_publish', $publish_time);
- }
- }
- }
-
- if (!$dryRun && DI::config()->get('system', 'adjust_poll_frequency')) {
- self::adjustPollFrequency($contact, $creation_dates);
- }
-
- return ['header' => $author, 'items' => $items];
+ return $postings;
}
/**
diff --git a/src/Protocol/ZOT.php b/src/Protocol/ZOT.php
index b5604bcc84..28fa493454 100644
--- a/src/Protocol/ZOT.php
+++ b/src/Protocol/ZOT.php
@@ -8,7 +8,6 @@
namespace Friendica\Protocol;
use Friendica\App;
-use Friendica\Core\Addon;
use Friendica\DI;
use Friendica\Module;
use Friendica\Module\Register;
@@ -43,6 +42,11 @@ class ZOT
*/
public static function getSiteInfo(): array
{
+ $baseUrl = (string) DI::baseUrl();
+ $keyValue = DI::keyValue();
+ $addonHelper = DI::addonHelper();
+ $config = DI::config();
+
$policies = [
Module\Register::OPEN => 'open',
Module\Register::APPROVE => 'approve',
@@ -50,14 +54,14 @@ class ZOT
];
return [
- 'url' => (string)DI::baseUrl(),
- 'openWebAuth' => (string)DI::baseUrl() . '/owa',
- 'authRedirect' => (string)DI::baseUrl() . '/magic',
+ 'url' => $baseUrl,
+ 'openWebAuth' => $baseUrl . '/owa',
+ 'authRedirect' => $baseUrl . '/magic',
'register_policy' => $policies[Register::getPolicy()],
- 'accounts' => DI::keyValue()->get('nodeinfo_total_users'),
- 'plugins' => Addon::getVisibleList(),
- 'sitename' => DI::config()->get('config', 'sitename'),
- 'about' => DI::config()->get('config', 'info'),
+ 'accounts' => $keyValue->get('nodeinfo_total_users'),
+ 'plugins' => $addonHelper->getVisibleEnabledAddons(),
+ 'sitename' => $config->get('config', 'sitename'),
+ 'about' => $config->get('config', 'info'),
'project' => App::PLATFORM,
'version' => App::VERSION,
];
diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 4c0e9b72dc..084ae567ea 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -299,12 +299,19 @@ class Crypto
* Creates cryptographic secure random digits
*
* @param string $digits The count of digits
- * @return int The random Digits
+ * @return string The random Digits
*
* @throws \Exception In case 'random_int' isn't usable
*/
- public static function randomDigits($digits)
+ public static function randomDigits($digits): string
{
- return random_int(0, 10 ** $digits - 1);
+ $rn = '';
+
+ // generating cryptographically secure pseudo-random integers
+ for ($i = 0; $i < $digits; $i++) {
+ $rn .= random_int(0, 9);
+ }
+
+ return $rn;
}
}
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 0dc9f48f09..3ced3e8afc 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -40,14 +40,18 @@ class Emailer
/** @var string */
private $siteEmailName;
- public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, BaseURL $baseURL, LoggerInterface $logger,
- L10n $defaultLang)
- {
- $this->config = $config;
- $this->pConfig = $pConfig;
- $this->logger = $logger;
- $this->baseUrl = $baseURL;
- $this->l10n = $defaultLang;
+ public function __construct(
+ IManageConfigValues $config,
+ IManagePersonalConfigValues $pConfig,
+ BaseURL $baseURL,
+ LoggerInterface $logger,
+ L10n $defaultLang
+ ) {
+ $this->config = $config;
+ $this->pConfig = $pConfig;
+ $this->logger = $logger;
+ $this->baseUrl = $baseURL;
+ $this->l10n = $defaultLang;
$this->siteEmailAddress = $this->config->get('config', 'sender_email');
if (empty($this->siteEmailAddress)) {
@@ -89,8 +93,14 @@ class Emailer
*/
public function newSystemMail()
{
- return new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger,
- $this->getSiteEmailAddress(), $this->getSiteEmailName());
+ return new SystemMailBuilder(
+ $this->l10n,
+ $this->baseUrl,
+ $this->config,
+ $this->logger,
+ $this->getSiteEmailAddress(),
+ $this->getSiteEmailName()
+ );
}
/**
@@ -100,8 +110,14 @@ class Emailer
*/
public function newNotifyMail()
{
- return new NotifyMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger,
- $this->getSiteEmailAddress(), $this->getSiteEmailName());
+ return new NotifyMailBuilder(
+ $this->l10n,
+ $this->baseUrl,
+ $this->config,
+ $this->logger,
+ $this->getSiteEmailAddress(),
+ $this->getSiteEmailName()
+ );
}
/**
@@ -143,9 +159,9 @@ class Emailer
// generate a mime boundary
$mimeBoundary = rand(0, 9) . '-'
- . rand(100000000, 999999999) . '-'
- . rand(100000000, 999999999) . '=:'
- . rand(10000, 99999);
+ . rand(100000000, 999999999) . '-'
+ . rand(100000000, 999999999) . '=:'
+ . rand(10000, 99999);
$messageHeader = $email->getAdditionalMailHeaderString();
if ($countMessageId === 0) {
@@ -163,9 +179,9 @@ class Emailer
$textBody = chunk_split(base64_encode($email->getMessage(true)));
$htmlBody = chunk_split(base64_encode($email->getMessage()));
$multipartMessageBody = "--" . $mimeBoundary . "\n" . // plain text section
- "Content-Type: text/plain; charset=UTF-8\n" .
- "Content-Transfer-Encoding: base64\n\n" .
- $textBody . "\n";
+ "Content-Type: text/plain; charset=UTF-8\n" .
+ "Content-Transfer-Encoding: base64\n\n" .
+ $textBody . "\n";
if (!$email_textonly && !is_null($email->getMessage())) {
$multipartMessageBody .=
@@ -207,8 +223,7 @@ class Emailer
$hookdata['parameters']
);
- $this->logger->debug('header ' . 'To: ' . $email->getToAddress() . '\n' . $messageHeader);
- $this->logger->debug('return value ' . (($res) ? 'true' : 'false'));
+ $this->logger->debug('Email message header', ['To' => $email->getToAddress(), 'messageHeader' => $messageHeader, 'return' => ($res) ? 'true' : 'false']);
return $res;
}
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 098b60d5e8..3e9ea157d5 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -86,7 +86,7 @@ class Temporal
$o .= '