X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=impressum%2Fimpressum.php;h=4bbb419babf37961a4f1ea589ac62f25bb0f549e;hb=42520d0351611660581b3b1fe046eb1e67af925f;hp=6300efca3d8ee3b043006447b17ccb067a0460a2;hpb=dbd93f83510027059d31d1fb7c0fa7b571b47516;p=friendica-addons.git

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 6300efca..4bbb419b 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -8,33 +8,25 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function impressum_install() {
-	Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
-    Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+	Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
+    Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     Logger::log("installed impressum Addon");
 }
 
-function impressum_uninstall() {
-	Addon::unregisterHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
-    Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-    Logger::log("uninstalled impressum Addon");
-}
-
 function impressum_module() {
 }
 function impressum_content() {
-    $a = get_app();
-    $a->internalRedirect('friendica/');
+    DI::baseUrl()->redirect('friendica/');
 }
 
 function obfuscate_email ($s) {
@@ -43,27 +35,27 @@ function obfuscate_email ($s) {
     return $s;
 }
 function impressum_footer($a, &$b) {
-    $text = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text')));
+    $text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum','footer_text')));
 
     if (! $text == '') {
-        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/impressum/impressum.css" media="all" />';
+        DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/impressum/impressum.css" media="all" />';
         $b .= '<div class="clear"></div>';
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }
 }
 
-function impressum_load_config(\Friendica\App $a)
+function impressum_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/impressum.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
 }
 
 function impressum_show($a,&$b) {
-    $b .= '<h3>'.L10n::t('Impressum').'</h3>';
-    $owner = Config::get('impressum', 'owner');
-    $owner_profile = Config::get('impressum','ownerprofile');
-    $postal = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal')));
-    $notes = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes')));
-    $email = obfuscate_email( Config::get('impressum','email') );
+    $b .= '<h3>'.DI::l10n()->t('Impressum').'</h3>';
+    $owner = DI::config()->get('impressum', 'owner');
+    $owner_profile = DI::config()->get('impressum','ownerprofile');
+    $postal = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'postal')));
+    $notes = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'notes')));
+    $email = obfuscate_email( DI::config()->get('impressum','email') );
     if (strlen($owner)) {
         if (strlen($owner_profile)) {
             $tmp = '<a href="'.$owner_profile.'">'.$owner.'</a>';
@@ -71,45 +63,44 @@ function impressum_show($a,&$b) {
             $tmp = $owner;
         }
         if (strlen($email)) {
-            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'<br /><strong>'.L10n::t('Email Address').'</strong>: '.$email.'</p>';
+            $b .= '<p><strong>'.DI::l10n()->t('Site Owner').'</strong>: '. $tmp .'<br /><strong>'.DI::l10n()->t('Email Address').'</strong>: '.$email.'</p>';
         } else {
-            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'</p>';
+            $b .= '<p><strong>'.DI::l10n()->t('Site Owner').'</strong>: '. $tmp .'</p>';
         }
         if (strlen($postal)) {
-            $b .= '<p><strong>'.L10n::t('Postal Address').'</strong><br />'. $postal .'</p>';
+            $b .= '<p><strong>'.DI::l10n()->t('Postal Address').'</strong><br />'. $postal .'</p>';
         }
         if (strlen($notes)) {
             $b .= '<p>'.$notes.'</p>';
         }
     } else {
-        $b .= '<p>'.L10n::t('The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.').'</p>';
+        $b .= '<p>'.DI::l10n()->t('The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.').'</p>';
     }
 }
 
 function impressum_addon_admin_post (&$a) {
-    $owner = ((x($_POST, 'owner')) ? Strings::escapeTags(trim($_POST['owner'])) : '');
-    $ownerprofile = ((x($_POST, 'ownerprofile')) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
-    $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : '');
-    $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : '');
-    $email = ((x($_POST, 'email')) ? Strings::escapeTags(trim($_POST['email'])) : '');
-    $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : '');
-    Config::set('impressum','owner',strip_tags($owner));
-    Config::set('impressum','ownerprofile',strip_tags($ownerprofile));
-    Config::set('impressum','postal',strip_tags($postal));
-    Config::set('impressum','email',strip_tags($email));
-    Config::set('impressum','notes',strip_tags($notes));
-    Config::set('impressum','footer_text',strip_tags($footer_text));
-    info(L10n::t('Settings updated.'). EOL );
+    $owner = (!empty($_POST['owner']) ? Strings::escapeTags(trim($_POST['owner'])) : '');
+    $ownerprofile = (!empty($_POST['ownerprofile']) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
+    $postal = (!empty($_POST['postal']) ? (trim($_POST['postal'])) : '');
+    $notes = (!empty($_POST['notes']) ? (trim($_POST['notes'])) : '');
+    $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
+    $footer_text = (!empty($_POST['footer_text']) ? (trim($_POST['footer_text'])) : '');
+    DI::config()->set('impressum','owner',strip_tags($owner));
+    DI::config()->set('impressum','ownerprofile',strip_tags($ownerprofile));
+    DI::config()->set('impressum','postal',strip_tags($postal));
+    DI::config()->set('impressum','email',strip_tags($email));
+    DI::config()->set('impressum','notes',strip_tags($notes));
+    DI::config()->set('impressum','footer_text',strip_tags($footer_text));
 }
 function impressum_addon_admin (&$a, &$o) {
     $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/impressum/" );
     $o = Renderer::replaceMacros($t, [
-        '$submit' => L10n::t('Save Settings'),
-        '$owner' => ['owner', L10n::t('Site Owner'), Config::get('impressum','owner'), L10n::t('The page operators name.')],
-        '$ownerprofile' => ['ownerprofile', L10n::t('Site Owners Profile'), Config::get('impressum','ownerprofile'), L10n::t('Profile address of the operator.')],
-        '$postal' => ['postal', L10n::t('Postal Address'), Config::get('impressum','postal'), L10n::t('How to contact the operator via snail mail. You can use BBCode here.')],
-        '$notes' => ['notes', L10n::t('Notes'), Config::get('impressum','notes'), L10n::t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')],
-        '$email' => ['email', L10n::t('Email Address'), Config::get('impressum','email'), L10n::t('How to contact the operator via email. (will be displayed obfuscated)')],
-        '$footer_text' => ['footer_text', L10n::t('Footer note'), Config::get('impressum','footer_text'), L10n::t('Text for the footer. You can use BBCode here.')],
+        '$submit' => DI::l10n()->t('Save Settings'),
+        '$owner' => ['owner', DI::l10n()->t('Site Owner'), DI::config()->get('impressum','owner'), DI::l10n()->t('The page operators name.')],
+        '$ownerprofile' => ['ownerprofile', DI::l10n()->t('Site Owners Profile'), DI::config()->get('impressum','ownerprofile'), DI::l10n()->t('Profile address of the operator.')],
+        '$postal' => ['postal', DI::l10n()->t('Postal Address'), DI::config()->get('impressum','postal'), DI::l10n()->t('How to contact the operator via snail mail. You can use BBCode here.')],
+        '$notes' => ['notes', DI::l10n()->t('Notes'), DI::config()->get('impressum','notes'), DI::l10n()->t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')],
+        '$email' => ['email', DI::l10n()->t('Email Address'), DI::config()->get('impressum','email'), DI::l10n()->t('How to contact the operator via email. (will be displayed obfuscated)')],
+        '$footer_text' => ['footer_text', DI::l10n()->t('Footer note'), DI::config()->get('impressum','footer_text'), DI::l10n()->t('Text for the footer. You can use BBCode here.')],
     ]);
 }