diff --git a/mod/ping.php b/mod/ping.php index 81aa9ec620..1afab5f726 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -283,7 +283,7 @@ function ping_init(App $a) foreach ($regs as $reg) { $notif = [ 'id' => 0, - 'href' => DI::baseUrl() . '/admin/users/pending', + 'href' => DI::baseUrl()->get(true) . '/admin/users/pending', 'name' => $reg['name'], 'url' => $reg['url'], 'photo' => $reg['micro'], @@ -296,7 +296,7 @@ function ping_init(App $a) } else { $notif = [ 'id' => 0, - 'href' => DI::baseUrl() . '/admin/users/pending', + 'href' => DI::baseUrl()->get(true) . '/admin/users/pending', 'name' => $regs[0]['name'], 'url' => $regs[0]['url'], 'photo' => $regs[0]['micro'], diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php index 1104212f6b..d56e020615 100644 --- a/src/Module/Admin/Logs/View.php +++ b/src/Module/Admin/Logs/View.php @@ -21,9 +21,9 @@ namespace Friendica\Module\Admin\Logs; -use Friendica\DI; use Friendica\Core\Renderer; use Friendica\Core\Theme; +use Friendica\DI; use Friendica\Module\BaseAdmin; use Psr\Log\LogLevel; @@ -80,9 +80,10 @@ class View extends BaseAdmin } } return Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Administration'), - '$page' => DI::l10n()->t('View Logs'), - '$l10n' => [ + '$baseurl' => DI::baseUrl()->get(true), + '$title' => DI::l10n()->t('Administration'), + '$page' => DI::l10n()->t('View Logs'), + '$l10n' => [ 'Search' => DI::l10n()->t('Search'), 'Search_in_logs' => DI::l10n()->t('Search in logs'), 'Show_all' => DI::l10n()->t('Show all'), diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 0f440f253a..4c5c38ea54 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -526,7 +526,7 @@ class Site extends BaseAdmin '$touch_icon' => ['touch_icon', DI::l10n()->t('Touch icon'), DI::config()->get('system', 'touch_icon'), DI::l10n()->t('Link to an icon that will be used for tablets and mobiles.')], '$additional_info' => ['additional_info', DI::l10n()->t('Additional Info'), $additional_info, DI::l10n()->t('For public servers: you can add additional information here that will be listed at %s/servers.', Search::getGlobalDirectory())], '$language' => ['language', DI::l10n()->t('System language'), DI::config()->get('system', 'language'), '', $lang_choices], - '$theme' => ['theme', DI::l10n()->t('System theme'), DI::config()->get('system', 'theme'), DI::l10n()->t('Default system theme - may be over-ridden by user profiles - Change default theme settings'), $theme_choices], + '$theme' => ['theme', DI::l10n()->t('System theme'), DI::config()->get('system', 'theme'), DI::l10n()->t('Default system theme - may be over-ridden by user profiles - Change default theme settings', DI::baseUrl()->get(true) . '/admin/themes'), $theme_choices], '$theme_mobile' => ['theme_mobile', DI::l10n()->t('Mobile system theme'), DI::config()->get('system', 'mobile-theme', '---'), DI::l10n()->t('Theme for mobile devices'), $theme_choices_mobile], '$ssl_policy' => ['ssl_policy', DI::l10n()->t('SSL link policy'), DI::config()->get('system', 'ssl_policy'), DI::l10n()->t('Determines whether generated links should be forced to use SSL'), $ssl_choices], '$force_ssl' => ['force_ssl', DI::l10n()->t('Force SSL'), DI::config()->get('system', 'force_ssl'), DI::l10n()->t('Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.')], diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php index 25724dc728..dc6bf58184 100644 --- a/src/Module/Admin/Themes/Details.php +++ b/src/Module/Admin/Themes/Details.php @@ -76,7 +76,7 @@ class Details extends BaseAdmin require_once "view/theme/$theme/config.php"; if (function_exists('theme_admin')) { - $admin_form = ''; + $admin_form = ''; } } diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php index 132a35b67b..439e78e642 100644 --- a/src/Module/Admin/Themes/Embed.php +++ b/src/Module/Admin/Themes/Embed.php @@ -24,6 +24,7 @@ namespace Friendica\Module\Admin\Themes; use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Module\BaseAdmin; use Friendica\Module\Response; use Friendica\Util\Profiler; @@ -94,7 +95,7 @@ class Embed extends BaseAdmin $t = Renderer::getMarkupTemplate('admin/addons/embed.tpl'); return Renderer::replaceMacros($t, [ - '$action' => '/admin/themes/' . $theme . '/embed?mode=minimal', + '$action' => DI::baseUrl()->get(true) . '/admin/themes/' . $theme . '/embed?mode=minimal', '$form' => $admin_form, '$form_security_token' => self::getFormSecurityToken("admin_theme_settings"), ]); diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index 9677ce30f2..cf0ddcfc6e 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -37,7 +37,7 @@ class Index extends BaseAdmin // reload active themes if (!empty($_GET['action'])) { - self::checkFormSecurityTokenRedirectOnError(DI::baseUrl()->get() . '/admin/themes', 'admin_themes', 't'); + self::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); switch ($_GET['action']) { case 'reload': diff --git a/src/Module/Register.php b/src/Module/Register.php index d415abf74c..9c09baef82 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -380,11 +380,11 @@ class Register extends BaseModule 'type' => Model\Notification\Type::SYSTEM, 'event' => 'SYSTEM_REGISTER_REQUEST', 'uid' => $admin['uid'], - 'link' => $base_url . '/admin/users/', + 'link' => DI::baseUrl()->get(true) . '/admin/users/', 'source_name' => $user['username'], 'source_mail' => $user['email'], 'source_nick' => $user['nickname'], - 'source_link' => $base_url . '/admin/users/', + 'source_link' => DI::baseUrl()->get(true) . '/admin/users/', 'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB), 'show_in_notification_page' => false ]); diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 8d8c16592a..fb4088c559 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.05-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-10 07:35+0000\n" +"POT-Creation-Date: 2022-03-11 22:56-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -309,7 +309,7 @@ msgstr "" #: mod/editpost.php:143 src/Content/Conversation.php:380 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:460 -#: src/Module/Admin/Logs/View.php:92 +#: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "" @@ -339,7 +339,7 @@ msgstr "" msgid "Create New Event" msgstr "" -#: mod/events.php:478 src/Module/Admin/Logs/View.php:96 +#: mod/events.php:478 src/Module/Admin/Logs/View.php:97 msgid "Event details" msgstr "" @@ -2900,7 +2900,7 @@ msgid "Addon applications, utilities, games" msgstr "" #: src/Content/Nav.php:230 src/Content/Text/HTML.php:881 -#: src/Module/Admin/Logs/View.php:86 src/Module/Search/Index.php:96 +#: src/Module/Admin/Logs/View.php:87 src/Module/Search/Index.php:96 msgid "Search" msgstr "" @@ -4708,7 +4708,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Server/Add.php:89 #: src/Module/Admin/Blocklist/Server/Index.php:78 #: src/Module/Admin/Federation.php:194 src/Module/Admin/Item/Delete.php:64 -#: src/Module/Admin/Logs/Settings.php:79 src/Module/Admin/Logs/View.php:83 +#: src/Module/Admin/Logs/Settings.php:79 src/Module/Admin/Logs/View.php:84 #: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:498 #: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:232 #: src/Module/Admin/Themes/Details.php:90 src/Module/Admin/Themes/Index.php:111 @@ -5257,7 +5257,7 @@ msgstr "" msgid "Implicit Mention" msgstr "" -#: src/Module/Admin/Item/Source.php:73 src/Module/Admin/Logs/View.php:98 +#: src/Module/Admin/Item/Source.php:73 src/Module/Admin/Logs/View.php:99 #: src/Module/Debug/ActivityPubConversion.php:62 msgid "Source" msgstr "" @@ -5329,68 +5329,68 @@ msgid "" "is readable." msgstr "" -#: src/Module/Admin/Logs/View.php:84 src/Module/BaseAdmin.php:110 +#: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:110 msgid "View Logs" msgstr "" -#: src/Module/Admin/Logs/View.php:87 +#: src/Module/Admin/Logs/View.php:88 msgid "Search in logs" msgstr "" -#: src/Module/Admin/Logs/View.php:88 +#: src/Module/Admin/Logs/View.php:89 #: src/Module/Notifications/Notifications.php:139 msgid "Show all" msgstr "" -#: src/Module/Admin/Logs/View.php:89 +#: src/Module/Admin/Logs/View.php:90 msgid "Date" msgstr "" -#: src/Module/Admin/Logs/View.php:90 +#: src/Module/Admin/Logs/View.php:91 msgid "Level" msgstr "" -#: src/Module/Admin/Logs/View.php:91 +#: src/Module/Admin/Logs/View.php:92 msgid "Context" msgstr "" -#: src/Module/Admin/Logs/View.php:93 +#: src/Module/Admin/Logs/View.php:94 msgid "ALL" msgstr "" -#: src/Module/Admin/Logs/View.php:94 +#: src/Module/Admin/Logs/View.php:95 msgid "View details" msgstr "" -#: src/Module/Admin/Logs/View.php:95 +#: src/Module/Admin/Logs/View.php:96 msgid "Click to view details" msgstr "" -#: src/Module/Admin/Logs/View.php:97 +#: src/Module/Admin/Logs/View.php:98 msgid "Data" msgstr "" -#: src/Module/Admin/Logs/View.php:99 +#: src/Module/Admin/Logs/View.php:100 msgid "File" msgstr "" -#: src/Module/Admin/Logs/View.php:100 +#: src/Module/Admin/Logs/View.php:101 msgid "Line" msgstr "" -#: src/Module/Admin/Logs/View.php:101 +#: src/Module/Admin/Logs/View.php:102 msgid "Function" msgstr "" -#: src/Module/Admin/Logs/View.php:102 +#: src/Module/Admin/Logs/View.php:103 msgid "UID" msgstr "" -#: src/Module/Admin/Logs/View.php:103 +#: src/Module/Admin/Logs/View.php:104 msgid "Process ID" msgstr "" -#: src/Module/Admin/Logs/View.php:104 +#: src/Module/Admin/Logs/View.php:105 msgid "Close" msgstr "" @@ -5651,9 +5651,10 @@ msgid "System theme" msgstr "" #: src/Module/Admin/Site.php:529 +#, php-format msgid "" -"Default system theme - may be over-ridden by user profiles - Change default theme settings" +"Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" #: src/Module/Admin/Site.php:530 @@ -6596,7 +6597,7 @@ msgstr "" msgid "Themes" msgstr "" -#: src/Module/Admin/Themes/Embed.php:79 +#: src/Module/Admin/Themes/Embed.php:80 msgid "Unknown theme." msgstr "" diff --git a/view/templates/admin/logs/view.tpl b/view/templates/admin/logs/view.tpl index 97b5c0625f..50e166f1ba 100644 --- a/view/templates/admin/logs/view.tpl +++ b/view/templates/admin/logs/view.tpl @@ -11,7 +11,7 @@

- {{$l10n.Show_all}} + {{$l10n.Show_all}}

diff --git a/view/templates/admin/summary.tpl b/view/templates/admin/summary.tpl index 121eb833b9..2421658d6c 100644 --- a/view/templates/admin/summary.tpl +++ b/view/templates/admin/summary.tpl @@ -34,7 +34,7 @@
{{$addons.0}}
{{foreach $addons.1 as $p}} -
{{$p}}
+
{{$p}}
{{/foreach}} diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl index cab8882683..d47c0361de 100755 --- a/view/theme/frio/templates/admin/logs/view.tpl +++ b/view/theme/frio/templates/admin/logs/view.tpl @@ -18,7 +18,7 @@
- {{$l10n.Show_all}} + {{$l10n.Show_all}}
@@ -33,7 +33,7 @@