X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finvite.php;h=460a3461d3c2953774c8a516b3d99c93d0df92bb;hb=d7d685ad6b06c398873e4e530f3d99b988319e5b;hp=e73ef01edb48b1c6091c71b7c392a8ab6076ef32;hpb=f3fc1f36caf9139f8d72611b85849a2b7e6759c3;p=friendica.git diff --git a/mod/invite.php b/mod/invite.php index e73ef01edb..460a3461d3 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -11,11 +11,13 @@ 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\Protocol\Email; use Friendica\Util\DateTimeFormat; use Friendica\Util\Security; +use Friendica\Util\Strings; function invite_post(App $a) { @@ -39,7 +41,7 @@ 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; @@ -54,20 +56,15 @@ 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; } if ($invitation_only && ($invites_remaining || is_site_admin())) { - $code = autoname(8) . srand(1000, 9999); + $code = Friendica\Model\Register::createForInvitation(); $nmessage = str_replace('$invite_code', $code, $message); - $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ", - DBA::escape($code), - DBA::escape(DateTimeFormat::utcNow()) - ); - if (! is_site_admin()) { $invites_remaining --; if ($invites_remaining >= 0) { @@ -115,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')) { @@ -145,7 +142,7 @@ function invite_content(App $a) { } } - $o = replace_macros($tpl, [ + $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:')],