DE translation blackout

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

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 6ea83367057e36e7ed0fb7feeb1ed65005a8316a..c8d1ccf9ac4efab7b65e02e2bdfad2a95a80785a 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -6,42 +6,56 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
-require_once 'include/bbcode.php';
-
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Util\Strings;
 
-function newmemberwidget_install () {
-    Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-    logger('newmemberwidget installed');
+function newmemberwidget_install()
+{
+       Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
+       Logger::log('newmemberwidget installed');
 }
-function newmemberwidget_uninstall () {
-    Addon::unregisterHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
+
+function newmemberwidget_uninstall()
+{
+       Hook::unregister( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
 }
 
-function newmemberwidget_network_mod_init ( $a, $b) {
-    if (x($_SESSION['new_member'])) {
+function newmemberwidget_network_mod_init ($a, $b)
+{
+       if (empty($_SESSION['new_member'])) {
+               return;
+       }
+
        $t = '<div id="newmember_widget" class="widget">'.EOL;
        $t .= '<h3>'.L10n::t('New Member').'</h3>'.EOL;
        $t .= '<a href="newmember" id="newmemberwidget-tips">' . L10n::t('Tips for New Members') . '</a><br />'.EOL;
-       if (Config::get('newmemberwidget','linkglobalsupport')==1)
-           $t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.L10n::t('Global Support Forum').'</a><br />'.EOL;
-       if (Config::get('newmemberwidget','linklocalsupport')==1)
-           $t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
-       $ft = Config::get('newmemberwidget','freetext');
-       if (!trim($ft)=="")
-           $t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
+
+       if (Config::get('newmemberwidget','linkglobalsupport', false)) {
+               $t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.L10n::t('Global Support Forum').'</a><br />'.EOL;
+       }
+
+       if (Config::get('newmemberwidget','linklocalsupport', false)) {
+               $t .= '<a href="'.$a->getBaseURL().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
+       }
+
+       $ft = Config::get('newmemberwidget','freetext', '');
+       if (!empty($ft)) {
+               $t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
+       }
+
        $t .= '</div><div class="clear"></div>';
-       $a->page['aside'] = $t . $a->page['aside'];
-    }
+       $a->page['aside'] = $t . $a->page['aside'];
 }
 
 function newmemberwidget_addon_admin_post(&$a)
 {
-       $ft = ((x($_POST, 'freetext')) ? trim($_POST['freetext']) : "");
-       $lsn = ((x($_POST, 'localsupportname')) ? notags(trim($_POST['localsupportname'])) : "");
+       $ft = (!empty($_POST['freetext']) ? trim($_POST['freetext']) : "");
+       $lsn = (!empty($_POST['localsupportname']) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
        $gs = intval($_POST['linkglobalsupport']);
        $ls = intval($_POST['linklocalsupport']);
        Config::set('newmemberwidget', 'freetext',           trim($ft));
@@ -52,8 +66,8 @@ function newmemberwidget_addon_admin_post(&$a)
 
 function newmemberwidget_addon_admin(&$a, &$o)
 {
-       $t = get_markup_template('admin.tpl', 'addon/newmemberwidget');
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/newmemberwidget');
+       $o = Renderer::replaceMacros($t, [
        '$submit' => L10n::t('Save Settings'),
        '$freetext' => [ "freetext", L10n::t("Message"), Config::get("newmemberwidget", "freetext"), L10n::t("Your message for new members. You can use bbcode here.")],
        '$linkglobalsupport' => [ "linkglobalsupport", L10n::t('Add a link to global support forum'), Config::get('newmemberwidget', 'linkglobalsupport'), L10n::t('Should a link to the global support forum be displayed?')." (<a href='https://forum.friendi.ca/profile/helpers'>@helpers</a>)"],