friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

cookienotice addon - fixes for 2019.01 - Template loading and replace macros

Browse source
This commit is contained in:
Peter Liebetrau 2019-01-22 16:50:13 +01:00
parent 12c4fcfcae
commit 308e093589
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cookienotice/cookienotice.php
View file

@ -7,9 +7,11 @@
* Author: Peter Liebetrau <https://socivitas/profile/peerteer> * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
* *
*/ */
use Friendica\Core\Addon;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer;
/** /**
* cookienotice_install * cookienotice_install
@ -71,8 +73,8 @@ function cookienotice_addon_settings(\Friendica\App $a, &$s)
$oktext = ''; $oktext = '';
} }
$t = get_markup_template("settings.tpl", "addon/cookienotice/"); $t = Renderer::getMarkupTemplate("settings.tpl", "addon/cookienotice/");
$s .= replace_macros($t, [ $s .= Renderer::replaceMacros($t, [
'$title' => L10n::t('"cookienotice" Settings'), '$title' => L10n::t('"cookienotice" Settings'),
'$description' => L10n::t('<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'), '$description' => L10n::t('<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'),
'$text' => ['cookienotice-text', L10n::t('Cookie Usage Notice'), $text, L10n::t('The cookie usage notice')], '$text' => ['cookienotice-text', L10n::t('Cookie Usage Notice'), $text, L10n::t('The cookie usage notice')],
@ -138,9 +140,9 @@ function cookienotice_page_end(\Friendica\App $a, &$b)
$text = (string) Config::get('cookienotice', 'text', L10n::t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.')); $text = (string) Config::get('cookienotice', 'text', L10n::t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'));
$oktext = (string) Config::get('cookienotice', 'oktext', L10n::t('OK')); $oktext = (string) Config::get('cookienotice', 'oktext', L10n::t('OK'));
$page_end_tpl = get_markup_template("cookienotice.tpl", "addon/cookienotice/"); $page_end_tpl = Renderer::getMarkupTemplate("cookienotice.tpl", "addon/cookienotice/");
$page_end = replace_macros($page_end_tpl, [ $page_end = Renderer::replaceMacros($page_end_tpl, [
'$text' => $text, '$text' => $text,
'$oktext' => $oktext, '$oktext' => $oktext,
]); ]);