Merge branch '3.6-release'

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

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 96ad36301738d61bf9589b5933064e9df5f3fbbc..eb121fb53638d60cc980ac8e271c63562a29fffd 100644 (file)
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -9,6 +9,7 @@
  */
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 
 function pageheader_install() {
     Addon::registerHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
@@ -47,14 +48,12 @@ function pageheader_addon_settings(&$a,&$s) {
        if(! $words)
                $words = '';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
-    $s .= '<div id="pageheader-wrapper">';
-    $s .= '<label id="pageheader-label" for="pageheader-words">' . t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
-    $s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $t = get_markup_template("settings.tpl", "addon/pageheader/");
+       $s .= replace_macros($t, [
+                                       '$title' => L10n::t('"pageheader" Settings'),
+                                       '$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
+                                       '$submit' => L10n::t('Save Settings')
+       ]);
 
        return;
 
@@ -67,7 +66,7 @@ function pageheader_addon_settings_post(&$a,&$b) {
 
        if($_POST['pageheader-submit']) {
                Config::set('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
-               info( t('pageheader Settings saved.') . EOL);
+               info(L10n::t('pageheader Settings saved.') . EOL);
        }
 }