X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finvite.php;h=e8901d0710907bc7ff57ad1f8b711254d7dc2bec;hb=6c341962648b73c935c2de26996b07332b776a1f;hp=7318b77ae9f78c6e3318a3fad8ad32fabb12eb21;hpb=a298a1f8d59b5cbc331aae66a5e46d3308dd7e43;p=friendica.git diff --git a/mod/invite.php b/mod/invite.php index 7318b77ae9..e8901d0710 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -7,13 +7,15 @@ */ use Friendica\App; +use Friendica\BaseModule; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Database\DBA; +use Friendica\Module\Register; use Friendica\Protocol\Email; -use Friendica\Util\DateTimeFormat; +use Friendica\Util\Strings; function invite_post(App $a) { @@ -22,7 +24,7 @@ function invite_post(App $a) return; } - check_form_security_token_redirectOnErr('/', 'send_invite'); + BaseModule::checkFormSecurityTokenRedirectOnError('/', 'send_invite'); $max_invites = intval(Config::get('system', 'max_invites')); if (! $max_invites) { @@ -37,9 +39,11 @@ function invite_post(App $a) $recipients = !empty($_POST['recipients']) ? explode("\n", $_POST['recipients']) : []; - $message = !empty($_POST['message']) ? notags(trim($_POST['message'])) : ''; + $message = !empty($_POST['message']) ? Strings::escapeTags(trim($_POST['message'])) : ''; $total = 0; + $invitation_only = false; + $invites_remaining = null; if (Config::get('system', 'invitation_only')) { $invitation_only = true; @@ -52,7 +56,7 @@ function invite_post(App $a) foreach ($recipients as $recipient) { $recipient = trim($recipient); - if (! valid_email($recipient)) { + if (!filter_var($recipient, FILTER_VALIDATE_EMAIL)) { notice(L10n::t('%s : Not a valid email address.', $recipient) . EOL); continue; } @@ -108,7 +112,7 @@ function invite_content(App $a) { return; } - $tpl = get_markup_template('invite.tpl'); + $tpl = Renderer::getMarkupTemplate('invite.tpl'); $invonly = false; if (Config::get('system', 'invitation_only')) { @@ -122,14 +126,14 @@ function invite_content(App $a) { $dirloc = Config::get('system', 'directory'); if (strlen($dirloc)) { - if (intval(Config::get('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 (intval(Config::get('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 { @@ -138,8 +142,8 @@ function invite_content(App $a) { } } - $o = replace_macros($tpl, [ - '$form_security_token' => get_form_security_token("send_invite"), + $o = Renderer::replaceMacros($tpl, [ + '$form_security_token' => BaseModule::getFormSecurityToken("send_invite"), '$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"