Move Config::get() to DI::config()->get()

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

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index d7f38068c025d5edf06bb5338ced5f4e4de910d9..21cb482fc294c90faab5e1a612e24ad1d28c2c45 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -7,19 +7,22 @@
  ***/
 
 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\Strings;
 
 function newmemberwidget_install()
 {
-       Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-       logger('newmemberwidget installed');
+       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');
+       Hook::unregister( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
 }
 
 function newmemberwidget_network_mod_init ($a, $b)
@@ -29,30 +32,30 @@ function newmemberwidget_network_mod_init ($a, $b)
        }
 
        $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;
+       $t .= '<h3>'.DI::l10n()->t('New Member').'</h3>'.EOL;
+       $t .= '<a href="newmember" id="newmemberwidget-tips">' . DI::l10n()->t('Tips for New Members') . '</a><br />'.EOL;
 
-       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 (DI::config()->get('newmemberwidget','linkglobalsupport', false)) {
+               $t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.DI::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;
+       if (DI::config()->get('newmemberwidget','linklocalsupport', false)) {
+               $t .= '<a href="'.DI::baseUrl()->get().'/profile/'.DI::config()->get('newmemberwidget','localsupport').'" target="_new">'.DI::l10n()->t('Local Support Forum').'</a><br />'.EOL;
        }
 
-       $ft = Config::get('newmemberwidget','freetext', '');
+       $ft = DI::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'];
+       DI::page()['aside'] = $t . DI::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));
@@ -63,12 +66,12 @@ function newmemberwidget_addon_admin_post(&$a)
 
 function newmemberwidget_addon_admin(&$a, &$o)
 {
-       $t = get_markup_template('admin.tpl', 'addon/newmemberwidget');
-       $o = replace_macros($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>)"],
-       '$linklocalsupport' => [ "linklocalsupport", L10n::t('Add a link to the local support forum'), Config::get('newmemberwidget', 'linklocalsupport'), L10n::t('If you have a local support forum and want to have a link displayed in the widget, check this box.')],
-       '$localsupportname' => [ "localsupportname", L10n::t('Name of the local support group'), Config::get('newmemberwidget', 'localsupport'), L10n::t('If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)')],
+       $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/newmemberwidget');
+       $o = Renderer::replaceMacros($t, [
+       '$submit' => DI::l10n()->t('Save Settings'),
+       '$freetext' => [ "freetext", DI::l10n()->t("Message"), DI::config()->get("newmemberwidget", "freetext"), DI::l10n()->t("Your message for new members. You can use bbcode here.")],
+       '$linkglobalsupport' => [ "linkglobalsupport", DI::l10n()->t('Add a link to global support forum'), DI::config()->get('newmemberwidget', 'linkglobalsupport'), DI::l10n()->t('Should a link to the global support forum be displayed?')." (<a href='https://forum.friendi.ca/profile/helpers'>@helpers</a>)"],
+       '$linklocalsupport' => [ "linklocalsupport", DI::l10n()->t('Add a link to the local support forum'), DI::config()->get('newmemberwidget', 'linklocalsupport'), DI::l10n()->t('If you have a local support forum and want to have a link displayed in the widget, check this box.')],
+       '$localsupportname' => [ "localsupportname", DI::l10n()->t('Name of the local support group'), DI::config()->get('newmemberwidget', 'localsupport'), DI::l10n()->t('If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)')],
        ]);
 }