Merge branch '3.6-rc'

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

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 75103dd1e644be3415e056556ce08f75f3fe73ef..e64e1cd2479ee7c35c8a1c6877f58acd02eaef04 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -1,34 +1,36 @@
 <?php
 /**
  * Name: Impressum
- * Description: Plugin to add contact information to the about page (/friendica)
+ * Description: Addon to add contact information to the about page (/friendica)
  * Version: 1.3
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * License: 3-clause BSD license
  */
 
-require_once('include/bbcode.php');
-require_once('mod/proxy.php');
+require_once 'mod/proxy.php';
 
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 
 function impressum_install() {
-    register_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    register_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-    logger("installed impressum plugin");
+    Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+    logger("installed impressum Addon");
 }
 
 function impressum_uninstall() {
-    unregister_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-    logger("uninstalled impressum plugin");
+    Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+    logger("uninstalled impressum Addon");
 }
 
 function impressum_module() {
 }
 function impressum_content() {
     $a = get_app();
-    goaway('friendica/');
+    goaway($a->get_baseurl().'/friendica/');
 }
 
 function obfuscate_email ($s) {
@@ -37,7 +39,7 @@ function obfuscate_email ($s) {
     return $s;
 }
 function impressum_footer($a, &$b) {
-    $text = proxy_parse_html(bbcode(Config::get('impressum','footer_text'), true));
+    $text = proxy_parse_html(BBCode::convert(Config::get('impressum','footer_text')));
     if (! $text == '') {
         $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
         $b .= '<div class="clear"></div>';
@@ -45,11 +47,11 @@ function impressum_footer($a, &$b) {
     }
 }
 function impressum_show($a,&$b) {
-    $b .= '<h3>'.t('Impressum').'</h3>';
+    $b .= '<h3>'.L10n::t('Impressum').'</h3>';
     $owner = Config::get('impressum', 'owner');
     $owner_profile = Config::get('impressum','ownerprofile');
-    $postal = proxy_parse_html(bbcode(Config::get('impressum', 'postal'), true));
-    $notes = proxy_parse_html(bbcode(Config::get('impressum', 'notes'), true));
+    $postal = proxy_parse_html(BBCode::convert(Config::get('impressum', 'postal')));
+    $notes = proxy_parse_html(BBCode::convert(Config::get('impressum', 'notes')));
     $email = obfuscate_email( Config::get('impressum','email') );
     if (strlen($owner)) {
         if (strlen($owner_profile)) {
@@ -58,22 +60,22 @@ function impressum_show($a,&$b) {
             $tmp = $owner;
         }
         if (strlen($email)) {
-            $b .= '<p><strong>'.t('Site Owner').'</strong>: '. $tmp .'<br /><strong>'.t('Email Address').'</strong>: '.$email.'</p>';
+            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'<br /><strong>'.L10n::t('Email Address').'</strong>: '.$email.'</p>';
         } else {
-            $b .= '<p><strong>'.t('Site Owner').'</strong>: '. $tmp .'</p>';
+            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'</p>';
         }
         if (strlen($postal)) {
-            $b .= '<p><strong>'.t('Postal Address').'</strong><br />'. $postal .'</p>';
+            $b .= '<p><strong>'.L10n::t('Postal Address').'</strong><br />'. $postal .'</p>';
         }
         if (strlen($notes)) {
             $b .= '<p>'.$notes.'</p>';
         }
     } else {
-        $b .= '<p>'.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>'.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_plugin_admin_post (&$a) {
+function impressum_addon_admin_post (&$a) {
     $owner = ((x($_POST, 'owner')) ? notags(trim($_POST['owner'])) : '');
     $ownerprofile = ((x($_POST, 'ownerprofile')) ? notags(trim($_POST['ownerprofile'])) : '');
     $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : '');
@@ -86,17 +88,17 @@ function impressum_plugin_admin_post (&$a) {
     Config::set('impressum','email',strip_tags($email));
     Config::set('impressum','notes',strip_tags($notes));
     Config::set('impressum','footer_text',strip_tags($footer_text));
-    info( t('Settings updated.'). EOL );
+    info(L10n::t('Settings updated.'). EOL );
 }
-function impressum_plugin_admin (&$a, &$o) {
+function impressum_addon_admin (&$a, &$o) {
     $t = get_markup_template( "admin.tpl", "addon/impressum/" );
     $o = replace_macros($t, [
-        '$submit' => t('Save Settings'),
-        '$owner' => ['owner', t('Site Owner'), Config::get('impressum','owner'), t('The page operators name.')],
-        '$ownerprofile' => ['ownerprofile', t('Site Owners Profile'), Config::get('impressum','ownerprofile'), t('Profile address of the operator.')],
-        '$postal' => ['postal', t('Postal Address'), Config::get('impressum','postal'), t('How to contact the operator via snail mail. You can use BBCode here.')],
-        '$notes' => ['notes', t('Notes'), Config::get('impressum','notes'), t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')],
-        '$email' => ['email', t('Email Address'), Config::get('impressum','email'), t('How to contact the operator via email. (will be displayed obfuscated)')],
-        '$footer_text' => ['footer_text', t('Footer note'), Config::get('impressum','footer_text'), t('Text for the footer. You can use BBCode here.')],
+        '$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.')],
     ]);
 }