Merge pull request #1135 from annando/profile-update

[friendica-addons.git] / cookienotice / cookienotice.php

diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index cc36bc29d6ed348a0a47f755c9156b1c8f9c8202..4ca862800b2e78064d2a4dac274561b90703f5e6 100644 (file)
--- 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
@@ -40,15 +39,15 @@ function cookienotice_addon_admin(App $a, &$s)
                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('<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],
-               '$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext],
-               '$submit' => L10n::t('Save Settings')
+               '$description' => DI::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', DI::l10n()->t('Cookie Usage Notice'), $text],
+               '$oktext' => ['cookienotice-oktext', DI::l10n()->t('OK Button Text'), $oktext],
+               '$submit' => DI::l10n()->t('Save Settings')
        ]);
 
        return;
@@ -56,24 +55,21 @@ function cookienotice_addon_admin(App $a, &$s)
 
 /**
  * cookienotice_addon_admin_post
- * addon_settings_post hook
  * handles the post request from the admin panel
  *
  * @param App    $a
- * @param string $b
  *
  * @return void
  */
-function cookienotice_addon_admin_post(App $a, &$b)
+function cookienotice_addon_admin_post(App $a)
 {
        if (!is_site_admin()) {
                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.') . EOL);
+               DI::config()->set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
+               DI::config()->set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
        }
 }
 
@@ -92,8 +88,8 @@ function cookienotice_page_content_top(App $a, &$b)
        $stylesheetPath = __DIR__ . '/cookienotice.css';
        $footerscriptPath = __DIR__ . '/cookienotice.js';
 
-       $a->registerStylesheet($stylesheetPath);
-       $a->registerFooterScript($footerscriptPath);
+       DI::page()->registerStylesheet($stylesheetPath);
+       DI::page()->registerFooterScript($footerscriptPath);
 }
 
 /**
@@ -108,10 +104,10 @@ function cookienotice_page_content_top(App $a, &$b)
  */
 function cookienotice_page_end(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.'));
-       $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,