X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=cookienotice%2Fcookienotice.php;h=5364573ca3571cf16156e3ebd98169c2b96d6e12;hb=06b15a6ed0edc129143eca28ebe33009a59b3562;hp=097f3c25ce2b5a8424614b63d62dc0d988d7861b;hpb=f6c847622891db71811bf79ba1348f579ce946d1;p=friendica-addons.git
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 097f3c25..5364573c 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -8,10 +8,9 @@
*/
use Friendica\App;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
/**
* cookienotice_install
@@ -36,19 +35,19 @@ function cookienotice_install()
*/
function cookienotice_addon_admin(App $a, &$s)
{
- if (!is_site_admin()) {
+ if (!$a->isSiteAdmin()) {
return;
}
- $text = Config::get('cookienotice', 'text', L10n::t('This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'));
- $oktext = Config::get('cookienotice', 'oktext', L10n::t('OK'));
+ $text = DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'));
+ $oktext = DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
- $t = Renderer::getMarkupTemplate('admin.tpl', __DIR__);
+ $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/cookienotice/');
$s .= Renderer::replaceMacros($t, [
- '$description' => L10n::t('Configure your cookie usage notice. 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],
- '$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext],
- '$submit' => L10n::t('Save Settings')
+ '$description' => DI::l10n()->t('Configure your cookie usage notice. 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', DI::l10n()->t('Cookie Usage Notice'), $text],
+ '$oktext' => ['cookienotice-oktext', DI::l10n()->t('OK Button Text'), $oktext],
+ '$submit' => DI::l10n()->t('Save Settings')
]);
return;
@@ -59,19 +58,17 @@ function cookienotice_addon_admin(App $a, &$s)
* handles the post request from the admin panel
*
* @param App $a
- *
* @return void
*/
function cookienotice_addon_admin_post(App $a)
{
- if (!is_site_admin()) {
+ if (!$a->isSiteAdmin()) {
return;
}
if ($_POST['cookienotice-submit']) {
- Config::set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
- Config::set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
- info(L10n::t('cookienotice Settings saved.'));
+ DI::config()->set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
+ DI::config()->set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
}
}
@@ -85,13 +82,10 @@ function cookienotice_addon_admin_post(App $a)
*
* @return void
*/
-function cookienotice_page_content_top(App $a, &$b)
+function cookienotice_page_content_top(App $a, array &$b)
{
- $stylesheetPath = __DIR__ . '/cookienotice.css';
- $footerscriptPath = __DIR__ . '/cookienotice.js';
-
- $a->registerStylesheet($stylesheetPath);
- $a->registerFooterScript($footerscriptPath);
+ DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css');
+ DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js');
}
/**
@@ -104,12 +98,12 @@ function cookienotice_page_content_top(App $a, &$b)
*
* @return void
*/
-function cookienotice_page_end(App $a, &$b)
+function cookienotice_page_end(App $a, array &$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.'));
- $oktext = (string)Config::get('cookienotice', 'oktext', L10n::t('OK'));
+ $text = (string)DI::config()->get('cookienotice', 'text', DI::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)DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
- $page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', __DIR__);
+ $page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', 'addon/cookienotice/');
$page_end = Renderer::replaceMacros($page_end_tpl, [
'$text' => $text,