mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #1350 from MrPetovan/bug/fatal-errors

Browse source 
[impressum] Avoid calling obfuscate_email on a null value
This commit is contained in:
Michael Vogel 2023-01-11 16:19:54 +01:00 committed by GitHub
commit b53914ee11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
impressum/impressum.php
View file

@ -61,31 +61,30 @@ function impressum_load_config(App $a, ConfigFileManager $loader)
function impressum_show(App $a, string &$body) function impressum_show(App $a, string &$body)
{ {
$body .= '<h3>' . DI::l10n()->t('Impressum') . '</h3>'; $body .= '<h3>' . DI::l10n()->t('Impressum') . '</h3>';
$owner = DI::config()->get('impressum', 'owner'); $owner = DI::config()->get('impressum', 'owner');
$owner_profile = DI::config()->get('impressum', 'ownerprofile'); $owner_profile = DI::config()->get('impressum', 'ownerprofile');
$postal = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'postal'))); $postal = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'postal')));
$notes = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'notes'))); $notes = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'notes')));
$email = obfuscate_email( DI::config()->get('impressum', 'email') );
if (strlen($owner)) { if ($owner) {
if (strlen($owner_profile)) { if ($owner_profile) {
$tmp = '<a href="' . $owner_profile . '">' . $owner . '</a>'; $tmp = '<a href="' . $owner_profile . '">' . $owner . '</a>';
} else { } else {
$tmp = $owner; $tmp = $owner;
} }
if (strlen($email)) { if ($email = DI::config()->get('impressum', 'email')) {
$body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'<br /><strong>' . DI::l10n()->t('Email Address') . '</strong>: ' . $email . '</p>'; $body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'<br /><strong>' . DI::l10n()->t('Email Address') . '</strong>: ' . obfuscate_email($email) . '</p>';
} else { } else {
$body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'</p>'; $body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'</p>';
} }
if (strlen($postal)) { if ($postal) {
$body .= '<p><strong>' . DI::l10n()->t('Postal Address') . '</strong><br />' . $postal . '</p>'; $body .= '<p><strong>' . DI::l10n()->t('Postal Address') . '</strong><br />' . $postal . '</p>';
} }
if (strlen($notes)) { if ($notes) {
$body .= '<p>' . $notes . '</p>'; $body .= '<p>' . $notes . '</p>';
} }
} else { } else {