Merge pull request #8044 from annando/contact-adding

[friendica.git] / src / Module / Invite.php

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 9261ea703c5462756f782b82f6862c4d38e0985b..67d26f6fa78af31c955f82ff2f721b8150cf9244 100644 (file)
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -26,7 +26,7 @@ class Invite extends BaseModule
                self::checkFormSecurityTokenRedirectOnError('/', 'send_invite');
 
                $app = DI::app();
-               $config = $app->getConfig();
+               $config = DI::config();
 
                $max_invites = intval($config->get('system', 'max_invites'));
                if (!$max_invites) {
@@ -112,7 +112,7 @@ class Invite extends BaseModule
                }
 
                $app = DI::app();
-               $config = $app->getConfig();
+               $config = DI::config();
 
                $inviteOnly = false;
 
@@ -129,14 +129,14 @@ class Invite extends BaseModule
                        if ($config->get('config', 'register_policy') === Register::CLOSED) {
                                $linkTxt = L10n::t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.', $dirLocation . '/servers');
                        } else {
-                               $linkTxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', $app->getBaseURL())
+                               $linkTxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl()->get())
                                        . "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirLocation . '/servers');
                        }
                } else { // there is no global directory URL defined
                        if ($config->get('config', 'register_policy') === Register::CLOSED) {
                                return L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
                        } else {
-                               $linkTxt = L10n::t('To accept this invitation, please visit and register at %s.', $app->getBaseURL()
+                               $linkTxt = L10n::t('To accept this invitation, please visit and register at %s.', DI::baseUrl()->get()
                                        . "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.'));
                        }
                }
@@ -152,7 +152,7 @@ class Invite extends BaseModule
                                L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
                                . $linkTxt
                                . "\r\n" . "\r\n" . (($inviteOnly) ? L10n::t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . L10n::t('Once you have registered, please connect with me via my profile page at:')
-                               . "\r\n" . "\r\n" . $app->getBaseURL() . '/profile/' . $app->user['nickname']
+                               . "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->user['nickname']
                                . "\r\n" . "\r\n" . L10n::t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n",
                        ],
                        '$submit'              => L10n::t('Submit')