Merge remote-tracking branch 'upstream/master'

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

diff --git a/impressum/impressum.php b/impressum/impressum.php
index a4e7199c970c66b26237c39e713b9b9425a327c0..6714dfc1391113b46aeb7e26ca11e2a09fd5f1f6 100755 (executable)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -2,8 +2,8 @@
 /**
  * Name: Impressum
  * Description: Plugin to add contact information to the about page (/friendica)
- * Version: 1.2
- * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
+ * Version: 1.3
+ * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * License: 3-clause BSD license
  */
 
@@ -20,6 +20,14 @@ function impressum_uninstall() {
     unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     logger("uninstalled impressum plugin");
 }
+
+function impressum_module() {
+}
+function impressum_content() {
+    $a = get_app();
+    goaway($a->get_baseurl().'/friendica/');
+}
+
 function obfuscate_email ($s) {
     $s = str_replace('@','(at)',$s);
     $s = str_replace('.','(dot)',$s);
@@ -29,6 +37,7 @@ function impressum_footer($a, &$b) {
     $text = bbcode(get_config('impressum','footer_text'), true);
     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>';
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }
 }
@@ -77,7 +86,7 @@ function impressum_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL );
 }
 function impressum_plugin_admin (&$a, &$o) {
-    $t = file_get_contents( dirname(__file__). "/admin.tpl" );
+    $t = get_markup_template( "admin.tpl", "addon/impressum/" );
     $o = replace_macros($t, array(
         '$submit' => t('Submit'),
         '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')),