Ops, one more left ...

[friendica.git] / mod / invite.php

diff --git a/mod/invite.php b/mod/invite.php
index 6807ff2c12e034bb8084fae928bd9a25f7c2bb09..2a98d19ffcffaf5d3e3c660252e7f304d8d9572b 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
 
@@ -61,8 +62,8 @@ function invite_post(App $a)
                        $nmessage = str_replace('$invite_code', $code, $message);
 
                        $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
-                               dbesc($code),
-                               dbesc(DateTimeFormat::utcNow())
+                               DBA::escape($code),
+                               DBA::escape(DateTimeFormat::utcNow())
                        );
 
                        if (! is_site_admin()) {
@@ -126,14 +127,14 @@ function invite_content(App $a) {
 
        $dirloc = Config::get('system', 'directory');
        if (strlen($dirloc)) {
-               if ($a->config['register_policy'] == REGISTER_CLOSED) {
+               if (intval(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.', $dirloc . '/servers');
                } else {
                        $linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl())
                        . "\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.', $dirloc . '/servers');
                }
        } else { // there is no global directory URL defined
-               if ($a->config['register_policy'] == REGISTER_CLOSED) {
+               if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
                        $o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
                        return $o;
                } else {
@@ -144,14 +145,13 @@ function invite_content(App $a) {
 
        $o = replace_macros($tpl, [
                '$form_security_token' => get_form_security_token("send_invite"),
-               '$invite'              => L10n::t('Send invitations'),
-               '$addr_text'           => L10n::t('Enter email addresses, one per line:'),
-               '$msg_text'            => L10n::t('Your message:'),
-               '$default_message'     => 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"
+               '$title'               => L10n::t('Send invitations'),
+               '$recipients'          => ['recipients', L10n::t('Enter email addresses, one per line:')],
+               '$message'             => ['message', L10n::t('Your message:'),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" . (($invonly) ? 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" . System::baseUrl() . '/profile/' . $a->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"  ,
+                       . "\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')
        ]);